[PHPiCalendar-Commits] phpicalendar/functions date_functions.php,1.17,1.18 event.js,1.11,1.12

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

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

Modified Files:
	date_functions.php event.js 
Log Message:
Added URL support to popup, re-wrote event.php for less code.



Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** date_functions.php	19 Nov 2003 07:54:09 -0000	1.17
--- date_functions.php	20 Nov 2003 05:18:38 -0000	1.18
***************
*** 161,165 ****
  }
  
! function openevent($calendar_name, $start, $end, $arr, $lines, $wrap, $pre_text, $post_text, $link_class) { 
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	# for iCal pseudo tag <http> comptability
--- 161,165 ----
  }
  
! function openevent($calendar_name, $start, $end, $arr, $lines, $wrap, $pre_text, $post_text, $link_class, $url) { 
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	# for iCal pseudo tag <http> comptability
***************
*** 191,194 ****
--- 191,198 ----
  		$description  = addslashes(stripslashes(urldecode($arr["description"])));
      }
+     
+     if (isset($arr["url"])) {
+ 		$url  = addslashes(stripslashes(urldecode($arr["url"])));
+     }
  
  	if (!empty($event_text)) {	
***************
*** 207,211 ****
  
      <script language="Javascript" type="text/javascript"><!--
!     var eventData = new EventData('$escaped_event', '$escaped_calendar', '$escaped_start', '$escaped_end', '$description', '$status', '$location', '$organizer', '$attendee');
      document.popup_data[$popup_data_index] = eventData;
      // --></script>
--- 211,215 ----
  
      <script language="Javascript" type="text/javascript"><!--
!     var eventData = new EventData('$escaped_event', '$escaped_calendar', '$escaped_start', '$escaped_end', '$description', '$status', '$location', '$organizer', '$attendee', '$url');
      document.popup_data[$popup_data_index] = eventData;
      // --></script>

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** event.js	19 Nov 2003 07:56:02 -0000	1.11
--- event.js	20 Nov 2003 05:18:38 -0000	1.12
***************
*** 14,17 ****
--- 14,18 ----
  	form.elements.organizer.value = data.organizer;
  	form.elements.attendee.value = data.attendee;    
+ 	form.elements.url.value = data.url;    
  	
  	// open a new window
***************
*** 21,25 ****
  }
  
! function EventData(event, cal, start, end, description, status, location, organizer, attendee) {
  	this.event = event;
  	this.cal = cal;
--- 22,26 ----
  }
  
! function EventData(event, cal, start, end, description, status, location, organizer, attendee, url) {
  	this.event = event;
  	this.cal = cal;
***************
*** 31,34 ****
--- 32,36 ----
  	this.organizer = organizer;
  	this.attendee = attendee;
+ 	this.url = url;
  }