[PHPiCalendar-Commits] phpicalendar/functions date_functions.php,1.13,1.14 ical_parser.php,1.88,1.89 init.inc.php,1.29,1.30

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv24719/functions

Modified Files:
	date_functions.php ical_parser.php init.inc.php 
Log Message:
Fixed a tons of E_ALL errors for smoother installs.



Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** date_functions.php	28 May 2003 04:19:25 -0000	1.13
--- date_functions.php	29 May 2003 06:27:14 -0000	1.14
***************
*** 171,185 ****
  		$event_text = strip_tags($event_text, '<b><i><u>');
  	}
! 	if ($arr["organizer"]) {
  		$organizer = urlencode(addslashes($arr["organizer"]));
  	}
! 	if ($arr["attendee"]) {
  		$attendee = urlencode(addslashes($arr["attendee"]));
  	}
! 	if ($arr["location"]) {
! 		$organizer = $arr["location"];
  	}
! 	if ($arr["status"]) {
! 		$organizer = $arr["status"];
  	}
  	if ($event_text != "") {	
--- 171,193 ----
  		$event_text = strip_tags($event_text, '<b><i><u>');
  	}
! 	if (isset($arr["organizer"])) {
  		$organizer = urlencode(addslashes($arr["organizer"]));
+ 	} else {
+ 		$organizer = '';
  	}
! 	if (isset($arr["attendee"])) {
  		$attendee = urlencode(addslashes($arr["attendee"]));
+ 	} else {
+ 		$attendee = '';
  	}
! 	if (isset($arr["location"])) {
! 		$location = $arr["location"];
! 	} else {
! 		$location = '';
  	}
! 	if (isset($arr["status"])) {
! 		$status = $arr["status"];
! 	} else {
! 		$status = '';
  	}
  	if ($event_text != "") {	

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** ical_parser.php	28 May 2003 04:19:25 -0000	1.88
--- ical_parser.php	29 May 2003 06:27:15 -0000	1.89
***************
*** 95,103 ****
  			);
  				
! 			$except_dates = array();
! 			$except_times = array();
  			$first_duration = TRUE;
! 			$count = 1000000;
! 			$valarm_set = FALSE;
  			
  			unset(
--- 95,103 ----
  			);
  				
! 			$except_dates 	= array();
! 			$except_times 	= array();
  			$first_duration = TRUE;
! 			$count 			= 1000000;
! 			$valarm_set 	= FALSE;
  			
  			unset(
***************
*** 110,120 ****
  			
  			// CLASS support
! 			if ($class == 'PRIVATE') {
! 				$summary ='**PRIVATE**';
! 				$description ='**PRIVATE**';
! 			} elseif ($class == 'CONFIDENTIAL') {
! 				$summary ='**CONFIDENTIAL**';
! 				$description ='**CONFIDENTIAL**';
! 			}			 
  			
  			// make sure we have some value for $uid
--- 110,122 ----
  			
  			// CLASS support
! 			if (isset($class)) {
! 				if ($class == 'PRIVATE') {
! 					$summary ='**PRIVATE**';
! 					$description ='**PRIVATE**';
! 				} elseif ($class == 'CONFIDENTIAL') {
! 					$summary ='**CONFIDENTIAL**';
! 					$description ='**CONFIDENTIAL**';
! 				}
! 			}	 
  			
  			// make sure we have some value for $uid
***************
*** 146,151 ****
  			}
  			
! 			if (!isset($summary)) $summary = '';
! 			if (!isset($description)) $description = '';
  			
  			$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
--- 148,156 ----
  			}
  			
! 			if (!isset($summary)) 		$summary = '';
! 			if (!isset($description)) 	$description = '';
! 			if (!isset($status)) 		$status = '';
! 			if (!isset($class)) 		$class = '';
! 			if (!isset($location)) 		$location = '';
  			
  			$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
***************
*** 180,184 ****
  
  			// RECURRENCE-ID Support
! 			if ($recurrence_d) {
  				$recurrence_delete["$recurrence_d"]["$recurrence_t"] = $uid;
  			}
--- 185,190 ----
  
  			// RECURRENCE-ID Support
! 			if (isset($recurrence_d)) {
! 				
  				$recurrence_delete["$recurrence_d"]["$recurrence_t"] = $uid;
  			}
***************
*** 187,190 ****
--- 193,198 ----
  			// Maybe this is no longer need since done at bottom of parser? - CL 11/20/02
  			if ($uid_valid && $write_processed) {
+ 				if (!isset($hour)) $hour = 00;
+ 				if (!isset($minute)) $minute = 00;
  				$processed[$uid] = array($start_date,($hour.$minute));
  			}
***************
*** 909,913 ****
  		}
  	}
! //print '<pre>';	
  	// Remove pesky recurrences
  	if (is_array($recurrence_delete)) {
--- 917,923 ----
  		}
  	}
! 	
! 	/*
! 	//print '<pre>';	
  	// Remove pesky recurrences
  	if (is_array($recurrence_delete)) {
***************
*** 944,948 ****
  			}
  		}
! 	}	
  	// Sort the array by absolute date.
  	if (isset($master_array) && is_array($master_array)) { 
--- 954,960 ----
  			}
  		}
! 	}
! 	
! 	*/
  	// Sort the array by absolute date.
  	if (isset($master_array) && is_array($master_array)) { 

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** init.inc.php	9 May 2003 20:28:57 -0000	1.29
--- init.inc.php	29 May 2003 06:27:15 -0000	1.30
***************
*** 7,16 ****
  
  // uncomment when developing, comment for shipping version
! // error_reporting (E_ALL);
  
  if (!defined('BASE')) define('BASE', './');
  include(BASE.'config.inc.php');
  include(BASE.'functions/error.php');
! if ($HTTP_COOKIE_VARS['phpicalendar']) {
  	$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	if (isset($phpicalendar['cookie_language'])) 	$language 			= $phpicalendar['cookie_language'];
--- 7,16 ----
  
  // uncomment when developing, comment for shipping version
! error_reporting (E_ALL);
  
  if (!defined('BASE')) define('BASE', './');
  include(BASE.'config.inc.php');
  include(BASE.'functions/error.php');
! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
  	$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	if (isset($phpicalendar['cookie_language'])) 	$language 			= $phpicalendar['cookie_language'];