smtech / canvas-ics-sync

phpicalendar/functions/userauth_functions.php

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
 function logout_querys() {
 	// Make sure the action is logout.
 	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
-	if ($querys == $_SERVER['QUERY_STRING']) $querys .= '&action=logout';
+	if ($querys == $_SERVER['QUERY_STRING']) {
+		$querys .= '&action=logout';
+	}
 
 	// Remove references to the username or password.
 	$querys = preg_replace('/(username|password)=[^&]+/', '', $querys);
@@ -48,7 +50,9 @@ 
 	// If not HTTP authenticated, try login via cookies or the web page.
 	if (isset($_SERVER['PHP_AUTH_USER'])) {
 		$username = $_SERVER['PHP_AUTH_USER'];
-		if (isset($_SERVER['PHP_AUTH_PW'])) $password = $_SERVER['PHP_AUTH_PW'];
+		if (isset($_SERVER['PHP_AUTH_PW'])) {
+			$password = $_SERVER['PHP_AUTH_PW'];
+		}
 
 		return array($username, $password, $invalid_login);
 	}

phpicalendar/functions/ical_parser.php

Braces +41 added lines, -18 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (!defined('BASE')) define('BASE', './');
+if (!defined('BASE')) {
+	define('BASE', './');
+}
 include_once(BASE.'functions/init.inc.php');
 include_once(BASE.'functions/date_functions.php');
 include_once(BASE.'functions/draw_functions.php');
@@ -33,16 +35,14 @@ 
 					 * (disk I/O is expensive, but *much* cheaper than going to the network for remote files)
 					 */
 					$realcal_mtime = filemtime($fname);
-				}
-				else if ((time() - $mtime) >= $phpiCal_config->webcal_hours * 60 * 60) {
+				} else if ((time() - $mtime) >= $phpiCal_config->webcal_hours * 60 * 60) {
 					/*
 					 * We limit remote file mtime checks based on the magic webcal_hours config variable
 					 * This allows highly volatile web calendars to be cached for a period of time before
 					 * downloading them again
 					 */
 					$realcal_mtime = remote_filemtime($fname);
-				}
-				else {
+				} else {
 					// This is our fallback, for the case where webcal_hours is taking effect
 					$realcal_mtime = $mtime;
 				}
@@ -54,7 +54,9 @@ 
 			}
 
 			foreach ($master_array['-3'] as $temp_array) {
-				if (isset($temp_array) && $temp_array !='') $caldisplaynames[] = $temp_array;
+				if (isset($temp_array) && $temp_array !='') {
+					$caldisplaynames[] = $temp_array;
+				}
 			}
 
 			// And the $y magic number is used here to determine if all calendars are up-to-date
@@ -63,8 +65,9 @@ 
 					// At this point, all calendars are up-to-date, so we can simply used the pre-parsed data
 					$parse_file = false;
 					$calendar_name = $master_array['calendar_name'];
-					if (isset($master_array['calendar_tz']))
-						$calendar_tz = $master_array['calendar_tz'];
+					if (isset($master_array['calendar_tz'])) {
+											$calendar_tz = $master_array['calendar_tz'];
+					}
 				}
 			}
 		}
@@ -115,7 +118,9 @@ 
 		include(BASE.'functions/parse/parse_tzs.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, 1024);
 		#if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
 
@@ -266,7 +271,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) {
 						// Start VTODO Parsing
@@ -454,7 +461,9 @@ 
 							$role		= ($role ? $matches5[1] : '');
 
 							// Emergency fallback
-							if (empty($name) && empty($email)) $name = $data;
+							if (empty($name) && empty($email)) {
+								$name = $data;
+							}
 
 							$attendee[] = array ('name'     => stripslashes($name),
 												 'email'    => stripslashes($email),
@@ -471,7 +480,9 @@ 
 							$name		= ($name ? $matches2[1] : $email);
 
 							// Emergency fallback
-							if (empty($name) && empty($email)) $name = $data;
+							if (empty($name) && empty($email)) {
+								$name = $data;
+							}
 
 							$organizer[] = array ('name' => stripslashes($name), 'email' => stripslashes($email));
 							break;
@@ -485,7 +496,9 @@ 
 							$url = $data;
 							break;
 						default:
-							if(strpos(':',$data) > 1) $other .= $data;
+							if(strpos(':',$data) > 1) {
+								$other .= $data;
+							}
 					}
 				}
 			}
@@ -497,10 +510,18 @@ 
 			unlink($filename);
 		}
 	}
-	if (!isset($master_array['-3'][$calnumber])) $master_array['-3'][$calnumber] = $actual_calname;
-	if (!isset($master_array['-4'][$calnumber]['mtime'])) $master_array['-4'][$calnumber]['mtime'] = $actual_mtime;
-	if (!isset($master_array['-4'][$calnumber]['filename'])) $master_array['-4'][$calnumber]['filename'] = $filename;
-	if (!isset($master_array['-4'][$calnumber]['webcal'])) $master_array['-4'][$calnumber]['webcal'] = 'no';
+	if (!isset($master_array['-3'][$calnumber])) {
+		$master_array['-3'][$calnumber] = $actual_calname;
+	}
+	if (!isset($master_array['-4'][$calnumber]['mtime'])) {
+		$master_array['-4'][$calnumber]['mtime'] = $actual_mtime;
+	}
+	if (!isset($master_array['-4'][$calnumber]['filename'])) {
+		$master_array['-4'][$calnumber]['filename'] = $filename;
+	}
+	if (!isset($master_array['-4'][$calnumber]['webcal'])) {
+		$master_array['-4'][$calnumber]['webcal'] = 'no';
+	}
 	$calnumber = $calnumber + 1;
 }
 
@@ -523,7 +544,9 @@ 
 	if (isset($master_array) && is_array($master_array) && $phpiCal_config->save_parsed_cals == 'yes') {
 		$write_me = serialize($master_array);
 		$fd = @fopen($parsedcal, 'w');
-		if ($fd == FALSE) exit(error($lang['l_error_cache'], $filename));
+		if ($fd == FALSE) {
+			exit(error($lang['l_error_cache'], $filename));
+		}
 		@fwrite($fd, $write_me);
 		@fclose($fd);
 		@chmod($parsedcal, 0600); // 0640

phpicalendar/functions/is_daylight.php

Braces +5 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	if(isset($tz_array[$timezone]['dt_start'][$year]) && isset($tz_array[$timezone]['st_start'][$year])){
 		$start	= $tz_array[$timezone]['dt_start'][$year];
 		$end 	= $tz_array[$timezone]['st_start'][$year];	
-	}else{
+	} else{
 		switch ($timezone){
 			case 'US/Samoa':                     # array('-1100', '-1100');
 			case 'America/Adak':                 # array('-1000', '-0900');
@@ -83,7 +83,7 @@ 
 				if ($year < 2007){
 					$start 	= strtotime("+1 Sun",strtotime($year."0331"));
 					$end 	= strtotime("-1 Sun",strtotime($year."1101"));
-				}else{
+				} else{
 					$start 	= strtotime("+2 Sun",strtotime($year."0300"));
 					$end 	= strtotime("+1 Sun",strtotime($year."1031"));
 				}
@@ -287,7 +287,9 @@ 
 				$dlst = date('I', $time);
 		}
 	}
-	if (isset($start,$end) && $time >= $start && $time < $end) $dlst = 1;
+	if (isset($start,$end) && $time >= $start && $time < $end) {
+		$dlst = 1;
+	}
 	#echo "$summary $dlst <br>";
 
 	return $dlst;

phpicalendar/functions/parse/parse_tzs.php

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

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

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/parse/overlapping_events.php

Braces +23 added lines, -9 removed lines

@@ -5,8 +5,11 @@ 
 	$x = $a;
 	$y = $b;
 	while ($x != $y) {
-		if ($x < $y) $x += $a;
-		else $y += $b;
+		if ($x < $y) {
+			$x += $a;
+		} else {
+			$y += $b;
+		}
 	}
 	return $x;
 }
@@ -63,8 +66,9 @@ 
 
 	$count = 0;
 	foreach ($ol_ranges as $loop_range) {
-		if ($count < $loop_range['count'])
-			$count = $loop_range['count'];
+		if ($count < $loop_range['count']) {
+					$count = $loop_range['count'];
+		}
 	}
 
 	return $count;
@@ -87,8 +91,12 @@ 
 			// check if blocks overlap
 			if (($loop_block['blockStart'] < $new_block['blockEnd']) && ($loop_block['blockEnd'] > $new_block['blockStart'])) {
 				// define start and end of merged overlap block
-				if ($new_block['blockStart'] > $loop_block['blockStart']) $ol_blocks[$new_block_key]['blockStart'] = $loop_block['blockStart'];
-				if ($new_block['blockEnd'] < $loop_block['blockEnd']) $ol_blocks[$new_block_key]['blockEnd'] = $loop_block['blockEnd'];
+				if ($new_block['blockStart'] > $loop_block['blockStart']) {
+					$ol_blocks[$new_block_key]['blockStart'] = $loop_block['blockStart'];
+				}
+				if ($new_block['blockEnd'] < $loop_block['blockEnd']) {
+					$ol_blocks[$new_block_key]['blockEnd'] = $loop_block['blockEnd'];
+				}
 				$ol_blocks[$new_block_key]['events'] = array_merge($new_block['events'], $loop_block['events']);
 				$new_block['events'] = $ol_blocks[$new_block_key]['events'];
 				foreach ($loop_block['overlapRanges'] as $ol_range) {
@@ -134,7 +142,9 @@ 
 	//		'end'	- end_time for the overlap block.
 function checkOverlap($event_date, $event_time, $uid) {
 	global $master_array, $overlap_array;
-	if (!isset($event_date)) return;
+	if (!isset($event_date)) {
+		return;
+	}
 	$event = $master_array[$event_date][$event_time][$uid];
 	// Copy out the array - we replace this at the end.
 	$ol_day_array = @$overlap_array[$event_date];
@@ -150,8 +160,12 @@ 
 				// ... unless it's already in the $ol_block
 				if (!in_array(array('time' => $drawTimes['draw_start'], 'key' => $uid), $loop_ol_block['events'])) {
 					$loop_ol_block['events'][] = array('time' => $drawTimes['draw_start'], 'key' => $uid);
-					if ($loop_ol_block['blockStart'] > $drawTimes['draw_start']) $loop_ol_block['blockStart'] = $drawTimes['draw_start'];
-					if ($loop_ol_block['blockEnd'] < $drawTimes['draw_end']) $loop_ol_block['blockEnd'] = $drawTimes['draw_end'];
+					if ($loop_ol_block['blockStart'] > $drawTimes['draw_start']) {
+						$loop_ol_block['blockStart'] = $drawTimes['draw_start'];
+					}
+					if ($loop_ol_block['blockEnd'] < $drawTimes['draw_end']) {
+						$loop_ol_block['blockEnd'] = $drawTimes['draw_end'];
+					}
 
 					// Merge in the new overlap range
 					$loop_ol_block['overlapRanges'] = merge_range($loop_ol_block['overlapRanges'], $drawTimes['draw_start'], $drawTimes['draw_end']);

phpicalendar/functions/calendar_functions.php

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/functions/admin_functions.php

Braces +35 added lines, -32 removed lines

@@ -6,10 +6,10 @@ 
 	global $_SESSION;
 	if (!isset($_SESSION['phpical_loggedin']) || $_SESSION['phpical_loggedin'] == FALSE) {
 		return FALSE;
+	} else {
+			return TRUE;
+	}
 	}
-	else
-		return TRUE;
-}
 
 // Attempt to login. If login is valid, set the session variable 'phpical_loggedin' to TRUE and store the username and password in the session
 //
@@ -51,7 +51,9 @@ 
 	
 	// set up basic connection
 	$conn_id = @ftp_connect($phpiCal_config->ftp_server, $phpiCal_config->ftp_port); 
-	if (!$conn_id) exit(error('Cannot connect to FTP server', $filename));
+	if (!$conn_id) {
+		exit(error('Cannot connect to FTP server', $filename));
+	}
 	// login with username and password
 	$login_result = @ftp_login($conn_id, $username, $password); 
 	
@@ -74,11 +76,12 @@ 
 function login_internal ($username, $password) {
 	global $phpiCal_config;
 	
-	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password)
-		return TRUE;
-	else
-		return FALSE;
-}
+	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password) {
+			return TRUE;
+	} else {
+			return FALSE;
+	}
+	}
 
 // Delete a calendar. If using ftp for authentication, use ftp to delete. Otherwise, use file system functions.
 //
@@ -100,15 +103,17 @@ 
 		$login_result = @ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
 		
 		// check connection
-		if ((!$conn_id) || (!$login_result))
-			return FALSE;
+		if ((!$conn_id) || (!$login_result)) {
+					return FALSE;
+		}
 		
 		// delete the file
 		$delete = @ftp_delete($conn_id, $filename); 
 		
 		// check delete status
-		if (!$delete)
-			return FALSE;
+		if (!$delete) {
+					return FALSE;
+		}
 		
 		// close the FTP stream 
 		@ftp_close($conn_id);
@@ -131,8 +136,7 @@ 
 		clearstatcache();
 		if (@file_exists($filename)) {
 			return FALSE;
-		}
-		else {
+		} else {
 			return TRUE;
 		}
 		
@@ -161,28 +165,28 @@ 
 		$login_result = ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
 		
 		// check connection
-		if ((!$conn_id) || (!$login_result))
-			return FALSE;
+		if ((!$conn_id) || (!$login_result)) {
+					return FALSE;
+		}
 		
 		// upload the file
 		$upload = ftp_put($conn_id, $destination, $source, FTP_ASCII); 
 		
 		// check upload status
-		if (!$upload)
-			return FALSE;
+		if (!$upload) {
+					return FALSE;
+		}
 		
 		// close the FTP stream 
 		ftp_close($conn_id);
 		
 		return TRUE;
-	}
-	else {
+	} else {
 		$destination = $calendar_path . "/" . basename($destination);
 		
 		if (check_php_version('4.0.3')) {
 			return move_uploaded_file($source, $destination);
-		}
-		else {
+		} else {
 			return copy($source, $destination);
 		}
 	}
@@ -197,9 +201,9 @@ 
 	global $phpiCal_config;
 	global $calendar_path;
 	
-	if ($phpiCal_config->ftp_calendar_path != '')
-		return $phpiCal_config->ftp_calendar_path;
-	else {
+	if ($phpiCal_config->ftp_calendar_path != '') {
+			return $phpiCal_config->ftp_calendar_path;
+	} else {
 		return str_replace ("\\", "/", realpath($calendar_path));
 	}
 }
@@ -212,8 +216,9 @@ 
 	// intval used for version like "4.0.4pl1"
 	$testVer=intval(str_replace(".", "",$version));
 	$curVer=intval(str_replace(".", "",phpversion()));
-	if( $curVer < $testVer )
-		return FALSE;
+	if( $curVer < $testVer ) {
+			return FALSE;
+	}
 	return TRUE;
 }
 
@@ -257,8 +262,7 @@ 
 				$error = $error . $upload_error . ": " . $upload_error_gen_lang;
 				break;
 		}
-	}
-	else {
+	} else {
 		$error = $upload_error_gen_lang;
 	}
 	
@@ -273,8 +277,7 @@ 
 	// Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother...
 	if(preg_match("/.ics$/i", $filename)) {
 		return TRUE;
-	}
-	else {
+	} else {
 		return FALSE;
 	}
 }