EGroupware / egroupware

calendar/inc/class.calendar_uilist.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -539,8 +539,9 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 events 'deleted'
-	 * @param string/array $session_name 'calendar_list'
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @param string $session_name 'calendar_list'
+	 * @param null|string $msg
+	 * @return null|boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
 	{

Braces +44 added lines, -12 removed lines

@@ -77,8 +77,14 @@ 
 	 */
 	function listview($_content=null,$msg='',$home=false)
 	{
-		if ($_GET['msg']) $msg .= $_GET['msg'];
-		if ($this->group_warning) $msg .= $this->group_warning;
+		if ($_GET['msg'])
+		{
+			$msg .= $_GET['msg'];
+		}
+		if ($this->group_warning)
+		{
+			$msg .= $this->group_warning;
+		}
 
 		$etpl = new Etemplate('calendar.list');
 
@@ -106,7 +112,8 @@ 
 			{
 				// Allow merge using the date range filter
 				if(strpos($_content['nm']['action'],'document') !== false &&
-					!count($_content['nm']['selected']) && !$_content['nm']['select_all']) {
+					!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
+				{
 					$_content['nm']['selected'][] = $this->get_merge_range($_content['nm']);
 				}
 				if (!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
@@ -165,15 +172,21 @@ 
 		{
 			$params = null;
 			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
-			if (isset($params['keywords']))	// new search => set filters so every match is shown
+			if (isset($params['keywords']))
+			{
+				// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
 			}
+			}
 		}
-		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
+		if (isset($_REQUEST['keywords']))
+		{
+			// new search => set filters so every match is shown
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
+		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
@@ -263,9 +276,12 @@ 
 		$old_params = Api\Cache::getSession('calendar', 'calendar_list');
 		if (is_array($old_params))
 		{
-			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
+			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])
+			{
+				// filter changed => order accordingly
 			{
 				$params['order'] = 'cal_start';
+			}
 				$params['sort'] = $params['filter'] == 'before' ? 'DESC' : 'ASC';
 			}
 			if ($old_params['search'] != $params['search'])
@@ -292,7 +308,10 @@ 
 			$cfs = array();
 			foreach($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#')
+				{
+					$cfs[] = substr($col,1);
+				}
 			}
 		}
 		$search_params = array(
@@ -524,7 +543,10 @@ 
 		{
 			$rows['format'] = '64';
 		}
-		if ($this->cat_id) $rows['no_cat_id'] = true;
+		if ($this->cat_id)
+		{
+			$rows['no_cat_id'] = true;
+		}
 		if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
 		{
 			$params['options-selectcols']['pm_id'] = false;
@@ -590,7 +612,10 @@ 
 			$this->get_rows($query,$events,$readonlys);
 			foreach($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked))
+				{
+					unset($events[$key]);
+				}
 			}
 			$checked = array_values($events); // Clear keys
 		}
@@ -604,7 +629,10 @@ 
 				$ids = array();
 				foreach($checked as $id)
 				{
-					if (is_array($id)) $id = $id['id'];
+					if (is_array($id))
+					{
+						$id = $id['id'];
+					}
 					// get rid of recurrences, doublicate series and calendar-integration events
 					if (($id = (int)$id))
 					{
@@ -618,7 +646,10 @@ 
 				exit();
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				}
 				$document_merge = new calendar_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
 				$failed = count($checked);
@@ -805,7 +836,8 @@ 
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if(!$recur_date || $app)
+						{
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							Link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);

Spacing +152 added lines, -152 removed lines

@@ -39,7 +39,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * Filternames
 	 *
@@ -60,11 +60,11 @@ 
 	 *
 	 * @param array $set_states =null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(true,$set_states);	// call the parent's constructor
+		parent::__construct(true, $set_states); // call the parent's constructor
 
-		foreach($this->date_filters as $name => $label)
+		foreach ($this->date_filters as $name => $label)
 		{
 			$this->date_filters[$name] = lang($label);
 		}
@@ -75,7 +75,7 @@ 
 	/**
 	 * Show the listview
 	 */
-	function listview($_content=null,$msg='',$home=false)
+	function listview($_content = null, $msg = '', $home = false)
 	{
 		if ($_GET['msg']) $msg .= $_GET['msg'];
 		if ($this->group_warning) $msg .= $this->group_warning;
@@ -83,7 +83,7 @@ 
 		$etpl = new Etemplate('calendar.list');
 
 		// Handle merge from sidebox
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
 			$_content['nm']['action'] = 'document_'.$_GET['merge'];
 			$_content['nm']['select_all'] = true;
@@ -92,7 +92,7 @@ 
 		if (is_array($_content))
 		{
 			// handle a single button like actions
-			foreach(array('delete','timesheet','document') as $button)
+			foreach (array('delete', 'timesheet', 'document') as $button)
 			{
 				if ($_content['nm']['rows'][$button])
 				{
@@ -105,7 +105,7 @@ 
 			if ($_content['nm']['action'])
 			{
 				// Allow merge using the date range filter
-				if(strpos($_content['nm']['action'],'document') !== false &&
+				if (strpos($_content['nm']['action'], 'document') !== false &&
 					!count($_content['nm']['selected']) && !$_content['nm']['select_all']) {
 					$_content['nm']['selected'][] = $this->get_merge_range($_content['nm']);
 				}
@@ -116,14 +116,14 @@ 
 				else
 				{
 					$success = $failed = $action_msg = null;
-					if ($this->action($_content['nm']['action'],$_content['nm']['selected'],$_content['nm']['select_all'],
-						$success,$failed,$action_msg,'calendar_list',$msg, $_content['nm']['checkboxes']['no_notifications']))
+					if ($this->action($_content['nm']['action'], $_content['nm']['selected'], $_content['nm']['select_all'],
+						$success, $failed, $action_msg, 'calendar_list', $msg, $_content['nm']['checkboxes']['no_notifications']))
 					{
-						$msg .= lang('%1 event(s) %2',$success,$action_msg);
+						$msg .= lang('%1 event(s) %2', $success, $action_msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
@@ -135,15 +135,15 @@ 
 		{
 			$content['nm'] = array(
 				'get_rows'        =>	'calendar.calendar_uilist.get_rows',
-	 			'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'          => True,	// I  disable the cat-selectbox
+	 			'filter_no_lang'  => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'      => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'          => True, // I  disable the cat-selectbox
 				'filter'          => 'after',
-				'order'           => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'            => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'           => 'cal_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'            => 'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'default_cols'    => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
 				'filter_onchange' => "app.calendar.filter_change",
-				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'row_id'          => 'row_id', // set in get rows "$event[id]:$event[recur_date]"
 				'row_modified'    => 'modified',
 				'favorites'       => true,
 				'placeholder_actions' => array('add')
@@ -151,7 +151,7 @@ 
 		}
 		$content['nm']['actions'] = $this->get_actions();
 
-		if (isset($_GET['filter']) && in_array($_GET['filter'],array_keys($this->date_filters)))
+		if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($this->date_filters)))
 		{
 			$content['nm']['filter'] = $_GET['filter'];
 		}
@@ -159,16 +159,16 @@ 
 		{
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if($this->owner)
+		if ($this->owner)
 		{
-			$content['nm']['col_filter']['participant'] = is_array($this->owner) ? $this->owner : explode(',',$this->owner);
+			$content['nm']['col_filter']['participant'] = is_array($this->owner) ? $this->owner : explode(',', $this->owner);
 		}
 		// search via jdots ajax_exec uses $_REQUEST['json_data'] instead of regular GET parameters
 		if (isset($_REQUEST['json_data']) && ($json_data = json_decode($_REQUEST['json_data'], true)) &&
 			!empty($json_data['request']['parameters'][0]))
 		{
 			$params = null;
-			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
+			parse_str(substr($json_data['request']['parameters'][0], 10), $params); // cut off "/index.php?"
 			if (isset($params['keywords']))	// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
@@ -176,22 +176,22 @@ 
 		}
 		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
 		{
-			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
+			$this->adjust_for_search($_REQUEST['keywords'], $content['nm']);
 		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
 		$sel_options['category'] = array('' => lang('all')) + Etemplate\Widget\Select::typeOptions('select-cat', ',,calendar');
 		// Prevent double encoding - widget does this on its own, but we're just grabbing the options
-		foreach($sel_options['category'] as &$label)
+		foreach ($sel_options['category'] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -199,15 +199,15 @@ 
 		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
 		{
 			$content['css'] .= '<style type="text/css">@media screen { .listDescription {  max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	   // dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
-		if($msg)
+		if ($msg)
 		{
 			Framework::message($msg);
 		}
-		$html = $etpl->exec('calendar.calendar_uilist.listview',$content,$sel_options,array(),array(),$home ? -1 : 0);
+		$html = $etpl->exec('calendar.calendar_uilist.listview', $content, $sel_options, array(), array(), $home ? -1 : 0);
 
 		// Not sure why this has to be echoed instead of appended, but that's what works.
 		//echo calendar_uiviews::edit_series();
@@ -218,7 +218,7 @@ 
 	/**
 	 * set filter for search, so that everything is shown
 	 */
-	function adjust_for_search($keywords,&$params)
+	function adjust_for_search($keywords, &$params)
 	{
 		$params['search'] = $keywords;
 		$params['start']  = 0;
@@ -242,9 +242,9 @@ 
 	 * @param array &$rows returned rows/events
 	 * @param array &$readonlys eg. to disable buttons based on Acl
 	 */
-	function get_rows(&$params,&$rows,&$readonlys)
+	function get_rows(&$params, &$rows, &$readonlys)
 	{
-		unset($readonlys);	// not used;
+		unset($readonlys); // not used;
 		//echo "uilist::get_rows() params="; _debug_array($params);
 		$this->filter = $params['filter'];
 		if ($params['filter'] == 'custom')
@@ -274,7 +274,7 @@ 
 			}
 			if ($old_params['search'] != $params['search'])
 			{
-				$this->adjust_for_search($params['search'],$params);
+				$this->adjust_for_search($params['search'], $params);
 				$this->filter = $params['filter'];
 			}
 		}
@@ -282,28 +282,28 @@ 
 		if (!$params['csv_export'])
 		{
 			Api\Cache::setSession('calendar', 'calendar_list',
-				array_diff_key ($params, array_flip(array('rows', 'actions', 'action_links', 'placeholder_actions'))));
+				array_diff_key($params, array_flip(array('rows', 'actions', 'action_links', 'placeholder_actions'))));
 		}
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
 		$select_cols = $params['selectcols'] ? $params['selectcols'] : $GLOBALS['egw_info']['user']['preferences']['calendar']['nextmatch-calendar.list.rows'];
-		if(!is_array($params['selectcols']))
+		if (!is_array($params['selectcols']))
 		{
-			$select_cols = explode(',',$select_cols);
+			$select_cols = explode(',', $select_cols);
 		}
-		if (in_array('cfs',$select_cols))
+		if (in_array('cfs', $select_cols))
 		{
 			$cfs = array();
-			foreach($select_cols as $col)
+			foreach ($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#') $cfs[] = substr($col, 1);
 			}
 		}
 		$search_params = array(
 			'cat_id'  => $params['cat_id'] ? $params['cat_id'] : 0,
 			'filter'  => $this->filter,
 			'query'   => $params['search'],
-			'offset'  => (int) $params['start'],
+			'offset'  => (int)$params['start'],
 			'num_rows'=> $params['num_rows'],
 			'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start ASC',
 			'cfs'	 => $params['csv_export'] ? array() : $cfs,
@@ -311,24 +311,24 @@ 
 		// Non-blocking events above blocking
 		$search_params['order'] .= ', cal_non_blocking DESC';
 
-		switch($this->filter)
+		switch ($this->filter)
 		{
 			case 'all':
 				break;
 			case 'before':
-				$search_params['end'] = $params['date'] ? Api\DateTime::to($params['date'],'ts') : $this->date;
-				$label = lang('Before %1',$this->bo->long_date($search_params['end']));
+				$search_params['end'] = $params['date'] ? Api\DateTime::to($params['date'], 'ts') : $this->date;
+				$label = lang('Before %1', $this->bo->long_date($search_params['end']));
 				break;
 			case 'custom':
-				$this->first = $search_params['start'] = Api\DateTime::to($params['startdate'],'ts');
-				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
-				$label = $this->bo->long_date($this->first,$this->last);
+				$this->first = $search_params['start'] = Api\DateTime::to($params['startdate'], 'ts');
+				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate'])) - 1;
+				$label = $this->bo->long_date($this->first, $this->last);
 				break;
 			case 'today':
 				$today = new Api\DateTime();
 				$today->setTime(0, 0, 0);
 				$this->first = $search_params['start'] = $today->format('ts');
-				$today->setTime(23,59,59);
+				$today->setTime(23, 59, 59);
 				$this->last  = $search_params['end'] = $today->format('ts');
 				break;
 			case 'week':
@@ -340,7 +340,7 @@ 
 				$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 				unset($this->last['raw']);
 				$this->last = $this->bo->date2ts($this->last);
-				$this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
+				$this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W', $this->first).': '.$this->bo->long_date($this->first, $this->last);
 				$search_params['start'] = $this->first;
 				$search_params['end'] = $this->last;
 				$params['startdate'] = Api\DateTime::to($this->first, Api\DateTime::ET2);
@@ -353,7 +353,7 @@ 
 				unset($this->first['raw']);
 				$this->last = $this->first;
 				$this->last['month'] += 1;
-				$this->date_filters['month'] = $label = lang(adodb_date('F',$this->bo->date2ts($params['date']))).' '.$this->first['year'];
+				$this->date_filters['month'] = $label = lang(adodb_date('F', $this->bo->date2ts($params['date']))).' '.$this->first['year'];
 				$this->first = $this->bo->date2ts($this->first);
 				$this->last = $this->bo->date2ts($this->last);
 				$this->last--;
@@ -366,22 +366,22 @@ 
 				// fall through to after given date
 			case 'after':
 			default:
-				$this->date = $params['startdate'] ? Api\DateTime::to($params['startdate'],'ts') : $this->date;
-				$label = lang('After %1',$this->bo->long_date($this->date));
+				$this->date = $params['startdate'] ? Api\DateTime::to($params['startdate'], 'ts') : $this->date;
+				$label = lang('After %1', $this->bo->long_date($this->date));
 				$search_params['start'] = $this->date;
 				break;
 		}
-		if($params['status_filter'])
+		if ($params['status_filter'])
 		{
 			$search_params['filter'] = $params['status_filter'];
 		}
 		if ($params['col_filter']['participant'])
 		{
-			$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array( $params['col_filter']['participant']);
+			$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array($params['col_filter']['participant']);
 		}
 		elseif (!$params['col_filter'] || !$params['col_filter']['participant'])
 		{
-			$search_params['users'] = $params['owner'] ? $params['owner'] : explode(',',$this->owner);
+			$search_params['users'] = $params['owner'] ? $params['owner'] : explode(',', $this->owner);
 		}
 		// Allow private to stay for all viewed owners, even if in separate calendars
 		$search_params['private_allowed'] = (array)$params['selected_owners'] + (array)$search_params['users'];
@@ -389,9 +389,9 @@ 
 		if ($params['col_filter'])
 		{
 			$col_filter = array();
-			foreach($params['col_filter'] as $name => $val)
+			foreach ($params['col_filter'] as $name => $val)
 			{
-				if (!in_array($name, array('participant','row_id')) && (string)$val !== '')
+				if (!in_array($name, array('participant', 'row_id')) && (string)$val !== '')
 				{
 					$col_filter[$name] = $val;
 				}
@@ -401,18 +401,18 @@ 
 
 		// App header is mostly taken care of on the client side, but here we update
 		// it to match changing list filters
-		if($params['view'] && $params['view'] == 'listview')
+		if ($params['view'] && $params['view'] == 'listview')
 		{
 			Api\Json\Response::get()->call('app.calendar.set_app_header',
-				(count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '') .
+				(count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '').
 				$label);
 		}
-		foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
+		foreach ((array)$this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
 		{
 
 			if ($params['csv_export'])
 			{
-				$event['participants'] = implode(",\n",$this->bo->participants($event,true));
+				$event['participants'] = implode(",\n", $this->bo->participants($event, true));
 			}
 			else
 			{
@@ -420,23 +420,23 @@ 
 			}
 
 			$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[] = Api\Html::image('calendar','private');
+					$icons[] = Api\Html::image('calendar', 'private');
 				}
 				else
 				{
-					$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+					$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 				}
 			}
 			else
 			{
-				$is_private = !$this->bo->check_perms(Acl::READ,$event);
+				$is_private = !$this->bo->check_perms(Acl::READ, $event);
 			}
 			if ($is_private)
 			{
@@ -447,9 +447,9 @@ 
 			$event['app_id'] = $event['id'];
 
 			// Edit link
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				$popup = calendar_uiviews::integration_get_popup($app,$app_id);
+				$popup = calendar_uiviews::integration_get_popup($app, $app_id);
 
 				// Need to strip off 'onclick'
 				$event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup);
@@ -460,18 +460,18 @@ 
 				// populate js_integration_data, if not already set
 				if (!isset($js_integration_data[$app]))
 				{
-					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
+					$js_integration_data[$app] = calendar_bo::integration_get_data($app, 'edit_link');
 				}
 			}
 			elseif ($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');
 			}
 
 			// Format start and end with timezone
-			foreach(array('start','end') as $time)
+			foreach (array('start', 'end') as $time)
 			{
-				$event[$time] = Api\DateTime::to($event[$time],'Y-m-d\TH:i:s\Z');
+				$event[$time] = Api\DateTime::to($event[$time], 'Y-m-d\TH:i:s\Z');
 			}
 
 			$rows[] = $event;
@@ -481,35 +481,35 @@ 
 		// set js_calendar_integration object, to use it in app.js cal_open() function
 		$params['js_integration_data'] = json_encode($js_integration_data);
 
-		$wv=0;
-		$dv=0;
+		$wv = 0;
+		$dv = 0;
 
 		// Add in some select options
-		$users = is_array($search_params['users']) ? $search_params['users'] : explode(',',$search_params['users']);
+		$users = is_array($search_params['users']) ? $search_params['users'] : explode(',', $search_params['users']);
 
 		$this->bo->warnings['groupmembers'] = '';
-		if(($message = $this->check_owners_access($users)))
+		if (($message = $this->check_owners_access($users)))
 		{
 			Api\Json\Response::get()->error($message);
 		}
-		else if($this->bo->warnings['groupmembers'])
+		else if ($this->bo->warnings['groupmembers'])
 		{
 			Api\Json\Response::get()->error($this->bo->warnings['groupmembers']);
 		}
 		$rows['sel_options']['filter'] = $this->date_filters;
-		if($label)
+		if ($label)
 		{
 			$rows['sel_options']['filter'][$params['filter']] = $label;
 		}
-		foreach($users as $owner)
+		foreach ($users as $owner)
 		{
-			if(!is_int($owner) && $this->bo->resources[$owner[0]])
+			if (!is_int($owner) && $this->bo->resources[$owner[0]])
 			{
 				$app = $this->bo->resources[$owner[0]]['app'];
-				$_owner = substr($owner,1);
+				$_owner = substr($owner, 1);
 				// Try link first
-				$title = Link::title($app, $_owner );
-				if($title)
+				$title = Link::title($app, $_owner);
+				if ($title)
 				{
 					$rows['sel_options']['owner'][$owner] = $title;
 				}
@@ -517,15 +517,15 @@ 
 		}
 		$params['options-selectcols']['week'] = lang('Week');
 		$params['options-selectcols']['weekday'] = lang('Weekday');
-		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
+		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows']) == 4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 5) == 'week,')
 		{
-			$rows['format'] = '32';	// prefix date with week-number
-			$wv=1;
+			$rows['format'] = '32'; // prefix date with week-number
+			$wv = 1;
 		}
-		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'],'weekday')===FALSE))
+		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'], 'weekday') === FALSE))
 		{
 			$rows['format'] = '16';
-			$dv=1;
+			$dv = 1;
 		}
 		if ($wv && $dv)
 		{
@@ -552,36 +552,36 @@ 
 	 * @param string/array $session_name 'calendar_list'
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $skip_notification = false)
 	{
 		//error_log(__METHOD__."('$action', ".array2string($checked).', all='.(int)$use_all.", ...)");
 		$success = $failed = 0;
 		$msg = null;
 
 		// Split out combined values
-		if(strpos($action, 'status') !== false)
+		if (strpos($action, 'status') !== false)
 		{
 			list($action, $status) = explode('-', $action);
 		}
 		elseif (strpos($action, '_') !== false)
 		{
-			list($action, $settings) = explode('_', $action,2);
+			list($action, $settings) = explode('_', $action, 2);
 		}
 
 		if ($use_all)
 		{
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('calendar', $session_name);
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$query['num_rows'] = -1;		// all
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$query['num_rows'] = -1; // all
 			$readonlys = null;
-			$this->get_rows($query,$checked,$readonlys,!in_array($action,array('ical','document')));	   // true = only return the id's
+			$this->get_rows($query, $checked, $readonlys, !in_array($action, array('ical', 'document'))); // true = only return the id's
 			// Get rid of any extras (rows that aren't events)
-			if(in_array($action,array('ical','document')))
+			if (in_array($action, array('ical', 'document')))
 			{
-				foreach($checked as $key => $event)
+				foreach ($checked as $key => $event)
 				{
-					if(!is_numeric($key))
+					if (!is_numeric($key))
 					{
 						unset($checked[$key]);
 					}
@@ -589,27 +589,27 @@ 
 			}
 		}
 		// for calendar integration we have to fetch all rows and unset the not selected ones, as we can not filter by id
-		elseif($action == 'document')
+		elseif ($action == 'document')
 		{
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('calendar', $session_name);
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
 			$events = null;
-			$this->get_rows($query,$events,$readonlys);
-			foreach($events as $key => $event)
+			$this->get_rows($query, $events, $readonlys);
+			foreach ($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'], $checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
 			}
 			$checked = array_values($events); // Clear keys
 		}
 
 		// Actions where one action is done to the group
-		switch($action)
+		switch ($action)
 		{
 			case 'ical':
 				// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 				// calendar_ical->exportVCal needs to read events again, to get them in server-time
 				$ids = array();
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
 					if (is_array($id)) $id = $id['id'];
 					// get rid of recurrences, doublicate series and calendar-integration events
@@ -619,7 +619,7 @@ 
 					}
 				}
 				$boical = new calendar_ical();
-				$ical =& $boical->exportVCal($ids, '2.0', 'PUBLISH');
+				$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH');
 				Api\Header\Content::type('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				exit();
@@ -634,19 +634,19 @@ 
 		}
 
 		// Actions where the action is applied to each entry
-		if(strpos($action, 'timesheet') !== false)
+		if (strpos($action, 'timesheet') !== false)
 		{
 			$timesheet_bo = new timesheet_bo();
 		}
-		foreach($checked as &$id)
+		foreach ($checked as &$id)
 		{
 			$recur_date = $app = $app_id = null;
-			if(is_array($id) && $id['id'])
+			if (is_array($id) && $id['id'])
 			{
 				$id = $id['id'];
 			}
 			$matches = null;
-			if(!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i',$id,$matches))
+			if (!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i', $id, $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
@@ -654,36 +654,36 @@ 
 			}
 			else
 			{
-				list($id,$recur_date) = explode(':',$id);
+				list($id, $recur_date) = explode(':', $id);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$action_msg = lang('deleted');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// Delete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
+					if ($id && $this->bo->delete($id, $recur_date, false, $skip_notification))
 					{
 						$success++;
-						if(!$recur_date && $settings == 'series')
+						if (!$recur_date && $settings == 'series')
 						{
 							// If there are multiple events in a series selected, the next one could purge
-							foreach($checked as $key => $c_id)
+							foreach ($checked as $key => $c_id)
 							{
-								list($c_id,$recur_date) = explode(':',$c_id);
-								if($c_id == $id)
+								list($c_id, $recur_date) = explode(':', $c_id);
+								if ($c_id == $id)
 								{
 									unset($checked[$key]);
 								}
 							}
 						}
 
-						if(Api\Json\Response::isJSONResponse())
+						if (Api\Json\Response::isJSONResponse())
 						{
-							Api\Json\Response::get()->call('egw.refresh','','calendar',$id,'delete');
+							Api\Json\Response::get()->call('egw.refresh', '', 'calendar', $id, 'delete');
 						}
 					}
 					else
@@ -693,23 +693,23 @@ 
 					break;
 				case 'undelete':
 					$action_msg = lang('recovered');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// unDelete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(Acl::EDIT,$id) &&
+					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(Acl::EDIT, $id) &&
 						is_array($event) && $event['deleted'])
 					{
 						$event['deleted'] = null;
-						if($this->bo->save($event))
+						if ($this->bo->save($event))
 						{
 							$success++;
 
-							if(Api\Json\Response::isJSONResponse())
+							if (Api\Json\Response::isJSONResponse())
 							{
-								Api\Json\Response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
-								Api\Json\Response::get()->call('egw.refresh','','calendar',$id,'edit');
+								Api\Json\Response::get()->call('egw.dataStoreUID', 'calendar::'.$id, $this->to_client($this->bo->read($id, $recur_date)));
+								Api\Json\Response::get()->call('egw.refresh', '', 'calendar', $id, 'edit');
 							}
 							break;
 						}
@@ -718,7 +718,7 @@ 
 					break;
 				case 'status':
 					$action_msg = lang('Status changed');
-					if($id && ($event = $this->bo->read($id, $recur_date)))
+					if ($id && ($event = $this->bo->read($id, $recur_date)))
 					{
 						$old_status = $event['participants'][$GLOBALS['egw_info']['user']['account_id']];
 						$quantity = $role = null;
@@ -727,12 +727,12 @@ 
 						{
 							//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 							$new_status = calendar_so::combine_status($status, $quantity, $role);
-							if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date,
-								false,true,$skip_notification))
+							if ($this->bo->set_status($event, $GLOBALS['egw_info']['user']['account_id'], $new_status, $recur_date,
+								false, true, $skip_notification))
 							{
-								if(Api\Json\Response::isJSONResponse())
+								if (Api\Json\Response::isJSONResponse())
 								{
-									Api\Json\Response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
+									Api\Json\Response::get()->call('egw.dataStoreUID', 'calendar::'.$id, $this->to_client($this->bo->read($id, $recur_date)));
 								}
 								$success++;
 								//$msg = lang('Status changed');
@@ -749,7 +749,7 @@ 
 					}
 					break;
 				case 'timesheet-add':
-					if($id && !$app)
+					if ($id && !$app)
 					{
 						$event = $this->bo->read($id, $recur_date);
 					}
@@ -761,7 +761,7 @@ 
 						$result = $this->bo->search($query);
 						$event = $result[$app.$app_id];
 					}
-					if(!$event)
+					if (!$event)
 					{
 						$failed++;
 						continue;
@@ -778,16 +778,16 @@ 
 					);
 
 					// Add global categories
-					$categories = explode(',',$event['category']);
+					$categories = explode(',', $event['category']);
 					$global_categories = array();
-					foreach($categories as $cat_id)
+					foreach ($categories as $cat_id)
 					{
-						if($GLOBALS['egw']->categories->is_global($cat_id))
+						if ($GLOBALS['egw']->categories->is_global($cat_id))
 						{
 							$global_categories[] = $cat_id;
 						}
 					}
-					if(count($global_categories))
+					if (count($global_categories))
 					{
 						$timesheet['cat_id'] = implode(',', $global_categories);
 					}
@@ -807,12 +807,12 @@ 
 						}
 					}
 
-					if(!$err)
+					if (!$err)
 					{
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if (!$recur_date || $app) {
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							Link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);
@@ -840,7 +840,7 @@ 
 	protected function get_merge_range($nm)
 	{
 		$checked = array();
-		if($nm['filter'] == 'fixed')
+		if ($nm['filter'] == 'fixed')
 		{
 			$checked['start'] = $nm['startdate'];
 			$last = $this->bo->date2array($nm['enddate']);
@@ -849,7 +849,7 @@ 
 		}
 		else
 		{
-			switch($nm['filter'])
+			switch ($nm['filter'])
 			{
 				case 'after':
 					$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
@@ -862,8 +862,8 @@ 
 					$checked['end'] = $nm['enddate'];
 					break;
 				default:
-					$date = date_create_from_format('Ymd',$this->date);
-					$checked['start']= $date->format('U');
+					$date = date_create_from_format('Ymd', $this->date);
+					$checked['start'] = $date->format('U');
 			}
 		}
 		return $checked;
@@ -888,7 +888,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&cal_id=$id',
 				'popup' => Link::get_registry('calendar', 'view_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'onExecute' => 'javaScript:app.calendar.cal_open',
 				'disableClass' => 'rowNoView',
 			),
@@ -921,7 +921,7 @@ 
 				'group' => $group,
 			),
 		);
-		$status = array_map('lang',$this->bo->verbose_status);
+		$status = array_map('lang', $this->bo->verbose_status);
 		unset($status['G']);
 		$actions['status'] = array(
 			'caption' => 'Change your status',
@@ -930,7 +930,7 @@ 
 			'children' => $status,
 			'group' => ++$group,
 		);
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -962,7 +962,7 @@ 
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&link_app[]=$app&link_id[]=$id',
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 				'onExecute' => 'javaScript:app.calendar.cal_fix_app_id',
 				'popup' => Link::get_registry('timesheet', 'add_popup'),
 			);
@@ -971,7 +971,7 @@ 
 				'caption' => 'Timesheet',
 				'group' => $group,
 				'allowOnMultiple' => 'only',
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 			);
 		}
 		$actions['ical'] = array(
@@ -980,11 +980,11 @@ 
 			'group' => ++$group,
 			'hint' => 'Download this event as iCal',
 			'disableClass' => 'rowNoView',
-			'postSubmit' => true,	// download needs post submit (not Ajax) to work
+			'postSubmit' => true, // download needs post submit (not Ajax) to work
 		);
 		$actions['documents'] = calendar_merge::document_action(
 			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
-			$this->bo->cal_prefs['default_document'],Api\Storage\Merge::getExportLimit('calendar')
+			$this->bo->cal_prefs['default_document'], Api\Storage\Merge::getExportLimit('calendar')
 		);
 		++$group;
 		$actions['delete'] = array(
@@ -994,7 +994,7 @@ 
 			'disableClass' => 'rowNoDelete',
 		);
 		// Add in deleted for admins
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',

calendar/inc/class.calendar_uiviews.inc.php

Doc Comments +8 added lines, -6 removed lines

@@ -412,7 +412,7 @@ 
 	/**
 	 * Displays the planner view
 	 *
-	 * @param boolean|Etemplate $home = false if etemplate return content suitable for home-page
+	 * @param null|Etemplate $home = false if etemplate return content suitable for home-page
 	 */
 	function &planner($content = array(), $home=false)
 	{
@@ -497,7 +497,7 @@ 
 	 * Used for home app
 	 *
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
-	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
+	 * @param null|Etemplate $home = false if not false return content suitable for home-page
 	 */
 	function &month($weeks=0,$home=false)
 	{
@@ -580,6 +580,8 @@ 
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current month
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
+	 * @param integer $first
+	 * @param integer $last
 	 */
 	function _week_align_month(&$first,&$last,$day=1)
 	{
@@ -604,7 +606,7 @@ 
 	 * Displays the weekview, with 5 or 7 days
 	 *
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
-	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
+	 * @param null|Etemplate $home = false if not false return content suitable for home-page
 	 */
 	function week($days=0,$home=false)
 	{
@@ -740,7 +742,7 @@ 
 	/**
 	 * Query the open ToDo's via a hook from InfoLog or any other 'calendar_include_todos' provider
 	 *
-	 * @param array/string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
+	 * @param string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
 	 *	On return $todo_label contains the label for the todo-box
 	 * @return string/boolean Api\Html with a table of open todo's or false if no hook availible
 	 */
@@ -824,7 +826,7 @@ 
 	 * - 'edit_popup' => '400x300' (optional)
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @return string
 	 */
 	public static function integration_get_popup($app,$id)
@@ -864,7 +866,7 @@ 
 	 * Icons specified in $events['icons'] are always displayed!
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @param array $event
 	 * @return array
 	 */

Braces +69 added lines, -21 removed lines

@@ -179,7 +179,10 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new Api\DateTime($time);
+		if (!is_a($time,'DateTime'))
+		{
+			$time = new Api\DateTime($time);
+		}
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -237,7 +240,8 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
+		if(Api\Header\UserAgent::mobile())
+		{
 			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
 			$tmpl->setElementAttribute('toolbar','view_range', '3');
 		}
@@ -396,10 +400,12 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('day_view','week_view','next', 'today','previous')))
+				{
 					$actions[$key]['toolbarDefault'] = false;
 				}
-				else {
+				else
+				{
 					$actions[$key]['toolbarDefault'] = true;
 				}
 			}
@@ -416,29 +422,38 @@ 
 	 */
 	function &planner($content = array(), $home=false)
 	{
-		if ($this->sortby == 'month')	// yearly planner with month rows
+		if ($this->sortby == 'month')
+		{
+			// yearly planner with month rows
 		{
 			$this->first = $this->bo->date2array($this->date);
+		}
 			$this->first['day'] = 1;
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
 			$this->last = $this->bo->date2ts($this->last)-1;
 		}
-		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
+		elseif (!$this->planner_view || $this->planner_view == 'month')
+		{
+			// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
 				$this->_week_align_month($this->first,$this->last);
+		}
 			}
 			else	// show 2 half month
 			{
 				$this->_week_align_month($this->first,$this->last,15);
 			}
 		}
-		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
+		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')
+		{
+			// weeekview
 		{
 			$start = new Api\DateTime($this->date);
+		}
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
@@ -477,7 +492,10 @@ 
 			$this->to_client($event);
 		}
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		$tmpl = $home ? $home : new Etemplate('calendar.planner');
 
@@ -501,7 +519,10 @@ 
 	 */
 	function &month($weeks=0,$home=false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		}
 
 		if (!$home)
 		{
@@ -543,7 +564,10 @@ 
 			$weekNavH = "1 month";
 			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		// Loop through, using Api\DateTime to handle DST
 		$week = 0;
@@ -588,7 +612,10 @@ 
 		$start->setWeekstart();
 		$first = $start->format('ts');
 		$start->setDate($this->year,$this->month+1,$day);
-		if ($day == 1) $start->add('-1day');
+		if ($day == 1)
+		{
+			$start->add('-1day');
+		}
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
 		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
@@ -611,19 +638,31 @@ 
 		if (!$days)
 		{
 			$days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview'];
-			if ($days != 5) $days = 7;
-			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
+			if ($days != 5)
+			{
+				$days = 7;
+			}
+			if ($days != $this->cal_prefs['days_in_weekview'])
+			{
+				// save the preference
 			{
 				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+			}
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		}
 
-		if ($days <= 4)		// next 4 days view
+		if ($days <= 4)
+		{
+			// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
+		}
 			$this->last = strtotime("+$days days",$this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
@@ -632,12 +671,15 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$wd_start = $this->first = $start->format('ts');
-			if ($days <= 5)		// no weekend-days
+			if ($days <= 5)
+			{
+				// no weekend-days
 			{
 				switch($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
 						$this->first = strtotime("+2 days",$this->first);
+			}
 						break;
 					case 'Sunday':
 						$this->first = strtotime("+1 day",$this->first);
@@ -666,7 +708,10 @@ 
 			) + $this->search_params;
 
 		$users = $this->search_params['users'];
-		if (!is_array($users)) $users = array($users);
+		if (!is_array($users))
+		{
+			$users = array($users);
+		}
 
 		$content = array('view' => array());
 
@@ -689,8 +734,7 @@ 
 			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days",$this->first) - 1);
 			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate']	||// for more then X users, show all in one row
 				$days == 1 // Showing just 1 day
-			)
-			{
+			) {
 				$content['view'][] = (array)$this->tagWholeDayOnTop($this->bo->search($search_params)) +
 					array('owner' => $users);
 			}
@@ -793,7 +837,8 @@ 
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if($todo['edit'])
+						{
 							$todo['edit_size'] = $todo['edit']['size'];
 							unset($todo['edit']['size']);
 							$edit_icon_href = Api\Html::a_href( $icons, $todo['edit'],'',' data-todo="app|750x590" ');
@@ -914,7 +959,10 @@ 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
 		foreach($actions as $id => &$action)
 		{
-			if($id=='add') continue;
+			if($id=='add')
+			{
+				continue;
+			}
 			if(!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';

Spacing +130 added lines, -131 removed lines

@@ -41,7 +41,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * extra rows above and below the workday
@@ -92,7 +92,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $use_time_grid=true;
+	var $use_time_grid = true;
 
 	/**
 	 * Pref value of use_time_grid preference
@@ -105,14 +105,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $scroll_to_wdstart=false;
+	var $scroll_to_wdstart = false;
 
 	/**
 	 * counter for the current whole day event of a single day
 	 *
 	 * @var int
 	 */
-	var $wholeDayPosCounter=1;
+	var $wholeDayPosCounter = 1;
 
 	/**
 	 * Switch to disable private data and possibility to view and edit events
@@ -125,26 +125,26 @@ 
 	 *
 	 * @param array $set_states = null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(false,$set_states);	// call the parent's constructor
+		parent::__construct(false, $set_states); // call the parent's constructor
 		$this->extraRowsOriginal = $this->extraRows; //save original extraRows value
 
 		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
 
 		// Check for GET message (from merge)
-		if($_GET['msg'])
+		if ($_GET['msg'])
 		{
 			Framework::message($_GET['msg']);
 			unset($_GET['msg']);
 		}
 		// standard params for calling bocal::search for all views
-		$this->owner = str_replace('%2C',',',$this->owner);
+		$this->owner = str_replace('%2C', ',', $this->owner);
 		$this->search_params = array(
 			'start'   => $this->date,
-			'cat_id'  => $this->cat_id ? (is_array($this->cat_id)?$this->cat_id:explode(',',$this->cat_id)) : 0,
-			'users'   => explode(',',$this->owner),
-			'owner'   => explode(',',$this->owner),
+			'cat_id'  => $this->cat_id ? (is_array($this->cat_id) ? $this->cat_id : explode(',', $this->cat_id)) : 0,
+			'users'   => explode(',', $this->owner),
+			'owner'   => explode(',', $this->owner),
 			'filter'  => $this->filter,
 			'daywise' => True,
 			'use_so_events' => $this->test === 'true',
@@ -170,7 +170,7 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new Api\DateTime($time);
+		if (!is_a($time, 'DateTime')) $time = new Api\DateTime($time);
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -188,19 +188,19 @@ 
 	/**
 	 * Load all views used by calendar, client side switches between them as needed
 	 */
-	function index($content=array())
+	function index($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 = Api\DateTime::to($content['last'],'ts');
+				$this->last = Api\DateTime::to($content['last'], 'ts');
 			}
 			$_GET['merge'] = $content['merge'];
 			$this->merge();
@@ -216,7 +216,7 @@ 
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualCalendar'.ucfirst($this->view));
 
 		// Sidebox & iframe for old views
-		if(in_array($this->view,array('year')) && $_GET['view'])
+		if (in_array($this->view, array('year')) && $_GET['view'])
 		{
 			$GLOBALS['egw_info']['flags']['nonavbar'] = true;
 			$this->manage_states($_GET);
@@ -228,24 +228,24 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
-			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
-			$tmpl->setElementAttribute('toolbar','view_range', '3');
+		if (Api\Header\UserAgent::mobile()) {
+			$tmpl->setElementAttribute('toolbar', 'class', 'et2_head_toolbar');
+			$tmpl->setElementAttribute('toolbar', 'view_range', '3');
 		}
-		$tmpl->exec('calendar_uiviews::index',array());
+		$tmpl->exec('calendar_uiviews::index', array());
 
 		// Load the different views once, we'll switch between them on the client side
 		$todo = new Etemplate('calendar.todo');
 		$label = '';
-		$todo->exec('calendar_uiviews::index',array('todos'=>'', 'label' => $label));
+		$todo->exec('calendar_uiviews::index', array('todos'=>'', 'label' => $label));
 
 		// Actually, this takes care of most of it...
 		$this->week();
 
 		$planner = new Etemplate('calendar.planner');
 		// Get the actions
-		$planner->setElementAttribute('planner','actions',$this->get_actions());
-		$planner->exec('calendar_uiviews::index',array());
+		$planner->setElementAttribute('planner', 'actions', $this->get_actions());
+		$planner->exec('calendar_uiviews::index', array());
 
 		// List view in a separate file
 		$list_ui = new calendar_uilist();
@@ -387,7 +387,7 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('day_view', 'week_view', 'next', 'today', 'previous'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 				else {
@@ -405,7 +405,7 @@ 
 	 *
 	 * @param boolean|Etemplate $home = false if etemplate return content suitable for home-page
 	 */
-	function &planner($content = array(), $home=false)
+	function &planner($content = array(), $home = false)
 	{
 		if ($this->sortby == 'month')	// yearly planner with month rows
 		{
@@ -414,17 +414,17 @@ 
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
-			$this->last = $this->bo->date2ts($this->last)-1;
+			$this->last = $this->bo->date2ts($this->last) - 1;
 		}
 		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
-				$this->_week_align_month($this->first,$this->last);
+				$this->_week_align_month($this->first, $this->last);
 			}
 			else	// show 2 half month
 			{
-				$this->_week_align_month($this->first,$this->last,15);
+				$this->_week_align_month($this->first, $this->last, 15);
 			}
 		}
 		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
@@ -433,7 +433,7 @@ 
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
-			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks'])-1;
+			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks']) - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 			unset($this->last['raw']);
 			$this->last = $this->bo->date2ts($this->last);
@@ -449,9 +449,9 @@ 
 		}
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			Egw::redirect_link('/index.php',array(
+			Egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 				'ajax'       => 'true'
@@ -464,21 +464,21 @@ 
 		$search_params['end'] = $this->last;
 		$search_params['enum_groups'] = $this->sortby == 'user';
 		$content['planner'] = $this->bo->search($search_params);
-		foreach($content['planner'] as &$event)
+		foreach ($content['planner'] as &$event)
 		{
 			$this->to_client($event);
 		}
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3', False, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		$tmpl = $home ? $home : new Etemplate('calendar.planner');
 
-		$tmpl->setElementAttribute('planner','start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','owner', $search_params['users']);
-		$tmpl->setElementAttribute('planner','group_by', $this->sortby);
+		$tmpl->setElementAttribute('planner', 'start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'owner', $search_params['users']);
+		$tmpl->setElementAttribute('planner', 'group_by', $this->sortby);
 		// Get the actions
-		$tmpl->setElementAttribute('planner','actions',$this->get_actions());
+		$tmpl->setElementAttribute('planner', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -491,30 +491,30 @@ 
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function &month($weeks=0,$home=false)
+	function &month($weeks = 0, $home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2', True, $weeks, $this->date);
 
 		if (!$home)
 		{
-			trigger_error(__METHOD__ .' only used by home app', E_USER_DEPRECATED);
+			trigger_error(__METHOD__.' only used by home app', E_USER_DEPRECATED);
 			return;
 		}
 
-		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all';	// all views
+		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all'; // all views
 		$granularity = 0;
-		if($weeks)
+		if ($weeks)
 		{
 			$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 			$list = $this->cal_prefs['use_time_grid'];
-			if(!is_array($list))
+			if (!is_array($list))
 			{
-				$list = explode(',',$list);
+				$list = explode(',', $list);
 			}
-			if(is_array($list))
+			if (is_array($list))
 			{
-				$granularity = in_array('weekN',$list) ? 0 : $granularity;
+				$granularity = in_array('weekN', $list) ? 0 : $granularity;
 			}
 		}
 		$content = array('view' => array());
@@ -524,23 +524,23 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
-			$this->last = strtotime("+$weeks weeks",$this->first) - 1;
+			$this->last = strtotime("+$weeks weeks", $this->first) - 1;
 			$weekNavH = "$weeks weeks";
 			$navHeader = lang('Week').' '.$this->week_number($this->first).' - '.$this->week_number($this->last).': '.
-				$this->bo->long_date($this->first,$this->last);
+				$this->bo->long_date($this->first, $this->last);
 		}
 		else
 		{
-			$this->_week_align_month($this->first,$this->last);
+			$this->_week_align_month($this->first, $this->last);
 			$weekNavH = "1 month";
-			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+			$navHeader = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4', False, $weeks, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		// Loop through, using Api\DateTime to handle DST
 		$week = 0;
 		$week_start = new EGroupware\Api\DateTime($this->first);
-		$week_start->setTime(0,0,0);
+		$week_start->setTime(0, 0, 0);
 		$week_end = new Api\DateTime($week_start);
 		$week_end->add(new DateInterval('P6DT23H59M59S'));
 		$last = new EGroupware\Api\DateTime($this->last);
@@ -554,14 +554,14 @@ 
 			array(
 				'id' => $week_start->format('Ymd')
 			);
-			$home->setElementAttribute("view[$week]",'onchange',false);
-			$home->setElementAttribute("view[$week]",'granularity',$granularity);
-			$home->setElementAttribute("view[$week]",'show_weekend', $this->search_params['weekend']);
+			$home->setElementAttribute("view[$week]", 'onchange', false);
+			$home->setElementAttribute("view[$week]", 'granularity', $granularity);
+			$home->setElementAttribute("view[$week]", 'show_weekend', $this->search_params['weekend']);
 			$week++;
 		}
 
 		// Get the actions
-		$home->setElementAttribute('view','actions',$this->get_actions());
+		$home->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$home->exec(__METHOD__, $content);
 	}
@@ -573,13 +573,13 @@ 
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
 	 */
-	function _week_align_month(&$first,&$last,$day=1)
+	function _week_align_month(&$first, &$last, $day = 1)
 	{
 		$start = new Api\DateTime($this->date);
-		$start->setDate($this->year,$this->month,$this->day=$day);
+		$start->setDate($this->year, $this->month, $this->day = $day);
 		$start->setWeekstart();
 		$first = $start->format('ts');
-		$start->setDate($this->year,$this->month+1,$day);
+		$start->setDate($this->year, $this->month + 1, $day);
 		if ($day == 1) $start->add('-1day');
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
@@ -588,7 +588,7 @@ 
 		$arr['day'] += 6;
 		$arr['hour'] = 23;
 		$arr['min'] = $arr['sec'] = 59;
-		unset($arr['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		unset($arr['raw']); // otherwise date2ts does not calc raw new, but uses it
 		$last = $this->bo->date2ts($arr);
 	}
 
@@ -598,7 +598,7 @@ 
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function week($days=0,$home=false)
+	function week($days = 0, $home = false)
 	{
 		if (!$days)
 		{
@@ -606,17 +606,17 @@ 
 			if ($days != 5) $days = 7;
 			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
 			{
-				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+				$GLOBALS['egw']->preferences->add('calendar', 'days_in_weekview', $days);
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2', True, $days, $this->date);
 
 		if ($days <= 4)		// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
 		else
@@ -626,30 +626,30 @@ 
 			$wd_start = $this->first = $start->format('ts');
 			if ($days <= 5)		// no weekend-days
 			{
-				switch($this->cal_prefs['weekdaystarts'])
+				switch ($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$this->first = strtotime("+2 days",$this->first);
+						$this->first = strtotime("+2 days", $this->first);
 						break;
 					case 'Sunday':
-						$this->first = strtotime("+1 day",$this->first);
+						$this->first = strtotime("+1 day", $this->first);
 						break;
 				}
 			}
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = 'week';
 		}
 
 		$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 		$list = $this->cal_prefs['use_time_grid'];
-		if(!is_array($list))
+		if (!is_array($list))
 		{
-			$list = explode(',',$list);
+			$list = explode(',', $list);
 		}
-		if(is_array($list))
+		if (is_array($list))
 		{
-			$granularity = in_array($view,$list) ? 0 : $granularity;
+			$granularity = in_array($view, $list) ? 0 : $granularity;
 		}
 
 		$search_params = array(
@@ -662,15 +662,15 @@ 
 
 		$content = array('view' => array());
 
-		if(!$home)
+		if (!$home)
 		{
 			// Fill with the minimum needed 'weeks'
 			$min = max(
 				6, // Some months need 6 weeks for full display
-				$this->cal_prefs['multiple_weeks'],  // WeekN view
+				$this->cal_prefs['multiple_weeks'], // WeekN view
 				$this->cal_prefs['week_consolidate'] // We collapse after this many users
 			);
-			for($i = 0; $i < $min; $i++)
+			for ($i = 0; $i < $min; $i++)
 			{
 				$content['view'][] = array();
 			}
@@ -678,8 +678,8 @@ 
 		else
 		{
 			// Always do 7 days for a week so scrolling works properly
-			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days",$this->first) - 1);
-			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate']	||// for more then X users, show all in one row
+			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days", $this->first) - 1);
+			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate'] || // for more then X users, show all in one row
 				$days == 1 // Showing just 1 day
 			)
 			{
@@ -688,7 +688,7 @@ 
 			}
 			else
 			{
-				foreach($users as $uid)
+				foreach ($users as $uid)
 				{
 					$search_params['users'] = $uid;
 					$content['view'][] = $this->tagWholeDayOnTop($this->bo->search($search_params))
@@ -696,15 +696,15 @@ 
 				}
 			}
 		}
-		$tmpl = $home ? $home :new Etemplate('calendar.view');
-		foreach(array_keys($content['view']) as $index)
+		$tmpl = $home ? $home : new Etemplate('calendar.view');
+		foreach (array_keys($content['view']) as $index)
 		{
-			$tmpl->setElementAttribute("view[$index]",'granularity',$granularity);
-			$tmpl->setElementAttribute("view[$index]",'show_weekend',$this->search_params['weekend']);
+			$tmpl->setElementAttribute("view[$index]", 'granularity', $granularity);
+			$tmpl->setElementAttribute("view[$index]", 'show_weekend', $this->search_params['weekend']);
 		}
 
 		// Get the actions
-		$tmpl->setElementAttribute('view','actions',$this->get_actions());
+		$tmpl->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -746,57 +746,56 @@ 
 			'owner'     => $this->owner	// num. id of the user, not necessary current user
 		));
 
-		if(is_array($todo_label))
+		if (is_array($todo_label))
 		{
-			list($label,$showall)=$todo_label;
+			list($label, $showall) = $todo_label;
 		}
 		else
 		{
-			$label=$todo_label;
-			$showall=true;
+			$label = $todo_label;
+			$showall = true;
 		}
 		$maxshow = (int)$GLOBALS['egw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
-		if($maxshow <= 0)
+		if ($maxshow <= 0)
 		{
-			$maxshow=10;
+			$maxshow = 10;
 		}
 		//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
 
 		$content = $todo_label = '';
 		if (is_array($todos_from_hook) && count($todos_from_hook))
 		{
-			foreach($todos_from_hook as $todos)
+			foreach ($todos_from_hook as $todos)
 			{
 				$i = 0;
 				if (is_array($todos))
 				{
 					$todo_label = !empty($label) ? $label : lang("open ToDo's:");
 
-					foreach($todos as &$todo)
+					foreach ($todos as &$todo)
 					{
-						if(!$showall && ($i++ > $maxshow))
+						if (!$showall && ($i++ > $maxshow))
 						{
 							break;
 						}
 						$icons = '';
-						foreach($todo['icons'] as $name => $alt)
+						foreach ($todo['icons'] as $name => $alt)
 						{
-							$icons .= ($icons?' ':'').Api\Html::image('infolog',$name,lang($alt),'border="0" width="15" height="15"');
+							$icons .= ($icons ? ' ' : '').Api\Html::image('infolog', $name, lang($alt), 'border="0" width="15" height="15"');
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if ($todo['edit']) {
 							$todo['edit_size'] = $todo['edit']['size'];
 							unset($todo['edit']['size']);
-							$edit_icon_href = Api\Html::a_href( $icons, $todo['edit'],'',' data-todo="app|750x590" ');
-							$edit_href = Api\Html::a_href( $todo['title'], $todo['edit'],'',' data-todo="app|750x590" ');
-							$todo['edit'] = Framework::link('/index.php',$todo['edit'],true);
+							$edit_icon_href = Api\Html::a_href($icons, $todo['edit'], '', ' data-todo="app|750x590" ');
+							$edit_href = Api\Html::a_href($todo['title'], $todo['edit'], '', ' data-todo="app|750x590" ');
+							$todo['edit'] = Framework::link('/index.php', $todo['edit'], true);
 						}
-						$icon_href = Api\Html::a_href($icons,$todo['view']);
+						$icon_href = Api\Html::a_href($icons, $todo['view']);
 						$content .= " <tr class=\"$class\">\n  <td valign=\"top\" width=\"15%\" nowrap>".
-							($this->bo->printer_friendly?$icons:($edit_icon_href ? $edit_icon_href : $icon_href)).
-							"</td>\n  <td>".($this->printer_friendly?$todo['title']:
-							$edit_href)."</td>\n </tr>\n";
+							($this->bo->printer_friendly ? $icons : ($edit_icon_href ? $edit_icon_href : $icon_href)).
+							"</td>\n  <td>".($this->printer_friendly ? $todo['title'] : $edit_href)."</td>\n </tr>\n";
 						/**
 						 * ToDo: add delete and closing action
 						 */
@@ -819,9 +818,9 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	public static function integration_get_popup($app,$id)
+	public static function integration_get_popup($app, $id)
 	{
-		$app_data = calendar_bo::integration_get_data($app,'edit_link');
+		$app_data = calendar_bo::integration_get_data($app, 'edit_link');
 
 		if (is_array($app_data) && isset($app_data['edit']))
 		{
@@ -831,7 +830,7 @@ 
 		}
 		else
 		{
-			$edit = Link::edit($app,$id,$popup_size);
+			$edit = Link::edit($app, $id, $popup_size);
 		}
 		if ($edit)
 		{
@@ -860,28 +859,28 @@ 
 	 * @param array $event
 	 * @return array
 	 */
-	static function integration_get_icons($app,$id,$event)
+	static function integration_get_icons($app, $id, $event)
 	{
 		$icons = array();
 		if ($event['icons'])
 		{
-			foreach(explode(',',$event['icons']) as $icon)
+			foreach (explode(',', $event['icons']) as $icon)
 			{
-				list($icon_app,$icon) = explode(':',$icon);
-				if (Api\Image::find($icon_app,$icon))
+				list($icon_app, $icon) = explode(':', $icon);
+				if (Api\Image::find($icon_app, $icon))
 				{
-					$icons[] = Api\Html::image($icon_app,$icon);
+					$icons[] = Api\Html::image($icon_app, $icon);
 				}
 			}
 		}
-		$app_data = calendar_bo::integration_get_data($app,'icons');
+		$app_data = calendar_bo::integration_get_data($app, 'icons');
 		if (is_null($app_data))
 		{
-			$icons[] = Api\Html::image($app,'navbar');	// use navbar icon
+			$icons[] = Api\Html::image($app, 'navbar'); // use navbar icon
 		}
 		elseif ($app_data)
 		{
-			$icons += (array)ExecMethod2($app_data,$id,$event);
+			$icons += (array)ExecMethod2($app_data, $id, $event);
 		}
 		return $icons;
 	}
@@ -904,22 +903,22 @@ 
 		unset($actions['select_all']);
 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
-		foreach($actions as $id => &$action)
+		foreach ($actions as $id => &$action)
 		{
-			if($id=='add') continue;
-			if(!$action['enabled'])
+			if ($id == 'add') continue;
+			if (!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';
 			}
 		}
 		$actions['add']['open'] = '{"app":"calendar","type":"add"}';
-		$actions['add']['onExecute'] =  'javaScript:app.calendar.action_open';
+		$actions['add']['onExecute'] = 'javaScript:app.calendar.action_open';
 		$actions['copy']['open'] = '{"app": "calendar", "type": "add", "extra": "cal_id=$id&action=copy"}';
 		$actions['copy']['onExecute'] = 'javaScript:app.calendar.action_open';
 		$actions['print']['open'] = '{"app": "calendar", "type": "add", "extra": "cal_id=$id&print=1"}';
 		$actions['print']['onExecute'] = 'javaScript:app.calendar.action_open';
 
-		foreach($actions['status']['children'] as $id => &$status)
+		foreach ($actions['status']['children'] as $id => &$status)
 		{
 			$status = array(
 				'id' => $id,
@@ -930,7 +929,7 @@ 
 
 		if ($actions['filemanager'])
 		{
-			$actions['filemanager']['url'] = '/index.php?'. $actions['filemanager']['url'];
+			$actions['filemanager']['url'] = '/index.php?'.$actions['filemanager']['url'];
 			$actions['filemanager']['onExecute'] = 'javaScript:app.calendar.action_open';
 		}
 		if ($actions['infolog_app'])
@@ -975,26 +974,26 @@ 
 				{
 					$start = $this->bo->date2array($event['start']);
 					$end = $this->bo->date2array($event['end']);
-					if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
+					if (!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
 					{
-						if($event['non_blocking'])
+						if ($event['non_blocking'])
 						{
-							$dayEvents[$day][$num]['whole_day_on_top']=true;
-							$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
+							$dayEvents[$day][$num]['whole_day_on_top'] = true;
+							$this->whole_day_positions[$num] = ($this->rowHeight * ($num + 2));
 							$extraRowsToAdd++;
 						}
 						else
 						{
-							$dayEvents[$day][$num]['whole_day']=true;
+							$dayEvents[$day][$num]['whole_day'] = true;
 						}
 					}
 					$this->to_client($dayEvents[$day][$num]);
 				}
 				// check after every day if we have to increase $this->extraRows
-				if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
+				if (($this->extraRowsOriginal + $extraRowsToAdd) > $this->extraRows)
 				{
 					$this->remBotExtraRows = $extraRowsToAdd;
-					$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
+					$this->extraRows = ($this->extraRowsOriginal + $extraRowsToAdd);
 				}
 			}
 		}

calendar/setup/tables_update.inc.php

Doc Comments +5 added lines, -1 removed lines

@@ -11,6 +11,10 @@ 
 
 use EGroupware\Api;
 
+/**
+ * @param string $table
+ * @param string $field
+ */
 function calendar_v0_9_2to0_9_3update_owner($table, $field)
 {
 	$GLOBALS['egw_setup']->oProc->query("select distinct($field) from $table");
@@ -2306,7 +2310,7 @@ 
  *
  * Also fix recurring events containing a reference to an other master, created when an exception is made a recurring event.
  *
- * @return type
+ * @return string
  */
 function calendar_upgrade14_1()
 {

Indentation +1 added lines, -1 removed lines

@@ -1909,7 +1909,7 @@
 			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
 	}
 
-    $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
 			WHERE recur_interval=0',__LINE__,__FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';

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

@@ -32,7 +32,7 @@ 
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
-			$GLOBALS['egw_setup']->oProc->query("UPDATE $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
+			$GLOBALS['egw_setup']->oProc->query("update $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
 		}
 	}
 	$GLOBALS['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
@@ -188,7 +188,7 @@ 
 	$db2 = clone($GLOBALS['egw_setup']->db);
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => false),
 				'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -238,7 +238,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
 				'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -268,7 +268,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_user');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
 				'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
@@ -310,7 +310,7 @@ 
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("update {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -602,7 +602,7 @@ 
 
 // calendar_entry => phpgw_cal
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => False),
 				'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -658,7 +658,7 @@ 
 
 // calendar_entry_repeats => phpgw_cal_repeats
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
 				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
@@ -731,7 +731,7 @@ 
 function calendar_upgrade0_9_11_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
 				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
@@ -767,7 +767,7 @@ 
 {
 	$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_holidays');
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'hol_id' => array('type' => 'auto','nullable' => False),
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
@@ -854,7 +854,7 @@ 
 function calendar_upgrade0_9_13_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
-		Array(
+		array(
 			'fd' => array(
 				'alarm_id' => array('type' => 'auto','nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -888,7 +888,7 @@ 
 
 function calendar_upgrade0_9_13_005()
 {
-	$calendar_data = Array();
+	$calendar_data = array();
 	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
 	while($GLOBALS['egw_setup']->oProc->next_record())
 	{

Spacing +438 added lines, -438 removed lines

@@ -20,7 +20,7 @@ 
 		{
 			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 		}
-		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		if ($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.10pre4'))
 		{
 			$acctstbl = 'accounts';
 		}
@@ -28,7 +28,7 @@ 
 		{
 			$acctstbl = 'phpgw_accounts';
 		}
-		for($i=0;$i<count($owner);$i++)
+		for ($i = 0; $i < count($owner); $i++)
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
@@ -41,8 +41,8 @@ 
 
 function calendar_upgrade0_9_3pre1()
 {
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry', 'cal_create_by');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user', 'cal_login');
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
 }
@@ -209,12 +209,12 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
@@ -224,13 +224,13 @@ 
 			$cal_access = $GLOBALS['egw_setup']->oProc->f('cal_access');
 			$cal_name = $GLOBALS['egw_setup']->oProc->f('cal_name');
 			$cal_description = $GLOBALS['egw_setup']->oProc->f('cal_description');
-			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),0,4)));
-			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),0,4)));
-			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 0, 4)));
+			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 0, 4)));
+			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 			$db2->next_record();
 			$cal_group = $db2->f('groups');
 			$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
-				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -251,17 +251,17 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_login = $GLOBALS['egw_setup']->oProc->f('cal_login');
 			$cal_status = $GLOBALS['egw_setup']->oProc->f('cal_status');
-			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -284,18 +284,18 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-			if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
+			if (isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 			{
-				$enddate = mktime(0,0,0,intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),0,4)));
+				$enddate = mktime(0, 0, 0, intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 0, 4)));
 				$useend = 1;
 			}
 			else
@@ -305,12 +305,12 @@ 
 			}
 			$cal_frequency = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 			$cal_days = $GLOBALS['egw_setup']->oProc->f('cal_days');
-			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')", __LINE__, __FILE__);
 		}
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'", __LINE__, __FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -322,19 +322,19 @@ 
 	$db2 = $GLOBALS['egw_setup']->db;
 
 	$GLOBALS['egw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
-	if($GLOBALS['egw_setup']->oProc->num_rows())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id', __LINE__, __FILE__);
+	if ($GLOBALS['egw_setup']->oProc->num_rows())
 	{
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
+			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'), __LINE__, __FILE__);
 			$db2->next_record();
 			$tz = $db2->f('preference_value');
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
 			$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
 			$edatetime = $datetime + (60 * $GLOBALS['egw_setup']->oProc->f('cal_edatetime'));
-			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 		}
 	}
 
@@ -582,22 +582,22 @@ 
 {
 	$db2 = $GLOBALS['egw_setup']->db;
 
-	if(extension_loaded('mcal') == False)
+	if (extension_loaded('mcal') == False)
 	{
-		define(RECUR_NONE,0);
-		define(RECUR_DAILY,1);
-		define(RECUR_WEEKLY,2);
-		define(RECUR_MONTHLY_MDAY,3);
-		define(RECUR_MONTHLY_WDAY,4);
-		define(RECUR_YEARLY,5);
-
-		define(M_SUNDAY,1);
-		define(M_MONDAY,2);
-		define(M_TUESDAY,4);
-		define(M_WEDNESDAY,8);
-		define(M_THURSDAY,16);
-		define(M_FRIDAY,32);
-		define(M_SATURDAY,64);
+		define(RECUR_NONE, 0);
+		define(RECUR_DAILY, 1);
+		define(RECUR_WEEKLY, 2);
+		define(RECUR_MONTHLY_MDAY, 3);
+		define(RECUR_MONTHLY_WDAY, 4);
+		define(RECUR_YEARLY, 5);
+
+		define(M_SUNDAY, 1);
+		define(M_MONDAY, 2);
+		define(M_TUESDAY, 4);
+		define(M_WEDNESDAY, 8);
+		define(M_THURSDAY, 16);
+		define(M_FRIDAY, 32);
+		define(M_SATURDAY, 64);
 	}
 
 // calendar_entry => phpgw_cal
@@ -624,13 +624,13 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
 		$access = $GLOBALS['egw_setup']->oProc->f('cal_access');
-		switch($access)
+		switch ($access)
 		{
 			case 'private':
 				$is_public = 0;
@@ -652,7 +652,7 @@ 
 		$description = $GLOBALS['egw_setup']->oProc->f('cal_description');
 
 		$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
-			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
+			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
@@ -660,12 +660,12 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
 		Array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
-				'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
+				'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_type' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_use_end' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_enddate' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_interval' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1'),
+				'recur_data' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1')
 			),
 			'pk' => array(),
 			'fk' => array(),
@@ -673,12 +673,12 @@ 
 			'uc' => array()
 		)
 	);
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-		switch($recur_type)
+		switch ($recur_type)
 		{
 			case 'daily':
 				$recur_type_num = RECUR_DAILY;
@@ -701,20 +701,20 @@ 
 		$recur_interval = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 		$days = strtoupper($GLOBALS['egw_setup']->oProc->f('cal_days'));
 		$recur_data = 0;
-		$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
-		$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
-		$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
-		$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
-		$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
-		$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
-		$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
+		$recur_data += (substr($days, 0, 1) == 'Y' ?M_SUNDAY:0);
+		$recur_data += (substr($days, 1, 1) == 'Y' ?M_MONDAY:0);
+		$recur_data += (substr($days, 2, 1) == 'Y' ?M_TUESDAY:0);
+		$recur_data += (substr($days, 3, 1) == 'Y' ?M_WEDNESDAY:0);
+		$recur_data += (substr($days, 4, 1) == 'Y' ?M_THURSDAY:0);
+		$recur_data += (substr($days, 5, 1) == 'Y' ?M_FRIDAY:0);
+		$recur_data += (substr($days, 6, 1) == 'Y' ?M_SATURDAY:0);
 		$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
-			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
+			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry_repeats');
 
 // calendar_entry_user => phpgw_cal_user
-	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
+	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user', 'phpgw_cal_user');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -733,11 +733,11 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
-			'pk' => array('locale','name'),
+			'pk' => array('locale', 'name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
@@ -769,10 +769,10 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'hol_id' => array('type' => 'auto','nullable' => False),
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'hol_id' => array('type' => 'auto', 'nullable' => False),
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
 			'pk' => array('hol_id'),
 			'fk' => array(),
@@ -789,10 +789,10 @@ 
 function calendar_upgrade0_9_11_007()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'mday', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'month_num', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'occurence', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'dow', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -809,7 +809,7 @@ 
 function calendar_upgrade0_9_11_009()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'observance_rule', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.010';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -844,7 +844,7 @@ 
 
 function calendar_upgrade0_9_13_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'reference', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -856,7 +856,7 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 		Array(
 			'fd' => array(
-				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'alarm_id' => array('type' => 'auto', 'nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -869,8 +869,8 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'uid', array('type' => 'varchar', 'precision' => 255, 'nullable' => False));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'location', array('type' => 'varchar', 'precision' => 255, 'nullable' => True));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.004';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -879,7 +879,7 @@ 
 
 function calendar_upgrade0_9_13_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm', 'alarm_enabled', array('type' => 'int', 'precision' => 4, 'nullable' => False, 'default' => '1'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.005';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -889,18 +889,18 @@ 
 function calendar_upgrade0_9_13_005()
 {
 	$calendar_data = Array();
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 	}
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'category', array('type' => 'varchar', 'precision' => 30, 'nullable' => True));
 
 	@reset($calendar_data);
-	while($calendar_data && list($cal_id,$category) = each($calendar_data))
+	while ($calendar_data && list($cal_id, $category) = each($calendar_data))
 	{
-		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id, __LINE__, __FILE__);
 	}
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.006';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -909,7 +909,7 @@ 
 
 function calendar_upgrade0_9_13_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats', 'recur_exception', array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.007';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -919,20 +919,20 @@ 
 
 function calendar_upgrade0_9_13_007()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -949,7 +949,7 @@ 
 function calendar_upgrade0_9_16_001()
 {
 	// this is to set the default as schema_proc was not setting an empty default
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
@@ -966,15 +966,15 @@ 
 
 function calendar_upgrade0_9_16_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array(),
 		'fk' => array(),
@@ -990,14 +990,14 @@ 
 
 function calendar_upgrade0_9_16_003()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_login' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u')
 		),
-		'pk' => array('cal_id','cal_login','cal_type'),
+		'pk' => array('cal_id', 'cal_login', 'cal_type'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1011,16 +1011,16 @@ 
 
 function calendar_upgrade0_9_16_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays', array(
 		'fd' => array(
-			'hol_id' => array('type' => 'auto','nullable' => False),
-			'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'hol_id' => array('type' => 'auto', 'nullable' => False),
+			'locale' => array('type' => 'char', 'precision' => '2', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'mday' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'month_num' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'occurence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'dow' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'observance_rule' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('hol_id'),
 		'fk' => array(),
@@ -1038,13 +1038,13 @@ 
 {
 	// creates uid's for all entries which do not have unique ones, they are '-@domain.com'
 	// very old entries even have an empty uid, see 0.9.16.006 update
-	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'", __LINE__, __FILE__);
 	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
 	}
 	$GLOBALS['egw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
-		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'),'cal_id',
+		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'), 'cal_id',
 			$GLOBALS['egw_setup']->db->quote('-'.$config['install_id'].'@'.
 			($config['mail_suffix'] ? $config['mail_suffix'] : 'local'))).
 		" WHERE uid LIKE '-@%' OR uid=''");
@@ -1067,7 +1067,7 @@ 
 function calendar_upgrade0_9_16_007()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays', 'hol_id');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1077,19 +1077,19 @@ 
 
 function calendar_upgrade1_0_0()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'uid', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'owner', 'cal_owner');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'category', 'cal_category');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'groups', 'cal_groups');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'datetime', 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'mdatetime', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'edatetime', 'cal_endtime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'priority', 'cal_priority');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'is_public', 'cal_public');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'title', 'cal_title');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'description', 'cal_description');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'location', 'cal_location');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'reference', 'cal_reference');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1099,13 +1099,13 @@ 
 
 function calendar_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'locale', 'hol_locale');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'name', 'hol_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'mday', 'hol_mday');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'month_num', 'hol_month_num');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'occurence', 'hol_occurence');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'dow', 'hol_dow');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'observance_rule', 'hol_observance_rule');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1115,8 +1115,8 @@ 
 
 function calendar_upgrade1_0_0_002()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_login', 'cal_user_id');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_type', 'cal_user_type');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1126,7 +1126,7 @@ 
 
 function calendar_upgrade1_0_0_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -1141,15 +1141,15 @@ 
 
 function calendar_upgrade1_0_0_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -1166,19 +1166,19 @@ 
 function calendar_upgrade1_0_0_005()
 {
 	// change prefix of all calendar tables to egw_
-	foreach(array('cal_user','cal_repeats','cal_extra','cal_holidays','cal') as $name)
+	foreach (array('cal_user', 'cal_repeats', 'cal_extra', 'cal_holidays', 'cal') as $name)
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$name);
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name, 'egw_'.$name);
 	}
 
 	// create new dates table, with content from the egw_cal table
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_end' => array('type' => 'int', 'precision' => '8', 'nullable' => False)
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1186,49 +1186,49 @@ 
 	$GLOBALS['egw_setup']->oProc->query("INSERT INTO egw_cal_dates SELECT cal_id,cal_starttime,cal_endtime FROM egw_cal");
 
 	// drop the fields transfered to the dates table
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_endtime' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_endtime' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_starttime');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_endtime');
+	), 'cal_endtime');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1244,15 +1244,15 @@ 
 		'precision' => '8',
 		'default' => '0'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
-			'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
-			'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_recur_date' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'cal_user_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u'),
+			'cal_user_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A')
 		),
-		'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+		'pk' => array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1266,50 +1266,50 @@ 
 
 function calendar_upgrade1_0_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_type');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_owner',array(
+	), 'cal_type');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_owner', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_priority',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '2'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_public',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_public', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_reference',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_reference', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_modifier', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -1322,36 +1322,36 @@ 
 
 function calendar_upgrade1_0_1_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_use_end');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','cal_id',array(
+	), 'recur_use_end');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_type', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_interval',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_interval', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_data', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
@@ -1365,13 +1365,13 @@ 
 
 function calendar_upgrade1_0_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -1386,7 +1386,7 @@ 
 
 function calendar_upgrade1_0_1_005()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1'
@@ -1400,7 +1400,7 @@ 
 
 function calendar_upgrade1_0_1_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_non_blocking', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1414,9 +1414,9 @@ 
 
 function calendar_upgrade1_0_1_007()
 {
-	$GLOBALS['egw_setup']->db->update('egw_cal_repeats',array('recur_exception' => null),array('recur_exception' => ''),__LINE__,__FILE__,'calendar');
+	$GLOBALS['egw_setup']->db->update('egw_cal_repeats', array('recur_exception' => null), array('recur_exception' => ''), __LINE__, __FILE__, 'calendar');
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_exception', array(
 		'type' => 'text'
 	));
 
@@ -1433,11 +1433,11 @@ 
 	{
 		$customfields = array();
 		$order = 0;
-		foreach($config_data['fields'] as $name => $data)
+		foreach ($config_data['fields'] as $name => $data)
 		{
 			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
 			{
-				$customfields[substr($name,1)] = array(
+				$customfields[substr($name, 1)] = array(
 					'type'  => 'text',
 					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
 					'label' => $data['name'],
@@ -1460,38 +1460,38 @@ 
 function calendar_upgrade1_0_1_009()
 {
 	$db2 = clone($GLOBALS['egw_setup']->db);
-	$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
-		False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
-	while(($row = $GLOBALS['egw_setup']->db->row(true)))
+	$GLOBALS['egw_setup']->db->select('egw_cal', 'DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date', "cal_groups != ''", __LINE__, __FILE__,
+		False, '', 'calendar', 0, ',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
+	while (($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
 		$row['cal_user_type'] = 'u';
-		foreach(explode(',',$row['cal_groups']) as $group)
+		foreach (explode(',', $row['cal_groups']) as $group)
 		{
 			$row['cal_user_id'] = $group;
-			$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+			$db2->insert('egw_cal_user', array('cal_status' => 'U'), $row, __LINE__, __FILE__, 'calendar');
 		}
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_groups');
+	), 'cal_groups');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
 }
@@ -1501,7 +1501,7 @@ 
 function calendar_upgrade1_2()
 {
 	// get old alarms (saved before 1.2) working again
-	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
 }
@@ -1509,7 +1509,7 @@ 
 
 function calendar_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_special', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1527,7 +1527,7 @@ 
 
 function calendar_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -1539,59 +1539,59 @@ 
 
 function calendar_upgrade1_5()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4'),
-			'cal_edit_time' => array('type' => 'int','precision' => '8')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4'),
+			'cal_edit_time' => array('type' => 'int', 'precision' => '8')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_user');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_edit_user');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_time');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
+	), 'cal_edit_time');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL', __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
 }
@@ -1599,12 +1599,12 @@ 
 
 function calendar_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False
@@ -1618,12 +1618,12 @@ 
 {
 	// update the alarm methods
 	$async = new Api\Asyncservice();
-	foreach((array)$async->read('cal:%') as $job)
+	foreach ((array)$async->read('cal:%') as $job)
 	{
 		if ($job['method'] == 'calendar.bocalupdate.send_alarm')
 		{
 			$job['method'] = 'calendar.calendar_boupdate.send_alarm';
-			$async->write($job,true);
+			$async->write($job, true);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
@@ -1640,48 +1640,48 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
 	// Search series exception for nearest exception in series master and add that RECURRENCE-ID
 	// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001)
 	$diff = null;
-	foreach($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
 		JOIN egw_cal_dates ON egw_cal.cal_id=egw_cal_dates.cal_id
 		JOIN egw_cal_repeats ON cal_reference=egw_cal_repeats.cal_id
-		WHERE cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		$recurrence = null;
-		foreach(explode(',',$row['recur_exception']) as $ts)
+		foreach (explode(',', $row['recur_exception']) as $ts)
 		{
-			if (is_null($recurrence) || abs($ts-$row['cal_start']) < $diff)
+			if (is_null($recurrence) || abs($ts - $row['cal_start']) < $diff)
 			{
 				$recurrence = $ts;
-				$diff = abs($ts-$row['cal_start']);
+				$diff = abs($ts - $row['cal_start']);
 			}
 		}
 		if ($recurrence)
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$recurrence.
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 		else
 		{
 			// if we cannot determine the RECURRENCE-ID use cal_start
 			// because RECURRENCE-ID must be present
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$row['cal_start'].
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
@@ -1696,33 +1696,33 @@ 
  */
 function calendar_upgrade1_6_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'creating user'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'comment' => 'creating user'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'creation time of event'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'creation time of event'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_recurrence',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_recurrence', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -1733,14 +1733,14 @@ 
 	// move RECURRENCE-ID from temporarily (1.6.003)
 	// used field cal_reference to new field cal_recurrence
 	// and restore cal_reference field of series exceptions with id of the series master
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id AS cal_id_ex,cal_master.cal_id AS cal_id_master,
 		cal_ex.cal_reference AS cal_reference_ex,cal_ex.cal_uid AS cal_uid_ex,
 		cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master
 		ON cal_ex.cal_uid=cal_master.cal_uid AND cal_master.cal_reference = 0 AND cal_ex.cal_owner = cal_master.cal_owner
-		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_recurrence='.(int)$row['cal_reference_ex'].
 			', cal_reference='.(int)$row['cal_id_master'].
@@ -1757,7 +1757,7 @@ 
  */
 function calendar_upgrade1_7_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT'
@@ -1773,14 +1773,14 @@ 
  */
 function calendar_upgrade1_7_002()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones', array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'varchar','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' => 'text','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'varchar', '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' => 'text', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),
@@ -1800,38 +1800,38 @@ 
  */
 function calendar_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u',
 		'comment' => 'u=user, g=group, c=contact, r=resource, e=email'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'id or email-address for type=e'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_status', array(
 		'type' => 'char',
 		'precision' => '1',
 		'default' => 'A',
 		'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1',
 		'comment' => 'only for certain types (eg. resources)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT',
 		'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_modified', array(
 		'type' => 'timestamp',
 		'default' => 'current_timestamp',
 		'comment' => 'automatic timestamp of last update'
@@ -1847,19 +1847,19 @@ 
  */
 function calendar_upgrade1_7_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'starttime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_end',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'endtime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','tz_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'tz_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'key into egw_cal_timezones'
@@ -1868,7 +1868,7 @@ 
 	// set id of server timezone for existing events, as that's the timezone their recurrences are using
 	if (($tzid = date_default_timezone_get()) && ($tz_id = calendar_timezones::tz2id($tzid)))
 	{
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id, __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.005';
 }
@@ -1895,22 +1895,22 @@ 
  */
 function calendar_upgrade1_7_006()
 {
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE (cal_end-cal_start)%86400=86340',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE (cal_end-cal_start)%86400=86340',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end+59
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end-1
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
     $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
-			WHERE recur_interval=0',__LINE__,__FILE__);
+			WHERE recur_interval=0',__LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';
 }
@@ -1926,17 +1926,17 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008';
@@ -1949,7 +1949,7 @@ 
  */
 function calendar_upgrade1_7_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user',array('cal_user_type','cal_user_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', array('cal_user_type', 'cal_user_id'));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.009';
 }
@@ -1961,22 +1961,22 @@ 
  */
 function calendar_upgrade1_7_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_uid');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_owner');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_owner');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.010';
 }
 
 function calendar_upgrade1_7_010()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_deleted', array(
 		'type' => 'bool',
 		'nullable' => False,
 		'default' => '0',
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001'; // was 1.7.011
 }
 
 function calendar_upgrade1_7_011()
@@ -2006,36 +2006,36 @@ 
 		'precision' => '8',
 		'comment' => 'ts when event was deleted'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
-			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'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,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'category id'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'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, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','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','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','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')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', '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', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', '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')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_deleted'),
 		'uc' => array()
-	),array(
+	), array(
 		// for deleted rows use cal_modified as deleted date, NULL for not deleted ones
-		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN cal_modified ELSE NULL END',
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true, 'bool').' THEN cal_modified ELSE NULL END',
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
@@ -2047,16 +2047,16 @@ 
  */
 function calendar_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
-	$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_cal SET caldav_name='.
+	$GLOBALS['egw_setup']->db->query($sql = 'UPDATE egw_cal SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('cal_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('cal_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'caldav_name');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.003';
 }
@@ -2067,8 +2067,8 @@ 
  */
 function calendar_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_modified');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user','cal_user_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', 'cal_user_modified');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.004';
 }
@@ -2080,7 +2080,7 @@ 
  */
 function calendar_upgrade1_9_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates', 'recur_exception', array(
 		'type' => 'bool',
 		'default' => '',
 		'null' => false,
@@ -2088,16 +2088,16 @@ 
 	));
 
 	// migrate existing exceptions to egw_cal_dates
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
 		'egw_cal_repeats.cal_id AS cal_id,egw_cal_repeats.recur_exception AS recur_exception,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 		'egw_cal_repeats.recur_exception IS NOT NULL', __LINE__, __FILE__, false,
 		'GROUP BY egw_cal_repeats.cal_id,egw_cal_repeats.recur_exception', 'calendar', '',
 		'JOIN egw_cal_dates ON egw_cal_repeats.cal_id=egw_cal_dates.cal_id') as $row)
 	{
-		foreach($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
+		foreach ($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
 		{
 			$GLOBALS['egw_setup']->db->insert('egw_cal_dates', array(
-				'cal_end' => $recur_exception+$row['cal_end']-$row['cal_start'],
+				'cal_end' => $recur_exception + $row['cal_end'] - $row['cal_start'],
 				'recur_exception' => true,
 			), array(
 				'cal_id' => $row['cal_id'],
@@ -2109,11 +2109,11 @@ 
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('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_enddate' => array('type' => 'int','precision' => '8'),
-			'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_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -2134,19 +2134,19 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_description', array(
 			'type' => 'varchar',
 			'precision' => '16384'
 		));
 	}
 	// allow more categories
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
 	// remove silly default of 1
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False
@@ -2161,14 +2161,14 @@ 
 {
 	// PostgreSQL needs temporary a nullable column, to not stall on broken events without dates!
 	// We add that constrain in 1.9.007, after deleting all rows with range_start=0 OR range_start IS NULL
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'startdate (of range)'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'enddate (of range, UNTIL of RRULE)'
@@ -2184,18 +2184,18 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('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(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_enddate');
+	), 'recur_enddate');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.007';
 }
@@ -2207,14 +2207,14 @@ 
  */
 function calendar_upgrade1_9_007()
 {
-	foreach(array('egw_cal_repeats','egw_cal_dates','egw_cal_user','egw_cal_extra') as $table)
+	foreach (array('egw_cal_repeats', 'egw_cal_dates', 'egw_cal_user', 'egw_cal_extra') as $table)
 	{
 		$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0 OR range_start IS NULL)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL", __LINE__, __FILE__);
 
 	// now we can remove temporary default of 0 from range_start and set it NOT NULL
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -2279,7 +2279,7 @@ 
 
 function calendar_upgrade1_9_010()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2309,7 +2309,7 @@ 
 SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT DISTINCT master.cal_id,egw_cal_user.cal_user_type,egw_cal_user.cal_user_id,'E' AS cal_status
 FROM egw_cal_user
 JOIN egw_cal ON egw_cal_user.cal_id=egw_cal.cal_id
@@ -2336,7 +2336,7 @@ 
  */
 function calendar_upgrade14_1_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
 FROM egw_cal
 JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
@@ -2364,7 +2364,7 @@ 
 		$enddate->modify(($event['end'] - $event['start']).' second');
 		if (($range_end = $enddate->format('server')) != $event['range_end'])
 		{
-			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+			$GLOBALS['egw_setup']->db->update('egw_cal', array(
 				'range_end' => $range_end,
 				'cal_etag=cal_etag+1',
 				'cal_modified' => time(),
@@ -2374,7 +2374,7 @@ 
 			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
 		}
 	}
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002';	// skip 14.2.001 update, as query is fixed now
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002'; // skip 14.2.001 update, as query is fixed now
 }
 
 /**
@@ -2398,7 +2398,7 @@ 
 	// if maximum is bigger then 3
 	if ($values[1] > 3)
 	{
-		switch($GLOBALS['egw_setup']->db->Type)
+		switch ($GLOBALS['egw_setup']->db->Type)
 		{
 			case 'mysql':
 				$sql = "UPDATE egw_cal
@@ -2443,7 +2443,7 @@ 
 
 function calendar_upgrade14_2_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -2455,13 +2455,13 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query("UPDATE egw_cal SET cal_category='' WHERE cal_category NOT REGEXP '^[0-9,]*$'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'ascii',
 		'meta' => 'category',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2518,22 +2518,22 @@ 
 		'type' => 'auto',
 		'nullable' => False
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('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' => 'varchar','meta' => array("cal_user_type='u'" => 'account'),'precision' => '128','nullable' => False,'comment' => 'id or 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_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' => 'varchar', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '128', 'nullable' => False, 'comment' => 'id or 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)
 		),
 		'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'))
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.005';
@@ -2542,12 +2542,12 @@ 
 
 function calendar_upgrade14_2_005()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_tzid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_tzid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_component',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_component', array(
 		'type' => 'ascii',
 		'precision' => '8192',
 		'comment' => 'iCal VTIMEZONE component'
@@ -2563,7 +2563,7 @@ 
  */
 function calendar_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_attendee',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_attendee', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'email or json object with attr. cn, url, ...'
@@ -2574,12 +2574,12 @@ 
 
 	// delete all but one row, which would give a doublicate key, after above normalising of email addresses
 	// by ordering by status we prever accepted over tentative over unknow over deleted
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
 		'cal_user_type' => 'e',
 	), __LINE__, __FILE__, false, "GROUP BY cal_id,cal_recur_date,$email HAVING COUNT(*)>1", 'calendar') as $row)
 	{
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
+		foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
 			'cal_id' => $row['cal_id'],
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
@@ -2588,7 +2588,7 @@ 
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user',
-				array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))),
+				array_intersect_key($user, array_flip(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id', 'cal_status'))),
 				__LINE__, __FILE__, 'calendar');
 		}
 	}
@@ -2598,7 +2598,7 @@ 
 		"UPDATE egw_cal_user SET cal_user_attendee=cal_user_id,cal_user_id=MD5($email) WHERE cal_user_type='e'",
 		__LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'ascii',
 		'meta' => array(
 			"cal_user_type='u'" => 'account'
@@ -2620,7 +2620,7 @@ 
 {
 	$GLOBALS['calendar_upgrade14_3_001-run'] = true;
 
-	foreach($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
+	foreach ($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
 FROM egw_cal_user
 JOIN egw_cal_user euser ON euser.cal_id=egw_cal_user.cal_id AND euser.cal_user_type='e' AND euser.cal_user_id=egw_cal_user.cal_user_id AND euser.cal_user_attendee IS NULL
 WHERE egw_cal_user.cal_user_type='e' AND egw_cal_user.cal_user_attendee IS NOT NULL
@@ -2671,8 +2671,8 @@ 
 {
 	Api\Preferences::change_preference('calendar', '/^favorite_/', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		if($old_value['state'] && is_array($old_value['state']))
+		unset($attr, $owner); // not used, but required by function signature
+		if ($old_value['state'] && is_array($old_value['state']))
 		{
 			unset($old_value['state']['date']);
 			unset($old_value['state']['startdate']);
@@ -2692,15 +2692,15 @@ 
 {
 	Api\Preferences::change_preference('calendar', 'use_time_grid', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		switch($old_value)
+		unset($attr, $owner); // not used, but required by function signature
+		switch ($old_value)
 		{
 			case 'all':
 				return 0;
 			case 'day_week':
-				return ['day','day4','week'];
+				return ['day', 'day4', 'week'];
 			case 'day4':
-				return ['day','day4'];
+				return ['day', 'day4'];
 		}
 		return null;
 	});
@@ -2725,7 +2725,7 @@ 
 function calendar_upgrade16_1_001()
 {
 	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value',
-		array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => ''));
+		array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False, 'default' => ''));
 
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'forced');
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'default');
@@ -2737,8 +2737,8 @@ 
 {
 	// Explicitly add months as showing list of events, no times
 	$change = function($attr, $old_value, $owner) {
-		if($owner == Api\Preferences::FORCED_ID) return;
-		if(is_array($old_value) && !in_array('month', $old_value))
+		if ($owner == Api\Preferences::FORCED_ID) return;
+		if (is_array($old_value) && !in_array('month', $old_value))
 		{
 			$old_value[] = 'month';
 		}

Braces +18 added lines, -5 removed lines

@@ -1429,13 +1429,18 @@ 
 function calendar_upgrade1_0_1_008()
 {
 	$config_data = Api\Config::read('calendar');
-	if (isset($config_data['fields']))	// old custom fields
+	if (isset($config_data['fields']))
+	{
+		// old custom fields
 	{
 		$customfields = array();
+	}
 		$order = 0;
 		foreach($config_data['fields'] as $name => $data)
 		{
-			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+			if ($name{0} == '#' && !$data['disabled'])
+			{
+				// real not-disabled custom field
 			{
 				$customfields[substr($name,1)] = array(
 					'type'  => 'text',
@@ -1444,6 +1449,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2584,9 +2590,12 @@ 
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
 			$email.'='.$GLOBALS['egw_setup']->db->quote($row['email']),
-		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
+		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)
+		{
+			// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
+		}
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user',
 				array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))),
 				__LINE__, __FILE__, 'calendar');
@@ -2736,8 +2745,12 @@ 
 function calendar_upgrade16_1_002()
 {
 	// Explicitly add months as showing list of events, no times
-	$change = function($attr, $old_value, $owner) {
-		if($owner == Api\Preferences::FORCED_ID) return;
+	$change = function($attr, $old_value, $owner)
+	{
+		if($owner == Api\Preferences::FORCED_ID)
+		{
+			return;
+		}
 		if(is_array($old_value) && !in_array('month', $old_value))
 		{
 			$old_value[] = 'month';

doc/fix_api.php

Doc Comments +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
  *
  * @param string $file filename
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
- * @return boolean false on error
+ * @return boolean|null false on error
  */
 function fix_api($file, $dry_run=false)
 {

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 
 // raw replacements
 $add_use_api = array(
-	"#use EGroupware\\\\Api;\n#" => '',	// remove evtl. use EGroupware\Api, as we add it again below
+	"#use EGroupware\\\\Api;\n#" => '', // remove evtl. use EGroupware\Api, as we add it again below
 	"#<\?php\n+\s*/\*+?(.*)\*/#msU" => "<?php\n/**$1*/\n\nuse EGroupware\\Api;",
 );
 $replace = array(
@@ -46,7 +46,7 @@ 
 // enclose class-names and static methods with some syntax check
 $class_start = '#(?<!function)([\[\s,;().!=])';
 $class_end = '(::|\\(|\\)|;|\?|:|\\s|,|$)#';
-foreach(array(
+foreach (array(
 	'accounts' => 'Api\\Accounts',
 	'acl' => 'Api\\Acl',
 	'EGW_ACL_READ' => 'Api\\Acl::READ',
@@ -189,10 +189,10 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api($file, $dry_run=false)
+function fix_api($file, $dry_run = false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = $content_in = file_get_contents($file)) === false) return false;
 
@@ -203,12 +203,12 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in) return true; // nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
 	// shorten some classes, if used, with further use declarations
-	foreach(array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
+	foreach (array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
 	{
 		if (strpos($content, $namespace) !== false && strpos($content, 'use EGroupware\\'.$namespace) === false)
 		{
@@ -247,11 +247,11 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api_recursive($dir, $dry_run=false)
+function fix_api_recursive($dir, $dry_run = false)
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -259,13 +259,13 @@ 
 		{
 			fix_api_recursive($dir.'/'.$file, $dry_run);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
 			fix_api($dir.'/'.$file, $dry_run);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -274,7 +274,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
@@ -288,9 +288,9 @@ 
 if (!$args) usage();
 
 $dry_run = false;
-while(($arg = array_shift($args)) && $arg[0] == '-')
+while (($arg = array_shift($args)) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -323,4 +323,4 @@ 
 		fix_api_recursive($arg, $dry_run);
 	}
 }
-while(($arg = array_shift($args)));
+while (($arg = array_shift($args)));

Braces +42 added lines, -10 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>fix_api.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 // raw replacements
 $add_use_api = array(
@@ -192,9 +195,16 @@ 
 function fix_api($file, $dry_run=false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
-	if (($content = $content_in = file_get_contents($file)) === false) return false;
+	if (($content = $content_in = file_get_contents($file)) === false)
+	{
+		return false;
+	}
 
 	if (!preg_match("|<\?php\n+\s*/\*\*?.*\*/|msU", $content))
 	{
@@ -203,7 +213,11 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in)
+	{
+		return true;
+	}
+	// nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
@@ -249,11 +263,17 @@ 
  */
 function fix_api_recursive($dir, $dry_run=false)
 {
-	if (!is_dir($dir)) return false;
+	if (!is_dir($dir))
+	{
+		return false;
+	}
 
 	foreach(scandir($dir) as $file)
 	{
-		if ($file == '.' || $file == '..') continue;
+		if ($file == '.' || $file == '..')
+		{
+			continue;
+		}
 
 		if (is_dir($dir.'/'.$file))
 		{
@@ -278,14 +298,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
-	if ($error) echo $error."\n\n";
+	if ($error)
+	{
+		echo $error."\n\n";
+	}
 	exit($error ? 1 : 0);
 }
 
 $args = $_SERVER['argv'];
 $prog = basename(array_shift($args));
 
-if (!$args) usage();
+if (!$args)
+{
+	usage();
+}
 
 $dry_run = false;
 while(($arg = array_shift($args)) && $arg[0] == '-')
@@ -303,16 +329,22 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
 do {
-	if (!file_exists($arg)) usage("Error: $arg not found!");
+	if (!file_exists($arg))
+	{
+		usage("Error: $arg not found!");
+	}
 
 	if (!is_dir($arg))
 	{

doc/fix_depricated.php

Doc Comments +2 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
  * Fix depricated stuff in a given file
  *
  * @param string $file filename
- * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
+ * @param boolean $replace_file replace existing file if modifications are necessary, otherwise .php53 file is created
  * @return boolean false on error
  */
 function fix_depricated($file,$replace_file=false)
@@ -146,7 +146,7 @@ 
  * Loop recursive through directory and call fix_depricated for each php file
  *
  * @param string $dir
- * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
+ * @param boolean $replace_file replace existing file if modifications are necessary, otherwise .php53 file is created
  * @return boolean false on error
  */
 function fix_depricated_recursive($dir,$replace_file=false)
@@ -174,7 +174,6 @@ 
 /**
  * Give usage
  *
- * @param string $error=null
  */
 function usage($error=null)
 {

Spacing +46 added lines, -46 removed lines

@@ -26,47 +26,47 @@ 
  * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
  * @return boolean false on error
  */
-function fix_depricated($file,$replace_file=false)
+function fix_depricated($file, $replace_file = false)
 {
 	$orig = $lines = file_get_contents($file);
 	if ($lines === false) return false;
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	// PHP Deprecated:  Assigning the return value of new by reference is deprecated
-	if (preg_match('/= *& *new /m',$lines))
+	if (preg_match('/= *& *new /m', $lines))
 	{
-		$lines = preg_replace('/= *& *new /','= new ',$lines);
+		$lines = preg_replace('/= *& *new /', '= new ', $lines);
 	}
 	// PHP Deprecated:  Function split() is deprecated
-	if (preg_match_all('/[= \t(]+spliti? *\\(("[^"]*"|\'[^\']*\'),/m',$lines,$matches))
+	if (preg_match_all('/[= \t(]+spliti? *\\(("[^"]*"|\'[^\']*\'),/m', $lines, $matches))
 	{
 		$replace = array();
 		//print_r($matches);
-		foreach($matches[1] as $key => $pattern)
+		foreach ($matches[1] as $key => $pattern)
 		{
 			$full_pattern = $matches[0][$key];
 			// single char --> just explode
-			if (strlen($pattern) == 3 || strlen($pattern) == 4 && substr($pattern,0,2) == '"\\')
+			if (strlen($pattern) == 3 || strlen($pattern) == 4 && substr($pattern, 0, 2) == '"\\')
 			{
-				$replace[$full_pattern] = str_replace('split','explode',$full_pattern);
+				$replace[$full_pattern] = str_replace('split', 'explode', $full_pattern);
 			}
 			else
 			{
-				$preg_pattern = $pattern[0].'/'.str_replace('/','\\\\/',substr($pattern,1,-1)).'/'.$pattern[0];
-				if (strpos($full_pattern,'spliti')) $preg_pattern = substr($preg_pattern,0,-1).'i'.$pattern[0];
-				$replace[$full_pattern] = str_replace(array('spliti','split',$pattern),array('preg_split','preg_split',$preg_pattern),$full_pattern);
+				$preg_pattern = $pattern[0].'/'.str_replace('/', '\\\\/', substr($pattern, 1, -1)).'/'.$pattern[0];
+				if (strpos($full_pattern, 'spliti')) $preg_pattern = substr($preg_pattern, 0, -1).'i'.$pattern[0];
+				$replace[$full_pattern] = str_replace(array('spliti', 'split', $pattern), array('preg_split', 'preg_split', $preg_pattern), $full_pattern);
 			}
 		}
 		//print_r($replace);
-		$lines = strtr($lines,$replace);
+		$lines = strtr($lines, $replace);
 	}
 	// PHP Deprecated:  Function ereg() is deprecated
-	if (preg_match_all('/!?eregi? *\\(("[^"]+"[^,]*|\'[^\']+\'[^,]*), *(\$[A-Za-z0-9_\[\]\$\'\"]+)(, *\$[A-Za-z0-9_\[\]\$\'\"]+)?\)([ )&|]+)/m',$lines,$matches))
+	if (preg_match_all('/!?eregi? *\\(("[^"]+"[^,]*|\'[^\']+\'[^,]*), *(\$[A-Za-z0-9_\[\]\$\'\"]+)(, *\$[A-Za-z0-9_\[\]\$\'\"]+)?\)([ )&|]+)/m', $lines, $matches))
 	{
 		$replace = array();
 		//print_r($matches);
-		foreach($matches[1] as $key => $pattern)
+		foreach ($matches[1] as $key => $pattern)
 		{
 			$full_pattern = $matches[0][$key];
 			$what = $matches[2][$key];
@@ -75,25 +75,25 @@ 
 			if (preg_quote($pattern) == $pattern)
 			{
 
-				$replace[$full_pattern] = (strpos($full_pattern,'eregi')!==false?'strposi':'strpos').'('.$what.','.$pattern.
-					') '.($full_pattern[0]=='!'?'===':'!==').' false'.$matches[4][$key];
+				$replace[$full_pattern] = (strpos($full_pattern, 'eregi') !== false ? 'strposi' : 'strpos').'('.$what.','.$pattern.
+					') '.($full_pattern[0] == '!' ? '===' : '!==').' false'.$matches[4][$key];
 			}
 			else
 			{
 				// full ereg regular expression --> preg_match
-				$preg_pattern = "'/'.".str_replace('/','\\\\/',$pattern).(strpos($full_pattern,'eregi') !== false ? ".'/i'" : ".'/'");
-				$replace[$full_pattern] = str_replace(array('eregi','ereg',$pattern),array('preg_match','preg_match',$preg_pattern),$full_pattern);
+				$preg_pattern = "'/'.".str_replace('/', '\\\\/', $pattern).(strpos($full_pattern, 'eregi') !== false ? ".'/i'" : ".'/'");
+				$replace[$full_pattern] = str_replace(array('eregi', 'ereg', $pattern), array('preg_match', 'preg_match', $preg_pattern), $full_pattern);
 			}
 		}
 		//print_r($replace);
-		$lines = strtr($lines,$replace);
+		$lines = strtr($lines, $replace);
 	}
 	// PHP Deprecated:  Function ereg_replace() is deprecated
-	if (preg_match_all('/eregi?_replace *\\((".+"|\'.+\'|[^,]+), *(.+), *[\'s$].+\)[,; =]/m',$lines,$matches))
+	if (preg_match_all('/eregi?_replace *\\((".+"|\'.+\'|[^,]+), *(.+), *[\'s$].+\)[,; =]/m', $lines, $matches))
 	{
 		$replace = array();
 		//print_r($matches);
-		foreach($matches[1] as $key => $pattern)
+		foreach ($matches[1] as $key => $pattern)
 		{
 			$full_pattern = $matches[0][$key];
 			$other = $matches[2][$key];
@@ -101,41 +101,41 @@ 
 			// simple replace --> use str_replace()
 			if (preg_quote($pattern) == $pattern)
 			{
-				$replace[$full_pattern] = str_replace(array('eregi_replace','ereg_replace'),array('stri_replace','str_replace'),$full_pattern);
+				$replace[$full_pattern] = str_replace(array('eregi_replace', 'ereg_replace'), array('stri_replace', 'str_replace'), $full_pattern);
 			}
 			else
 			{
 				// full ereg regular expression --> preg_replace
-				$preg_pattern = "'/'.".str_replace('/','\\\\/',$pattern).(strpos($full_pattern,'eregi') !== false ? ".'/i'" : ".'/'");
-				$replace[$full_pattern] = str_replace(array('eregi_replace','ereg_replace',$pattern),
-					array('preg_replace','preg_replace',$preg_pattern),$full_pattern);
+				$preg_pattern = "'/'.".str_replace('/', '\\\\/', $pattern).(strpos($full_pattern, 'eregi') !== false ? ".'/i'" : ".'/'");
+				$replace[$full_pattern] = str_replace(array('eregi_replace', 'ereg_replace', $pattern),
+					array('preg_replace', 'preg_replace', $preg_pattern), $full_pattern);
 			}
 		}
 		//print_r($replace);
-		$lines = strtr($lines,$replace);
+		$lines = strtr($lines, $replace);
 	}
 	// remove extra '/' from regular expressions
-	$lines = str_replace(array("'/'.'","'.'/'","'.'/i'"),array("'/","/'","/i'"),$lines);
+	$lines = str_replace(array("'/'.'", "'.'/'", "'.'/i'"), array("'/", "/'", "/i'"), $lines);
 
 	// fix call to not longer existing PDO method $result->fetchSingle()
-	$lines = str_replace('->fetchSingle(','->fetchColumn(',$lines);
+	$lines = str_replace('->fetchSingle(', '->fetchColumn(', $lines);
 
 	// fix calls to deprecated call_user_method(_array)?(method,object[,args])
-	if (preg_match('/call_user_method(_array)?\(/',$lines,$matches))
+	if (preg_match('/call_user_method(_array)?\(/', $lines, $matches))
 	{
-		$lines = preg_replace('/call_user_method\(([^,]+),([^,\)]+)([,)])/','call_user_func(array(\\2,\\1)\\3',$lines);
-		$lines = preg_replace('/call_user_method_array\(([^,]+),([^,\)]+)([,)])/','call_user_func_array(array(\\2,\\1)\\3',$lines);
+		$lines = preg_replace('/call_user_method\(([^,]+),([^,\)]+)([,)])/', 'call_user_func(array(\\2,\\1)\\3', $lines);
+		$lines = preg_replace('/call_user_method_array\(([^,]+),([^,\)]+)([,)])/', 'call_user_func_array(array(\\2,\\1)\\3', $lines);
 	}
 
 	if ($lines != $orig)
 	{
-		file_put_contents($file.'53',$lines);
-		system('/usr/bin/php -l '.$file.'53',$ret);
+		file_put_contents($file.'53', $lines);
+		system('/usr/bin/php -l '.$file.'53', $ret);
 		system('/usr/bin/diff -u '.$file.' '.$file.'53');
 		if (!$ret && $replace_file)
 		{
 			unlink($file);
-			rename($file.'53',$file);
+			rename($file.'53', $file);
 		}
 		return !$ret;
 	}
@@ -149,25 +149,25 @@ 
  * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
  * @return boolean false on error
  */
-function fix_depricated_recursive($dir,$replace_file=false)
+function fix_depricated_recursive($dir, $replace_file = false)
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
 		if (is_dir($dir.'/'.$file))
 		{
-			fix_depricated_recursive($dir.'/'.$file,$replace_file);
+			fix_depricated_recursive($dir.'/'.$file, $replace_file);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
-			fix_depricated($dir.'/'.$file,$replace_file);
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
+			fix_depricated($dir.'/'.$file, $replace_file);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -176,7 +176,7 @@ 
  *
  * @param string $error=null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [--replace] [-h|--help] file or dir\n\n";
@@ -190,9 +190,9 @@ 
 if (!$args) usage();
 
 $replace_file = false;
-while(($arg = array_shift($args)))
+while (($arg = array_shift($args)))
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -216,9 +216,9 @@ 
 
 if (!is_dir($arg))
 {
-	fix_depricated($arg,$replace_file);
+	fix_depricated($arg, $replace_file);
 }
 else
 {
-	fix_depricated_recursive($arg,$replace_file);
+	fix_depricated_recursive($arg, $replace_file);
 }
\ No newline at end of file

Braces +41 added lines, -10 removed lines

@@ -14,10 +14,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>fix_depricated.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * Fix depricated stuff in a given file
@@ -29,9 +32,16 @@ 
 function fix_depricated($file,$replace_file=false)
 {
 	$orig = $lines = file_get_contents($file);
-	if ($lines === false) return false;
+	if ($lines === false)
+	{
+		return false;
+	}
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
 	// PHP Deprecated:  Assigning the return value of new by reference is deprecated
 	if (preg_match('/= *& *new /m',$lines))
@@ -54,7 +64,10 @@ 
 			else
 			{
 				$preg_pattern = $pattern[0].'/'.str_replace('/','\\\\/',substr($pattern,1,-1)).'/'.$pattern[0];
-				if (strpos($full_pattern,'spliti')) $preg_pattern = substr($preg_pattern,0,-1).'i'.$pattern[0];
+				if (strpos($full_pattern,'spliti'))
+				{
+					$preg_pattern = substr($preg_pattern,0,-1).'i'.$pattern[0];
+				}
 				$replace[$full_pattern] = str_replace(array('spliti','split',$pattern),array('preg_split','preg_split',$preg_pattern),$full_pattern);
 			}
 		}
@@ -151,11 +164,17 @@ 
  */
 function fix_depricated_recursive($dir,$replace_file=false)
 {
-	if (!is_dir($dir)) return false;
+	if (!is_dir($dir))
+	{
+		return false;
+	}
 
 	foreach(scandir($dir) as $file)
 	{
-		if ($file == '.' || $file == '..') continue;
+		if ($file == '.' || $file == '..')
+		{
+			continue;
+		}
 
 		if (is_dir($dir.'/'.$file))
 		{
@@ -180,14 +199,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [--replace] [-h|--help] file or dir\n\n";
-	if ($error) echo $error."\n\n";
+	if ($error)
+	{
+		echo $error."\n\n";
+	}
 	exit($error ? 1 : 0);
 }
 
 $args = $_SERVER['argv'];
 $prog = basename(array_shift($args));
 
-if (!$args) usage();
+if (!$args)
+{
+	usage();
+}
 
 $replace_file = false;
 while(($arg = array_shift($args)))
@@ -204,15 +229,21 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
-if (!file_exists($arg)) usage("Error: $arg not found!");
+if (!file_exists($arg))
+{
+	usage("Error: $arg not found!");
+}
 
 if (!is_dir($arg))
 {

doc/rpm-build/checkout-build-archives.php

Doc Comments +2 added lines, -1 removed lines

@@ -464,6 +464,7 @@ 
  *
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
+ * @return string
  */
 function config_translate($name, $value=null)
 {
@@ -1194,7 +1195,7 @@ 
  * Runs given shell command, exists with error-code after echoing the output of the failed command (if not already running verbose)
  *
  * @param string $cmd
- * @param array& $output=null $output of command, only if !$verbose !!!
+ * @param array& $output $output of command, only if !$verbose !!!
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @return int exit code of $cmd
  */

Braces +236 added lines, -58 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
 
 $verbose = 0;
@@ -137,7 +140,10 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value)
+				{
+					array_unshift($config['run'],$name);
+				}
 				break;
 
 			case 'editchangelog':
@@ -153,7 +159,10 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs',$config['run']))
+				{
+					$config['run'][] = 'obs';
+				}
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -211,7 +220,10 @@ 
 	}
 
 	$cmd = $config['git'].' log '.escapeshellarg($last_tag.'..HEAD');
-	if (getcwd() != $path) $cmd = 'cd '.$path.'; '.$cmd;
+	if (getcwd() != $path)
+	{
+		$cmd = 'cd '.$path.'; '.$cmd;
+	}
 	$output = null;
 	run_cmd($cmd, $output);
 
@@ -242,7 +254,10 @@ 
 {
 	global $config, $verbose;
 
-	if ($verbose) echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	if ($verbose)
+	{
+		echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	}
 
 	if (!is_dir($config['checkoutdir']))
 	{
@@ -273,12 +288,21 @@ 
 		elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches))
 		{
 			$repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[5] : $matches[3];
-			if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			if (substr($matches[1], 0, 3) == 'svn')
+			{
+				$repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			}
 			$modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url;
-			if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url);
+			if ($module === '' && !isset($baseurl))
+			{
+				$baseurl = str_replace('/egroupware.git', '', $url);
+			}
 		}
 	}
-	if ($verbose) print_r($modules);
+	if ($verbose)
+	{
+		print_r($modules);
+	}
 	return $modules;
 }
 
@@ -345,7 +369,11 @@ 
 
 	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -361,7 +389,10 @@ 
 	global $config,$verbose;
 
 	// push local changes to Github incl. tags
-	if ($verbose) echo "Pushing changes and tags\n";
+	if ($verbose)
+	{
+		echo "Pushing changes and tags\n";
+	}
 	chdir($config['checkoutdir']);
 	run_cmd($config['mr']. ' up');		// in case someone else pushed something
 	chdir($config['checkoutdir']);
@@ -429,7 +460,10 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose)
+		{
+			echo "Uploading $path as $content_type\n";
+		}
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -441,7 +475,10 @@ 
 	{
 		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
-		if ($verbose) echo $cmd."\n";
+		if ($verbose)
+		{
+			echo $cmd."\n";
+		}
 		passthru($cmd);
 	}
 }
@@ -474,25 +511,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -503,7 +555,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);
 
@@ -520,13 +575,19 @@ 
 {
 	global $config;
 
-	if (!isset($value)) $value = $config[$name];
+	if (!isset($value))
+	{
+		$value = $config[$name];
+	}
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
 		foreach($config as $n => $val)
 		{
-			if (is_string($val)) $translate['$'.$n] = $val;
+			if (is_string($val))
+			{
+				$translate['$'.$n] = $val;
+			}
 		}
 		$value = strtr($value, $translate);
 	}
@@ -628,7 +689,10 @@ 
 	if (is_null($revision))
 	{
 		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
-		if (empty($branch)) $branch = $config['version'];
+		if (empty($branch))
+		{
+			$branch = $config['version'];
+		}
 		$tags_url .= '/tags';
 		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
@@ -654,11 +718,18 @@ 
 	$message = '';
 	foreach($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix)))
+		{
+			continue;
+		}
+		// no match --> ignore
 
 		$message .= $msg."\n";
 	}
-	if ($verbose) echo $message;
+	if ($verbose)
+	{
+		echo $message;
+	}
 
 	return $message;
 }
@@ -689,7 +760,10 @@ 
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix)
+	{
+		$msg = $prefix.$msg;
+	}
 
 	return $msg;
 }
@@ -726,7 +800,10 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose)
+			{
+				echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			}
 			return (int)$log['revision'];
 		}
 	}
@@ -746,7 +823,10 @@ 
 	{
 		usage("Path '$config[obs]' not found!");
 	}
-	if ($verbose) echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	if ($verbose)
+	{
+		echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	}
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
@@ -766,10 +846,16 @@ 
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
-				if ($verbose) echo "rm $path\n";
+				if ($verbose)
+				{
+					echo "rm $path\n";
+				}
 			}
 			copy($new_name,dirname($path).'/'.basename($new_name));
-			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
+			if ($verbose)
+			{
+				echo "cp $new_name ".dirname($path)."/\n";
+			}
 			++$n;
 		}
 		// if we have no changelog (eg. because commands run separate), try parsing it from changelog file
@@ -807,7 +893,10 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose)
+				{
+					echo "Updated $path\n";
+				}
 				++$n;
 			}
 		}
@@ -845,9 +934,12 @@ 
 			}
 			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while($lines[$n])
+			{
+				// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
+			}
 				++$n;
 			}
 			return substr($logentry, 0, -1);	// remove training "\n"
@@ -868,7 +960,10 @@ 
 
 	list($header) = explode("\n", $content);
 	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	if (substr($config['changelog'],0,2) != '  ')
+	{
+		$config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	}
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -882,10 +977,13 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
 	if (!file_exists($sumsfile))
@@ -896,11 +994,17 @@ 
 	// signing it
 	if (empty($config['gpg']) || !file_exists($config['gpg']))
 	{
-		if (!empty($config['gpg'])) echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		if (!empty($config['gpg']))
+		{
+			echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		}
 		return;
 	}
 	echo "Signing sha1sum file:\n";
-	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
+	if (file_exists($sumsfile.'.asc'))
+	{
+		unlink($sumsfile.'.asc');
+	}
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
 	unlink($sumsfile);	// delete the unsigned file
@@ -913,11 +1017,17 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir']))
+	{
+		mkdir($config['sourcedir'],0755,true);
+	}
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
@@ -955,12 +1065,22 @@ 
 				{
 					foreach((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
-						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
+						if (substr($add, -4) != '.tar')
+						{
+							continue;
+						}
+						// probably a module
+						if (!($tar = realpath($add)))
+						{
+							throw new Exception("File '$add' not found!");
+						}
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
 				}
-				if (file_exists($file.'.bz2')) $cmd .= '; rm -f '.$file.'.bz2';
+				if (file_exists($file.'.bz2'))
+				{
+					$cmd .= '; rm -f '.$file.'.bz2';
+				}
 				$cmd .= '; '.$config['bzip2'].' '.$file;
 				// run cmd now and continue without adding all tar-ball to sums, as we dont want to publish it
 				run_cmd($cmd);
@@ -981,7 +1101,10 @@ 
 
 		foreach($config['extra'] as $name => $modules)
 		{
-			if (is_numeric($name)) $name = $modules;
+			if (is_numeric($name))
+			{
+				$name = $modules;
+			}
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
 			switch($type)
@@ -1022,7 +1145,10 @@ 
 	{
 		echo "Updating virus signatures\n";
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
-		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
+		if (!$verbose && function_exists('posix_getuid') && posix_getuid())
+		{
+			echo $cmd."\n";
+		}
 		$output = null;
 		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
 	}
@@ -1050,7 +1176,10 @@ 
 	}
 
 	// we need to stash uncommited changes like .mrconfig, before copying
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("cd $config[checkoutdir]; git stash");
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("cd $config[checkoutdir]; git stash");
+	}
 
 	try {
 		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude .mrconfig --exclude node_modules/ '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
@@ -1059,8 +1188,14 @@ 
 	catch (Exception $e) {
 		// catch failures to pop stash, before throwing exception
 	}
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("git stash pop");
-	if (isset($e)) throw $e;
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("git stash pop");
+	}
+	if (isset($e))
+	{
+		throw $e;
+	}
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
@@ -1145,9 +1280,12 @@ 
 				if ($ret || substr($line,0,5) == 'URL: ')
 				{
 					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)
+					{
+						// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
+					}
 						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
 						clearstatcache();
 					}
@@ -1194,19 +1332,31 @@ 
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
 	$url = $svnbranch.'/'.$config['svnalias'];
 	$cmd = $svn.' propget svn:externals --strict '.$url;
-	if ($verbose) echo $cmd."\n";
+	if ($verbose)
+	{
+		echo $cmd."\n";
+	}
 	$output = $ret = null;
 	exec($cmd,$output,$ret);
 	$config['modules'] = array();
 	foreach($output as $line)
 	{
 		$line = trim($line);
-		if (empty($line) || $line[0] == '#') continue;
+		if (empty($line) || $line[0] == '#')
+		{
+			continue;
+		}
 		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
@@ -1215,13 +1365,25 @@ 
 		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
 		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module,'://') !== false)
+		{
+			$module = basename($module);
+		}
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
 	}
-	if ($verbose) print_r($config['modules']);
+	if ($verbose)
+	{
+		print_r($config['modules']);
+	}
 	return $config['modules'];
 }
 
@@ -1232,7 +1394,11 @@ 
 {
 	global $config,$svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
 
@@ -1271,11 +1437,17 @@ 
 	{
 		$output[] = $cmd;
 		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		if ($verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 	}
 	if ($ret && !in_array($ret,(array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
+		if (!$verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 		throw new Exception("Error during '$cmd' --> aborting",$ret);
 	}
 	return $ret;
@@ -1321,7 +1493,10 @@ 
 	echo "options and their defaults:\n";
 	if ($verbose)
 	{
-		if (!isset($config['modules'])) $config['modules'] = get_modules_per_repo();
+		if (!isset($config['modules']))
+		{
+			$config['modules'] = get_modules_per_repo();
+		}
 	}
 	else
 	{
@@ -1329,7 +1504,10 @@ 
 	}
 	foreach($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		if (is_array($default))
+		{
+			$default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		}
 		echo '--'.str_pad($name,20).$default."\n";
 	}
 	if ($error)

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

@@ -403,7 +403,7 @@ 
 	}
 
 	$archives = config_translate('upload');
-	echo "Uploading $archives to $config[upload_url]\n";
+	echo "uploading $archives to $config[upload_url]\n";
 
 	foreach(glob($archives, GLOB_BRACE) as $path)
 	{
@@ -429,7 +429,7 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose) echo "uploading $path as $content_type\n";
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -492,7 +492,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -726,7 +726,7 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -807,7 +807,7 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose) echo "updated $path\n";
 				++$n;
 			}
 		}
@@ -942,7 +942,7 @@ 
 	}
 	foreach($config['types'] as $type)
 	{
-		echo "Creating $type archives\n";
+		echo "creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
@@ -1064,7 +1064,7 @@ 
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
-		echo "Running $cmd\n";
+		echo "running $cmd\n";
 		run_cmd($cmd);
 	}
 	// fix permissions

Spacing +179 added lines, -179 removed lines

@@ -14,15 +14,15 @@ 
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
-date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
+date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings
 
 $verbose = 0;
 $config = array(
 	'packagename' => 'egroupware-epl',
-	'version' => '16.1',        // '14.3'
+	'version' => '16.1', // '14.3'
 	'packaging' => date('Ymd'), // '20160520'
-	'branch'  => 'master',        // checked out branch
-	'tag' => '$version.$packaging',	// name of tag
+	'branch'  => 'master', // checked out branch
+	'tag' => '$version.$packaging', // name of tag
 	'checkoutdir' => realpath(__DIR__.'/../..'),
 	'egw_buildroot' => '/tmp/build_root/epl_16.1_buildroot',
 	'sourcedir' => '/home/download/stylite-epl/egroupware-epl-16.1',
@@ -34,11 +34,11 @@ 
 	'svnalias' => 'aliases/default-ssh',    // default alias
 	'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro', '$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'),
 	*/
-	'extra' => array('stylite', 'esyncpro', 'archive',	// create an extra archive for given apps
+	'extra' => array('stylite', 'esyncpro', 'archive', // create an extra archive for given apps
 		// these apps are placed in egroupware-epl-contrib archive
 		'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sambaadmin', 'sitemgr', 'phpfreechat')),
-	'aliasdir' => 'egroupware',             // directory created by the alias
-	'types' => array('tar.bz2','tar.gz','zip','all.tar.bz2'),
+	'aliasdir' => 'egroupware', // directory created by the alias
+	'types' => array('tar.bz2', 'tar.gz', 'zip', 'all.tar.bz2'),
 	// add given extra-apps or (uncompressed!) archives to above all.tar.bz2 archive
 	'all-add' => array('contrib', '/home/stylite/epl-16.1/phpfreechat_data_public.tar'),
 	// diverse binaries we need
@@ -55,12 +55,12 @@ 
 	'gpg' => trim(`which gpg`),
 	'editor' => trim(`which vi`),
 	'rsync' => trim(`which rsync`).' --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"',
-	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs --no-dev' : '',
+	'composer' => ($composer = trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs --no-dev' : '',
 	'after-checkout' => 'rm -rf */source */templates/*/source',
 	'packager' => 'build@egroupware.org',
 	'obs' => '/home/stylite/obs/stylite-epl',
-	'obs_package_alias' => '',	// name used in obs package, if different from packagename
-	'changelog' => false,   // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
+	'obs_package_alias' => '', // name used in obs package, if different from packagename
+	'changelog' => false, // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
 	'changelog_packager' => 'Ralf Becker <rb@stylite.de>',
 	'editchangelog' => '* ',
 	//'sfuser' => 'ralfbecker',
@@ -69,23 +69,23 @@ 
 	'upload' => '$sourcedir/*egroupware-epl{,-contrib}-$version.$packaging*',
 	'copychangelog' => '$sourcedir/README', //'$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README',
 	'skip' => array(),
-	'run' => array('checkout','editchangelog','tag','copy','virusscan','create','sign','obs','copychangelog'),
+	'run' => array('checkout', 'editchangelog', 'tag', 'copy', 'virusscan', 'create', 'sign', 'obs', 'copychangelog'),
 	'patchCmd' => '# run cmd after copy eg. "cd $egw_buildroot; patch -p1 /path/to/patch"',
-	'github_user' => 'ralfbecker',	// Github user for following token
-	'github_token' => '',	// Github repo personal access token from above user
+	'github_user' => 'ralfbecker', // Github user for following token
+	'github_token' => '', // Github repo personal access token from above user
 );
 
 // process config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
 
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		++$verbose;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		if (in_array('editchangelog', $config['skip']) || !in_array('editchangelog', $config['run']))
 		{
@@ -93,10 +93,10 @@ 
 		}
 		usage();
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$value = array_shift($argv);
-		switch($name)
+		switch ($name)
 		{
 			case 'extra':	// stored as array and allow to add/delete items with +/- prefix
 			case 'types':
@@ -119,7 +119,7 @@ 
 				{
 					$value = array_unique(preg_split('/[ ,]+/', $value));
 				}
-				switch($op)
+				switch ($op)
 				{
 					case '+':
 						$config[$name] = array_unique(array_merge($config[$name], $value));
@@ -137,14 +137,14 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value) array_unshift($config['run'], $name);
 				break;
 
 			case 'editchangelog':
 				$config[$name] = $value ? $value : true;
-				if (!in_array('editchangelog',$config['run']))
+				if (!in_array('editchangelog', $config['run']))
 				{
-					array_unshift($config['run'],'editchangelog');
+					array_unshift($config['run'], 'editchangelog');
 				}
 				break;
 
@@ -153,7 +153,7 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs', $config['run'])) $config['run'][] = 'obs';
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -171,16 +171,16 @@ 
 }
 $svn = $config['svn'];
 
-$run = array_diff($config['run'],$config['skip']);
+$run = array_diff($config['run'], $config['skip']);
 
 // if we dont edit the changelog, set packaging from changelog
 if (!in_array('editchangelog', $run))
 {
 	parse_current_changelog(true);
 }
-foreach($run as $func)
+foreach ($run as $func)
 {
-	chdir(dirname(__FILE__));	// make relative filenames work, if other command changes dir
+	chdir(dirname(__FILE__)); // make relative filenames work, if other command changes dir
 	call_user_func('do_'.$func);
 }
 
@@ -195,7 +195,7 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_git($_path, $log_pattern=null, &$last_tag=null, $prefix='* ')
+function get_changelog_from_git($_path, $log_pattern = null, &$last_tag = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
 	global $config;
@@ -216,7 +216,7 @@ 
 	run_cmd($cmd, $output);
 
 	$changelog = '';
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		if (substr($line, 0, 4) == "    " && ($msg = _match_log_pattern(substr($line, 4), $log_pattern, $prefix)))
 		{
@@ -248,13 +248,13 @@ 
 	{
 		throw new Exception("checkout directory '{$config['checkoutdir']} does NOT exists or is NO directory!");
 	}
-	if (!($mrconfig = file_get_contents($path=$config['checkoutdir'].'/.mrconfig')))
+	if (!($mrconfig = file_get_contents($path = $config['checkoutdir'].'/.mrconfig')))
 	{
 		throw new Exception("$path not found!");
 	}
 	$module = $baseurl = null;
 	$modules = array();
-	foreach(explode("\n", $mrconfig) as $line)
+	foreach (explode("\n", $mrconfig) as $line)
 	{
 		$matches = null;
 		if (isset($baseurl))
@@ -319,7 +319,7 @@ 
 		$cmd = $config['git'].' clone '.(!empty($config['branch']) ? ' -b '.$config['branch'] : '').
 			' git@github.com:EGroupware/egroupware.git '.$config['checkoutdir'];
 		run_cmd($cmd);
-		run_cmd('mr up');	// need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
+		run_cmd('mr up'); // need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -343,9 +343,9 @@ 
 	}
 	chdir($config['checkoutdir']);
 
-	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
+	$config['tag'] = config_translate('tag'); // allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag'])) return; // otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -358,16 +358,16 @@ 
  */
 function do_release()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	// push local changes to Github incl. tags
 	if ($verbose) echo "Pushing changes and tags\n";
 	chdir($config['checkoutdir']);
-	run_cmd($config['mr']. ' up');		// in case someone else pushed something
+	run_cmd($config['mr'].' up'); // in case someone else pushed something
 	chdir($config['checkoutdir']);
-	run_cmd($config['git'].' push');	// regular commits like changelog
+	run_cmd($config['git'].' push'); // regular commits like changelog
 	$tag = config_translate('tag');
-	run_cmd($config['mr']. ' push origin '.$tag);	// pushing tags in all apps
+	run_cmd($config['mr'].' push origin '.$tag); // pushing tags in all apps
 
 	if (empty($config['github_user']) || empty($config['github_token']))
 	{
@@ -384,7 +384,7 @@ 
 		'body' => $config['changelog'],
 	);
 	$response = github_api("/repos/EGroupware/egroupware/releases", $data);
-	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']);	// remove {?name,label} template
+	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']); // remove {?name,label} template
 
 	do_upload();
 }
@@ -394,33 +394,33 @@ 
  */
 function do_upload()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (empty($config['upload_url']))
 	{
 		$response = github_api("/repos/EGroupware/egroupware/releases", array(), 'GET');
-		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']);	// remove {?name,label} template
+		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']); // remove {?name,label} template
 	}
 
 	$archives = config_translate('upload');
 	echo "Uploading $archives to $config[upload_url]\n";
 
-	foreach(glob($archives, GLOB_BRACE) as $path)
+	foreach (glob($archives, GLOB_BRACE) as $path)
 	{
 		$label = null;
 		if (substr($path, -4) == '.zip')
 		{
 			$content_type = 'application/zip';
 		}
-		elseif(substr($path, -7) == '.tar.gz')
+		elseif (substr($path, -7) == '.tar.gz')
 		{
 			$content_type = 'application/x-gzip';
 		}
-		elseif(substr($path, -8) == '.tar.bz2')
+		elseif (substr($path, -8) == '.tar.bz2')
 		{
 			$content_type = 'application/x-bzip2';
 		}
-		elseif(substr($path, -8) == '.txt.asc')
+		elseif (substr($path, -8) == '.txt.asc')
 		{
 			$content_type = 'text/plain';
 			$label = 'Signed hashes of downloads';
@@ -439,7 +439,7 @@ 
 
 	if (!empty($config['release']))
 	{
-		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
+		$target = config_translate('release'); // allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
 		if ($verbose) echo $cmd."\n";
 		passthru($cmd);
@@ -457,7 +457,7 @@ 
  * @throws Exception
  * @return array with response
  */
-function github_api($_url, $data, $method='POST', $upload=null, $content_type=null)
+function github_api($_url, $data, $method = 'POST', $upload = null, $content_type = null)
 {
 	global $config, $verbose;
 
@@ -470,7 +470,7 @@ 
 	curl_setopt($c, CURLOPT_TIMEOUT, 240);
 	curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
 
-	switch($method)
+	switch ($method)
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
@@ -478,13 +478,13 @@ 
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
@@ -492,7 +492,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "Sending $method request to $url ".(isset($short_data) && $method != 'GET' ? $short_data : '')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -500,7 +500,7 @@ 
 		curl_setopt($c, CURLOPT_HEADER, true);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, false);
 		curl_exec($c);
-		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
+		throw new Exception("$method request to $url failed ".(isset($short_data) && $method != 'GET' ? $short_data : ''));
 	}
 
 	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
@@ -516,7 +516,7 @@ 
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
  */
-function config_translate($name, $value=null)
+function config_translate($name, $value = null)
 {
 	global $config;
 
@@ -524,7 +524,7 @@ 
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
-		foreach($config as $n => $val)
+		foreach ($config as $n => $val)
 		{
 			if (is_string($val)) $translate['$'.$n] = $val;
 		}
@@ -550,7 +550,7 @@ 
  */
 function do_editchangelog()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Querying changelog from Git/SVN\n";
 	if (!isset($config['modules']))
@@ -560,7 +560,7 @@ 
 	// query changelog per repo
 	$changelog = '';
 	$last_tag = null;
-	foreach($config['modules'] as $branch_url => $modules)
+	foreach ($config['modules'] as $branch_url => $modules)
 	{
 		$revision = null;
 		if (substr($branch_url, -4) == '.git')
@@ -573,15 +573,15 @@ 
 			$changelog .= get_changelog_from_svn($branch_url, $config['editchangelog'], $revision);
 		}
 	}
-	$logfile = tempnam('/tmp','checkout-build-archives');
-	file_put_contents($logfile,$changelog);
+	$logfile = tempnam('/tmp', 'checkout-build-archives');
+	file_put_contents($logfile, $changelog);
 	$cmd = $config['editor'].' '.escapeshellarg($logfile);
 	passthru($cmd);
 	$config['changelog'] = file_get_contents($logfile);
 	// remove trailing newlines
-	while (substr($config['changelog'],-1) == "\n")
+	while (substr($config['changelog'], -1) == "\n")
 	{
-		$config['changelog'] = substr($config['changelog'],0,-1);
+		$config['changelog'] = substr($config['changelog'], 0, -1);
 	}
 	// allow user to abort, by deleting the changelog
 	if (strlen($config['changelog']) <= 2)
@@ -596,7 +596,7 @@ 
 	}
 	file_put_contents($changelog, update_changelog(file_get_contents($changelog)));
 
-	update_api_setup($api_setup=$config['checkoutdir'].'/api/setup/setup.inc.php');
+	update_api_setup($api_setup = $config['checkoutdir'].'/api/setup/setup.inc.php');
 
 	if (file_exists($config['checkoutdir'].'/.git'))
 	{
@@ -609,7 +609,7 @@ 
 	run_cmd($cmd);
 
 	// update obs changelogs (so all changlogs are updated in case of a later error and changelog step can be skiped)
-	do_obs(true);	// true: only update debian.changes in obs checkouts
+	do_obs(true); // true: only update debian.changes in obs checkouts
 }
 
 /**
@@ -623,41 +623,41 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_svn($branch_url, $log_pattern=null, &$revision=null, $prefix='* ')
+function get_changelog_from_svn($branch_url, $log_pattern = null, &$revision = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
-	global $config,$verbose,$svn;
+	global $config, $verbose, $svn;
 
 	if (is_null($revision))
 	{
-		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
+		list($tags_url, $branch) = preg_split('#/(branches/|trunk)#', $branch_url);
 		if (empty($branch)) $branch = $config['version'];
 		$tags_url .= '/tags';
-		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
+		$pattern = '|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
-		$revision = get_last_svn_tag($tags_url,$pattern,$matches);
+		$revision = get_last_svn_tag($tags_url, $pattern, $matches);
 		$tag = $matches[1];
 	}
-	elseif(!is_numeric($revision))
+	elseif (!is_numeric($revision))
 	{
-		$revision = get_last_svn_tag($tags_url,$tag=$revision);
+		$revision = get_last_svn_tag($tags_url, $tag = $revision);
 	}
 	$cmd = $svn.' log --xml -r '.escapeshellarg($revision.':HEAD').' '.escapeshellarg($branch_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for log from r$revision".($tag ? " ($tag)" : '').":\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$message = '';
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue; // no match --> ignore
 
 		$message .= $msg."\n";
 	}
@@ -674,25 +674,25 @@ 
  * @param string $prefix ='* '
  * @return string
  */
-function _match_log_pattern($msg, $log_pattern, $prefix='* ')
+function _match_log_pattern($msg, $log_pattern, $prefix = '* ')
 {
 	$pattern_len = strlen($log_pattern);
 	$prefix_len = strlen($prefix);
 
 	$matches = null;
-	if ($log_pattern[0] == '/' && preg_match($log_pattern,$msg,$matches))
+	if ($log_pattern[0] == '/' && preg_match($log_pattern, $msg, $matches))
 	{
 		$msg = $matches[1];
 	}
-	elseif($log_pattern && $log_pattern[0] != '/' && substr($msg,0,$pattern_len) == $log_pattern)
+	elseif ($log_pattern && $log_pattern[0] != '/' && substr($msg, 0, $pattern_len) == $log_pattern)
 	{
-		list($msg) = explode("\n",$msg);
+		list($msg) = explode("\n", $msg);
 	}
-	elseif($log_pattern)
+	elseif ($log_pattern)
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg, 0, $prefix_len) != $prefix) $msg = $prefix.$msg;
 
 	return $msg;
 }
@@ -706,30 +706,30 @@ 
  * @param array &$matches=null on return matches of preg_match
  * @return int revision of last svn tag matching pattern
  */
-function get_last_svn_tag($tags_url,$pattern,&$matches=null)
+function get_last_svn_tag($tags_url, $pattern, &$matches = null)
 {
-	global $verbose,$svn;
+	global $verbose, $svn;
 
 	$cmd = $svn.' log --xml --limit 40 -v '.escapeshellarg($tags_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for last tags\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$is_regexp = $pattern[0] == substr($pattern, -1);
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
 		//print_r($log);
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "Revision {$log['revision']} matches".($matches ? ': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -741,9 +741,9 @@ 
  *
  * @param boolean $only_update_changelog =false true update debian.changes, but nothing else, nor commit it
  */
-function do_obs($only_update_changelog=false)
+function do_obs($only_update_changelog = false)
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!is_dir($config['obs']))
 	{
@@ -753,25 +753,25 @@ 
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
-	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
+	foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
 	{
 		if (basename(dirname($path)) == '.osc' ||
 			!preg_match('/\/('.preg_quote($config['packagename']).
 				($config['obs_package_alias'] ? '|'.preg_quote($config['obs_package_alias']) : '').
-				')[a-z-]*-('.preg_quote($config['version']).'|trunk)/',$path))
+				')[a-z-]*-('.preg_quote($config['version']).'|trunk)/', $path))
 		{
 			continue;
 		}
 		$matches = null;
-		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/',$path,$matches) &&
-			file_exists($new_name=$config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
+		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/', $path, $matches) &&
+			file_exists($new_name = $config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
 		{
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
 				if ($verbose) echo "rm $path\n";
 			}
-			copy($new_name,dirname($path).'/'.basename($new_name));
+			copy($new_name, dirname($path).'/'.basename($new_name));
 			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
 			++$n;
 		}
@@ -781,35 +781,35 @@ 
 			$config['changelog'] = parse_current_changelog();
 		}
 		// updating dsc, spec and changelog files
-		if (!$only_update_changelog && (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec') ||
+		if (!$only_update_changelog && (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec') ||
 			!empty($config['changelog']) && basename($path) == 'debian.changes')
 		{
 			$content = $content_was = file_get_contents($path);
 
-			if (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec')
+			if (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec')
 			{
-				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m','Version: '.$config['version'].'.'.$config['packaging'],$content);
+				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m', 'Version: '.$config['version'].'.'.$config['packaging'], $content);
 			}
-			if (substr($path,-4) == '.dsc')
+			if (substr($path, -4) == '.dsc')
 			{
 				$content = preg_replace('/^(Debtransform-Tar: '.preg_quote($config['packagename']).'[a-z-]*)-'.
 					preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/m',
-					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2',$content);
+					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2', $content);
 			}
-			if (basename($path) == 'debian.changes' && strpos($content,$config['version'].'.'.$config['packaging']) === false)
+			if (basename($path) == 'debian.changes' && strpos($content, $config['version'].'.'.$config['packaging']) === false)
 			{
 				$content = update_changelog($content);
 			}
-			if (!empty($config['changelog']) && substr($path,-5) == '.spec' &&
-				($pos_changelog = strpos($content,'%changelog')) !== false)
+			if (!empty($config['changelog']) && substr($path, -5) == '.spec' &&
+				($pos_changelog = strpos($content, '%changelog')) !== false)
 			{
 				$pos_changelog += strlen("%changelog\n");
-				$content = substr($content,0,$pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
-					$config['changelog']."\n".substr($content,$pos_changelog);
+				$content = substr($content, 0, $pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
+					$config['changelog']."\n".substr($content, $pos_changelog);
 			}
 			if ($content != $content_was)
 			{
-				file_put_contents($path,$content);
+				file_put_contents($path, $content);
 				if ($verbose) echo "Updated $path\n";
 				++$n;
 			}
@@ -830,33 +830,33 @@ 
  * @param boolean $set_packaging =false true: set packaging from last changelog entry
  * @return string changelog entries without header and footer lines
  */
-function parse_current_changelog($set_packaging=false)
+function parse_current_changelog($set_packaging = false)
 {
 	global $config;
 
 	$changelog = file_get_contents($config['checkoutdir'].'/doc/rpm-build/debian.changes');
 	$lines = explode("\n", $changelog, 100);
 	$matches = null;
-	foreach($lines as $n => $line)
+	foreach ($lines as $n => $line)
 	{
-		if (preg_match($preg='/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
+		if (preg_match($preg = '/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
 			($set_packaging ? '([0-9]+)' : preg_quote($config['packaging'])).'/', $line, $matches))
 		{
 			if ($set_packaging)
 			{
 				$config['packaging'] = $matches[1];
 			}
-			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
+			$n += empty($lines[$n + 1]) ? 2 : 1; // overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while ($lines[$n])	// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
 				++$n;
 			}
-			return substr($logentry, 0, -1);	// remove training "\n"
+			return substr($logentry, 0, -1); // remove training "\n"
 		}
 	}
-	return null;	// paragraph for current version NOT found
+	return null; // paragraph for current version NOT found
 }
 
 /**
@@ -870,8 +870,8 @@ 
 	global $config;
 
 	list($header) = explode("\n", $content);
-	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/', '('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
+	if (substr($config['changelog'], 0, 2) != '  ') $config['changelog'] = '  '.implode("\n  ", explode("\n", $config['changelog']));
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -909,9 +909,9 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
@@ -930,7 +930,7 @@ 
 	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
-	unlink($sumsfile);	// delete the unsigned file
+	unlink($sumsfile); // delete the unsigned file
 }
 
 /**
@@ -940,22 +940,22 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'], 0755, true);
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
 	chdir($config['egw_buildroot']);
 
-	if($config['extra'])
+	if ($config['extra'])
 	{
 		$exclude = $exclude_all = array();
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
-			foreach((array)$modules as $module)
+			foreach ((array)$modules as $module)
 			{
 				$exclude[] = basename($module);
 				if (!empty($config['all-add']) && !in_array($module, $config['all-add']) && (is_int($name) || !in_array($name, $config['all-add'])))
@@ -965,24 +965,24 @@ 
 			}
 		}
 		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude);
-		$exclude_all_extra =  $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
+		$exclude_all_extra = $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
 	}
-	foreach($config['types'] as $type)
+	foreach ($config['types'] as $type)
 	{
 		echo "Creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-		switch($type)
+		switch ($type)
 		{
 			case 'all.tar.bz2':	// single tar-ball for debian builds not easily supporting to use multiple
 				$file = $config['sourcedir'].'/'.$config['packagename'].'-all-'.$config['version'].'.'.$config['packaging'].'.tar';
 				$cmd = $config['tar'].' --owner=root --group=root -cf '.$file.$exclude_all_extra.' egroupware';
 				if (!empty($config['all-add']))
 				{
-					foreach((array)$config['all-add'] as $add)
+					foreach ((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
+						if (substr($add, -4) != '.tar') continue; // probably a module
 						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
@@ -1006,15 +1006,15 @@ 
 		run_cmd($cmd);
 		$sums .= sha1_file($file)."\t".basename($file)."\n";
 
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
 			if (is_numeric($name)) $name = $modules;
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-			switch($type)
+			switch ($type)
 			{
 				case 'all.tar.bz2':
-					break;	// nothing to do
+					break; // nothing to do
 				case 'tar.bz2':
 				case 'tar.gz':
 					$cmd = $config['tar'].' --owner=root --group=root -c'.$tar_type.'f '.$file.$dirs;
@@ -1029,7 +1029,7 @@ 
 		}
 	}
 	// writing sha1sum file
-	file_put_contents($sumsfile,$sums);
+	file_put_contents($sumsfile, $sums);
 }
 
 /**
@@ -1037,7 +1037,7 @@ 
  */
 function do_virusscan()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!file_exists($config['clamscan']) || !is_executable($config['clamscan']))
 	{
@@ -1051,7 +1051,7 @@ 
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
 		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
 		$output = null;
-		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
+		run_cmd($cmd, $output, 1); // 1 = ignore already up to date database
 	}
 	echo "Starting virusscan\n";
 	$cmd = $config['clamscan'].' --quiet -r '.$config['egw_buildroot'];
@@ -1108,12 +1108,12 @@ 
  */
 function do_svncheckout()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Starting svn checkout/update\n";
 	if (!file_exists($config['checkoutdir']))
 	{
-		mkdir($config['checkoutdir'],0755,true);
+		mkdir($config['checkoutdir'], 0755, true);
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -1128,17 +1128,17 @@ 
 		{
 			get_modules_per_repo();
 		}
-		$config['svntag'] = config_translate('svntag');	// in case svntag command did not run, translate tag name
+		$config['svntag'] = config_translate('svntag'); // in case svntag command did not run, translate tag name
 
 		if (file_exists($config['aliasdir']))
 		{
-			system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout, as we dont implement switching tags
+			system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout, as we dont implement switching tags
 			clearstatcache();
 		}
-		foreach($config['modules'] as $repo => $modules)
+		foreach ($config['modules'] as $repo => $modules)
 		{
 			$cmd = $svn.' co ';
-			foreach($modules as $path => $url)
+			foreach ($modules as $path => $url)
 			{
 				if ($path == $config['aliasdir'])
 				{
@@ -1148,7 +1148,7 @@ 
 					$cmd = $svn.' co ';
 					continue;
 				}
-				if(file_exists($config['aliasdir']))
+				if (file_exists($config['aliasdir']))
 				{
 					die("'egroupware' applications must be first one in externals!\n");
 				}
@@ -1166,16 +1166,16 @@ 
 			// check if correct branch
 			$cmd = 'LANG=C '.$svn.' info';
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
-			foreach($output as $line)
+			exec($cmd, $output, $ret);
+			foreach ($output as $line)
 			{
-				if ($ret || substr($line,0,5) == 'URL: ')
+				if ($ret || substr($line, 0, 5) == 'URL: ')
 				{
-					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					$url = substr($line, 5);
+					if ($ret || substr($url, 0, strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
-						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
+						system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout
 						clearstatcache();
 					}
 					break;
@@ -1187,10 +1187,10 @@ 
 		run_cmd($cmd);
 
 		chdir($config['aliasdir']);
-		foreach($config['extra'] as $module)
+		foreach ($config['extra'] as $module)
 		{
-			$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-			$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+			$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+			$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 			$url .= $module;
 			$cmd = $svn.' co '.$url;
 			run_cmd($cmd);
@@ -1215,7 +1215,7 @@ 
  */
 function get_modules_per_svn_repo()
 {
-	global $config,$svn,$verbose;
+	global $config, $svn, $verbose;
 
 	// process alias/externals
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
@@ -1223,27 +1223,27 @@ 
 	$cmd = $svn.' propget svn:externals --strict '.$url;
 	if ($verbose) echo $cmd."\n";
 	$output = $ret = null;
-	exec($cmd,$output,$ret);
+	exec($cmd, $output, $ret);
 	$config['modules'] = array();
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		$line = trim($line);
 		if (empty($line) || $line[0] == '#') continue;
-		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
+		list($path, $url) = preg_split('/[ \t\r\n]+/', $line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
-	foreach($config['extra'] as $module)
+	foreach ($config['extra'] as $module)
 	{
-		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+		$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+		$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module, '://') !== false) $module = basename($module);
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
@@ -1257,11 +1257,11 @@ 
  */
 function do_svntag()
 {
-	global $config,$svn;
+	global $config, $svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag'])) return; // otherwise we copy everything in svn root!
 
-	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
+	$config['svntag'] = config_translate('svntag'); // allow to use config vars like $version in tag
 
 	echo "Creating SVN tag $config[svntag]\n";
 	if (!isset($config['modules']))
@@ -1269,9 +1269,9 @@ 
 		get_modules_per_repo();
 	}
 	// create tags (per repo)
-	foreach($config['modules'] as $repo => $modules)
+	foreach ($config['modules'] as $repo => $modules)
 	{
-		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
+		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ', $modules).' '.$repo.'/'.$config['svntag'].'/';
 		run_cmd($cmd);
 	}
 }
@@ -1284,7 +1284,7 @@ 
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -1292,18 +1292,18 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		exec($cmd, $output, $ret);
+		if ($verbose) echo implode("\n", $output)."\n";
 	}
-	if ($ret && !in_array($ret,(array)$no_bailout))
+	if ($ret && !in_array($ret, (array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
-		throw new Exception("Error during '$cmd' --> aborting",$ret);
+		if (!$verbose) echo implode("\n", $output)."\n";
+		throw new Exception("Error during '$cmd' --> aborting", $ret);
 	}
 	return $ret;
 }
@@ -1330,7 +1330,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -1340,9 +1340,9 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config,$verbose;
+	global $prog, $config, $verbose;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
 	echo "options and their defaults:\n";
@@ -1352,12 +1352,12 @@ 
 	}
 	else
 	{
-		unset($config['modules']);	// they give an error, because of nested array and are quite lengthy
+		unset($config['modules']); // they give an error, because of nested array and are quite lengthy
 	}
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
-		echo '--'.str_pad($name,20).$default."\n";
+		if (is_array($default)) $default = json_encode($default, JSON_UNESCAPED_SLASHES);
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{

doc/rpm-build/post_install.php

Doc Comments +2 added lines, -2 removed lines

@@ -485,7 +485,7 @@ 
  *
  * @param string $cmd
  * @param array &$output=null $output of command
- * @param int|array|true $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
+ * @param integer $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
  * @return int exit code of $cmd
  */
 function run_cmd($cmd,array &$output=null,$no_bailout=null)
@@ -712,7 +712,7 @@ 
  * Read one Univention secret/password eg. _ucr_secret('mysql')
  *
  * @param string $name
- * @return string|boolean
+ * @return false|string
  */
 function _ucr_secret($name)
 {

Braces +86 added lines, -22 removed lines

@@ -9,10 +9,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling post_install as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling post_install as web-page
 {
 	die('<h1>post_install.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 $verbose = false;
 $config = array(
 	'php'         => PHP_BINARY,
@@ -100,7 +103,10 @@ 
 	{
 		case 'suse':
 			// openSUSE 12.1+ no longer uses php5
-			if (file_exists('/usr/bin/php5')) $config['php'] = '/usr/bin/php5';
+			if (file_exists('/usr/bin/php5'))
+			{
+				$config['php'] = '/usr/bin/php5';
+			}
 			$config['start_db'] = '/sbin/service mysql';
 			$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
 			$config['start_webserver'] = '/sbin/service apache2';
@@ -145,9 +151,12 @@ 
 			// fall through
 		case 'rh':
 			// some MySQL packages (mysql.com, MariaDB, ...) use "mysql" as service name instead of RH default "mysqld"
-			if (file_exists('/usr/bin/systemctl'))	// RHEL 7
+			if (file_exists('/usr/bin/systemctl'))
+			{
+				// RHEL 7
 			{
 				$config['start_db'] = '/usr/bin/systemctl %s mariadb';
+			}
 				$config['autostart_db'] = build_cmd('start_db', 'enable');
 				$config['start_webserver'] = '/usr/bin/systemctl %s httpd';
 				$config['autostart_webserver'] = build_cmd('start_webserver', 'enable');
@@ -176,11 +185,14 @@ 
 	while($config_set)
 	{
 		$val = array_shift($config_set);
-		if (($quote = $val[0]) == "'" || $quote == '"')	// arguments might be quoted with ' or "
+		if (($quote = $val[0]) == "'" || $quote == '"')
+		{
+			// arguments might be quoted with ' or "
 		{
 			while (substr($val,-1) != $quote)
 			{
 				if (!$config_set) throw new Exception('Invalid EGW_POST_INSTALL enviroment variable!');
+		}
 				$val .= ' '.array_shift($config_set);
 			}
 			$val = substr($val,1,-1);
@@ -245,8 +257,11 @@ 
 // basic config checks
 foreach(array('php','source_dir','data_dir','setup-cli') as $name)
 {
-	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
-}
+	if (!file_exists($config[$name]))
+	{
+		bail_out(1,$config[$name].' not found!');
+	}
+	}
 
 // fix important php.ini and conf.d/*.ini settings
 check_fix_php_apc_ini();
@@ -255,7 +270,9 @@ 
 $setup_cli = $config['php'].' -d memory_limit=-1 '.$config['setup-cli'];
 
 // if we have a header, include it
-if (file_exists($config['header']) && filesize($config['header']) >= 200)	// default header redirecting to setup is 147 bytes
+if (file_exists($config['header']) && filesize($config['header']) >= 200)
+{
+	// default header redirecting to setup is 147 bytes
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
@@ -263,6 +280,7 @@ 
 			'currentapp' => 'login',	// stop PHP Notice: Undefined index "currentapp" in pre 16.1 header
 		)
 	);
+}
 	include $config['header'];
 
 	// get user from header and replace password, as we dont know it
@@ -286,7 +304,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_db', 'start'));
-			if (!empty($config['autostart_db'])) system($config['autostart_db']);
+			if (!empty($config['autostart_db']))
+			{
+				system($config['autostart_db']);
+			}
 		}
 	}
 	// create database
@@ -302,7 +323,10 @@ 
 	@list($config['account_repository'],$config['auth_type'],$rest) = explode(',',$config['account-auth'],3);
 	$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
 	$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
-	if (empty($rest)) unset($config['account-auth']);
+	if (empty($rest))
+	{
+		unset($config['account-auth']);
+	}
 	if ($config['account_repository'] == 'ldap' || $config['auth_type'] == 'ldap')
 	{
 		// set account_min_id to 1100 if not specified to NOT clash with system accounts
@@ -362,7 +386,10 @@ 
 	$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']);
 	foreach(array('account-auth','smtpserver','smtp','postfix','mailserver','imap','cyrus','sieve','folder') as $name)
 	{
-		if (!empty($config[$name])) $setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		if (!empty($config[$name]))
+		{
+			$setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		}
 	}
 	run_cmd($setup_mailserver);
 
@@ -378,7 +405,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_webserver', 'start'));
-			if (!empty($config['autostart_webserver'])) system($config['autostart_webserver']);
+			if (!empty($config['autostart_webserver']))
+			{
+				system($config['autostart_webserver']);
+			}
 		}
 		else
 		{
@@ -424,10 +454,16 @@ 
 			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
 			run_cmd($header_update);
 			$ret = run_cmd($setup_update,$output,15);
-			if ($ret != 15) break;
+			if ($ret != 15)
+			{
+				break;
+			}
 			// fall through
 		case 15:	// missing configuration (eg. mailserver)
-			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			if (!$verbose)
+			{
+				echo implode("\n",(array)$output)."\n";
+			}
 			break;
 
 		case 0:
@@ -457,9 +493,15 @@ 
 {
 	global $config;
 
-	if (isset($config[$cmd])) $cmd = $config[$cmd];
+	if (isset($config[$cmd]))
+	{
+		$cmd = $config[$cmd];
+	}
 
-	if (strpos($cmd, '%s')) return str_replace('%s', $arg, $cmd);
+	if (strpos($cmd, '%s'))
+	{
+		return str_replace('%s', $arg, $cmd);
+	}
 
 	return $cmd.' '.$arg;
 }
@@ -528,7 +570,10 @@ 
  */
 function bail_out($ret=1,$output=null)
 {
-	if ($output) echo implode("\n",(array)$output);
+	if ($output)
+	{
+		echo implode("\n",(array)$output);
+	}
 	echo "\n\nInstallation failed --> exiting!\n\n";
 	exit($ret);
 }
@@ -574,7 +619,11 @@ 
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
 	{
-		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
+		if (in_array($name, array('postfix','cyrus')))
+		{
+			continue;
+		}
+		// do NOT report deprecated options
 		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
@@ -667,7 +716,10 @@ 
 			// only set on host mailserver app is installed: _ucr_get('mail/cyrus/imap') == 'yes' &&
 			($domains=_ucr_get('mail/hosteddomains')))
 		{
-			if (!is_array($domains)) $domains = explode("\n", $domains);
+			if (!is_array($domains))
+			{
+				$domains = explode("\n", $domains);
+			}
 			$domain = array_shift($domains);
 			// set "use auth with session credentials",tls,"not user editable","further identities"
 			$config['smtpserver'] = "$mailserver,465,,,yes,tls,no,yes";
@@ -686,13 +738,19 @@ 
 					$config['imap'] = ',,Imap\\Dovecot';
 				}
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			else
 			{
 				$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',Imap\\Cyrus';
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			// set folders so mail creates them on first login, UCS does not automatic
 			$config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,Spam,,Ham';
@@ -757,7 +815,10 @@ 
 		$shm_size = ini_get('apc.shm_size');
 		$shm_segments = ini_get('apc.shm_segments');
 		// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
-		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576)) $shm_size .= 'M';
+		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576))
+		{
+			$shm_size .= 'M';
+		}
 
 		$size = _size_with_unit($shm_size) * $shm_segments;
 		//echo "shm_size=$shm_size, shm_segments=$shm_segments --> $size, numeric_size=$numeric_size\n";
@@ -773,7 +834,10 @@ 
 				file_exists($path = $matches[1]) && ($apc_ini = file_get_contents($path)))
 			{
 				$new_shm_size = 128 / $shm_segments;
-				if (!$numeric_size) $new_shm_size .= 'M';
+				if (!$numeric_size)
+				{
+					$new_shm_size .= 'M';
+				}
 				if (preg_match('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', $apc_ini))
 				{
 					file_put_contents($path, preg_replace('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', 'apc.shm_size='.$new_shm_size, $apc_ini));

Spacing +82 added lines, -85 removed lines

@@ -18,7 +18,7 @@ 
 	'php'         => PHP_BINARY,
 	'source_dir'  => realpath(__DIR__.'/../..'),
 	'data_dir'    => '/var/lib/egroupware',
-	'header'      => '$data_dir/header.inc.php',	// symlinked to source_dir by rpm
+	'header'      => '$data_dir/header.inc.php', // symlinked to source_dir by rpm
 	'setup-cli'   => '$source_dir/setup/setup-cli.php',
 	'domain'      => 'default',
 	'config_user' => 'admin',
@@ -30,13 +30,13 @@ 
 	'db_user'     => 'egroupware',
 	'db_pass'     => randomstring(),
 	'db_grant_host' => 'localhost',
-	'db_root'     => 'root',	// mysql root user/pw to create database
+	'db_root'     => 'root', // mysql root user/pw to create database
 	'db_root_pw'  => '',
 	'backup'      => '',
 	'admin_user'  => 'sysop',
 	'admin_passwd'=> randomstring(),
 	'admin_email' => '',
-	'lang'        => 'en',	// languages for admin user and extra lang to install
+	'lang'        => 'en', // languages for admin user and extra lang to install
 	'charset'     => 'utf-8',
 	'start_db'    => '/sbin/service mysqld',
 	'autostart_db' => '/sbin/chkconfig --level 345 mysqld on',
@@ -56,23 +56,23 @@ 
 	'ldap_search_filter' => '(uid=%user)',
 	'ldap_group_context' => 'ou=groups,$base',
 	'ldap_encryption_type' => '',
-	'sambaadmin/sambasid'=> '',	// SID for sambaadmin
+	'sambaadmin/sambasid'=> '', // SID for sambaadmin
 	'mailserver'    => '',
 	'smtpserver'    => 'localhost,25',
-	'smtp'          => '',	// see setup-cli.php --help config
+	'smtp'          => '', // see setup-cli.php --help config
 	'imap'          => '',
 	'sieve'         => '',
 	'folder'        => '',
-	'install-update-app' => '',	// install or update a single (non-default) app
-	'webserver_user'=> 'apache',	// required to fix permissions
+	'install-update-app' => '', // install or update a single (non-default) app
+	'webserver_user'=> 'apache', // required to fix permissions
 	'php5enmod'     => '',
 );
 
 // read language from LANG enviroment variable
 if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : (isset($_SERVER['LANG']) ? $_SERVER['LANG'] : null)))
 {
-	@list($lang,$nat) = preg_split('/[_.]/',$lang);
-	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
+	@list($lang, $nat) = preg_split('/[_.]/', $lang);
+	if (in_array($lang.'-'.strtolower($nat), array('es-es', 'pt-br', 'zh-tw')))
 	{
 		$lang .= '-'.strtolower($nat);
 	}
@@ -85,16 +85,13 @@ 
  *
  * @param string $distro =null default autodetect
  */
-function set_distro_defaults($distro=null)
+function set_distro_defaults($distro = null)
 {
 	global $config;
 	if (is_null($distro))
 	{
-		$distro = file_exists('/etc/SuSE-release') ? 'suse' :
-			(file_exists('/etc/mandriva-release') ? 'mandriva' :
-			(file_exists('/etc/lsb-release') && preg_match('/^DISTRIB_ID="?Univention"?$/mi',
-				file_get_contents('/etc/lsb-release')) ? 'univention' :
-			(file_exists('/etc/debian_version') ? 'debian' : 'rh')));
+		$distro = file_exists('/etc/SuSE-release') ? 'suse' : (file_exists('/etc/mandriva-release') ? 'mandriva' : (file_exists('/etc/lsb-release') && preg_match('/^DISTRIB_ID="?Univention"?$/mi',
+				file_get_contents('/etc/lsb-release')) ? 'univention' : (file_exists('/etc/debian_version') ? 'debian' : 'rh')));
 	}
 	switch (($config['distro'] = $distro))
 	{
@@ -154,9 +151,9 @@ 
 			}
 			elseif (!file_exists('/etc/init.d/mysqld') && file_exists('/etc/init.d/mysql'))
 			{
-				foreach(array('start_db','autostart_db') as $name)
+				foreach (array('start_db', 'autostart_db') as $name)
 				{
-					$config[$name] = str_replace('mysqld','mysql',$config[$name]);
+					$config[$name] = str_replace('mysqld', 'mysql', $config[$name]);
 				}
 			}
 			break;
@@ -172,48 +169,48 @@ 
 if (($config_set = isset($_ENV['EGW_POST_INSTALL']) ? $_ENV['EGW_POST_INSTALL'] : @$_SERVER['EGW_POST_INSTALL']))
 {
 	$conf = array();
-	$config_set = preg_split('/[ \t]+/',trim($config_set));
-	while($config_set)
+	$config_set = preg_split('/[ \t]+/', trim($config_set));
+	while ($config_set)
 	{
 		$val = array_shift($config_set);
 		if (($quote = $val[0]) == "'" || $quote == '"')	// arguments might be quoted with ' or "
 		{
-			while (substr($val,-1) != $quote)
+			while (substr($val, -1) != $quote)
 			{
 				if (!$config_set) throw new Exception('Invalid EGW_POST_INSTALL enviroment variable!');
 				$val .= ' '.array_shift($config_set);
 			}
-			$val = substr($val,1,-1);
+			$val = substr($val, 1, -1);
 		}
 		$conf[] = $val;
 	}
-	$argv = array_merge($conf,$argv);
+	$argv = array_merge($conf, $argv);
 }
 
 $auth_type_given = false;
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		$verbose = true;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		usage();
 	}
-	elseif($arg == '--suse')
+	elseif ($arg == '--suse')
 	{
 		set_distro_defaults('suse');
 	}
-	elseif($arg == '--distro')
+	elseif ($arg == '--distro')
 	{
 		set_distro_defaults(array_shift($argv));
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$config[$name] = array_shift($argv);
 
-		switch($name)
+		switch ($name)
 		{
 			case 'auth_type':
 				$auth_type_given = true;
@@ -234,18 +231,18 @@ 
 }
 
 $replace = array();
-foreach($config as $name => $value)
+foreach ($config as $name => $value)
 {
 	$replace['$'.$name] = $value;
-	if (strpos($value,'$') !== false)
+	if (strpos($value, '$') !== false)
 	{
-		$config[$name] = strtr($value,$replace);
+		$config[$name] = strtr($value, $replace);
 	}
 }
 // basic config checks
-foreach(array('php','source_dir','data_dir','setup-cli') as $name)
+foreach (array('php', 'source_dir', 'data_dir', 'setup-cli') as $name)
 {
-	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
+	if (!file_exists($config[$name])) bail_out(1, $config[$name].' not found!');
 }
 
 // fix important php.ini and conf.d/*.ini settings
@@ -260,13 +257,13 @@ 
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
 			'noapi' => true,
-			'currentapp' => 'login',	// stop PHP Notice: Undefined index "currentapp" in pre 16.1 header
+			'currentapp' => 'login', // stop PHP Notice: Undefined index "currentapp" in pre 16.1 header
 		)
 	);
 	include $config['header'];
 
 	// get user from header and replace password, as we dont know it
-	$old_password = patch_header($config['header'],$config['config_user'],$config['config_passwd']);
+	$old_password = patch_header($config['header'], $config['config_user'], $config['config_passwd']);
 	// register a shutdown function to put old password back in any case
 	register_shutdown_function(function() use (&$config, $old_password)
 	{
@@ -274,7 +271,7 @@ 
 	});
 }
 // new header or does not include requested domain (!= "default") --> new install
-if (!isset($GLOBALS['egw_domain']) ||  $config['domain'] !== 'default' && !isset($GLOBALS['egw_domain'][$config['domain']]))
+if (!isset($GLOBALS['egw_domain']) || $config['domain'] !== 'default' && !isset($GLOBALS['egw_domain'][$config['domain']]))
 {
 	// --> new install
 	$extra_config = '';
@@ -291,7 +288,7 @@ 
 	}
 	// create database
 	$setup_db = $setup_cli.' --setup-cmd-database sub_command=create_db';
-	foreach(array('domain','db_type','db_host','db_port','db_name','db_user','db_pass','db_root','db_root_pw','db_grant_host') as $name)
+	foreach (array('domain', 'db_type', 'db_host', 'db_port', 'db_name', 'db_user', 'db_pass', 'db_root', 'db_root_pw', 'db_grant_host') as $name)
 	{
 		$setup_db .= ' '.escapeshellarg($name.'='.$config[$name]);
 	}
@@ -299,7 +296,7 @@ 
 
 	// check if ldap is required and initialise it
 	// we need to specify account_repository and auth_type to --install as extra config, otherwise install happens for sql!
-	@list($config['account_repository'],$config['auth_type'],$rest) = explode(',',$config['account-auth'],3);
+	@list($config['account_repository'], $config['auth_type'], $rest) = explode(',', $config['account-auth'], 3);
 	$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
 	$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
 	if (empty($rest)) unset($config['account-auth']);
@@ -310,15 +307,15 @@ 
 
 		$setup_ldap = $setup_cli.' --setup-cmd-ldap sub_command='.
 			($config['account_repository'] == 'ldap' ? 'create_ldap' : 'test_ldap');
-		foreach(array(
-			'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw',	// non-egw params: only used for create
-			'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context',	// egw params
+		foreach (array(
+			'domain', 'ldap_suffix', 'ldap_host', 'ldap_admin', 'ldap_admin_pw', // non-egw params: only used for create
+			'ldap_base', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_search_filter', 'ldap_group_context', // egw params
 			'ldap_encryption_type', 'sambaadmin/sambasid',
 		) as $name)
 		{
-			if (strpos($value=$config[$name],'$') !== false)
+			if (strpos($value = $config[$name], '$') !== false)
 			{
-				$config[$name] = $value = strtr($value,array(
+				$config[$name] = $value = strtr($value, array(
 					'$suffix' => $config['ldap_suffix'],
 					'$base' => $config['ldap_base'],
 					'$admin_pw' => $config['ldap_admin_pw'],
@@ -326,7 +323,7 @@ 
 			}
 			$setup_ldap .= ' '.escapeshellarg($name.'='.$value);
 
-			if (!in_array($name,array('domain','ldap_suffix','ldap_admin','ldap_admin_pw')))
+			if (!in_array($name, array('domain', 'ldap_suffix', 'ldap_admin', 'ldap_admin_pw')))
 			{
 				$extra_config .= ' '.escapeshellarg($name.'='.$value);
 			}
@@ -360,7 +357,7 @@ 
 	}
 	// create mailserver config (fmail requires at least minimal config given as default, otherwise fatal error)
 	$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']);
-	foreach(array('account-auth','smtpserver','smtp','postfix','mailserver','imap','cyrus','sieve','folder') as $name)
+	foreach (array('account-auth', 'smtpserver', 'smtp', 'postfix', 'mailserver', 'imap', 'cyrus', 'sieve', 'folder') as $name)
 	{
 		if (!empty($config[$name])) $setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
 	}
@@ -374,7 +371,7 @@ 
 	// check if webserver is started and start it (permanent) if not
 	if ($config['start_webserver'])
 	{
-		exec(build_cmd('start_webserver', 'status'),$dummy,$ret);
+		exec(build_cmd('start_webserver', 'status'), $dummy, $ret);
 		if ($ret)
 		{
 			system(build_cmd('start_webserver', 'start'));
@@ -416,18 +413,18 @@ 
 	// update egroupware, or single app(s), in later case skip backup
 	$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd'].
 		(empty($config['install-update-app']) ? '' : ',no,'.$config['install-update-app']));
-	$ret = run_cmd($setup_update,$output,array(4,15));
+	$ret = run_cmd($setup_update, $output, array(4, 15));
 
-	switch($ret)
+	switch ($ret)
 	{
 		case 4:		// header needs an update
 			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
 			run_cmd($header_update);
-			$ret = run_cmd($setup_update,$output,15);
+			$ret = run_cmd($setup_update, $output, 15);
 			if ($ret != 15) break;
 			// fall through
 		case 15:	// missing configuration (eg. mailserver)
-			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			if (!$verbose) echo implode("\n", (array)$output)."\n";
 			break;
 
 		case 0:
@@ -472,18 +469,18 @@ 
  * @param string $password new password
  * @return string old password
  */
-function patch_header($filename,&$user,$password)
+function patch_header($filename, &$user, $password)
 {
 	$header = file_get_contents($filename);
 
 	$umatches = $pmatches = null;
-	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '", '/')."([^']+)';/m",$header,$umatches) ||
-		!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",$header,$pmatches))
+	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '", '/')."([^']+)';/m", $header, $umatches) ||
+		!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m", $header, $pmatches))
 	{
-		bail_out(99,"$filename is no regular EGroupware header.inc.php!");
+		bail_out(99, "$filename is no regular EGroupware header.inc.php!");
 	}
-	file_put_contents($filename,preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
-		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';",$header));
+	file_put_contents($filename, preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
+		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';", $header));
 
 	$user = $umatches[1];
 
@@ -498,7 +495,7 @@ 
  * @param int|array|true $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -506,16 +503,16 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
+		exec($cmd, $output, $ret);
 	}
-	if ($ret && $no_bailout !== true && !in_array($ret,(array)$no_bailout))
+	if ($ret && $no_bailout !== true && !in_array($ret, (array)$no_bailout))
 	{
-		bail_out($ret,$verbose?null:$output);
+		bail_out($ret, $verbose ?null:$output);
 	}
 	return $ret;
 }
@@ -526,9 +523,9 @@ 
  * @param int $ret =1
  * @param array|string $output line(s) to output before temination notice
  */
-function bail_out($ret=1,$output=null)
+function bail_out($ret = 1, $output = null)
 {
-	if ($output) echo implode("\n",(array)$output);
+	if ($output) echo implode("\n", (array)$output);
 	echo "\n\nInstallation failed --> exiting!\n\n";
 	exit($ret);
 }
@@ -539,24 +536,24 @@ 
  * @param int $len =16
  * @return string
  */
-function randomstring($len=16)
+function randomstring($len = 16)
 {
 	static $usedchars = array(
-		'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-		'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-		'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-		'@','!','%','&','(',')','=','?',';',':','#','_','-','<',
-		'>','|','[',']','}',	// dont add /\,'"{ as we have problems dealing with them
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+		'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+		'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+		'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+		'@', '!', '%', '&', '(', ')', '=', '?', ';', ':', '#', '_', '-', '<',
+		'>', '|', '[', ']', '}', // dont add /\,'"{ as we have problems dealing with them
 	);
 
 	// use cryptographically secure random_int available in PHP 7+
 	$func = function_exists('random_int') ? 'random_int' : 'mt_rand';
 
 	$str = '';
-	for($i=0; $i < $len; $i++)
+	for ($i = 0; $i < $len; $i++)
 	{
-		$str .= $usedchars[$func(0,count($usedchars)-1)];
+		$str .= $usedchars[$func(0, count($usedchars) - 1)];
 	}
 	return $str;
 }
@@ -566,20 +563,20 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config;
+	global $prog, $config;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [--distro=(suse|rh|debian)] [options, ...]\n\n";
 	echo "options and their defaults:\n";
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
-		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
+		if (in_array($name, array('postfix', 'cyrus'))) continue; // do NOT report deprecated options
+		if (in_array($name, array('config_passwd', 'db_pass', 'admin_passwd', 'ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
 		}
-		echo '--'.str_pad($name,20).$default."\n";
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{
@@ -629,8 +626,8 @@ 
 	$config['distro'] = 'univention';
 
 	// set lang from ucr locale, as cloud-config at least never has anything but EN set in enviroment
-	@list($lang,$nat) = preg_split('/[_.]/', _ucr_get('locale/default'));
-	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
+	@list($lang, $nat) = preg_split('/[_.]/', _ucr_get('locale/default'));
+	if (in_array($lang.'-'.strtolower($nat), array('es-es', 'pt-br', 'zh-tw')))
 	{
 		$lang .= '-'.strtolower($nat);
 	}
@@ -655,7 +652,7 @@ 
 		// ldap password hash (our default blowfish_crypt seems not to work)
 		$config['ldap_encryption_type'] = 'sha512_crypt';
 
-		$config['account_min_id'] = 1200;	// UCS use 11xx for internal users/groups
+		$config['account_min_id'] = 1200; // UCS use 11xx for internal users/groups
 
 		$config['account-auth'] = 'univention,ldap';
 
@@ -665,7 +662,7 @@ 
 		// mailserver, see setup-cli.php --help config
 		if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) &&
 			// only set on host mailserver app is installed: _ucr_get('mail/cyrus/imap') == 'yes' &&
-			($domains=_ucr_get('mail/hosteddomains')))
+			($domains = _ucr_get('mail/hosteddomains')))
 		{
 			if (!is_array($domains)) $domains = explode("\n", $domains);
 			$domain = array_shift($domains);
@@ -714,12 +711,12 @@ 
  */
 function _ucr_get($name)
 {
-	static $values=null;
+	static $values = null;
 	if (!isset($values))
 	{
 		$output = $matches = null;
 		exec('/usr/sbin/ucr dump', $output);
-		foreach($output as $line)
+		foreach ($output as $line)
 		{
 			if (preg_match("/^([^:]+): (.*)\n?$/", $line, $matches))
 			{
@@ -795,7 +792,7 @@ 
  */
 function _size_with_unit($size)
 {
-	switch(strtoupper(substr($size, -1)))
+	switch (strtoupper(substr($size, -1)))
 	{
 		case 'G':
 			$size *= 1024;

filemanager/inc/class.filemanager_admin.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 	/**
 	 * Mount GUI
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null, $msg='', $msg_type=null)
 	{

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

Spacing +24 added lines, -24 removed lines

@@ -78,14 +78,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -99,14 +99,14 @@ 
 				Vfs::chgrp($path, 'Admins');
 				Vfs::chmod($path, 075);
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -122,18 +122,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -143,7 +143,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -154,8 +154,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -200,8 +200,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -215,7 +215,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -238,10 +238,10 @@ 
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files']) $content['percent_files'] = number_format(100.0 * $content['version_files'] / $content['total_files'], 1).'%';
+			if ($content['total_size']) $content['percent_size'] = number_format(100.0 * $content['version_size'] / $content['total_size'], 1).'%';
 		}
-		if (!($content['is_root']=Vfs::$is_root))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -257,16 +257,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -276,13 +276,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new Etemplate('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -302,10 +302,10 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= Api\Html::form('<p>'.($check_only&&is_array($msgs) ?
+		$content .= Api\Html::form('<p>'.($check_only && is_array($msgs) ?
 			Api\Html::submit_button('fix', lang('Fix reported problems')) : '').
 			Api\Html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}

filemanager/inc/class.filemanager_favorite_portlet.inc.php

Doc Comments -2 removed lines

@@ -92,8 +92,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($content = array())
 	{

Braces +4 added lines, -1 removed lines

@@ -104,7 +104,10 @@
 		if ($content['nm']['action'])
 		{
 			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
+			if($msg)
+			{
+				Api\Json\Response::get()->apply('egw.message',array($msg));
+			}
 			foreach($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;

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

@@ -23,7 +23,7 @@
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		$context['appname'] = 'filemanager';
 

Spacing +8 added lines, -8 removed lines

@@ -28,13 +28,13 @@ 
 		$context['appname'] = 'filemanager';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->nm_settings += array(
 			'get_rows'       => 'filemanager.filemanager_favorite_portlet.get_rows',
 			'csv_export'     => true,
 			// Use a different template so it can be accessed from client side
-			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows' ),
+			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows'),
 			// Filemanager needs this header, it's an important component for actions, but we reduce it to the minimum
 			'header_left'    => 'filemanager.home.header_left',
 			// Use a reduced column set for home, user can change if needed
@@ -46,7 +46,7 @@ 
 			'parent_id'      => 'dir',
 			'is_parent'      => 'mime',
 			'is_parent_value'=> Vfs::DIR_MIME_TYPE,
-			'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+			'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 		);
 	}
 
@@ -80,7 +80,7 @@ 
 		$ui = new filemanager_ui();
 		$total = $ui->get_rows($query, $rows, $readonlys);
 		// Change template to match selected view
-		if($query['view'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.home.rows' : 'filemanager.tile');
 		}
@@ -103,14 +103,14 @@ 
 		// the etemplate exec to fire again.
 		if ($content['nm']['action'])
 		{
-			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
-			foreach($content['nm']['selected'] as &$id)
+			$msg = filemanager_ui::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+			if ($msg) Api\Json\Response::get()->apply('egw.message', array($msg));
+			foreach ($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;
 			}
 			// Directly request an update - this will get filemanager tab too
-			Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+			Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 		}
 	}
  }
\ No newline at end of file