smtech / canvas-ics-sync

phpicalendar/functions/template.php

Spacing +209 added lines, -209 removed lines

@@ -24,8 +24,8 @@ 
 			$filelist = availableCalendars('', '', '', true);
 			foreach ($filelist as $file) {
 				if ($column > $COLUMNS_TO_PRINT) {
-					$delete_table 	.= '</tr>';
-					$column 	= 1;
+					$delete_table .= '</tr>';
+					$column = 1;
 				}
 				if ($column == 1) {
 					$delete_table .= '<tr>';
@@ -59,35 +59,35 @@ 
 		preg_match('!<\!-- loop events on -->(.*)<\!-- loop events off -->!Uis', $this->page, $match1);
 		preg_match('!<\!-- switch some_events on -->(.*)<\!-- loop events on -->!Uis', $this->page, $match3);
 		$loop_event		= trim($match1[1]);
-		$loop_day 		= trim($match3[1]);
-		$parse_month 	= date ('Ym', strtotime($getdate));
-		$parse_year 	= date ('Y', strtotime($getdate));
+		$loop_day = trim($match3[1]);
+		$parse_month = date('Ym', strtotime($getdate));
+		$parse_year 	= date('Y', strtotime($getdate));
 
 		$seen_events = array();
 		$final = '';
 		$events_week = 0;
-		foreach($master_array as $key => $val) {
-			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
-			if (((@$regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr(@$regs[1],0,4) == $parse_year) && ($printview == 'year'))) {
+		foreach ($master_array as $key => $val) {
+			preg_match('/([0-9]{6})([0-9]{2})/', $key, $regs);
+			if (((@$regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr(@$regs[1], 0, 4) == $parse_year) && ($printview == 'year'))) {
 				$events_week++;
-				$dayofmonth = strtotime ($key);
-				$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
+				$dayofmonth = strtotime($key);
+				$dayofmonth = localizeDate($dateFormat_day, $dayofmonth);
 				$events_tmp = $loop_event;
-				$day_tmp	= $loop_day;
+				$day_tmp = $loop_day;
 				$day_events = 0;
 				// Pull out each day
 				$some_events = '';
 				foreach ($val as $cal_time => $new_val) {
 					foreach ($new_val as $new_key2 => $new_val2) {
-						if (isset($seen_events[$new_key2]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1){
+						if (isset($seen_events[$new_key2]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1) {
 							$new_val2['event_text'] .= ' second instance of '.$new_key2;
 							continue;
 						}
 						$seen_events[$new_key2] = 1;
 						$day_events++;
 						if (isset($new_val2['event_text'])) {
-							$event_text 	= sanitizeForWeb(stripslashes(urldecode($new_val2['event_text'])));
-							$location 		= sanitizeForWeb(stripslashes(urldecode($new_val2['location'])));
+							$event_text = sanitizeForWeb(stripslashes(urldecode($new_val2['event_text'])));
+							$location = sanitizeForWeb(stripslashes(urldecode($new_val2['location'])));
 							$description 	= sanitizeForWeb(stripslashes(urldecode($new_val2['description'])));
 							if (!empty($description)) {
 								$description = ereg_replace('(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&amp;)+[[:alnum:]/])', '<a target="_new" href="\2">\2</a>', $description);
@@ -95,16 +95,16 @@ 
 							}
 
 							$event_start 	= $new_val2['event_start'];
-							$event_end 		= $new_val2['event_end'];
+							$event_end = $new_val2['event_end'];
 							if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
 							if ($cal_time == -1) {
 								$event_start = $lang['l_all_day'];
 								$event_start2 = '';
 								$event_end = '';
 							} else {
-								$event_start 	= date ($timeFormat, strtotime ($event_start));
-								$event_end 		= date ($timeFormat, strtotime ($event_end));
-								$event_start 	= $event_start .' - '.$event_end;
+								$event_start 	= date($timeFormat, strtotime($event_start));
+								$event_end = date($timeFormat, strtotime($event_end));
+								$event_start 	= $event_start.' - '.$event_end;
 								if (date('Ymd', $new_val2['start_unixtime']) != date('Ymd', $new_val2['end_unixtime'])) $event_start .= ' '.localizeDate($dateFormat_day, $new_val2['end_unixtime']);
 							}
 						}
@@ -149,34 +149,34 @@ 
 		$loop_event		= trim($match1[1]);
 		$loop_recur 	= trim($match2[1]);
 		$loop_except 	= trim($match3[1]);
-		$parse_month 	= date ('Ym', strtotime($getdate));
+		$parse_month 	= date('Ym', strtotime($getdate));
 
 		$events_found = 0;
 		$some_events = '';
 		$final = '';
-		if (isset($the_arr)){
+		if (isset($the_arr)) {
 			// Pull out each event
-			foreach($the_arr as $key => $val) {
+			foreach ($the_arr as $key => $val) {
 				$events_found++;
 				$dayofmonth = strtotime($val['date']);
-				$dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth);
+				$dayofmonth = localizeDate('%A, %B %e %Y', $dayofmonth);
 				$events_tmp = $loop_event;
-				$recur_tmp	= $loop_recur;
+				$recur_tmp = $loop_recur;
 				if ($val['event_text']) {
-					$event_text 	= sanitizeForWeb(stripslashes(urldecode($val['event_text'])));
+					$event_text = sanitizeForWeb(stripslashes(urldecode($val['event_text'])));
 					$description 	= sanitizeForWeb(stripslashes(urldecode($val['description'])));
-					$location 		= sanitizeForWeb(stripslashes(urldecode($val['location'])));
+					$location = sanitizeForWeb(stripslashes(urldecode($val['location'])));
 					$event_start 	= $val['event_start'];
-					$event_end 		= $val['event_end'];
+					$event_end = $val['event_end'];
 					if (isset($val['display_end'])) $event_end = $val['display_end'];
 					if (!$val['event_start']) {
 						$event_start = $lang['l_all_day'];
 						$event_start2 = '';
 						$event_end = '';
 					} else {
-							$event_start    = date ($timeFormat, strtotime ($event_start));
-							$event_end      = date ($timeFormat, strtotime ($event_end));
-							$event_start    = $event_start .' - '.$event_end;
+							$event_start    = date($timeFormat, strtotime($event_start));
+							$event_end      = date($timeFormat, strtotime($event_end));
+							$event_start    = $event_start.' - '.$event_end;
 					}
 				}
 
@@ -185,41 +185,41 @@ 
 				}
 					if (!isset($val['exceptions'])) {
 					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
-				}else{
+				} else {
 					$some_exceptions = '';
-					foreach ($val['exceptions'] as $except_val){
-						$except_tmp	= $loop_except;
+					foreach ($val['exceptions'] as $except_val) {
+						$except_tmp = $loop_except;
 
 						$except_date = strtotime($except_val['date']);
-						$except_date = localizeDate ('%A, %B %e %Y', $except_date);
+						$except_date = localizeDate('%A, %B %e %Y', $except_date);
 						$except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp);
 
-						$except_event_start    	= date ($timeFormat, strtotime ($except_val['event_start']));
-						$except_event_end    	= date ($timeFormat, strtotime ($except_val['event_end']));
-						$except_event_start    	= $except_event_start .' - '.$except_event_end;
+						$except_event_start    	= date($timeFormat, strtotime($except_val['event_start']));
+						$except_event_end = date($timeFormat, strtotime($except_val['event_end']));
+						$except_event_start    	= $except_event_start.' - '.$except_event_end;
 
 						$except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp);
 
-						$except_event_text 	= sanitizeForWeb(stripslashes(urldecode($except_val['event_text'])));
+						$except_event_text = sanitizeForWeb(stripslashes(urldecode($except_val['event_text'])));
 						$except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp);
 
 						#is there a recur in the exception?
 						if (!$except_val['recur']) {
 							$except_tmp = preg_replace('!<\!-- switch except_recur on -->.*<\!-- switch except_recur off -->!Uis', '', $except_tmp);
-						}else{
+						} else {
 							$except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp);
 						}
 						#is there a description in the exception?
 						if (!$except_val['description']) {
 							$except_tmp = preg_replace('!<\!-- switch except_description on -->.*<\!-- switch except_description off -->!Uis', '', $except_tmp);
-						}else{
+						} else {
 							$except_description = stripslashes(urldecode($except_val['description']));
 							$except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp);
 						}
 						$some_exceptions .= $except_tmp;
 
 					}
-					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp );
+					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', $some_exceptions, $events_tmp);
 
 
 				}
@@ -227,11 +227,11 @@ 
 				if (!$val['recur']) {
 					$events_tmp = preg_replace('!<\!-- switch recur on -->.*<\!-- switch recur off -->!Uis', '', $events_tmp);
 					$events_tmp = str_replace('{L_STARTING_ON}', '', $events_tmp);
-				}else{
+				} else {
 					$events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp);
 				}
 
-				$search		= array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}');
+				$search		= array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}', '{LOCATION}');
 				$replace	= array($event_start, $event_text, $description, $location);
 				$events_tmp = str_replace($search, $replace, $events_tmp);
 				$some_events .= $events_tmp;
@@ -240,7 +240,7 @@ 
 
 				$some_events  = str_replace('{KEY}', $val['date'], $some_events);
 				$some_events  = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events);
-				$final   .= $some_events;
+				$final .= $some_events;
 				$some_events = '';
 
 			}
@@ -259,24 +259,24 @@ 
 		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;
-		$swt	   	= $start_week_time;
-		for ($i=0;$i < $phpiCal_config->week_length;$i++) {
+		$thisdate = $start_week_time;
+		$swt = $start_week_time;
+		for ($i = 0; $i < $phpiCal_config->week_length; $i++) {
 			$thisday = date('Ymd', $thisdate);
 			$nbrGridCols[$thisday] = 1;
 			if (isset($master_array[$thisday])) {
-				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
+				foreach ($master_array[($thisday)] as $ovlKey => $ovlValue) {
 					# ovlKey is a time slot; $ovlValue is an array with key=uid
 					if ($ovlKey != '-1') {
-						foreach($ovlValue as $ovl2Value) {
+						foreach ($ovlValue as $ovl2Value) {
 							$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value['event_overlap'] + 1));
 						}
 					}
 				}
 			}
-			$weekarray[$i] 		= $thisday;
-			$event_length[$thisday] = array ();
-			$thisdate = ($thisdate + (25 * 60 * 60));
+			$weekarray[$i] = $thisday;
+			$event_length[$thisday] = array();
+			$thisdate = ($thisdate + (25*60*60));
 		}
 		#echo "<pre>";print_r($nbrGridCols);
 		// Replaces the allday events
@@ -285,58 +285,58 @@ 
 		preg_match('!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis', $this->page, $match1);
 		preg_match('!<\!-- loop alldaysofweek on -->(.*)<\!-- loop allday on -->!Uis', $this->page, $match2);
 		preg_match('!<\!-- loop allday off -->(.*)<\!-- loop alldaysofweek off -->!Uis', $this->page, $match3);
-		$loop_ad 	= trim($match1[1]); # one day cell
+		$loop_ad = trim($match1[1]); # one day cell
 		$loop_begin = trim($match2[1]); # <td>
-		$loop_end 	= trim($match3[1]); # </td>
+		$loop_end = trim($match3[1]); # </td>
 		preg_match('!<\!-- loop alldaysofweek off -->(.*)<\!-- loop allday row off -->!Uis', $this->page, $match3);
-		$loop_row_end 	= trim($match3[1]); # </tr>
+		$loop_row_end = trim($match3[1]); # </tr>
 		$allday_uids = array();
 		$allday_uid_dates = array();
 		$weekreplace = '';
-		foreach ($weekarray as $i=>$get_date){
-			if (isset($master_array[$get_date]['-1']) && is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1'])){
-				foreach ($master_array[$get_date]['-1'] as $uid => $allday){
+		foreach ($weekarray as $i=>$get_date) {
+			if (isset($master_array[$get_date]['-1']) && is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1'])) {
+				foreach ($master_array[$get_date]['-1'] as $uid => $allday) {
 					if (!array_key_exists($uid, $allday_uids)) $allday_uids[$uid] = $get_date;
 					$allday_uid_dates[$uid][] = $get_date;
 				}
 			}
 		}
 		# new allday routine is better for multiday events
-		while(!empty($allday_uids)){
+		while (!empty($allday_uids)) {
 			$row = $loop_row_begin;
 			$day = 0;
 			$replace = '';
-			while ($day < $phpiCal_config->week_length){
-				$colspan  = 0;
-				$replace  .= $loop_begin; # <td>
+			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);
+				$replace = str_replace('{TODAY}', 'rowOff', $replace);
 
-				if(array_search($weekarray[$day], $allday_uids)){
+				if (array_search($weekarray[$day], $allday_uids)) {
 					$uid = array_search($weekarray[$day], $allday_uids);
 					unset($allday_uids[$uid]);
 					$allday = $master_array[$weekarray[$day]]['-1'][$uid];
-					foreach ($allday_uid_dates[$uid] as $date){
+					foreach ($allday_uid_dates[$uid] as $date) {
 						$colspan += $nbrGridCols[$weekarray[$day]];
 						$day++;
 					}
-					$event_calno  	= $allday['calnumber'];
-					$event_calno	= (($event_calno - 1) % $phpiCal_config->unique_colors) + 1;
- 					$event 			= openevent($get_date, -1, $uid, $allday, $phpiCal_config->allday_week_lines, (8*$colspan), 'psf');
+					$event_calno = $allday['calnumber'];
+					$event_calno = (($event_calno - 1)%$phpiCal_config->unique_colors) + 1;
+ 					$event = openevent($get_date, -1, $uid, $allday, $phpiCal_config->allday_week_lines, (8*$colspan), 'psf');
 					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
 					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
-					$replace		= str_replace('{NOBORDER}', ' style="border-top: none;"', $replace);
+					$replace = str_replace('{NOBORDER}', ' style="border-top: none;"', $replace);
 					$replace		.= $loop_tmp;
 					$replace		.= $loop_end;
-				}else{
+				} else {
 					$replace		= str_replace('{NOBORDER}', '', $replace);
 					$colspan		= $nbrGridCols[$weekarray[$day]];
-					$replace		.= $loop_end;
+					$replace .= $loop_end;
 					$day++;
 				}
 				unset ($ev);
-				$replace 	= str_replace('{COLSPAN}', 'colspan="'.$colspan.'"', $replace);
+				$replace = str_replace('{COLSPAN}', 'colspan="'.$colspan.'"', $replace);
 			}
 			$row .= $replace.' '.$loop_row_end."\n";
 			$weekreplace .= $row."\n";
@@ -346,26 +346,26 @@ 
 		// Replaces the daysofweek
 		preg_match('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!Uis', $this->page, $match1);
 		$loop_dof = trim($match1[1]);
-		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+		$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
 		$weekday_loop = '';
-		for ($i=0; $i<$phpiCal_config->week_length; $i++) {
+		for ($i = 0; $i < $phpiCal_config->week_length; $i++) {
 			$daylink = date('Ymd', $start_wt);
 			$weekday = localizeDate($dateFormat_week_list, strtotime($daylink));
 			if ($daylink == $getdate) {
 				$row1 = 'rowToday';
 				$row2 = 'rowOn';
 				$row3 = 'rowToday';
-			}else{
+			} else {
 				$row1 = 'rowOff';
 				$row2 = 'rowOn';
 				$row3 = 'rowOff';
 			}
-			$start_wt 		= strtotime('+1 day', $start_wt);
+			$start_wt = strtotime('+1 day', $start_wt);
 			$colspan		= 'colspan="'.$nbrGridCols[$daylink].'"';
 			$search			= array('{DAY}', '{DAYLINK}', '{ROW1}', '{ROW2}', '{ROW3}', '{COLSPAN}');
 			$replace		= array($weekday, $daylink, $row1, $row2, $row3, $colspan);
-			$loop_tmp 		= str_replace($search, $replace, $loop_dof);
-			$weekday_loop  .= $loop_tmp;
+			$loop_tmp = str_replace($search, $replace, $loop_dof);
+			$weekday_loop .= $loop_tmp;
 		}
 		$this->page = preg_replace('!<\!-- loop daysofweek on -->.*<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
 
@@ -375,9 +375,9 @@ 
 		$loop_hours = trim($match2[1]);
 		$loop_event = trim($match3[1]);
 
-		$event_length = array ();
+		$event_length = array();
 		$border = 0;
-		preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
+		preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
 		$this_day = $day_array2[3];
 		$this_month = $day_array2[2];
 		$this_year = $day_array2[1];
@@ -389,26 +389,26 @@ 
 		foreach ($day_array as $key) {
 			$cal_time = $key;
 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
-			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
-			$key = date ($timeFormat, $key);
+			$key = mktime($regs_tmp[1], $regs_tmp[2], 0, $this_month, $this_day, $this_year);
+			$key = date($timeFormat, $key);
 
 			if (ereg('([0-9]{1,2}):00', $key)) {
 				$even_row = '2';
 				# column of times colspan = 4 to cover navigation links at top
 				$weekdisplay .= '<tr>';
-				$weekdisplay .= '<td colspan="4" rowspan="' . (60 / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder2">'.$key.'</td>';
-				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
+				$weekdisplay .= '<td colspan="4" rowspan="'.(60/$phpiCal_config->gridLength).'" align="center" valign="top" width="60" class="timeborder2">'.$key.'</td>';
+				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>';
 			} elseif ($cal_time == $phpiCal_config->day_start) {
-				$size_tmp = 60 - (int)substr($cal_time,2,2);
+				$size_tmp = 60 - (int)substr($cal_time, 2, 2);
 				$weekdisplay .= '<tr>';
-				$weekdisplay .= '<td colspan="4" rowspan="' . ($size_tmp / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder2">'.$key.' </td>';
-				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
+				$weekdisplay .= '<td colspan="4" rowspan="'.($size_tmp/$phpiCal_config->gridLength).'" align="center" valign="top" width="60" class="timeborder2">'.$key.' </td>';
+				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>';
 			} else {
 				$even_row = '';
 				if (ereg('([0-9]{1,2}):30', $key)) $even_row = '3';
 				# empty row for each gridLength, to the right of times and left of first weekday
 				$weekdisplay .= '<tr>';
-				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
+				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>';
 			}
 
 			/* 	add columns in the $cal_time grid slot for each day
@@ -417,9 +417,9 @@ 
 				$this_time_arr = array();
 				if ($phpiCal_config->day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
 					# want to pile up all the events before day_start that end in the displayed times
-					foreach($master_array[$thisday] as $time_key => $time_arr) {
+					foreach ($master_array[$thisday] as $time_key => $time_arr) {
 						if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
-							foreach($time_arr as $uid => $event_tmp) {
+							foreach ($time_arr as $uid => $event_tmp) {
 								if ((int)$event_tmp['display_end'] > (int)$cal_time) $this_time_arr[$uid] = $event_tmp;
 							}
 						}
@@ -433,17 +433,17 @@ 
 
 				// go through $this_time_array and fill the event_length array
 				foreach ($this_time_arr as $eventKey => $loopevent) {
-					$drawEvent = drawEventTimes ($cal_time, $loopevent['display_end']);
+					$drawEvent = drawEventTimes($cal_time, $loopevent['display_end']);
 					$j = 0;
 					while (isset($event_length[$thisday][$j])) {
 						if ($event_length[$thisday][$j]['state'] == 'ended') {
-							$event_length[$thisday][$j] = array ('length' => ($drawEvent['draw_length'] / $phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin');
+							$event_length[$thisday][$j] = array('length' => ($drawEvent['draw_length']/$phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'], 'state' => 'begin');
 							break;
 						}
 						$j++;
 					}
 					if ($j == sizeof(@$event_length[$thisday])) {
-						$event_length[$thisday][] = array ('length' => ($drawEvent['draw_length'] / $phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin');
+						$event_length[$thisday][] = array('length' => ($drawEvent['draw_length']/$phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'], 'state' => 'begin');
 					}
 				}
 				$class = ' class="weekborder'.$even_row.'"';
@@ -452,31 +452,31 @@ 
 					$tclass = $class;
 					if ($thisday == $getdate) $tclass = ' class="weekborder'.$even_row.' weektoday"';
 					$drawWidth = 1;
-					$weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '"' . $tclass . '>&nbsp;</td>'."\n";
+					$weekdisplay .= '<td colspan="'.$nbrGridCols[$thisday].'"'.$tclass.'>&nbsp;</td>'."\n";
 				} else {
 					# have events
 					$emptyWidth = $nbrGridCols[$thisday];
 					// Used to "join" ended events, so the ended case below results in one colspan'd td instead of multiple tds.
 					$ended_counter = 0;
-					foreach($event_length[$thisday] as $i=>$el) {
-						$drawWidth = $nbrGridCols[$thisday] / ($el['overlap'] + 1);
+					foreach ($event_length[$thisday] as $i=>$el) {
+						$drawWidth = $nbrGridCols[$thisday]/($el['overlap'] + 1);
 						$emptyWidth = $emptyWidth - $drawWidth;
 						switch ($el['state']) {
 							case 'begin':
 								if ($ended_counter) {
 									$tclass = $class;
 									if ($thisday == $getdate) $tclass = ' class="weekborder'.$even_row.' weektoday"';
-									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
+									$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, $event_start);
- 								$event_calno  	= $this_time_arr[$uid]['calnumber'];
+								$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'];
-								$event_calno = (($event_calno - 1) % $phpiCal_config->unique_colors) + 1;
+								$event_calno = (($event_calno - 1)%$phpiCal_config->unique_colors) + 1;
 								$confirmed = '';
 						  		if (is_array($event_recur)) $confirmed .= '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 								if ($event_status != '') {
@@ -496,8 +496,8 @@ 
 									}
 								}
 								$event_temp   = $loop_event;
-								$event 		  = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
-								$weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
+								$event = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
+								$weekdisplay .= '<td rowspan="'.$event_length[$thisday][$i]['length'].'" colspan="'.$drawWidth.'" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
 
 								// Start drawing the event
 								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
@@ -513,7 +513,7 @@ 
 								if ($ended_counter) {
 									$tclass = $class;
 									if ($thisday == $getdate) $tclass = ' class="weekborder'.$even_row.' weektoday"';
-									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
+									$weekdisplay .= '<td colspan="'.$ended_counter.'"'.$tclass.'>&nbsp;</td>';
 									$ended_counter = 0;
 								}
 								break;
@@ -533,7 +533,7 @@ 
 					if ($emptyWidth > 0) {
 						$tclass = $class;
 						if ($thisday == $getdate) $tclass = ' class="weekborder'.$even_row.' weektoday"';
-						$weekdisplay .= '<td colspan="' . $emptyWidth . '"'.$tclass.'>&nbsp;</td>'."\n";
+						$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]);
@@ -556,8 +556,8 @@ 
 			preg_match('!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis', $this->page, $match1);
 			$loop_ad = trim($match1[1]);
 			foreach ($master_array[$getdate]['-1'] as $uid => $allday) {
-				$event_calno  	= $allday['calnumber'];
-				$event_calno	= (($event_calno - 1) % $phpiCal_config->unique_colors) + 1;
+				$event_calno = $allday['calnumber'];
+				$event_calno = (($event_calno - 1)%$phpiCal_config->unique_colors) + 1;
  				$event 			= openevent($getdate, -1, $uid, $allday);
 				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
 				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
@@ -569,13 +569,13 @@ 
 		// Replaces the daysofweek
 		preg_match('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!Uis', $this->page, $match1);
 		$loop_dof = trim($match1[1]);
-		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
-		$start_day 			= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
-		for ($i=0; $i< $phpiCal_config->week_length; $i++) {
-			$day_num 		= date('w', $start_day);
-			$daylink		= date('Ymd', $start_wt);
+		$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+		$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+		for ($i = 0; $i < $phpiCal_config->week_length; $i++) {
+			$day_num = date('w', $start_day);
+			$daylink = date('Ymd', $start_wt);
 			if ($current_view == 'day') {
-				$weekday 		= $daysofweek_lang[$day_num];
+				$weekday = $daysofweek_lang[$day_num];
 			} else {
 				$weekday = localizeDate($dateFormat_week_list, strtotime($daylink));
 			}
@@ -588,12 +588,12 @@ 
 				$row2 = 'rowOn';
 				$row3 = 'rowOff';
 			}
-			$start_day 		= strtotime('+1 day', $start_day);
+			$start_day = strtotime('+1 day', $start_day);
 			$start_wt 		= strtotime('+1 day', $start_wt);
 			$search			= array('{DAY}', '{DAYLINK}', '{ROW1}', '{ROW2}', '{ROW3}');
 			$replace		= array($weekday, $daylink, $row1, $row2, $row3);
 			$loop_tmp 		= str_replace($search, $replace, $loop_dof);
-			$weekday_loop  .= $loop_tmp;
+			$weekday_loop .= $loop_tmp;
 		}
 		$this->page = preg_replace('!<\!-- loop daysofweek on -->.*<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
 
@@ -602,9 +602,9 @@ 
 
 		$nbrGridCols = 1;
 		if (isset($master_array[($getdate)])) {
-			foreach($master_array[($getdate)] as $ovlKey => $ovlValue) {
+			foreach ($master_array[($getdate)] as $ovlKey => $ovlValue) {
 				if ($ovlKey != '-1') {
-					foreach($ovlValue as $ovl2Value) {
+					foreach ($ovlValue as $ovl2Value) {
 						$nbrGridCols = kgv($nbrGridCols, ($ovl2Value['event_overlap'] + 1));
 					}
 				}
@@ -615,7 +615,7 @@ 
 		$loop_hours = trim($match2[1]);
 		$loop_event = trim($match3[1]);
 
-		$event_length = array ();
+		$event_length = array();
 		$border = 0;
 		preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
 		$this_day = $day_array2[3];
@@ -624,16 +624,16 @@ 
 		foreach ($day_array as $key) {
 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
 			$cal_time = $key;
-			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
-			$key = date ($timeFormat, $key);
+			$key = mktime($regs_tmp[1], $regs_tmp[2], 0, $this_month, $this_day, $this_year);
+			$key = date($timeFormat, $key);
 			unset($this_time_arr);
 
 			// add events that overlap $phpiCal_config->day_start instead of cutting them out completely
 			if (($phpiCal_config->day_start == $cal_time) && (isset($master_array[$getdate]))) {
-				foreach($master_array[$getdate] as $time_key => $time_arr) {
+				foreach ($master_array[$getdate] as $time_key => $time_arr) {
 					if ((int)$time_key <= (int)$cal_time) {
 						if (is_array($time_arr) && $time_key != '-1') {
-							foreach($time_arr as $uid => $event_tmp) {
+							foreach ($time_arr as $uid => $event_tmp) {
 								if ((int)$event_tmp['event_end'] > (int)$cal_time) {
 									$this_time_arr[$uid] = $event_tmp;
 								}
@@ -653,32 +653,32 @@ 
 			// check for eventstart
 			if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
 				foreach ($this_time_arr as $eventKey => $loopevent) {
-					$drawEvent = drawEventTimes ($cal_time, $loopevent['display_end']);
+					$drawEvent = drawEventTimes($cal_time, $loopevent['display_end']);
 					$j = 0;
 					while (isset($event_length[$j])) {
 						if ($event_length[$j]['state'] == 'ended') {
-							$event_length[$j] = array ('length' => ($drawEvent['draw_length'] / $phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin');
+							$event_length[$j] = array('length' => ($drawEvent['draw_length']/$phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'], 'state' => 'begin');
 							break;
 						}
 						$j++;
 					}
 					if ($j == sizeof($event_length)) {
-						array_push ($event_length, array ('length' => ($drawEvent['draw_length'] / $phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin'));
+						array_push($event_length, array('length' => ($drawEvent['draw_length']/$phpiCal_config->gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'], 'state' => 'begin'));
 					}
 				}
 			}
 			if (preg_match('/([0-9]{1,2}):00/', $key)) {
 				$daydisplay .= '<tr>'."\n";
-				$daydisplay .= '<td rowspan="' . (60 / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
-				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>'."\n";
-			} elseif($cal_time == $phpiCal_config->day_start) {
-				$size_tmp = 60 - (int)substr($cal_time,2,2);
+				$daydisplay .= '<td rowspan="'.(60/$phpiCal_config->gridLength).'" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
+				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>'."\n";
+			} elseif ($cal_time == $phpiCal_config->day_start) {
+				$size_tmp = 60 - (int)substr($cal_time, 2, 2);
 				$daydisplay .= '<tr>'."\n";
-				$daydisplay .= '<td rowspan="' . ($size_tmp / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
-				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>'."\n";
+				$daydisplay .= '<td rowspan="'.($size_tmp/$phpiCal_config->gridLength).'" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
+				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>'."\n";
 			} else {
 				$daydisplay .= '<tr>'."\n";
-				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>'."\n";
+				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="'.$phpiCal_config->gridLength.'"></td>'."\n";
 			}
 
 			switch (++$dayborder) {
@@ -701,19 +701,19 @@ 
 			}
 
 			if (sizeof($event_length) == 0) {
-				$daydisplay .= '<td colspan="' . $nbrGridCols . '"' . $class . '>&nbsp;</td>' . "\n";
+				$daydisplay .= '<td colspan="'.$nbrGridCols.'"'.$class.'>&nbsp;</td>'."\n";
 
 			} else {
 				$emptyWidth = $nbrGridCols;
 				// Used to "join" ended events, so the ended case below results in one colspan'd td instead of multiple tds.
 				$ended_counter = 0;
-				for ($i=0;$i<sizeof($event_length);$i++) {
-					$drawWidth = $nbrGridCols / ($event_length[$i]['overlap'] + 1);
+				for ($i = 0; $i < sizeof($event_length); $i++) {
+					$drawWidth = $nbrGridCols/($event_length[$i]['overlap'] + 1);
 					$emptyWidth = $emptyWidth - $drawWidth;
 					switch ($event_length[$i]['state']) {
 						case 'begin':
 						  if ($ended_counter) {
-							$daydisplay .= '<td colspan="' . $ended_counter . '"' . $class . '>&nbsp;</td>';
+							$daydisplay .= '<td colspan="'.$ended_counter.'"'.$class.'>&nbsp;</td>';
 							$ended_counter = 0;
 						  }
 						  $event_length[$i]['state'] = 'started';
@@ -721,7 +721,7 @@ 
  						  $event_calno  = $this_time_arr[$uid]['calnumber'];
  						  $event_recur  = $this_time_arr[$uid]['recur'];
  						  $event_status = strtolower($this_time_arr[$uid]['status']);
-						  $event_calno  = (($event_calno - 1) % $phpiCal_config->unique_colors) + 1;
+						  $event_calno = (($event_calno - 1)%$phpiCal_config->unique_colors) + 1;
 						  $confirmed = '';
 						  if (is_array($event_recur)) $confirmed .= '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 						  if ($event_status != '') $confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
@@ -738,11 +738,11 @@ 
 								  $confirmed .= '<img src="images/longevent_mid.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 							  }
 						  }
-						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_' . $event_calno . '">' . "\n";
+						  $daydisplay .= '<td rowspan="'.$event_length[$i]['length'].'" colspan="'.$drawWidth.'" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
 
 						  // Start drawing the event
 						  $event_temp  = $loop_event;
-						  $event 	   = openevent($getdate, $cal_time, $uid, $this_time_arr[$uid], 0, 0, 'ps');
+						  $event = openevent($getdate, $cal_time, $uid, $this_time_arr[$uid], 0, 0, 'ps');
 						  $event_temp  = str_replace('{EVENT}', $event, $event_temp);
 						  $event_temp  = str_replace('{EVENT_START}', date($timeFormat, $this_time_arr[$uid]['start_unixtime']), $event_temp);
 						  $event_temp  = str_replace('{EVENT_END}', date($timeFormat, $this_time_arr[$uid]['end_unixtime']), $event_temp);
@@ -755,12 +755,12 @@ 
 						  break;
 						case 'started':
 							if ($ended_counter) {
-								$daydisplay .= '<td colspan="' . $ended_counter . '"' . $class . '>&nbsp;</td>';
+								$daydisplay .= '<td colspan="'.$ended_counter.'"'.$class.'>&nbsp;</td>';
 								$ended_counter = 0;
 							}
 							break;
 						case 'ended':
-							$daydisplay .= '<td colspan="' . $drawWidth . '"' . $class . '>&nbsp;</td>' . "\n";
+							$daydisplay .= '<td colspan="'.$drawWidth.'"'.$class.'>&nbsp;</td>'."\n";
 							break;
 					}
 					$event_length[$i]['length']--;
@@ -773,7 +773,7 @@ 
 				$emptyWidth += $ended_counter;
 				//fill empty space on the right
 				if ($emptyWidth > 0) {
-					$daydisplay .= '<td colspan="' . $emptyWidth . '"' . $class . '>&nbsp;</td>' . "\n";
+					$daydisplay .= '<td colspan="'.$emptyWidth.'"'.$class.'>&nbsp;</td>'."\n";
 				}
 				while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') {
 					array_pop($event_length);
@@ -797,8 +797,8 @@ 
 		$loop_t_e 	= trim($match2[1]);
 		$replace_ad	= '';
 		$replace_e	= '';
-		$return_adtmp	= '';
-		$return_etmp	= '';
+		$return_adtmp = '';
+		$return_etmp = '';
 
 		if (isset($master_array[$next_day]) && is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) {
 			foreach ($master_array[$next_day] as $cal_time => $event_times) {
@@ -843,17 +843,17 @@ 
 					if (isset($val['vtodo_text']) && !empty($val['vtodo_text'])) {
 						$vtodo_text = sanitizeForWeb(stripslashes(urldecode($val['vtodo_text'])));
 						if (isset($val['description']) && !empty($val['description'])) {
-							$description 	= sanitizeForWeb(stripslashes(urldecode($val['description'])));
+							$description = sanitizeForWeb(stripslashes(urldecode($val['description'])));
 						} else {
 							$description = '';
 						}
 						$completed_date = $val['completed_date'];
 						$event_calna 	= $val['calname'];
-						$status 		= $val['status'];
+						$status = $val['status'];
 						$priority 		= $val['priority'];
-						$start_date 	= $val['start_date'];
+						$start_date = $val['start_date'];
 						$due_date 		= $val['due_date'];
-						$vtodo_array 	= array(
+						$vtodo_array = array(
 							'cal'			=> $event_calna,
 							'completed_date'=> $completed_date,
 							'description'	=> $description,
@@ -862,8 +862,8 @@ 
 							'start_date'	=> $start_date,
 							'status'		=> $status,
 							'vtodo_text' 	=> $vtodo_text);
-						$vtodo_array 	= base64_encode(urlencode(serialize($vtodo_array)));
-						$todo_text		= str_replace('"', '\\"', $vtodo_text);
+						$vtodo_array = base64_encode(urlencode(serialize($vtodo_array)));
+						$todo_text = str_replace('"', '\\"', $vtodo_text);
 						$todo = <<<HEREDOC
 <script language="Javascript" type="text/javascript">
 <!--
@@ -874,13 +874,13 @@ 
 
 HEREDOC;
 
-						$todo .= '<a class="psf" title="' . @$title . '" href="#" onclick="openTodoInfo(' . $todo_popup_data_index . '); return false;">';
+						$todo .= '<a class="psf" title="'.@$title.'" href="#" onclick="openTodoInfo('.$todo_popup_data_index.'); return false;">';
 						$todo_popup_data_index++;
 						$vtodo_array = $todo;
 
 						$vtodo_text 	= word_wrap(str_replace('<br />', ' ', $vtodo_text), 21, $phpiCal_config->tomorrows_events_lines);
-						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');
-						$rep			= array ($vtodo_text, $vtodo_array);
+						$data = array('{VTODO_TEXT}', '{VTODO_ARRAY}');
+						$rep = array($vtodo_text, $vtodo_array);
 
 						// Reset this TODO's category.
 
@@ -936,16 +936,16 @@ 
 		$t_month[1]			= trim($match4[1]);
 		$t_month[2] 		= trim($match5[1]);
 		$startweek 			= trim($match6[1]);
-		$endweek 			= trim($match7[1]);
+		$endweek = trim($match7[1]);
 		if ($type != 'medium') {
 			$fake_getdate_time 	= strtotime($this_year.'-'.$this_month.'-15');
-			$fake_getdate_time	= strtotime($offset.' month', $fake_getdate_time);
+			$fake_getdate_time = strtotime($offset.' month', $fake_getdate_time);
 		} else {
 			$fake_getdate_time 	= strtotime($this_year.'-'.$offset.'-15');
 		}
 
 		$minical_month 		= date('m', $fake_getdate_time);
-		$minical_year 		= date('Y', $fake_getdate_time);
+		$minical_year = date('Y', $fake_getdate_time);
 		$first_of_month 	= $minical_year.$minical_month.'01';
 		$first_of_year 		= $minical_year.'0101';
 
@@ -954,9 +954,9 @@ 
 		$dateFormat_month_local = str_replace('%Y', '<a class="ps3" href="year.php?cal='.$cal.'&amp;getdate='.$first_of_year.'">%Y</a>', $dateFormat_month_local);
 
 		//$start_day 			= strtotime($phpiCal_config->week_start_day);
-		$start_day			= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
-		$month_title 		= localizeDate ($dateFormat_month_local, $fake_getdate_time);
-		$month_date 		= date ('Ymd', $fake_getdate_time);
+		$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+		$month_title = localizeDate($dateFormat_month_local, $fake_getdate_time);
+		$month_date = date('Ymd', $fake_getdate_time);
 
 		if ($type == 'small') {
 			$langtype = $daysofweekreallyshort_lang;
@@ -968,26 +968,26 @@ 
 
 		$weekday_loop = '';
 		$middle = '';
-		for ($i=0; $i< $phpiCal_config->week_length; $i++) {
+		for ($i = 0; $i < $phpiCal_config->week_length; $i++) {
 			$day_num 		= date('w', $start_day);
 			$weekday 		= $langtype[$day_num];
-			$start_day 		= strtotime('+1 day', $start_day);
-			$loop_tmp 		= str_replace('{LOOP_WEEKDAY}', $weekday, $loop_wd);
-			$weekday_loop  .= $loop_tmp;
+			$start_day = strtotime('+1 day', $start_day);
+			$loop_tmp = str_replace('{LOOP_WEEKDAY}', $weekday, $loop_wd);
+			$weekday_loop .= $loop_tmp;
 		}
 
-		$start_day 			= strtotime(dateOfWeek($first_of_month, $phpiCal_config->week_start_day));
-		$i 					= 0;
-		$whole_month 		= TRUE;
+		$start_day = strtotime(dateOfWeek($first_of_month, $phpiCal_config->week_start_day));
+		$i = 0;
+		$whole_month = TRUE;
 
 		do {
 			if ($i == 0) $middle .= $startweek; $i++;
 			#$temp_middle			= $loop_md;
-			$switch					= array('ALLDAY' => '', 'CAL' => $cal, 'MINICAL_VIEW' => $minical_view);
-			$check_month 			= date ('m', $start_day);
-			$daylink 				= date ('Ymd', $start_day);
-			$switch['DAY']	 		= date ('j', $start_day);
-			$switch['DAYLINK'] 		= date ('Ymd', $start_day);
+			$switch = array('ALLDAY' => '', 'CAL' => $cal, 'MINICAL_VIEW' => $minical_view);
+			$check_month = date('m', $start_day);
+			$daylink = date('Ymd', $start_day);
+			$switch['DAY'] = date('j', $start_day);
+			$switch['DAYLINK'] = date('Ymd', $start_day);
 			if ($check_month != $minical_month) {
 				$temp = $t_month[0];
 			} elseif ($daylink == $getdate) {
@@ -1003,12 +1003,12 @@ 
 							if (!isset($val['calnumber'])) continue;
 
 							if (($phpiCal_config->month_locations == 'yes') && isset($val['location']) && !empty($val['location'])) {
-								$location = '<br /><span style="font-size: 95%">' . sanitizeForWeb(stripslashes(urldecode($val['location']))) . '</span>';
+								$location = '<br /><span style="font-size: 95%">'.sanitizeForWeb(stripslashes(urldecode($val['location']))).'</span>';
 							}
 							else $location = '';
 
-							$event_calno 	= $val['calnumber'];
-							$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
+							$event_calno = $val['calnumber'];
+							$event_calno = (($event_calno - 1)%$unique_colors) + 1;
 							if ($cal_time == -1) {
 								if ($type == 'large') {
 									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
@@ -1018,7 +1018,7 @@ 
 									$switch['ALLDAY'] = '<img src="templates/'.$phpiCal_config->template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />';
 								}
 							} else {
-								$start2		 = date($timeFormat_small, $val['start_unixtime']);
+								$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', '<span style="font-weight: bold;">'.$start2.'</span> ');
@@ -1045,11 +1045,11 @@ 
 			$start_day = strtotime('+1 day', $start_day);
 			if ($i == $phpiCal_config->week_length) {
 				if ($phpiCal_config->week_length != 7) {
-					$start_day = strtotime('+'.(7-$phpiCal_config->week_length).' day', $start_day);
+					$start_day = strtotime('+'.(7 - $phpiCal_config->week_length).' day', $start_day);
 				}
 				$i = 0;
 				$middle .= $endweek;
-				$checkagain = date ('m', $start_day);
+				$checkagain = date('m', $start_day);
 				if ($checkagain != $minical_month) $whole_month = FALSE;
 			}
 		} while ($whole_month == TRUE);
@@ -1064,11 +1064,11 @@ 
 	}
 
 	function nomonthbottom() {
-		$this->page = preg_replace('!<\!-- switch showbottom on -->.*<\!-- switch showbottom off -->!Uis','', $this->page);
+		$this->page = preg_replace('!<\!-- switch showbottom on -->.*<\!-- switch showbottom off -->!Uis', '', $this->page);
 	}
 
 	function nosearch() {
-		$this->page = preg_replace('!<\!-- switch show_search on -->.*<\!-- switch show_search off -->!Uis','', $this->page);
+		$this->page = preg_replace('!<\!-- switch show_search on -->.*<\!-- switch show_search off -->!Uis', '', $this->page);
 	}
 
 	function monthbottom() {
@@ -1081,7 +1081,7 @@ 
 
 		$m_start = $this_year.$this_month.'01';
 		$u_start = strtotime($m_start);
-		$i=0;
+		$i = 0;
 		$seen_events = array();
 		$middle = '';
 		do {
@@ -1089,25 +1089,25 @@ 
 				foreach ($master_array[$m_start] as $cal_time => $event_times) {
 				#	$switch['CAL'] 			= $cal;
 				#	$switch['START_DATE'] 	= localizeDate ($dateFormat_week_list, $u_start);
-					$start_date 	= localizeDate ($dateFormat_week_list, $u_start);
+					$start_date = localizeDate($dateFormat_week_list, $u_start);
 					foreach ($event_times as $uid => $val) {
 						if (isset($seen_events[$uid]) && @$val['spans_day'] == 1) continue;
 						$seen_events[$uid] = 1;
-						$switch['CAL'] 			= $cal;
-						$switch['START_DATE'] 	= $start_date;
-						$switch['CALNAME'] 	= $val['calname'];
+						$switch['CAL'] = $cal;
+						$switch['START_DATE'] = $start_date;
+						$switch['CALNAME'] = $val['calname'];
 						if (!isset($val['event_start'])) {
 							$switch['START_TIME'] 	= $lang['l_all_day'];
 							$switch['EVENT_TEXT'] 	= openevent($m_start, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 15, 'psf');
-							$switch['DESCRIPTION'] 	= sanitizeForWeb(stripslashes(urldecode($val['description'])));
+							$switch['DESCRIPTION'] = sanitizeForWeb(stripslashes(urldecode($val['description'])));
 						} else {
 							$event_start = $val['start_unixtime'];
 							$event_end 	 = (isset($val['display_end'])) ? $val['display_end'] : $val['event_end'];
 							$event_start = date($timeFormat, $val['start_unixtime']);
 							$event_end   = date($timeFormat, $val['end_unixtime']);
-							$switch['START_TIME'] 	= $event_start . ' - ' . $event_end;
+							$switch['START_TIME'] 	= $event_start.' - '.$event_end;
 							$switch['EVENT_TEXT'] 	= openevent($m_start, $cal_time, $uid, $val, 0, 15, 'psf');
-							$switch['DESCRIPTION'] 	= sanitizeForWeb(stripslashes(urldecode($val['description'])));
+							$switch['DESCRIPTION'] = sanitizeForWeb(stripslashes(urldecode($val['description'])));
 						}
 
 						if ($switch['EVENT_TEXT'] != '') {
@@ -1135,9 +1135,9 @@ 
 
 	function Page($file = 'std.tpl') {
 		global $phpiCal_config;
-		if (!file_exists($file)){
+		if (!file_exists($file)) {
 			#look for it in default if not found
-			$file = str_replace('templates/'.$phpiCal_config->template,'templates/default',$file);
+			$file = str_replace('templates/'.$phpiCal_config->template, 'templates/default', $file);
 			if (!file_exists($file)) die('Template file '.$file.' not found.');
 		}
 		$this->page = join('', file($file));
@@ -1146,12 +1146,12 @@ 
 
 	function parse($file) {
 		global $phpiCal_config; $lang;
-		if (basename(dirname($file)) == $phpiCal_config->template || $file =='./functions/event.js'){
-			if (!is_file($file)){
+		if (basename(dirname($file)) == $phpiCal_config->template || $file == './functions/event.js') {
+			if (!is_file($file)) {
 				#look for it in default if not found
-				$file = str_replace('templates/'.$phpiCal_config->template,'templates/default',$file);
+				$file = str_replace('templates/'.$phpiCal_config->template, 'templates/default', $file);
 			}
-			if (!is_file($file)){
+			if (!is_file($file)) {
 				exit(error($lang['l_error_path'], $file));
 			}
 			ob_start();
@@ -1168,11 +1168,11 @@ 
 
 				// This removes any unfilled tags
 				if (!$data) {
-					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->.*<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
+					$this->page = preg_replace('!<\!-- switch '.$tag.' on -->.*<\!-- switch '.$tag.' off -->!Uis', '', $this->page);
 				}
 
 				// This replaces any tags
-				$this->page = str_replace('{' . strtoupper($tag) . '}', $data, $this->page);
+				$this->page = str_replace('{'.strtoupper($tag).'}', $data, $this->page);
 			}
 
 		else
@@ -1188,11 +1188,11 @@ 
 
 				// This removes any unfilled tags
 				if (!$data) {
-					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->.*<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
+					$this->page = preg_replace('!<\!-- switch '.$tag.' on -->.*<\!-- switch '.$tag.' off -->!Uis', '', $this->page);
 				}
 
 				// This replaces any tags
-				$this->page = str_replace('{' . strtoupper($tag) . '}', $data, $this->page);
+				$this->page = str_replace('{'.strtoupper($tag).'}', $data, $this->page);
 			}
 
 		else
@@ -1203,22 +1203,22 @@ 
 		global $phpiCal_config, $php_started, $lang, $template_started, $cpath;
 
 		// Looks for {MONTH} before sending page out
-		preg_match_all ('!\{MONTH_([A-Z]*)\|?([+|-])([0-9]{1,2})\}!Uis', $this->page, $match);
+		preg_match_all('!\{MONTH_([A-Z]*)\|?([+|-])([0-9]{1,2})\}!Uis', $this->page, $match);
 		if (sizeof($match) > 0) {
-			$i=0;
+			$i = 0;
 			foreach ($match[1] as $key => $val) {
 				if ($match[1][$i] == 'SMALL') {
-					$template_file 	= $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_small.tpl');
-					$type 			= 'small';
-					$offset 		= $match[2][$i].$match[3][$i];
+					$template_file = $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_small.tpl');
+					$type = 'small';
+					$offset = $match[2][$i].$match[3][$i];
 				} elseif ($match[1][$i] == 'MEDIUM') {
-					$template_file 	= $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_medium.tpl');
-					$type 			= 'medium';
-					$offset 		= $match[3][$i];
+					$template_file = $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_medium.tpl');
+					$type = 'medium';
+					$offset = $match[3][$i];
 				} else {
-					$template_file 	= $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_large.tpl');
-					$type 			= 'large';
-					$offset 		= $match[2][$i].$match[3][$i];
+					$template_file = $this->parse(BASE.'templates/'.$phpiCal_config->template.'/month_large.tpl');
+					$type = 'large';
+					$offset = $match[2][$i].$match[3][$i];
 				}
 				$data = $this->draw_month($template_file, $offset, $type);
 				$this->page = str_replace($match[0][$i], $data, $this->page);
@@ -1227,8 +1227,8 @@ 
 		}
 
 		$php_ended = @getmicrotime();
-		$generated1 = number_format(($php_ended-$php_started),3);
-		$generated2 = number_format(($php_ended-$template_started),3);
+		$generated1 = number_format(($php_ended - $php_started), 3);
+		$generated2 = number_format(($php_ended - $template_started), 3);
 		$this->page = str_replace('{GENERATED1}', $generated1, $this->page);
 		$this->page = str_replace('{GENERATED2}', $generated2, $this->page);
 		if ($phpiCal_config->enable_rss != 'yes') {
@@ -1236,7 +1236,7 @@ 
 		} else {
 			$this->page = str_replace('{BASE}', BASE, $this->page);
 		}
-		if ($cpath){
+		if ($cpath) {
 			$this->page = str_replace('&amp;getdate', '&amp;cpath='.$cpath.'&amp;getdate', $this->page);
 		}
 		print($this->page);

phpicalendar/index.php

Spacing +4 added lines, -4 removed lines

@@ -3,16 +3,16 @@
 include_once(BASE.'functions/init.inc.php');
 
 if ($phpiCal_config->printview_default == 'yes') {
-	$theview ="print.php";
+	$theview = "print.php";
 } else {
-	$check = array ('day', 'week', 'month', 'year');
+	$check = array('day', 'week', 'month', 'year');
 	if (in_array($phpiCal_config->default_view, $check)) {
-		$theview = $phpiCal_config->default_view . '.php';
+		$theview = $phpiCal_config->default_view.'.php';
 	} else {
 		die('illegal view');
 	}
 }
-if(isset($_GET['cpath'])){
+if (isset($_GET['cpath'])) {
 	$theview .= '?cpath='.$_GET['cpath'];
 }
 header("Location: $theview");

phpicalendar/search.php

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-define('BASE','./');
+define('BASE', './');
 $current_view = 'search';
 require_once(BASE.'functions/ical_parser.php');
 require_once(BASE.'functions/list_functions.php');
@@ -42,9 +42,9 @@ 
 		$formatted_search = $format_search_arr[0];
 	}
 	if (isset($master_array) && is_array($master_array)) {
-		foreach($master_array as $date_key_tmp => $date_tmp) {
+		foreach ($master_array as $date_key_tmp => $date_tmp) {
 			if (is_array($date_tmp)) {
-				foreach($date_tmp as $time_tmp) {
+				foreach ($date_tmp as $time_tmp) {
 					if (is_array($time_tmp)) {
 						foreach ($time_tmp as $uid_tmp => $event_tmp) {
 							if (is_array($event_tmp)) {
@@ -55,11 +55,11 @@ 
 									$results1 = false;
 									$results2 = false;
 									if (isset($event_tmp['event_text'])) {
-										$results1 = search_boolean($format_search_arr,$event_tmp['event_text']);
+										$results1 = search_boolean($format_search_arr, $event_tmp['event_text']);
 									}
 
 									if (!$results1 && isset($event_tmp['description'])) {
-										$results2 = search_boolean($format_search_arr,$event_tmp['description']);
+										$results2 = search_boolean($format_search_arr, $event_tmp['description']);
 									}
 									if ($results1 || $results2) {
 										$event_tmp['date'] = $date_key_tmp;
@@ -85,7 +85,7 @@ 
 }
 $search_ended = getmicrotime();
 
-$search_took = number_format(($search_ended-$search_started),3);
+$search_took = number_format(($search_ended - $search_started), 3);
 
 // takes a boolean search and formats it into an array
 // use with sister function search_boolean()
@@ -98,13 +98,13 @@ 
 
 	$search_str = strtolower($search_str);
 
-	if ($search_str == ' ') return array(false,$and_arr,$or_arr,$not_arr);
+	if ($search_str == ' ') return array(false, $and_arr, $or_arr, $not_arr);
 
 	// clean up search string
 	$search_str = trim($search_str);
 	$search_str = str_replace(' and ', ' ', $search_str);
 	$search_str = str_replace(' - ', ' ', $search_str);
-	$search_str = ereg_replace('[[:space:]]+',' ', $search_str);
+	$search_str = ereg_replace('[[:space:]]+', ' ', $search_str);
 	$search_str = str_replace(' not ', ' -', $search_str);
 
 	// start out with an AND array of all the items
@@ -113,16 +113,16 @@ 
 	$j = 0;
 
 	// build an OR array from the items in AND
-	for($i=0;$i<$count;$i++) {
+	for ($i = 0; $i < $count; $i++) {
 		if ($i != 0 && $and_arr[$i] == 'or') {
 			while ($and_arr[$i] == 'or') {
-				$or_arr[$j][] = $and_arr[$i-1];
-				array_splice($and_arr,$i-1,2);
+				$or_arr[$j][] = $and_arr[$i - 1];
+				array_splice($and_arr, $i - 1, 2);
  				$i--;
 			}
 			if (isset($and_arr[$i])) {
 				$or_arr[$j][] = $and_arr[$i];
-				array_splice($and_arr,$i,1);
+				array_splice($and_arr, $i, 1);
 			}
 			$or_str_arr[$j] = implode('</b> OR <b>', $or_arr[$j]);
 			$j++;
@@ -130,13 +130,13 @@ 
 	}
 
 	// build a NOT array from the items in AND
-	foreach($and_arr as $key => $val) {
-		if (substr($val,0,1) == '-') {
-			$not_arr[] = substr($val,1);
-			array_splice($and_arr,$key,1);
-		} elseif(substr($val,0,1) == '+') {
-			$and_arr[] = substr($val,1);
-			array_splice($and_arr,$key,1);
+	foreach ($and_arr as $key => $val) {
+		if (substr($val, 0, 1) == '-') {
+			$not_arr[] = substr($val, 1);
+			array_splice($and_arr, $key, 1);
+		} elseif (substr($val, 0, 1) == '+') {
+			$and_arr[] = substr($val, 1);
+			array_splice($and_arr, $key, 1);
 		}
 	}
 
@@ -185,30 +185,30 @@ 
 	$haystack = strtolower($haystack);
 
 	// check against the NOT
-	foreach($not_arr as $s) {
-		if (is_string(strstr($haystack,$s)) == true) {
+	foreach ($not_arr as $s) {
+		if (is_string(strstr($haystack, $s)) == true) {
 			return false;
 		}
 	}
 
 	// check against the AND
-	foreach($and_arr as $s) {
+	foreach ($and_arr as $s) {
 			#echo "haystack: $haystack<br>needle: $s<br>";
-		if (is_string(strstr($haystack,$s)) == false) {
+		if (is_string(strstr($haystack, $s)) == false) {
 			return false;
 		}
 	}
 
 	// check against the OR
-	foreach($or_arr as $or) {
+	foreach ($or_arr as $or) {
 		$is_false = true;
-		foreach($or as $s) {
-			if (substr($s,0,1) == '-') {
-				if (is_string(strstr($haystack,substr($s,1))) == false) {
+		foreach ($or as $s) {
+			if (substr($s, 0, 1) == '-') {
+				if (is_string(strstr($haystack, substr($s, 1))) == false) {
 					$is_false = false;
 					break;
 				}
-			} elseif (is_string(strstr($haystack,$s)) == true) {
+			} elseif (is_string(strstr($haystack, $s)) == true) {
 				$is_false = false;
 				break;
 			}
@@ -235,8 +235,8 @@ 
 		$freq = $format_recur_lang[$freq][$tmp];
 	}
 
-	if		(isset($arr['COUNT']))	$for = str_replace('%int%',$arr['COUNT'],$format_recur_lang['count']);
-	elseif	(isset($arr['UNTIL']))	$for = str_replace('%date%',$arr['UNTIL'], $format_recur_lang['until']);
+	if (isset($arr['COUNT']))	$for = str_replace('%int%', $arr['COUNT'], $format_recur_lang['count']);
+	elseif (isset($arr['UNTIL']))	$for = str_replace('%date%', $arr['UNTIL'], $format_recur_lang['until']);
 	else							$for = '';
 
 	$print = $format_recur_lang['start'];
@@ -248,8 +248,8 @@ 
 		$list = '';
 		$last = count($arr['BYMONTH']) - 1;
 		foreach ($arr['BYMONTH'] as $key => $month) {
-			if ($key == $last)	$list .= $monthsofyear_lang[($month-1)];
-			else 				$list .= $monthsofyear_lang[($month-1)].$d;
+			if ($key == $last)	$list .= $monthsofyear_lang[($month - 1)];
+			else 				$list .= $monthsofyear_lang[($month - 1)].$d;
 		}
 		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['bymonth']);
@@ -260,8 +260,8 @@ 
 		if ($arr['BYMONTHDAY'][(count($arr['BYMONTHDAY']) - 1)] == '0') unset($arr['BYMONTHDAY'][$last]);
 		$last = count($arr['BYMONTHDAY']) - 1;
 		foreach ($arr['BYMONTHDAY'] as $key => $day) {
-			ereg('(-{0,1})([0-9]{1,2})',$day,$regs);
-			list($junk,$sign,$day) = $regs;
+			ereg('(-{0,1})([0-9]{1,2})', $day, $regs);
+			list($junk, $sign, $day) = $regs;
 			if ($sign != '')	$list .= $sign;
 			if ($key == $last)	$list .= $day;
 			else				$list .= $day.$d;
@@ -274,9 +274,9 @@ 
 		$list = '';
 		$last = count($arr['BYDAY']) - 1;
 		foreach ($arr['BYDAY'] as $key => $day) {
-			ereg('([-\+]{0,1})([0-9]{0,1})([A-Z]{2})',$day,$regs);
-			list($junk,$sign,$day_num,$day_txt) = $regs;
-			$num = two2threeCharDays($day_txt,false);
+			ereg('([-\+]{0,1})([0-9]{0,1})([A-Z]{2})', $day, $regs);
+			list($junk, $sign, $day_num, $day_txt) = $regs;
+			$num = two2threeCharDays($day_txt, false);
 			if ($sign != '')	$list .= $sign;
 			if ($day_num != '')	$list .= $day_num.' ';
 			if ($key == $last)	$list .= $daysofweek_lang[$num];

phpicalendar/day.php

Spacing +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@ 
 
 $weekstart 		= 1;
 $unix_time 		= strtotime($getdate);
-$today_today 	= date('Ymd', time() + $phpiCal_config->second_offset);  
-$next_day		= date('Ymd', strtotime("+1 day",  $unix_time));
-$prev_day 		= date('Ymd', strtotime("-1 day",  $unix_time));
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset);  
+$next_day = date('Ymd', strtotime("+1 day", $unix_time));
+$prev_day = date('Ymd', strtotime("-1 day", $unix_time));
 
 $display_date = localizeDate($dateFormat_day, $unix_time);
 $sidebar_date = localizeDate($dateFormat_week_list, $unix_time);
@@ -36,10 +36,10 @@ 
 
 
 // select for calendars
-$available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
+$available = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
 $list_icals 	= display_ical_list($available);
 $list_years 	= list_years();
-$list_months 	= list_months();
+$list_months = list_months();
 $list_weeks 	= list_weeks();
 $list_jumps 	= list_jumps();
 $list_calcolors = list_calcolors();

phpicalendar/default_config.php

Spacing +58 added lines, -58 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-class Configs{
+class Configs {
 	private static $instance;
-	private function __construct(){
+	private function __construct() {
 		$this->phpicalendar_version = '2.4';
 	// Configuration file for PHP iCalendar 2.4
 	//
@@ -10,88 +10,88 @@ 
 #=================Initialize global variables=================================
 // Define some magic strings.
 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
-		$this->template 				= 'default';		// Template support
-		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
-		$this->minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
-		$this->default_cal 				= $this->ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
-		$this->language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
-		$this->week_start_day 			= 'Sunday';			// Day of the week your week starts on
-		$this->week_length				= '7';				// Number of days to display in the week view
-		$this->day_start 				= '0600';			// Start time for day grid
-		$this->day_end					= '2000';			// End time for day grid
-		$this->gridLength 				= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
-		$this->num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
-		$this->month_event_lines 		= '0';				// Number of lines to wrap each event title in month view, 0 means display all lines.
-		$this->tomorrows_events_lines 	= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
-		$this->allday_week_lines 		= '1';				// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
-		$this->week_events_lines 		= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
-		$this->timezone 				= '';				// Set timezone. Read TIMEZONES file for more information
-		$this->calendar_path 			= '';				// Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder.
-		$this->second_offset			= '';				// The time in seconds between your time and your server's time.
-		$this->bleed_time				= '-1';				// This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time.
-		$this->cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
-		$this->download_uri				= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
-		$this->default_path				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
-		$this->cpath	     			= ''; 				// optional subdirectory
-		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
+		$this->template = 'default'; // Template support
+		$this->default_view 			= 'day'; // Default view for calendars = 'day', 'week', 'month', 'year'
+		$this->minical_view 			= 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
+		$this->default_cal 				= $this->ALL_CALENDARS_COMBINED; // Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
+		$this->language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
+		$this->week_start_day = 'Sunday'; // Day of the week your week starts on
+		$this->week_length				= '7'; // Number of days to display in the week view
+		$this->day_start 				= '0600'; // Start time for day grid
+		$this->day_end = '2000'; // End time for day grid
+		$this->gridLength 				= '15'; // Grid distance in minutes for day view, multiples of 15 preferred
+		$this->num_years 				= '1'; // Number of years (up and back) to display in 'Jump to'
+		$this->month_event_lines 		= '0'; // Number of lines to wrap each event title in month view, 0 means display all lines.
+		$this->tomorrows_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
+		$this->allday_week_lines 		= '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
+		$this->week_events_lines 		= '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
+		$this->timezone = ''; // Set timezone. Read TIMEZONES file for more information
+		$this->calendar_path = ''; // Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder.
+		$this->second_offset			= ''; // The time in seconds between your time and your server's time.
+		$this->bleed_time				= '-1'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time.
+		$this->cookie_uri				= ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
+		$this->download_uri				= ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
+		$this->default_path				= ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
+		$this->cpath	     			= ''; // optional subdirectory
+		$this->charset = 'UTF-8'; // Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
 
 		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
-		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
-		$this->month_locations  		= 'yes';			// Display location in the month view.
-		$this->this_months_events 		= 'yes';			// Display "This month's events" at the bottom off the month page.
-		$this->enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
-		$this->rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
-		$this->show_search				= 'no';			// Show the search box in the sidebar.
-		$this->allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
-		$this->printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $this->default_view (listed well above).
-		$this->show_todos				= 'yes';			// Show your todo list on the side of day and week view.
-		$this->show_completed			= 'yes';				// Show completed todos on your todo list.
-		$this->event_download			= 'no';				// Show completed todos on your todo list.
-		$this->allow_login				= 'no';				// Set to yes to prompt for login to unlock calendars.
-		$this->login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
-		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
-		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
+		$this->allow_webcals = 'no'; // Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
+		$this->month_locations  		= 'yes'; // Display location in the month view.
+		$this->this_months_events = 'yes'; // Display "This month's events" at the bottom off the month page.
+		$this->enable_rss = 'yes'; // Enable RSS access to your calendars (good thing).
+		$this->rss_link_to_event		= ''; // Set to yes to have links in the feed popup an event window.  Default is to link to day.php
+		$this->show_search = 'no'; // Show the search box in the sidebar.
+		$this->allow_preferences		= 'yes'; // Allow visitors to change various preferences via cookies.
+		$this->printview_default		= 'no'; // Set print view as the default view. day, week, and month only supported views for $this->default_view (listed well above).
+		$this->show_todos = 'yes'; // Show your todo list on the side of day and week view.
+		$this->show_completed			= 'yes'; // Show completed todos on your todo list.
+		$this->event_download			= 'no'; // Show completed todos on your todo list.
+		$this->allow_login = 'no'; // Set to yes to prompt for login to unlock calendars.
+		$this->login_cookies			= 'no'; // Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
+		$this->support_ical				= 'no'; // Set to yes to support the Apple iCal calendar database structure.
+		$this->recursive_path = 'no'; // Set to yes to recurse into subdirectories of the calendar path.
 
 		// Calendar Caching (decreases page load times)
-		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
-		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
-		$this->webcal_hours				= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals if they've been modified.
+		$this->save_parsed_cals = 'no'; // Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
+		$this->tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
+		$this->webcal_hours = '24'; // Number of hours to cache webcals. Setting to '0' will always re-parse webcals if they've been modified.
 
 		// Webdav style publishing
-		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
+		$this->phpicalendar_publishing = '0'; // Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
 
 		// Administration settings (/admin/)
-		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method
-		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
-		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
-		$this->auth_internal_password	= 'admin';			// Only used if $this->auth_method='internal'. The password for the administrator.
-		$this->ftp_server				= 'localhost';		// Only used if $this->auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
-		$this->ftp_port					= '21';				// Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
-		$this->ftp_calendar_path		= '';				// Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config.
-		$this->salt                     = '';
+		$this->allow_admin				= 'no'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method
+		$this->auth_method				= 'internal'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
+		$this->auth_internal_username	= 'admin'; // Only used if $this->auth_method='internal'. The username for the administrator.
+		$this->auth_internal_password	= 'admin'; // Only used if $this->auth_method='internal'. The password for the administrator.
+		$this->ftp_server = 'localhost'; // Only used if $this->auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
+		$this->ftp_port = '21'; // Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
+		$this->ftp_calendar_path = ''; // Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config.
+		$this->salt = '';
 		// Calendar colors
 		//
 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif)
 		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
 		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
-		$this->unique_colors			= '7';
+		$this->unique_colors = '7';
 
 		return true;
 	}
 
-	public static function getInstance(){
-		if (empty(self::$instance)){
+	public static function getInstance() {
+		if (empty(self::$instance)) {
 			self::$instance = new Configs;
 		}
 		return self::$instance;
 	}
 
 	# val can be an array
-	public function setProperty($key,$val){
+	public function setProperty($key, $val) {
 		$this->$key = $val;
 		return;
 	}
-	public function getProperty($key){
+	public function getProperty($key) {
 		return $this->$key;
 	}
 }

phpicalendar/includes/event.php

Spacing +17 added lines, -17 removed lines

@@ -8,10 +8,10 @@ 
 # information for the popup is sent via $_POST by a javascript snippet in 
 # in function openevent() from functions/date_functions.php
 # character encoding has been problematic with popups.
-$event			= unserialize(stripslashes($_POST['event_data']));
-$organizer 		= unserialize($event['organizer']);
-$attendee 		= unserialize($event['attendee']);
-$uid    		= stripslashes($_POST['uid']);
+$event = unserialize(stripslashes($_POST['event_data']));
+$organizer = unserialize($event['organizer']);
+$attendee = unserialize($event['attendee']);
+$uid = stripslashes($_POST['uid']);
 
 // Format event time
 // All day
@@ -36,7 +36,7 @@ 
 }
 
 if (isset($organizer) && is_array($organizer)) {
-	$i=0;
+	$i = 0;
 	$organizers = array();
 	foreach ($organizer as $val) {
 		if (!empty($organizer[$i]["email"])) {
@@ -46,10 +46,10 @@ 
 		}
 		$i++;
 	}
-	$organizer = implode(', ',$organizers);
+	$organizer = implode(', ', $organizers);
 }
 if (isset($attendee) && is_array($attendee)) {
-	$i=0;
+	$i = 0;
 	$attendees = array();
 	foreach ($attendee as $val) {
 		if (!empty($attendee[$i]["email"])) {
@@ -59,36 +59,36 @@ 
 		}
 		$i++;
 	}
-	$attendee = implode(', ',$attendees);
+	$attendee = implode(', ', $attendees);
 }
 if (isset($event['location'])) $event['location'] = stripslashes($event['location']);
 if (sizeof($attendee) == 0) $attendee = '';
 if (sizeof($organizer) == 0) $organizer = '';
 if ($event['url'] != '') $event['url'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
 
-switch ($event['status']){
+switch ($event['status']) {
 	case 'CONFIRMED':
-		$event['status'] =	$lang['l_status_confirmed'] ; 
+		$event['status'] = $lang['l_status_confirmed']; 
 		break;
 	case 'CANCELLED':
-		$event['status'] =	$lang['l_status_cancelled'] ; 
+		$event['status'] = $lang['l_status_cancelled']; 
 		break;
 	case 'TENTATIVE':
-		$event['status'] =	$lang['l_status_tentative'] ; 
+		$event['status'] = $lang['l_status_tentative']; 
 		break;
 	default:	
-		$event['status'] =	'' ; 
+		$event['status'] = ''; 
 }
 
 $event_download = '';
-if($phpiCal_config->event_download == 'yes') $event_download = "
+if ($phpiCal_config->event_download == 'yes') $event_download = "
 <form action='' method='post'>
 <input type=hidden name='event_data' value = '".$_POST['event_data']."' />
 <input type=hidden name='uid' value = '".$_POST['uid']."' />
 <input type='submit' name='submit' value='".$lang['l_download_event']."' />
 <form>";
 
-if (isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
 header("Content-Type: text/calendar; charset=utf-8; name=$uid");
 header("Content-Disposition: attachment; filename=$uid");
 echo 
@@ -99,8 +99,8 @@ 
 UID:$uid
 SUMMARY:".$event['event_text']."
 CATEGORIES:".$event['calname']."
-DTSTART;TZID=".$event['timezone'].":".date("Ymd\THis",$event['start_unixtime'])."
-DTEND;TZID=".$event['timezone'].":".date("Ymd\THis",$event['start_unixtime'])."
+DTSTART;TZID=".$event['timezone'].":".date("Ymd\THis", $event['start_unixtime'])."
+DTEND;TZID=".$event['timezone'].":".date("Ymd\THis", $event['start_unixtime'])."
 CLASS:".$event['class']."
 ".$event['other']."
 SEQUENCE:1

phpicalendar/includes/todo.php

Spacing +6 added lines, -6 removed lines

@@ -10,20 +10,20 @@
 // Set the variables from the array
 $vtodo_text		= (isset($vtodo_array['vtodo_text'])) ? $vtodo_array['vtodo_text'] : ('');
 $description	= (isset($vtodo_array['description'])) ? $vtodo_array['description'] : ('');
-$completed_date	= (isset($vtodo_array['completed_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['completed_date'])) : ('');
-$status			= (isset($vtodo_array['status'])) ? $vtodo_array['status'] : ('');
+$completed_date	= (isset($vtodo_array['completed_date'])) ? localizeDate($dateFormat_day, strtotime($vtodo_array['completed_date'])) : ('');
+$status = (isset($vtodo_array['status'])) ? $vtodo_array['status'] : ('');
 $calendar_name  = (isset($vtodo_array['cal'])) ? $vtodo_array['cal'] : ('');
-$start_date 	= (isset($vtodo_array['start_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
-$due_date 		= (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
+$start_date = (isset($vtodo_array['start_date'])) ? localizeDate($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
+$due_date 		= (isset($vtodo_array['due_date'])) ? localizeDate($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
 $priority 		= (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : ('');
 
 $cal_title_full = $calendar_name.' '.$lang['l_calendar'];
 $description	= ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description);
-$vtodo_text		= ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text);
+$vtodo_text		= ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $vtodo_text);
 
 
 if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
-	$status = $lang['l_completed_date'] . ' ' . $completed_date;
+	$status = $lang['l_completed_date'].' '.$completed_date;
 } elseif ($status == "COMPLETED") {
 	$status = $lang['l_completed'];
 } else {

phpicalendar/config.inc.php

Spacing +9 added lines, -9 removed lines

@@ -51,7 +51,7 @@ 
 #     'language'             => 'English',
 #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
 #     'template'             => 'green',           // Template support: change this to have a different "skin" for your installation.     
-    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
+    'default_view'         => 'year', // Default view for calendars'     => 'day', 'week', 'month', 'year'
 #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
 #     'gridLength'           => 10,                // Grid size in day and week views. Allowed values are 1,2,3,4,10,12,15,20,30,60. Default is 15
 #     'minical_view'         => 'current',	       // Where do the mini-calendars go when clicked?'     => 'day', 'week', 'month', 'current'
@@ -111,13 +111,13 @@ 
 these arrays provide extra calendar options.
 
 */
-$locked_map['user1:pass'] = array('');             // Map username:password accounts to locked calendars that should be
-$locked_map['user2:pass'] = array('');             // unlocked if logged in. Calendar names should be the same as what is
-$locked_map['user3:pass'] = array('');             // listed in the $locked_cals, again without the .ics suffix.
-$locked_map['user4:pass'] = array('');             // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
+$locked_map['user1:pass'] = array(''); // Map username:password accounts to locked calendars that should be
+$locked_map['user2:pass'] = array(''); // unlocked if logged in. Calendar names should be the same as what is
+$locked_map['user3:pass'] = array(''); // listed in the $locked_cals, again without the .ics suffix.
+$locked_map['user4:pass'] = array(''); // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
 // add more lines as necessary
 
-$apache_map['user1'] = array('');                  // Map HTTP authenticated users to specific calendars. Users listed here and
-$apache_map['user2'] = array('');                  // authenticated via HTTP will not see the public calendars, and will not be
-$apache_map['user3'] = array('');                  // given any login/logout options. Calendar names not include the .ics suffix.
-$apache_map['user4'] = array('');                  // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
+$apache_map['user1'] = array(''); // Map HTTP authenticated users to specific calendars. Users listed here and
+$apache_map['user2'] = array(''); // authenticated via HTTP will not see the public calendars, and will not be
+$apache_map['user3'] = array(''); // given any login/logout options. Calendar names not include the .ics suffix.
+$apache_map['user4'] = array(''); // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');

phpicalendar/error.php

Spacing +6 added lines, -6 removed lines

@@ -1,23 +1,23 @@
 <?php
-if (!defined('BASE')) define('BASE','./');
+if (!defined('BASE')) define('BASE', './');
 require_once(BASE.'functions/template.php');
 
 
-function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') {
+function error($error_msg = 'There was an error processing the request.', $file = 'NONE', $error_base = '') {
 	global $getdate, $rss_powered, $lang, $phpiCal_config, $cal;
 	if (!isset($template))					$template = $phpiCal_config->template;
 		
-	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file,true));
+	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file, true));
 	$current_view 		= 'error';
 	$display_date 		= $lang['l_error_title'];
 	$calendar_name 		= $lang['l_error_title'];
 	
 	$default_path = $phpiCal_config->default_path;
 	if (empty($phpiCal_config->default_path)) {
-		if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
-			$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
+		if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on') {
+			$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/rss/'));
 		} else {
-			$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
+			$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/rss/'));
 		}
 	}
 	$page = new Page(BASE.'templates/'.$template.'/error.tpl');