smtech / canvas-ics-sync

phpicalendar/config.inc.php

Indentation +5 added lines, -5 removed lines

@@ -25,19 +25,19 @@ 
 
 The salt parameter is used to obfuscate things like webcal links that may have usernames and passwords.  This should be changed.
 */
-     'calendar_path'        => '/var/www-data/canvas/ics-sync',
+	 'calendar_path'        => '/var/www-data/canvas/ics-sync',
 #     'default_path'         => '', 	
 #     'save_parsed_cals'     => 'yes', 
 #     'cookie_uri'           => '', 
 #     'download_uri'         => '', 	
-     'allow_webcals'          => 'yes',
+	 'allow_webcals'          => 'yes',
 #     'recursive_path'          => 'yes',
-     'salt'                => 'AjeoRZ9rC5pDzV6xk9nD',
+	 'salt'                => 'AjeoRZ9rC5pDzV6xk9nD',
 
 /*     ** Timezones **
 If timezone is not set, all events show in the local time of the source calendar.  This isn't a problem if all your calendars are in the same timezone.  If you set a timezone for the server, events in other timezones are shown when they occur at the server's time.
 */
-     'timezone'             => 'US/Eastern',
+	 'timezone'             => 'US/Eastern',
 #     'second_offset'        => $secs,
 
 /*     ** Appearance **      
@@ -51,7 +51,7 @@ 
 #     'language'             => 'English',
 #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
 #     'template'             => 'green',           // Template support: change this to have a different "skin" for your installation.     
-    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
+	'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
 #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
 #     'gridLength'           => 10,                // Grid size in day and week views. Allowed values are 1,2,3,4,10,12,15,20,30,60. Default is 15
 #     'minical_view'         => 'current',	       // Where do the mini-calendars go when clicked?'     => 'day', 'week', 'month', 'current'

Spacing +9 added lines, -9 removed lines

@@ -51,7 +51,7 @@ 
 #     'language'             => 'English',
 #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
 #     'template'             => 'green',           // Template support: change this to have a different "skin" for your installation.     
-    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
+    'default_view'         => 'year', // Default view for calendars'     => 'day', 'week', 'month', 'year'
 #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
 #     'gridLength'           => 10,                // Grid size in day and week views. Allowed values are 1,2,3,4,10,12,15,20,30,60. Default is 15
 #     'minical_view'         => 'current',	       // Where do the mini-calendars go when clicked?'     => 'day', 'week', 'month', 'current'
@@ -111,13 +111,13 @@ 
 these arrays provide extra calendar options.
 
 */
-$locked_map['user1:pass'] = array('');             // Map username:password accounts to locked calendars that should be
-$locked_map['user2:pass'] = array('');             // unlocked if logged in. Calendar names should be the same as what is
-$locked_map['user3:pass'] = array('');             // listed in the $locked_cals, again without the .ics suffix.
-$locked_map['user4:pass'] = array('');             // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
+$locked_map['user1:pass'] = array(''); // Map username:password accounts to locked calendars that should be
+$locked_map['user2:pass'] = array(''); // unlocked if logged in. Calendar names should be the same as what is
+$locked_map['user3:pass'] = array(''); // listed in the $locked_cals, again without the .ics suffix.
+$locked_map['user4:pass'] = array(''); // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
 // add more lines as necessary
 
-$apache_map['user1'] = array('');                  // Map HTTP authenticated users to specific calendars. Users listed here and
-$apache_map['user2'] = array('');                  // authenticated via HTTP will not see the public calendars, and will not be
-$apache_map['user3'] = array('');                  // given any login/logout options. Calendar names not include the .ics suffix.
-$apache_map['user4'] = array('');                  // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
+$apache_map['user1'] = array(''); // Map HTTP authenticated users to specific calendars. Users listed here and
+$apache_map['user2'] = array(''); // authenticated via HTTP will not see the public calendars, and will not be
+$apache_map['user3'] = array(''); // given any login/logout options. Calendar names not include the .ics suffix.
+$apache_map['user4'] = array(''); // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');

phpicalendar/error.php

Spacing +6 added lines, -6 removed lines

@@ -1,23 +1,23 @@
 <?php
-if (!defined('BASE')) define('BASE','./');
+if (!defined('BASE')) define('BASE', './');
 require_once(BASE.'functions/template.php');
 
 
-function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') {
+function error($error_msg = 'There was an error processing the request.', $file = 'NONE', $error_base = '') {
 	global $getdate, $rss_powered, $lang, $phpiCal_config, $cal;
 	if (!isset($template))					$template = $phpiCal_config->template;
 		
-	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file,true));
+	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file, true));
 	$current_view 		= 'error';
 	$display_date 		= $lang['l_error_title'];
 	$calendar_name 		= $lang['l_error_title'];
 	
 	$default_path = $phpiCal_config->default_path;
 	if (empty($phpiCal_config->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/'));
 		}
 	}
 	$page = new Page(BASE.'templates/'.$template.'/error.tpl');

Braces +6 added lines, -2 removed lines

@@ -1,11 +1,15 @@
 <?php
-if (!defined('BASE')) define('BASE','./');
+if (!defined('BASE')) {
+	define('BASE','./');
+}
 require_once(BASE.'functions/template.php');
 
 
 function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') {
 	global $getdate, $rss_powered, $lang, $phpiCal_config, $cal;
-	if (!isset($template))					$template = $phpiCal_config->template;
+	if (!isset($template)) {
+		$template = $phpiCal_config->template;
+	}
 		
 	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file,true));
 	$current_view 		= 'error';

phpicalendar/preferences.php

Indentation +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 			include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
 	}
 	$_COOKIE[$cookie_name] = $the_cookie;
-    $cpath = $cookie_cpath;
-    $cal = $cookie_calendar;
+	$cpath = $cookie_cpath;
+	$cal = $cookie_calendar;
 }
 
 if (isset($_COOKIE[$cookie_name])) {

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define('BASE','./');
+define('BASE', './');
 $current_view = 'preferences';
 require_once(BASE.'functions/init.inc.php');
 require_once(BASE.'functions/template.php');
@@ -19,21 +19,21 @@ 
 	$action = '';
 } 
 
-$startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
+$startdays = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 
 if ($action == 'setcookie') { 
 	$cookie_language 	= urldecode($_POST['cookie_language']);
-   	$cookie_cpath     	= $_POST['cpath'];
+   	$cookie_cpath = $_POST['cpath'];
 	$cookie_calendar 	= $_POST['cookie_calendar'];
-	$cookie_view 		= $_POST['cookie_view'];
-	$cookie_style 		= $_POST['cookie_style'];
+	$cookie_view = $_POST['cookie_view'];
+	$cookie_style = $_POST['cookie_style'];
 	$cookie_startday	= $_POST['cookie_startday'];
-	$cookie_time		= $_POST['cookie_time'];
-	$cookie_timeformat	= urldecode($_POST['cookie_timeformat']);
+	$cookie_time = $_POST['cookie_time'];
+	$cookie_timeformat = urldecode($_POST['cookie_timeformat']);
 	$cookie_endtime		= $_POST['cookie_endtime'];
 	$cookie_timezone	= $_POST['cookie_timezone'];
-	$cookie_unset		= @$_POST['unset'];
-	$the_cookie = array (
+	$cookie_unset = @$_POST['unset'];
+	$the_cookie = array(
 		"cookie_language"   => "$cookie_language", 
 		"cookie_calendar"   => "$cookie_calendar", 
 		"cookie_view"       => "$cookie_view", 
@@ -45,11 +45,11 @@ 
 		"cookie_cpath"      => "$cookie_cpath", 
 		"cookie_timezone"   => "$cookie_timezone"
 		);
-	$the_cookie 		= addslashes(serialize($the_cookie));
+	$the_cookie = addslashes(serialize($the_cookie));
 	if (isset($cookie_unset)) { 
-		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
+		setcookie("$cookie_name", "$the_cookie", time() - (60*60*24*7), "/", "$phpiCal_config->cookie_uri", 0);
 	} else {
-		setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$phpiCal_config->cookie_uri",0);
+		setcookie("$cookie_name", "$the_cookie", time() + (60*60*24*7*12*10), "/", "$phpiCal_config->cookie_uri", 0);
 		if (isset($_POST['cookie_view'])) 
 			$phpiCal_config->default_view = $_POST['cookie_view'];
 		if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) 
@@ -63,15 +63,15 @@ 
 }
 
 if (isset($_COOKIE[$cookie_name])) {
-	$phpicalendar 		= unserialize(stripslashes($_COOKIE[$cookie_name]));
+	$phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
 	$cookie_language 	= $phpicalendar['cookie_language'];
 	$cookie_calendar 	= $phpicalendar['cookie_calendar'];
-	$cookie_view 		= $phpicalendar['cookie_view'];
-	$cookie_style 		= $phpicalendar['cookie_style'];
+	$cookie_view = $phpicalendar['cookie_view'];
+	$cookie_style = $phpicalendar['cookie_style'];
 	$cookie_startday	= $phpicalendar['cookie_startday'];
-	$cookie_time		= $phpicalendar['cookie_time'];
+	$cookie_time = $phpicalendar['cookie_time'];
 	$cookie_endtime		= $phpicalendar['cookie_endtime'];
-	$cookie_timeformat	= $phpicalendar['cookie_timeformat'];
+	$cookie_timeformat = $phpicalendar['cookie_timeformat'];
 	$cookie_timezone	= $phpicalendar['cookie_timezone'];
 	if ($cookie_unset) { 
 		unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style, $cookie_startday, $cookie_time, $cookie_endtime, $cookie_timeformat, $cookie_timezone);
@@ -87,8 +87,8 @@ 
 	$cookie_startday 	= $phpiCal_config->week_start_day;
 	$cookie_time    	= $phpiCal_config->day_start;
 	$cookie_endtime 	= $phpiCal_config->day_end;
-	$cookie_timeformat 	= $timeFormat;
-	$cookie_timezone 	= $phpiCal_config->timezone;
+	$cookie_timeformat = $timeFormat;
+	$cookie_timezone = $phpiCal_config->timezone;
 }
 
 if ($action == 'setcookie') { 
@@ -118,12 +118,12 @@ 
 closedir($dir_handle);
 
 // select for calendars
-$calendar_select = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED),TRUE);
-$calendar_select .="<option value=\"$phpiCal_config->ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
-$calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select);
+$calendar_select = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
+$calendar_select .= "<option value=\"$phpiCal_config->ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
+$calendar_select = str_replace("<option value=\"$cookie_calendar\">", "<option value=\"$cookie_calendar\" selected='selected'>", $calendar_select);
 // select for dayview
-$view_select 	 = ($phpiCal_config->default_view == 'day'  ) ? '<option value="day" selected="selected">{L_DAY}</option>'     : '<option value="day">{L_DAY}</option>';
-$view_select    .= ($phpiCal_config->default_view == 'week' ) ? '<option value="week" selected="selected">{L_WEEK}</option>'   : '<option value="week">{L_WEEK}</option>';
+$view_select = ($phpiCal_config->default_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>';
+$view_select    .= ($phpiCal_config->default_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>';
 $view_select    .= ($phpiCal_config->default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>';
 
 // select for time
@@ -167,7 +167,7 @@ 
 }
 
 // select for day of week
-$i=0;
+$i = 0;
 $startday_select = '';
 foreach ($daysofweek_lang as $daysofweek) {
 	if ($startdays[$i] == $cookie_startday) {

Braces +12 added lines, -7 removed lines

@@ -11,7 +11,9 @@ 
 
 $current_view = "preferences";
 $back_page = BASE.$phpiCal_config->default_view.'.php?cal='.$cal.'&getdate='.$getdate.'&cpath='.$cpath;
-if ($phpiCal_config->allow_preferences == 'no') header("Location: $back_page");
+if ($phpiCal_config->allow_preferences == 'no') {
+	header("Location: $back_page");
+}
 
 if (isset($_GET['action'])) {
 	$action = $_GET['action'];
@@ -50,12 +52,15 @@ 
 		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
 	} else {
 		setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$phpiCal_config->cookie_uri",0);
-		if (isset($_POST['cookie_view'])) 
-			$phpiCal_config->default_view = $_POST['cookie_view'];
-		if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) 
-			$phpiCal_config->template = $_POST['cookie_style'];
-		if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php')) 
-			include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
+		if (isset($_POST['cookie_view'])) {
+					$phpiCal_config->default_view = $_POST['cookie_view'];
+		}
+		if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) {
+					$phpiCal_config->template = $_POST['cookie_style'];
+		}
+		if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php')) {
+					include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
+		}
 	}
 	$_COOKIE[$cookie_name] = $the_cookie;
     $cpath = $cookie_cpath;

phpicalendar/lib/HTTP/CalDAV/Tools/ICalendarParser.php

Indentation +253 added lines, -253 removed lines

@@ -41,259 +41,259 @@
  */
 class ICalendarParser
 {
-    /**
-     * Input stream handle
-     *
-     * @var resource
-     * @access private
-     */
-    var $_handle;
-
-    /**
-     * Line of input
-     *
-     * @var string
-     * @access private
-     */
-    var $_line;
-
-    /**
-     * Offset of line
-     *
-     * @var int
-     * @access private
-     */
-    var $_offset;
-
-    /**
-     * Success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = true;
-
-    /**
-     * Parsed components are collected here in post-order
-     *
-     * @var array
-     * @access public
-     */
-    var $comps = array();
-
-    /**
-     * Parsed components' offsets are collected here in post-order
-     *
-     * @var array
-     * @access public
-     */
-    var $offsets = array();
-
-    /**
-     * Component stack for parsing nested components
-     *
-     * @var array
-     * @access private
-     */
-    var $_compStack = array();
-
-    /**
-     * Begin offset stack for tracking start offsets of nested components
-     *
-     * @var array
-     * @access private
-     */
-    var $_startOffsetStack = array();
-
-    /**
-     * Offsets stack for parsing within specific ranges
-     *
-     * @var array
-     * @access private
-     */
-    var $_offsetStack = array();
-
-    /**
-     * Value stack for parsing only specific components & properties
-     *
-     * @var array
-     * @access private
-     */
-    var $_valueStack = array();
-
-    /**
-     * Filter stack for parsing only components & properties which match
-     * specific filters
-     *
-     * @var array
-     * @access private
-     */
-    var $_filterStack = array();
-
-    /**
-     * Parse RFC2445 date-time
-     *
-     * May eventually get moved someplace more appropriate
-     * TODO Timezone support
-     *
-     * @param string RFC2445 date-time
-     * @return int timestamp
-     * @access public
-     */
-    function datetime_to_timestamp($datetime)
-    {
-        return gmmktime(substr($datetime, 9, 2), substr($datetime, 11, 2), substr($datetime, 13, 2), substr($datetime, 4, 2), substr($datetime, 6, 2), substr($datetime, 0, 4));
-    }
-
-    /**
-     * Constructor
-     *
-     * @param resource input stream handle
-     * @access public
-     */
-    function ICalendarParser($handle, $offsets=null, $value=null, $filters=null)
-    {
-        $this->_handle = $handle;
-        $this->_offsetStack[] = $offsets;
-
-        // FIXME Separate comps & props stacks?
-        $this->_valueStack[] = array('comps' => $value);
-        $this->_filterStack[] = $filters;
-        while ($this->success &&
-                ($this->_offset = ftell($this->_handle)) !== false &&
-                ($this->_line = fgets($this->_handle, 4096)) !== false) {
-            if (is_array($this->_offsetStack[count($this->_offsetStack) - 1]['offsets'])) {
-                if ($this->_offset > $this->_offsetStack[count($this->_offsetStack) - 1]['offsets'][0][1]) {
-                    if (array_shift($this->_offsetStack[count($this->_offsetStack) - 1]['offsets']) !== null) {
-                        if (fseek($this->_offsetStack[count($this->_offsetStack) - 1]['offsets'][0][0])) {
-                            $this->success = false;
-                            return;
-                        }
-
-                        continue;
-                    }
-
-                    if (!empty($this->_compStack)) {
-                        $name = $this->_compStack[count($this->_compStack) - 1]->name;
-                        while (($line = fgets($this->_handle, 4096)) !== false) {
-                            if (trim($line) == "END:$name") {
-                                return;
-                            }
-                        }
-
-                        $this->_endComp($name);
-                        continue;
-                    }
-
-                    return;
-                }
-            }
-
-            $line = explode(':', trim($this->_line));
-
-            if ($line[0] == 'BEGIN') {
-                $this->_startComp($line[1]);
-                continue;
-            }
-
-            if ($line[0] == 'END') {
-                $this->_endComp($line[1]);
-                continue;
-            }
-
-            $line[0] = explode(';=', $line[0]);
-            $name = array_shift($line[0]);
-            if (is_array($this->_valueStack[count($this->_valueStack) - 1]['props']) && !in_array($name, $this->_valueStack[count($this->_valueStack) - 1]['props'])) {
-                continue;
-            }
-
-            $params = array();
-            while (!empty($line[0])) {
-                $params[array_shift($line[0])] = array_shift($line[0]);
-            }
-            $this->_compStack[count($this->_compStack) - 1]->add_property($name, $line[1], $params);
-        }
-
-        if (!feof($this->_handle)) {
-            $this->success = false;
-        }
-    }
-
-    function _startComp($name)
-    {
-        if (is_array($this->_valueStack[count($this->_valueStack) - 1]['comps']) &&
-                !isset($this->_valueStack[count($this->_valueStack) - 1]['comps'][$name])) {
-            while (($line = fgets($this->_handle, 4096)) !== false) {
-                if (trim($line) == "END:$name") {
-                    return;
-                }
-            }
-
-            $this->success = false;
-            return;
-        }
-
-        $class = 'iCalendar_' . ltrim(strtolower($name), 'v');
-        if ($name == 'VCALENDAR') {
-            $class = 'iCalendar';
-        }
-
-        if (!class_exists($class)) {
-            while (($line = fgets($this->_handle, 4096)) !== false) {
-                if (trim($line) == "END:$name") {
-                    return;
-                }
-            }
-
-            $this->success = false;
-            return;
-        }
-
-        $this->_compStack[] = new $class;
-        $this->_startOffsetStack[] = $this->_offset;
-        $this->_offsetStack[] = $this->_offsetStack[count($this->_offsetStack) - 1]['comps'][$name];
-        $this->_valueStack[] = $this->_valueStack[count($this->_valueStack) - 1]['comps'][$name];
-        $this->_filterStack[] = $this->_filterStack[count($this->_filterStack) - 1]['comps'][$name];
-    }
-
-    function _endComp($name)
-    {
-        if ($name != $this->_compStack[count($this->_compStack) - 1]->name) {
-            $this->success = false;
-            return;
-        }
-
-        if (is_array($this->_filterStack[count($this->_filterStack) - 1]['filters'])) {
-            foreach ($this->_filterStack[count($this->_filterStack) - 1]['filters'] as $filter) {
-                if ($filter['name'] == 'time-range') {
-                    if ($filter['value']['start'] > $this->_compStack[count($this->_compStack) - 1]->properties['DTEND'][0]->value || $filter['value']['end'] < $this->_compStack[count($this->_compStack) - 1]->properties['DTSTART'][0]->value) {
-                        array_pop($this->_compStack);
-                        array_pop($this->_startOffsetStack);
-                        array_pop($this->_offsetStack);
-                        array_pop($this->_valueStack);
-                        array_pop($this->_filterStack);
-                        return;
-                    }
-                }
-            }
-        }
-
-        if (count($this->_compStack) > 1 && !$this->_compStack[count($this->_compStack) - 2]->add_component($this->_compStack[count($this->_compStack) - 1])) {
-            $this->success = false;
-            return;
-        }
-
-        if (($offset = ftell($this->_handle)) === false) {
-            $this->success = false;
-            return;
-        }
-
-        $this->comps[] = array_pop($this->_compStack);
-        $this->offsets[] = array(array_pop($this->_startOffsetStack), $offset);
-        array_pop($this->_offsetStack);
-        array_pop($this->_valueStack);
-        array_pop($this->_filterStack);
-    }
+	/**
+	 * Input stream handle
+	 *
+	 * @var resource
+	 * @access private
+	 */
+	var $_handle;
+
+	/**
+	 * Line of input
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_line;
+
+	/**
+	 * Offset of line
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $_offset;
+
+	/**
+	 * Success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = true;
+
+	/**
+	 * Parsed components are collected here in post-order
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $comps = array();
+
+	/**
+	 * Parsed components' offsets are collected here in post-order
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $offsets = array();
+
+	/**
+	 * Component stack for parsing nested components
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_compStack = array();
+
+	/**
+	 * Begin offset stack for tracking start offsets of nested components
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_startOffsetStack = array();
+
+	/**
+	 * Offsets stack for parsing within specific ranges
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_offsetStack = array();
+
+	/**
+	 * Value stack for parsing only specific components & properties
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_valueStack = array();
+
+	/**
+	 * Filter stack for parsing only components & properties which match
+	 * specific filters
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_filterStack = array();
+
+	/**
+	 * Parse RFC2445 date-time
+	 *
+	 * May eventually get moved someplace more appropriate
+	 * TODO Timezone support
+	 *
+	 * @param string RFC2445 date-time
+	 * @return int timestamp
+	 * @access public
+	 */
+	function datetime_to_timestamp($datetime)
+	{
+		return gmmktime(substr($datetime, 9, 2), substr($datetime, 11, 2), substr($datetime, 13, 2), substr($datetime, 4, 2), substr($datetime, 6, 2), substr($datetime, 0, 4));
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param resource input stream handle
+	 * @access public
+	 */
+	function ICalendarParser($handle, $offsets=null, $value=null, $filters=null)
+	{
+		$this->_handle = $handle;
+		$this->_offsetStack[] = $offsets;
+
+		// FIXME Separate comps & props stacks?
+		$this->_valueStack[] = array('comps' => $value);
+		$this->_filterStack[] = $filters;
+		while ($this->success &&
+				($this->_offset = ftell($this->_handle)) !== false &&
+				($this->_line = fgets($this->_handle, 4096)) !== false) {
+			if (is_array($this->_offsetStack[count($this->_offsetStack) - 1]['offsets'])) {
+				if ($this->_offset > $this->_offsetStack[count($this->_offsetStack) - 1]['offsets'][0][1]) {
+					if (array_shift($this->_offsetStack[count($this->_offsetStack) - 1]['offsets']) !== null) {
+						if (fseek($this->_offsetStack[count($this->_offsetStack) - 1]['offsets'][0][0])) {
+							$this->success = false;
+							return;
+						}
+
+						continue;
+					}
+
+					if (!empty($this->_compStack)) {
+						$name = $this->_compStack[count($this->_compStack) - 1]->name;
+						while (($line = fgets($this->_handle, 4096)) !== false) {
+							if (trim($line) == "END:$name") {
+								return;
+							}
+						}
+
+						$this->_endComp($name);
+						continue;
+					}
+
+					return;
+				}
+			}
+
+			$line = explode(':', trim($this->_line));
+
+			if ($line[0] == 'BEGIN') {
+				$this->_startComp($line[1]);
+				continue;
+			}
+
+			if ($line[0] == 'END') {
+				$this->_endComp($line[1]);
+				continue;
+			}
+
+			$line[0] = explode(';=', $line[0]);
+			$name = array_shift($line[0]);
+			if (is_array($this->_valueStack[count($this->_valueStack) - 1]['props']) && !in_array($name, $this->_valueStack[count($this->_valueStack) - 1]['props'])) {
+				continue;
+			}
+
+			$params = array();
+			while (!empty($line[0])) {
+				$params[array_shift($line[0])] = array_shift($line[0]);
+			}
+			$this->_compStack[count($this->_compStack) - 1]->add_property($name, $line[1], $params);
+		}
+
+		if (!feof($this->_handle)) {
+			$this->success = false;
+		}
+	}
+
+	function _startComp($name)
+	{
+		if (is_array($this->_valueStack[count($this->_valueStack) - 1]['comps']) &&
+				!isset($this->_valueStack[count($this->_valueStack) - 1]['comps'][$name])) {
+			while (($line = fgets($this->_handle, 4096)) !== false) {
+				if (trim($line) == "END:$name") {
+					return;
+				}
+			}
+
+			$this->success = false;
+			return;
+		}
+
+		$class = 'iCalendar_' . ltrim(strtolower($name), 'v');
+		if ($name == 'VCALENDAR') {
+			$class = 'iCalendar';
+		}
+
+		if (!class_exists($class)) {
+			while (($line = fgets($this->_handle, 4096)) !== false) {
+				if (trim($line) == "END:$name") {
+					return;
+				}
+			}
+
+			$this->success = false;
+			return;
+		}
+
+		$this->_compStack[] = new $class;
+		$this->_startOffsetStack[] = $this->_offset;
+		$this->_offsetStack[] = $this->_offsetStack[count($this->_offsetStack) - 1]['comps'][$name];
+		$this->_valueStack[] = $this->_valueStack[count($this->_valueStack) - 1]['comps'][$name];
+		$this->_filterStack[] = $this->_filterStack[count($this->_filterStack) - 1]['comps'][$name];
+	}
+
+	function _endComp($name)
+	{
+		if ($name != $this->_compStack[count($this->_compStack) - 1]->name) {
+			$this->success = false;
+			return;
+		}
+
+		if (is_array($this->_filterStack[count($this->_filterStack) - 1]['filters'])) {
+			foreach ($this->_filterStack[count($this->_filterStack) - 1]['filters'] as $filter) {
+				if ($filter['name'] == 'time-range') {
+					if ($filter['value']['start'] > $this->_compStack[count($this->_compStack) - 1]->properties['DTEND'][0]->value || $filter['value']['end'] < $this->_compStack[count($this->_compStack) - 1]->properties['DTSTART'][0]->value) {
+						array_pop($this->_compStack);
+						array_pop($this->_startOffsetStack);
+						array_pop($this->_offsetStack);
+						array_pop($this->_valueStack);
+						array_pop($this->_filterStack);
+						return;
+					}
+				}
+			}
+		}
+
+		if (count($this->_compStack) > 1 && !$this->_compStack[count($this->_compStack) - 2]->add_component($this->_compStack[count($this->_compStack) - 1])) {
+			$this->success = false;
+			return;
+		}
+
+		if (($offset = ftell($this->_handle)) === false) {
+			$this->success = false;
+			return;
+		}
+
+		$this->comps[] = array_pop($this->_compStack);
+		$this->offsets[] = array(array_pop($this->_startOffsetStack), $offset);
+		array_pop($this->_offsetStack);
+		array_pop($this->_valueStack);
+		array_pop($this->_filterStack);
+	}
 }
 
 /*

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
      * @param resource input stream handle
      * @access public
      */
-    function ICalendarParser($handle, $offsets=null, $value=null, $filters=null)
+    function ICalendarParser($handle, $offsets = null, $value = null, $filters = null)
     {
         $this->_handle = $handle;
         $this->_offsetStack[] = $offsets;
@@ -233,7 +233,7 @@ 
             return;
         }
 
-        $class = 'iCalendar_' . ltrim(strtolower($name), 'v');
+        $class = 'iCalendar_'.ltrim(strtolower($name), 'v');
         if ($name == 'VCALENDAR') {
             $class = 'iCalendar';
         }

phpicalendar/lib/bennu/bennu.class.php

Indentation +30 added lines, -30 removed lines

@@ -14,46 +14,46 @@
  */
 
 class Bennu {
-    function timestamp_to_datetime($t = NULL) {
-        if($t === NULL) {
-            $t = time();
-        }
-        return gmstrftime('%Y%m%dT%H%M%SZ', $t);
-    }
+	function timestamp_to_datetime($t = NULL) {
+		if($t === NULL) {
+			$t = time();
+		}
+		return gmstrftime('%Y%m%dT%H%M%SZ', $t);
+	}
 
-    function generate_guid() {
-        // Implemented as per the Network Working Group draft on UUIDs and GUIDs
+	function generate_guid() {
+		// Implemented as per the Network Working Group draft on UUIDs and GUIDs
     
-        // These two octets get special treatment
-        $time_hi_and_version       = sprintf('%02x', (1 << 6) + mt_rand(0, 15)); // 0100 plus 4 random bits
-        $clock_seq_hi_and_reserved = sprintf('%02x', (1 << 7) + mt_rand(0, 63)); // 10 plus 6 random bits
+		// These two octets get special treatment
+		$time_hi_and_version       = sprintf('%02x', (1 << 6) + mt_rand(0, 15)); // 0100 plus 4 random bits
+		$clock_seq_hi_and_reserved = sprintf('%02x', (1 << 7) + mt_rand(0, 63)); // 10 plus 6 random bits
     
-        // Need another 14 random octects
-        $pool = '';
-        for($i = 0; $i < 7; ++$i) {
-            $pool .= sprintf('%04x', mt_rand(0, 65535));
-        }
+		// Need another 14 random octects
+		$pool = '';
+		for($i = 0; $i < 7; ++$i) {
+			$pool .= sprintf('%04x', mt_rand(0, 65535));
+		}
     
-        // time_low = 4 octets
-        $random  = substr($pool, 0, 8).'-';
+		// time_low = 4 octets
+		$random  = substr($pool, 0, 8).'-';
     
-        // time_mid = 2 octets
-        $random .= substr($pool, 8, 4).'-';
+		// time_mid = 2 octets
+		$random .= substr($pool, 8, 4).'-';
     
-        // time_high_and_version = 2 octets
-        $random .= $time_hi_and_version.substr($pool, 12, 2).'-';
+		// time_high_and_version = 2 octets
+		$random .= $time_hi_and_version.substr($pool, 12, 2).'-';
     
-        // clock_seq_high_and_reserved = 1 octet
-        $random .= $clock_seq_hi_and_reserved;
+		// clock_seq_high_and_reserved = 1 octet
+		$random .= $clock_seq_hi_and_reserved;
     
-        // clock_seq_low = 1 octet
-        $random .= substr($pool, 13, 2).'-';
+		// clock_seq_low = 1 octet
+		$random .= substr($pool, 13, 2).'-';
     
-        // node = 6 octets
-        $random .= substr($pool, 14, 12);
+		// node = 6 octets
+		$random .= substr($pool, 14, 12);
     
-        return $random;
-    }
+		return $random;
+	}
 }
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 class Bennu {
     function timestamp_to_datetime($t = NULL) {
-        if($t === NULL) {
+        if ($t === NULL) {
             $t = time();
         }
         return gmstrftime('%Y%m%dT%H%M%SZ', $t);
@@ -30,7 +30,7 @@ 
     
         // Need another 14 random octects
         $pool = '';
-        for($i = 0; $i < 7; ++$i) {
+        for ($i = 0; $i < 7; ++$i) {
             $pool .= sprintf('%04x', mt_rand(0, 65535));
         }
     

phpicalendar/lib/bennu/iCalendar_components.php

Indentation +342 added lines, -342 removed lines

@@ -14,377 +14,377 @@
  */
 
 class iCalendar_component {
-    var $name             = NULL;
-    var $properties       = NULL;
-    var $components       = NULL;
-    var $valid_properties = NULL;
-    var $valid_components = NULL;
-
-    function iCalendar_component() {
-        $this->construct();
-    }
-
-    function construct() {
-        // Initialize the components array
-        if(empty($this->components)) {
-            $this->components = array();
-            foreach($this->valid_components as $name) {
-                $this->components[$name] = array();
-            }
-        }
-    }
-
-    function get_name() {
-        return $this->name;
-    }
-
-    function add_property($name, $value = NULL, $parameters = NULL) {
-
-        // Uppercase first of all
-        $name = strtoupper($name);
-
-        // Are we trying to add a valid property?
-        $xname = false;
-        if(!isset($this->valid_properties[$name])) {
-            // If not, is it an x-name as per RFC 2445?
-            if(!rfc2445_is_xname($name)) {
-                return false;
-            }
-            // Since this is an xname, all components are supposed to allow this property
-            $xname = true;
-        }
-
-        // Create a property object of the correct class
-        if($xname) {
-            $property = new iCalendar_property_x;
-            $property->set_name($name);
-        }
-        else {
-            $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $name));
-            $property = new $classname;
-        }
-
-        // If $value is NULL, then this property must define a default value.
-        if($value === NULL) {
-            $value = $property->default_value();
-            if($value === NULL) {
-                return false;
-            }
-        }
-
-        // Set this property's parent component to ourselves, because some
-        // properties behave differently according to what component they apply to.
-        $property->set_parent_component($this->name);
-
-        // Set parameters before value; this helps with some properties which
-        // accept a VALUE parameter, and thus change their default value type.
-
-        // The parameters must be valid according to property specifications
-        if(!empty($parameters)) {
-            foreach($parameters as $paramname => $paramvalue) {
-                if(!$property->set_parameter($paramname, $paramvalue)) {
-                    return false;
-                }
-            }
-
-            // Some parameters interact among themselves (e.g. ENCODING and VALUE)
-            // so make sure that after the dust settles, these invariants hold true
-            if(!$property->invariant_holds()) {
-                return false;
-            }
-        }
-
-        // $value MUST be valid according to the property data type
-        if(!$property->set_value($value)) {
-            return false;
-        }
-
-        // If this property is restricted to only once, blindly overwrite value
-        if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
-            $this->properties[$name] = array($property);
-        }
-
-        // Otherwise add it to the instance array for this property
-        else {
-            $this->properties[$name][] = $property;
-        }
-
-        // Finally: after all these, does the component invariant hold?
-        if(!$this->invariant_holds()) {
-            // If not, completely undo the property addition
-            array_pop($this->properties[$name]);
-            if(empty($this->properties[$name])) {
-                unset($this->properties[$name]);
-            }
-            return false;
-        }
-
-        return true;        
+	var $name             = NULL;
+	var $properties       = NULL;
+	var $components       = NULL;
+	var $valid_properties = NULL;
+	var $valid_components = NULL;
+
+	function iCalendar_component() {
+		$this->construct();
+	}
+
+	function construct() {
+		// Initialize the components array
+		if(empty($this->components)) {
+			$this->components = array();
+			foreach($this->valid_components as $name) {
+				$this->components[$name] = array();
+			}
+		}
+	}
+
+	function get_name() {
+		return $this->name;
+	}
+
+	function add_property($name, $value = NULL, $parameters = NULL) {
+
+		// Uppercase first of all
+		$name = strtoupper($name);
+
+		// Are we trying to add a valid property?
+		$xname = false;
+		if(!isset($this->valid_properties[$name])) {
+			// If not, is it an x-name as per RFC 2445?
+			if(!rfc2445_is_xname($name)) {
+				return false;
+			}
+			// Since this is an xname, all components are supposed to allow this property
+			$xname = true;
+		}
+
+		// Create a property object of the correct class
+		if($xname) {
+			$property = new iCalendar_property_x;
+			$property->set_name($name);
+		}
+		else {
+			$classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $name));
+			$property = new $classname;
+		}
+
+		// If $value is NULL, then this property must define a default value.
+		if($value === NULL) {
+			$value = $property->default_value();
+			if($value === NULL) {
+				return false;
+			}
+		}
+
+		// Set this property's parent component to ourselves, because some
+		// properties behave differently according to what component they apply to.
+		$property->set_parent_component($this->name);
+
+		// Set parameters before value; this helps with some properties which
+		// accept a VALUE parameter, and thus change their default value type.
+
+		// The parameters must be valid according to property specifications
+		if(!empty($parameters)) {
+			foreach($parameters as $paramname => $paramvalue) {
+				if(!$property->set_parameter($paramname, $paramvalue)) {
+					return false;
+				}
+			}
+
+			// Some parameters interact among themselves (e.g. ENCODING and VALUE)
+			// so make sure that after the dust settles, these invariants hold true
+			if(!$property->invariant_holds()) {
+				return false;
+			}
+		}
+
+		// $value MUST be valid according to the property data type
+		if(!$property->set_value($value)) {
+			return false;
+		}
+
+		// If this property is restricted to only once, blindly overwrite value
+		if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
+			$this->properties[$name] = array($property);
+		}
+
+		// Otherwise add it to the instance array for this property
+		else {
+			$this->properties[$name][] = $property;
+		}
+
+		// Finally: after all these, does the component invariant hold?
+		if(!$this->invariant_holds()) {
+			// If not, completely undo the property addition
+			array_pop($this->properties[$name]);
+			if(empty($this->properties[$name])) {
+				unset($this->properties[$name]);
+			}
+			return false;
+		}
+
+		return true;        
         
-    }
-
-    function add_component($component) {
-
-        // With the detailed interface, you can add only components with this function
-        if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
-            return false;
-        }
-
-        $name = $component->get_name();
-
-        // Only valid components as specified by this component are allowed
-        if(!in_array($name, $this->valid_components)) {
-            return false;
-        }
-
-        // Add it
-        $this->components[$name][] = $component;
-
-        return true;
-    }
-
-    function get_property_list($name) {
-    }
-
-    function invariant_holds() {
-        return true;
-    }
-
-    function is_valid() {
-        // If we have any child components, check that they are all valid
-        if(!empty($this->components)) {
-            foreach($this->components as $component => $instances) {
-                foreach($instances as $number => $instance) {
-                    if(!$instance->is_valid()) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        // Finally, check the valid property list for any mandatory properties
-        // that have not been set and do not have a default value
-        foreach($this->valid_properties as $property => $propdata) {
-            if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
-                $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
-                $object    = new $classname;
-                if($object->default_value() === NULL) {
-                    return false;
-                }
-                unset($object);
-            }
-        }
-
-        return true;
-    }
+	}
+
+	function add_component($component) {
+
+		// With the detailed interface, you can add only components with this function
+		if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
+			return false;
+		}
+
+		$name = $component->get_name();
+
+		// Only valid components as specified by this component are allowed
+		if(!in_array($name, $this->valid_components)) {
+			return false;
+		}
+
+		// Add it
+		$this->components[$name][] = $component;
+
+		return true;
+	}
+
+	function get_property_list($name) {
+	}
+
+	function invariant_holds() {
+		return true;
+	}
+
+	function is_valid() {
+		// If we have any child components, check that they are all valid
+		if(!empty($this->components)) {
+			foreach($this->components as $component => $instances) {
+				foreach($instances as $number => $instance) {
+					if(!$instance->is_valid()) {
+						return false;
+					}
+				}
+			}
+		}
+
+		// Finally, check the valid property list for any mandatory properties
+		// that have not been set and do not have a default value
+		foreach($this->valid_properties as $property => $propdata) {
+			if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
+				$classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
+				$object    = new $classname;
+				if($object->default_value() === NULL) {
+					return false;
+				}
+				unset($object);
+			}
+		}
+
+		return true;
+	}
     
-    function serialize() {
-        // Start tag
-        $string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
-
-        // List of properties
-        if(!empty($this->properties)) {
-            foreach($this->properties as $name => $properties) {
-                foreach($properties as $property) {
-                    $string .= $property->serialize();
-                }
-            }
-        }
-
-        // List of components
-        if(!empty($this->components)) {
-            foreach($this->components as $name => $components) {
-                foreach($components as $component) {
-                    $string .= $component->serialize();
-                }
-            }
-        }
-
-        // End tag
-        $string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
-
-        return $string;
-    }
+	function serialize() {
+		// Start tag
+		$string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
+
+		// List of properties
+		if(!empty($this->properties)) {
+			foreach($this->properties as $name => $properties) {
+				foreach($properties as $property) {
+					$string .= $property->serialize();
+				}
+			}
+		}
+
+		// List of components
+		if(!empty($this->components)) {
+			foreach($this->components as $name => $components) {
+				foreach($components as $component) {
+					$string .= $component->serialize();
+				}
+			}
+		}
+
+		// End tag
+		$string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
+
+		return $string;
+	}
 }
 
 class iCalendar extends iCalendar_component {
-    var $name = 'VCALENDAR';
-
-    function construct() {
-        $this->valid_properties = array(
-            'CALSCALE'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'METHOD'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'PRODID'      => RFC2445_REQUIRED | RFC2445_ONCE,
-            'VERSION'     => RFC2445_REQUIRED | RFC2445_ONCE,
-            RFC2445_XNAME => RFC2445_OPTIONAL 
-        );
-
-        $this->valid_components = array(
-            'VEVENT'
-            // TODO: add support for the other component types
-            //, 'VTODO', 'VJOURNAL', 'VFREEBUSY', 'VTIMEZONE', 'VALARM'
-        );
-        parent::construct();
-    }
+	var $name = 'VCALENDAR';
+
+	function construct() {
+		$this->valid_properties = array(
+			'CALSCALE'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'METHOD'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'PRODID'      => RFC2445_REQUIRED | RFC2445_ONCE,
+			'VERSION'     => RFC2445_REQUIRED | RFC2445_ONCE,
+			RFC2445_XNAME => RFC2445_OPTIONAL 
+		);
+
+		$this->valid_components = array(
+			'VEVENT'
+			// TODO: add support for the other component types
+			//, 'VTODO', 'VJOURNAL', 'VFREEBUSY', 'VTIMEZONE', 'VALARM'
+		);
+		parent::construct();
+	}
 }
 
 class iCalendar_event extends iCalendar_component {
 
-    var $name       = 'VEVENT';
-    var $properties;
+	var $name       = 'VEVENT';
+	var $properties;
     
-    function construct() {
+	function construct() {
         
-        $this->valid_components = array('VALARM');
-
-        $this->valid_properties = array(
-            'CLASS'          => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'CREATED'        => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DESCRIPTION'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that DTSTAMP in optional,
-            // while in 4.8.7.2 it says it's REQUIRED. Go with REQUIRED.
-            'DTSTAMP'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that DTSTART in optional,
-            // while in 4.8.2.4 it says it's REQUIRED. Go with REQUIRED.
-            'DTSTART'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            'GEO'            => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'LAST-MODIFIED'  => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'LOCATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'ORGANIZER'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'PRIORITY'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'SEQUENCE'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'STATUS'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'SUMMARY'        => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'TRANSP'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that UID in optional,
-            // while in 4.8.4.7 it says it's REQUIRED. Go with REQUIRED.
-            'UID'            => RFC2445_REQUIRED | RFC2445_ONCE,
-            'URL'            => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'RECURRENCE-ID'  => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DTEND'          => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DURATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'ATTACH'         => RFC2445_OPTIONAL,
-            'ATTENDEE'       => RFC2445_OPTIONAL,
-            'CATEGORIES'     => RFC2445_OPTIONAL,
-            'COMMENT'        => RFC2445_OPTIONAL,
-            'CONTACT'        => RFC2445_OPTIONAL,
-            'EXDATE'         => RFC2445_OPTIONAL,
-            'EXRULE'         => RFC2445_OPTIONAL,
-            'REQUEST-STATUS' => RFC2445_OPTIONAL,
-            'RELATED-TO'     => RFC2445_OPTIONAL,
-            'RESOURCES'      => RFC2445_OPTIONAL,
-            'RDATE'          => RFC2445_OPTIONAL,
-            'RRULE'          => RFC2445_OPTIONAL,
-            RFC2445_XNAME    => RFC2445_OPTIONAL
-        );
-
-        parent::construct();
-    }
-
-    function invariant_holds() {
-        // DTEND and DURATION must not appear together
-        if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
-            return false;
-        }
+		$this->valid_components = array('VALARM');
+
+		$this->valid_properties = array(
+			'CLASS'          => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'CREATED'        => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DESCRIPTION'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that DTSTAMP in optional,
+			// while in 4.8.7.2 it says it's REQUIRED. Go with REQUIRED.
+			'DTSTAMP'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that DTSTART in optional,
+			// while in 4.8.2.4 it says it's REQUIRED. Go with REQUIRED.
+			'DTSTART'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			'GEO'            => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'LAST-MODIFIED'  => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'LOCATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'ORGANIZER'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'PRIORITY'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'SEQUENCE'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'STATUS'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'SUMMARY'        => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'TRANSP'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that UID in optional,
+			// while in 4.8.4.7 it says it's REQUIRED. Go with REQUIRED.
+			'UID'            => RFC2445_REQUIRED | RFC2445_ONCE,
+			'URL'            => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'RECURRENCE-ID'  => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DTEND'          => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DURATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'ATTACH'         => RFC2445_OPTIONAL,
+			'ATTENDEE'       => RFC2445_OPTIONAL,
+			'CATEGORIES'     => RFC2445_OPTIONAL,
+			'COMMENT'        => RFC2445_OPTIONAL,
+			'CONTACT'        => RFC2445_OPTIONAL,
+			'EXDATE'         => RFC2445_OPTIONAL,
+			'EXRULE'         => RFC2445_OPTIONAL,
+			'REQUEST-STATUS' => RFC2445_OPTIONAL,
+			'RELATED-TO'     => RFC2445_OPTIONAL,
+			'RESOURCES'      => RFC2445_OPTIONAL,
+			'RDATE'          => RFC2445_OPTIONAL,
+			'RRULE'          => RFC2445_OPTIONAL,
+			RFC2445_XNAME    => RFC2445_OPTIONAL
+		);
+
+		parent::construct();
+	}
+
+	function invariant_holds() {
+		// DTEND and DURATION must not appear together
+		if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
+			return false;
+		}
 
         
-        if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
-            // DTEND must be later than DTSTART
-            // The standard is not clear on how to hande different value types though
-            // TODO: handle this correctly even if the value types are different
-            if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
-                return false;
-            }
-
-            // DTEND and DTSTART must have the same value type
-            if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
-                return false;
-            }
-
-        }
-        return true;
-    }
+		if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
+			// DTEND must be later than DTSTART
+			// The standard is not clear on how to hande different value types though
+			// TODO: handle this correctly even if the value types are different
+			if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
+				return false;
+			}
+
+			// DTEND and DTSTART must have the same value type
+			if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
+				return false;
+			}
+
+		}
+		return true;
+	}
 }
 
 class iCalendar_todo extends iCalendar_component {
-    var $name       = 'VTODO';
-    var $properties;
-
-    function construct() {
-
-        $this->properties = array(
-            'class'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'completed'   => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'created'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'description' => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'dtstamp'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'dtstart'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'geo'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'location'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'organizer'   => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'percent'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'priority'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'recurid'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'sequence'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'status'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'summary'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'uid'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'url'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'due'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'duration'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'attach'      => RFC2445_OPTIONAL,
-            'attendee'    => RFC2445_OPTIONAL,
-            'categories'  => RFC2445_OPTIONAL,
-            'comment'     => RFC2445_OPTIONAL,
-            'contact'     => RFC2445_OPTIONAL,
-            'exdate'      => RFC2445_OPTIONAL,
-            'exrule'      => RFC2445_OPTIONAL,
-            'rstatus'     => RFC2445_OPTIONAL,
-            'related'     => RFC2445_OPTIONAL,
-            'resources'   => RFC2445_OPTIONAL,
-            'rdate'       => RFC2445_OPTIONAL,
-            'rrule'       => RFC2445_OPTIONAL,
-            'xprop'       => RFC2445_OPTIONAL
-        );
-
-        parent::construct();
-        // TODO:
-        // either 'due' or 'duration' may appear in  a 'eventprop', but 'due'
-        // and 'duration' MUST NOT occur in the same 'eventprop'
-    }
+	var $name       = 'VTODO';
+	var $properties;
+
+	function construct() {
+
+		$this->properties = array(
+			'class'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'completed'   => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'created'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'description' => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'dtstamp'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'dtstart'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'geo'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'location'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'organizer'   => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'percent'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'priority'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'recurid'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'sequence'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'status'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'summary'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'uid'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'url'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'due'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'duration'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'attach'      => RFC2445_OPTIONAL,
+			'attendee'    => RFC2445_OPTIONAL,
+			'categories'  => RFC2445_OPTIONAL,
+			'comment'     => RFC2445_OPTIONAL,
+			'contact'     => RFC2445_OPTIONAL,
+			'exdate'      => RFC2445_OPTIONAL,
+			'exrule'      => RFC2445_OPTIONAL,
+			'rstatus'     => RFC2445_OPTIONAL,
+			'related'     => RFC2445_OPTIONAL,
+			'resources'   => RFC2445_OPTIONAL,
+			'rdate'       => RFC2445_OPTIONAL,
+			'rrule'       => RFC2445_OPTIONAL,
+			'xprop'       => RFC2445_OPTIONAL
+		);
+
+		parent::construct();
+		// TODO:
+		// either 'due' or 'duration' may appear in  a 'eventprop', but 'due'
+		// and 'duration' MUST NOT occur in the same 'eventprop'
+	}
 }
 
 class iCalendar_journal extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_freebusy extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_alarm extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_timezone extends iCalendar_component {
-    var $name       = 'VTIMEZONE';
-    var $properties;
-
-    function construct() {
-
-        $this->properties = array(
-            'tzid'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'tzurl'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // TODO: the next two are components of their own!
-            'standardc'   => RFC2445_REQUIRED,
-            'daylightc'   => RFC2445_REQUIRED,
-            'x-prop'      => RFC2445_OPTIONAL
-        );
+	var $name       = 'VTIMEZONE';
+	var $properties;
+
+	function construct() {
+
+		$this->properties = array(
+			'tzid'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'tzurl'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// TODO: the next two are components of their own!
+			'standardc'   => RFC2445_REQUIRED,
+			'daylightc'   => RFC2445_REQUIRED,
+			'x-prop'      => RFC2445_OPTIONAL
+		);
         
-        parent::construct();
-    }
+		parent::construct();
+	}
 }
 
 // REMINDER: DTEND must be later than DTSTART for all components which support both

Spacing +39 added lines, -39 removed lines

@@ -26,9 +26,9 @@ 
 
     function construct() {
         // Initialize the components array
-        if(empty($this->components)) {
+        if (empty($this->components)) {
             $this->components = array();
-            foreach($this->valid_components as $name) {
+            foreach ($this->valid_components as $name) {
                 $this->components[$name] = array();
             }
         }
@@ -45,9 +45,9 @@ 
 
         // Are we trying to add a valid property?
         $xname = false;
-        if(!isset($this->valid_properties[$name])) {
+        if (!isset($this->valid_properties[$name])) {
             // If not, is it an x-name as per RFC 2445?
-            if(!rfc2445_is_xname($name)) {
+            if (!rfc2445_is_xname($name)) {
                 return false;
             }
             // Since this is an xname, all components are supposed to allow this property
@@ -55,7 +55,7 @@ 
         }
 
         // Create a property object of the correct class
-        if($xname) {
+        if ($xname) {
             $property = new iCalendar_property_x;
             $property->set_name($name);
         }
@@ -65,9 +65,9 @@ 
         }
 
         // If $value is NULL, then this property must define a default value.
-        if($value === NULL) {
+        if ($value === NULL) {
             $value = $property->default_value();
-            if($value === NULL) {
+            if ($value === NULL) {
                 return false;
             }
         }
@@ -80,27 +80,27 @@ 
         // accept a VALUE parameter, and thus change their default value type.
 
         // The parameters must be valid according to property specifications
-        if(!empty($parameters)) {
-            foreach($parameters as $paramname => $paramvalue) {
-                if(!$property->set_parameter($paramname, $paramvalue)) {
+        if (!empty($parameters)) {
+            foreach ($parameters as $paramname => $paramvalue) {
+                if (!$property->set_parameter($paramname, $paramvalue)) {
                     return false;
                 }
             }
 
             // Some parameters interact among themselves (e.g. ENCODING and VALUE)
             // so make sure that after the dust settles, these invariants hold true
-            if(!$property->invariant_holds()) {
+            if (!$property->invariant_holds()) {
                 return false;
             }
         }
 
         // $value MUST be valid according to the property data type
-        if(!$property->set_value($value)) {
+        if (!$property->set_value($value)) {
             return false;
         }
 
         // If this property is restricted to only once, blindly overwrite value
-        if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
+        if (!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
             $this->properties[$name] = array($property);
         }
 
@@ -110,10 +110,10 @@ 
         }
 
         // Finally: after all these, does the component invariant hold?
-        if(!$this->invariant_holds()) {
+        if (!$this->invariant_holds()) {
             // If not, completely undo the property addition
             array_pop($this->properties[$name]);
-            if(empty($this->properties[$name])) {
+            if (empty($this->properties[$name])) {
                 unset($this->properties[$name]);
             }
             return false;
@@ -126,14 +126,14 @@ 
     function add_component($component) {
 
         // With the detailed interface, you can add only components with this function
-        if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
+        if (!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
             return false;
         }
 
         $name = $component->get_name();
 
         // Only valid components as specified by this component are allowed
-        if(!in_array($name, $this->valid_components)) {
+        if (!in_array($name, $this->valid_components)) {
             return false;
         }
 
@@ -152,10 +152,10 @@ 
 
     function is_valid() {
         // If we have any child components, check that they are all valid
-        if(!empty($this->components)) {
-            foreach($this->components as $component => $instances) {
-                foreach($instances as $number => $instance) {
-                    if(!$instance->is_valid()) {
+        if (!empty($this->components)) {
+            foreach ($this->components as $component => $instances) {
+                foreach ($instances as $number => $instance) {
+                    if (!$instance->is_valid()) {
                         return false;
                     }
                 }
@@ -164,11 +164,11 @@ 
 
         // Finally, check the valid property list for any mandatory properties
         // that have not been set and do not have a default value
-        foreach($this->valid_properties as $property => $propdata) {
-            if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
+        foreach ($this->valid_properties as $property => $propdata) {
+            if (($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
                 $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
                 $object    = new $classname;
-                if($object->default_value() === NULL) {
+                if ($object->default_value() === NULL) {
                     return false;
                 }
                 unset($object);
@@ -180,28 +180,28 @@ 
     
     function serialize() {
         // Start tag
-        $string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
+        $string = rfc2445_fold('BEGIN:'.$this->name).RFC2445_CRLF;
 
         // List of properties
-        if(!empty($this->properties)) {
-            foreach($this->properties as $name => $properties) {
-                foreach($properties as $property) {
+        if (!empty($this->properties)) {
+            foreach ($this->properties as $name => $properties) {
+                foreach ($properties as $property) {
                     $string .= $property->serialize();
                 }
             }
         }
 
         // List of components
-        if(!empty($this->components)) {
-            foreach($this->components as $name => $components) {
-                foreach($components as $component) {
+        if (!empty($this->components)) {
+            foreach ($this->components as $name => $components) {
+                foreach ($components as $component) {
                     $string .= $component->serialize();
                 }
             }
         }
 
         // End tag
-        $string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
+        $string .= rfc2445_fold('END:'.$this->name).RFC2445_CRLF;
 
         return $string;
     }
@@ -230,7 +230,7 @@ 
 
 class iCalendar_event extends iCalendar_component {
 
-    var $name       = 'VEVENT';
+    var $name = 'VEVENT';
     var $properties;
     
     function construct() {
@@ -283,21 +283,21 @@ 
 
     function invariant_holds() {
         // DTEND and DURATION must not appear together
-        if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
+        if (isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
             return false;
         }
 
         
-        if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
+        if (isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
             // DTEND must be later than DTSTART
             // The standard is not clear on how to hande different value types though
             // TODO: handle this correctly even if the value types are different
-            if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
+            if ($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
                 return false;
             }
 
             // DTEND and DTSTART must have the same value type
-            if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
+            if ($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
                 return false;
             }
 
@@ -307,7 +307,7 @@ 
 }
 
 class iCalendar_todo extends iCalendar_component {
-    var $name       = 'VTODO';
+    var $name = 'VTODO';
     var $properties;
 
     function construct() {
@@ -368,7 +368,7 @@ 
 }
 
 class iCalendar_timezone extends iCalendar_component {
-    var $name       = 'VTIMEZONE';
+    var $name = 'VTIMEZONE';
     var $properties;
 
     function construct() {

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
         if($xname) {
             $property = new iCalendar_property_x;
             $property->set_name($name);
-        }
-        else {
+        } else {
             $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $name));
             $property = new $classname;
         }

phpicalendar/calendars/publish.php

Switch Indentation +79 added lines, -79 removed lines

@@ -129,92 +129,92 @@
 
 switch ($_SERVER['REQUEST_METHOD']){
 	// unpublishing
-	case 'DELETE':
-		// get calendar filename
-		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
-		$calendar_file = urldecode($calendar_file);
-		logmsg('received request to delete '.$calendar_file);
-		// remove calendar file
-		if(!unlink($calendar_file)){
-			logmsg('unable to delete the calendar file');
-		}else{
-			logmsg('deleted');
-		}
-		break;
-	// publishing
-	case 'PUT':
-		logmsg('PUT request');
-		// get calendar data
-		# php://input allows you to read raw POST data
-		if($datain = fopen('php://input','r')){
-			while(!@feof($datain)){
-				$data .= fgets($datain,4096);
-			}
-			@fclose($datain);
-		}else{
-			logmsg('unable to read input data');
-		}
-		if(isset($data)){
-			if (isset($_SERVER['PATH_INFO'])) {
-				preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
-				$calendar_name = urldecode($matches[1]);
+		case 'DELETE':
+			// get calendar filename
+			$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
+			$calendar_file = urldecode($calendar_file);
+			logmsg('received request to delete '.$calendar_file);
+			// remove calendar file
+			if(!unlink($calendar_file)){
+				logmsg('unable to delete the calendar file');
+			}else{
+				logmsg('deleted');
 			}
-			// If we don't have it from path info, use the supplied calendar name
-			if( ! isset($calendar_name) ) {
-				$cal_arr = explode("\n",$data);
-				foreach($cal_arr as $k => $v){
-					if(strstr($v,'X-WR-CALNAME:')){
-						$arr = explode(':',$v);
-						$calendar_name = trim($arr[1]);
-						break;
-					}
+			break;
+		// publishing
+		case 'PUT':
+			logmsg('PUT request');
+			// get calendar data
+			# php://input allows you to read raw POST data
+			if($datain = fopen('php://input','r')){
+				while(!@feof($datain)){
+					$data .= fgets($datain,4096);
 				}
-			}
-			logmsg('Received request to update: ' . $calendar_name);
-			// Remove any invalid characters from the filename
-			$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
-			if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
-				header('HTTP/1.1 401 Invalid calendar name');
-				header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
-				echo 'Invalid calendar name.';
-			}
-			// If we don't have a name, assume default
-			$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
-			logmsg('Updating calendar: ' . $calendar_name);
-			// If this is Apple iCal, an event with a blank summary is private - mark as such
-			if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
-				$data = preg_replace(
-					"/^\s*SUMMARY:\s*$/m",
-					"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
-					$data
-				);
-			}
-			// write to file
-			if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
-				fputs($dataout, $data, strlen($data) );
-				@fclose($dataout);
+				@fclose($datain);
 			}else{
-				logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
+				logmsg('unable to read input data');
 			}
+			if(isset($data)){
+				if (isset($_SERVER['PATH_INFO'])) {
+					preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
+					$calendar_name = urldecode($matches[1]);
+				}
+				// If we don't have it from path info, use the supplied calendar name
+				if( ! isset($calendar_name) ) {
+					$cal_arr = explode("\n",$data);
+					foreach($cal_arr as $k => $v){
+						if(strstr($v,'X-WR-CALNAME:')){
+							$arr = explode(':',$v);
+							$calendar_name = trim($arr[1]);
+							break;
+						}
+					}
+				}
+				logmsg('Received request to update: ' . $calendar_name);
+				// Remove any invalid characters from the filename
+				$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
+				if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
+					header('HTTP/1.1 401 Invalid calendar name');
+					header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
+					echo 'Invalid calendar name.';
+				}
+				// If we don't have a name, assume default
+				$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
+				logmsg('Updating calendar: ' . $calendar_name);
+				// If this is Apple iCal, an event with a blank summary is private - mark as such
+				if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
+					$data = preg_replace(
+						"/^\s*SUMMARY:\s*$/m",
+						"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
+						$data
+					);
+				}
+				// write to file
+				if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
+					fputs($dataout, $data, strlen($data) );
+					@fclose($dataout);
+				}else{
+					logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
+				}
 
-		}else {
-			logmsg('PUT ERROR - No data supplied.');
-		}
-		break;
-	case 'GET':
-		if (isset($_SERVER['PATH_INFO'])) {
-			preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
-			$icsfile = urldecode($matches[1]);
+			}else {
+				logmsg('PUT ERROR - No data supplied.');
+			}
+			break;
+		case 'GET':
+			if (isset($_SERVER['PATH_INFO'])) {
+				preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
+				$icsfile = urldecode($matches[1]);
 	
-			// get calendar data
-			if (file_exists($calendar_path . $icsfile . '.ics') &&
-				is_readable($calendar_path . $icsfile . '.ics') &&
-				is_file($calendar_path . $icsfile . '.ics')
-			) {
-				echo file_get_contents($calendar_path . $icsfile . '.ics');
-				logmsg('downloaded calendar ' . $icsfile);
+				// get calendar data
+				if (file_exists($calendar_path . $icsfile . '.ics') &&
+					is_readable($calendar_path . $icsfile . '.ics') &&
+					is_file($calendar_path . $icsfile . '.ics')
+				) {
+					echo file_get_contents($calendar_path . $icsfile . '.ics');
+					logmsg('downloaded calendar ' . $icsfile);
+				}
 			}
-		}
 }
 
 if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {

Spacing +46 added lines, -46 removed lines

@@ -78,9 +78,9 @@ 
 
 // allow/disallow publishing
 $phpicalendar_publishing = isset($phpiCal_config->phpicalendar_publishing) ? $phpiCal_config->phpicalendar_publishing : 0;
-define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );
+define('PHPICALENDAR_PUBLISHING', $phpicalendar_publishing);
 // only allow publishing if explicitly enabled
-if(PHPICALENDAR_PUBLISHING != 1) {
+if (PHPICALENDAR_PUBLISHING != 1) {
 	header('WWW-Authenticate: Basic realm="ERROR: Calendar Publishing is disabled on this server"');
 	header('HTTP/1.1 401 Unauthorized');
 	echo 'Calendar Publishing is disabled on this server!';
@@ -89,15 +89,15 @@ 
 
 // set calendar path, or just use current directory...make sure there's a trailing slash
 if (isset($phpiCal_config->calendar_path) && $phpiCal_config->calendar_path != '') {
-	if (substr($phpiCal_config->calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/';
+	if (substr($phpiCal_config->calendar_path, -1, 1) != '/') $calendar_path = $calendar_path.'/';
 } else {
 	$calendar_path = '';
 }
 
 // toggle logging
-define( 'PHPICALENDAR_LOG_PUBLISHING', 1 );
-if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
-	if( ! $logfile = fopen('publish_log.txt','a+') ) {
+define('PHPICALENDAR_LOG_PUBLISHING', 1);
+if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
+	if (!$logfile = fopen('publish_log.txt', 'a+')) {
 		header('HTTP/1.1 401 Unauthorized');
 		header('WWW-Authenticate: Basic realm="ERROR: Unable to open log file"');
 		echo 'Unable to open log file.';
@@ -110,7 +110,7 @@ 
 	// Require authentication 
 	if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
 		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])
-			= explode( ':', base64_decode( substr($_SERVER['HTTP_AUTHORIZATION'], 6) ) );
+			= explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
 	}
 	if (!isset($_SERVER['PHP_AUTH_USER'])) {
 		header('WWW-Authenticate: Basic realm="phpICalendar"');
@@ -127,17 +127,17 @@ 
 	}
 }
 
-switch ($_SERVER['REQUEST_METHOD']){
+switch ($_SERVER['REQUEST_METHOD']) {
 	// unpublishing
 	case 'DELETE':
 		// get calendar filename
-		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
+		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'], (strrpos($_SERVER['REQUEST_URI'], '/') + 1));
 		$calendar_file = urldecode($calendar_file);
 		logmsg('received request to delete '.$calendar_file);
 		// remove calendar file
-		if(!unlink($calendar_file)){
+		if (!unlink($calendar_file)) {
 			logmsg('unable to delete the calendar file');
-		}else{
+		} else {
 			logmsg('deleted');
 		}
 		break;
@@ -146,43 +146,43 @@ 
 		logmsg('PUT request');
 		// get calendar data
 		# php://input allows you to read raw POST data
-		if($datain = fopen('php://input','r')){
-			while(!@feof($datain)){
-				$data .= fgets($datain,4096);
+		if ($datain = fopen('php://input', 'r')) {
+			while (!@feof($datain)) {
+				$data .= fgets($datain, 4096);
 			}
 			@fclose($datain);
-		}else{
+		} else {
 			logmsg('unable to read input data');
 		}
-		if(isset($data)){
+		if (isset($data)) {
 			if (isset($_SERVER['PATH_INFO'])) {
-				preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
+				preg_match("/\/([\w\-\.\+ ]*).ics/i", $_SERVER['PATH_INFO'], $matches);
 				$calendar_name = urldecode($matches[1]);
 			}
 			// If we don't have it from path info, use the supplied calendar name
-			if( ! isset($calendar_name) ) {
-				$cal_arr = explode("\n",$data);
-				foreach($cal_arr as $k => $v){
-					if(strstr($v,'X-WR-CALNAME:')){
-						$arr = explode(':',$v);
+			if (!isset($calendar_name)) {
+				$cal_arr = explode("\n", $data);
+				foreach ($cal_arr as $k => $v) {
+					if (strstr($v, 'X-WR-CALNAME:')) {
+						$arr = explode(':', $v);
 						$calendar_name = trim($arr[1]);
 						break;
 					}
 				}
 			}
-			logmsg('Received request to update: ' . $calendar_name);
+			logmsg('Received request to update: '.$calendar_name);
 			// Remove any invalid characters from the filename
-			$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
-			if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
+			$calendar_name = preg_replace("/[^\w\.\- ]/", '', $calendar_name);
+			if ((!isset($calendar_name)) || ($calendar_name == '')) {
 				header('HTTP/1.1 401 Invalid calendar name');
 				header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
 				echo 'Invalid calendar name.';
 			}
 			// If we don't have a name, assume default
 			$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
-			logmsg('Updating calendar: ' . $calendar_name);
+			logmsg('Updating calendar: '.$calendar_name);
 			// If this is Apple iCal, an event with a blank summary is private - mark as such
-			if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
+			if (preg_match("/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'])) {
 				$data = preg_replace(
 					"/^\s*SUMMARY:\s*$/m",
 					"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
@@ -190,34 +190,34 @@ 
 				);
 			}
 			// write to file
-			if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
-				fputs($dataout, $data, strlen($data) );
+			if ($dataout = fopen($calendar_path.$calendar_name.'.ics', 'w+')) {
+				fputs($dataout, $data, strlen($data));
 				@fclose($dataout);
-			}else{
-				logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
+			} else {
+				logmsg('could not open file '.$calendar_path.$calendar_name.'.ics');
 			}
 
-		}else {
+		} else {
 			logmsg('PUT ERROR - No data supplied.');
 		}
 		break;
 	case 'GET':
 		if (isset($_SERVER['PATH_INFO'])) {
-			preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
+			preg_match("/\/([ A-Za-z0-9._]*).ics/i", $_SERVER['PATH_INFO'], $matches);
 			$icsfile = urldecode($matches[1]);
 	
 			// get calendar data
-			if (file_exists($calendar_path . $icsfile . '.ics') &&
-				is_readable($calendar_path . $icsfile . '.ics') &&
-				is_file($calendar_path . $icsfile . '.ics')
+			if (file_exists($calendar_path.$icsfile.'.ics') &&
+				is_readable($calendar_path.$icsfile.'.ics') &&
+				is_file($calendar_path.$icsfile.'.ics')
 			) {
-				echo file_get_contents($calendar_path . $icsfile . '.ics');
-				logmsg('downloaded calendar ' . $icsfile);
+				echo file_get_contents($calendar_path.$icsfile.'.ics');
+				logmsg('downloaded calendar '.$icsfile);
 			}
 		}
 }
 
-if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
+if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
 	fclose($logfile);
 }
 
@@ -226,18 +226,18 @@ 
 
 
 // for logging
-function logmsg($str){
+function logmsg($str) {
 	global $logfile;
 
-	if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
-		if( $_SERVER['PHP_AUTH_USER'] )
-			$user =  $_SERVER['PHP_AUTH_USER'];
+	if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
+		if ($_SERVER['PHP_AUTH_USER'])
+			$user = $_SERVER['PHP_AUTH_USER'];
 		else
-			$user =  $_SERVER['REMOTE_USER'];
+			$user = $_SERVER['REMOTE_USER'];
 
-		$logline = date('Y-m-d H:i:s ') . $_SERVER['REMOTE_ADDR'] . ' ' . $user . ' ' . $str . "\n";
+		$logline = date('Y-m-d H:i:s ').$_SERVER['REMOTE_ADDR'].' '.$user.' '.$str."\n";
 
-		fputs($logfile, $logline, strlen($logline) );
+		fputs($logfile, $logline, strlen($logline));
 	}
 }
 ?>
\ No newline at end of file

Braces +13 added lines, -10 removed lines

@@ -89,8 +89,10 @@ 
 
 // set calendar path, or just use current directory...make sure there's a trailing slash
 if (isset($phpiCal_config->calendar_path) && $phpiCal_config->calendar_path != '') {
-	if (substr($phpiCal_config->calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/';
-} else {
+	if (substr($phpiCal_config->calendar_path, -1, 1) !='/') {
+		$calendar_path = $calendar_path.'/';
+	}
+	} else {
 	$calendar_path = '';
 }
 
@@ -137,7 +139,7 @@ 
 		// remove calendar file
 		if(!unlink($calendar_file)){
 			logmsg('unable to delete the calendar file');
-		}else{
+		} else{
 			logmsg('deleted');
 		}
 		break;
@@ -151,7 +153,7 @@ 
 				$data .= fgets($datain,4096);
 			}
 			@fclose($datain);
-		}else{
+		} else{
 			logmsg('unable to read input data');
 		}
 		if(isset($data)){
@@ -193,11 +195,11 @@ 
 			if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
 				fputs($dataout, $data, strlen($data) );
 				@fclose($dataout);
-			}else{
+			} else{
 				logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
 			}
 
-		}else {
+		} else {
 			logmsg('PUT ERROR - No data supplied.');
 		}
 		break;
@@ -230,10 +232,11 @@ 
 	global $logfile;
 
 	if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
-		if( $_SERVER['PHP_AUTH_USER'] )
-			$user =  $_SERVER['PHP_AUTH_USER'];
-		else
-			$user =  $_SERVER['REMOTE_USER'];
+		if( $_SERVER['PHP_AUTH_USER'] ) {
+					$user =  $_SERVER['PHP_AUTH_USER'];
+		} else {
+					$user =  $_SERVER['REMOTE_USER'];
+		}
 
 		$logline = date('Y-m-d H:i:s ') . $_SERVER['REMOTE_ADDR'] . ' ' . $user . ' ' . $str . "\n";
 

phpicalendar/year.php

Indentation +3 added lines, -3 removed lines

@@ -48,8 +48,8 @@ 
 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
 	'event_js'			=> BASE.'functions/event.js',
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
-    'sidebar'           => BASE.'templates/'.$template.'/sidebar_year.tpl',
-    'search_box'        => BASE.'templates/'.$template.'/search_box.tpl'
+	'sidebar'           => BASE.'templates/'.$template.'/sidebar_year.tpl',
+	'search_box'        => BASE.'templates/'.$template.'/search_box.tpl'
 	));
 
 $page->replace_tags(array(
@@ -61,7 +61,7 @@ 
 	'default_path'		=> $phpiCal_config->default_path,
 	'cal'				=> $cal,
 	'getcpath'			=> "&cpath=$cpath",
-    'cpath'             => $cpath,
+	'cpath'             => $cpath,
 	'getdate'			=> $getdate,
 	'calendar_name'		=> $cal_displayname,
 	'display_date'		=> $this_year,

Spacing +10 added lines, -10 removed lines

@@ -5,20 +5,20 @@ 
 require_once(BASE.'functions/list_functions.php');
 require_once(BASE.'functions/template.php');
 
-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];
-$next_year 	= strtotime ("+1 year", strtotime($getdate));
-$next_year 	= date ("Ymd", $next_year);
-$prev_year 	= strtotime ("-1 year", strtotime($getdate));
-$prev_year 	= date ("Ymd", $prev_year);
+$next_year 	= strtotime("+1 year", strtotime($getdate));
+$next_year 	= date("Ymd", $next_year);
+$prev_year 	= strtotime("-1 year", strtotime($getdate));
+$prev_year 	= date("Ymd", $prev_year);
 
-$sidebar_date 		= localizeDate($dateFormat_week_list, strtotime($getdate));
+$sidebar_date = localizeDate($dateFormat_week_list, strtotime($getdate));
 
 // For the side months
-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];
 
@@ -26,7 +26,7 @@ 
 $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
 $list_icals 	= display_ical_list($available);
 $list_years 	= list_years();
-$list_months 	= list_months();
+$list_months = list_months();
 $list_weeks 	= list_weeks();
 $list_jumps 	= list_jumps();
 $list_calcolors = '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_all_day'].'<br>

phpicalendar/month.php

Indentation +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
 	'event_js'			=> BASE.'functions/event.js',
 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
-    'calendar_nav'      => BASE.'templates/'.$phpiCal_config->template.'/calendar_nav.tpl',
-    'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
+	'calendar_nav'      => BASE.'templates/'.$phpiCal_config->template.'/calendar_nav.tpl',
+	'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
 	));
 
 $page->replace_tags(array(

Spacing +21 added lines, -21 removed lines

@@ -15,41 +15,41 @@
 		break;
 }
 
-$unix_time 				= strtotime($getdate);
-$today_today 			= date('Ymd', time() + $phpiCal_config->second_offset); 
-$tomorrows_date 		= date('Ymd', strtotime("+1 day",  $unix_time));
-$yesterdays_date 		= date('Ymd', strtotime("-1 day",  $unix_time));
-$sidebar_date 			= localizeDate($dateFormat_week_list, $unix_time);
+$unix_time = strtotime($getdate);
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset); 
+$tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time));
+$yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time));
+$sidebar_date = localizeDate($dateFormat_week_list, $unix_time);
 if (!isset($style_select)) $style_select = '';
 
 // find out next month
-$next_month_month 		= ($this_month+1 == '13') ? '1' : ($this_month+1);
-$next_month_day 		= $this_day;
-$next_month_year 		= ($next_month_month == '1') ? ($this_year+1) : $this_year;
-while (!checkdate($next_month_month,$next_month_day,$next_month_year)) $next_month_day--;
-$next_month_time 		= mktime(0,0,0,$next_month_month,$next_month_day,$next_month_year);
+$next_month_month = ($this_month + 1 == '13') ? '1' : ($this_month + 1);
+$next_month_day = $this_day;
+$next_month_year 		= ($next_month_month == '1') ? ($this_year + 1) : $this_year;
+while (!checkdate($next_month_month, $next_month_day, $next_month_year)) $next_month_day--;
+$next_month_time 		= mktime(0, 0, 0, $next_month_month, $next_month_day, $next_month_year);
 
 // find out last month
-$prev_month_month 		= ($this_month-1 == '0') ? '12' : ($this_month-1);
-$prev_month_day 		= $this_day;
-$prev_month_year 		= ($prev_month_month == '12') ? ($this_year-1) : $this_year;
-while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) $prev_month_day--;
-$prev_month_time 		= mktime(0,0,0,$prev_month_month,$prev_month_day,$prev_month_year);
+$prev_month_month = ($this_month - 1 == '0') ? '12' : ($this_month - 1);
+$prev_month_day = $this_day;
+$prev_month_year 		= ($prev_month_month == '12') ? ($this_year - 1) : $this_year;
+while (!checkdate($prev_month_month, $prev_month_day, $prev_month_year)) $prev_month_day--;
+$prev_month_time 		= mktime(0, 0, 0, $prev_month_month, $prev_month_day, $prev_month_year);
 
 $next_month 			= date("Ymd", $next_month_time);
 $prev_month 			= date("Ymd", $prev_month_time);
-$display_date 			= localizeDate ($dateFormat_month, $unix_time);
-$parse_month 			= date ("Ym", $unix_time);
-$first_of_month 		= $this_year.$this_month."01";
+$display_date = localizeDate($dateFormat_month, $unix_time);
+$parse_month = date("Ym", $unix_time);
+$first_of_month = $this_year.$this_month."01";
 $start_month_day 		= dateOfWeek($first_of_month, $phpiCal_config->week_start_day);
-$thisday2 				= localizeDate($dateFormat_week_list, $unix_time);
+$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
 $num_of_events2 			= 0;
 
 // select for calendars
-$available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
+$available = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
 $list_icals 	= display_ical_list($available);
 $list_years 	= list_years();
-$list_months 	= list_months();
+$list_months = list_months();
 $list_weeks 	= list_weeks();
 $list_jumps 	= list_jumps();
 $list_calcolors = list_calcolors();

Braces +9 added lines, -3 removed lines

@@ -20,20 +20,26 @@
 $tomorrows_date 		= date('Ymd', strtotime("+1 day",  $unix_time));
 $yesterdays_date 		= date('Ymd', strtotime("-1 day",  $unix_time));
 $sidebar_date 			= localizeDate($dateFormat_week_list, $unix_time);
-if (!isset($style_select)) $style_select = '';
+if (!isset($style_select)) {
+	$style_select = '';
+}
 
 // find out next month
 $next_month_month 		= ($this_month+1 == '13') ? '1' : ($this_month+1);
 $next_month_day 		= $this_day;
 $next_month_year 		= ($next_month_month == '1') ? ($this_year+1) : $this_year;
-while (!checkdate($next_month_month,$next_month_day,$next_month_year)) $next_month_day--;
+while (!checkdate($next_month_month,$next_month_day,$next_month_year)) {
+	$next_month_day--;
+}
 $next_month_time 		= mktime(0,0,0,$next_month_month,$next_month_day,$next_month_year);
 
 // find out last month
 $prev_month_month 		= ($this_month-1 == '0') ? '12' : ($this_month-1);
 $prev_month_day 		= $this_day;
 $prev_month_year 		= ($prev_month_month == '12') ? ($this_year-1) : $this_year;
-while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) $prev_month_day--;
+while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) {
+	$prev_month_day--;
+}
 $prev_month_time 		= mktime(0,0,0,$prev_month_month,$prev_month_day,$prev_month_year);
 
 $next_month 			= date("Ymd", $next_month_time);