[PHPiCalendar-Commits] phpicalendar preferences.php,1.55,1.56

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6132/phpicalendar

Modified Files:
	preferences.php 
Log Message:
patches to fix several files to work better with cookies. Changes in preferences.php, preferencees.tpl, init.inc.php

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** preferences.php	7 Sep 2005 03:41:18 -0000	1.55
--- preferences.php	27 Nov 2005 07:56:31 -0000	1.56
***************
*** 26,32 ****
--- 26,34 ----
  
  $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'];
***************
*** 35,39 ****
  	$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 		= serialize($the_cookie);
  	if ($cookie_unset) { 
--- 37,41 ----
  	$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", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
***************
*** 43,46 ****
--- 45,50 ----
  	}
  	$_COOKIE['phpicalendar'] = $the_cookie;
+     $cpath = $cookie_cpath;
+     $cal = $cookie_calendar;
  }
  
***************
*** 63,67 ****
  	$cookie_calendar = $default_cal;
  	$cookie_view = $default_view;
! 	$cookie_style = $style_sheet;
  	$cookie_startday = $week_start_day;
  	$cookie_time = $day_start;
--- 67,71 ----
  	$cookie_calendar = $default_cal;
  	$cookie_view = $default_view;
! 	$cookie_style = $template;
  	$cookie_startday = $week_start_day;
  	$cookie_time = $day_start;
***************
*** 94,98 ****
  
  // select for calendars
! $calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  
  // select for dayview
--- 98,103 ----
  
  // select for calendars
! $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
***************
*** 147,150 ****
--- 152,156 ----
  	'template'			=> $template,
  	'default_path'		=> '',
+ 	'cpath'				=> $cpath,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,