HTML/CSS template rewrites, nice-title integration, XSS fixes, version bump

Author: Jason Oster

README

@@ -88,14 +88,32 @@ COPYING for more information about our license.
 
 Changes:
 --------
-2.31 Fix events ending at midnight bug in day view
+2.4
+	Event information displayed with Nice Titles
+	More ICS input sanitizing
+	Better display of tabs/line breaks in calendar events
+	Many updates to included templates; HTML fixes, better CSS support
+	Webcal caching now works like local calendar caching (with save_parsed_cals enabled)
+	Updates to Czech and French translations
+	Fixes for attendee/organizer parsing and email address hyperlinking
+	Fixes for Print View
+	Fix setting time format in preferences page
+	Fix default calendar selections in listbox picker
+	Fix timezone DST calculation with all-day events
+	Fix dates before 1970
+	Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars (using wrong file name)
+	Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)
+
+2.31
+	Fix events ending at midnight bug in day view
 	Fix publish.php for 2.3 config system
 	add option to hide location in month view
 	add option to make individual events downloadable from event view
 	Fix calendar showing modified events twice
 	Make multiline descriptions display with line breaks in event popup
 	Fix German language file
-2.3 Major changes to recurrence handling
+2.3
+	Major changes to recurrence handling
 	Added more languages
 	Added login to month view
 	Consolidated common rss functions

default_config.php

@@ -2,8 +2,8 @@
 class Configs{
 	private static $instance;
 	private function __construct(){
-		$this->phpicalendar_version = '2.32alpha';
-	// Configuration file for PHP iCalendar 2.32
+		$this->phpicalendar_version = '2.4alpha';
+	// Configuration file for PHP iCalendar 2.4
 	//
 	// To set values, change the text between the single quotes
 	// Follow instructions to the right for detailed information

functions/calendar_functions.php

@@ -264,7 +264,6 @@ function display_ical_list($cals, $pick=FALSE) {
 				$return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n";
 			}
 		} else {
-			$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
 			if ($cal_encoded_tmp == $cal || $cal_encoded_tmp == urldecode($cal)) {
 				$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>";
 			} else {

functions/date_functions.php

@@ -234,6 +234,8 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 		$full_event_text = $event_text;
 		$event_text      = strip_tags($event_text, '<b><i><u><img>');
 	}
+	
+	if (!empty($link_class)) $link_class = ' class="'.$link_class.'"';
 
 	if (!empty($event_text)) {
 		$title = strip_tags(str_replace("<br />","\n",$title));
@@ -254,10 +256,10 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 				document.popup_data[$popup_data_index] = eventData;
 				// --></script>";
 
-			$return .= '<a class="'.$link_class.'" title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
+			$return .= '<a'.$link_class.' title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
 			$popup_data_index++;
 		} else {
-			$return .= '<a class="'.$link_class.'" title="'.$title.'" href="'.$res[1].'">';
+			$return .= '<a'.$link_class.' title="'.$title.'" href="'.$res[1].'">';
 		}
 		$return .= $pre_text.$event_text.$post_text.'</a>'."\n";
 	}

functions/event.js

@@ -11,7 +11,7 @@ function openEventWindow(num) {
 	form.elements.event_data.value = data.event_data;
 
 	// open a new window
-	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
+	var w = window.open('', 'Popup', 'scrollbars=yes,width=550,height=350');
 	form.target = 'Popup';
 	form.submit();
 }
@@ -36,7 +36,7 @@ function openTodoInfo(num) {
 	form.elements.todo_data.value = data.todo_data;
 
 	// open a new window
-	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
+	var w = window.open('', 'Popup', 'scrollbars=yes,width=550,height=350');
 	form.target = 'Popup';
 	form.submit();
 }

functions/template.php

@@ -253,7 +253,7 @@ function draw_search($template_p) {
 	}#end draw_search
 
 	function draw_week($template_p) {
-		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $timeFormat_small;
+		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat;
 
 		// Figure out colspans and initialize weekarray
 		$thisdate  	= $start_week_time;
@@ -306,6 +306,10 @@ function draw_week($template_p) {
 			while ($day < $phpiCal_config->week_length){
 				$colspan  = 0;
 				$replace  .= $loop_begin; # <td>
+
+				if ($weekarray[$day] == $getdate) $replace = str_replace('{TODAY}', "rowToday", $replace);
+				$replace 	= str_replace('{TODAY}', "rowOff", $replace);
+
 				if(array_search($weekarray[$day], $allday_uids)){ 
 					$uid = array_search($weekarray[$day], $allday_uids);
 					unset($allday_uids[$uid]);
@@ -464,9 +468,14 @@ function draw_week($template_p) {
 					} else {
 						$class = '';
 						$dayborder = 0;
-					}					
+					}
+					$tclass = $class;
+					if ($thisday == $getdate) {
+						if ($tclass) $tclass = ' class="weekborder weektoday"';
+						else $tclass = ' class="weektoday"';
+					}
 					$drawWidth = 1;
-					$weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '>&nbsp;</td>'."\n";					
+					$weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '"' . $tclass . '>&nbsp;</td>'."\n";
 				} else {
 					# have events
 					$emptyWidth = $nbrGridCols[$thisday];
@@ -478,13 +487,18 @@ function draw_week($template_p) {
 						switch ($el["state"]) {
 							case "begin":
 								if ($ended_counter) {
-									$weekdisplay .= '<td colspan="' . $ended_counter . '" '.$class.'>&nbsp;</td>';
+									$tclass = $class;
+									if ($thisday == $getdate) {
+										if ($tclass) $tclass = ' class="weekborder weektoday"';
+										else $tclass = ' class="weektoday"';
+									}
+									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
 									$ended_counter = 0;
 								}
 								$event_length[$thisday][$i]["state"] = "started";
  								$uid = $event_length[$thisday][$i]["key"];
  								$event_start 	= $this_time_arr[$uid]['start_unixtime'];
-								$event_start 	= date ($timeFormat_small, $event_start);
+								$event_start 	= date ($timeFormat, $event_start);
  								$event_calno  	= $this_time_arr[$uid]['calnumber'];
  								$event_status	= strtolower($this_time_arr[$uid]['status']);
  								$event_recur = $this_time_arr[$uid]['recur'];
@@ -510,7 +524,12 @@ function draw_week($template_p) {
 								break;
 							case "started":
 								if ($ended_counter) {
-									$weekdisplay .= '<td colspan="' . $ended_counter . '" '.$class.'>&nbsp;</td>';
+									$tclass = $class;
+									if ($thisday == $getdate) {
+										if ($tclass) $tclass = ' class="weekborder weektoday"';
+										else $tclass = ' class="weektoday"';
+									}
+									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
 									$ended_counter = 0;
 								}
 								break;
@@ -528,7 +547,12 @@ function draw_week($template_p) {
 					$emptyWidth += $ended_counter;
 					//fill empty space on the right
 					if ($emptyWidth > 0) {
-						$weekdisplay .= "<td colspan=\"" . $emptyWidth . "\" $class>&nbsp;</td>\n";
+						$tclass = $class;
+						if ($thisday == $getdate) {
+							if ($tclass) $tclass = ' class="weekborder weektoday"';
+							else $tclass = ' class="weektoday"';
+						}
+						$weekdisplay .= "<td colspan=\"" . $emptyWidth . "\"$tclass>&nbsp;</td>\n";
 					}
 					while (isset($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"]) && $event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") {
 						array_pop($event_length[$thisday]);
@@ -981,7 +1005,7 @@ function draw_month($template_p, $offset = '+0', $type) {
 								$start2		 = date($timeFormat_small, $val['start_unixtime']);
 								if ($type == 'large') {
 									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
- 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 10, 'ps3', "$start2 ").'';
+ 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 10, 'ps3', "<span style=\"font-weight: bold;\">$start2</span> ");
  									$switch['EVENT'] .= (isset($val['location']) && $val['location'] != '' && $phpiCal_config->month_locations == 'yes') ? "<br />".$val['location']."<br />" : '';
 									$switch['EVENT'] .= '</div>';
 								} else {
@@ -1033,7 +1057,7 @@ function nosearch() {
 	}
 
 	function monthbottom() {
-		global $phpiCal_config, $getdate, $master_array, $this_year, $this_month, $cal, $timeFormat, $timeFormat_small, $dateFormat_week_list, $lang;
+		global $phpiCal_config, $getdate, $master_array, $this_year, $this_month, $cal, $timeFormat, $dateFormat_week_list, $lang;
 		preg_match("!<\!-- loop showbottomevents_odd on -->(.*)<\!-- loop showbottomevents_odd off -->!Uis", $this->page, $match1);
 		preg_match("!<\!-- loop showbottomevents_even on -->(.*)<\!-- loop showbottomevents_even off -->!Uis", $this->page, $match2);
 

month.php

@@ -84,7 +84,9 @@
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
 	'show_search' 		=> $phpiCal_config->show_search,
+	'next_day' 			=> $tomorrows_date,
 	'next_month' 		=> $next_month,
+	'prev_day'	 		=> $yesterdays_date,
 	'prev_month'	 	=> $prev_month,
 	'show_goto' 		=> '',
 	'show_user_login'	=> $show_user_login,
@@ -110,6 +112,8 @@
 	'l_tomorrows'		=> $lang['l_tomorrows'],
 	'l_jump'			=> $lang['l_jump'],
 	'l_todo'			=> $lang['l_todo'],
+	'l_prev'			=> $lang['l_prev'],
+	'l_next'			=> $lang['l_next'],
 	'l_day'				=> $lang['l_day'],
 	'l_week'			=> $lang['l_week'],
 	'l_month'			=> $lang['l_month'],
@@ -148,10 +152,8 @@
 } else {
 	$page->nomonthbottom($page);
 }
-$page->draw_subscribe($page);
 
+$page->draw_subscribe($page);
 $page->output();
 
-
-
 ?>

nicetitle/nicetitle.css

@@ -0,0 +1,32 @@
+div.nicetitle {
+    position: absolute;
+    padding: 4px;
+    top: 0px;
+    left: 0px;
+    color: white;
+    font-size: 12px;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    width: 25em;
+    background: url(ntbg.png);
+
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    text-shadow: black 1px 1px 1px;
+}
+div.nicetitle p {
+    margin: 0;
+    padding: 0 3px;
+}
+div.nicetitle p.destination {
+    font-size: 9px;
+    text-align: left;
+    padding-top: 3px;
+}
+
+@media print {
+    div.nicetitle {
+        display: none;
+    }
+}