smtech / canvas-ics-sync

phpicalendar/functions/parse/parse_tzs.php

Spacing +10 added lines, -10 removed lines

@@ -15,7 +15,7 @@ 
 	$nextline = ereg_replace("[\r\n]", '', $nextline);
 	#handle continuation lines that start with either a space or a tab (MS Outlook)
 	while (isset($nextline{0}) && ($nextline{0} == ' ' || $nextline{0} == "\t")) { 
-		$line = $line . substr($nextline, 1);
+		$line = $line.substr($nextline, 1);
 		$nextline = fgets($ifile, 1024);
 		$nextline = ereg_replace("[\r\n]", '', $nextline);
 	}
@@ -56,12 +56,12 @@ 
 			break;
 		default:
 			unset ($field, $data, $prop_pos, $property);
-			if (ereg ('([^:]+):(.*)', $line, $line)){
+			if (ereg('([^:]+):(.*)', $line, $line)) {
 				$field = $line[1];
 				$data = $line[2];				
 				$property = strtoupper($field);
-				$prop_pos = strpos($property,';');
-				if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
+				$prop_pos = strpos($property, ';');
+				if ($prop_pos !== false) $property = substr($property, 0, $prop_pos);
 				switch ($property) {		
 					case 'TZID':
 						$tz_id = $data;
@@ -73,18 +73,18 @@ 
 						$offset_to = $data;
 						break;
 					case 'DTSTART':
-						if($is_std || $is_daylight){
+						if ($is_std || $is_daylight) {
 							$datetime = extractDateTime($data, $property, $field); 
 							$start_unixtime = $datetime[0];
 							$start_date = $datetime[1];
-							$year = substr($start_date,0,4);
-							if($is_std) $begin_std[$year] = $data;
-							if($is_daylight) $begin_daylight[$year] = $data;
+							$year = substr($start_date, 0, 4);
+							if ($is_std) $begin_std[$year] = $data;
+							if ($is_daylight) $begin_daylight[$year] = $data;
 						}
 						break;
 					case 'TZNAME':
-						if($is_std) $st_name = $data;
-						if($is_daylight) $dt_name = $data;
+						if ($is_std) $st_name = $data;
+						if ($is_daylight) $dt_name = $data;
 						break;
 				}
 			}	

Braces +21 added lines, -7 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 $ifile = @fopen($filename, 'r');
-if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
+if ($ifile == FALSE) {
+	exit(error($lang['l_error_cantopen'], $filename));
+}
 $nextline = fgets($ifile);
 #if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
 
@@ -43,7 +45,9 @@ 
 			$is_daylight = false;
 			break;
 		case 'END:VTIMEZONE':
-			if (!isset($offset_d) && isset($offset_s)) $offset_d = $offset_s;
+			if (!isset($offset_d) && isset($offset_s)) {
+				$offset_d = $offset_s;
+			}
 			$tz_array[$tz_id] = array(
 				0	=> @$offset_s, 
 				1	=> @$offset_d,
@@ -61,7 +65,9 @@ 
 				$data = $line[2];				
 				$property = strtoupper($field);
 				$prop_pos = strpos($property,';');
-				if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
+				if ($prop_pos !== false) {
+					$property = substr($property,0,$prop_pos);
+				}
 				switch ($property) {		
 					case 'TZID':
 						$tz_id = $data;
@@ -78,13 +84,21 @@ 
 							$start_unixtime = $datetime[0];
 							$start_date = $datetime[1];
 							$year = substr($start_date,0,4);
-							if($is_std) $begin_std[$year] = $data;
-							if($is_daylight) $begin_daylight[$year] = $data;
+							if($is_std) {
+								$begin_std[$year] = $data;
+							}
+							if($is_daylight) {
+								$begin_daylight[$year] = $data;
+							}
 						}
 						break;
 					case 'TZNAME':
-						if($is_std) $st_name = $data;
-						if($is_daylight) $dt_name = $data;
+						if($is_std) {
+							$st_name = $data;
+						}
+						if($is_daylight) {
+							$dt_name = $data;
+						}
 						break;
 				}
 			}	

phpicalendar/functions/parse/end_vevent.php

Spacing +81 added lines, -81 removed lines

@@ -15,11 +15,11 @@ 
 // CLASS support
 if (isset($class)) {
 	if ($class == 'PRIVATE') {
-		$summary ='**PRIVATE**';
-		$description ='**PRIVATE**';
+		$summary = '**PRIVATE**';
+		$description = '**PRIVATE**';
 	} elseif ($class == 'CONFIDENTIAL') {
-		$summary ='**CONFIDENTIAL**';
-		$description ='**CONFIDENTIAL**';
+		$summary = '**CONFIDENTIAL**';
+		$description = '**CONFIDENTIAL**';
 	}
 }
 
@@ -28,19 +28,19 @@ 
 	$uid = $uid_counter;
 	$uid_counter++;
 	$uid_valid = false;
-}elseif(in_array($uid, $uid_list)) {
+}elseif (in_array($uid, $uid_list)) {
 	# UID seen before. If sequence is the default, bump it.
 	if ($sequence == 0) $sequence++;
-}else{
+} else {
 	$uid_valid = true;
 }
 $uid_list[] = $uid;
 
 # Handle DURATION
 if (!isset($end_unixtime)) {
-	if(!isset($the_duration)) $the_duration = 0;
-	$end_unixtime 	= $start_unixtime + $the_duration;
-	$end_time 	= date ('Hi', $end_unixtime);
+	if (!isset($the_duration)) $the_duration = 0;
+	$end_unixtime = $start_unixtime + $the_duration;
+	$end_time = date('Hi', $end_unixtime);
 }
 # at this point $end_unixtime should be set
 # adjust event start and end times
@@ -52,7 +52,7 @@ 
 	}
 }
 # look for events that span more than one day
-if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) < date('Ymd',$end_unixtime)) {
+if (isset($start_unixtime, $end_unixtime) && date('Ymd', $start_unixtime) < date('Ymd', $end_unixtime)) {
 	$spans_day = true;
 	$bleed_check = (($start_unixtime - $end_unixtime) <= (60*60*24)) ? '-1' : '0';
 } else {
@@ -61,14 +61,14 @@ 
 }
 
 $length = $end_unixtime - $start_unixtime;
-if ($length < 0){ 
+if ($length < 0) { 
 	$length = 0;
 	$end_time = $start_time;
 }
 # get hour and minute adjusted to allowed grid times
 $drawKey = drawEventTimes($start_time, $end_time, ($length >= (60*60*24)));
-preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
-preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4);
+preg_match('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
+preg_match('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4);
 $hour = $time3[1];
 $minute = $time3[2];
 $end_hour = $time4[1];
@@ -104,16 +104,16 @@ 
 $freq_type = 'none';
 # Load $rrule_array
 foreach ($rrule_array as $key => $val) {
-	switch($key) {
+	switch ($key) {
 		case 'FREQ':
 			switch ($val) {
-				case 'YEARLY':		$freq_type = 'year';	break;
-				case 'MONTHLY':		$freq_type = 'month';	break;
-				case 'WEEKLY':		$freq_type = 'week';	break;
-				case 'DAILY':		$freq_type = 'day';		break;
-				case 'HOURLY':		$freq_type = 'hour';	break;
-				case 'MINUTELY':	$freq_type = 'minute';	break;
-				case 'SECONDLY':	$freq_type = 'second';	break;
+				case 'YEARLY':		$freq_type = 'year'; break;
+				case 'MONTHLY':		$freq_type = 'month'; break;
+				case 'WEEKLY':		$freq_type = 'week'; break;
+				case 'DAILY':		$freq_type = 'day'; break;
+				case 'HOURLY':		$freq_type = 'hour'; break;
+				case 'MINUTELY':	$freq_type = 'minute'; break;
+				case 'SECONDLY':	$freq_type = 'second'; break;
 			}
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = strtolower($val);
 			break;
@@ -123,51 +123,51 @@ 
 			break;
 		case 'UNTIL':
 			# UNTIL must be in UTC
-			$until = date("YmdHis",strtotime($val)); 
-			ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs);
-			$until_unixtime = mktime($regs[4],@$regs[5],@$regs[6],$regs[2],$regs[3],$regs[1]);
-			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until);
+			$until = date("YmdHis", strtotime($val)); 
+			ereg('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs);
+			$until_unixtime = mktime($regs[4], @$regs[5], @$regs[6], $regs[2], $regs[3], $regs[1]);
+			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week, $until);
 			break;
 		case 'INTERVAL':
-			if ($val > 0){
+			if ($val > 0) {
 			$interval = $val;
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $interval;
 			}
 			break;
 		case 'BYSECOND':
-			$bysecond = split (',', $val);
+			$bysecond = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $bysecond;
 			break;
 		case 'BYMINUTE':
-			$byminute = split (',', $val);
+			$byminute = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $byminute;
 			break;
 		case 'BYHOUR':
-			$byhour = split (',', $val);
+			$byhour = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $byhour;
 			break;
 		case 'BYDAY':
-			$byday = split (',', $val);
+			$byday = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $byday;
 			break;
 		case 'BYMONTHDAY':
-			$bymonthday = split (',', $val);
+			$bymonthday = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $bymonthday;
 			break;					
 		case 'BYYEARDAY':
-			$byyearday = split (',', $val);
+			$byyearday = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $byyearday;
 			break;
 		case 'BYWEEKNO':
-			$byweekno = split (',', $val);
+			$byweekno = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $byweekno;
 			break;
 		case 'BYMONTH':
-			$bymonth = split (',', $val);
+			$bymonth = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $bymonth;
 			break;
 		case 'BYSETPOS':
-			$bysetpos = split (',', $val);
+			$bysetpos = split(',', $val);
 			$recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $bysetpos;
 			break;
 		case 'WKST':
@@ -178,9 +178,9 @@ 
 }
 # convert wkst to a 3 char day for strtotime to work		
 $wkst3char = two2threeCharDays($wkst);
-if($current_view == 'search') $freq_type = 'none'; 
+if ($current_view == 'search') $freq_type = 'none'; 
 # $recur is the recurrence info that goes into the master array for this VEVENT
-$recur ='';
+$recur = '';
 if (isset($recur_array[($start_date)][($hour.$minute)][$uid]['recur'])) $recur = $recur_array[($start_date)][($hour.$minute)][$uid]['recur']; 
 
 /* ============================ Load $recur_data ============================
@@ -202,22 +202,22 @@ 
 	!isset($rrule_array['FREQ']) 	- only iterate once, set the end_range_unixtime to the end_date_unixtime
 Note that start_range_unixtime and end_range_unixtime are not the same as start_date_unixtime and end_date_unixtime */
 
-$end_range_unixtime = $mArray_end+60*60*24;
+$end_range_unixtime = $mArray_end + 60*60*24;
 $start_date_unixtime = strtotime($start_date);
 $next_range_unixtime = $start_date_unixtime;
 
 # conditions where we don't need to iterate over the whole range
 # 	if repeating without limit, and steps are by 1, don't go back before the mArray beginning.
-if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin;
+if ($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin;
 
 # 	if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time
 if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
 
 # 	stop at the until limit if set
-if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;else $until_unixtime = $mArray_end;
+if (isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; else $until_unixtime = $mArray_end;
 
 # 	more adjustments
-switch ($freq_type){
+switch ($freq_type) {
 	case 'week':
 		# need to get the first value of $next_range_unixtime onto the right day of the week
 		$next_range_unixtime = strtotime("this ".date("D", $start_date_unixtime), $next_range_unixtime);
@@ -228,7 +228,7 @@ 
 }
 
 #nonrepeating events can stop at the first instance
-if(!isset($rrule_array['FREQ']) && isset($end_date)){ 
+if (!isset($rrule_array['FREQ']) && isset($end_date)) { 
 	$end_range_unixtime = strtotime($end_date);
 	$count = 1;
 }
@@ -241,8 +241,8 @@ 
 while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
 	$year = date("Y", $next_range_unixtime); 
 	$month = date('m', $next_range_unixtime); 
-	$time = mktime(12,0,0,$month,date("d",$start_unixtime),$year);
-	switch ($freq_type){
+	$time = mktime(12, 0, 0, $month, date("d", $start_unixtime), $year);
+	switch ($freq_type) {
 		case 'day':
 			add_recur($next_range_unixtime);
 			break;
@@ -250,18 +250,18 @@ 
 			add_recur(expand_byday($next_range_unixtime));
 			break;
 		case 'month':
-			if(!empty($bymonthday)) $time = mktime(12,0,0,$month,1,$year);
-			$times = expand_bymonthday(array($time));#echo "\n $month exp bymonthday";dump_times($times);
-			foreach($times as $time){ 
+			if (!empty($bymonthday)) $time = mktime(12, 0, 0, $month, 1, $year);
+			$times = expand_bymonthday(array($time)); #echo "\n $month exp bymonthday";dump_times($times);
+			foreach ($times as $time) { 
 				add_recur(expand_byday($time));
 			}
 			break;
 		case 'year':
-			$times = expand_bymonth($time);      #echo "exp bymonth";dump_times($times);
-			$times = expand_byweekno($times);    #echo "exp byweekno";dump_times($times);
-			$times = expand_byyearday($times);   #echo "exp byyearday";dump_times($times);
-			$times = expand_bymonthday($times);  #echo "\nexp bymonthday";dump_times($times);
-			foreach($times as $time){ 
+			$times = expand_bymonth($time); #echo "exp bymonth";dump_times($times);
+			$times = expand_byweekno($times); #echo "exp byweekno";dump_times($times);
+			$times = expand_byyearday($times); #echo "exp byyearday";dump_times($times);
+			$times = expand_bymonthday($times); #echo "\nexp bymonthday";dump_times($times);
+			foreach ($times as $time) { 
 				add_recur(expand_byday($time));
 			}
 			break;
@@ -284,22 +284,22 @@ 
 $hour and $minute are the values from the start_time, rounded to the nearest grid time.
 
 */
-$recur_data_hour = @substr($start_time,0,2);
-$recur_data_minute = @substr($start_time,2,2);
-if (isset($allday_start) && $allday_start != ''){
+$recur_data_hour = @substr($start_time, 0, 2);
+$recur_data_minute = @substr($start_time, 2, 2);
+if (isset($allday_start) && $allday_start != '') {
 	$recur_data_hour = '00';
 	$recur_data_minute = '00';
 }
-foreach($recur_data as $recur_data_unixtime) {
+foreach ($recur_data as $recur_data_unixtime) {
 	$recur_data_year 	= date('Y', $recur_data_unixtime);
-	$recur_data_month 	= date('m', $recur_data_unixtime);
-	$recur_data_day 	= date('d', $recur_data_unixtime);
+	$recur_data_month = date('m', $recur_data_unixtime);
+	$recur_data_day = date('d', $recur_data_unixtime);
 	$recur_data_date 	= $recur_data_year.$recur_data_month.$recur_data_day;
 	
 	# initialize the loop range	to the recur date + grid time
-	$next_range_unixtime = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
+	$next_range_unixtime = mktime($recur_data_hour, $recur_data_minute, 0, $recur_data_month, $recur_data_day, $recur_data_year);
 	$end_range_unixtime = $next_range_unixtime + $length;
-	$end_date_tmp = date("Ymd",$end_range_unixtime);
+	$end_date_tmp = date("Ymd", $end_range_unixtime);
 	#echo "<pre>$summary ".date("Ymd H:i:s",$next_range_unixtime)." ".date("Ymd H:i:s",$end_range_unixtime)."\n";
 
 	# default the time_key to -1 for allday events, overwrite as needed
@@ -308,31 +308,31 @@ 
 	$start_unixtime_tmp = strtotime($recur_data_date.$start_time);
 	$end_unixtime_tmp = strtotime($end_date_tmp.$end_time);
 	while (date("Ymd", $next_range_unixtime) <= $end_date_tmp) {
-		$this_date_tmp = date('Ymd',$next_range_unixtime);	
-		$next_range_unixtime = strtotime('+1 day',$next_range_unixtime);
+		$this_date_tmp = date('Ymd', $next_range_unixtime);	
+		$next_range_unixtime = strtotime('+1 day', $next_range_unixtime);
 		
 		if (!isset($allday_start) || $allday_start == '') $time_key = $hour.$minute;
 		$display_end_tmp = $end_hour.$end_minute;
-		if($time_key > -1){
+		if ($time_key > -1) {
 			# the day is not the first day of the recurrence
 			if ($this_date_tmp > $recur_data_date) $time_key = '0000';
 			# the day is not the last day of the recurrence
 			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
 		}
-		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
-		if(!isset($master_array[$this_date_tmp][$time_key][$uid]['sequence']) || 
-			$sequence >  $master_array[$this_date_tmp][$time_key][$uid]['sequence']
-			){
-			$master_array[$this_date_tmp][$time_key][$uid] = array (
-				'event_start' => $start_time,                	# hhmm
-				'event_end' => $end_time,                    	# hhmm
-				'display_start' => $time_key,                   # hhmm
-				'display_end' => $display_end_tmp,            	# hhmm
-				'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
-				'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
-				'event_text' => $summary,                    	#
-				'event_length' => $length,                    	# length in seconds
-				'event_overlap' => 0,                        	# checkOverlap modifies this
+		if ($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
+		if (!isset($master_array[$this_date_tmp][$time_key][$uid]['sequence']) || 
+			$sequence > $master_array[$this_date_tmp][$time_key][$uid]['sequence']
+			) {
+			$master_array[$this_date_tmp][$time_key][$uid] = array(
+				'event_start' => $start_time, # hhmm
+				'event_end' => $end_time, # hhmm
+				'display_start' => $time_key, # hhmm
+				'display_end' => $display_end_tmp, # hhmm
+				'start_unixtime' => $start_unixtime_tmp, # start unixtime for this recurrence
+				'end_unixtime' => $end_unixtime_tmp, # end unixtime for this recurrence
+				'event_text' => $summary, #
+				'event_length' => $length, # length in seconds
+				'event_overlap' => 0, # checkOverlap modifies this
 				'description' => $description, 
 				'status' => $status, 
 				'class' => $class, 
@@ -351,7 +351,7 @@ 
 				'recur' => $recur
 				);
 		}
-		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
+		if ($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
 	}
 } # end foreach recur_data 
 unset($recur_data);
@@ -361,9 +361,9 @@ 
 // Added for version 0.9.5 modified in 2.22 remove anything that doesn't have an event_start
 if (is_array($except_dates)) {
 	foreach ($except_dates as $key => $value) {
-		if (isset ($master_array[$value])){
-			foreach ($master_array[$value] as $time => $value2){
-				if (!isset($value2[$uid]['event_start'])){
+		if (isset ($master_array[$value])) {
+			foreach ($master_array[$value] as $time => $value2) {
+				if (!isset($value2[$uid]['event_start'])) {
 					unset($master_array[$value][$time][$uid]);
 				}
 			}

Braces +46 added lines, -16 removed lines

@@ -10,7 +10,9 @@ 
 2. Build recur_data array
 3. Add occurrences to master_array
 */
-if (!isset($start_date)) $start_date = "19700101";
+if (!isset($start_date)) {
+	$start_date = "19700101";
+}
 
 // CLASS support
 if (isset($class)) {
@@ -28,17 +30,21 @@ 
 	$uid = $uid_counter;
 	$uid_counter++;
 	$uid_valid = false;
-}elseif(in_array($uid, $uid_list)) {
+} elseif(in_array($uid, $uid_list)) {
 	# UID seen before. If sequence is the default, bump it.
-	if ($sequence == 0) $sequence++;
-}else{
+	if ($sequence == 0) {
+		$sequence++;
+	}
+	} else{
 	$uid_valid = true;
 }
 $uid_list[] = $uid;
 
 # Handle DURATION
 if (!isset($end_unixtime)) {
-	if(!isset($the_duration)) $the_duration = 0;
+	if(!isset($the_duration)) {
+		$the_duration = 0;
+	}
 	$end_unixtime 	= $start_unixtime + $the_duration;
 	$end_time 	= date ('Hi', $end_unixtime);
 }
@@ -178,10 +184,14 @@ 
 }
 # convert wkst to a 3 char day for strtotime to work		
 $wkst3char = two2threeCharDays($wkst);
-if($current_view == 'search') $freq_type = 'none'; 
+if($current_view == 'search') {
+	$freq_type = 'none';
+}
 # $recur is the recurrence info that goes into the master array for this VEVENT
 $recur ='';
-if (isset($recur_array[($start_date)][($hour.$minute)][$uid]['recur'])) $recur = $recur_array[($start_date)][($hour.$minute)][$uid]['recur']; 
+if (isset($recur_array[($start_date)][($hour.$minute)][$uid]['recur'])) {
+	$recur = $recur_array[($start_date)][($hour.$minute)][$uid]['recur'];
+}
 
 /* ============================ Load $recur_data ============================
 $recur_data is an array of unix times for days of recurrences of an event.  This code handles repeats at the day level or above.  The next loop handles the times.
@@ -208,13 +218,21 @@ 
 
 # conditions where we don't need to iterate over the whole range
 # 	if repeating without limit, and steps are by 1, don't go back before the mArray beginning.
-if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin;
+if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) {
+	$next_range_unixtime = $mArray_begin;
+}
 
 # 	if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time
-if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
+if ($next_range_unixtime < $start_date_unixtime) {
+	$next_range_unixtime = $start_date_unixtime;
+}
 
 # 	stop at the until limit if set
-if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;else $until_unixtime = $mArray_end;
+if(isset($until) && $end_range_unixtime > $until_unixtime) {
+	$end_range_unixtime = $until_unixtime;
+} else {
+	$until_unixtime = $mArray_end;
+}
 
 # 	more adjustments
 switch ($freq_type){
@@ -250,7 +268,9 @@ 
 			add_recur(expand_byday($next_range_unixtime));
 			break;
 		case 'month':
-			if(!empty($bymonthday)) $time = mktime(12,0,0,$month,1,$year);
+			if(!empty($bymonthday)) {
+				$time = mktime(12,0,0,$month,1,$year);
+			}
 			$times = expand_bymonthday(array($time));#echo "\n $month exp bymonthday";dump_times($times);
 			foreach($times as $time){ 
 				add_recur(expand_byday($time));
@@ -311,15 +331,23 @@ 
 		$this_date_tmp = date('Ymd',$next_range_unixtime);	
 		$next_range_unixtime = strtotime('+1 day',$next_range_unixtime);
 		
-		if (!isset($allday_start) || $allday_start == '') $time_key = $hour.$minute;
+		if (!isset($allday_start) || $allday_start == '') {
+			$time_key = $hour.$minute;
+		}
 		$display_end_tmp = $end_hour.$end_minute;
 		if($time_key > -1){
 			# the day is not the first day of the recurrence
-			if ($this_date_tmp > $recur_data_date) $time_key = '0000';
+			if ($this_date_tmp > $recur_data_date) {
+				$time_key = '0000';
+			}
 			# the day is not the last day of the recurrence
-			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
+			if ($this_date_tmp < $end_date_tmp) {
+				$display_end_tmp = '2400';
+			}
+		}
+		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) {
+			continue;
 		}
-		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
 		if(!isset($master_array[$this_date_tmp][$time_key][$uid]['sequence']) || 
 			$sequence >  $master_array[$this_date_tmp][$time_key][$uid]['sequence']
 			){
@@ -351,7 +379,9 @@ 
 				'recur' => $recur
 				);
 		}
-		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
+		if($time_key > -1) {
+			checkOverlap($this_date_tmp, $time_key, $uid);
+		}
 	}
 } # end foreach recur_data 
 unset($recur_data);

phpicalendar/functions/parse/recur_functions.php

Spacing +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
 
 function add_recur($times, $freq = '') {
 	global $recur_data;
-	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime,$until_unixtime, $day_offset, $current_view;
+	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime, $end_range_unixtime, $until_unixtime, $day_offset, $current_view;
 	if (!is_array($times)) $times = array($times);
 	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
 #dump_times($times);
@@ -30,13 +30,13 @@ 
 
 		// Why are we arbitrarily setting the time to noon?
 		$date = date('Ymd', $time);
-		$time = strtotime($date . ' 12:00:00');
+		$time = strtotime($date.' 12:00:00');
 		$until_date = date('Ymd', $until_unixtime);
-		$until_unixtime = strtotime($until_date . ' 12:00:00');
+		$until_unixtime = strtotime($until_date.' 12:00:00');
 
 		# day offset fixes shifts across day boundaries due to time diffs.
 		# These are already fixed for the initial instance, but need to be fixed for recurrences
-		if (date('Ymd', $time) != $start_date) $time = $time + ($day_offset * 24 * 60 * 60);
+		if (date('Ymd', $time) != $start_date) $time = $time + ($day_offset*24*60*60);
 		if ((isset($time)) &&
 			(!in_array($time, $recur_data)) &&
 			(!in_array($date, $except_dates)) &&
@@ -79,12 +79,12 @@ 
 	if ($freq_type != 'year') return $times;
 	if (empty($byweekno)) return $times;
 	$total_weeks = date('W', mktime(12, 0, 0, 12, 24, $year)) + 1;
-	$w1_start = strtotime('this ' . $wkst3char, mktime(12, 0, 0, 1, 1, $year));
+	$w1_start = strtotime('this '.$wkst3char, mktime(12, 0, 0, 1, 1, $year));
 	foreach ($byweekno as $weekno) {
 		if ($weekno < 0) {
 			$weekno = $weekno + $total_weeks;
 		}
-		$new_times[] = strtotime('+' . (($weekno - 1) * 7) . ' days', $w1_start);
+		$new_times[] = strtotime('+'.(($weekno - 1)*7).' days', $w1_start);
 	}
 	#dump_times($new_times);
 	return $new_times;
@@ -93,16 +93,16 @@ 
 function expand_byyearday($times) {
 	global $byyearday, $year;
 	if (empty($byyearday)) return $times;
-	$py = $year-1;
-	$ny = $year+1;
+	$py = $year - 1;
+	$ny = $year + 1;
 	$new_times = array();
-	foreach ($times as $time){
+	foreach ($times as $time) {
 		foreach ($byyearday as $yearday) {
 			if ($yearday > 0) {
-				$day = strtotime('+' . $yearday . ' days Dec 31, ' . $py);
+				$day = strtotime('+'.$yearday.' days Dec 31, '.$py);
 			}
 			else {
-				$day = strtotime('Jan 1 ' . $ny . ' ' . $yearday . ' days');
+				$day = strtotime('Jan 1 '.$ny.' '.$yearday.' days');
 			}
 			if (date('Y', $day == $year)) $new_times[] = $day;
 		}
@@ -127,7 +127,7 @@ 
 }
 
 function expand_byday($time) {
-	global $freq_type, $byday, $bymonth,$byweekno, $wkst3char, $year, $month, $start_unixtime, $summary;
+	global $freq_type, $byday, $bymonth, $byweekno, $wkst3char, $year, $month, $start_unixtime, $summary;
 	if (empty($byday)) return array($time);
 	$times = array();
 	$the_sunday = dateOfWeek(date('Ymd', $time), $wkst3char);
@@ -138,12 +138,12 @@ 
 				[2] => 4 number
 				[3] => TH day abbr
 		*/
-		ereg ('([-\+]{0,1})?([0-9]+)?([A-Z]{2})', $day, $byday_arr);
+		ereg('([-\+]{0,1})?([0-9]+)?([A-Z]{2})', $day, $byday_arr);
 		$on_day = two2threeCharDays($byday_arr[3]);
 		switch ($freq_type) {
 			case 'week':
 				#need to find the first day of the appropriate week.
-				$next_date_time = strtotime('this ' . $on_day, strtotime($the_sunday)) + (12 * 60 * 60);
+				$next_date_time = strtotime('this '.$on_day, strtotime($the_sunday)) + (12*60*60);
 				$times[] = $next_date_time;
 				break;
 			case 'month':
@@ -152,9 +152,9 @@ 
 			case 'year':
 				if (empty($byweekno)) {
 					$week_arr = array(1, 2, 3, 4, 5);
-					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]);
-					$month_start = strtotime(date('Ym01', $time)) - (24 * 60 * 60);
-					$month_end = strtotime(date('Ymt', $time)) + (36 * 60 * 60);
+					if (isset($byday_arr[2]) && $byday_arr[2] != '') $week_arr = array($byday_arr[2]);
+					$month_start = strtotime(date('Ym01', $time)) - (24*60*60);
+					$month_end = strtotime(date('Ymt', $time)) + (36*60*60);
 					if ($freq_type == 'year' && empty($bymonth)) {
 						$month_start = mktime(12, 0, 0, 1, 0, $year);
 						$month_end   = mktime(12, 0, 0, 1, 1, $year + 1);
@@ -162,14 +162,14 @@ 
 					$month_start_day = strtolower(date('D', $month_start));
 					foreach ($week_arr as $week) {
 						if ($byday_arr[1] == '-') {
-							$next_date_time = strtotime($byday_arr[1] . $week . $on_day, $month_end);
+							$next_date_time = strtotime($byday_arr[1].$week.$on_day, $month_end);
 						}
 						else {
 							# we need this special offset in case the event day coincides with the month start day
 							# eg: month starts on a Sunday, our event is the Nth Sunday of the month... without this
 							# special offset, the event will be added to the (N+1)th Sunday of the month
-							$special_offset = ($month_start_day == $on_day) ? (24 * 60 * 60) : 0;
-							$next_date_time = strtotime($byday_arr[1] . $week . $on_day, ($month_start + $special_offset));
+							$special_offset = ($month_start_day == $on_day) ? (24*60*60) : 0;
+							$next_date_time = strtotime($byday_arr[1].$week.$on_day, ($month_start + $special_offset));
 						}
 						# check that we're still in the same month
 						if (date('m', $next_date_time) == date('m', $time)) $times[] = $next_date_time;
@@ -177,13 +177,13 @@ 
 				}
 				else {
 					# byweekno should act like freq_type = week
-					$next_date_time = strtotime('this ' . $on_day, strtotime($the_sunday)) + (12 * 60 * 60);
+					$next_date_time = strtotime('this '.$on_day, strtotime($the_sunday)) + (12*60*60);
 					$times[] = $next_date_time;
 				}
 				break;
 			default:
 				$month_start = strtotime(date('Ym01', $time));
-				$next_date_time = strtotime($byday_arr[1] . $byday_arr[2] . $on_day, $month_start);
+				$next_date_time = strtotime($byday_arr[1].$byday_arr[2].$on_day, $month_start);
 				break;
 		}
 	}
@@ -254,7 +254,7 @@ 
 				[2] => 4 number
 				[3] => TH day abbr
 		*/
-		ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
+		ereg('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
 		$byday3[] = two2threeCharDays($byday_arr[3]);
 	}
 	$new_times = array();
@@ -278,10 +278,10 @@ 
 # for diagnostics
 function dump_times($times) {
 	global $summary;
-	echo '<pre>' . $summary . ' times:';
+	echo '<pre>'.$summary.' times:';
 	#var_dump($times);
 	foreach ($times as $time) {
-		echo "\ndate:" . date('Y-m-d H:i:s', $time);
+		echo "\ndate:".date('Y-m-d H:i:s', $time);
 	}
 	echo '</pre>';
 }

Braces +85 added lines, -35 removed lines

@@ -11,7 +11,9 @@ 
 function add_recur($times, $freq = '') {
 	global $recur_data;
 	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime,$until_unixtime, $day_offset, $current_view;
-	if (!is_array($times)) $times = array($times);
+	if (!is_array($times)) {
+		$times = array($times);
+	}
 	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
 #dump_times($times);
 	if ($current_view != 'search') {
@@ -20,13 +22,17 @@ 
 		$times = restrict_byyearday($times, $freq);
 		$times = restrict_bymonthday($times, $freq);
 		$times = restrict_byday($times, $freq);
-		if ($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime;
+		if ($start_date_unixtime > $mArray_begin) {
+			$times[] = $start_date_unixtime;
+		}
 		$times = restrict_bysetpos($times, $freq);
 		$times = array_unique($times);
 		sort($times);
 	}
 	foreach ($times as $time) {
-		if (!isset($time) || $time == '') continue;
+		if (!isset($time) || $time == '') {
+			continue;
+		}
 
 		// Why are we arbitrarily setting the time to noon?
 		$date = date('Ymd', $time);
@@ -36,7 +42,9 @@ 
 
 		# day offset fixes shifts across day boundaries due to time diffs.
 		# These are already fixed for the initial instance, but need to be fixed for recurrences
-		if (date('Ymd', $time) != $start_date) $time = $time + ($day_offset * 24 * 60 * 60);
+		if (date('Ymd', $time) != $start_date) {
+			$time = $time + ($day_offset * 24 * 60 * 60);
+		}
 		if ((isset($time)) &&
 			(!in_array($time, $recur_data)) &&
 			(!in_array($date, $except_dates)) &&
@@ -49,8 +57,7 @@ 
 				($count >= 0)) {
 				$recur_data[] = $time;
 			}
-		}
-		else if (in_array($date, $except_dates)) {
+		} else if (in_array($date, $except_dates)) {
 			$count--;
 		}
 	}
@@ -60,10 +67,16 @@ 
 
 function expand_bymonth($time) {
 	global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type;
-	if (!empty($byweekno)) return $time;
-	if (empty($bymonth)) $bymonth = array(date('m', $start_unixtime));
+	if (!empty($byweekno)) {
+		return $time;
+	}
+	if (empty($bymonth)) {
+		$bymonth = array(date('m', $start_unixtime));
+	}
 	$d = date('d', $start_unixtime);
-	if (!empty($bymonthday)) $d = 1;
+	if (!empty($bymonthday)) {
+		$d = 1;
+	}
 	foreach ($bymonth as $m) {
 		$time = mktime(12, 0, 0, $m, $d, $year);
 		$times[] = $time;
@@ -76,8 +89,12 @@ 
 	# byweekno is only used when repeat is yearly
 	# when it's set, the input times are irrelevant
 	# it also needs a byday.
-	if ($freq_type != 'year') return $times;
-	if (empty($byweekno)) return $times;
+	if ($freq_type != 'year') {
+		return $times;
+	}
+	if (empty($byweekno)) {
+		return $times;
+	}
 	$total_weeks = date('W', mktime(12, 0, 0, 12, 24, $year)) + 1;
 	$w1_start = strtotime('this ' . $wkst3char, mktime(12, 0, 0, 1, 1, $year));
 	foreach ($byweekno as $weekno) {
@@ -92,7 +109,9 @@ 
 
 function expand_byyearday($times) {
 	global $byyearday, $year;
-	if (empty($byyearday)) return $times;
+	if (empty($byyearday)) {
+		return $times;
+	}
 	$py = $year-1;
 	$ny = $year+1;
 	$new_times = array();
@@ -100,11 +119,12 @@ 
 		foreach ($byyearday as $yearday) {
 			if ($yearday > 0) {
 				$day = strtotime('+' . $yearday . ' days Dec 31, ' . $py);
-			}
-			else {
+			} else {
 				$day = strtotime('Jan 1 ' . $ny . ' ' . $yearday . ' days');
 			}
-			if (date('Y', $day == $year)) $new_times[] = $day;
+			if (date('Y', $day == $year)) {
+				$new_times[] = $day;
+			}
 		}
 	}
 #	dump_times($new_times);
@@ -113,7 +133,9 @@ 
 
 function expand_bymonthday($times) {
 	global $bymonthday, $year;
-	if (empty($bymonthday)) return $times;
+	if (empty($bymonthday)) {
+		return $times;
+	}
 	foreach ($times as $time) {
 		$month = date('m', $time);
 		foreach ($bymonthday as $monthday) {
@@ -128,7 +150,9 @@ 
 
 function expand_byday($time) {
 	global $freq_type, $byday, $bymonth,$byweekno, $wkst3char, $year, $month, $start_unixtime, $summary;
-	if (empty($byday)) return array($time);
+	if (empty($byday)) {
+		return array($time);
+	}
 	$times = array();
 	$the_sunday = dateOfWeek(date('Ymd', $time), $wkst3char);
 	foreach ($byday as $key => $day) {
@@ -152,7 +176,9 @@ 
 			case 'year':
 				if (empty($byweekno)) {
 					$week_arr = array(1, 2, 3, 4, 5);
-					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]);
+					if(isset($byday_arr[2]) && $byday_arr[2] !='') {
+						$week_arr = array($byday_arr[2]);
+					}
 					$month_start = strtotime(date('Ym01', $time)) - (24 * 60 * 60);
 					$month_end = strtotime(date('Ymt', $time)) + (36 * 60 * 60);
 					if ($freq_type == 'year' && empty($bymonth)) {
@@ -163,8 +189,7 @@ 
 					foreach ($week_arr as $week) {
 						if ($byday_arr[1] == '-') {
 							$next_date_time = strtotime($byday_arr[1] . $week . $on_day, $month_end);
-						}
-						else {
+						} else {
 							# we need this special offset in case the event day coincides with the month start day
 							# eg: month starts on a Sunday, our event is the Nth Sunday of the month... without this
 							# special offset, the event will be added to the (N+1)th Sunday of the month
@@ -172,10 +197,11 @@ 
 							$next_date_time = strtotime($byday_arr[1] . $week . $on_day, ($month_start + $special_offset));
 						}
 						# check that we're still in the same month
-						if (date('m', $next_date_time) == date('m', $time)) $times[] = $next_date_time;
+						if (date('m', $next_date_time) == date('m', $time)) {
+							$times[] = $next_date_time;
+						}
 					}
-				}
-				else {
+				} else {
 					# byweekno should act like freq_type = week
 					$next_date_time = strtotime('this ' . $on_day, strtotime($the_sunday)) + (12 * 60 * 60);
 					$times[] = $next_date_time;
@@ -192,20 +218,28 @@ 
 
 function restrict_bymonth($times, $freq = '') {
 	global $bymonth, $byyearday;
-	if (empty($bymonth) || !empty($byyearday)) return $times;
+	if (empty($bymonth) || !empty($byyearday)) {
+		return $times;
+	}
 	$new_times = array();
 	foreach ($times as $time) {
-		if (in_array(date('m', $time), $bymonth)) $new_times[] = $time;
+		if (in_array(date('m', $time), $bymonth)) {
+			$new_times[] = $time;
+		}
 	}
 	return $new_times;
 }
 
 function restrict_byweekno($times, $freq = '') {
 	global $byweekno;
-	if (empty($byweekno)) return $times;
+	if (empty($byweekno)) {
+		return $times;
+	}
 	$new_times = array();
 	foreach ($times as $time) {
-		if (in_array(date('W', $time), $byweekno)) $new_times[] = $time;
+		if (in_array(date('W', $time), $byweekno)) {
+			$new_times[] = $time;
+		}
 	}
 	return $new_times;
 
@@ -213,25 +247,33 @@ 
 
 function restrict_byyearday($times, $freq = '') {
 	global $byyearday;
-	if (empty($byyearday)) return $times;
+	if (empty($byyearday)) {
+		return $times;
+	}
 	$new_times = array();
 	foreach ($times as $time) {
 		foreach ($byyearday as $yearday) {
 			if ($yearday < 0) {
 				$yearday = 365 + $yearday + 1;
-				if (date('L', $time)) $yearday += 1;
+				if (date('L', $time)) {
+					$yearday += 1;
+				}
 			}
 			$yearday_arr[] = $yearday;
 		}
 		# date('z', $time) gives 0 for Jan 1
-		if (in_array((date('z', $time) + 1), $yearday_arr)) $new_times[] = $time;
+		if (in_array((date('z', $time) + 1), $yearday_arr)) {
+			$new_times[] = $time;
+		}
 	}
 	return $new_times;
 }
 
 function restrict_bymonthday($times, $freq = '') {
 	global $bymonthday;
-	if (empty($bymonthday)) return $times;
+	if (empty($bymonthday)) {
+		return $times;
+	}
 	$new_times = array();
 	foreach ($times as $time) {
 		foreach ($bymonthday as $monthday) {
@@ -240,13 +282,17 @@ 
 			}
 			$monthday_arr[] = $monthday;
 		}
-		if (in_array(date('j', $time), $monthday_arr)) $new_times[] = $time;
+		if (in_array(date('j', $time), $monthday_arr)) {
+			$new_times[] = $time;
+		}
 	}
 	return $new_times;
 }
 function restrict_byday($times, $freq = '') {
 	global $byday;
-	if (empty($byday)) return $times;
+	if (empty($byday)) {
+		return $times;
+	}
 	foreach ($byday as $key => $day) {
 		/* set $byday_arr
 				[0] => byday string, e.g. 4TH
@@ -259,14 +305,18 @@ 
 	}
 	$new_times = array();
 	foreach ($times as $time) {
-		if (in_array(strtolower(date('D', $time)), $byday3)) $new_times[] = $time;
+		if (in_array(strtolower(date('D', $time)), $byday3)) {
+			$new_times[] = $time;
+		}
 	}
 	return $new_times;
 }
 
 function restrict_bysetpos($times, $freq = '') {
 	global $bysetpos;
-	if (empty($bysetpos)) return $times;
+	if (empty($bysetpos)) {
+		return $times;
+	}
 	sort($times);
 	$new_times = array();
 	foreach ($bysetpos as $setpos) {

phpicalendar/functions/calendar_functions.php

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
 	// This array keeps track of paths we need to search.
 	$search_paths = array($phpiCal_config->calendar_path);
 	// Add web calendars.
-	if ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin)	{
+	if ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin) {
 		if (!isset($http_user) && !$admin) {
 			foreach ($list_webcals as $file) {
 				// Make sure the URL ends with .ics.
@@ -189,7 +189,7 @@ 
 // is not printed out by this function.
 //
 // $cals	= The calendars (entire path, e.g. from availableCalendars).
-function display_ical_list($cals, $pick=FALSE) {
+function display_ical_list($cals, $pick = FALSE) {
 	global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $list_webcals, $phpiCal_config, $master_array;
 	// Print each calendar option.
 	$return = '';
@@ -209,7 +209,7 @@ 
 			(substr($cal_tmp, 0, 8) == 'https://') ||
 			(substr($cal_tmp, 0, 9) == 'webcal://')) {
 			$cal_tmp2 = str_replace('webcal://', 'http://', $cal_tmp);
-			$cal_tmp2 = str_replace('https://',  'http://', $cal_tmp2);
+			$cal_tmp2 = str_replace('https://', 'http://', $cal_tmp2);
 			$num = 1;
 			foreach ($master_array[-4] as $master_cal) {
 				if ($master_cal['filename'] == $cal_tmp2) {
@@ -226,20 +226,20 @@ 
 			while (!feof($ifile)) {
 				$line = fgets($ifile, 1024);
 				$line = trim($line);
-				if (ereg ("([^:]+):(.*)", $line, $regs)){
+				if (ereg("([^:]+):(.*)", $line, $regs)) {
 					$field = $regs[1];
 					$data = $regs[2];
 					$property = $field;
-					$prop_pos = strpos($property,';');
-					if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
+					$prop_pos = strpos($property, ';');
+					if ($prop_pos !== false) $property = substr($property, 0, $prop_pos);
 					$property = strtoupper($property);
-					if ($property == "X-WR-CALNAME"){
+					if ($property == "X-WR-CALNAME") {
 						$cal_displayname_tmp = stripslashes($data);
 						break;
 					}
 				}	
 				#stop reading if we find an event or timezone before there's a name
-				if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break;
+				if ($line == "BEGIN:VTIMEZONE" || $line == "BEGIN:VEVENT") break;
 			}
 			@fclose($ifile);
 		}
@@ -267,8 +267,8 @@ 
 
 		// Encode the calendar path.
 		$cal_encoded_tmp = urlencode($cal_tmp);
-		if(in_array($cal_tmp, $list_webcals)){
-			$cal_encoded_tmp = md5($phpiCal_config->salt.$cal_tmp);;
+		if (in_array($cal_tmp, $list_webcals)) {
+			$cal_encoded_tmp = md5($phpiCal_config->salt.$cal_tmp); ;
 		}
 
 		// Try to detect unselected calendars
@@ -279,7 +279,7 @@ 
 		// The submitted calendar will be encoded, and always use http://
 		// if it is a webcal. So that is how we perform the comparison when
 		// trying to figure out if this is the selected calendar.
-		if($pick) {
+		if ($pick) {
 			if (in_array($cal_encoded_tmp, explode(",", $cal)) || count($cals) == count(explode(",", $cal))) {
 				$return .= "<option value=\"$cal_encoded_tmp\" selected=\"selected\">$cal_displayname_tmp</option>\n";
 			} else {
@@ -297,9 +297,9 @@ 
 	// option to open all (non-web) calenders together
 	if (!$pick) {
 		if ($all_cals || $cal == $phpiCal_config->ALL_CALENDARS_COMBINED) {
-			$return .=  "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>";
+			$return .= "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>";
 		} else {
-			$return .=  "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
+			$return .= "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
 		}
 	}
 

Braces +58 added lines, -27 removed lines

@@ -29,10 +29,11 @@ 
 		$unlocked_cals = $locked_map["$username:$password"];
 	}
 	// Make a local copy of the requested calendars.
-	if (!is_array($cal_filename))
-		$cal_filename_local = array($cal_filename);
-	else
-		$cal_filename_local = $cal_filename;
+	if (!is_array($cal_filename)) {
+			$cal_filename_local = array($cal_filename);
+	} else {
+			$cal_filename_local = $cal_filename;
+	}
 
 	// Create the list of available calendars.
 	$calendars = array();
@@ -44,7 +45,9 @@ 
 		if (!isset($http_user) && !$admin) {
 			foreach ($list_webcals as $file) {
 				// Make sure the URL ends with .ics.
-				if (!is_string($file)) continue;			
+				if (!is_string($file)) {
+					continue;
+				}
 				// Add this calendar.
 				array_push($calendars, $file);
 			}
@@ -72,13 +75,16 @@ 
 			// Open the directory.
 			$dir_handle = opendir($search_path)
 				or die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
-			if ($dir_handle === false)
-				die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
+			if ($dir_handle === false) {
+							die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
+			}
 				
 			// Add each file in the directory that does not begin with a dot.
 			while (false !== ($file = readdir($dir_handle))) {
 				// Make sure this is not a dot file.
-				if (preg_match("/^\./", $file)) continue;
+				if (preg_match("/^\./", $file)) {
+					continue;
+				}
 				array_push($files, "$search_path/$file");
 			}
 		} else {
@@ -94,24 +100,38 @@ 
 			// Push directories onto the search paths if recursive paths is
 			// turned on.
 			if (is_dir($file)) {
-				if ($phpiCal_config->recursive_path == 'yes') array_push($search_paths, $file);
+				if ($phpiCal_config->recursive_path == 'yes') {
+					array_push($search_paths, $file);
+				}
 				continue;
 			}			
 			// Make sure the file is real.
-			if (!is_file($file)) continue;
+			if (!is_file($file)) {
+				continue;
+			}
 			// Remove any php files.
-			if (preg_match("/^.*\.php$/i", $file)) continue;
+			if (preg_match("/^.*\.php$/i", $file)) {
+				continue;
+			}
 			# remove publish log file 
-			if ($file == 'publish_log.txt') continue;
+			if ($file == 'publish_log.txt') {
+				continue;
+			}
 			// Make sure this is not a blacklisted calendar.
 			$cal_name = getCalendarName($file); 
-			if (in_array($cal_name, $blacklisted_cals)) continue;
+			if (in_array($cal_name, $blacklisted_cals)) {
+				continue;
+			}
 			// If HTTP authenticated, make sure this calendar is available
 			// to the user.
-			if (isset($http_user) && isset($apache_map[$http_user]) && !in_array($cal_name, $apache_map[$http_user])) continue;
+			if (isset($http_user) && isset($apache_map[$http_user]) && !in_array($cal_name, $apache_map[$http_user])) {
+				continue;
+			}
 
 			// Make sure this calendar is not locked.
-			if (!$admin && in_array($cal_name, $locked_cals) && !in_array($cal_name, $unlocked_cals)) continue;
+			if (!$admin && in_array($cal_name, $locked_cals) && !in_array($cal_name, $unlocked_cals)) {
+				continue;
+			}
 			
 			// Add this calendar if we're looking for it, and remove it's name
 			// from the local list because we've found it.
@@ -119,7 +139,9 @@ 
 				array_push($calendars, $file);
 				$cal_filename_local = array_diff($cal_filename_local, array($cal_name));				
 				// If the local list is empty, we're done.
-				if (empty($cal_filename_local))	break 2;
+				if (empty($cal_filename_local)) {
+					break 2;
+				}
 			}
 		}
 	}
@@ -169,8 +191,9 @@ 
 						
 			// Pull out the calendar name.
 			$num_matches = preg_match("/<key>Title<\/key>\s*?<string>(.+?)<\/string>/i", $contents, $matches);
-			if ($num_matches > 0)
-				return $matches[1];
+			if ($num_matches > 0) {
+							return $matches[1];
+			}
 		}
 	}
 	
@@ -195,7 +218,9 @@ 
 	$return = '';
 
 	$all_cals = false;
-	if (count($cals) > 1) $all_cals = true;
+	if (count($cals) > 1) {
+		$all_cals = true;
+	}
 
 	foreach ($cals as $cal_tmp) {
 		// Format the calendar path for display.
@@ -204,8 +229,7 @@ 
 		$search_idx = array_search($cal_tmp, $cal_filelist);
 		if (is_numeric($search_idx)) {
 			$cal_displayname_tmp = $cal_displaynames[$search_idx];
-		}
-		else if ((substr($cal_tmp, 0, 7) == 'http://') ||
+		} else if ((substr($cal_tmp, 0, 7) == 'http://') ||
 			(substr($cal_tmp, 0, 8) == 'https://') ||
 			(substr($cal_tmp, 0, 9) == 'webcal://')) {
 			$cal_tmp2 = str_replace('webcal://', 'http://', $cal_tmp);
@@ -218,11 +242,12 @@ 
 				}
 				$num++;
 			}
-		}
-		else {
+		} else {
 			# pull the name from the $cal_tmp file
 			$ifile = @fopen($cal_tmp, 'r');
-			if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp));
+			if ($ifile == FALSE) {
+				exit(error($lang['l_error_cantopen'], $cal_tmp));
+			}
 			while (!feof($ifile)) {
 				$line = fgets($ifile, 1024);
 				$line = trim($line);
@@ -231,7 +256,9 @@ 
 					$data = $regs[2];
 					$property = $field;
 					$prop_pos = strpos($property,';');
-					if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
+					if ($prop_pos !== false) {
+						$property = substr($property,0,$prop_pos);
+					}
 					$property = strtoupper($property);
 					if ($property == "X-WR-CALNAME"){
 						$cal_displayname_tmp = stripslashes($data);
@@ -239,7 +266,9 @@ 
 					}
 				}	
 				#stop reading if we find an event or timezone before there's a name
-				if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break;
+				if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") {
+					break;
+				}
 			}
 			@fclose($ifile);
 		}
@@ -272,7 +301,9 @@ 
 		}
 
 		// Try to detect unselected calendars
-		if (!in_array($cal_encoded_tmp, explode(",", $cal))) $all_cals = false;
+		if (!in_array($cal_encoded_tmp, explode(",", $cal))) {
+			$all_cals = false;
+		}
 
 		// Display the option.
 		//

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");

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('BASE')) define('BASE', './');
+if (!defined('BASE')) {
+	define('BASE', './');
+}
 include_once(BASE.'functions/init.inc.php');
 
 if ($phpiCal_config->printview_default == 'yes') {

phpicalendar/search.php

Indentation +4 added lines, -4 removed lines

@@ -49,9 +49,9 @@ 
 						foreach ($time_tmp as $uid_tmp => $event_tmp) {
 							if (is_array($event_tmp)) {
 								if (!isset($the_arr[$uid_tmp]) || isset($event_tmp['exception'])) {
-                                                                        #print_r($format_search_arr);
-                                                                        #print_r($event_tmp);
-                                                                        #echo "<br>this event:".$event_tmp['event_text']."<br>";
+																		#print_r($format_search_arr);
+																		#print_r($event_tmp);
+																		#echo "<br>this event:".$event_tmp['event_text']."<br>";
 									$results1 = false;
 									$results2 = false;
 									if (isset($event_tmp['event_text'])) {
@@ -216,7 +216,7 @@ 
 		if ($is_false) return false;
 	}
 	// if we haven't returned false, then we return true
-       # echo "return true<br>";
+	   # echo "return true<br>";
 	return true;
 }
 

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];

Braces +46 added lines, -17 removed lines

@@ -98,7 +98,9 @@ 
 
 	$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);
@@ -176,10 +178,14 @@ 
 	$or_arr = $needle_arr[2];
 	$not_arr = $needle_arr[3];
 
-	if (!$needle_arr[0]) return false;
+	if (!$needle_arr[0]) {
+		return false;
+	}
 	if ((sizeof($and_arr) == 0) &&
 		(sizeof($or_arr) == 0) &&
-		(sizeof($not_arr) == 0)) return false;
+		(sizeof($not_arr) == 0)) {
+		return false;
+	}
 
 	// compare lowercase versions of the strings
 	$haystack = strtolower($haystack);
@@ -213,7 +219,9 @@ 
 				break;
 			}
 		}
-		if ($is_false) return false;
+		if ($is_false) {
+			return false;
+		}
 	}
 	// if we haven't returned false, then we return true
        # echo "return true<br>";
@@ -235,9 +243,13 @@ 
 		$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']);
-	else							$for = '';
+	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'];
 	$print = str_replace('%int%', $int, $print);
@@ -248,8 +260,11 @@ 
 		$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']);
@@ -257,14 +272,21 @@ 
 
 	if (isset($arr['BYMONTHDAY'])) {
 		$list = '';
-		if ($arr['BYMONTHDAY'][(count($arr['BYMONTHDAY']) - 1)] == '0') unset($arr['BYMONTHDAY'][$last]);
+		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;
-			if ($sign != '')	$list .= $sign;
-			if ($key == $last)	$list .= $day;
-			else				$list .= $day.$d;
+			if ($sign != '') {
+				$list .= $sign;
+			}
+			if ($key == $last) {
+				$list .= $day;
+			} else {
+				$list .= $day.$d;
+			}
 		}
 		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['bymonthday']);
@@ -277,10 +299,17 @@ 
 			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];
-			else				$list .= $daysofweek_lang[$num].$d;
+			if ($sign != '') {
+				$list .= $sign;
+			}
+			if ($day_num != '') {
+				$list .= $day_num.' ';
+			}
+			if ($key == $last) {
+				$list .= $daysofweek_lang[$num];
+			} else {
+				$list .= $daysofweek_lang[$num].$d;
+			}
 		}
 		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['byday']);

phpicalendar/day.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
 	'event_js'			=> BASE.'functions/event.js',
 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
-    'sidebar'           => BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl',
-    'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
+	'sidebar'           => BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl',
+	'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
 	));
 
 $page->replace_tags(array(

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();

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 $current_view = 'day';
-if (!defined('BASE')) define('BASE', './');
+if (!defined('BASE')) {
+	define('BASE', './');
+}
 require_once(BASE.'functions/init.inc.php');
 header("Content-Type: text/html; charset=$phpiCal_config->charset");
 if (isset($_GET['jumpto_day'])) {

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

Braces +23 added lines, -9 removed lines

@@ -19,13 +19,17 @@ 
 	$start = localizeDate($dateFormat_week, $event['start_unixtime']);
 	$end   = localizeDate($dateFormat_week, ($event['end_unixtime'] - 60));
 	$event_times = $lang['l_all_day']." $start";
-	if ($start != $end) $event_times = "$start - $end";
-} else {
+	if ($start != $end) {
+		$event_times = "$start - $end";
+	}
+	} else {
 	$start = date($timeFormat, $event['start_unixtime']);
 	$end   = date($timeFormat, $event['end_unixtime']);
 	$event_times = "$start";
-	if ($start != $end) $event_times = "$start - $end";
-}
+	if ($start != $end) {
+		$event_times = "$start - $end";
+	}
+	}
 
 $event['event_text']  = sanitizeForWeb(urldecode($event['event_text']));
 $event['description'] = sanitizeForWeb(urldecode($event['description']));
@@ -61,10 +65,18 @@ 
 	}
 	$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>';
+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']){
 	case 'CONFIRMED':
@@ -81,12 +93,14 @@ 
 }
 
 $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'])){
 header("Content-Type: text/calendar; charset=utf-8; name=$uid");