[PHPiCalendar-Commits] phpicalendar/functions date_functions.php,1.34,1.35 event.js,1.15,1.16

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18894/phpicalendar/functions

Modified Files:
	date_functions.php event.js 
Log Message:
changes to event popup so that reparsing not needed

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** date_functions.php	19 Mar 2006 08:17:18 -0000	1.34
--- date_functions.php	5 Apr 2006 04:43:59 -0000	1.35
***************
*** 159,163 ****
  
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 	global $cpath;
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	if (empty($start)) {
--- 159,163 ----
  
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 	global $cpath, $master_array;
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	if (empty($start)) {
***************
*** 184,192 ****
  			$escaped_time = addslashes($time);
  			$escaped_uid = addslashes($uid);
  			// fix for URL-length bug in IE: populate and submit a hidden form on click
  			static $popup_data_index = 0;
  $return = "
      <script language=\"Javascript\" type=\"text/javascript\"><!--
!     var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath');
      document.popup_data[$popup_data_index] = eventData;
      // --></script>";
--- 184,193 ----
  			$escaped_time = addslashes($time);
  			$escaped_uid = addslashes($uid);
+ 			$event_data = addslashes(serialize ($master_array[$event_date][$time][$uid]));
  			// fix for URL-length bug in IE: populate and submit a hidden form on click
  			static $popup_data_index = 0;
  $return = "
      <script language=\"Javascript\" type=\"text/javascript\"><!--
!     var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath','$event_data');
      document.popup_data[$popup_data_index] = eventData;
      // --></script>";

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** event.js	7 Sep 2005 06:08:02 -0000	1.15
--- event.js	5 Apr 2006 04:43:59 -0000	1.16
***************
*** 9,12 ****
--- 9,13 ----
  	form.elements.uid.value = data.uid;
  	form.elements.cpath.value = data.cpath;
+ 	form.elements.event_data.value = data.event_data;
  	
  	// open a new window
***************
*** 16,24 ****
  }
  
! function EventData(date, time, uid, cpath) {
  	this.date = date;
  	this.time = time;
  	this.uid = uid;
  	this.cpath = cpath;
  }
  
--- 17,26 ----
  }
  
! function EventData(date, time, uid, cpath, event_data) {
  	this.date = date;
  	this.time = time;
  	this.uid = uid;
  	this.cpath = cpath;
+ 	this.event_data = event_data;
  }