Fixed: All day text in all views, all-popups.

5 files changed, 10 insertions, 9 deletions

diff --git a/day.php b/day.php
index ed445a9..6a78f21 100644
--- a/day.php
+++ b/day.php
@@ -107,8 +107,6 @@ if (is_array($master_array[($getdate)])) {
 							$all_day_text = $allday['event_text'];
 							$description = $allday['description'];
 							$event_text2 = urlencode(addslashes($all_day_text));
-							$event_start = 'All';
-							$event_end = 'Day';
 					
 							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>'.$all_day_text.'</i></font></a></td>'."\n";
diff --git a/event.php b/event.php
index 70382f0..bd5d648 100644
--- a/event.php
+++ b/event.php
@@ -65,7 +65,7 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2);
 	   		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<?php 
 				if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>'; 
-				if ($start != '' && $end == '' && isset($start, $end)) $event_times = ' - <font class="V9">(<i>'.$start.'</i>)</font>';
+				if ($start == '' && $end == '' && isset($start, $end)) $event_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>';
 				?>
 				<tr>
 					 <td width="1%"><img src="images/spacer.gif" width="6" height="1"></td>
diff --git a/month.php b/month.php
index b338903..5f5eb77 100644
--- a/month.php
+++ b/month.php
@@ -153,7 +153,7 @@
 											echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
 											echo "<tr>\n";
 											if (!isset($val["event_start"])) {
-												$event_start = $all_day_lang;
+												$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";
 											} else {	
diff --git a/month_bottom.php b/month_bottom.php
index 80218a7..e80eb73 100644
--- a/month_bottom.php
+++ b/month_bottom.php
@@ -355,16 +355,21 @@
 													$event_end 		= $new_val2["event_end"];
 													$event_start 	= date ($timeFormat, strtotime ("$event_start"));
 													$event_end 		= date ($timeFormat, strtotime ("$event_end"));
-													$event_text = str_replace ("<br>", "", $event_text);
+													$event_text 	= str_replace ("<br>", "", $event_text);
+													$event_start2	= $event_start;
 													if (strlen($event_text) > 70) {
 														$event_text = substr("$event_text", 0, 65);
 														$event_text = $event_text . "...";
 													}
-													if (!$new_val2["event_start"]) $event_start = "$all_day_lang";
+													if (!$new_val2["event_start"]) { 
+														$event_start = "$all_day_lang";
+														$event_start2 = '';
+														$event_end = '';
+													}
 													echo "<tr>\n";
 													echo "<td width =\"160\" class=\"montheventline\" nowrap><font $fontclass>&nbsp;<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n";
 													echo "<td colspan=\"2\">\n";
-													echo "&nbsp;<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$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')\"><font class=\"G10B\">$event_text</font></a>\n";
 													echo "</td>\n";
 													echo "</tr>\n";
 												}
diff --git a/week.php b/week.php
index 873128f..410ea26 100644
--- a/week.php
+++ b/week.php
@@ -179,8 +179,6 @@ for ($i=0;$i<7;$i++) {
 											$all_day_text = $allday["event_text"];
 											$event_text2 = urlencode(addslashes($all_day_text));
 											$description = $allday["description"];
-											$event_start = 'All';
-											$event_end = 'Day';
 											echo "<tr>\n";
 											echo "<td colspan=\"" . $nbrGridCols[$thisday] . "\" 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 "</tr>\n";