smtech / canvas-ics-sync

phpicalendar/rss/rss1.0.php

Spacing +16 added lines, -16 removed lines

@@ -8,23 +8,23 @@ 
    

 define('BASE', '../');

 require(BASE.'rss/rss_common.php');

-function rss_top(){

+function rss_top() {

 	global $cal_displayname, $theview, $phpiCal_config, $cpath, $lang, $rss_link, $rss_language;

-	$rss = 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";

+	$rss = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";

 	

 	/* Use 1.0 and strip encoding, use rss_language */

-	$rss .= 	'<rdf:RDF 

+	$rss .= '<rdf:RDF 

 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 

 		xmlns:ev="http://purl.org/rss/1.0/modules/event/"

 		xmlns:dc="http://purl.org/dc/elements/1.1/"

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

-	$rss .='">'."\n";

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

+	$rss .= '">'."\n";

 	

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

-	if ($theview !=""){$rss .= ' - '.$theview;} 

+	if ($theview != "") {$rss .= ' - '.$theview; } 

 	$rss .= "</title>\n";

 	

 	$rss .= '<link>'.htmlspecialchars("$phpiCal_config->default_path").'</link>'."\n";

@@ -32,16 +32,16 @@ 
 	#$rss .= '<language>'.$rss_language.'</language>'."\n";

 	return $rss;

 }

-function rss_li($rss_link, $uid){

+function rss_li($rss_link, $uid) {

 	return '<rdf:li rdf:resource="'.$rss_link.'&amp;uid='.$uid.'/" />'."\n";

 }

 

-function enclose_items($rss_items){

+function enclose_items($rss_items) {

 	return 	"<items>\n<rdf:Seq>\n".$rss_items."</rdf:Seq>\n</items>\n</channel>\n";

 }

 

-function rss_item(){

-	global $uid,$event_start,$rss_title,$rss_link, $dayofweek, $event_text, $rss_description, $val;

+function rss_item() {

+	global $uid, $event_start, $rss_title, $rss_link, $dayofweek, $event_text, $rss_description, $val;

 	$rss_item = '<item rdf:about="'.$rss_link.'&amp;uid='.urlencode($uid).'/">'."\n";

 

 	/* Create guid, and use uid to make link unique */

@@ -53,24 +53,24 @@ 
 

 	$rss_item .= '<link>'.$rss_link.'</link>'."\n";

 	$rss_item .= '<description>'.$rss_description.'</description>'."\n";

-	if (isset($val['location']) && $val['location'] !=''){

-		$location		= str_replace('&','&amp;',$val['location']);

-		$location		= str_replace('&amp;amp;','&amp;',$location);

+	if (isset($val['location']) && $val['location'] != '') {

+		$location		= str_replace('&', '&amp;', $val['location']);

+		$location		= str_replace('&amp;amp;', '&amp;', $location);

 		$rss_item .= '<ev:location>'.$location."</ev:location>\n";

 	}	

 	$rss_item .= '</item>'."\n";

 	return $rss_item;

 }

 

-function rss_noitems(){

+function rss_noitems() {

 	$rss_item = '<item rdf:about="'.$default_path."\">\n";

 	$rss_item .= '<title>No events found</title>'."\n";

-	$rss_item .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";

+	$rss_item .= '<link>'.htmlspecialchars("$default_path").'</link>'."\n";

 	$rss_item .= '</item>'."\n";

 	return $rss_item;

 }

 

-function rss_close(){

+function rss_close() {

 	return "</rdf:RDF>\n";

 }

 ?>

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

Spacing +16 added lines, -16 removed lines

@@ -23,39 +23,39 @@ 
    

 define('BASE', '../');

 require(BASE.'rss/rss_common.php');

-function rss_top(){

+function rss_top() {

 	global $cal_displayname, $theview, $phpiCal_config, $cpath, $lang, $rss_link, $rss_language;

 

-	$rss = 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";

+	$rss = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";

 	/* Use 2.0 and strip encoding, use rss_language */

 	$rss .= '<rss version="2.0"'."\n";

-	$rss .= 	'xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  

+	$rss .= 'xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  

 	xmlns:ev="http://purl.org/rss/1.0/modules/event/" '.

 #	'xmlns:atom="http://www.w3.org/2005/Atom"'.

 	'xmlns:dc="http://purl.org/dc/elements/1.1/">'."\n";

 	$rss .= '<channel>'."\n";

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

-	if ($theview !=""){$rss .= ' - '.$theview;} 

+	if ($theview != "") {$rss .= ' - '.$theview; } 

 	$rss .= "</title>\n";

 	

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

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

-	$rss .='</link>'."\n";

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

 	return $rss;

 }

 

-function rss_li($rss_link, $uid){

+function rss_li($rss_link, $uid) {

 	$return = "";

 }

 

-function enclose_items($rss_items){

+function enclose_items($rss_items) {

 	return $rss_items;

 }

 

-function rss_item(){

-	global $uid,$event_start,$rss_title,$rss_link, $dayofweek, $event_text, $rss_description, $val, $thisdate;

+function rss_item() {

+	global $uid, $event_start, $rss_title, $rss_link, $dayofweek, $event_text, $rss_description, $val, $thisdate;

 	$rss = '<item>'."\n";

 	/* Create guid, and use uid to make link unique */

 	$rss .= '<guid isPermaLink="false">'.$rss_link.'&amp;uid='.$uid.'</guid>'."\n";

@@ -66,25 +66,25 @@ 
 

 	$rss .= '<link>'.$rss_link.'</link>'."\n";

 	$rss .= '<description>'.$rss_description.'</description>'."\n";

-	if (isset($val['location']) && $val['location'] !=''){

-		$location		= str_replace('&','&amp;',$val['location']);

-		$location		= str_replace('&amp;amp;','&amp;',$location);

+	if (isset($val['location']) && $val['location'] != '') {

+		$location		= str_replace('&', '&amp;', $val['location']);

+		$location		= str_replace('&amp;amp;', '&amp;', $location);

 		$rss .= '<ev:location>'.$location."</ev:location>\n";

 	}	

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

 	return $rss;

 }

 

-function rss_noitems(){

+function rss_noitems() {

 	$rss = '<item>'."\n";

 	$rss .= '<guid isPermaLink="false">'.$default_path.'&amp;uid='.$thisdate.'</guid>'."\n";

 	$rss .= '<title>No events found</title>'."\n";

-	$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";

+	$rss .= '<link>'.htmlspecialchars("$default_path").'</link>'."\n";

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

 	return $rss;	

 }

 

-function rss_close(){

+function rss_close() {

 	global $rss_link;

 	return "\n".

 #	"<atom:link href=\"$rss_link\" rel=\"self\" type=\"application/rss+xml\" />\n".

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

Spacing +12 added lines, -12 removed lines

@@ -3,8 +3,8 @@ 
 $php_started = getmicrotime();
 # 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" );
+if (phpversion() < '5.1') {
+	die (phpversion()." detected. php 5.1 or higher required for this version.\n\n");
 }	
 include_once(BASE.'functions/init/sanitize.php');
 include_once(BASE.'functions/init/set_error_reporting.php');
@@ -34,7 +34,7 @@ 
 // Pull the calendars off the GET line if provided. The $cal_filename
 // is always an array, because this makes it easier to deal with below.
 $cal_filenames = array();
-if (isset($_GET['cal']) && $_GET['cal'] !='') {
+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']))
@@ -43,7 +43,7 @@ 
 	// Grab the calendar filenames off the cal value array.
 	$cal_filenames = $_GET['cal'];
 } elseif ($phpiCal_config->default_cal != '') {
-	$cal_filenames = explode(',',$phpiCal_config->default_cal);
+	$cal_filenames = explode(',', $phpiCal_config->default_cal);
 } else {
 	$cal_filenames[0] = $phpiCal_config->ALL_CALENDARS_COMBINED;
 }
@@ -51,7 +51,7 @@ 
 $all_calendars_combined = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
 
 //load cal_filenames if $ALL_CALENDARS_COMBINED
-if ($cal_filenames[0] == $phpiCal_config->ALL_CALENDARS_COMBINED){
+if ($cal_filenames[0] == $phpiCal_config->ALL_CALENDARS_COMBINED) {
 	$cal_filenames = $all_calendars_combined;
 }
 // Separate the calendar identifiers into web calendars and local
@@ -60,13 +60,13 @@ 
 $local_cals = array();
 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;
+	foreach ($list_webcals as $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.
 	$cal_filename = urldecode($cal_filename); #need to decode for substr statements to identify webcals
-	$cal_filename = str_replace(' ','%20', $cal_filename); #need to reencode blank spaces for matching with $list_webcals
+	$cal_filename = str_replace(' ', '%20', $cal_filename); #need to reencode blank spaces for matching with $list_webcals
 	if (substr($cal_filename, 0, 7) == 'http://' ||
 		substr($cal_filename, 0, 8) == 'https://' ||
 		substr($cal_filename, 0, 9) == 'webcal://')
@@ -79,7 +79,7 @@ 
 	// Otherwise it is a local calendar.
 	else {
 		// Check blacklisted.
-		if (in_array($cal_filename, $blacklisted_cals)  && $cal_filename !='') {
+		if (in_array($cal_filename, $blacklisted_cals) && $cal_filename != '') {
 			exit(error($lang['l_error_restrictedcal'], $cal_filename));
 		}
 		$local_cals[] = urldecode(str_replace(".ics", '', basename($cal_filename)));
@@ -119,7 +119,7 @@ 
 #	$cal_displaynames[] = substr(str_replace('32', ' ', basename($web_cal)), 0, -4);
 	$cal_displaynames[] = substr(basename($web_cal), 0, -4);
 	
-	if(in_array($web_cal, $list_webcals)){
+	if (in_array($web_cal, $list_webcals)) {
 		$web_cal = md5($phpiCal_config->salt.$web_cal);
 	}
 	$cals[] = urlencode($web_cal);
@@ -143,7 +143,7 @@ 
 	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;
@@ -177,7 +177,7 @@ 
 $rss_powered = ($phpiCal_config->enable_rss == 'yes') ? 'yes' : '';
 
 function getmicrotime() { 
-	list($usec, $sec) = explode(' ',microtime()); 
+	list($usec, $sec) = explode(' ', microtime()); 
 	return ((float)$usec + (float)$sec); 
 }
 

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

Spacing +1 added lines, -1 removed lines

@@ -381,7 +381,7 @@
 $tz_array['Europe/Zaporozhye']           	= array('+0200', '+0300');
 $tz_array['Europe/Zurich']               	= array('+0100', '+0200');
 $tz_array['GB']                          	= array('+0000', '+0100');
-$tz_array['GMT']                          	= array('+0000', '+0000');
+$tz_array['GMT'] = array('+0000', '+0000');
 $tz_array['GB-Eire']                     	= array('+0000', '+0100');
 $tz_array['HST']                         	= array('-1000', '-1000');
 $tz_array['Hongkong']                    	= array('+0800', '+0800');

phpicalendar/functions/list_functions.php

Spacing +18 added lines, -18 removed lines

@@ -19,7 +19,7 @@ 
 	if (is_array($master_array['-3'])) {
 		foreach ($master_array['-3'] as $key => $val) {
 			if ($i > $phpiCal_config->unique_colors) $i = 1;
-			$val = str_replace ("\,", ",", $val);
+			$val = str_replace("\,", ",", $val);
 			$return .= '<img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$i.'.gif" alt="" /> '.$val.'<br />';
 			$i++;
 		}
@@ -29,19 +29,19 @@ 
 
 function list_months() {
 	global $getdate, $this_year, $cal, $dateFormat_month;
-	$month_time 	= strtotime("$this_year-01-01");
-	$getdate_month 	= date("m", strtotime($getdate));
+	$month_time = strtotime("$this_year-01-01");
+	$getdate_month = date("m", strtotime($getdate));
 	$return = '';
-	for ($i=0; $i<12; $i++) {
-		$monthdate 		= date ("Ymd", $month_time);
-		$month_month 	= date("m", $month_time);
-		$select_month 	= localizeDate($dateFormat_month, $month_time);
+	for ($i = 0; $i < 12; $i++) {
+		$monthdate = date("Ymd", $month_time);
+		$month_month = date("m", $month_time);
+		$select_month = localizeDate($dateFormat_month, $month_time);
 		if ($month_month == $getdate_month) {
 			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\" selected=\"selected\">$select_month</option>\n";
 		} else {
 			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\">$select_month</option>\n";
 		}
-		$month_time = strtotime ("+1 month", $month_time);
+		$month_time = strtotime("+1 month", $month_time);
 	}
 	return $return;
 }
@@ -51,7 +51,7 @@ 
 	global $getdate, $this_year, $cal, $phpiCal_config;
 	$year_time = strtotime($getdate);
 	$return = '';
-	for ($i=0; $i < $phpiCal_config->num_years; $i++) {
+	for ($i = 0; $i < $phpiCal_config->num_years; $i++) {
 		$offset = $phpiCal_config->num_years - $i;
 		$prev_time = strtotime("-$offset year", $year_time);
 		$prev_date = date("Ymd", $prev_time);
@@ -63,12 +63,12 @@ 
 	$getdate_year = date("Y", $year_time);
 	$return .= "<option value=\"year.php?cal=$cal&amp;getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n";
 	
-	for ($i=0; $i < $phpiCal_config->num_years; $i++) {
+	for ($i = 0; $i < $phpiCal_config->num_years; $i++) {
 		$offset = $i + 1;
 		$next_time = strtotime("+$offset year", $year_time);
 		$next_date = date("Ymd", $next_time);
 		$next_year = date("Y", $next_time);
-		$return .=  "<option value=\"year.php?cal=$cal&amp;getdate=$next_date\">$next_year</option>\n";
+		$return .= "<option value=\"year.php?cal=$cal&amp;getdate=$next_date\">$next_year</option>\n";
 	}
 	
 	return $return;
@@ -77,17 +77,17 @@ 
 
 function list_weeks() {
 	global $getdate, $this_year, $cal, $dateFormat_week_jump, $phpiCal_config;
-	ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
-	$this_day 			= $day_array2[3]; 
+	ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
+	$this_day = $day_array2[3]; 
 	$this_month 		= $day_array2[2];
 	$this_year 			= $day_array2[1];
 	$check_week 		= strtotime($getdate);
-	$start_week_time 	= strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $phpiCal_config->week_start_day));
-	$end_week_time 		= $start_week_time + (6 * 25 * 60 * 60);
+	$start_week_time = strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $phpiCal_config->week_start_day));
+	$end_week_time = $start_week_time + (6*25*60*60);
 	$return = '';
 		
 	do {
-		$weekdate 		= date ("Ymd", $start_week_time);
+		$weekdate = date("Ymd", $start_week_time);
 		$select_week1 	= localizeDate($dateFormat_week_jump, $start_week_time);
 		$select_week2 	= localizeDate($dateFormat_week_jump, $end_week_time);
 	
@@ -96,8 +96,8 @@ 
 		} else {
 			$return .= "<option value=\"week.php?cal=$cal&amp;getdate=$weekdate\">$select_week1 - $select_week2</option>\n";
 		}
-		$start_week_time =  strtotime ("+1 week", $start_week_time);
-		$end_week_time = $start_week_time + (6 * 25 * 60 * 60);
+		$start_week_time = strtotime("+1 week", $start_week_time);
+		$end_week_time = $start_week_time + (6*25*60*60);
 	} while (date("Y", $start_week_time) <= $this_year);
 
 	return $return;

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

Switch Indentation +21 added lines, -21 removed lines

@@ -27,27 +27,27 @@
 	$end_year++;
 }
 switch ($current_view){
-	case 'month':
-	case 'week':
-	case 'day':
-	case 'print':
-		$mArray_begin = mktime (0,0,0,$start_month,1,($start_year));
-		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
-		break;
-	case 'admin':
-	case 'error':
-	case 'preferences':
-	case 'rss_index':
-		$mArray_begin = time();
-		$mArray_end = time();
-		break;		
-	case 'search':
-		$mArray_begin = mktime (0,0,0,1,1,1970);
-		$mArray_end = mktime (0,0,0,1,31,2030);
-		break;		
-	default:
-		$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
-		$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
+		case 'month':
+		case 'week':
+		case 'day':
+		case 'print':
+			$mArray_begin = mktime (0,0,0,$start_month,1,($start_year));
+			$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
+			break;
+		case 'admin':
+		case 'error':
+		case 'preferences':
+		case 'rss_index':
+			$mArray_begin = time();
+			$mArray_end = time();
+			break;		
+		case 'search':
+			$mArray_begin = mktime (0,0,0,1,1,1970);
+			$mArray_end = mktime (0,0,0,1,31,2030);
+			break;		
+		default:
+			$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
+			$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
 }
 if ($phpiCal_config->save_parsed_cals == 'yes') {	
 	$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
 	}
 }
 
-preg_match ("/([0-9]{4})([0-9]{2})([0-9]{2})/", $getdate, $day_array2);
+preg_match("/([0-9]{4})([0-9]{2})([0-9]{2})/", $getdate, $day_array2);
 $this_day = $day_array2[3];
 $this_month = $day_array2[2];
 $this_year = $day_array2[1];
@@ -18,21 +18,21 @@ 
 $start_year = $this_year;
 $end_month = $this_month + 1;
 $end_year = $this_year;
-if ($this_month == 1){
+if ($this_month == 1) {
 	$start_month = 12;
 	$start_year--;
 }	
-if ($this_month == 12){
+if ($this_month == 12) {
 	$end_month = 1;
 	$end_year++;
 }
-switch ($current_view){
+switch ($current_view) {
 	case 'month':
 	case 'week':
 	case 'day':
 	case 'print':
-		$mArray_begin = mktime (0,0,0,$start_month,1,($start_year));
-		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
+		$mArray_begin = mktime(0, 0, 0, $start_month, 1, ($start_year));
+		$mArray_end = mktime(0, 0, 0, $end_month, 31, ($end_year));
 		break;
 	case 'admin':
 	case 'error':
@@ -42,14 +42,14 @@ 
 		$mArray_end = time();
 		break;		
 	case 'search':
-		$mArray_begin = mktime (0,0,0,1,1,1970);
-		$mArray_end = mktime (0,0,0,1,31,2030);
+		$mArray_begin = mktime(0, 0, 0, 1, 1, 1970);
+		$mArray_end = mktime(0, 0, 0, 1, 31, 2030);
 		break;		
 	default:
-		$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
-		$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
+		$mArray_begin = mktime(0, 0, 0, 12, 21, ($this_year - 1));
+		$mArray_end = mktime(0, 0, 0, 1, 31, ($this_year + 1));
 }
 if ($phpiCal_config->save_parsed_cals == 'yes') {	
-	$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
-	$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
+	$mArray_begin = mktime(0, 0, 0, 12, 21, ($this_year - 1));
+	$mArray_end = mktime(0, 0, 0, 1, 31, ($this_year + 1));
 }
\ No newline at end of file

phpicalendar/functions/init/configs.php

Spacing +25 added lines, -25 removed lines

@@ -1,47 +1,47 @@ 
 <?php
 // Pull in the configuration and some functions.
 include_once(BASE.'default_config.php');
-if (is_file(BASE.'config.inc.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){
+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);
 
 
 if ($phpiCal_config->cookie_uri == '') {
-	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')) );
+	$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', '');
 }
 $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_style']) && is_dir(BASE.'templates/'.$phpicalendar['cookie_style'].'/')){ 
-													$phpiCal_config->setProperty('template', 			$phpicalendar['cookie_style']);
+	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
@@ -54,9 +54,9 @@ 
 	include_once($lang_file);
 }
 
-if (isset($phpicalendar['cookie_timeformat']) && $phpicalendar['cookie_timeformat'] !=''){
+if (isset($phpicalendar['cookie_timeformat']) && $phpicalendar['cookie_timeformat'] != '') {
 	$timeFormat = urldecode($phpicalendar['cookie_timeformat']);
-	switch($timeFormat){
+	switch ($timeFormat) {
 		case 'h:i':
 		case 'h:i A':
 			$timeFormat_small = 'h:i';
@@ -73,11 +73,11 @@ 
 $template = $phpiCal_config->template;
 
 $fillTime = $phpiCal_config->day_start;
-$day_array = array ();
+$day_array = array();
 
 while ($fillTime < $phpiCal_config->day_end) {
-	array_push ($day_array, $fillTime);
-	preg_match ('/([0-9]{2})([0-9]{2})/', $fillTime, $dTime);
+	array_push($day_array, $fillTime);
+	preg_match('/([0-9]{2})([0-9]{2})/', $fillTime, $dTime);
 	$fill_h = $dTime[1];
 	$fill_min = $dTime[2];
 	$fill_min = sprintf('%02d', $fill_min + $phpiCal_config->gridLength);
@@ -85,7 +85,7 @@ 
 		$fill_h = sprintf('%02d', ($fill_h + 1));
 		$fill_min = '00';
 	}
-	$fillTime = $fill_h . $fill_min;
+	$fillTime = $fill_h.$fill_min;
 }
 
 if (!isset($current_view)) $current_view = $phpiCal_config->default_view;

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

phpicalendar/functions/init/cpaths.php

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 # adjust paths in case they are incorrect
 if ($phpiCal_config->default_path == '') {
 	$proto = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off') ? 'https://' : 'http://');
-	$p = str_replace("/rss","",$proto.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['PHP_SELF']) );
+	$p = str_replace("/rss", "", $proto.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['PHP_SELF']));
 	$phpiCal_config->setProperty('default_path', $p);
 }
 
@@ -12,22 +12,22 @@ 
 }
 $calendar_path = $phpiCal_config->calendar_path;
 $cpath = ''; #initialize cpath to prevent later undef warnings.
-if(isset($_REQUEST['cpath'])&& $_REQUEST['cpath'] !=''){
-	$cpath 	= str_replace('..','',$_REQUEST['cpath']);				
-	$calendar_path 	.= "/$cpath";				
+if (isset($_REQUEST['cpath']) && $_REQUEST['cpath'] != '') {
+	$cpath = str_replace('..', '', $_REQUEST['cpath']);				
+	$calendar_path .= "/$cpath";				
 #	$tmp_dir 	.= "/$cpath";				
-}elseif(isset($phpiCal_config->default_cpath_check) && $phpiCal_config->default_cpath_check !='' ){
-	$cpath 	= str_replace('..','',$default_cpath_check);				
-	$calendar_path 	.= "/$cpath";				
+}elseif (isset($phpiCal_config->default_cpath_check) && $phpiCal_config->default_cpath_check != '') {
+	$cpath = str_replace('..', '', $default_cpath_check);				
+	$calendar_path .= "/$cpath";				
 #	$tmp_dir 	.= "/$cpath";
 }
 #these need cpath to be set
 #set up specific template folder for a particular cpath
-if (isset($user_template["$cpath"])){ 
+if (isset($user_template["$cpath"])) { 
   $template = $user_template["$cpath"]; 
 }
 #set up specific webcals for a particular cpath
-if (isset($more_webcals[$cpath]) && is_array($more_webcals[$cpath])){
+if (isset($more_webcals[$cpath]) && is_array($more_webcals[$cpath])) {
 	foreach ($more_webcals[$cpath] as $wcal)$list_webcals[] = $wcal;
 }
-$phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file
+$phpiCal_config->setProperty('calendar_path', $calendar_path);
\ No newline at end of file

Braces +5 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	$cpath 	= str_replace('..','',$_REQUEST['cpath']);				
 	$calendar_path 	.= "/$cpath";				
 #	$tmp_dir 	.= "/$cpath";				
-}elseif(isset($phpiCal_config->default_cpath_check) && $phpiCal_config->default_cpath_check !='' ){
+} elseif(isset($phpiCal_config->default_cpath_check) && $phpiCal_config->default_cpath_check !='' ){
 	$cpath 	= str_replace('..','',$default_cpath_check);				
 	$calendar_path 	.= "/$cpath";				
 #	$tmp_dir 	.= "/$cpath";
@@ -28,6 +28,8 @@ 
 }
 #set up specific webcals for a particular cpath
 if (isset($more_webcals[$cpath]) && is_array($more_webcals[$cpath])){
-	foreach ($more_webcals[$cpath] as $wcal)$list_webcals[] = $wcal;
-}
+	foreach ($more_webcals[$cpath] as $wcal) {
+		$list_webcals[] = $wcal;
+	}
+	}
 $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file

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.

Braces +6 added lines, -2 removed lines

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