smtech / canvas-ics-sync

phpicalendar/functions/userauth_functions.php

Spacing +8 added lines, -8 removed lines

@@ -54,9 +54,9 @@ 
 	}
 
 	// Look for a login cookie.
-	if ($phpiCal_config->login_cookies == 'yes' && isset($_COOKIE['phpicalendar_login'])){
+	if ($phpiCal_config->login_cookies == 'yes' && isset($_COOKIE['phpicalendar_login'])) {
 		$login_cookie = unserialize(stripslashes($_COOKIE['phpicalendar_login']));
-		if (isset($login_cookie['username']) &&	isset($login_cookie['password'])){
+		if (isset($login_cookie['username']) && isset($login_cookie['password'])) {
 			$username = $login_cookie['username'];
 			$password = $login_cookie['password'];
 		}
@@ -66,9 +66,9 @@ 
 	if ($phpiCal_config->login_cookies != 'yes') {
 		if (!session_id()) {
 			session_start();
-			setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
+			setcookie(session_name(), session_id(), time() + (60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
 		}
-		if (isset($_SESSION['username'], $_SESSION['password'])){
+		if (isset($_SESSION['username'], $_SESSION['password'])) {
 			$username = $_SESSION['username'];
 			$password = $_SESSION['password'];
 		}
@@ -81,7 +81,7 @@ 
 #		$password = $_GET['password'];
 #	} else
 
-	if (isset($_POST['username'], $_POST['password'])){
+	if (isset($_POST['username'], $_POST['password'])) {
 		$username = $_POST['username'];
 		$password = $_POST['password'];
 	}
@@ -96,7 +96,7 @@ 
 	// Set the login cookie or session authentication values.
 	if ($phpiCal_config->login_cookies == 'yes' && empty($_COOKIE['phpicalendar_login'])) {
 		$the_cookie = serialize(array('username' => $username, 'password' => $password));
-		setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
+		setcookie('phpicalendar_login', $the_cookie, time() + (60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
 	} else {
 		$_SESSION['username'] = $username;
 		$_SESSION['password'] = $password;
@@ -115,13 +115,13 @@ 
 
 	// Clear the login cookie or session authentication values.
 	if ($phpiCal_config->login_cookies == 'yes') {
-		setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $phpiCal_config->cookie_uri, 0);
+		setcookie('phpicalendar_login', '', time() - (60*60*24*7), '/', $phpiCal_config->cookie_uri, 0);
 		unset($_COOKIE['phpicalendar_login']);
 	} else {
 		// Check if the session has already been started.
 		if (!session_id()) {
 			session_start();
-			setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
+			setcookie(session_name(), session_id(), time() + (60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
 		}
 
 		// Clear the session authentication values.

phpicalendar/functions/draw_functions.php

Spacing +24 added lines, -24 removed lines

@@ -1,76 +1,76 @@
 <?php
 # drawEventTimes returns starttime and endtime and event length for drawing into a grid
-function drawEventTimes ($start, $end, $long_event = FALSE) {
+function drawEventTimes($start, $end, $long_event = FALSE) {
 	global  $phpiCal_config;
 	$sta_h = $sta_min = $end_h = $end_min = "00";
 	$gridLength = $phpiCal_config->gridLength;
-	if (preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time)){
+	if (preg_match('/([0-9]{2})([0-9]{2})/', $start, $time)) {
 		$sta_h   = $time[1];
 		$sta_min = $time[2];
 	}
-	$sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength);
+	$sta_min = sprintf("%02d", floor($sta_min/$gridLength)*$gridLength);
 	if ($sta_min == 60) {
 		$sta_h = sprintf("%02d", ($sta_h + 1));
 		$sta_min = "00";
 	}
 	
-	if (preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time)){
+	if (preg_match('/([0-9]{2})([0-9]{2})/', $end, $time)) {
 		$end_h   = $time[1];
 		$end_min = $time[2];
 	}
-	$end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength);
+	$end_min = sprintf("%02d", floor($end_min/$gridLength)*$gridLength);
 	if ($end_min == 60) {
 		$end_h = sprintf("%02d", ($end_h + 1));
 		$end_min = "00";
 	}
 	
-	if ((!$long_event) && (($sta_h . $sta_min) == ($end_h . $end_min))) {
+	if ((!$long_event) && (($sta_h.$sta_min) == ($end_h.$end_min))) {
 		$end_min += $gridLength;
 		if ($end_min == 60) {
 			$end_h = sprintf("%02d", ($end_h + 1));
 			$end_min = "00";
 		}
 	}
-	$draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min);
+	$draw_len = ($end_h*60 + $end_min) - ($sta_h*60 + $sta_min);
 
-	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);
+	return array("draw_start" => ($sta_h.$sta_min), "draw_end" => ($end_h.$end_min), "draw_length" => $draw_len);
 }
 
 // word wrap function that returns specified number of lines
 // when lines is 0, it returns the entire string as wordwrap() does it
-function word_wrap($str, $length, $lines=0) {
+function word_wrap($str, $length, $lines = 0) {
 	if ($lines > 0) {
-		$len = $length * $lines;
+		$len = $length*$lines;
 		//if ($len < strlen($str)) {
 		// $str = substr($str,0,$len).'...';
 		//}
-		$rstr=bite_str($str,0,$len+1);
+		$rstr = bite_str($str, 0, $len + 1);
 	}
 	return $rstr;
 }
 
 // String intercept By Bleakwind
 // utf-8:$byte=3 | gb2312:$byte=2 | big5:$byte=2
-function bite_str($string, $start, $len, $byte=3){
+function bite_str($string, $start, $len, $byte = 3) {
 	$str = "";
 	$count = 0;
 	$str_len = strlen($string);
-	for ($i=0; $i<$str_len; $i++) {
-		if (($count+1-$start)>$len) {
+	for ($i = 0; $i < $str_len; $i++) {
+		if (($count + 1 - $start) > $len) {
 			$str .= "...";
 			break;
-		} elseif ((ord(substr($string,$i,1)) <= 128) && ($count < $start)){
+		} elseif ((ord(substr($string, $i, 1)) <= 128) && ($count < $start)) {
 			$count++;
-		} elseif ((ord(substr($string,$i,1)) > 128) && ($count < $start)){
-			$count = $count+2;
-			$i = $i+$byte-1;
-		} elseif ((ord(substr($string,$i,1)) <= 128) && ($count >= $start)){
-			$str .= substr($string,$i,1);
+		} elseif ((ord(substr($string, $i, 1)) > 128) && ($count < $start)) {
+			$count = $count + 2;
+			$i = $i + $byte - 1;
+		} elseif ((ord(substr($string, $i, 1)) <= 128) && ($count >= $start)) {
+			$str .= substr($string, $i, 1);
 			$count++;
-		} elseif ((ord(substr($string,$i,1)) > 128) && ($count >= $start)){
-			$str .= substr($string,$i,$byte);
-			$count = $count+2;
-			$i = $i+$byte-1;
+		} elseif ((ord(substr($string, $i, 1)) > 128) && ($count >= $start)) {
+			$str .= substr($string, $i, $byte);
+			$count = $count + 2;
+			$i = $i + $byte - 1;
 		}
 	}
 	return $str;

phpicalendar/functions/ical_parser.php

Spacing +37 added lines, -37 removed lines

@@ -13,13 +13,13 @@ 
 if ($phpiCal_config->save_parsed_cals == 'yes') {
 	sort($cal_filelist);
 	$filename = sha1(implode(',', $cal_filelist));
-	$parsedcal = $phpiCal_config->tmp_dir . '/parsedcal-' . $filename . '-' . $this_year;
+	$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.$filename.'-'.$this_year;
 	if (file_exists($parsedcal)) {
 		$fd = fopen($parsedcal, 'r');
 		$contents = fread($fd, filesize($parsedcal));
 		fclose($fd);
 		$master_array = unserialize($contents);
-		$y=0;
+		$y = 0;
 		// Check the calendars' last-modified time to determine if any need to be re-parsed
 		if (count($master_array['-4']) == count($cal_filelist)) {
 			foreach ($master_array['-4'] as $temp_array) {
@@ -34,7 +34,7 @@ 
 					 */
 					$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
@@ -54,7 +54,7 @@ 
 			}
 
 			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
@@ -76,7 +76,7 @@ 
 }
 
 if ($parse_file) {
-	$overlap_array = array ();
+	$overlap_array = array();
 	$uid_counter = 0;
 }
 
@@ -124,7 +124,7 @@ 
 
 		// Set default calendar name - can be overridden by X-WR-CALNAME
 		$calendar_name = $cal_filename;
-		$master_array['calendar_name'] 	= $calendar_name;
+		$master_array['calendar_name'] = $calendar_name;
 
 		// read file in line by line
 		// XXX end line is skipped because of the 1-line readahead
@@ -134,7 +134,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);
 			}
@@ -173,17 +173,17 @@ 
 
 					$except_dates 	= array();
 					$except_times 	= array();
-					$rrule_array 	= array();
+					$rrule_array = array();
 					$byday  	 	= array();
 					$bymonth	 	= array();
 					$bymonthday 	= array();
 					$byyearday  	= array();
 					$bysetpos   	= array();
 					$first_duration = TRUE;
-					$count 			= 1000000;
+					$count = 1000000;
 					$valarm_set 	= FALSE;
-					$attendee		= array();
-					$organizer		= array();
+					$attendee = array();
+					$organizer = array();
 
 					break;
 				case 'END:VFREEBUSY':
@@ -213,7 +213,7 @@ 
 						}
 					}
 
-					$master_array['-2']["$vtodo_sort"]["$uid"] = array (
+					$master_array['-2']["$vtodo_sort"]["$uid"] = array(
 						'start_date' => $start_date,
 						'start_time' => $start_time,
 						'vtodo_text' => $summary,
@@ -261,12 +261,12 @@ 
 
 				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) {
 						// Start VTODO Parsing
@@ -312,8 +312,8 @@ 
 							$start_time = $datetime[2];
 							$allday_start = $datetime[3];
 							$start_tz = $datetime[4];
-							preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
-							$vevent_start_date = $regs[1] . $regs[2] . $regs[3];
+							preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
+							$vevent_start_date = $regs[1].$regs[2].$regs[3];
 							$day_offset = dayCompare($start_date, $vevent_start_date);
 							#echo date("Ymd Hi", $start_unixtime)." $start_date $start_time $vevent_start_date $day_offset<br>";
 							break;
@@ -331,13 +331,13 @@ 
 							foreach ($data as $exdata) {
 								$exdata = str_replace('T', '', $exdata);
 								$exdata = str_replace('Z', '', $exdata);
-								preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $exdata, $regs);
-								$except_dates[] = $regs[1] . $regs[2] . $regs[3];
+								preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $exdata, $regs);
+								$except_dates[] = $regs[1].$regs[2].$regs[3];
 								// Added for Evolution, since they dont think they need to tell me which time to exclude.
 								if ($regs[4] == '' && isset($start_time) && $start_time != '') {
 									$except_times[] = $start_time;
 								} else {
-									$except_times[] = $regs[4] . $regs[5];
+									$except_times[] = $regs[4].$regs[5];
 								}
 							}
 							break;
@@ -366,8 +366,8 @@ 
 
 						case 'RECURRENCE-ID':
 							$parts = explode(';', $field);
-							foreach($parts as $part) {
-								$eachval = split('=',$part);
+							foreach ($parts as $part) {
+								$eachval = split('=', $part);
 								if ($eachval[0] == 'RECURRENCE-ID') {
 									// do nothing
 								} elseif ($eachval[0] == 'TZID') {
@@ -384,9 +384,9 @@ 
 
 							$data = str_replace('T', '', $data);
 							$data = str_replace('Z', '', $data);
-							ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs);
-							$recurrence_id['date'] = $regs[1] . $regs[2] . $regs[3];
-							$recurrence_id['time'] = $regs[4] . $regs[5];
+							ereg('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs);
+							$recurrence_id['date'] = $regs[1].$regs[2].$regs[3];
+							$recurrence_id['time'] = $regs[4].$regs[5];
 
 							$recur_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
 
@@ -422,21 +422,21 @@ 
 							break;
 						case 'DURATION':
 							if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) {
-								ereg ('^P([0-9]{1,2}[W])?([0-9]{1,3}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration);
+								ereg('^P([0-9]{1,2}[W])?([0-9]{1,3}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration);
 								$weeks 			= str_replace('W', '', $duration[1]);
-								$days 			= str_replace('D', '', $duration[2]);
+								$days = str_replace('D', '', $duration[2]);
 								$hours 			= str_replace('H', '', $duration[4]);
 								$minutes 		= str_replace('M', '', $duration[5]);
 								$seconds 		= str_replace('S', '', $duration[6]);
-								$the_duration 	= ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds);
+								$the_duration = ($weeks*60*60*24*7) + ($days*60*60*24) + ($hours*60*60) + ($minutes*60) + ($seconds);
 								$first_duration = FALSE;
 							}
 							break;
 						case 'RRULE':
-							$data = str_replace ('RRULE:', '', $data);
-							$rrule = split (';', $data);
+							$data = str_replace('RRULE:', '', $data);
+							$rrule = split(';', $data);
 							foreach ($rrule as $recur) {
-								ereg ('(.*)=(.*)', $recur, $regs);
+								ereg('(.*)=(.*)', $recur, $regs);
 								$rrule_array[$regs[1]] = $regs[2];
 							}
 							break;
@@ -444,19 +444,19 @@ 
 							$email		= preg_match('/mailto:(.*)/i', $data, $matches1);
 							$name		= preg_match('/CN=([^;]*)/i', $field, $matches2);
 							$rsvp 		= preg_match('/RSVP=([^;]*)/i', $field, $matches3);
-							$partstat	= preg_match('/PARTSTAT=([^;]*)/i', $field, $matches4);
+							$partstat = preg_match('/PARTSTAT=([^;]*)/i', $field, $matches4);
 							$role		= preg_match('/ROLE=([^;]*)/i', $field, $matches5);
 
-							$email		= ($email ? $matches1[1] : '');
+							$email = ($email ? $matches1[1] : '');
 							$name		= ($name ? $matches2[1] : $email);
 							$rsvp		= ($rsvp ? $matches3[1] : '');
-							$partstat	= ($partstat ? $matches4[1] : '');
+							$partstat = ($partstat ? $matches4[1] : '');
 							$role		= ($role ? $matches5[1] : '');
 
 							// Emergency fallback
 							if (empty($name) && empty($email)) $name = $data;
 
-							$attendee[] = array ('name'     => stripslashes($name),
+							$attendee[] = array('name'     => stripslashes($name),
 												 'email'    => stripslashes($email),
 									        	 'RSVP'     => stripslashes($rsvp),
 									        	 'PARTSTAT' => stripslashes($partstat),
@@ -473,7 +473,7 @@ 
 							// Emergency fallback
 							if (empty($name) && empty($email)) $name = $data;
 
-							$organizer[] = array ('name' => stripslashes($name), 'email' => stripslashes($email));
+							$organizer[] = array('name' => stripslashes($name), 'email' => stripslashes($email));
 							break;
 						case 'LOCATION':
 							$data = str_replace('$', '&#36;', $data);
@@ -485,7 +485,7 @@ 
 							$url = $data;
 							break;
 						default:
-							if(strpos(':',$data) > 1) $other .= $data;
+							if (strpos(':', $data) > 1) $other .= $data;
 					}
 				}
 			}

phpicalendar/functions/is_daylight.php

Spacing +22 added lines, -22 removed lines

@@ -2,22 +2,22 @@ 
 /* 	values are offset in hhmm (not seconds!) relative to GMT
 	case The first value is for standard, and the second value is for daylight
 */
-function is_daylight($time, $timezone){
+function is_daylight($time, $timezone) {
 	global $tz_array, $summary;
 	# default to std time, overwrite if daylight.
 	$dlst = 0;
 	# Subtract the offset for std time.  This will be slightly off in some cases, but will be closer than using nothing (?).
 	$time = $time - calcOffset($tz_array[$timezone][0]);
 	$year = date("Y", $time);
-	$month = date("m",$time);
-	$day = date("d",$time);
-	$hour = date("H",$time);
+	$month = date("m", $time);
+	$day = date("d", $time);
+	$hour = date("H", $time);
 	
-	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{
-		switch ($timezone){
+	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 {
+		switch ($timezone) {
 			case 'US/Samoa':                     # array('-1100', '-1100');
 			case 'America/Adak':                 # array('-1000', '-0900');
 			case 'America/Atka':    
@@ -80,18 +80,18 @@ 
 			case 'Canada/Newfoundland':
 			case 'America/Godthab':              # array('-0300', '-0200');
 			case 'America/Miquelon':   
-				if ($year < 2007){
-					$start 	= strtotime("+1 Sun",strtotime($year."0331"));
-					$end 	= strtotime("-1 Sun",strtotime($year."1101"));
-				}else{
-					$start 	= strtotime("+2 Sun",strtotime($year."0300"));
-					$end 	= strtotime("+1 Sun",strtotime($year."1031"));
+				if ($year < 2007) {
+					$start 	= strtotime("+1 Sun", strtotime($year."0331"));
+					$end 	= strtotime("-1 Sun", strtotime($year."1101"));
+				} else {
+					$start 	= strtotime("+2 Sun", strtotime($year."0300"));
+					$end 	= strtotime("+1 Sun", strtotime($year."1031"));
 				}
 				break;
 			case 'America/Havana':          
 			case 'Cuba':                   
-				$start 	= strtotime("+3 Sun",strtotime($year."0300"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));	
+				$start = strtotime("+3 Sun", strtotime($year."0300"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));	
 				break;
 			case 'America/Cancun':     
 			case 'America/Chihuahua':       
@@ -104,8 +104,8 @@ 
 			case 'Mexico/BajaNorte': 
 			case 'Mexico/General':          
 			case 'America/Mazatlan':        
-				$start 	= strtotime("+1 Sun",strtotime($year."0331"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));
+				$start = strtotime("+1 Sun", strtotime($year."0331"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));
 				break;
 			case 'Chile/EasterIsland':           # array('-0500', '-0600');
 			case 'Pacific/Easter':        
@@ -190,8 +190,8 @@ 
 			case 'Europe/Uzhgorod':   
 			case 'Europe/Zaporozhye': 
 			case 'EET':               
-				$start 	= strtotime("-1 Sun",strtotime($year."0401"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));	
+				$start = strtotime("-1 Sun", strtotime($year."0401"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));	
 				break;
 			case 'Africa/Windhoek':       	     # array('+0200', '+0100');
 		
@@ -287,7 +287,7 @@ 
 				$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

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

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

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>';
 }

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

phpicalendar/functions/admin_functions.php

Spacing +27 added lines, -27 removed lines

@@ -2,7 +2,7 @@ 
 // Is the user logged in
 //
 // returns boolean is the user logged in
-function is_loggedin () {
+function is_loggedin() {
 	global $_SESSION;
 	if (!isset($_SESSION['phpical_loggedin']) || $_SESSION['phpical_loggedin'] == FALSE) {
 		return FALSE;
@@ -16,7 +16,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was the login successful
-function login ($username, $password) {
+function login($username, $password) {
 	global $_SESSION;
 	global $phpiCal_config;
 	
@@ -46,7 +46,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was login successful
-function login_ftp ($username, $password) {
+function login_ftp($username, $password) {
 	global $phpiCal_config;
 	
 	// set up basic connection
@@ -71,7 +71,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was login successful
-function login_internal ($username, $password) {
+function login_internal($username, $password) {
 	global $phpiCal_config;
 	
 	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password)
@@ -84,14 +84,14 @@ 
 //
 // arg0: string calendar file - not the full path
 // returns boolean was delete successful
-function delete_cal ($filename) {
+function delete_cal($filename) {
 	global $_SESSION;
 	global $phpiCal_config;
 	global $calendar_path;
 	echo $filename;
 	
 	if ($phpiCal_config->auth_method == 'ftp') {
-		$filename = get_ftp_calendar_path() . "/" . $filename;
+		$filename = get_ftp_calendar_path()."/".$filename;
 		
 		// set up basic connection
 		$conn_id = @ftp_connect($phpiCal_config->ftp_server); 
@@ -119,11 +119,11 @@ 
 		$delete = unlink($filename); 
 		clearstatcache();
 		if (@file_exists($filename)) { 
-			$filesys = eregi_replace("/","\\", $filename); 
+			$filesys = eregi_replace("/", "\\", $filename); 
 			$delete = system("rm -f $filesys");
 			clearstatcache();
 			if (@file_exists($filename)) { 
-				$delete = chmod ($filename, 0775); 
+				$delete = chmod($filename, 0775); 
 				$delete = unlink($filename); 
 				$delete = system("del $filesys");
 			}
@@ -145,14 +145,14 @@ 
 // arg0: string full path to calendar file
 // arg1: string destination filename
 // returns boolean was copy successful
-function copy_cal ($source, $destination) {
+function copy_cal($source, $destination) {
 	global $_SESSION;
 	global $phpiCal_config;
 	global $calendar_path;
 	
 	if ($phpiCal_config->auth_method == 'ftp') {
-		$destination = get_ftp_calendar_path() . "/" . basename($destination);
-		$destination = str_replace ("\\", "/", realpath($destination));
+		$destination = get_ftp_calendar_path()."/".basename($destination);
+		$destination = str_replace("\\", "/", realpath($destination));
 		
 		// set up basic connection
 		$conn_id = ftp_connect($phpiCal_config->ftp_server); 
@@ -177,7 +177,7 @@ 
 		return TRUE;
 	}
 	else {
-		$destination = $calendar_path . "/" . basename($destination);
+		$destination = $calendar_path."/".basename($destination);
 		
 		if (check_php_version('4.0.3')) {
 			return move_uploaded_file($source, $destination);
@@ -200,7 +200,7 @@ 
 	if ($phpiCal_config->ftp_calendar_path != '')
 		return $phpiCal_config->ftp_calendar_path;
 	else {
-		return str_replace ("\\", "/", realpath($calendar_path));
+		return str_replace("\\", "/", realpath($calendar_path));
 	}
 }
 
@@ -210,9 +210,9 @@ 
 // return boolean true if $version is >= current php version
 function check_php_version($version) {
 	// intval used for version like "4.0.4pl1"
-	$testVer=intval(str_replace(".", "",$version));
-	$curVer=intval(str_replace(".", "",phpversion()));
-	if( $curVer < $testVer )
+	$testVer = intval(str_replace(".", "", $version));
+	$curVer = intval(str_replace(".", "", phpversion()));
+	if ($curVer < $testVer)
 		return FALSE;
 	return TRUE;
 }
@@ -221,14 +221,14 @@ 
 //
 // arg0: string filename
 // returns boolean is the uploaded a file
-function is_uploaded_file_v4 ($filename) {
+function is_uploaded_file_v4($filename) {
     if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
         $tmp_file = dirname(tempnam('', ''));
     }
-    $tmp_file .= '/' . basename($filename);
+    $tmp_file .= '/'.basename($filename);
     // For Windows compat
-    $filename = str_replace ("\\", "/", $filename);
-    $tmp_file = str_replace ("\\", "/", $tmp_file);
+    $filename = str_replace("\\", "/", $filename);
+    $tmp_file = str_replace("\\", "/", $tmp_file);
     // User might have trailing slash in php.ini... 
     return (ereg_replace('/+', '/', $tmp_file) == $filename);
 }
@@ -237,24 +237,24 @@ 
 //
 // arg0: array error number from $_FILES[file]['error']
 // returns string error message
-function get_upload_error ($upload_error) {
+function get_upload_error($upload_error) {
 	global $php_error_lang;
 	global $upload_error_lang;
 	global $upload_error_gen_lang;
 	
 	if (isset($upload_error)) {
 		// This is only available in PHP >= 4.2.0
-		$error = $php_error_lang . " ";
-		switch($upload_error) {
+		$error = $php_error_lang." ";
+		switch ($upload_error) {
 			case 0: //no error; possible file attack!
 			case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 			case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 			case 3: //uploaded file was only partially uploaded
 			case 4: //no file was uploaded
-				$error = $error . $upload_error . ": " . $upload_error_lang[$upload_error];
+				$error = $error.$upload_error.": ".$upload_error_lang[$upload_error];
 				break;
 			default: //a default error, just in case!  :)
-				$error = $error . $upload_error . ": " . $upload_error_gen_lang;
+				$error = $error.$upload_error.": ".$upload_error_gen_lang;
 				break;
 		}
 	}
@@ -269,9 +269,9 @@ 
 //
 // arg0: string filename
 // returns booloean does the filename end in .ics
-function is_uploaded_ics ($filename) {
+function is_uploaded_ics($filename) {
 	// 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)) {
+	if (preg_match("/.ics$/i", $filename)) {
 		return TRUE;
 	}
 	else {