From e3ce63d1406a343d7295995d3f2fbfad9e12b608 Mon Sep 17 00:00:00 2001
From: Jim Hu <jimhu@users.sourceforge.net>
Date: Wed, 5 Apr 2006 04:43:59 +0000
Subject: changes to event popup so that reparsing not needed

---
 functions/date_functions.php | 5 +++--
 functions/event.js           | 4 +++-
 includes/event.php           | 5 +++--
 languages/french.inc.php     | 2 +-
 templates/default/footer.tpl | 2 +-
 templates/default/header.tpl | 1 +
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/functions/date_functions.php b/functions/date_functions.php
index 3e5e4b8..c6901d0 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -158,7 +158,7 @@ function chooseOffset($time) {
 }
 
 function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
-	global $cpath;
+	global $cpath, $master_array;
 	$event_text = stripslashes(urldecode($arr["event_text"]));
 	if (empty($start)) {
 		$title = $event_text;
@@ -183,11 +183,12 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 			$escaped_date = addslashes($event_date);
 			$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');
+    var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath','$event_data');
     document.popup_data[$popup_data_index] = eventData;
     // --></script>";
 
diff --git a/functions/event.js b/functions/event.js
index 0072bd3..6895626 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -8,6 +8,7 @@ function openEventWindow(num) {
 	form.elements.time.value = data.time;
 	form.elements.uid.value = data.uid;
 	form.elements.cpath.value = data.cpath;
+	form.elements.event_data.value = data.event_data;
 	
 	// open a new window
 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
@@ -15,11 +16,12 @@ function openEventWindow(num) {
 	form.submit();
 }
 
-function EventData(date, time, uid, cpath) {
+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;
 }
 
 function openTodoInfo(vtodo_array) {	
diff --git a/includes/event.php b/includes/event.php
index df47bf7..af00fcc 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -2,7 +2,7 @@
 define('BASE', '../');
 $getdate = $_POST['date'];
 include_once(BASE.'functions/init.inc.php'); 
-include_once(BASE.'functions/ical_parser.php'); 
+#include_once(BASE.'functions/ical_parser.php'); 
 require_once(BASE.'functions/template.php');
 
 function decode_popup ($item) {
@@ -13,7 +13,8 @@ function decode_popup ($item) {
 
 
 
-$event 			= $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])];
+#$event 			= $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])];
+$event 			= unserialize(stripslashes($_POST['event_data']));
 $organizer 		= unserialize($event['organizer']);
 $attendee 		= unserialize($event['attendee']);
 
diff --git a/languages/french.inc.php b/languages/french.inc.php
index 7a572ce..9558eab 100644
--- a/languages/french.inc.php
+++ b/languages/french.inc.php
@@ -44,7 +44,7 @@ $lang['l_gomonth'] 			= 'Voir ce mois';
 $lang['l_goyear'] 			= 'Voir cette ann&eacute;e';
 $lang['l_search'] 			= 'Rechercher'; // the verb
 $lang['l_results'] 			= 'R&eacute;sultats de la recherche';
-$lang['l_pick_multiple'] 	= 'Pick multiple';
+$lang['l_pick_multiple'] 	= 'Choix multiple';
 $lang['l_query'] 			= 'Requ&egrave;te'; // will be followed by the search query
 $lang['l_no_results'] 		= 'Aucun &eacute;v&eacute;nement trouv&eacute;';
 $lang['l_goprint'] 			= 'Version imprimable';
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 5d450c9..0ed0958 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -1,4 +1,4 @@
-<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.22rc1</a><br />
+<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.22rc3</a><br />
 <!-- switch rss_valid on -->
 <p>
 <a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">
diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index 0a2832a..07837a9 100644
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -16,4 +16,5 @@
   <input type="hidden" name="time" id="time" value="" />
   <input type="hidden" name="uid" id="uid" value="" />
   <input type="hidden" name="cpath" id="cpath" value="" />
+  <input type="hidden" name="event_data" id="event_data" value="" />
 </form>
-- 
cgit v1.2.3