diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2005-11-27 07:56:31 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2005-11-27 07:56:31 +0000 |
| commit | 6b786f6023ec8ff6e8ece7b352d0fa95b7946e02 (patch) | |
| tree | e74866aa5ca8d090b2c8922fb301d3829d0407fc /preferences.php | |
| parent | 561a87eeef31ad4927e20aec1be00d7a58ecf08b (diff) | |
| download | phpicalendar-6b786f6023ec8ff6e8ece7b352d0fa95b7946e02.tar.gz phpicalendar-6b786f6023ec8ff6e8ece7b352d0fa95b7946e02.tar.bz2 phpicalendar-6b786f6023ec8ff6e8ece7b352d0fa95b7946e02.zip | |
patches to fix several files to work better with cookies. Changes in preferences.php, preferencees.tpl, init.inc.php
Diffstat (limited to 'preferences.php')
| -rw-r--r-- | preferences.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/preferences.php b/preferences.php index c865e76..f3ec74d 100644 --- a/preferences.php +++ b/preferences.php @@ -25,16 +25,18 @@ if (isset($_GET['action'])) { } $startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'); +$cpath = $_REQUEST['cpath']; if ($action == 'setcookie') { $cookie_language = $_POST['cookie_language']; + $cookie_cpath = $_POST['cpath']; $cookie_calendar = $_POST['cookie_calendar']; $cookie_view = $_POST['cookie_view']; $cookie_style = $_POST['cookie_style']; $cookie_startday = $_POST['cookie_startday']; $cookie_time = $_POST['cookie_time']; $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"); + $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_cpath"=>"$cookie_cpath"); $the_cookie = serialize($the_cookie); if ($cookie_unset) { setcookie("phpicalendar","$the_cookie",time()-(60*60*24*7) ,"/","$cookie_uri",0); @@ -42,6 +44,8 @@ if ($action == 'setcookie') { 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'])) { @@ -62,7 +66,7 @@ if ((!isset($_COOKIE['phpicalendar'])) || ($cookie_unset)) { $cookie_language = ucfirst($language); $cookie_calendar = $default_cal; $cookie_view = $default_view; - $cookie_style = $style_sheet; + $cookie_style = $template; $cookie_startday = $week_start_day; $cookie_time = $day_start; } @@ -93,7 +97,8 @@ while ($file = readdir($dir_handle)) { closedir($dir_handle); // select for calendars -$calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED)); +$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>'; @@ -146,6 +151,7 @@ $page->replace_tags(array( 'charset' => $charset, 'template' => $template, 'default_path' => '', + 'cpath' => $cpath, 'cal' => $cal, 'getdate' => $getdate, 'calendar_name' => $calendar_name, |