[PHPiCalendar-Commits] phpicalendar/includes event.php, 1.42, 1.43 todo.php, 1.19, 1.20

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

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/includes

Modified Files:
	event.php todo.php 
Log Message:
misc error warnings and notices

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** event.php	17 Dec 2008 09:58:30 -0000	1.42
--- event.php	20 Dec 2008 03:22:54 -0000	1.43
***************
*** 1,3 ****
--- 1,4 ----
  <?php 
+ $current_view = "event";
  define('BASE', '../');
  #$getdate = $_POST['date'];
***************
*** 30,39 ****
  $event['event_text'] = stripslashes(utf8_decode(urldecode($event['event_text'])));
  $event['location'] = stripslashes(utf8_decode(urldecode($event['location'])));
! 
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
! if (is_array($organizer)) {
  	$i=0;
! 	$display .= $organizer_lang . ' - ';
  	foreach ($organizer as $val) {	
  		$organizers .= $organizer[$i]["name"] . ', ';
--- 31,41 ----
  $event['event_text'] = stripslashes(utf8_decode(urldecode($event['event_text'])));
  $event['location'] = stripslashes(utf8_decode(urldecode($event['location'])));
! $display ='';
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
! $organizer = '';
! if (isset($organizer) && is_array($organizer)) {
  	$i=0;
! 	$display .= $lang['l_organizer'] . ' - ';
  	foreach ($organizer as $val) {	
  		$organizers .= $organizer[$i]["name"] . ', ';
***************
*** 42,48 ****
  	$organizer = substr($organizers,0,-2);
  }
! if (is_array($attendee)) {
  	$i=0;
! 	$display .= $attendee_lang . ' - ';
  	foreach ($attendee as $val) {	
  		$attendees .= $attendee[$i]["name"] . ', ';
--- 44,51 ----
  	$organizer = substr($organizers,0,-2);
  }
! $attendees = '';
! if (isset($attendee) && is_array($attendee)) {
  	$i=0;
! 	$display .= $lang['l_attendee'] . ' - ';
  	foreach ($attendee as $val) {	
  		$attendees .= $attendee[$i]["name"] . ', ';
***************
*** 52,56 ****
  }
  
! if ($event['location']) {
  	if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>';
  }else{
--- 55,59 ----
  }
  
! if (isset($event['location'])) {
  	if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>';
  }else{
***************
*** 58,62 ****
  }
  
! if (!$event['location'] && $event['url']) {
  	$event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
  	$lang['l_location'] = 'URL';
--- 61,65 ----
  }
  
! if (!isset($event['location']) && isset($event['url'])) {
  	$event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
  	$lang['l_location'] = 'URL';
***************
*** 80,87 ****
  }
  
! $page = new Page(BASE.'templates/'.$template.'/event.tpl');
  
  $page->replace_tags(array(
! 	'charset'			=> $charset,
  	'cal' 				=> $event['calname'],
  	'event_text' 		=> $event['event_text'],
--- 83,90 ----
  }
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/event.tpl');
  
  $page->replace_tags(array(
! 	'charset'			=> $phpiCal_config->charset,
  	'cal' 				=> $event['calname'],
  	'event_text' 		=> $event['event_text'],
***************
*** 93,97 ****
  	'location' 			=> stripslashes($event['location']),
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
! 	'template'			=> $template,
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],
--- 96,100 ----
  	'location' 			=> stripslashes($event['location']),
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
! 	'template'			=> $phpiCal_config->template,
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],

Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** todo.php	19 May 2007 16:18:13 -0000	1.19
--- todo.php	20 Dec 2008 03:22:54 -0000	1.20
***************
*** 5,9 ****
  include_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/template.php');
! 
  $vtodo_array = unserialize(urldecode(base64_decode($_REQUEST['todo_data'])));
  
--- 5,9 ----
  include_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/template.php');
! $current_view = 'todo';
  $vtodo_array = unserialize(urldecode(base64_decode($_REQUEST['todo_data'])));
  
***************
*** 26,32 ****
  	$status = $lang['l_completed_date'] . ' ' . $completed_date;
  } elseif ($status == "COMPLETED") {
! 	$status = $completed_lang;
  } else {
! 	$status = $unfinished_lang;
  }
  
--- 26,32 ----
  	$status = $lang['l_completed_date'] . ' ' . $completed_date;
  } elseif ($status == "COMPLETED") {
! 	$status = $lang['l_completed'];
  } else {
! 	$status = $lang['l_unfinished'];
  }
  
***************
*** 44,48 ****
  
  $page->replace_tags(array(
! 	'charset'			=> $charset,
  	'cal' 				=> $cal_title_full,
  	'vtodo_text' 		=> $vtodo_text,
--- 44,48 ----
  
  $page->replace_tags(array(
! 	'charset'			=> $phpiCal_config->charset,
  	'cal' 				=> $cal_title_full,
  	'vtodo_text' 		=> $vtodo_text,
***************
*** 53,57 ****
  	'due_date' 			=> $due_date,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $template,
  	'l_created'			=> $lang['l_created'],
  	'l_priority'		=> $lang['l_priority'],
--- 53,57 ----
  	'due_date' 			=> $due_date,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $phpiCal_config->template,
  	'l_created'			=> $lang['l_created'],
  	'l_priority'		=> $lang['l_priority'],