[PHPiCalendar-Commits] phpicalendar/includes event.php,1.43,1.44

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

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

Modified Files:
	event.php 
Log Message:
modify event.php

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** event.php	20 Dec 2008 03:22:54 -0000	1.43
--- event.php	20 Dec 2008 09:35:44 -0000	1.44
***************
*** 2,20 ****
  $current_view = "event";
  define('BASE', '../');
- #$getdate = $_POST['date'];
  include_once(BASE.'functions/init.inc.php'); 
- #include_once(BASE.'functions/ical_parser.php'); 
  require_once(BASE.'functions/template.php');
  
! function decode_popup ($item) {
! 	$item = stripslashes(rawurldecode($item));
! 	$item = str_replace('\\','',$item);
! 	return $item;
! }
! 
! 
! 
! #$event 			= $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])];
! $event			= unserialize(stripslashes($_REQUEST['event_data']));
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
--- 2,12 ----
  $current_view = "event";
  define('BASE', '../');
  include_once(BASE.'functions/init.inc.php'); 
  require_once(BASE.'functions/template.php');
  
! # information for the popup is sent via $_POST by a javascript snippet in 
! # in function openevent() from functions/date_functions.php
! # character encoding has been problematic with popups.
! $event			= unserialize($_POST['event_data']);
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
***************
*** 28,56 ****
  }
  
! $event['description'] 	= stripslashes(utf8_decode(urldecode($event['description'])));
! $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"] . ', ';
  		$i++;
  	}
! 	$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"] . ', ';
  		$i++;
  	}
! 	$attendee = substr($attendees,0,-2);
  }
  
--- 20,46 ----
  }
  
! $event['event_text'] = stripslashes(urldecode($event['event_text']));
! $event['description'] 	= stripslashes(urldecode($event['description']));
! $event['location'] = stripslashes(urldecode($event['location']));
  $display ='';
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
  if (isset($organizer) && is_array($organizer)) {
  	$i=0;
  	$display .= $lang['l_organizer'] . ' - ';
  	foreach ($organizer as $val) {	
! 		$organizers[] = $organizer[$i]["name"];
  		$i++;
  	}
! 	$organizer = implode(', ',$organizers);
  }
  if (isset($attendee) && is_array($attendee)) {
  	$i=0;
  	$display .= $lang['l_attendee'] . ' - ';
  	foreach ($attendee as $val) {	
! 		$attendees[] .= $attendee[$i]["name"];
  		$i++;
  	}
! 	$attendee = implode(', ',$attendees);
  }
  
***************
*** 97,100 ****
--- 87,92 ----
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
  	'template'			=> $phpiCal_config->template,
+ 	'l_summary' 		=> $lang['l_summary'],
+ 	'l_description'		=> $lang['l_description'],
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],