[PHPiCalendar-Commits] phpicalendar/includes edit.php, 1.1.2.2, 1.1.2.3 event.php, 1.51.2.1, 1.51.2.2

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20875/includes

Modified Files:
      Tag: phpicalendar-editor
	edit.php event.php 
Log Message:
merge with HEAD

Index: edit.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/Attic/edit.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** edit.php	23 Feb 2009 21:28:57 -0000	1.1.2.2
--- edit.php	12 Apr 2010 18:58:37 -0000	1.1.2.3
***************
*** 17,20 ****
--- 17,32 ----
  
  
+ // Format event time
+ $start = date('Y-m-d H:i', $arr['start_unixtime']);
+ if ($arr['spans_day']) {
+     $allday = 1;
+     $end = '';
+ }
+ else {
+     $end = date('Y-m-d H:i', $arr['end_unixtime']);
+     $allday = 0;
+ }
+ 
+ 
  // Sanitize input fields
  $arr['event_text']  = sanitizeForWeb(urldecode($arr['event_text']));
***************
*** 78,81 ****
--- 90,96 ----
      'calnumber'         => $calnumber,
      'event_text'        => $arr['event_text'],
+     'event_start'       => $start,
+     'event_end'         => $end,
+     'allday'            => $allday,
      'description'       => $arr['description'],
      'location'          => $arr['location'],
***************
*** 88,91 ****
--- 103,108 ----
      'template'          => $phpiCal_config->template,
      'l_calendar'        => $lang['l_calendar'],
+     'l_event_start'     => $lang['l_event_start'],
+     'l_event_end'       => $lang['l_event_end'],
      'l_description'     => $lang['l_description'],
      'l_summary'         => $lang['l_summary'],

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -C2 -d -r1.51.2.1 -r1.51.2.2
*** event.php	23 Feb 2009 21:28:57 -0000	1.51.2.1
--- event.php	12 Apr 2010 18:58:37 -0000	1.51.2.2
***************
*** 31,43 ****
  $event['description'] = sanitizeForWeb(urldecode($event['description']));
  $event['location']    = sanitizeForWeb(urldecode($event['location']));
! $display ='';
! if (isset($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'] . ' - ';
  	$organizers = array();
! 	foreach ($organizer as $val) {	
! 		$organizers[] = $organizer[$i]["name"];
  		$i++;
  	}
--- 31,48 ----
  $event['description'] = sanitizeForWeb(urldecode($event['description']));
  $event['location']    = sanitizeForWeb(urldecode($event['location']));
! if (isset($event['description'])) {
! 	$event['description'] = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&amp;)+[[:alnum:]/])", '<a target="_new" href="\2">\2</a>', $event['description']);
! 	$event['description'] = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '<a href="mailto:\3">\3</a>', $event['description']);
! }
  
  if (isset($organizer) && is_array($organizer)) {
  	$i=0;
  	$organizers = array();
! 	foreach ($organizer as $val) {
! 		if (!empty($organizer[$i]["email"])) {
! 			$organizers[] .= "<a href=\"mailto:{$organizer[$i]["email"]}\">{$organizer[$i]["name"]}</a>";
! 		} else {
! 			$organizers[] .= $organizer[$i]["name"];
! 		}
  		$i++;
  	}
***************
*** 46,53 ****
  if (isset($attendee) && is_array($attendee)) {
  	$i=0;
- 	$display .= $lang['l_attendee'] . ' - ';
  	$attendees = array();
! 	foreach ($attendee as $val) {	
! 		$attendees[] .= $attendee[$i]["name"];
  		$i++;
  	}
--- 51,61 ----
  if (isset($attendee) && is_array($attendee)) {
  	$i=0;
  	$attendees = array();
! 	foreach ($attendee as $val) {
! 		if (!empty($attendee[$i]["email"])) {
! 			$attendees[] .= "<a href=\"mailto:{$attendee[$i]["email"]}\">{$attendee[$i]["name"]}</a>";
! 		} else {
! 			$attendees[] .= $attendee[$i]["name"];
! 		}
  		$i++;
  	}
***************
*** 109,113 ****
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> str_replace('\n',"<br />",$event['description']),
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,
--- 117,121 ----
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> $event['description'],
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,
***************
*** 116,120 ****
  	'event_download'	=> $event_download,
  	'url'      			=> $event['url'],
! 	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
  	'template'			=> $phpiCal_config->template,
  	'l_summary' 		=> $lang['l_summary'],
--- 124,128 ----
  	'event_download'	=> $event_download,
  	'url'      			=> $event['url'],
! 	'cal_title_full'	=> $event['calname'],
  	'template'			=> $phpiCal_config->template,
  	'l_summary' 		=> $lang['l_summary'],