Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24417/phpicalendar
Modified Files:
preferences.php
Log Message:
improve cookie handling and preferences.php
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** preferences.php 25 Mar 2006 20:22:47 -0000 1.57
--- preferences.php 5 Apr 2006 04:51:41 -0000 1.58
***************
*** 34,41 ****
$cookie_view = $_POST['cookie_view'];
$cookie_style = $_POST['cookie_style'];
- if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')){
- $template = $_POST['cookie_style'];
- }
-
$cookie_startday = $_POST['cookie_startday'];
$cookie_time = $_POST['cookie_time'];
--- 34,37 ----
***************
*** 44,58 ****
$the_cookie = serialize($the_cookie);
if ($cookie_unset) {
! setcookie("phpicalendar","$the_cookie",time()-(60*60*24*7) ,"/","$cookie_uri",0);
} else {
! setcookie("phpicalendar","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0);
}
! $_COOKIE['phpicalendar'] = $the_cookie;
$cpath = $cookie_cpath;
$cal = $cookie_calendar;
}
! if (isset($_COOKIE['phpicalendar'])) {
! $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar']));
$cookie_language = $phpicalendar['cookie_language'];
$cookie_calendar = $phpicalendar['cookie_calendar'];
--- 40,60 ----
$the_cookie = serialize($the_cookie);
if ($cookie_unset) {
! setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$cookie_uri",0);
} else {
! setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0);
! if (isset($_POST['cookie_view']))
! $default_view = $_POST['cookie_view'];
! if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/'))
! $template = $_POST['cookie_style'];
! if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php'))
! include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
}
! $_COOKIE[$cookie_name] = $the_cookie;
$cpath = $cookie_cpath;
$cal = $cookie_calendar;
}
! if (isset($_COOKIE[$cookie_name])) {
! $phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
$cookie_language = $phpicalendar['cookie_language'];
$cookie_calendar = $phpicalendar['cookie_calendar'];
***************
*** 66,70 ****
}
! if ((!isset($_COOKIE['phpicalendar'])) || ($cookie_unset)) {
# No cookie set -> use defaults from config file.
$cookie_language = ucfirst($language);
--- 68,72 ----
}
! if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) {
# No cookie set -> use defaults from config file.
$cookie_language = ucfirst($language);
***************
*** 104,112 ****
$calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED),TRUE);
$calendar_select .="<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
!
// select for dayview
! $view_select = ($cookie_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>';
! $view_select .= ($cookie_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>';
! $view_select .= ($cookie_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>';
// select for time
--- 106,114 ----
$calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED),TRUE);
$calendar_select .="<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
! $calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select);
// select for dayview
! $view_select = ($default_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>';
! $view_select .= ($default_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>';
! $view_select .= ($default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>';
// select for time
|
