smtech / canvas-ics-sync

phpicalendar/print.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/rss_common.php

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

phpicalendar/rss/rss.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 	if ($theview !=""){$rss .= ' - '.$theview;} 
 	$rss .= "</title>\n";
 	
-	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
+	if (isset($cpath) && $cpath !='') {
+		$rss_link.="?cpath=$cpath";
+	}
 	$rss .= '<link>'.htmlspecialchars("$phpiCal_config->default_path").'</link>'."\n";	
 	$rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n";
 	$rss .= '<language>'.$rss_language.'</language>'."\n";

phpicalendar/rss/rss1.0.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 		xmlns="http://purl.org/rss/1.0/">'."\n";

 	

 	$rss .= '<channel rdf:about="'.$phpiCal_config->default_path.'/rss/rss.php/';

-	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";

+	if (isset($cpath) && $cpath !='') {
+		$rss_link.="?cpath=$cpath";
+	}
 	$rss .='">'."\n";

 	

 	$rss .= '<title>'.$cal_displayname;

phpicalendar/rss/rss2.0.php

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
 	$rss .= "</title>\n";

 	

 	$rss .= '<link>'.$phpiCal_config->default_path.'/rss/rss2.0.php/';

-	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";

+	if (isset($cpath) && $cpath !='') {
+		$rss_link.="?cpath=$cpath";
+	}
 	$rss .='</link>'."\n";

 	$rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n";

 	$rss .= '<language>'.$rss_language.'</language>'."\n";

phpicalendar/functions/init.inc.php

Braces +20 added lines, -8 removed lines

@@ -2,7 +2,9 @@ 
 # require php 5
 $php_started = getmicrotime();
 # define BASE
-if (!defined('BASE')) define('BASE', './');
+if (!defined('BASE')) {
+	define('BASE', './');
+}
 if (phpversion() < '5.1'){
 	die (phpversion()." detected. php 5.1 or higher required for this version.\n\n" );
 }	
@@ -17,12 +19,17 @@ 
 
 // Grab the action (login or logout).
 $action = '';
-if (isset($_GET['action']))			$action = $_GET['action'];
-else if (isset($_POST['action']))	$action = $_POST['action'];											
+if (isset($_GET['action'])) {
+	$action = $_GET['action'];
+} else if (isset($_POST['action'])) {
+	$action = $_POST['action'];
+}
 	
 // Login and/or logout.
 list($username, $password, $invalid_login) = user_login();
-if ($action != 'login') $invalid_login = false;
+if ($action != 'login') {
+	$invalid_login = false;
+}
 if ($action == 'logout' || $invalid_login) {
 	list($username, $password) = user_logout();
 }
@@ -37,8 +44,9 @@ 
 if (isset($_GET['cal']) && $_GET['cal'] !='') {
 	// If the cal value is not an array, split it into an array on
 	// commas.
-	if (!is_array($_GET['cal']))
-		$_GET['cal'] = explode(',', $_GET['cal']);
+	if (!is_array($_GET['cal'])) {
+			$_GET['cal'] = explode(',', $_GET['cal']);
+	}
 	
 	// Grab the calendar filenames off the cal value array.
 	$cal_filenames = $_GET['cal'];
@@ -61,7 +69,9 @@ 
 foreach ($cal_filenames as $cal_filename) {
 	# substitute for md5-obscured list_webcals
 	foreach ($list_webcals as $tmp_cal){
-		if($cal_filename == md5($phpiCal_config->salt.$tmp_cal)) $cal_filename = $tmp_cal;
+		if($cal_filename == md5($phpiCal_config->salt.$tmp_cal)) {
+			$cal_filename = $tmp_cal;
+		}
 	}
 	// If the calendar identifier begins with a web protocol, this is a web
 	// calendar.
@@ -143,7 +153,9 @@ 
 	if (count($local_cals) == 1) {
 		$filename = $local_cals[0];
 		$add_cpath = '';
-		if (isset($cpath) && $cpath !='') $add_cpath = "$cpath/";
+		if (isset($cpath) && $cpath !='') {
+			$add_cpath = "$cpath/";
+		}
 
 		if (($phpiCal_config->download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) {
 			$subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'.$filename;

phpicalendar/functions/list_functions.php

Braces +3 added lines, -1 removed lines

@@ -18,7 +18,9 @@
 	$i = 1;
 	if (is_array($master_array['-3'])) {
 		foreach ($master_array['-3'] as $key => $val) {
-			if ($i > $phpiCal_config->unique_colors) $i = 1;
+			if ($i > $phpiCal_config->unique_colors) {
+				$i = 1;
+			}
 			$val = str_replace ("\,", ",", $val);
 			$return .= '<img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$i.'.gif" alt="" /> '.$val.'<br />';
 			$i++;

phpicalendar/functions/init/sanitize.php

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/init/configs.php

Braces +41 added lines, -19 removed lines

@@ -3,22 +3,24 @@ 
 include_once(BASE.'default_config.php');
 if (is_file(BASE.'config.inc.php')){
 	include(BASE.'config.inc.php');
-	foreach($configs as $key=>$value) $phpiCal_config->setProperty($key, $value);
-}
+	foreach($configs as $key=>$value) {
+		$phpiCal_config->setProperty($key, $value);
+	}
+	}
 
 # adjust gridlength to allowed values
 $g = $phpiCal_config->gridLength;
 if (!in_array($g,array(1,2,3,4,10,12,15,20,30,60)) && $g < 11){
 	$g = 10;
-}elseif($g < 13){
+} elseif($g < 13){
 	$g = 12;
-}elseif($g < 17){
+} elseif($g < 17){
 	$g = 15;
-}elseif($g < 25){
+} elseif($g < 25){
 	$g = 20;
-}elseif($g < 45){
+} elseif($g < 45){
 	$g = 30;
-}else{
+} else{
 	$g = 60;
 }
 $phpiCal_config->setProperty('gridLength', $g);
@@ -26,23 +28,41 @@ 
 
 if ($phpiCal_config->cookie_uri == '') {
 	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')) );
-	if ($phpiCal_config->cookie_uri == 'localhost')	$phpiCal_config->setProperty('cookie_uri', '');
-}
+	if ($phpiCal_config->cookie_uri == 'localhost') {
+		$phpiCal_config->setProperty('cookie_uri', '');
+	}
+	}
 $cookie_name = 'phpicalendar_'.basename($phpiCal_config->default_path);
 if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset']) && $current_view != 'rss') {
 	$phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
-	if (isset($phpicalendar['cookie_language'])) 	$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
-	if (isset($phpicalendar['cookie_calendar'])) 	$phpiCal_config->setProperty('default_cal', 	$phpicalendar['cookie_calendar']);
-	if (isset($phpicalendar['cookie_cpath']) && strpos($phpicalendar['cookie_cpath'],'../') === false) 		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
-	if (isset($phpicalendar['cookie_view'])) 		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
+	if (isset($phpicalendar['cookie_language'])) {
+		$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
+	}
+	if (isset($phpicalendar['cookie_calendar'])) {
+		$phpiCal_config->setProperty('default_cal', 	$phpicalendar['cookie_calendar']);
+	}
+	if (isset($phpicalendar['cookie_cpath']) && strpos($phpicalendar['cookie_cpath'],'../') === false) {
+		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
+	}
+	if (isset($phpicalendar['cookie_view'])) {
+		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
+	}
 	if (isset($phpicalendar['cookie_style']) && is_dir(BASE.'templates/'.$phpicalendar['cookie_style'].'/')){ 
 													$phpiCal_config->setProperty('template', 			$phpicalendar['cookie_style']);
 	}	
-	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
-	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
-	if (isset($phpicalendar['cookie_endtime']))		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
-	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']); 
-}
+	if (isset($phpicalendar['cookie_startday'])) {
+		$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
+	}
+	if (isset($phpicalendar['cookie_time'])) {
+		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']);
+	}
+	if (isset($phpicalendar['cookie_endtime'])) {
+		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']);
+	}
+	if (isset($phpicalendar['cookie_timezone'])) {
+		$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']);
+	}
+	}
 
 # language support
 # default to english and overwrite other strings as available
@@ -88,7 +108,9 @@ 
 	$fillTime = $fill_h . $fill_min;
 }
 
-if (!isset($current_view)) $current_view = $phpiCal_config->default_view;
+if (!isset($current_view)) {
+	$current_view = $phpiCal_config->default_view;
+}
 /*
 $tz_array=array();
 echo "<pre>xx";