Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar preferences.php,1.69,1.70
|
From: <ji...@us...> - 2008-12-31 07:14:41
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24812 Modified Files: preferences.php Log Message: timeFormat select in preferences (feature request 1401779) Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** preferences.php 29 Dec 2008 03:07:34 -0000 1.69 --- preferences.php 31 Dec 2008 07:14:34 -0000 1.70 *************** *** 30,37 **** $cookie_startday = $_POST['cookie_startday']; $cookie_time = $_POST['cookie_time']; $cookie_endtime = $_POST['cookie_endtime']; $cookie_timezone = $_POST['cookie_timezone']; $cookie_unset = @$_POST['unset']; ! $the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath", "cookie_timezone"=>"$cookie_timezone"); $the_cookie = serialize($the_cookie); if ($cookie_unset) { --- 30,49 ---- $cookie_startday = $_POST['cookie_startday']; $cookie_time = $_POST['cookie_time']; + $cookie_timeformat = $_POST['cookie_timeformat']; $cookie_endtime = $_POST['cookie_endtime']; $cookie_timezone = $_POST['cookie_timezone']; $cookie_unset = @$_POST['unset']; ! $the_cookie = array ( ! "cookie_language" => "$cookie_language", ! "cookie_calendar" => "$cookie_calendar", ! "cookie_view" => "$cookie_view", ! "cookie_startday" => "$cookie_startday", ! "cookie_style" => "$cookie_style", ! "cookie_time" => "$cookie_time", ! "cookie_endtime" => "$cookie_endtime", ! "cookie_timeformat" => "$cookie_timeformat", ! "cookie_cpath" => "$cookie_cpath", ! "cookie_timezone" => "$cookie_timezone" ! ); $the_cookie = serialize($the_cookie); if ($cookie_unset) { *************** *** 60,66 **** $cookie_time = $phpicalendar['cookie_time']; $cookie_endtime = $phpicalendar['cookie_endtime']; $cookie_timezone = $phpicalendar['cookie_timezone']; if ($cookie_unset) { ! unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday); } } --- 72,79 ---- $cookie_time = $phpicalendar['cookie_time']; $cookie_endtime = $phpicalendar['cookie_endtime']; + $cookie_timeformat = $phpicalendar['cookie_timeformat']; $cookie_timezone = $phpicalendar['cookie_timezone']; if ($cookie_unset) { ! unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style, $cookie_startday, $cookie_time, $cookie_endtime, $cookie_timeformat, $cookie_timezone); } } *************** *** 68,79 **** if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) { # No cookie set -> use defaults from config file. ! $cookie_language = ucfirst($language); ! $cookie_calendar = $phpiCal_config->default_cal; ! $cookie_view = $phpiCal_config->default_view; ! $cookie_style = $phpiCal_config->template; ! $cookie_startday = $phpiCal_config->week_start_day; ! $cookie_time = $phpiCal_config->day_start; ! $cookie_endtime = $phpiCal_config->day_end; ! $cookie_timezone = $phpiCal_config->timezone; } --- 81,93 ---- if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) { # No cookie set -> use defaults from config file. ! $cookie_language = ucfirst($language); ! $cookie_calendar = $phpiCal_config->default_cal; ! $cookie_view = $phpiCal_config->default_view; ! $cookie_style = $phpiCal_config->template; ! $cookie_startday = $phpiCal_config->week_start_day; ! $cookie_time = $phpiCal_config->day_start; ! $cookie_endtime = $phpiCal_config->day_end; ! $cookie_timeformat = $timeFormat; ! $cookie_timezone = $phpiCal_config->timezone; } *************** *** 109,114 **** $calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select); // select for dayview ! $view_select = ($phpiCal_config->default_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>'; ! $view_select .= ($phpiCal_config->default_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>'; $view_select .= ($phpiCal_config->default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>'; --- 123,128 ---- $calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select); // select for dayview ! $view_select = ($phpiCal_config->default_view == 'day' ) ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>'; ! $view_select .= ($phpiCal_config->default_view == 'week' ) ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>'; $view_select .= ($phpiCal_config->default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>'; *************** *** 133,136 **** --- 147,168 ---- $endtime_select .= ">$s</option>\n"; } + $timeformat_arr = array( + 'g:i', + 'h:i', + 'g:i A', + 'h:i A', + 'G:i', + 'H:i', + ); + $example_time = strtotime("19700101 08:00:00"); + $timeformat_select = ''; + foreach ($timeformat_arr as $i => $s) { + $s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60)); + $timeformat_select .= '<option value="'.$timeformat_arr[$i].'"'; + if ($timeformat_arr[$i] == $cookie_timeformat) { + $timeformat_select .= ' selected="selected"'; + } + $timeformat_select .= ">$s</option>\n"; + } // select for day of week *************** *** 238,241 **** --- 270,274 ---- 'time_select' => $time_select, 'endtime_select' => $endtime_select, + 'timeformat_select' => $timeformat_select, 'startday_select' => $startday_select, 'style_select' => $style_select, *************** *** 249,252 **** --- 282,286 ---- 'l_select_timezone' => $lang['l_select_timezone'], 'l_select_endtime' => $lang['l_select_endtime'], + 'l_select_timeformat'=> $lang['l_select_timeformat'], 'l_select_day' => $lang['l_select_day'], 'l_select_cal' => $lang['l_select_cal'], |
