[PHPiCalendar-Commits] phpicalendar/functions date_functions.php,1.27,1.28 event.js,1.14,1.15

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

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

Modified Files:
	date_functions.php event.js 
Log Message:
adjust date_functions.php, event.js, header.tpl to allow event popups to work with cpath multiple calendar directories

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** date_functions.php	16 May 2005 19:14:59 -0000	1.27
--- date_functions.php	7 Sep 2005 06:08:02 -0000	1.28
***************
*** 164,168 ****
  
  function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	if (empty($start)) {
--- 164,168 ----
  
  function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 	global $cpath;
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	if (empty($start)) {
***************
*** 194,198 ****
  $return = "
      <script language=\"Javascript\" type=\"text/javascript\"><!--
!     var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid');
      document.popup_data[$popup_data_index] = eventData;
      // --></script>";
--- 194,198 ----
  $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>";

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** event.js	16 May 2005 19:15:00 -0000	1.14
--- event.js	7 Sep 2005 06:08:02 -0000	1.15
***************
*** 8,11 ****
--- 8,12 ----
  	form.elements.time.value = data.time;
  	form.elements.uid.value = data.uid;
+ 	form.elements.cpath.value = data.cpath;
  	
  	// open a new window
***************
*** 15,22 ****
  }
  
! function EventData(date, time, uid) {
  	this.date = date;
  	this.time = time;
  	this.uid = uid;
  }
  
--- 16,24 ----
  }
  
! function EventData(date, time, uid, cpath) {
  	this.date = date;
  	this.time = time;
  	this.uid = uid;
+ 	this.cpath = cpath;
  }