Support for displaying event STATUS in the java pop-up.

5 files changed, 32 insertions, 12 deletions

diff --git a/day.php b/day.php
index b4ba33b..a34faff 100644
--- a/day.php
+++ b/day.php
@@ -106,13 +106,14 @@ if (is_array($master_array[($getdate)])) {
 						echo '<td colspan="3" height="24">'."\n";
 						echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n";
 						foreach($master_array[($getdate)]['-1'] as $allday) {
-							$event_text = stripslashes(urldecode($allday['event_text']));
-							$description = addslashes(urlencode($allday['description']));
-							$event_text2 = rawurlencode(addslashes($allday['event_text']));
+							$event_text 	= stripslashes(urldecode($allday['event_text']));
+							$description 	= addslashes(urlencode($allday['description']));
+							$event_text2 	= rawurlencode(addslashes($allday['event_text']));
+							$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.'\')"><font color="#ffffff"><i>'.$event_text.'</i></font></a></td>'."\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"><i>'.$event_text.'</i></font></a></td>'."\n";
 							echo '</tr>'."\n";
 						}
 						echo '</table>'."\n";
@@ -246,6 +247,7 @@ if (is_array($master_array[($getdate)])) {
 													$event_start 	= date ($timeFormat, $event_start);
 													$event_end 		= date ($timeFormat, $event_end);
 													$calendar_name2	= rawurlencode(addslashes($calendar_name));
+													$status			= $this_time_arr[($event_length[$i]['key'])]['status'];
 													echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2">'."\n";
 													echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n";
 													echo '<tr>'."\n";
@@ -255,7 +257,7 @@ if (is_array($master_array[($getdate)])) {
 													echo '<td>'."\n";
 													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.'\')"><font class="eventfont">'.$event_text.'</font></a></td>'."\n";
+													echo '<td class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name2.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\', \''.$status.'\')"><font class="eventfont">'.$event_text.'</font></a></td>'."\n";
 													echo '</tr>'."\n";
 													echo '</table>'."\n";
 													echo '</td>'."\n";           
diff --git a/functions/event.js b/functions/event.js
index 0f3bcad..8b0ebb2 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -4,7 +4,7 @@
 ?>
 <script language="JavaScript" type="text/javascript">
 <!--
-	function openEventInfo(event, calendarname, start, end, description)
+	function openEventInfo(event, calendarname, start, end, description, status)
 	{	
 		var windowW = 460;
 		var windowH = 275;
@@ -13,7 +13,8 @@
 			"&cal="+calendarname+
 			"&start="+start+
 			"&end="+end+
-			"&description="+description;
+			"&description="+description+
+			"&status="+status;
 				
 		options = "scrollbars=yes,width="+windowW+",height="+windowH;
 	
diff --git a/includes/event.php b/includes/event.php
index 7a685fa..bccce01 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -28,6 +28,11 @@ if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
 } else {
 	$end = '';
 }
+if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
+	$status = $HTTP_GET_VARS['status'];
+} else {
+	$status = '';
+}
 
 $event = rawurldecode($event);
 $event = stripslashes($event);
@@ -80,6 +85,14 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2);
 							'<a target="_new" href="\0">\0</a>', $description); ?></td>
 					</tr>
 				<?php } ?>
+				
+				<?php if ($status) { ?>    
+					<tr>
+					 <td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>
+					 <td align="left" colspan="2" class="V12">
+					 <?php echo "$status"; ?></td>
+					</tr>
+				<?php } ?>
 	
 	   </table>
    </td>
diff --git a/month.php b/month.php
index 67b600e..f06ca77 100644
--- a/month.php
+++ b/month.php
@@ -172,6 +172,7 @@ $num_of_events = 0;
 											$calendar_name2	= addslashes($calendar_name);
 											$calendar_name2 = urlencode($calendar_name2);
 											$event_text		= word_wrap($event_text, 12, $month_event_lines);
+											$status 		= $val["status"];
 											echo "<tr>\n";
 											echo "<td>\n";
 											echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
@@ -179,9 +180,9 @@ $num_of_events = 0;
 											if (!isset($val["event_start"])) {
 												$event_start = '';
 												$event_end = '';
-												echo "<td><font class=\"V10\"><center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a></center></font></td>\n";
+												echo "<td><font class=\"V10\"><center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><i>$event_text</i></a></center></font></td>\n";
 											} else {	
-												echo "<td align=\"left\" valign=\"top\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"V9\">&nbsp;$event_start2 $event_text</font></a></td>\n";
+												echo "<td align=\"left\" valign=\"top\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V9\">&nbsp;$event_start2 $event_text</font></a></td>\n";
 											}
 											echo "</tr>\n";
 											echo "</table>\n";
@@ -261,6 +262,7 @@ $num_of_events = 0;
 									$event_text2 	= urlencode($event_text2);
 									$description 	= addslashes(urlencode($new_val2["description"]));
 									$description 	= str_replace("\"", "&quot;", $description);
+									$status			= $new_val2["status"];
 									if (isset($new_val2["event_start"])) {
 										$event_start 	= $new_val2["event_start"];
 										$event_end 		= $new_val2["event_end"];
@@ -280,7 +282,7 @@ $num_of_events = 0;
 									echo "<tr>\n";
 									echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass>&nbsp;<a class=\"psf\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n";
 									echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n";
-									echo "&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description')\"><font class=\"G10B\">$event_text</font></a>\n";
+									echo "&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n";
 									echo "</td>\n";
 									echo "</tr>\n";
 								}
diff --git a/week.php b/week.php
index cdebc64..7185e1c 100644
--- a/week.php
+++ b/week.php
@@ -182,10 +182,11 @@ for ($i=0;$i<7;$i++) {
 														$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')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\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";
@@ -303,6 +304,7 @@ for ($i=0;$i<7;$i++) {
 																	$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";
 																	echo "<tr>\n";
@@ -312,7 +314,7 @@ for ($i=0;$i<7;$i++) {
 																	echo "<td>\n";
 																	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')\"><font class=\"V10W\">$event_text</font></a></td>\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";