smtech / canvas-ics-sync

purge.php

Spacing +8 added lines, -8 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once(__DIR__ . '/.ignore.calendar-ics-authentication.inc.php');
-require_once(__DIR__ . '/config.inc.php');
+require_once(__DIR__.'/.ignore.calendar-ics-authentication.inc.php');
+require_once(__DIR__.'/config.inc.php');
 
-require_once(APP_PATH . '/include/page-generator.inc.php');
-require_once(APP_PATH . '/include/canvas-api.inc.php');
-require_once(APP_PATH . '/include/mysql.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
+require_once(APP_PATH.'/include/canvas-api.inc.php');
+require_once(APP_PATH.'/include/mysql.inc.php');
 
 $eventsApi = new CanvasApiProcess(CANVAS_API_URL, CANVAS_API_TOKEN);
 $api = new CanvasApiProcess(CANVAS_API_URL, CANVAS_API_TOKEN);
@@ -20,14 +20,14 @@ 
 	)
 );
 do {
-	foreach($events as $event) {
+	foreach ($events as $event) {
 		$api->delete("calendar_events/{$event['id']}",
 			array(
-				'cancel_reason' => TOOL_NAME . " course_url={$_REQUEST['course_url']}"
+				'cancel_reason' => TOOL_NAME." course_url={$_REQUEST['course_url']}"
 			)
 		);
 	}
-} while($events = $eventsApi->nextPage());
+} while ($events = $eventsApi->nextPage());
 
 echo('Calendar purged.');
 

index.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-require_once(__DIR__ . '/config.inc.php');
+require_once(__DIR__.'/config.inc.php');
 
-require_once(APP_PATH . '/include/page-generator.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
 
 // TODO: might be nice to have an option to remove a previously synced ICS feed
 

export.php

Spacing +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-require_once(__DIR__ . '/.ignore.calendar-ics-authentication.inc.php');
-require_once(__DIR__ . '/config.inc.php');
+require_once(__DIR__.'/.ignore.calendar-ics-authentication.inc.php');
+require_once(__DIR__.'/config.inc.php');
 
-require_once(APP_PATH . '/include/page-generator.inc.php');
-require_once(APP_PATH . '/include/canvas-api.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
+require_once(APP_PATH.'/include/canvas-api.inc.php');
 
 
 if (isset($_REQUEST['course_url'])) {
@@ -15,9 +15,9 @@ 
 		displayPage('
 		<h3>Course Calendar ICS Feed</h3>
 		<p>You can subscribe to the calendar for <a href="https://' .
-		parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/courses/' . $courseId .
-		'">' . $course['name'] . '</a> at <a href="' .
-		$webcalFeed . '">' . $webcalFeed .
+		parse_url(CANVAS_API_URL, PHP_URL_HOST).'/courses/'.$courseId.
+		'">'.$course['name'].'</a> at <a href="'.
+		$webcalFeed.'">'.$webcalFeed.
 		'</a> in any calendar application that supports external ICS feeds.</p>'
 		);
 		exit;
@@ -27,7 +27,7 @@ 
 	}
 } else {
 	displayPage('
-	<form method="post" action="' . $_SERVER['PHP_SELF'] . '">
+	<form method="post" action="' . $_SERVER['PHP_SELF'].'">
 		<label for="course_url">Course URL <span class="comment">The URL to the course whose calendar you would like to export as an ICS feed</span></label>
 		<input id="course_url" name="course_url" type="text" />
 		<input type="submit" value="Generate ICS Feed" />

config.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 /* this will break if there are mod_rewrites, but will do for now... */
-define('APP_URL', 'http://' . $_SERVER['SERVER_NAME'] . str_replace(realpath($_SERVER['DOCUMENT_ROOT']), '', realpath(__DIR__)));
+define('APP_URL', 'http://'.$_SERVER['SERVER_NAME'].str_replace(realpath($_SERVER['DOCUMENT_ROOT']), '', realpath(__DIR__)));
 define('APP_PATH', realpath(__DIR__));
 
 /* customize generated pages */

css/lightbox.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../config.inc.php');
+require_once(__DIR__.'/../config.inc.php');
 
 header('Content-type: text/css');
 header('X-Content-Type-Options: nosniff'); // because IE is not trusting

css/script-ui.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__ . '/../config.inc.php');
+require_once(__DIR__.'/../config.inc.php');
 
 header('Content-type: text/css');
 header('X-Content-Type-Options: nosniff'); // because IE is not trusting

phpicalendar/print.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	'getdate'			=> $getdate,
 	'calendar_name'		=> $cal_displayname,
 	'current_view'		=> $current_view,
-    'printview'         => $printview,
+	'printview'         => $printview,
 	'display_date'		=> $display_date,
 	'sidebar_date'		=> @$sidebar_date,
 	'rss_powered'	 	=> $rss_powered,

Spacing +14 added lines, -14 removed lines

@@ -1,42 +1,42 @@
 <?php
 if (!defined('BASE')) define('BASE', './');
-$current_view 		='print';
+$current_view = 'print';
 require_once(BASE.'functions/date_functions.php');
 require_once(BASE.'functions/init.inc.php');
-$start_week_time 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
-$end_week_time 		= $start_week_time + (6 * 25 * 60 * 60);
-$parse_month 		= date ("Ym", strtotime($getdate));
+$start_week_time = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+$end_week_time = $start_week_time + (6*25*60*60);
+$parse_month 		= date("Ym", strtotime($getdate));
 $events_week 		= 0;
-$unix_time 			= strtotime($getdate);
+$unix_time = strtotime($getdate);
 $printview = $phpiCal_config->default_view;
 if (isset($_GET['printview']))	$printview = $_GET['printview'];
 
 if ($printview == 'day') {
-	$display_date 	= localizeDate ($dateFormat_day, strtotime($getdate));
+	$display_date = localizeDate($dateFormat_day, strtotime($getdate));
 	$next 			= date("Ymd", strtotime("+1 day", $unix_time));
 	$prev 			= date("Ymd", strtotime("-1 day", $unix_time));
 	$week_start		= '';
-	$week_end		= '';
+	$week_end = '';
 } elseif ($printview == 'week') {
 	$start_week 	= localizeDate($dateFormat_week, $start_week_time);
 	$end_week 		= localizeDate($dateFormat_week, $end_week_time);
-	$display_date 	= "$start_week - $end_week";
+	$display_date = "$start_week - $end_week";
 	$week_start 	= date("Ymd", $start_week_time);
 	$week_end 		= date("Ymd", $end_week_time);
 	$next 			= date("Ymd", strtotime("+1 week", $unix_time));
 	$prev 			= date("Ymd", strtotime("-1 week", $unix_time));
 } elseif ($printview == 'month') {
-	$display_date 	= localizeDate ($dateFormat_month, strtotime($getdate));
+	$display_date = localizeDate($dateFormat_month, strtotime($getdate));
 	$next 			= date("Ymd", strtotime("+1 month", $unix_time));
 	$prev 			= date("Ymd", strtotime("-1 month", $unix_time));
-	$week_start		= '';
-	$week_end		= '';
+	$week_start = '';
+	$week_end = '';
 } elseif ($printview == 'year') {
-	$display_date 	= localizeDate ($dateFormat_year, strtotime($getdate));
+	$display_date = localizeDate($dateFormat_year, strtotime($getdate));
 	$next 			= date("Ymd", strtotime("+1 year", $unix_time));
 	$prev 			= date("Ymd", strtotime("-1 year", $unix_time));
-	$week_start		= '';
-	$week_end		= '';
+	$week_start = '';
+	$week_end = '';
 }
 require_once(BASE.'functions/ical_parser.php');
 require_once(BASE.'functions/list_functions.php');

Braces +6 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (!defined('BASE')) define('BASE', './');
+if (!defined('BASE')) {
+	define('BASE', './');
+}
 $current_view 		='print';
 require_once(BASE.'functions/date_functions.php');
 require_once(BASE.'functions/init.inc.php');
@@ -9,7 +11,9 @@ 
 $events_week 		= 0;
 $unix_time 			= strtotime($getdate);
 $printview = $phpiCal_config->default_view;
-if (isset($_GET['printview']))	$printview = $_GET['printview'];
+if (isset($_GET['printview'])) {
+	$printview = $_GET['printview'];
+}
 
 if ($printview == 'day') {
 	$display_date 	= localizeDate ($dateFormat_day, strtotime($getdate));

phpicalendar/rss/index.php

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 /* Rewritten by J. Hu 4/2/06*/
 $current_view = 'rss_index';
-define('BASE','../');
+define('BASE', '../');
 require_once(BASE.'functions/init.inc.php');
 require_once(BASE.'functions/calendar_functions.php');
 
@@ -11,10 +11,10 @@ 
 }
 
 if (empty($default_path)) {
-	if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
-		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
+	if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') {
+		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/rss/'));
 	} else {
-		$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
+		$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/rss/'));
 	}
 }
 
@@ -22,7 +22,7 @@ 
 $display_date = "RSS Info";
 
 $rss_list = "<table width='90%'>\n";
-$xml_icon ="<img src = 'feed.png' alt='rss icon'>";
+$xml_icon = "<img src = 'feed.png' alt='rss icon'>";
 $cals[] = '';
 $cal_displaynames[] = $all_cal_comb_lang;
 foreach ($cals as $k=>$file) {
@@ -30,7 +30,7 @@ 
 	// $cal is a urlencoded version of $cal_filename
 	// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
 	
-	$rss_list .= '<tr><td rowspan ="3"><font class="V12" color="blue"><b>'.$cal_displaynames[$k].' '. $lang['l_calendar'].'</b></font></td>';
+	$rss_list .= '<tr><td rowspan ="3"><font class="V12" color="blue"><b>'.$cal_displaynames[$k].' '.$lang['l_calendar'].'</b></font></td>';
 
 /* Changed to show links without urlencode, but links valid urls */
 	$rss_list .= "<td>".$lang['l_day']."</td>";

phpicalendar/rss/rss_common.php

Spacing +60 added lines, -60 removed lines

@@ -34,13 +34,13 @@ 
 //set the range of days to return based on the view chosen
 $rssview = $phpiCal_config->default_view;
 if (isset($_GET['rssview'])) $rssview = $_GET['rssview'];
-if (isset($_GET['getdate']) && $_GET['getdate'] !=''){
+if (isset($_GET['getdate']) && $_GET['getdate'] != '') {
 	$getdate = $_GET['getdate'];
-}else{
+} else {
 	$getdate = date("Ymd");
 }
 # for all views, $fromdate is the first day to be shown and $todate should be the last day.
-switch ($rssview){
+switch ($rssview) {
 	case 'day':
 		$fromdate = $getdate;
 		$todate = date("Ymd", strtotime($getdate) + 60*60*24);
@@ -49,52 +49,52 @@ 
 	case 'today':
 		$fromdate = date("Ymd");
 		$todate = date("Ymd", strtotime('tomorrow'));
-		$theview = $lang['l_todays'] ;
+		$theview = $lang['l_todays'];
 		break;
 	case 'tomorrow':
-		$fromdate = date("Ymd",strtotime('tomorrow'));
+		$fromdate = date("Ymd", strtotime('tomorrow'));
 		$todate = date("Ymd", strtotime('tomorrow') + 60*60*24);
-		$theview = $lang['l_tomorrows'] ;
+		$theview = $lang['l_tomorrows'];
 		break;
 	case 'week':
 		$fromdate = dateOfWeek($getdate, 'Sunday');
 		$todate = date("Ymd", strtotime($fromdate) + 6*24*60*60);
-		$theview = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate));
+		$theview = $lang['l_week']." of ".date('n/d/Y', strtotime($fromdate));
 		break;
 	case 'month':
-		$parse_month = date ("Ym", strtotime($getdate));
-		$fromdate = ($parse_month *100) + 1;
-		$todate = ($parse_month *100) + date("t",strtotime($getdate));
-		$theview = date('M Y',strtotime($fromdate));
+		$parse_month = date("Ym", strtotime($getdate));
+		$fromdate = ($parse_month*100) + 1;
+		$todate = ($parse_month*100) + date("t", strtotime($getdate));
+		$theview = date('M Y', strtotime($fromdate));
 		break;
 	case 'year':
-		if(isset($_GET['year'])){
+		if (isset($_GET['year'])) {
 			$theyear = $_GET['year'];
-		}else{
-			$theyear = substr($getdate,0,4);
+		} else {
+			$theyear = substr($getdate, 0, 4);
 		}
-		$fromdate = ($theyear*10000)+101;	
-		$todate = date("Ymd", strtotime($theyear*10000+1231));
+		$fromdate = ($theyear*10000) + 101;	
+		$todate = date("Ymd", strtotime($theyear*10000 + 1231));
 		$theview = $theyear;
 		break;
 	case 'daysfrom':
 		$fromdate = $getdate;
 		$todate = date("Ymd", strtotime($getdate) + $_GET['days']*60*60*24);
-		$theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate));
+		$theview = $_GET['days']." days from ".date('n/d/Y', strtotime($fromdate));
 		break;
 	case 'daysto':
 		$todate = $getdate;
 		$fromdate = date("Ymd", strtotime($getdate) - $_GET['days']*60*60*24);
-		$theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate));
+		$theview = $_GET['days']." days before ".date('n/d/Y', strtotime($todate));
 		break;
 	case 'range':
-		if(isset($_GET['from'])){
+		if (isset($_GET['from'])) {
 		$fromdate = $_GET['from'];
-		}else{
+		} else {
 			$fromdate = $getdate;
 		}
 		$todate = $_GET['to'];
-		$theview = date('n/d/Y',strtotime($fromdate)).'-'.date('n/d/Y',strtotime($todate));
+		$theview = date('n/d/Y', strtotime($fromdate)).'-'.date('n/d/Y', strtotime($todate));
 		break;
 	default:
 		#default to week
@@ -117,96 +117,96 @@ 
 $events_count = 0;
 
 // calculate a value for Last Modified and ETag
-$cal = implode(",",$cals);
+$cal = implode(",", $cals);
 
 //get filemtime from master array
 $filemod = 0; #default to start of unix era, overwrite with most recent mtime from master array
-foreach ($master_array['-4'] as $calinfo){
+foreach ($master_array['-4'] as $calinfo) {
 	if ($calinfo['mtime'] > $filemod) $filemod = $calinfo['mtime']; 
 }	
 $filemodtime = date("r", $filemod);
 
 //send relevant headers
-header ("Last-Modified: $filemodtime");
-header ("ETag:\"$filemodtime\"");
+header("Last-Modified: $filemodtime");
+header("ETag:\"$filemodtime\"");
 
 // checks the user agents headers to see if they kept track of our
 // stuff, if so be nice and send back a 304 and exit.
 
-if ( (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || (@$_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)){
-	header ("HTTP/1.1 304 Not Modified");
+if ((@$_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || (@$_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)) {
+	header("HTTP/1.1 304 Not Modified");
 	exit;
 }
 
 /* Change languages to ISO 639-1 to validate RSS without changing long version in config.inc.php */
-$user_language = array ("english", "polish", "german", "french", "dutch", "italian", "japanese", "norwegian", "spanish",  "swedish", "portuguese", "catalan", "traditional_chinese", "esperanto", "korean");
-$iso_language = array ("en", "pl", "de", "fr", "nl", "da", "it", "ja", "no", "es", "sv", "pt", "ca", "zh-tw", "eo", "ko");
+$user_language = array("english", "polish", "german", "french", "dutch", "italian", "japanese", "norwegian", "spanish", "swedish", "portuguese", "catalan", "traditional_chinese", "esperanto", "korean");
+$iso_language = array("en", "pl", "de", "fr", "nl", "da", "it", "ja", "no", "es", "sv", "pt", "ca", "zh-tw", "eo", "ko");
 $rss_language = str_replace($user_language, $iso_language, $language);
 /* End language modification */
 
-$rss = 	rss_top();
+$rss = rss_top();
 
 //generate the items
-$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24))+1;
-$thisdate = $fromdate; 	#	start at beginning of date range, 
+$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)) + 1;
+$thisdate = $fromdate; #	start at beginning of date range, 
 						# 	note that usage of $thisdate is different from distribution
 						# 	I use it as a date, dist uses it as a time
 $thistime = strtotime($thisdate);						
-$i = 1;  #day counter
+$i = 1; #day counter
 
 $rss_list = '';
 $rss_items = '';
 $uid_arr = array();
 do {
-	$thisdate=date('Ymd', $thistime);
+	$thisdate = date('Ymd', $thistime);
 	#	echo "Date: $thisdate\ti:$i\tnumdays:$numdays<br>\n";
-	$dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate));
+	$dayofweek = localizeDate("%a %b %e %Y", strtotime($thisdate));
 	if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) {
 		foreach ($master_array[("$thisdate")] as $event_times) {
 			foreach ($event_times as $uid=>$val) {
 				#handle multiday all day events
-				if(!isset($val["event_start"])){
-					if (isset($uid_arr[$uid])){
-						$uid_arr[$uid] .= "+$dayofweek" ;
+				if (!isset($val["event_start"])) {
+					if (isset($uid_arr[$uid])) {
+						$uid_arr[$uid] .= "+$dayofweek";
 						continue;
-					}else{
-						$uid_arr[$uid] = "$dayofweek" ;
+					} else {
+						$uid_arr[$uid] = "$dayofweek";
 					}
 					$event_start = $lang['l_all_day'];
-				}else{	
+				} else {	
 					$event_start 	= @$val["event_start"];	
-					$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
+					$event_start 	= date($timeFormat, @strtotime("$event_start"));
 				}	
 				$event_text 	= stripslashes(urldecode($val["event_text"]));
 				$event_text 	= strip_tags($event_text, '<b><i><u>');
-				$event_text		= str_replace('&','&amp;',$event_text);
-				$event_text		= str_replace('&amp;amp;','&amp;',$event_text);
+				$event_text		= str_replace('&', '&amp;', $event_text);
+				$event_text		= str_replace('&amp;amp;', '&amp;', $event_text);
 			#	$event_text		= urlencode($event_text);
 			#uncomment for shorter event text with ...
 			#	$event_text 	= word_wrap($event_text, 21, $tomorrows_events_lines); 		
 				$description 	= stripslashes(urldecode($val["description"]));
 			#	$description		= str_replace('<br />',"\n",$description);
 				$description 	= strip_tags($description, '<b><i><u><br>');
-				$description		= str_replace('&','&amp;',$description);
-				$description		= str_replace('&amp;amp;','&amp;',$description);
-				$rss_title		= urldecode ("$dayofweek: $event_text");	
-				$urlcal 		= rawurlencode ("$cal");
-				if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){
+				$description		= str_replace('&', '&amp;', $description);
+				$description		= str_replace('&amp;amp;', '&amp;', $description);
+				$rss_title = urldecode("$dayofweek: $event_text");	
+				$urlcal = rawurlencode("$cal");
+				if (isset($rss_link_to_event) && $rss_link_to_event == 'yes') {
 					$event_data = urlencode(serialize($val));
 					$rss_link		= $phpiCal_config->default_path."/includes/event.php?getdate=$thisdate&amp;cal=$cal&amp;event_data=$event_data";
-				}else{
-					$rss_link		=  ($phpiCal_config->default_path."/day.php?getdate=$thisdate&amp;cal=$urlcal");
+				} else {
+					$rss_link		= ($phpiCal_config->default_path."/day.php?getdate=$thisdate&amp;cal=$urlcal");
 	
 				}
-				if (isset($cpath) && $cpath !='') $rss_link.="&amp;cpath=$cpath";
-				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
-				$rss_list .= rss_li($rss_link,$uid);
+				if (isset($cpath) && $cpath != '') $rss_link .= "&amp;cpath=$cpath";
+				$rss_description = htmlspecialchars("$dayofweek $event_start: $description");
+				$rss_list .= rss_li($rss_link, $uid);
 				$rss_items .= rss_item();
 				$events_count++;
 			}
 		}
 	}
-	$thistime = $thistime+(60*60*24); # echo "$thisdate: ".strtotime($thisdate)."->$thistime<br>\n";
+	$thistime = $thistime + (60*60*24); # echo "$thisdate: ".strtotime($thisdate)."->$thistime<br>\n";
 	$i++;	
 } while ($i <= $numdays);
 if (($events_count < 1) && ($i == $numdays)) $rss_items = rss_noitems();
@@ -214,18 +214,18 @@ 
 $rss_list = enclose_items($rss_list);
 $rss .= $rss_list.$rss_items.rss_close();
 
-foreach ($uid_arr as $uid=>$date_range){
+foreach ($uid_arr as $uid=>$date_range) {
 	#echo "date_range:$date_range<br>";
 
-	if(strpos($date_range,"+")>0){
+	if (strpos($date_range, "+") > 0) {
 		#echo "+ in date_range<br>";
-		$temp = explode("+",$date_range);
+		$temp = explode("+", $date_range);
 		$date_range = $temp[0].'-'.array_pop($temp);
 	}
-	$rss = str_replace("<uid>$uid</uid>\n<event_start>".$lang['l_all_day']."</event_start>","<uid>$uid</uid>\n<event_start>$date_range</event_start>", $rss);
+	$rss = str_replace("<uid>$uid</uid>\n<event_start>".$lang['l_all_day']."</event_start>", "<uid>$uid</uid>\n<event_start>$date_range</event_start>", $rss);
 
 }
-header ("Content-Type: application/xml");
+header("Content-Type: application/xml");
 
 echo "$rss";
 

Braces +19 added lines, -11 removed lines

@@ -33,10 +33,12 @@ 
 
 //set the range of days to return based on the view chosen
 $rssview = $phpiCal_config->default_view;
-if (isset($_GET['rssview'])) $rssview = $_GET['rssview'];
+if (isset($_GET['rssview'])) {
+	$rssview = $_GET['rssview'];
+}
 if (isset($_GET['getdate']) && $_GET['getdate'] !=''){
 	$getdate = $_GET['getdate'];
-}else{
+} else{
 	$getdate = date("Ymd");
 }
 # for all views, $fromdate is the first day to be shown and $todate should be the last day.
@@ -70,7 +72,7 @@ 
 	case 'year':
 		if(isset($_GET['year'])){
 			$theyear = $_GET['year'];
-		}else{
+		} else{
 			$theyear = substr($getdate,0,4);
 		}
 		$fromdate = ($theyear*10000)+101;	
@@ -90,7 +92,7 @@ 
 	case 'range':
 		if(isset($_GET['from'])){
 		$fromdate = $_GET['from'];
-		}else{
+		} else{
 			$fromdate = $getdate;
 		}
 		$todate = $_GET['to'];
@@ -122,8 +124,10 @@ 
 //get filemtime from master array
 $filemod = 0; #default to start of unix era, overwrite with most recent mtime from master array
 foreach ($master_array['-4'] as $calinfo){
-	if ($calinfo['mtime'] > $filemod) $filemod = $calinfo['mtime']; 
-}	
+	if ($calinfo['mtime'] > $filemod) {
+		$filemod = $calinfo['mtime'];
+	}
+	}	
 $filemodtime = date("r", $filemod);
 
 //send relevant headers
@@ -169,11 +173,11 @@ 
 					if (isset($uid_arr[$uid])){
 						$uid_arr[$uid] .= "+$dayofweek" ;
 						continue;
-					}else{
+					} else{
 						$uid_arr[$uid] = "$dayofweek" ;
 					}
 					$event_start = $lang['l_all_day'];
-				}else{	
+				} else{	
 					$event_start 	= @$val["event_start"];	
 					$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
 				}	
@@ -194,11 +198,13 @@ 
 				if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){
 					$event_data = urlencode(serialize($val));
 					$rss_link		= $phpiCal_config->default_path."/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
-				}else{
+				} else{
 					$rss_link		=  ($phpiCal_config->default_path."/day.php?getdate=$thisdate&cal=$urlcal");
 	
 				}
-				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
+				if (isset($cpath) && $cpath !='') {
+					$rss_link.="&cpath=$cpath";
+				}
 				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
 				$rss_list .= rss_li($rss_link,$uid);
 				$rss_items .= rss_item();
@@ -209,7 +215,9 @@ 
 	$thistime = $thistime+(60*60*24); # echo "$thisdate: ".strtotime($thisdate)."->$thistime<br>\n";
 	$i++;	
 } while ($i <= $numdays);
-if (($events_count < 1) && ($i == $numdays)) $rss_items = rss_noitems();
+if (($events_count < 1) && ($i == $numdays)) {
+	$rss_items = rss_noitems();
+}
 
 $rss_list = enclose_items($rss_list);
 $rss .= $rss_list.$rss_items.rss_close();