smtech / canvas-ics-sync

include/class/CanvasApiProcess.class.php

Doc Comments +6 added lines

@@ -240,6 +240,9 @@ 
 		return $this->call(CANVAS_API_PUT, $path, $data, $throwsExceptions);
 	}
 	
+	/**
+	 * @param string $page
+	 */
 	private function pageLink($page) {
 		if (array_key_exists($page, $this->lastCall['pagination'])) {
 			$this->pagePest = new Pest($this->lastCall['pagination'][$page]);
@@ -264,6 +267,9 @@ 
 		return $this->pageLink('last');
 	}
 	
+	/**
+	 * @param string $page
+	 */
 	private function getPageNumber($page) {
 		if (array_key_exists($page, $this->lastCall['pagination'])) {
 			parse_str(parse_url($this->lastCall['pagination'][$page], PHP_URL_QUERY), $query);

include/Pest.php

Doc Comments +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
     /**
      * Do CURL request
      * @param resource $curl
-     * @return mixed
+     * @return string
      * @throws Pest_Curl_Exec
      * @throws Pest_Curl_Meta
      */

Braces +31 added lines, -19 removed lines

@@ -150,20 +150,23 @@ 
             throw new Pest_Curl_Init($this->processError(curl_error($curl), 'curl'));
         }
 
-        foreach ($opts as $opt => $val)
-            curl_setopt($curl, $opt, $val);
+        foreach ($opts as $opt => $val) {
+                    curl_setopt($curl, $opt, $val);
+        }
 
         $this->last_request = array(
             'url' => $url
         );
 
-        if (isset($opts[CURLOPT_CUSTOMREQUEST]))
-            $this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
-        else
-            $this->last_request['method'] = 'GET';
+        if (isset($opts[CURLOPT_CUSTOMREQUEST])) {
+                    $this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
+        } else {
+                    $this->last_request['method'] = 'GET';
+        }
 
-        if (isset($opts[CURLOPT_POSTFIELDS]))
-            $this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
+        if (isset($opts[CURLOPT_POSTFIELDS])) {
+                    $this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
+        }
 
         return $curl;
     }
@@ -261,14 +264,16 @@ 
      */
     protected function checkLastResponseForError()
     {
-        if (!$this->throw_exceptions)
-            return;
+        if (!$this->throw_exceptions) {
+                    return;
+        }
 
         $meta = $this->last_response['meta'];
         $body = $this->last_response['body'];
 
-        if ($meta === false)
-            return;
+        if ($meta === false) {
+                    return;
+        }
 
         $err = null;
         switch ($meta['http_code']) {
@@ -302,10 +307,11 @@ 
                 throw new Pest_InvalidRecord($this->processError($body));
                 break;
             default:
-                if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499)
-                    throw new Pest_ClientError($this->processError($body));
-                elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599)
-                    throw new Pest_ServerError($this->processError($body)); elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
+                if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499) {
+                                    throw new Pest_ClientError($this->processError($body));
+                } elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599) {
+                                    throw new Pest_ServerError($this->processError($body));
+                } elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
                     throw new Pest_UnknownResponse($this->processError($body));
                 }
         }
@@ -356,7 +362,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -405,7 +413,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -456,7 +466,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 

phpicalendar/caldav.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return $basePath;
 	}
 
+	/**
+	 * @param string $absolutePath
+	 */
 	function deletePath($absolutePath) {
 		$dirs = array();
 		$paths = array();

phpicalendar/functions/admin_functions.php

Doc Comments +3 added lines

@@ -208,6 +208,9 @@
 //
 // arg0: string version of php to check against
 // return boolean true if $version is >= current php version
+/**
+ * @param string $version
+ */
 function check_php_version($version) {
 	// intval used for version like "4.0.4pl1"
 	$testVer=intval(str_replace(".", "",$version));

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

phpicalendar/functions/date_functions.php

Doc Comments +9 added lines

@@ -75,6 +75,9 @@ 
  * Resolve relative paths
  * Utility function for remote_filemtime()
  */
+/**
+ * @param string $rel_path
+ */
 function resolve_path($url, $rel_path) {
 	if (parse_url($rel_path) !== FALSE) {
 		// Path is a URL
@@ -224,6 +227,9 @@ 
 // $have is the current offset (ie, '-0500')
 // $want is the wanted offset (ie, '-0700')
 // $time is the unixtime relative to $have
+/**
+ * @param integer $time
+ */
 function calcTime($have, $want, $time) {
 	if ($have == 'none' || $want == 'none') return $time;
 	$have_secs = calcOffset($have);
@@ -233,6 +239,9 @@ 
 	return $time;
 }
 
+/**
+ * @param integer $time
+ */
 function chooseOffset($time, $timezone = '') {
 	global $tz_array, $summary;
 	switch ($timezone) {

Braces +48 added lines, -16 removed lines

@@ -12,11 +12,15 @@ 
  */
 function remote_filemtime($url, $recurse = 0) {
 	// We hate infinite loops!
-	if (++$recurse > 5) return 0;
+	if (++$recurse > 5) {
+		return 0;
+	}
 	
 	// Caching the remote mtime is a Really Good Idea.
 	static $remote_files = array();
-	if (isset($remote_files[$url])) return $remote_files[$url];
+	if (isset($remote_files[$url])) {
+		return $remote_files[$url];
+	}
 
 	$uri = parse_url($url);
 	$uri['proto'] = (
@@ -44,7 +48,9 @@ 
 	$headers = array();
 	while (!feof($handle)) {
 		$line = trim(fgets($handle, 1024));
-		if (empty($line)) break;
+		if (empty($line)) {
+			break;
+		}
 		$headers[] = $line;
 	}
 	fclose($handle);
@@ -64,7 +70,9 @@ 
 				$result = strtotime($value);
 				break;
 		}
-		if ($result) break;
+		if ($result) {
+			break;
+		}
 	}
 
 	$remote_files[$url] = $result;
@@ -121,7 +129,9 @@ 
 function dateOfWeek($Ymd, $day) {
 	global $phpiCal_config;
 	$week_start_day = 'Sunday';
-	if (isset($phpiCal_config->week_start_day)) $week_start_day = $phpiCal_config->week_start_day;
+	if (isset($phpiCal_config->week_start_day)) {
+		$week_start_day = $phpiCal_config->week_start_day;
+	}
 	$timestamp = strtotime($Ymd);
 	$num = date('w', strtotime($week_start_day));
 	$start_day_time = strtotime((date('w',$timestamp)==$num ? "$week_start_day" : "last $week_start_day"), $timestamp);
@@ -216,7 +226,9 @@ 
 	$hours = substr($offset_str, 1, 2);
 	$mins = substr($offset_str, 3, 2);
 	$secs = ((int)$hours * 3600) + ((int)$mins * 60);
-	if ($sign == '-') $secs = 0 - $secs;
+	if ($sign == '-') {
+		$secs = 0 - $secs;
+	}
 	return $secs;
 }
 
@@ -225,7 +237,9 @@ 
 // $want is the wanted offset (ie, '-0700')
 // $time is the unixtime relative to $have
 function calcTime($have, $want, $time) {
-	if ($have == 'none' || $want == 'none') return $time;
+	if ($have == 'none' || $want == 'none') {
+		return $time;
+	}
 	$have_secs = calcOffset($have);
 	$want_secs = calcOffset($want);
 	$diff = $want_secs - $have_secs;
@@ -265,12 +279,16 @@ 
 		$start = localizeDate($dateFormat_week, $arr['start_unixtime']);
 		$end   = localizeDate($dateFormat_week, ($arr['end_unixtime'] - 60));
 		$title = $event_text;
-		if ($start != $end) $title .= "\n$start - $end";
+		if ($start != $end) {
+			$title .= "\n$start - $end";
+		}
 	} else {
 		$start = date($timeFormat, $arr['start_unixtime']);
 		$end   = date($timeFormat, $arr['end_unixtime']);
 		$title = "$start: $event_text";
-		if ($start != $end) $title = "$event_text\n$start - $end";
+		if ($start != $end) {
+			$title = "$event_text\n$start - $end";
+		}
 	}
 
 	if (!empty($arr['location'])) {
@@ -314,7 +332,9 @@ 
 		$event_text = strip_tags($event_text, '<b><i><u><img>');
 	}
 	
-	if (!empty($link_class)) $link_class = ' class="'.$link_class.'"';
+	if (!empty($link_class)) {
+		$link_class = ' class="'.$link_class.'"';
+	}
 
 	if (!empty($event_text)) {
 		$title = strip_tags(str_replace('<br />',"\n",$title));
@@ -360,7 +380,9 @@ 
 	$allday =''; #suppress error on returning undef.
 	// Check for zulu time.
 	$zulu_time = false;
-	if (substr($data,-1) == 'Z') $zulu_time = true;
+	if (substr($data,-1) == 'Z') {
+		$zulu_time = true;
+	}
 	// Pull out the timezone, or use GMT if zulu time was indicated.
 	if (preg_match('/^'.$property.';TZID=/i', $field)) {
 		$tz_tmp = explode('=', $field);
@@ -384,7 +406,9 @@ 
 	// Extract date-time values.
 	// Pull out the date and time values. Minimum year is 1970.
 	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
-	if (!isset ($regs[1])) return;
+	if (!isset ($regs[1])) {
+		return;
+	}
 	if ($regs[1] < 1970) { 
 		$regs[1] = '1970';
 	}
@@ -403,10 +427,14 @@ 
 		$tz_dt = $phpiCal_config->timezone;
 	}
 	// Set the values.
-	if ($allday == '') $unixtime = calcTime($offset_tmp, $server_offset_tmp, $unixtime);
+	if ($allday == '') {
+		$unixtime = calcTime($offset_tmp, $server_offset_tmp, $unixtime);
+	}
 	#echo "offset_tmp $offset_tmp, server_offset_tmp $server_offset_tmp, $unixtime =".date("Ymd His",$unixtime)." $time<br>";
 	$date = date('Ymd', $unixtime);
-	if ($allday == '') $time = date('Hi', $unixtime);
+	if ($allday == '') {
+		$time = date('Hi', $unixtime);
+	}
 		
 	// Return the results.
 	return array($unixtime, $date, $time, $allday, $tz_dt);
@@ -420,9 +448,13 @@ 
 */
 function match_tz($data){
 	global $tz_array;
-	if (isset($tz_array[$data])) return $data;
+	if (isset($tz_array[$data])) {
+		return $data;
+	}
 	foreach ($tz_array as $key=>$val){
-		if (strpos(" $data",$key) > 0) return $key;
+		if (strpos(" $data",$key) > 0) {
+			return $key;
+		}
 	}
 	return $data;
 }?>
\ No newline at end of file

phpicalendar/functions/draw_functions.php

Doc Comments +7 added lines

@@ -38,6 +38,9 @@ 
 
 // word wrap function that returns specified number of lines
 // when lines is 0, it returns the entire string as wordwrap() does it
+/**
+ * @param integer $length
+ */
 function word_wrap($str, $length, $lines=0) {
 	if ($lines > 0) {
 		$len = $length * $lines;
@@ -51,6 +54,10 @@ 
 
 // String intercept By Bleakwind
 // utf-8:$byte=3 | gb2312:$byte=2 | big5:$byte=2
+/**
+ * @param integer $start
+ * @param double $len
+ */
 function bite_str($string, $start, $len, $byte=3){
 	$str = "";
 	$count = 0;

phpicalendar/functions/init/sanitize.php

Doc Comments +2 added lines

@@ -35,6 +35,7 @@ 
 
 /**
  * Truncate a string to a specific number of words
+ * @param integer $count
  */
 function chopToWordCount($string, $count) {
     $wc = str_word_count($string);
@@ -49,6 +50,7 @@ 
 
 /**
  * Strip "dangerous" HTML to make it safe to print to web browsers
+ * @param string $string
  */
 function sanitizeForWeb($string) {
     $string = preg_replace('/<br\s*\/?>/', "\n", $string);

Braces +16 added lines, -6 removed lines

@@ -90,11 +90,15 @@ 
 	switch ($key){
 		case 'action':
 			$actions = array('login','logout','addupdate','delete');
-			if (!in_array($val,$actions)) $val = '';
+			if (!in_array($val,$actions)) {
+				$val = '';
+			}
 			break;
 		case 'date':
 		case 'time':
-			if (!is_numeric($val)) $val = '';
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 			$val = recursiveSanitize($val);
@@ -108,7 +112,7 @@ 
 			if (!is_array($val)){
 				$val = strip_tags($val);
 				$_GET['cal'] = strip_tags($val);
-			}else{
+			} else{
 				unset ($_GET['cal']);
 				foreach($val as $cal){
 					$_GET['cal'][]= strip_tags($cal);
@@ -116,18 +120,24 @@ 
 			}
 			break;
 		case 'getdate':
-			if (!is_numeric($val)) $val = ''; 
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 			$val = recursiveSanitize($val);
 	}
-	if ($key != 'cal') $_GET[$key] = $val;
+	if ($key != 'cal') {
+		$_GET[$key] = $val;
+	}
 
 }
 foreach ($_COOKIE as $key=>$val){
 	switch ($key){
 		case 'time':
-			if (!is_numeric($val)) $val = '';
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 		$val = recursiveSanitize($val);

phpicalendar/functions/is_daylight.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 /* 	values are offset in hhmm (not seconds!) relative to GMT
 	case The first value is for standard, and the second value is for daylight
 */
+/**
+ * @param string $timezone
+ */
 function is_daylight($time, $timezone){
 	global $tz_array, $summary;
 	# default to std time, overwrite if daylight.

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

Doc Comments +3 added lines

@@ -1,6 +1,9 @@
 <?php
 // function to determine maximum necessary columns per day
 // actually an algorithm to get the smallest multiple for two numbers
+/**
+ * @param integer $b
+ */
 function kgv($a, $b) {
 	$x = $a;
 	$y = $b;

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