[PHPiCalendar-Commits] phpicalendar README,1.45,1.46 week.php,1.88,1.89

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

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

Modified Files:
	README week.php 
Log Message:
Week.php now supports new javascript popup.



Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** README	9 May 2003 20:28:56 -0000	1.45
--- README	29 May 2003 05:07:53 -0000	1.46
***************
*** 79,83 ****
--- 79,85 ----
  	-Added support for LOCATION
  	-Added support for ATTENDEE
+ 	-Added support for ORGANIZER
  	-Added support for STATUS
+ 	-New javascript functions provide additional information.
  	-Added the ability to correct the servers time display
  	-Added admin.php for administration of calendars (uses cookies). See config.inc.php for configuration.

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** week.php	9 May 2003 20:28:56 -0000	1.88
--- week.php	29 May 2003 05:07:54 -0000	1.89
***************
*** 59,63 ****
  		} 
  	?>
- 	<?php include (BASE.'functions/event.js'); ?>
  	<?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?>
  </head>
--- 59,62 ----
***************
*** 178,199 ****
  												if (isset($master_array[($thisday)]["-1"])) {
  													echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n";
! 													foreach($master_array[($thisday)]["-1"] as $allday) {
! 														$all_day_text 	= stripslashes(urldecode($allday["event_text"]));
! 														$event_text2 	= urlencode(addslashes($all_day_text));
! 														$all_day_text 	= word_wrap($all_day_text, 12, $allday_week_lines);
! 														$description 	= addslashes(urlencode($allday["description"]));
! 														$status			= $allday["status"];
! 														$event_start 	= '';
! 														$event_end		= '';
  														echo "<tr>\n";
! 														echo "<td valign=\"top\" align=\"center\" class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description', '$status')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\n";
! 														echo "</tr>\n";
! 													}
! 													echo "</table>\n";
! 													}
  												echo "</td>\n";
  												$thisdate = ($thisdate + (25 * 60 * 60));
  												$i++;
! 											} while ($i < 7);
  											echo "</tr>\n";
  										}
--- 177,199 ----
  												if (isset($master_array[($thisday)]["-1"])) {
  													echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n";
! 												  	foreach($master_array[($thisday)]["-1"] as $allday) {
  														echo "<tr>\n";
! 														echo "<td valign=\"top\" align=\"center\" class=\"eventbg\">";
! 														openevent("$calendar_name",
! 														"",
! 													  	"",
! 													  	$allday,
! 													  	$allday_week_lines,
! 													  	12,
! 													  	'<font color="#ffffff">',
! 													  	"</font>");
! 														echo "</td></tr>\n";
! 												  	}
! 												  echo "</table>\n";
! 												}
  												echo "</td>\n";
  												$thisdate = ($thisdate + (25 * 60 * 60));
  												$i++;
! 											  } while ($i < 7);
  											echo "</tr>\n";
  										}
***************
*** 294,309 ****
  															switch ($event_length[$thisday][$i]["state"]) {
  																case "begin":
- 																
  																	$event_length[$thisday][$i]["state"] = "started";
- 																	$event_text 	= stripslashes(urldecode($this_time_arr[($event_length[$thisday][$i]["key"])]["event_text"]));
- 																	$event_text 	= word_wrap($event_text, 25, $week_events_lines);
- 																	$event_text2 	= urlencode(addslashes($this_time_arr[($event_length[$thisday][$i]["key"])]["event_text"]));
  																	$event_start 	= $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"];
- 																	$event_end		= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
- 																	$description 	= urlencode(addslashes($this_time_arr[($event_length[$thisday][$i]["key"])]["description"]));
  																	$event_start 	= date ($timeFormat, $event_start);
- 																	$event_end 		= date ($timeFormat, $event_end);
- 																	$calendar_name2	= urlencode(addslashes($calendar_name));
- 																	$status			= $this_time_arr[($event_length[$thisday][$i]["key"])]["status"];
  																	echo "<td rowspan=\"" . $event_length[$thisday][$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg2week\">\n";
  																	echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
--- 294,300 ----
***************
*** 315,320 ****
  																	echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
  																	echo "<tr>\n";
! 																	echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V10W\">$event_text</font></a></td>\n";
! 																	echo "</tr>\n";
  																	echo "</table>\n";
  																	echo "</td>\n";           
--- 306,321 ----
  																	echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
  																	echo "<tr>\n";
! 																	echo "<td class=\"eventbg\">";
! 																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
! 																	$event_end 		= date ($timeFormat, $event_end);
! 																	openevent("$calendar_name2",
! 																		  "$event_start",
! 																		  "$event_end",
! 																		  $this_time_arr[($event_length[$thisday][$i]["key"])],
! 																		  $week_events_lines,
! 																		  25,
! 																		  "<font class=\"V10W\">",
! 																		  "</font>");
! 																	echo "</td></tr>\n";
  																	echo "</table>\n";
  																	echo "</td>\n";