EGroupware / egroupware

calendar/sitemgr/class.module_calendar_month.inc.php

Spacing +29 added lines, -30 removed lines

@@ -55,7 +55,7 @@ 
 			'category' => array(
 				'type' => 'select',
 				'label' => lang('Choose a category'),
-				'options' => array(),	// specification of options is postponed into the get_user_interface function
+				'options' => array(), // specification of options is postponed into the get_user_interface function
 				'multiple' => true,
 			),
 			'numWeeks' => array(
@@ -107,8 +107,8 @@ 
 	function get_user_interface()
 	{
 		// copied from bookmarks module.
-		$cat = createobject('phpgwapi.categories','','calendar');
-		$cats = $cat->return_array('all',0,False,'','cat_name','',True);
+		$cat = createobject('phpgwapi.categories', '', 'calendar');
+		$cats = $cat->return_array('all', 0, False, '', 'cat_name', '', True);
 		$cat_ids = array();
 		while (list(,$category) = @each($cats))
 		{
@@ -119,12 +119,12 @@ 
 			$this->arguments['category']['multiple'] = 5;
 		}
 
-		if (! isset($GLOBALS['egw']->accounts))
+		if (!isset($GLOBALS['egw']->accounts))
 		{
 			$GLOBALS['egw']->accounts = new Api\Accounts();
 		}
-		$this->accounts =& $GLOBALS['egw']->accounts;
-		$search_params=array(
+		$this->accounts = & $GLOBALS['egw']->accounts;
+		$search_params = array(
 			'type' => 'both',
 			'app' => 'calendar',
 		);
@@ -134,7 +134,7 @@ 
 		// sort users and groups separately.
 		if (isset($GLOBALS['sitemgr_info']['anonymous_user']))
 		{
-			$anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'],'account_lid','u');
+			$anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'], 'account_lid', 'u');
 		}
 		else
 		{
@@ -143,7 +143,7 @@ 
 			 * Get possible sitemgr paths from the HTTP_REFERRER in order to unreveal the
 			 * anonymous user for the correct site.
 			 */
-			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/',"/\${1}",$_SERVER['HTTP_REFERER']);
+			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/', "/\${1}", $_SERVER['HTTP_REFERER']);
 			// Remove the trailing file- / pathname if any
 			$sitemgr_path = preg_replace('/[^\/]*$/', '', $sitemgr_path);
 			// Add leading slash if it has been lost.
@@ -155,14 +155,14 @@ 
 			// Code adapted from sitemgr-site/index.php
 			$site_urls = array();
 			$site_urls[] = $sitemgr_path;
-			$site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $sitemgr_path;
-			$site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $sitemgr_path;
+			$site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$sitemgr_path;
+			$site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$sitemgr_path;
 
-			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->select('egw_sitemgr_sites','anonymous_user,anonymous_passwd,site_id',
-				array('site_url' => $site_urls),__LINE__,__FILE__,false,'','sitemgr')->fetchColumn(),'account_lid','u');
+			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->select('egw_sitemgr_sites', 'anonymous_user,anonymous_passwd,site_id',
+				array('site_url' => $site_urls), __LINE__, __FILE__, false, '', 'sitemgr')->fetchColumn(), 'account_lid', 'u');
 		}
 
-		$anon_groups = $this->accounts->memberships($anon_user,true);
+		$anon_groups = $this->accounts->memberships($anon_user, true);
 		foreach ($accounts as $entry)
 		{
 			$is_group = false;
@@ -170,9 +170,9 @@ 
 			$acl = new Acl($entry['account_id']);
 			$acl->read_repository();
 			// get the rights for each account to check whether the anon user has read permissions.
-			$rights = $acl->get_rights($anon_user,'calendar');
+			$rights = $acl->get_rights($anon_user, 'calendar');
 			// also add the anon user if it's his own calendar.
-			if (($rights & Acl::READ) || ($entry['account_id'] == $anon_user))
+			if (($rights&Acl::READ) || ($entry['account_id'] == $anon_user))
 			{
 				$has_read_permissions = true;
 			}
@@ -182,8 +182,8 @@ 
 				// or ass permissions if this is the anon group's calendar.
 				foreach ($anon_groups as $parent_group)
 				{
-					$rights = $acl->get_rights($parent_group,'calendar');
-					if (($rights & Acl::READ) || ($entry['account_id'] == $parent_group))
+					$rights = $acl->get_rights($parent_group, 'calendar');
+					if (($rights&Acl::READ) || ($entry['account_id'] == $parent_group))
 					{
 						$has_read_permissions = true;
 						break;
@@ -199,7 +199,7 @@ 
 				}
 				else
 				{
-					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']);
+					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']);
 				}
 			}
 		}
@@ -219,7 +219,7 @@ 
 		return parent::get_user_interface();
 	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$html = "";
 		Api\Translation::add_app('calendar');
@@ -227,33 +227,32 @@ 
 		$this->ui->allowEdit = false;
 		$this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false;
 
-		$weeks = $arguments['numWeeks'] ? (int) $arguments['numWeeks'] : 2;
+		$weeks = $arguments['numWeeks'] ? (int)$arguments['numWeeks'] : 2;
 
-		if (($arguments['acceptDateParam']) && (get_var('date',array('POST','GET'))))
+		if (($arguments['acceptDateParam']) && (get_var('date', array('POST', 'GET'))))
 		{
-			$start = (int) (strtotime(get_var('date',array('POST','GET'))) +
+			$start = (int)(strtotime(get_var('date', array('POST', 'GET'))) +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		else
 		{
-			$start = (int) ($this->bo->now_su +
+			$start = (int)($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		$start = new Api\DateTime($start);
 		$start->setWeekstart();
 		$first = $start->format('ts');
-		$last = strtotime("+$weeks weeks",$first) - 1;
+		$last = strtotime("+$weeks weeks", $first) - 1;
 
 		if ($arguments['showTitle'])
 		{
 			$html .= '<div id="divAppboxHeader">'.$GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Weekview').": ";
-			$html .= lang('After %1',$this->bo->long_date($first));
+			$html .= lang('After %1', $this->bo->long_date($first));
 			$html .= "</div>";
 		}
 
 		// set the search parameters
-		$search_params = Array
-		(
+		$search_params = Array(
 			'offset' => false,
 			'order' => 'cal_start ASC',
 			'start' => $first,
@@ -288,19 +287,19 @@ 
 		$html .= '<!-- END Calendar info -->'."\n";
 		unset($css_file);
 		// we add DAY_s/2 to $this->first (using 12h), to deal with daylight saving changes
-		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week",$week_start))
+		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week", $week_start))
 		{
 			$week = array();
 			for ($i = 0; $i < 7; ++$i)
 			{
-				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days",$week_start) : $week_start);
+				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days", $week_start) : $week_start);
 				$week[$day_ymd] = array_shift($rows);
 			}
 			$week_view = array(
 				'menuaction' => false,
 				'date' => $this->bo->date2string($week_start),
 			);
-			$title = lang('Wk').' '.adodb_date('W',$week_start);
+			$title = lang('Wk').' '.adodb_date('W', $week_start);
 			if (!isset($GLOBALS['egw']->template))
 			{
 				$GLOBALS['egw']->template = new Framework\Template;

Braces +2 added lines, -1 removed lines

@@ -115,7 +115,8 @@
 			$cat_ids[$category['id']] = $GLOBALS['egw']->strip_html($category['name']);
 		}
 		$this->arguments['category']['options'] = $cat_ids;
-		if (count($cat_ids) > 5) {
+		if (count($cat_ids) > 5)
+		{
 			$this->arguments['category']['multiple'] = 5;
 		}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 		}
 
 		// set the search parameters
-		$search_params = Array
+		$search_params = array
 		(
 			'offset' => $arguments['entryOffset'] ? (int) $arguments['entryOffset'] : false,
 			'order' => 'cal_start ASC',

calendar/setup/setup.inc.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index&ajax=true';
 
-$setup_info['calendar']['license']  = 'GPL';
+$setup_info['calendar']['license'] = 'GPL';
 $setup_info['calendar']['description'] =
 	'Powerful group calendar with meeting request system and ACL security.';
 $setup_info['calendar']['note'] =

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );
 
 

calendar/setup/tables_current.inc.php

Spacing +56 added lines, -56 removed lines

@@ -12,41 +12,41 @@ 
 $phpgw_baseline = array(
 	'egw_cal' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False,'comment' => 'calendar id'),
-			'cal_uid' => array('type' => 'ascii','precision' => '128','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'ascii','meta' => 'category','precision' => '64','comment' => 'category id(s)'),
-			'cal_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2','comment' => 'priority: 1=Low, 2=Normal, 3=High'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'title of event'),
-			'cal_description' => array('type' => 'varchar','precision' => '16384','comment' => 'description'),
-			'cal_location' => array('type' => 'varchar','precision' => '255','comment' => 'location'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted'),
-			'caldav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CalDAV URL, if specified by client'),
-			'range_start' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'startdate (of range)'),
-			'range_end' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'enddate (of range, UNTIL of RRULE)')
+			'cal_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'calendar id'),
+			'cal_uid' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'ascii', 'meta' => 'category', 'precision' => '64', 'comment' => 'category id(s)'),
+			'cal_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2', 'comment' => 'priority: 1=Low, 2=Normal, 3=High'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'title of event'),
+			'cal_description' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'description'),
+			'cal_location' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'location'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted'),
+			'caldav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CalDAV URL, if specified by client'),
+			'range_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'startdate (of range)'),
+			'range_end' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'enddate (of range, UNTIL of RRULE)')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_modified','cal_reference','cal_deleted','caldav_name'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_modified', 'cal_reference', 'cal_deleted', 'caldav_name'),
 		'uc' => array()
 	),
 	'egw_cal_repeats' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -55,53 +55,53 @@ 
 	),
 	'egw_cal_user' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'ascii','meta' => array("cal_user_type='u'" => 'account'),'precision' => '32','nullable' => False,'comment' => 'id or md5(email-address) for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False),
-			'cal_user_attendee' => array('type' => 'varchar','precision' => '255','comment' => 'email or json object with attr. cn, url, ...')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'ascii', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '32', 'nullable' => False, 'comment' => 'id or md5(email-address) for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False),
+			'cal_user_attendee' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'email or json object with attr. cn, url, ...')
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	),
 	'egw_cal_extra' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
 	),
 	'egw_cal_dates' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_start' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'starttime in server time'),
-			'cal_end' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'endtime in server time'),
-			'recur_exception' => array('type' => 'bool','nullable' => False,'default' => '','comment' => 'date is an exception')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'starttime in server time'),
+			'cal_end' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'endtime in server time'),
+			'recur_exception' => array('type' => 'bool', 'nullable' => False, 'default' => '', 'comment' => 'date is an exception')
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
-		'ix' => array(array('recur_exception','cal_id')),
+		'ix' => array(array('recur_exception', 'cal_id')),
 		'uc' => array()
 	),
 	'egw_cal_timezones' => array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'ascii','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'ascii','precision' => '8192','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'ascii', 'precision' => '8192', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),

calendar/setup/tz_aliases.inc.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	'Arab Standard Time' => 'Asia/Riyadh',
 	'Arabian Standard Time' => 'Asia/Dubai',
 	'Arabic Standard Time' => 'Asia/Baghdad',
-	'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',	// was 'America/Buenos_Aires',
+	'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', // was 'America/Buenos_Aires',
 	'Atlantic Standard Time' => 'America/Halifax',
 	'Azerbaijan Standard Time' => 'Asia/Baku',
 	'Azores Standard Time' => 'Atlantic/Azores',
@@ -59,7 +59,7 @@ 
 	'Greenland Standard Time' => 'America/Godthab',
 	'Greenwich Standard Time' => 'Atlantic/Reykjavik',
 	'Hawaiian Standard Time' => 'Pacific/Honolulu',
-	'India Standard Time' => 'Asia/Kolkata',	// Asia/Calcutta is an alias to Asia/Kolkata
+	'India Standard Time' => 'Asia/Kolkata', // Asia/Calcutta is an alias to Asia/Kolkata
 	'Iran Standard Time' => 'Asia/Tehran',
 	'Israel Standard Time' => 'Asia/Jerusalem',
 	'Jordan Standard Time' => 'Asia/Amman',
@@ -198,7 +198,7 @@ 
 	'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
 
 	// various aliases collected over time
-	'America/Creston' => 'America/Dawson_Creek',	// not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS
+	'America/Creston' => 'America/Dawson_Creek', // not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS
 	'Armenian Standard Time' => 'Asia/Yerevan',
 	'Asia/Katmandu' => 'Asia/Kathmandu',
 	'Asia/Calcutta' => 'Asia/Kolkata',

calendar/setup/default_records.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
  */
 
 // enable auto-loading of holidays from localhost by default
-foreach(array(
+foreach (array(
 	'auto_load_holidays' => 'True',
 	'holidays_url_path'  => 'localhost',
 ) as $name => $value)
 {
-	$oProc->insert($GLOBALS['egw_setup']->config_table,array(
+	$oProc->insert($GLOBALS['egw_setup']->config_table, array(
 		'config_value' => $value,
-	),array(
+	), array(
 		'config_app' => 'phpgwapi',
 		'config_name' => $name,
-	),__FILE__,__LINE__);
+	), __FILE__, __LINE__);
 }
 
 // import timezone data

calendar/freebusy.php

Spacing +13 added lines, -13 removed lines

@@ -41,23 +41,23 @@ 
 	$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 }
 // fix for SOGo connector, which does not decode the = in our f/b url
-if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
+if (strpos($_SERVER['QUERY_STRING'], '=3D') !== false && substr($_GET['user'], 0, 2) == '3D')
 {
-	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
+	$_GET['user'] = substr($_GET['user'], 2);
+	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'], 2);
+	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'], 2);
 }
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
-	list(,$domain) = explode('@',$user);
+	list(,$domain) = explode('@', $user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
-	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
+	list($user) = explode('@', $user);
+	$user = $GLOBALS['egw']->accounts->name2id($user, 'account_lid', 'u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))
 {
-	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
+	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)", $_GET['user']));
 }
 if (!$loged_in)
 {
@@ -78,11 +78,11 @@ 
 		if (strpos($authuser, '@') === false)
 		{
 			$domain = $GLOBALS['egw_info']['server']['default_domain'];
-			$authuser .= '@' . $domain;
+			$authuser .= '@'.$domain;
 		}
 		else
 		{
-			list(, $domain) = explode('@',$authuser, 2);
+			list(, $domain) = explode('@', $authuser, 2);
 		}
 		if (array_key_exists($domain, $GLOBALS['egw_domain']))
 		{
@@ -92,8 +92,8 @@ 
 			$GLOBALS['egw_info']['user']['domain'] = $domain;
 			$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
 			$GLOBALS['egw_info']['flags']['noapi'] = false;
-			require_once(EGW_API_INC . '/functions.inc.php');
-			$loged_in =  $GLOBALS['egw']->session->create($authuser, $password, 'text');
+			require_once(EGW_API_INC.'/functions.inc.php');
+			$loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text');
 			session_unset();
 			session_destroy();
 		}
@@ -109,7 +109,7 @@ 
 }
 else
 {
-	Api\Header\Content::type('freebusy.ifb','text/calendar');
+	Api\Header\Content::type('freebusy.ifb', 'text/calendar');
 }
 $ical = new calendar_ical();
 echo $ical->freebusy($user, $_GET['end']);

Braces +12 added lines, -4 removed lines

@@ -44,15 +44,23 @@
 if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
 {
 	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
-}
+	if (isset($_GET['password']))
+	{
+		$_GET['password'] = substr($_GET['password'],2);
+	}
+	if (isset($_GET['cred']))
+	{
+		$_GET['cred'] = substr($_GET['cred'],2);
+	}
+	}
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
 	list(,$domain) = explode('@',$user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
+	{
+		list($user) = explode('@',$user);
+	}
 	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))

calendar/inc/class.calendar_egw_record.inc.php

Spacing +12 added lines, -12 removed lines

@@ -24,8 +24,8 @@ 
 
 	public static $types = array(
 		'select-cat'    => array('category'),
-		'select-account'=> array('owner','creator', 'modifier'),
-		'date-time'     => array('modified', 'created','start','end','recur_date'),
+		'select-account'=> array('owner', 'creator', 'modifier'),
+		'date-time'     => array('modified', 'created', 'start', 'end', 'recur_date'),
 		'date'			=> array('recur_enddate'),
 		'select-bool'	=> array('public', 'non_blocking'),
 		'select'	=> array('priority'),
@@ -37,12 +37,12 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(!is_object($this->bo)) {
+		if (!is_object($this->bo)) {
 			$this->bo = new calendar_bo();
 		}
-		if($this->identifier) {
+		if ($this->identifier) {
 			$this->record = $this->bo->read($this->identifier);
 		}
 	}
@@ -96,7 +96,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -124,7 +124,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -135,8 +135,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
@@ -146,15 +146,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +32 added lines, -16 removed lines

@@ -37,12 +37,15 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
-		if(!is_object($this->bo)) {
+		if(!is_object($this->bo))
+		{
 			$this->bo = new calendar_bo();
 		}
-		if($this->identifier) {
+		if($this->identifier)
+		{
 			$this->record = $this->bo->read($this->identifier);
 		}
 	}
@@ -52,7 +55,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -62,7 +66,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
@@ -74,7 +79,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -83,8 +89,10 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
-		if (empty($this->record)) {
+	public function get_title()
+	{
+		if (empty($this->record))
+		{
 			$this->get_record();
 		}
 		return $this->record['title'];
@@ -96,7 +104,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -105,7 +114,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -115,7 +125,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'calendar/navbar';
 	}
 
@@ -124,7 +135,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -135,7 +147,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used
 	}
 
@@ -146,7 +159,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used
 	}
 
@@ -154,7 +168,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -162,7 +177,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 	}
 
 }
\ No newline at end of file

calendar/inc/class.calendar_ui.inc.php

Indentation +5 added lines, -5 removed lines

@@ -387,11 +387,11 @@
 	}
 
 	/**
-	* gets the icons displayed for a given event
-	*
-	* @param array $event
-	* @return array of 'img' / 'title' pairs
-	*/
+	 * gets the icons displayed for a given event
+	 *
+	 * @param array $event
+	 * @return array of 'img' / 'title' pairs
+	 */
 	function event_icons($event)
 	{
 		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
 				'Global Categories'  => Egw::link('/index.php',array(

Braces +49 added lines, -13 removed lines

@@ -166,7 +166,10 @@ 
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','calendar')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit','calendar'))
+		{
+			Api\Hooks::read(true);
+		}
 	}
 
 	/**
@@ -279,11 +282,15 @@ 
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
 					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',',$set_states['owner']);
-					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
+					if ((string)$set_owners[0] === '0')
+					{
+						// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default;
+					}
+					// --> set default, instead of none
 						}
 						else
 						{
@@ -369,7 +376,10 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states')
+		{
+			$this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		}
 		// save the states in the session only when we are in calendar
 		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
 		{
@@ -505,8 +515,11 @@ 
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
-		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+ 		{
+			if(!is_array($resource['cal_sidebox']))
+			{
+				continue;
+			}
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
 			$file = ExecMethod($resource['cal_sidebox']['file'],array(
 				'menuaction' => $this->view_menuaction,
@@ -553,7 +566,10 @@ 
 		$sidebox = new Etemplate('calendar.sidebox');
 
 		$cont = $this->cal_prefs['saved_states'];
-		if (!is_array($cont)) $cont = array();
+		if (!is_array($cont))
+		{
+			$cont = array();
+		}
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : Api\DateTime();
 
@@ -612,7 +628,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
+		if(!$event_id)
+		{
+			return false;
+		}
 
 		// Directly update stored data.
 		// Make sure we have the whole event
@@ -678,7 +697,10 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if(!$event || !is_array($event))
+		{
+			return false;
+		}
 
 		if (!$this->bo->check_perms(Acl::EDIT,$event))
 		{
@@ -699,8 +721,16 @@ 
 
 		$event['recure'] = $this->bo->recure2string($event);
 
-		if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-		if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+		if (empty($event['description']))
+		{
+			$event['description'] = ' ';
+		}
+		// no description screws the titles horz. alignment
+		if (empty($event['location']))
+		{
+			$event['location'] = ' ';
+		}
+		// no location screws the owner horz. alignment
 
 		// respect category permissions
 		if(!empty($event['category']))
@@ -777,8 +807,14 @@ 
 			if(!$timespan)
 			{
 				// Try to make time span into appropriate ranges to match
-				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false) $template = 'month';
-				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false) $template = 'week';
+				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false)
+				{
+					$template = 'month';
+				}
+				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false)
+				{
+					$template = 'week';
+				}
 				//error_log("Detected template $template");
 				switch ($template)
 				{

Spacing +135 added lines, -135 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @var $debug mixed integer level or string function-name
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * instance of the bocal or bocalupdate class
 	 *
@@ -127,7 +127,7 @@ 
 	/**
 	 * @var array $states_to_save all states that will be saved to the user prefs
 	 */
-	var $states_to_save = array('owner','status_filter','filter','cat_id','view','sortby','planner_view','weekend');
+	var $states_to_save = array('owner', 'status_filter', 'filter', 'cat_id', 'view', 'sortby', 'planner_view', 'weekend');
 
 	/**
 	 * Constructor
@@ -135,7 +135,7 @@ 
 	 * @param boolean $use_boupdate use bocalupdate as parenent instead of bocal
 	 * @param array $set_states to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($use_boupdate=false,$set_states=NULL)
+	function __construct($use_boupdate = false, $set_states = NULL)
 	{
 		if ($use_boupdate)
 		{
@@ -146,27 +146,27 @@ 
 			$this->bo = new calendar_bo();
 		}
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
-		$this->common_prefs	= &$GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->common_prefs = &$GLOBALS['egw_info']['user']['preferences']['common'];
 		$this->cal_prefs	= &$GLOBALS['egw_info']['user']['preferences']['calendar'];
 		$this->bo->check_set_default_prefs();
 
-		$this->wd_start		= 60*$this->cal_prefs['workdaystarts'];
-		$this->wd_end		= 60*$this->cal_prefs['workdayends'];
-		$this->interval_m	= $this->cal_prefs['interval'];
+		$this->wd_start		= 60 * $this->cal_prefs['workdaystarts'];
+		$this->wd_end = 60 * $this->cal_prefs['workdayends'];
+		$this->interval_m = $this->cal_prefs['interval'];
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->manage_states($set_states);
 
-		$GLOBALS['uical'] = &$this;	// make us available for ExecMethod, else it creates a new instance
+		$GLOBALS['uical'] = &$this; // make us available for ExecMethod, else it creates a new instance
 
 		// calendar does not work with hidden sidebox atm.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','calendar')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit', 'calendar')) Api\Hooks::read(true);
 	}
 
 	/**
@@ -179,21 +179,21 @@ 
 	function check_owners_access($users = null, &$no_access = array())
 	{
 		$no_access = $no_access_group = array();
-		$owner_array = $users ? $users : explode(',',$this->owner);
-		foreach($owner_array as $idx => $owner)
+		$owner_array = $users ? $users : explode(',', $this->owner);
+		foreach ($owner_array as $idx => $owner)
 		{
 			$owner = trim($owner);
 			if (is_numeric($owner) && $GLOBALS['egw']->accounts->get_type($owner) == 'g')
 			{
-				foreach($GLOBALS['egw']->accounts->members($owner, true) as $member)
+				foreach ($GLOBALS['egw']->accounts->members($owner, true) as $member)
 				{
-					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$member))
+					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $member))
 					{
 						$no_access_group[$member] = $this->bo->participant_name($member);
 					}
 				}
 			}
-			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$owner))
+			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $owner))
 			{
 				$no_access[$owner] = $this->bo->participant_name($owner);
 				unset($owner_array[$idx]);
@@ -201,14 +201,14 @@ 
 		}
 		if (count($no_access))
 		{
-			$message = lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access));
-			Framework::message($message,'error');
-			$this->owner = implode(',',$owner_array);
+			$message = lang('Access denied to the calendar of %1 !!!', implode(', ', $no_access));
+			Framework::message($message, 'error');
+			$this->owner = implode(',', $owner_array);
 			return $message;
 		}
 		if (count($no_access_group))
 		{
-			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.',implode(', ',$no_access_group));
+			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.', implode(', ', $no_access_group));
 		}
 		return false;
 	}
@@ -227,7 +227,7 @@ 
 	 *	- view: the actual view, where dialogs should return to or which they refresh
 	 * @param array $set_states array to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function manage_states($set_states=NULL)
+	function manage_states($set_states = NULL)
 	{
 		// retrieve saved states from prefs
 		$states = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -247,12 +247,12 @@ 
 				}
 				else
 				{
-					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states);	// cut off "/index.php?"
+					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states); // cut off "/index.php?"
 				}
 			}
 			else
 			{
-				$set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
+				$set_states = substr($_GET['menuaction'], 0, 9) == 'calendar.' ? $_REQUEST : array();
 			}
 		}
 		if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
@@ -260,16 +260,16 @@ 
 			$states['date'] = $this->bo->date2string($states);
 		}
 
-		foreach(array(
+		foreach (array(
 			'date'       => $this->bo->date2string($this->bo->now_su),
 			'cat_id'     => 0,
 			'status_filter'     => 'default',
 			'owner'      => $this->user,
 			'save_owner' => 0,
 			'sortby'     => 'category',
-			'planner_view'=> 'month',	// full month
-			'view'       => ($this->bo->cal_prefs['defaultcalendar']?$this->bo->cal_prefs['defaultcalendar']:'day'), // use pref, if exists else use the dayview
-			'listview_days'=> '',	// no range
+			'planner_view'=> 'month', // full month
+			'view'       => ($this->bo->cal_prefs['defaultcalendar'] ? $this->bo->cal_prefs['defaultcalendar'] : 'day'), // use pref, if exists else use the dayview
+			'listview_days'=> '', // no range
 			'test'       => 'false',
 		) as $state => $default)
 		{
@@ -278,42 +278,42 @@ 
 				if ($state == 'owner')
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
-					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',',$set_states['owner']);
+					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',', $set_states['owner']);
 					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default; // --> set default, instead of none
 						}
 						else
 						{
-							$set_states['owner'] = substr($set_states['owner'],2);
+							$set_states['owner'] = substr($set_states['owner'], 2);
 						}
 					}
 					else	// change only the owners of the given type
 					{
 						$res_type = is_numeric($set_owners[0]) ? false : $set_owners[0][0];
 						$owners = $states['owner'] ? $states['owner'] : $default;
-						if(!is_array($owners))
+						if (!is_array($owners))
 						{
-							$owners = explode(',',$owners);
+							$owners = explode(',', $owners);
 						}
-						foreach($owners as $key => $owner)
+						foreach ($owners as $key => $owner)
 						{
 							if (!$res_type && is_numeric($owner) || $res_type && $owner[0] == $res_type)
 							{
 								unset($owners[$key]);
 							}
 						}
-						if (!$res_type || !in_array($res_type.'0',$set_owners))
+						if (!$res_type || !in_array($res_type.'0', $set_owners))
 						{
-							$owners = array_merge($owners,$set_owners);
+							$owners = array_merge($owners, $set_owners);
 						}
-						$set_states['owner'] = implode(',',$owners);
+						$set_states['owner'] = implode(',', $owners);
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,25) == 'calendar.calendar_uiforms')
+				if (substr($_GET['menuaction'], 0, 25) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;
@@ -327,7 +327,7 @@ 
 			if ($state == 'date')
 			{
 				$date_arr = $this->bo->date2array($states['date']);
-				foreach(array('year','month','day') as $name)
+				foreach (array('year', 'month', 'day') as $name)
 				{
 					$this->$name = $states[$name] = $date_arr[$name];
 				}
@@ -335,16 +335,16 @@ 
 			$this->$state = $states[$state];
 		}
 		// remove a given calendar from the view
-		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners=explode(',',$this->owner))) !== false)
+		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners = explode(',', $this->owner))) !== false)
 		{
 			unset($owners[$k]);
-			$this->owner = $states['owner'] = implode(',',$owners);
+			$this->owner = $states['owner'] = implode(',', $owners);
 		}
-		if(is_array($this->owner))
+		if (is_array($this->owner))
 		{
-			$this->owner = implode(',',$this->owner);
+			$this->owner = implode(',', $this->owner);
 		}
-		if (substr($this->view,0,8) == 'planner_')
+		if (substr($this->view, 0, 8) == 'planner_')
 		{
 			$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';
 			$states['view'] = $this->view = 'planner';
@@ -352,10 +352,10 @@ 
 		// set the actual view as return_to
 		if (isset($_GET['menuaction']))
 		{
-			list(,$class,$func) = explode('.',$_GET['menuaction']);
+			list(,$class, $func) = explode('.', $_GET['menuaction']);
 			if ($func == 'index')
 			{
-				$func = $this->view; $this->view = 'index';	// switch to the default view
+				$func = $this->view; $this->view = 'index'; // switch to the default view
 			}
 		}
 		else	// eg. calendar/index.php
@@ -369,18 +369,18 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3', True, $set_states, $states);
 		// save the states in the session only when we are in calendar
-		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'calendar')
 		{
 			// save defined states into the user-prefs
-			if(!empty($states) && is_array($states))
+			if (!empty($states) && is_array($states))
 			{
-				$saved_states = array_intersect_key($states,array_flip($this->states_to_save));
+				$saved_states = array_intersect_key($states, array_flip($this->states_to_save));
 				if ($saved_states != $this->cal_prefs['saved_states'])
 				{
-					$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
-					$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+					$GLOBALS['egw']->preferences->add('calendar', 'saved_states', $saved_states);
+					$GLOBALS['egw']->preferences->save_repository(false, 'user', true);
 				}
 			}
 		}
@@ -394,35 +394,35 @@ 
 	*/
 	function event_icons($event)
 	{
-		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);
+		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ, $event);
 
 		$icons = array();
 		if (!$is_private)
 		{
-			if($event['priority'] == 3)
+			if ($event['priority'] == 3)
 			{
-				$icons[] = Api\Html::image('calendar','high',lang('high priority'));
+				$icons[] = Api\Html::image('calendar', 'high', lang('high priority'));
 			}
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$icons[] = Api\Html::image('calendar','recur',lang('recurring event'));
+				$icons[] = Api\Html::image('calendar', 'recur', lang('recurring event'));
 			}
 			// icons for single user, multiple users or group(s) and resources
-			foreach(array_keys($event['participants']) as  $uid)
+			foreach (array_keys($event['participants']) as  $uid)
 			{
-				if(is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
+				if (is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
 				{
 					if (isset($icons['single']) || $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 					{
 						unset($icons['single']);
-						$icons['multiple'] = Api\Html::image('calendar','users');
+						$icons['multiple'] = Api\Html::image('calendar', 'users');
 					}
 					elseif (!isset($icons['multiple']))
 					{
-						$icons['single'] = Api\Html::image('calendar','single');
+						$icons['single'] = Api\Html::image('calendar', 'single');
 					}
 				}
-				elseif(!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
+				elseif (!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
 				{
 				 	$icons[$uid[0]] = Api\Html::image($this->bo->resources[$uid[0]]['app'],
 				 		($this->bo->resources[$uid[0]]['icon'] ? $this->bo->resources[$uid[0]]['icon'] : 'navbar'),
@@ -431,21 +431,21 @@ 
 				}
 			}
 		}
-		if($event['non_blocking'])
+		if ($event['non_blocking'])
 		{
-			$icons[] = Api\Html::image('calendar','nonblocking',lang('non blocking'));
+			$icons[] = Api\Html::image('calendar', 'nonblocking', lang('non blocking'));
 		}
-		if($event['public'] == 0)
+		if ($event['public'] == 0)
 		{
-			$icons[] = Api\Html::image('calendar','private',lang('private'));
+			$icons[] = Api\Html::image('calendar', 'private', lang('private'));
 		}
-		if(isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
+		if (isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
 		{
-			$icons[] = Api\Html::image('calendar','alarm',lang('alarm'));
+			$icons[] = Api\Html::image('calendar', 'alarm', lang('alarm'));
 		}
-		if($event['participants'][$this->user][0] == 'U')
+		if ($event['participants'][$this->user][0] == 'U')
 		{
-			$icons[] = Api\Html::image('calendar','needs-action',lang('Needs action'));
+			$icons[] = Api\Html::image('calendar', 'needs-action', lang('Needs action'));
 		}
 		return $icons;
 	}
@@ -460,17 +460,17 @@ 
 	 * @param array $vars
 	 * @return string the link incl. content
 	 */
-	function add_link($content,$date=null,$hour=null,$minute=0,array $vars=null)
+	function add_link($content, $date = null, $hour = null, $minute = 0, array $vars = null)
 	{
 		$vars['menuaction'] = 'calendar.calendar_uiforms.edit';
-		$vars['date'] =  $date ? $date : $this->date;
+		$vars['date'] = $date ? $date : $this->date;
 
 		if (!is_null($hour))
 		{
 			$vars['hour'] = $hour;
 			$vars['minute'] = $minute;
 		}
-		return Api\Html::a_href($content,'',$vars,' data-date="' .$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
+		return Api\Html::a_href($content, '', $vars, ' data-date="'.$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
 				. '" title="'.Api\Html::htmlspecialchars(lang('Add')).'"');
 	}
 
@@ -482,7 +482,7 @@ 
 		// Magic etemplate2 favorites menu (from framework)
 		display_sidebox('calendar', lang('Favorites'), Framework\Favorites::list_favorites('calendar'));
 
-		$file = array('menuOpened' => true);	// menu open by default
+		$file = array('menuOpened' => true); // menu open by default
 
 		// Target for etemplate
 		$file[] = array(
@@ -495,34 +495,34 @@ 
 		// Merge print placeholders (selectbox in etemplate)
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$file['Placeholders'] = Egw::link('/index.php','menuaction=calendar.calendar_merge.show_replacements');
+			$file['Placeholders'] = Egw::link('/index.php', 'menuaction=calendar.calendar_merge.show_replacements');
 		}
 		$appname = 'calendar';
 		$menu_title = lang('Calendar Menu');
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		$this->sidebox_etemplate();
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
 		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+			if (!is_array($resource['cal_sidebox'])) continue;
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
-			$file = ExecMethod($resource['cal_sidebox']['file'],array(
+			$file = ExecMethod($resource['cal_sidebox']['file'], array(
 				'menuaction' => $this->view_menuaction,
 				'owner' => $this->owner,
 			));
-			display_sidebox($appname,$menu_title,$file);
+			display_sidebox($appname, $menu_title, $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Configuration'=>Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-				'Custom Fields'=>Egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
-				'Global Categories' =>Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
+				'Configuration'=>Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+				'Custom Fields'=>Egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar'),
+				'Global Categories' =>Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar'),
 			);
-			$GLOBALS['egw']->framework->sidebox($appname,lang('Admin'),$file,'admin');
+			$GLOBALS['egw']->framework->sidebox($appname, lang('Admin'), $file, 'admin');
 		}
 	}
 
@@ -531,15 +531,15 @@ 
 	 */
 	function sidebox_etemplate($content = array())
 	{
-		if($content['merge'])
+		if ($content['merge'])
 		{
 			// View from sidebox is JSON encoded
-			$this->manage_states(array_merge($content,json_decode($content['view'],true)));
-			if($content['first'])
+			$this->manage_states(array_merge($content, json_decode($content['view'], true)));
+			if ($content['first'])
 			{
-				$this->first = Api\DateTime::to($content['first'],'ts');
+				$this->first = Api\DateTime::to($content['first'], 'ts');
 			}
-			if($content['last'])
+			if ($content['last'])
 			{
 				$this->last = new Api\DateTime($content['last']);
 				$this->last->setTime(23, 59, 59);
@@ -557,25 +557,25 @@ 
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : Api\DateTime();
 
-		$cont['year'] = (int)Api\DateTime::to($cont['date'],'Y');
+		$cont['year'] = (int)Api\DateTime::to($cont['date'], 'Y');
 		$cont['holidays'] = $this->bo->read_holidays($cont['year']);
 
 		$readonlys = array();
 		$sel_options['status_filter'] = array(
-			array('value' => 'default',     'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
-			array('value' => 'accepted',    'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
-			array('value' => 'unknown',     'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
-			array('value' => 'tentative',   'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
-			array('value' => 'delegated',   'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
-			array('value' => 'rejected',    'label' => lang('Rejected'),'title' => lang('Show only rejected events')),
-			array('value' => 'owner',       'label' => lang('Owner too'),'title' => lang('Show also events just owned by selected user')),
-			array('value' => 'all',         'label' => lang('All incl. rejected'),'title' => lang('Show all status incl. rejected events')),
-			array('value' => 'hideprivate', 'label' => lang('Hide private infos'),'title' => lang('Show all events, as if they were private')),
-			array('value' => 'showonlypublic',  'label' => lang('Hide private events'),'title' => lang('Show only events flagged as public, (not checked as private)')),
-			array('value' => 'no-enum-groups', 'label' => lang('only group-events'),'title' => lang('Do not include events of group members')),
-			array('value' => 'not-unknown', 'label' => lang('No meeting requests'),'title' => lang('Show all status, but unknown')),
+			array('value' => 'default', 'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
+			array('value' => 'accepted', 'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
+			array('value' => 'unknown', 'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
+			array('value' => 'tentative', 'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
+			array('value' => 'delegated', 'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
+			array('value' => 'rejected', 'label' => lang('Rejected'), 'title' => lang('Show only rejected events')),
+			array('value' => 'owner', 'label' => lang('Owner too'), 'title' => lang('Show also events just owned by selected user')),
+			array('value' => 'all', 'label' => lang('All incl. rejected'), 'title' => lang('Show all status incl. rejected events')),
+			array('value' => 'hideprivate', 'label' => lang('Hide private infos'), 'title' => lang('Show all events, as if they were private')),
+			array('value' => 'showonlypublic', 'label' => lang('Hide private events'), 'title' => lang('Show only events flagged as public, (not checked as private)')),
+			array('value' => 'no-enum-groups', 'label' => lang('only group-events'), 'title' => lang('Do not include events of group members')),
+			array('value' => 'not-unknown', 'label' => lang('No meeting requests'), 'title' => lang('Show all status, but unknown')),
 		);
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$sel_options['status_filter'][] = array('value' => 'deleted', 'label' => lang('Deleted'), 'title' => lang('Show events that have been deleted'));
 		}
@@ -583,7 +583,7 @@ 
 		// Merge print
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar');
+			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null, 'calendar');
 		}
 		else
 		{
@@ -612,10 +612,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
-		if(is_string($event_id) && strpos($event_id,':') !== FALSE)
+		if (!$event_id) return false;
+		if (is_string($event_id) && strpos($event_id, ':') !== FALSE)
 		{
-			list($event_id, $date) = explode(':',$event_id);
+			list($event_id, $date) = explode(':', $event_id);
 			$recurrence_date = new Api\DateTime($date);
 		}
 
@@ -628,7 +628,7 @@ 
 		// Check filters to see if they still match, may have to remove
 		// the event because it should no longer be displayed
 		$filter_match = true;
-		if($this->cal_prefs['saved_states']['status_filter'] != 'all' ||
+		if ($this->cal_prefs['saved_states']['status_filter'] != 'all' ||
 			$this->cal_prefs['saved_states']['cat_id'])
 		{
 			$filter_check = array(
@@ -641,20 +641,20 @@ 
 			$filter_match = count($this->bo->search($filter_check, $this->bo->so->cal_table.".cal_id = {$event['id']}")) > 0;
 		}
 
-		if(!$event || !$filter_match)
+		if (!$event || !$filter_match)
 		{
 			// Sending null will trigger a removal
 			$response->generic('data', array('uid' => 'calendar::'.$event_id, 'data' => null));
 			return false;
 		}
 
-		if(!$event['recur_type'] || $recurrence_date)
+		if (!$event['recur_type'] || $recurrence_date)
 		{
 			$this->to_client($event);
 			$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
 		}
 		// If it's recurring, try to send the next month or so
-		else if($event['recur_type'] )
+		else if ($event['recur_type'])
 		{
 			$this_month = new Api\DateTime('next month');
 			$rrule = calendar_rrule::event2rrule($event, true);
@@ -667,7 +667,7 @@ 
 				$response->generic('data', array('uid' => 'calendar::'.$converted['row_id'], 'data' => $converted));
 				$rrule->next();
 			}
-			while ($rrule->valid() && $occurrence <= $this_month );
+			while ($rrule->valid() && $occurrence <= $this_month);
 		}
 		return true;
 	}
@@ -683,15 +683,15 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if (!$event || !is_array($event)) return false;
 
-		if (!$this->bo->check_perms(Acl::EDIT,$event))
+		if (!$this->bo->check_perms(Acl::EDIT, $event))
 		{
 			$event['class'] .= 'rowNoEdit ';
 		}
 
 		// Delete disabled for other applications
-		if (!$this->bo->check_perms(Acl::DELETE,$event) || !is_numeric($event['id']))
+		if (!$this->bo->check_perms(Acl::DELETE, $event) || !is_numeric($event['id']))
 		{
 			$event['class'] .= 'rowNoDelete ';
 		}
@@ -704,32 +704,32 @@ 
 
 		$event['recure'] = $this->bo->recure2string($event);
 
-		if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-		if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+		if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+		if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 
 		// respect category permissions
-		if(!empty($event['category']))
+		if (!empty($event['category']))
 		{
 			$event['category'] = $this->categories->check_list(Acl::READ, $event['category']);
 		}
 		$event['non_blocking'] = (bool)$event['non_blocking'];
 
 		$matches = null;
-		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+		if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 		{
 			$app = $matches[1];
 			$app_id = $matches[2];
 			$icons = array();
-			if(!($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+			if (!($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 			{
-				$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+				$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 			}
 			$event['app'] = $app;
 			$event['app_id'] = $app_id;
 		}
 		else
 		{
-			$is_private = !$this->bo->check_perms(Acl::READ,$event);
+			$is_private = !$this->bo->check_perms(Acl::READ, $event);
 		}
 		if ($is_private)
 		{
@@ -737,29 +737,29 @@ 
 			$event['class'] .= 'rowNoView ';
 		}
 
-		if(!$event['app'])
+		if (!$event['app'])
 		{
 			$event['app'] = 'calendar';
 		}
-		if(!$event['app_id'])
+		if (!$event['app_id'])
 		{
 			$event['app_id'] = $event['id'];
 		}
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE)
 		{
-			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts');
+			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts');
 		}
 		// set id for grid
-		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts') : '');
+		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts') : '');
 
-		$event['parts'] = implode(",\n",$this->bo->participants($event,false));
+		$event['parts'] = implode(",\n", $this->bo->participants($event, false));
 		$event['date'] = $this->bo->date2string($event['start']);
 
 		// Change dates
-		foreach(calendar_egw_record::$types['date-time'] as $field)
+		foreach (calendar_egw_record::$types['date-time'] as $field)
 		{
-			if(is_int($event[$field]))
+			if (is_int($event[$field]))
 			{
 				$event[$field] = Api\DateTime::to($event[$field], Api\DateTime::ET2);
 			}
@@ -777,13 +777,13 @@ 
 	public function merge($timespan = array())
 	{
 		// Merge print
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
-			if(!$timespan)
+			if (!$timespan)
 			{
 				// Try to make time span into appropriate ranges to match
-				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false) $template = 'month';
-				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false) $template = 'week';
+				if (stripos($_GET['merge'], 'month') !== false || stripos($_GET['merge'], lang('month')) !== false) $template = 'month';
+				if (stripos($_GET['merge'], 'week') !== false || stripos($_GET['merge'], lang('week')) !== false) $template = 'week';
 				//error_log("Detected template $template");
 				switch ($template)
 				{
@@ -791,8 +791,8 @@ 
 						// Trim to _only_ the month, do not pad to week start / end
 						$time = new Api\DateTime($this->date);
 						$timespan = array(array(
-							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'),'ts'),
-							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'),'ts')
+							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'), 'ts'),
+							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'), 'ts')
 						));
 						break;
 					case 'week':
@@ -800,7 +800,7 @@ 
 						$start = new Api\DateTime($this->first);
 						$t = clone $start;
 						$t->modify('+1 week')->modify('-1 second');
-						if($t->format('ts') < Api\DateTime::to($this->last,'ts'))
+						if ($t->format('ts') < Api\DateTime::to($this->last, 'ts'))
 						{
 							do
 							{
@@ -810,7 +810,7 @@ 
 								);
 								$start->modify('+1 week');
 								$t->modify('+1 week');
-							} while( $start->format('ts') < $this->last);
+							} while ($start->format('ts') < $this->last);
 							break;
 						}
 						// Fall through
@@ -828,7 +828,7 @@ 
 			Framework::refresh_opener($error, 'calendar');
 		}
 		unset($_GET['merge']);
-		if($error)
+		if ($error)
 		{
 			// This doesn't give message either, but at least it doesn't give a blank screen
 			Framework::redirect_link('/index.php', array(

calendar/inc/class.calendar_rrule.inc.php

Spacing +90 added lines, -90 removed lines

@@ -76,8 +76,8 @@ 
 	static private $recur_egw2ical_2_0 = array(
 		self::DAILY        => 'DAILY',
 		self::WEEKLY       => 'WEEKLY',
-		self::MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..7, -1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31, -1 for last day of month}
+		self::MONTHLY_WDAY => 'MONTHLY', // BYDAY={1..7, -1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MONTHLY', // BYMONHTDAY={1..31, -1 for last day of month}
 		self::YEARLY       => 'YEARLY',
 	);
 
@@ -87,8 +87,8 @@ 
 	static private $recur_egw2ical_1_0 = array(
 		self::DAILY        => 'D',
 		self::WEEKLY       => 'W',
-		self::MONTHLY_WDAY => 'MP',	// BYDAY={1..7,-1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31,-1}
+		self::MONTHLY_WDAY => 'MP', // BYDAY={1..7,-1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MD', // BYMONHTDAY={1..31,-1}
 		self::YEARLY       => 'YM',
 	);
 
@@ -144,7 +144,7 @@ 
 	const THURSDAY  = 16;
 	const FRIDAY    = 32;
 	const SATURDAY  = 64;
-	const WORKDAYS  = 62;	// Mo, ..., Fr
+	const WORKDAYS  = 62; // Mo, ..., Fr
 	const ALLDAYS   = 127;
 	/**
 	 * Translate weekday bitmasks to labels
@@ -172,14 +172,14 @@ 
 	 *
 	 * @var array
 	 */
-	public $exceptions=array();
+	public $exceptions = array();
 
 	/**
 	 * Array of exceptions as DateTime/egw_time objects
 	 *
 	 * @var array
 	 */
-	public $exceptions_objs=array();
+	public $exceptions_objs = array();
 
 	/**
 	 * Starttime of series
@@ -222,9 +222,9 @@ 
 	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
 	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
-	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
+	public function __construct(DateTime $time, $type, $interval = 1, DateTime $enddate = null, $weekdays = 0, array $exceptions = null)
 	{
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$this->lastdayofweek = self::SATURDAY;
@@ -238,7 +238,7 @@ 
 
 		$this->time = $time instanceof Api\DateTime ? $time : new Api\DateTime($time);
 
-		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
+		if (!in_array($type, array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -248,16 +248,16 @@ 
 		if ($type == self::MONTHLY_WDAY)
 		{
 			// check for last week of month
-			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time)-7)
+			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time) - 7)
 			{
 				$this->monthly_byday_num = -1;
 			}
 			else
 			{
-				$this->monthly_byday_num = 1 + floor(($this->time->format('d')-1) / 7);
+				$this->monthly_byday_num = 1 + floor(($this->time->format('d') - 1) / 7);
 			}
 		}
-		elseif($type == self::MONTHLY_MDAY)
+		elseif ($type == self::MONTHLY_MDAY)
 		{
 			$this->monthly_bymonthday = (int)$this->time->format('d');
 			// check for last day of month
@@ -274,7 +274,7 @@ 
 
 		if ((int)$interval < 1)
 		{
-			$interval = 1;	// calendar stores no (extra) interval as null, so using default 1 here
+			$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
 		}
 		$this->interval = (int)$interval;
 
@@ -304,7 +304,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -320,22 +320,22 @@ 
 	 * @param int $interval =1
 	 * @return int
 	 */
-	public static function recurrence_interval($type, $interval=1)
+	public static function recurrence_interval($type, $interval = 1)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case self::DAILY:
-				$duration = 24*3600;
+				$duration = 24 * 3600;
 				break;
 			case self::WEEKLY:
-				$duration = 7*24*3600;
+				$duration = 7 * 24 * 3600;
 				break;
 			case self::MONTHLY_MDAY:
 			case self::MONTHLY_WDAY:
-				$duration = 31*24*3600;
+				$duration = 31 * 24 * 3600;
 				break;
 			case self::YEARLY:
-				$duration = 366*24*3600;
+				$duration = 366 * 24 * 3600;
 				break;
 		}
 		if ($interval > 1) $duration *= $interval;
@@ -351,9 +351,9 @@ 
 	 */
 	private static function daysInMonth(DateTime $time)
 	{
-		list($year,$month) = explode('-',$time->format('Y-m'));
+		list($year, $month) = explode('-', $time->format('Y-m'));
 		$last_day = new Api\DateTime();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -383,7 +383,7 @@ 
 	 */
 	public function next_no_exception()
 	{
-		switch($this->type)
+		switch ($this->type)
 		{
 			case self::NONE:	// need to add at least one day, to end "series", as enddate == current date
 			case self::DAILY:
@@ -398,28 +398,28 @@ 
 					// --> on the last day of the week we have to additionally advance interval-1 weeks
 					if ($this->interval > 1 && self::getWeekday($this->current) == $this->lastdayofweek)
 					{
-						$this->current->modify(($this->interval-1).' week');
+						$this->current->modify(($this->interval - 1).' week');
 					}
 					$this->current->modify('1 day');
 					//echo __METHOD__.'() '.$this->current->format('l').', '.$this->current.": $this->weekdays & ".self::getWeekday($this->current)."<br />\n";
 				}
-				while(!($this->weekdays & self::getWeekday($this->current)));
+				while (!($this->weekdays&self::getWeekday($this->current)));
 				break;
 
 			case self::MONTHLY_WDAY:	// iCal: BYDAY={1, ..., 5, -1}{MO..SO}
 				// advance to start of next month
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$month += $this->interval+($this->monthly_byday_num < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$this->monthly_byday_num < 0 ? 0 : 1);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$month += $this->interval + ($this->monthly_byday_num < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $this->monthly_byday_num < 0 ? 0 : 1);
 				//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).": setDate($year,$month,1): ".$this->current->format('l').', '.$this->current."<br />\n";
 				// now advance to n-th week
 				if ($this->monthly_byday_num > 1)
 				{
-					$this->current->modify(($this->monthly_byday_num-1).' week');
+					$this->current->modify(($this->monthly_byday_num - 1).' week');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify('.($this->monthly_byday_num-1).' week): '.$this->current->format('l').', '.$this->current."<br />\n";
 				}
 				// advance to given weekday
-				while(!($this->weekdays & self::getWeekday($this->current)))
+				while (!($this->weekdays&self::getWeekday($this->current)))
 				{
 					$this->current->modify(($this->monthly_byday_num < 0 ? -1 : 1).' day');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify(1 day): '.$this->current->format('l').', '.$this->current."<br />\n";
@@ -427,10 +427,10 @@ 
 				break;
 
 			case self::MONTHLY_MDAY:	// iCal: monthly_bymonthday={1, ..., 31, -1}
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$day = $this->monthly_bymonthday+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$month += $this->interval+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$day);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$day = $this->monthly_bymonthday + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$month += $this->interval + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $day);
 				//echo __METHOD__."() setDate($year,$month,$day): ".$this->current->format('l').', '.$this->current."<br />\n";
 				break;
 
@@ -452,7 +452,7 @@ 
 		{
 			$this->next_no_exception();
 		}
-		while($this->exceptions && in_array($this->current->format('Ymd'),$this->exceptions));
+		while ($this->exceptions && in_array($this->current->format('Ymd'), $this->exceptions));
 	}
 
 	/**
@@ -484,7 +484,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -509,7 +509,7 @@ 
 		// if enddate is now before next acurrence, but not on same day, we use previous recurrence
 		// this can happen if client gives an enddate which is NOT a recurrence date
 		// eg. for a on Monday recurring weekly event a Tuesday as enddate
-		if ($this->enddate < $this->current  && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
+		if ($this->enddate < $this->current && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
 		{
 			$last = $previous;
 		}
@@ -528,7 +528,7 @@ 
 		$this->current = clone $this->time;
 		while ($this->valid() &&
 			$this->exceptions &&
-			in_array($this->current->format('Ymd'),$this->exceptions))
+			in_array($this->current->format('Ymd'), $this->exceptions))
 		{
 			$this->next_no_exception();
 		}
@@ -539,7 +539,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		return $this->current->format('Ymd') <= $this->enddate_ymd;
 	}
@@ -553,9 +553,9 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
-			list($str) = explode(' (',lang(self::$types[$this->type]));	// remove (by day/date) from Monthly
+			list($str) = explode(' (', lang(self::$types[$this->type])); // remove (by day/date) from Monthly
 
 			$str_extra = array();
 			switch ($this->type)
@@ -571,7 +571,7 @@ 
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('all') : lang('day');
 					}
-					elseif($this->weekdays == self::WORKDAYS)
+					elseif ($this->weekdays == self::WORKDAYS)
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('workdays') : lang('workday');
 					}
@@ -579,24 +579,24 @@ 
 					{
 						foreach (self::$days as $mask => $label)
 						{
-							if ($this->weekdays & $mask)
+							if ($this->weekdays&$mask)
 							{
 								$repeat_days[] = lang($label);
 							}
 						}
 					}
-					if($this->type == self::WEEKLY && count($repeat_days))
+					if ($this->type == self::WEEKLY && count($repeat_days))
 					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+						$str_extra[] = lang('days repeated').': '.implode(', ', $repeat_days);
 					}
-					elseif($this->type == self::MONTHLY_WDAY)
+					elseif ($this->type == self::MONTHLY_WDAY)
 					{
-						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ',$repeat_days);
+						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ', $repeat_days);
 					}
 					break;
 
 			}
-			if($this->interval > 1)
+			if ($this->interval > 1)
 			{
 				$str_extra[] = lang('Interval').': '.$this->interval;
 			}
@@ -612,9 +612,9 @@ 
 			{
 				$str_extra[] = $this->time->getTimezone()->getName();
 			}
-			if(count($str_extra))
+			if (count($str_extra))
 			{
-				$str .= ' ('.implode(', ',$str_extra).')';
+				$str .= ' ('.implode(', ', $str_extra).')';
 			}
 		}
 		return $str;
@@ -626,24 +626,24 @@ 
 	 *
 	 * $return array	vCalendar RRULE
 	 */
-	public function generate_rrule($version='2.0')
+	public function generate_rrule($version = '2.0')
 	{
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE) return false; // no recuring event
 
 		if ($version == '1.0')
 		{
-			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type] . $this->interval;
+			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type].$this->interval;
 			switch ($this->type)
 			{
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -656,7 +656,7 @@ 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}+ {MO..SO}
 					$rrule['BYDAY'] = abs($this->monthly_byday_num);
 					$rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
-					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'), 0, 2));
 					$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
 					break;
 			}
@@ -674,9 +674,9 @@ 
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -687,8 +687,8 @@ 
 					break;
 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
-					$rrule['BYDAY'] = $this->monthly_byday_num .
-						strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] = $this->monthly_byday_num.
+						strtoupper(substr($this->time->format('l'), 0, 2));
 					break;
 			}
 			if ($this->interval > 1)
@@ -723,12 +723,12 @@ 
 	 *
 	 * @return calendar_rrule		false on error
 	 */
-	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
+	public static function event2rrule(array $event, $usertime = true, $to_tz = null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
+		if (!is_array($event) || !isset($event['tzid'])) return false;
 		if (!$to_tz) $to_tz = $event['tzid'];
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new Api\DateTime($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -741,16 +741,16 @@ 
 
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], $timestamp_tz);
 		}
 		if (is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $exception)
+			foreach ($event['recur_exception'] as $exception)
 			{
-				$exceptions[] = is_a($exception,'DateTime') ? $exception : new Api\DateTime($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new Api\DateTime($exception, $timestamp_tz);
 			}
 		}
-		return new calendar_rrule($time,$event['recur_type'],$event['recur_interval'],$enddate,$event['recur_data'],$exceptions);
+		return new calendar_rrule($time, $event['recur_type'], $event['recur_interval'], $enddate, $event['recur_data'], $exceptions);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 * @param DateTime/string		starttime of the event (in servertime)
 	 * @param string $to_tz			new timezone
 	 */
-	public static function rrule2tz(array &$event,$starttime,$to_tz)
+	public static function rrule2tz(array &$event, $starttime, $to_tz)
 	{
 		// We assume that the difference between timezones can result
 		// in a maximum of one day
@@ -797,7 +797,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new Api\DateTime($starttime, Api\DateTime::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -815,11 +815,11 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask&128) $mask = $mask - 127; // overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask&1) $mask = $mask + 128; // underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -830,15 +830,15 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 	function lang($str) { return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new Api\DateTime('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new Api\DateTime('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -847,29 +847,29 @@ 
 		$_REQUEST['user-tz'] = 'Europe/Berlin';
 	}
 	echo "<html>\n<head>\n\t<title>Test calendar_rrule class</title>\n</head>\n<body>\n<form method='GET'>\n";
-	echo "<p>Date+Time: ".Api\Html::input('time',$_REQUEST['time']).
-		Api\Html::select('tz',$_REQUEST['tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>Type: ".Api\Html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".Api\Html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".Api\Html::input('time', $_REQUEST['time']).
+		Api\Html::select('tz', $_REQUEST['tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>Type: ".Api\Html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".Api\Html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".Api\Html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".Api\Html::select('user-tz',$_REQUEST['user-tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>".Api\Html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".Api\Html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".Api\Html::select('user-tz', $_REQUEST['user-tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>".Api\Html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	$time = new Api\DateTime($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'], $tz);
+	$weekdays = 0; foreach ((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach (preg_split("/[,\r\n]+ ?/", $_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
 
-	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
+	$rrule = new calendar_rrule($time, $_REQUEST['type'], $_REQUEST['interval'], $enddate, $weekdays, $exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
-	foreach($rrule as $rtime)
+	foreach ($rrule as $rtime)
 	{
 		$rtime->setTimezone(Api\DateTime::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

Braces +58 added lines, -14 removed lines

@@ -338,7 +338,10 @@ 
 				$duration = 366*24*3600;
 				break;
 		}
-		if ($interval > 1) $duration *= $interval;
+		if ($interval > 1)
+		{
+			$duration *= $interval;
+		}
 
 		return $duration;
 	}
@@ -481,7 +484,10 @@ 
 		{
 			return clone $this->time;
 		}
-		if (isset($this->current)) $backup = $this->current;
+		if (isset($this->current))
+		{
+			$backup = $this->current;
+		}
 		$this->rewind();
 
 		while(--$count > 0)
@@ -489,7 +495,10 @@ 
 			$this->next_no_exception();
 		}
 		$ret = clone $this->current;
-		if ($backup) $this->current = $backup;
+		if ($backup)
+		{
+			$this->current = $backup;
+		}
 		return $ret;
 	}
 
@@ -631,7 +640,11 @@ 
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE)
+		{
+			return false;
+		}
+		// no recuring event
 
 		if ($version == '1.0')
 		{
@@ -725,8 +738,14 @@ 
 	 */
 	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
-		if (!$to_tz) $to_tz = $event['tzid'];
+		if (!is_array($event)  || !isset($event['tzid']))
+		{
+			return false;
+		}
+		if (!$to_tz)
+		{
+			$to_tz = $event['tzid'];
+		}
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
 		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
 
@@ -786,7 +805,10 @@ 
 			$event['recur_type'] == self::NONE ||
 			empty($event['recur_data']) || $event['recur_data'] == ALLDAYS ||
 			empty($event['tzid']) || empty($to_tz) ||
-			$event['tzid'] == $to_tz) return;
+			$event['tzid'] == $to_tz)
+		{
+			return;
+		}
 
 		if (!isset(self::$tz_cache[$event['tzid']]))
 		{
@@ -815,11 +837,19 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask & 128)
+						{
+							$mask = $mask - 127;
+						}
+						// overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask & 1)
+						{
+							$mask = $mask + 128;
+						}
+						// underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -828,11 +858,16 @@ 
 	}
 }
 
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	ini_set('display_errors',1);
+}
 	error_reporting(E_ALL & ~E_NOTICE);
-	function lang($str) { return $str; }
+	function lang($str)
+	{
+return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
@@ -863,9 +898,18 @@ 
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
 	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	if ($_REQUEST['enddate'])
+	{
+		$enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
+	}
+	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask)
+	{
+$weekdays |= $mask; }
+	if ($_REQUEST['exceptions'])
+	{
+		foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception);
+	}
+	}
 
 	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 *
 	 * @var array
 	 */
-	static public $types = Array(
+	static public $types = array(
 		self::NONE         => 'None',
 		self::DAILY        => 'Daily',
 		self::WEEKLY       => 'Weekly',