Project

General

Profile

« Previous | Next » 

Revision 1872

Added by Dietmar over 11 years ago

  1. bugfix preferences timezone, date_format, time_format settings, backend and frontend

View differences:

preferences_form.php
60 60
	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
61 61
}
62 62

  
63
$user_time = true;
64
require(ADMIN_PATH.'/interface/timezones.php');
65
require(ADMIN_PATH.'/interface/date_formats.php');
66
require(ADMIN_PATH.'/interface/time_formats.php');
67 63
$error = array();
68 64
$success = array();
69 65

  
......
172 168
$template->set_block('main_block', 'language_list_block', 'language_list');
173 169
foreach( $aLangUsed as $sDirectory => $sName  )
174 170
{
175
    $langIcons = ( empty($sDirectory) ? 'none' : strtolower($sDirectory));
171
	$langIcons = ( empty($sDirectory) ? 'none' : strtolower($sDirectory));
176 172

  
177
    $template->set_var('CODE',        $sDirectory);
178
    $template->set_var('NAME',        $sName);
179
    $template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
180
    $template->set_var('SELECTED',    ( $_SESSION['LANGUAGE'] == $sDirectory ? ' selected="selected"' : '') );
173
	$template->set_var('CODE',        $sDirectory);
174
	$template->set_var('NAME',        $sName);
175
	$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
176
	$template->set_var('SELECTED',    ( $_SESSION['LANGUAGE'] == $sDirectory ? ' selected="selected"' : '') );
181 177

  
182
    $template->parse('language_list', 'language_list_block', true);
178
	$template->parse('language_list', 'language_list_block', true);
183 179
}
184 180

  
185 181
// Insert default timezone values
182
$user_time = true;
183
require(ADMIN_PATH.'/interface/timezones.php');
186 184
$template->set_block('main_block', 'timezone_list_block', 'timezone_list');
187 185
foreach($TIMEZONES AS $hour_offset => $title) {
188
    $template->set_var('VALUE', $hour_offset);
189
    $template->set_var('NAME', $title);
190
    if($wb->get_timezone() == $hour_offset*3600) {
191
        $template->set_var('SELECTED', 'selected="selected"');
192
    } else {
193
        $template->set_var('SELECTED', '');
194
    }
195
    $template->parse('timezone_list', 'timezone_list_block', true);
186
	$template->set_var('VALUE',    $hour_offset);
187
	$template->set_var('NAME',     $title);
188
	$template->set_var('SELECTED', ($wb->get_timezone() == ($hour_offset * 3600) ? ' selected="selected"' : '') );
189
	$template->parse('timezone_list', 'timezone_list_block', true);
196 190
}
197

  
198 191
// Insert date format list
192
$user_time = true;
193
require(ADMIN_PATH.'/interface/date_formats.php');
199 194
$template->set_block('main_block', 'date_format_list_block', 'date_format_list');
200 195
foreach($DATE_FORMATS AS $format => $title)
201 196
{
202
    $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
203
    if($format != 'system_default') {
204
        $template->set_var('VALUE', $format);
205
    } else {
206
        $template->set_var('VALUE', '');
207
    }
208
    $template->set_var('NAME', $title);
209
    if($wb->get_session('DATE_FORMAT') == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
210
        $template->set_var('SELECTED', 'selected="selected"');
211
    } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
212
        $template->set_var('SELECTED', 'selected="selected"');
213
    } else {
214
        $template->set_var('SELECTED', '');
215
    }
216
    $template->parse('date_format_list', 'date_format_list_block', true);
197
	$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
198
	if($format != 'system_default') {
199
	    $template->set_var('VALUE', $format);
200
	} else {
201
	    $template->set_var('VALUE', '');
202
	}
203
	$template->set_var('NAME', $title);
204
	if($wb->get_session('DATE_FORMAT') == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
205
	    $template->set_var('SELECTED', 'selected="selected"');
206
	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
207
	    $template->set_var('SELECTED', 'selected="selected"');
208
	} else {
209
	    $template->set_var('SELECTED', '');
210
	}
211
	$template->parse('date_format_list', 'date_format_list_block', true);
217 212
}
218 213

  
214
// Insert time format list
219 215
$user_time = true;
220
// Insert time format list
216
require(ADMIN_PATH.'/interface/time_formats.php');
221 217
$template->set_block('main_block', 'time_format_list_block', 'time_format_list');
222 218
foreach($TIME_FORMATS AS $format => $title)
223 219
{
224
    $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
225
    if($format != 'system_default') {
226
        $template->set_var('VALUE', $format);
227
    } else {
228
        $template->set_var('VALUE', '');
229
    }
230
    $template->set_var('NAME', $title);
231
    if($wb->get_session('TIME_FORMAT') == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
232
        $template->set_var('SELECTED', 'selected="selected"');
233
    } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
234
        $template->set_var('SELECTED', 'selected="selected"');
235
    } else {
236
    $template->set_var('SELECTED', '');
237
    }
238
    $template->parse('time_format_list', 'time_format_list_block', true);
220
	$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
221
	if($format != 'system_default') {
222
	    $template->set_var('VALUE', $format);
223
	} else {
224
	    $template->set_var('VALUE', '');
225
	}
226
	$template->set_var('NAME', $title);
227
	if($wb->get_session('TIME_FORMAT') == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
228
	    $template->set_var('SELECTED', 'selected="selected"');
229
	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
230
	    $template->set_var('SELECTED', 'selected="selected"');
231
	} else {
232
	$template->set_var('SELECTED',  '');
233
	}
234
	$template->parse('time_format_list', 'time_format_list_block', true);
239 235
}
240 236
// Insert language headings
241 237
$template->set_var(array(

Also available in: Unified diff