EGroupware / egroupware

calendar/inc/class.calendar_so.inc.php

Indentation +1 added lines, -1 removed lines

@@ -1528,7 +1528,7 @@
 			if (!$set_recurrences)
 			{
 				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
-				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
+					$event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
 

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

@@ -252,7 +252,7 @@ 
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_start ELSE cal_start END AS cal_start,\n".
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_end ELSE cal_end END AS cal_end\n".
 			// using time-limited range view, instead of complete table, give a big performance plus
-			"FROM $egw_cal\n".
+			"from $egw_cal\n".
 			"JOIN egw_cal_user ON egw_cal_user.cal_id=egw_cal.cal_id\n".
 			// need to left join dates, as egw_cal_user.recur_date is null for non-recuring event
 			"LEFT JOIN egw_cal_dates ON egw_cal_user.cal_id=egw_cal_dates.cal_id AND egw_cal_dates.cal_start=egw_cal_user.cal_recur_date\n".
@@ -345,7 +345,7 @@ 
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
 			$cols .= ',MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end';
-			$join = "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
+			$join = "join $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
 		}
 		else
 		{
@@ -870,7 +870,7 @@ 
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
 		$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 
-		$join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
+		$join = "join $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
 			"LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id ".
 			$rejected_by_user_join;
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
@@ -946,7 +946,7 @@ 
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				foreach(array_keys($selects) as $key)
 				{
-					$selects[$key]['cols'] = "DISTINCT $this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
+					$selects[$key]['cols'] = "distinct $this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
 					if (!$params['enum_recuring'])
 					{
 						$selects[$key]['cols'] = str_replace(array('cal_start','cal_end'),
@@ -1397,7 +1397,7 @@ 
 			{
 				$old_repeats = $this->db->select($this->repeats_table, "$this->repeats_table.*,range_end AS recur_enddate",
 					"$this->repeats_table.cal_id=".(int)$cal_id, __LINE__, __FILE__,
-					false, '', 'calendar', 0, "JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
+					false, '', 'calendar', 0, "join $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
 			}
 			$where = array('cal_id' => $cal_id);
 			// read only timezone id, to check if it is changed
@@ -1762,13 +1762,13 @@ 
 		if ($move_start)
 		{
 			// move the recur-date of the participants
-			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
+			$this->db->query("update $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
 				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
-			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
+			$this->db->query("update $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
 				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
 		}
 		return $this->db->affected_rows();
@@ -2468,7 +2468,7 @@ 
 			),__LINE__,__FILE__,'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
+			foreach($this->db->select($this->cal_table,"distinct $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
 				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);

Spacing +387 added lines, -390 removed lines

@@ -15,40 +15,40 @@ 
 /**
  * some necessary defines used by the calendar
  */
-if(!extension_loaded('mcal'))
+if (!extension_loaded('mcal'))
 {
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	define('MCAL_RECUR_SECONDLY',6);
-	define('MCAL_RECUR_MINUTELY',7);
-	define('MCAL_RECUR_HOURLY',8);
-
-	define('MCAL_M_SUNDAY',1);
-	define('MCAL_M_MONDAY',2);
-	define('MCAL_M_TUESDAY',4);
-	define('MCAL_M_WEDNESDAY',8);
-	define('MCAL_M_THURSDAY',16);
-	define('MCAL_M_FRIDAY',32);
-	define('MCAL_M_SATURDAY',64);
-
-	define('MCAL_M_WEEKDAYS',62);
-	define('MCAL_M_WEEKEND',65);
-	define('MCAL_M_ALLDAYS',127);
+	define('MCAL_RECUR_NONE', 0);
+	define('MCAL_RECUR_DAILY', 1);
+	define('MCAL_RECUR_WEEKLY', 2);
+	define('MCAL_RECUR_MONTHLY_MDAY', 3);
+	define('MCAL_RECUR_MONTHLY_WDAY', 4);
+	define('MCAL_RECUR_YEARLY', 5);
+	define('MCAL_RECUR_SECONDLY', 6);
+	define('MCAL_RECUR_MINUTELY', 7);
+	define('MCAL_RECUR_HOURLY', 8);
+
+	define('MCAL_M_SUNDAY', 1);
+	define('MCAL_M_MONDAY', 2);
+	define('MCAL_M_TUESDAY', 4);
+	define('MCAL_M_WEDNESDAY', 8);
+	define('MCAL_M_THURSDAY', 16);
+	define('MCAL_M_FRIDAY', 32);
+	define('MCAL_M_SATURDAY', 64);
+
+	define('MCAL_M_WEEKDAYS', 62);
+	define('MCAL_M_WEEKEND', 65);
+	define('MCAL_M_ALLDAYS', 127);
 }
 
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-define('DELEGATED',4);
+define('REJECTED', 0);
+define('NO_RESPONSE', 1);
+define('TENTATIVE', 2);
+define('ACCEPTED', 3);
+define('DELEGATED', 4);
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Class to store all calendar data (storage object)
@@ -96,7 +96,7 @@ 
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
 	var $cal_table = 'egw_cal';
-	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
+	var $extra_table, $repeats_table, $user_table, $dates_table, $all_tables;
 
 	/**
 	 * reference to global db-object
@@ -132,7 +132,7 @@ 
 		$this->db = $GLOBALS['egw']->db;
 
 		$this->all_tables = array($this->cal_table);
-		foreach(array('extra','repeats','user','dates') as $name)
+		foreach (array('extra', 'repeats', 'user', 'dates') as $name)
 		{
 			$vname = $name.'_table';
 			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
@@ -148,11 +148,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function cal_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
 		{
-			return $this->cal_table;	// no need / use for a view
+			return $this->cal_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -178,11 +178,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function dates_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -227,14 +227,14 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
-	function &events($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &events($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
-		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
+		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i', $start) : '').','.($end ? date('Y-m-d H:i', $end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 		$start_time = microtime(true);
 		// not everything is supported by now
 		if (!$start || !$end || is_string($params['query']) ||
 			//in_array($filter,array('owner','deleted')) ||
-			$params['enum_recuring']===false)
+			$params['enum_recuring'] === false)
 		{
 			throw new egw_exception_assertion_failed("Unsupported value for parameters!");
 		}
@@ -261,7 +261,7 @@ 
 		{
 			// fix $users to also prefix system users and groups (with 'u')
 			if (!is_array($users)) $users = $users ? (array)$users : array();
-			foreach($users as &$uid)
+			foreach ($users as &$uid)
 			{
 				$user_type = $user_id = null;
 				self::split_user($uid, $user_type, $user_id, true);
@@ -282,7 +282,7 @@ 
 
 		if ($params['order'])	// only order if requested
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
@@ -291,8 +291,8 @@ 
 			$offset = 0;
 			$num_rows = -1;
 		}
-		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
-		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true)-$start_time, 3));
+		$events = & $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
+		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true) - $start_time, 3));
 		return $events;
 	}
 
@@ -305,12 +305,12 @@ 
 	 * @param int $recur_date =0 if set read the next recurrence at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids,$recur_date=0)
+	function read($ids, $recur_date = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($ids).",$recur_date) ".function_backtrace());
 		$cols = self::get_columns('calendar', $this->cal_table);
 		$cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',',$cols);
+		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',', $cols);
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
@@ -320,23 +320,23 @@ 
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif (is_array($ids) && isset($ids[count($ids) - 1]) || is_scalar($ids))	// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
-			unset($ids);	// otherwise users get not read!
+			unset($ids); // otherwise users get not read!
 		}
 		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
 		{
-			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
+			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.', array(
 				'cal_id' => $where['cal_id'],
 			));
 			unset($where['cal_id']);
 		}
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -349,7 +349,7 @@ 
 		}
 		$cols .= ',range_end AS recur_enddate';
 
-		$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
+		$events = & $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
 
 		return $events ? $events : false;
 	}
@@ -361,7 +361,7 @@ 
 	 * @param int $recur_date =0
 	 * @return array
 	 */
-	protected function &get_events($rs, $recur_date=0)
+	protected function &get_events($rs, $recur_date = 0)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -373,7 +373,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -381,7 +381,7 @@ 
 				unset($row['recur_enddate']);
 			}
 			$row['recur_exception'] = $row['alarm'] = array();
-			$events[$row['cal_id']] = egw_db::strip_array_keys($row,'cal_');
+			$events[$row['cal_id']] = egw_db::strip_array_keys($row, 'cal_');
 		}
 		if (!$events) return $events;
 
@@ -393,26 +393,26 @@ 
 			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length)
 			{
 				// event (without uid), not strong enough uid => create new uid
-				$event['uid'] = common::generate_uid('calendar',$event['id']);
+				$event['uid'] = common::generate_uid('calendar', $event['id']);
 				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
-					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+					array('cal_id' => $event['id']), __LINE__, __FILE__, 'calendar');
 			}
 			if (!(int)$recur_date && $event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					$events[$row['cal_id']]['recur_exception'][] = $row['cal_start'];
 				}
-				break;	// as above select read all exceptions (and I dont think too short uid problem still exists)
+				break; // as above select read all exceptions (and I dont think too short uid problem still exists)
 			}
 			// make sure we fetch only real exceptions (deleted occurrences of a series should not show up)
-			if (($recur_date &&	$event['recur_type'] != MCAL_RECUR_NONE))
+			if (($recur_date && $event['recur_type'] != MCAL_RECUR_NONE))
 			{
 				//_debug_array(__METHOD__.__LINE__.' recur_date:'.$recur_date.' check cal_start:'.$event['start']);
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $event['id'],
 					'cal_start' => $event['start'],
 					'recur_exception' => true,
@@ -428,7 +428,7 @@ 
 						'cal_deleted' => NULL
 					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn())
 					{
-						$e = $this->read($event['id'],$event['start']+1);
+						$e = $this->read($event['id'], $event['start'] + 1);
 						$event = $e[$event['id']];
 						break;
 					}
@@ -450,21 +450,21 @@ 
 			if ($recur_date)
 			{
 				// also remember recur_date, maybe we need it later, duno now
-				$recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
+				$recur_date = array(0, $events[$ids]['recur_date'] = $events[$ids]['start']);
 			}
 		}
 
 		// participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
 		// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
-		foreach($this->db->select($this->user_table,'*',array(
+		foreach ($this->db->select($this->user_table, '*', array(
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		), __LINE__, __FILE__, false, 'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT, 'calendar') as $row)	// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
 			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][is_numeric($uid) ? $uid : substr($uid, 1)] = $status;
@@ -473,7 +473,7 @@ 
 		}
 
 		// custom fields
-		foreach($this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->extra_table, '*', array('cal_id'=>$ids), __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			$events[$row['cal_id']]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
 		}
@@ -481,7 +481,7 @@ 
 		// alarms
 		if (is_array($ids))
 		{
-			foreach($this->read_alarms((array)$ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms((array)$ids) as $cal_id => $alarms)
 			{
 				$events[$cal_id]['alarm'] = $alarms;
 			}
@@ -510,11 +510,11 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return int maximum modification timestamp
 	 */
-	function get_ctag($users, $owner_too=false,$master_only=false)
+	function get_ctag($users, $owner_too = false, $master_only = false)
 	{
-		static $ctags = array();	// some per-request caching
+		static $ctags = array(); // some per-request caching
 		static $last_request = null;
-		if (!isset($last_request) || time()-$last_request > self::MAX_CTAG_CACHE_TIME)
+		if (!isset($last_request) || time() - $last_request > self::MAX_CTAG_CACHE_TIME)
 		{
 			$ctags = array();
 			$last_request = time();
@@ -523,13 +523,13 @@ 
 		if (isset($ctags[$signature])) return $ctags[$signature];
 
 		$types = array();
-		foreach((array)$users as $uid)
+		foreach ((array)$users as $uid)
 		{
 			$type = $id = null;
 			self::split_user($uid, $type, $id, true);
 			$types[$type][] = $id;
 		}
-		foreach($types as $type => $ids)
+		foreach ($types as $type => $ids)
 		{
 			$where = array(
 				'cal_user_type' => $type,
@@ -551,17 +551,17 @@ 
 		if ($owner_too)
 		{
 			// owner can only by users, no groups or resources
-			foreach($users as $key => $user)
+			foreach ($users as $key => $user)
 			{
 				if (!($user > 0)) unset($users[$key]);
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
 					'cal_owner' => $users,
-				),')');
+				), ')');
 		}
-		return $ctags[$signature] = $this->db->select($this->user_table,'MAX(cal_modified)',
-			$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
+		return $ctags[$signature] = $this->db->select($this->user_table, 'MAX(cal_modified)',
+			$where, __LINE__, __FILE__, false, '', 'calendar', 0, 'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
 	}
 
 	/**
@@ -573,7 +573,7 @@ 
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
 	 * @return Iterator as egw_db::select
 	 */
-	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
+	function get_cal_data(array $query, $cols = 'cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
 		if (!is_array($cols)) $cols = explode(',', $cols);
 
@@ -599,12 +599,12 @@ 
 		if ($cat_id)
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
-			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
-			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
-			foreach($cats as $cat)
+			array_walk($cats, create_function('&$val,$key', '$val = (int) $val;'));
+			if (is_array($cat_id) && count($cat_id) == 1) $cat_id = $cat_id[0];
+			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','", $cats)."')" : '='.$this->db->quote((int)$cat_id));
+			foreach ($cats as $cat)
 			{
-				$sql .= ' OR '.$this->db->concat("','",'cal_category',"','").' LIKE '.$this->db->quote('%,'.$cat.',%');
+				$sql .= ' OR '.$this->db->concat("','", 'cal_category', "','").' LIKE '.$this->db->quote('%,'.$cat.',%');
 			}
 			$sql .= ') ';
 		}
@@ -619,13 +619,13 @@ 
 	 * @param array $where =array() array to add filters too
 	 * @return array
 	 */
-	protected function status_filter($filter, $enum_recuring=true, array $where=array())
+	protected function status_filter($filter, $enum_recuring = true, array $where = array())
 	{
-		if($filter != 'deleted' && $filter != 'everything')
+		if ($filter != 'deleted' && $filter != 'everything')
 		{
 			$where[] = 'cal_deleted IS NULL';
 		}
-		switch($filter)
+		switch ($filter)
 		{
 			case 'everything':	// no filter at all
 				break;
@@ -699,7 +699,7 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &search($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
 		//error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 
@@ -722,7 +722,7 @@ 
 		{
 			$all_cols = self::get_columns('calendar', $this->cal_table);
 			$all_cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
+			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end AS recur_enddate,".implode(',', $all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
 		}
 		$where = array();
 		if (is_array($params['query']))
@@ -731,19 +731,19 @@ 
 		}
 		elseif ($params['query'])
 		{
-			foreach(array('cal_title','cal_description','cal_location') as $col)
+			foreach (array('cal_title', 'cal_description', 'cal_location') as $col)
 			{
 				$to_or[] = $col.' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%');
 			}
-			$where[] = '('.implode(' OR ',$to_or).')';
+			$where[] = '('.implode(' OR ', $to_or).')';
 
 			// Searching - restrict private to own or private grant
 			if (!isset($params['private_grants']))
 			{
 				$params['private_grants'] = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], EGW_ACL_PRIVATE, 'calendar');
-				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id'];	// db query does NOT return current user
+				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id']; // db query does NOT return current user
 			}
-			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])) . ')';
+			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])).')';
 			$where[] = $private_filter;
 		}
 		if (!empty($params['sql_filter']))
@@ -752,7 +752,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -760,11 +760,11 @@ 
 		if ($users)
 		{
 			$users_by_type = array();
-			foreach((array)$users as $user)
+			foreach ((array)$users as $user)
 			{
 				if (is_numeric($user))
 				{
-					$users_by_type['u'][] = (int) $user;
+					$users_by_type['u'][] = (int)$user;
 				}
 				else
 				{
@@ -776,45 +776,45 @@ 
 			$to_or = $user_or = array();
 			$owner_or = null;
 			$useUnionQuery = $this->db->capabilities['distinct_on_text'] && $this->db->capabilities['union'];
-			$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-			foreach($users_by_type as $type => $ids)
+			$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+			foreach ($users_by_type as $type => $ids)
 			{
 				// when we are able to use Union Querys, we do not OR our query, we save the needed parts for later construction of the union
 				if ($useUnionQuery)
 				{
-					$user_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$user_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 						// only users can be owners, no need to add groups
 						$user_ids = array();
-						foreach($ids as $user_id)
+						foreach ($ids as $user_id)
 						{
 							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
 						}
-						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
+						$owner_or = $this->db->expression($cal_table_def, array('cal_owner' => $user_ids));
 					}
 				}
 				else
 				{
-					$to_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$to_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
-						$to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids));
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
+						$to_or[] = $this->db->expression($cal_table_def, array('cal_owner' => $ids));
 					}
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery) $where[] = '('.implode(' OR ', $to_or).')';
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -833,15 +833,15 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
 		{
 			$where[] = "$this->user_table.cal_recur_date=0";
-			$cols = str_replace(array('cal_start','cal_end'),array('range_start AS cal_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'),$cols);
+			$cols = str_replace(array('cal_start', 'cal_end'), array('range_start AS cal_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'), $cols);
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
-			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
+			$where = str_replace(array('cal_start', 'cal_end'), array('range_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
 			if ($end) $where[] = (int)$end.' > range_start';
   		}
@@ -853,14 +853,13 @@ 
 				" ON $this->cal_table.cal_id=rejected_by_user.cal_id".
 				" AND rejected_by_user.cal_user_type='u'".
 				" AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user).
-				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' :
-					'(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
+				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' : '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
 			$or_required = array(
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
 			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
-			$where[] = '('.implode(' OR ',$or_required).')';
+			$where[] = '('.implode(' OR ', $or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
@@ -872,7 +871,7 @@ 
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
 		if ($params['enum_recuring'])
 		{
-			$join = "JOIN ".$this->dates_table.	// using dates_table direct seems quicker then an other view
+			$join = "JOIN ".$this->dates_table.// using dates_table direct seems quicker then an other view
 				//$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted').
 				" ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$join;
 		}
@@ -899,29 +898,29 @@ 
 			// as replace the OR by construction of a suitable UNION for performance reasons
 			if ($owner_or || $user_or)
 			{
-				foreach($user_or as $user_sql)
+				foreach ($user_or as $user_sql)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $user_sql;
+					$selects[count($selects) - 1]['where'][] = $user_sql;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $user_sql;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $user_sql;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 				// if the query is to be filtered by owner we need to add more selects for the union
 				if ($owner_or)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $owner_or;
+					$selects[count($selects) - 1]['where'][] = $owner_or;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $owner_or;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $owner_or;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 			}
@@ -931,34 +930,34 @@ 
 				$selects[] = $select;
 				if ($params['enum_recuring'])
 				{
-					$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+					$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+					$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
 			if (is_numeric($offset) && !$params['no_total'])	// get the total too
 			{
 				$save_selects = $selects;
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
-				foreach(array_keys($selects) as $key)
+				foreach (array_keys($selects) as $key)
 				{
 					$selects[$key]['cols'] = "DISTINCT $this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
 					if (!$params['enum_recuring'])
 					{
-						$selects[$key]['cols'] = str_replace(array('cal_start','cal_end'),
-							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
+						$selects[$key]['cols'] = str_replace(array('cal_start', 'cal_end'),
+							array('range_start AS cal_start', 'range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
+				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		else	// MsSQL oder MySQL 3.23
 		{
@@ -981,27 +980,27 @@ 
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 				{
-					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+					self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 				}
 				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 				$selects = $save_selects;
 			}
 			if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 			{
-				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 			}
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		//error_log(__METHOD__."() useUnionQuery=$useUnionQuery --> query took ".(microtime(true)-$starttime).'s '.$rs->sql);
 
 		if (isset($params['cols']))
 		{
-			return $rs;	// if colums are specified we return the recordset / iterator
+			return $rs; // if colums are specified we return the recordset / iterator
 		}
 		// Todo: return $this->get_events($rs);
 
 		$events = $ids = $recur_dates = $recur_ids = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			$id = $row['cal_id'];
 			if (is_numeric($id)) $ids[] = $id;
@@ -1013,9 +1012,9 @@ 
 			}
 			if ($row['participants'])
 			{
-				$row['participants'] = explode(',',$row['participants']);
+				$row['participants'] = explode(',', $row['participants']);
 				$row['participants'] = array_combine($row['participants'],
-					array_fill(0,count($row['participants']),''));
+					array_fill(0, count($row['participants']), ''));
 			}
 			else
 			{
@@ -1024,9 +1023,9 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id, (array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
 
-			$events[$id] = egw_db::strip_array_keys($row,'cal_');
+			$events[$id] = egw_db::strip_array_keys($row, 'cal_');
 		}
 		//_debug_array($events);
 		if (count($ids))
@@ -1036,26 +1035,26 @@ 
 			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
 			// This will always read the first entry of each recuring event too, we eliminate it later
 			$recur_dates[] = 0;
-			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',',$ids).")".
+			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',', $ids).")".
 				($filter != 'everything' ? " AND cal_status NOT IN ('X','E')" : '').") utcalid ";
 			//$utrecurdate_view = " (select * from ".$this->user_table." where cal_recur_date in (".implode(',',array_unique($recur_dates)).")) utrecurdates ";
-			foreach($this->db->select($utcal_id_view,'*',array(
+			foreach ($this->db->select($utcal_id_view, '*', array(
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
-				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',$num_rows,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT, 'calendar', $num_rows, $join = '',
+				$this->db->get_table_definitions('calendar', $this->user_table)) as $row)	// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
 				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-				$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 				// set accept/reject/tentative of series for all recurrences
 				if (!$row['cal_recur_date'])
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $i)
+					foreach ((array)$recur_ids[$row['cal_id']] as $i)
 					{
 						if (isset($events[$i]) && !isset($events[$i]['participants'][$uid]))
 						{
@@ -1070,16 +1069,16 @@ 
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					// for enum_recurring events are not indexed by cal_id, but $cal_id.'-'.$cal_start
 					// find master, which is first recurrence
-					if (!isset($events[$id=$row['cal_id']]))
+					if (!isset($events[$id = $row['cal_id']]))
 					{
-						foreach($events as $id => $event)
+						foreach ($events as $id => $event)
 						{
 							if ($event['id'] == $row['cal_id']) break;
 						}
@@ -1092,10 +1091,10 @@ 
 			{
 				$where = array('cal_id' => $ids);
 				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
-				foreach($this->db->select($this->extra_table,'*',$where,
-					__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where,
+					__LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $id)
+					foreach ((array)$recur_ids[$row['cal_id']] as $id)
 					{
 						if (isset($events[$id]))
 						{
@@ -1105,9 +1104,9 @@ 
 				}
 			}
 			// alarms
-			foreach($this->read_alarms($ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms($ids) as $cal_id => $alarms)
 			{
-				foreach($alarms as $id => $alarm)
+				foreach ($alarms as $id => $alarm)
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
@@ -1144,16 +1143,16 @@ 
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
-	private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query,$users_raw)
+	private static function get_union_selects(array &$selects, $start, $end, $users, $cat_id, $filter, $query, $users_raw)
 	{
-		if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php','/activesync/index.php')) ||
-			!in_array($GLOBALS['egw_info']['flags']['currentapp'],array('calendar','home')))
+		if (in_array(basename($_SERVER['SCRIPT_FILENAME']), array('groupdav.php', 'rpc.php', 'xmlrpc.php', '/activesync/index.php')) ||
+			!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('calendar', 'home')))
 		{
-			return;    // disable integration for GroupDAV, SyncML, ...
+			return; // disable integration for GroupDAV, SyncML, ...
 		}
 		self::$integration_data = $GLOBALS['egw']->hooks->process(array(
 			'location' => 'calendar_search_union',
-			'cols'  => $selects[0]['cols'],    // cols to return
+			'cols'  => $selects[0]['cols'], // cols to return
 			'start' => $start,
 			'end'   => $end,
 			'users' => $users,
@@ -1162,12 +1161,12 @@ 
 			'filter'=> $filter,
 			'query' => $query,
 		));
-		foreach(self::$integration_data as $data)
+		foreach (self::$integration_data as $data)
 		{
 			if (is_array($data['selects']))
 			{
 				//echo $app; _debug_array($data);
-				$selects = array_merge($selects,$data['selects']);
+				$selects = array_merge($selects, $data['selects']);
 			}
 		}
 	}
@@ -1192,35 +1191,35 @@ 
 	 * @param string $required_app ='calendar'
 	 * @return string cols for union query to match ones supplied in $required
 	 */
-	public static function union_cols(array $app_cols,$required,$required_app='calendar')
+	public static function union_cols(array $app_cols, $required, $required_app = 'calendar')
 	{
 		// remove evtl. used DISTINCT, we currently dont need it
-		if (($distinct = substr($required,0,9) == 'DISTINCT '))
+		if (($distinct = substr($required, 0, 9) == 'DISTINCT '))
 		{
-			$required = substr($required,9);
+			$required = substr($required, 9);
 		}
 		$return_cols = array();
-		foreach(is_array($required) ? $required : explode(',',$required) as $cols)
+		foreach (is_array($required) ? $required : explode(',', $required) as $cols)
 		{
 			$matches = null;
-			if (substr($cols,-2) == '.*')
+			if (substr($cols, -2) == '.*')
 			{
-				$cols = self::get_columns($required_app,substr($cols,0,-2));
+				$cols = self::get_columns($required_app, substr($cols, 0, -2));
 			}
 			// remove CAST added for PostgreSQL from eg. "CAST(egw_cal.cal_id AS varchar)"
 			elseif (preg_match('/CAST\(([a-z0-9_.]+) AS [a-z0-9_]+\)/i', $cols, $matches))
 			{
 				$cols = $matches[1];
 			}
-			elseif (strpos($cols,' AS ') !== false)
+			elseif (strpos($cols, ' AS ') !== false)
 			{
-				list(,$cols) = explode(' AS ',$cols);
+				list(,$cols) = explode(' AS ', $cols);
 			}
-			foreach((array)$cols as $col)
+			foreach ((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col, 0, 7) == 'egw_cal')	// remove table name
 				{
-					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
+					$col = preg_replace('/^egw_cal[a-z_]*\./', '', $col);
 				}
 				if (isset($app_cols[$col]))
 				{
@@ -1233,7 +1232,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1243,21 +1242,21 @@ 
 	 * @param string $table
 	 * @return array of column names
 	 */
-	static private function get_columns($app,$table)
+	static private function get_columns($app, $table)
 	{
 		if ($table != 'egw_cal')
 		{
-			$table_def = $GLOBALS['egw']->db->get_table_definitions($app,$table);
+			$table_def = $GLOBALS['egw']->db->get_table_definitions($app, $table);
 			$cols = array_keys($table_def['fd']);
 		}
 		else
 		{
 			// special handling for egw_cal, as old databases have a different column order!!!
-			$cols =& egw_cache::getSession(__CLASS__,$table);
+			$cols = & egw_cache::getSession(__CLASS__, $table);
 
 			if (is_null($cols))
 			{
-				$meta = $GLOBALS['egw']->db->metadata($table,true);
+				$meta = $GLOBALS['egw']->db->metadata($table, true);
 				$cols = array_keys($meta['meta']);
 			}
 		}
@@ -1310,12 +1309,12 @@ 
 	 * @param int &$etag etag=null etag to check or null, on return new etag
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
-	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
+	function save($event, &$set_recurrences, &$set_recurrences_start = 0, $change_since = 0, &$etag = null)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length <= 1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1326,7 +1325,7 @@ 
 
 		//error_log(__METHOD__.'('.array2string($event).",$set_recurrences,$change_since,$etag) ".function_backtrace());
 
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		unset($event['id']);
 		$set_recurrences = !$cal_id && $event['recur_type'] != MCAL_RECUR_NONE;
 
@@ -1354,9 +1353,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach($event as $col => $val)
+		foreach ($event as $col => $val)
 		{
-			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && substr($col,0,6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
+			if ($col[0] != '#' && substr($col, 0, 6) != 'recur_' && substr($col, 0, 6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -1366,13 +1365,12 @@ 
 		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
 		if (isset($event['cal_end']))
 		{
-			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
-				($event['recur_enddate'] ? $event['recur_enddate'] : null);
+			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] : ($event['recur_enddate'] ? $event['recur_enddate'] : null);
 		}
 		// ensure that we find mathing entries later on
 		if (!is_array($event['cal_category']))
 		{
-			$categories = array_unique(explode(',',$event['cal_category']));
+			$categories = array_unique(explode(',', $event['cal_category']));
 			sort($categories);
 		}
 		else
@@ -1381,7 +1379,7 @@ 
 		}
 		sort($categories, SORT_NUMERIC);
 
-		$event['cal_category'] = implode(',',$categories);
+		$event['cal_category'] = implode(',', $categories);
 
 		// make sure recurring events never reference to an other recurrent event
 		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
@@ -1399,18 +1397,18 @@ 
 			// read only timezone id, to check if it is changed
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
+				$old_tz_id = $this->db->select($this->cal_table, 'tz_id', $where, __LINE__, __FILE__, 'calendar')->fetchColumn();
 			}
 			if (!is_null($etag)) $where['cal_etag'] = $etag;
 
 			unset($event['cal_etag']);
-			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=cal_etag+1'; // always update the etag, even if none given to check
 
-			$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $event, $where, __LINE__, __FILE__, 'calendar');
 
 			if (!is_null($etag) && $this->db->affected_rows() < 1)
 			{
-				return 0;	// wrong etag, someone else updated the entry
+				return 0; // wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
 		}
@@ -1419,10 +1417,10 @@ 
 			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
 
-			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
-			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			$this->db->insert($this->cal_table, $event, false, __LINE__, __FILE__, 'calendar');
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table, 'cal_id')))
 			{
 				return false;
 			}
@@ -1432,7 +1430,7 @@ 
 		// event without uid or not strong enough uid
 		if (!isset($event['cal_uid']) || strlen($event['cal_uid']) < $minimum_uid_length)
 		{
-			$update['cal_uid'] = $event['cal_uid'] = common::generate_uid('calendar',$cal_id);
+			$update['cal_uid'] = $event['cal_uid'] = common::generate_uid('calendar', $cal_id);
 		}
 		// set caldav_name, if not given by caller
 		if (empty($event['caldav_name']) && version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>='))
@@ -1441,37 +1439,37 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 
 		if ($event['recur_type'] == MCAL_RECUR_NONE)
 		{
-			$this->db->delete($this->dates_table,array(
+			$this->db->delete($this->dates_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// delete all user-records, with recur-date != 0
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_id' => $cal_id, 'cal_recur_date != 0'),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
-			$this->db->delete($this->repeats_table,array(
+			$this->db->delete($this->repeats_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// add exception marker to master, so participants added to exceptions *only* get found
 			if ($event['cal_reference'])
 			{
 				$master_participants = array();
-				foreach($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
+				foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
 					'cal_id' => $event['cal_reference'],
 					'cal_recur_date' => 0,
-					"cal_status != 'X'",	// deleted need to be replaced with exception marker too
+					"cal_status != 'X'", // deleted need to be replaced with exception marker too
 				), __LINE__, __FILE__, 'calendar') as $row)
 				{
 					$master_participants[] = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				}
-				foreach(array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
+				foreach (array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
 				{
 					$user_type = $user_id = null;
 					self::split_user($uid, $user_type, $user_id, true);
@@ -1490,10 +1488,10 @@ 
 		else // write information about recuring event, if recur_type is present in the array
 		{
 			// fetch information about the currently saved (old) event
-			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-			$old_duration = (int) $this->db->select($this->dates_table,'MIN(cal_end)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn() - $old_min;
+			$old_min = (int)$this->db->select($this->dates_table, 'MIN(cal_start)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
+			$old_duration = (int)$this->db->select($this->dates_table, 'MIN(cal_end)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn() - $old_min;
 			$old_exceptions = array();
-			foreach($this->db->select($this->dates_table, 'cal_start', array(
+			foreach ($this->db->select($this->dates_table, 'cal_start', array(
 				'cal_id' => $cal_id,
 				'recur_exception' => true
 			), __LINE__, __FILE__, false, 'ORDER BY cal_start', 'calendar') as $row)
@@ -1512,8 +1510,8 @@ 
 				'cal_recur_date' => 0,
 			);
 			$old_participants = array();
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
@@ -1523,7 +1521,7 @@ 
 			// re-check: did so much recurrence data change that we have to rebuild it from scratch?
 			if (!$set_recurrences)
 			{
-				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
+				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int)$event['cal_start']) ||
 				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
@@ -1532,22 +1530,22 @@ 
 			{
 				// too much recurrence data has changed, we have to do a rebuild from scratch
 				// delete all, but the lowest dates record
-				$this->db->delete($this->dates_table,array(
+				$this->db->delete($this->dates_table, array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$old_min,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// delete all user-records, with recur-date != 0
-				$this->db->delete($this->user_table,array(
+				$this->db->delete($this->user_table, array(
 					'cal_id' => $cal_id,
 					'cal_recur_date != 0',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 			else
 			{
 				// we adjust some possibly changed recurrences manually
 				// deleted exceptions: re-insert recurrences into the user and dates table
-				if (count($deleted_exceptions = array_diff($old_exceptions,$event['recur_exception'])))
+				if (count($deleted_exceptions = array_diff($old_exceptions, $event['recur_exception'])))
 				{
 					if (isset($event['cal_participants']))
 					{
@@ -1558,7 +1556,7 @@ 
 						// use old default
 						$participants = $old_participants;
 					}
-					foreach($deleted_exceptions as $id => $deleted_exception)
+					foreach ($deleted_exceptions as $id => $deleted_exception)
 					{
 						// rebuild participants for the re-inserted recurrence
 						$this->recurrence($cal_id, $deleted_exception, $deleted_exception + $old_duration, $participants);
@@ -1566,24 +1564,24 @@ 
 				}
 
 				// check if recurrence enddate was adjusted
-				if(isset($event['recur_enddate']))
+				if (isset($event['recur_enddate']))
 				{
 					// recurrences need to be truncated
-					if((int)$event['recur_enddate'] > 0 &&
+					if ((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
 					)
 					{
-						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
-						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
+						$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
+						$this->db->delete($this->dates_table, array('cal_id' => $cal_id, 'cal_start >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
 					}
 
 					// recurrences need to be expanded
-					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
+					if (((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
 					)
 					{
 						$set_recurrences = true;
-						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
+						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1 * DAY_s);
 					}
 					//error_log(__METHOD__."() event[recur_enddate]=$event[recur_enddate], old_repeats[recur_enddate]=$old_repeats[recur_enddate] --> set_recurrences=".array2string($set_recurrences).", set_recurrences_start=$set_recurrences_start");
 				}
@@ -1592,9 +1590,9 @@ 
 				if (count($event['recur_exception']))
 				{
 					// added and existing exceptions: delete the execeptions from the user table, it could be the first time
-					$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
+					$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date' => $event['recur_exception']), __LINE__, __FILE__, 'calendar');
 					// update recur_exception flag based on current exceptions
-					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table,array(
+					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table, array(
 						'cal_start' => $event['recur_exception'],
 					)), array(
 						'cal_id' => $cal_id,
@@ -1603,25 +1601,25 @@ 
 			}
 
 			// write the repeats table
-			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
-			$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			unset($event[0]); // unset the 'etag=etag+1', as it's not in the repeats table
+			$this->db->insert($this->repeats_table, $event, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
 		if (isset($event['cal_start']) && isset($event['cal_end']))
 		{
-			$this->move($cal_id,$event['cal_start'],$event['cal_end'],!$cal_id ? false : $change_since, $old_min, $old_min +  $old_duration);
+			$this->move($cal_id, $event['cal_start'], $event['cal_end'], !$cal_id ? false : $change_since, $old_min, $old_min + $old_duration);
 		}
 		// update participants if present in the event-array
 		if (isset($event['cal_participants']))
 		{
-			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
+			$this->participants($cal_id, $event['cal_participants'], !$cal_id ? false : $change_since);
 		}
 		// Custom fields
-		foreach($event as $name => $value)
+		foreach ($event as $name => $value)
 		{
 			if ($name[0] == '#')
 			{
-				if (is_array($value) && array_key_exists('id',$value))
+				if (is_array($value) && array_key_exists('id', $value))
 				{
 					//error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace());
 					$value = $value['id'];
@@ -1629,19 +1627,19 @@ 
 				}
 				if ($value)
 				{
-					$this->db->insert($this->extra_table,array(
-						'cal_extra_value'	=> is_array($value) ? implode(',',$value) : $value,
-					),array(
+					$this->db->insert($this->extra_table, array(
+						'cal_extra_value'	=> is_array($value) ? implode(',', $value) : $value,
+					), array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 				else
 				{
-					$this->db->delete($this->extra_table,array(
+					$this->db->delete($this->extra_table, array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1652,9 +1650,9 @@ 
 			{
 				if ($alarm['id'] && strpos($alarm['id'], 'cal:'.$cal_id.':') !== 0)
 				{
-					unset($alarm['id']);	// unset the temporary id to add the alarm
+					unset($alarm['id']); // unset the temporary id to add the alarm
 				}
-				if(!isset($alarm['offset']))
+				if (!isset($alarm['offset']))
 				{
 					$alarm['offset'] = $event['cal_start'] - $alarm['time'];
 				}
@@ -1665,14 +1663,14 @@ 
 
 				if ($alarm['time'] < time() && !self::shift_alarm($event, $alarm))
 				{
-					continue;	// pgoerzen: don't add alarm in the past
+					continue; // pgoerzen: don't add alarm in the past
 				}
-				$this->save_alarm($cal_id, $alarm, false);	// false: not update modified, we do it anyway
+				$this->save_alarm($cal_id, $alarm, false); // false: not update modified, we do it anyway
 			}
 		}
 		if (is_null($etag))
 		{
-			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			$etag = $this->db->select($this->cal_table, 'cal_etag', array('cal_id' => $cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 		}
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
@@ -1692,7 +1690,7 @@ 
 	 *	are dealing with, default is now.
 	 * @return boolean true if alarm could be shifted, false if not
 	 */
-	public static function shift_alarm(array $_event, array &$alarm, $timestamp=null)
+	public static function shift_alarm(array $_event, array &$alarm, $timestamp = null)
 	{
 		if ($_event['recur_type'] == MCAL_RECUR_NONE)
 		{
@@ -1703,7 +1701,7 @@ 
 		$rrule = calendar_rrule::event2rrule($event, false);
 		foreach ($rrule as $time)
 		{
-			if ($start < ($ts = egw_time::to($time,'server')))
+			if ($start < ($ts = egw_time::to($time, 'server')))
 			{
 				$alarm['time'] = $ts - $alarm['offset'];
 				return true;
@@ -1724,34 +1722,34 @@ 
 	 * @todo Recalculate recurrences, if timezone changes
 	 * @return int|boolean number of moved recurrences or false on error
 	 */
-	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
+	function move($cal_id, $start, $end, $change_since = 0, $old_start = 0, $old_end = 0)
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int)$cal_id) return false;
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
-				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			if ($change_since !== false) $row = $this->db->select($this->dates_table, 'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+				array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetch();
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
-				$this->db->insert($this->dates_table,array(
+				$this->db->insert($this->dates_table, array(
 					'cal_id'    => $cal_id,
 					'cal_start' => $start,
 					'cal_end'   => $end,
-				),false,__LINE__,__FILE__,'calendar');
+				), false, __LINE__, __FILE__, 'calendar');
 
 				return 1;
 			}
-			$move_start = (int) ($start-$row['cal_start']);
-			$move_end   = (int) ($end-$row['cal_end']);
+			$move_start = (int)($start - $row['cal_start']);
+			$move_end   = (int)($end - $row['cal_end']);
 		}
 		else
 		{
-			$move_start = (int) ($start-$old_start);
-			$move_end   = (int) ($end-$old_end);
+			$move_start = (int)($start - $old_start);
+			$move_end   = (int)($end - $old_end);
 		}
 		$where = 'cal_id='.(int)$cal_id;
 
@@ -1759,13 +1757,13 @@ 
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0'), __LINE__, __FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
 			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
-				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
+				((int)$change_since ? ' AND cal_start >= '.(int)$change_since : ''), __LINE__, __FILE__);
 		}
 		return $this->db->affected_rows();
 	}
@@ -1784,8 +1782,7 @@ 
 		}
 		if (is_array($attendee))
 		{
-			$email = !empty($attendee['email']) ? $user_attendee['email'] :
-				(strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
+			$email = !empty($attendee['email']) ? $user_attendee['email'] : (strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
 			$attendee = !empty($attendee['cn']) ? $attendee['cn'].' <'.$email.'>' : $email;
 		}
 		return $attendee;
@@ -1798,11 +1795,11 @@ 
 	 * @param string|array $attendee attendee information: email, json or array with attr cn and url
 	 * @return string|int combined id
 	 */
-	static function combine_user($user_type, $user_id, $attendee=null)
+	static function combine_user($user_type, $user_id, $attendee = null)
 	{
 		if (!$user_type || $user_type == 'u')
 		{
-			return (int) $user_id;
+			return (int)$user_id;
 		}
 		if ($user_type == 'e' && $attendee)
 		{
@@ -1822,12 +1819,12 @@ 
 	 * @param string|int &$user_id id
 	 * @param boolean $md5_email =false md5 hash user_id for email / user_type=="e"
 	 */
-	static function split_user($uid, &$user_type, &$user_id, $md5_email=false)
+	static function split_user($uid, &$user_type, &$user_id, $md5_email = false)
 	{
 		if (is_numeric($uid))
 		{
 			$user_type = 'u';
-			$user_id = (int) $uid;
+			$user_id = (int)$uid;
 		}
 		// create md5 hash from lowercased and trimed raw email ("rb@stylite.de", not "Ralf Becker <rb@stylite.de>")
 		elseif ($md5_email && $uid[0] == 'e')
@@ -1841,7 +1838,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1853,7 +1850,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return string
 	 */
-	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
+	static function combine_status($status, $quantity = 1, $role = 'REQ-PARTICIPANT')
 	{
 		if ((int)$quantity > 1) $status .= (int)$quantity;
 		if ($role != 'REQ-PARTICIPANT') $status .= $role;
@@ -1869,13 +1866,13 @@ 
 	 * @param string &$role=null only O: role
 	 * @return string status U, T, A or R, same as $status parameter on return
 	 */
-	static function split_status(&$status,&$quantity=null,&$role=null)
+	static function split_status(&$status, &$quantity = null, &$role = null)
 	{
 		$quantity = 1;
 		$role = 'REQ-PARTICIPANT';
 		//error_log(__METHOD__.__LINE__.array2string($status));
 		$matches = null;
-		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
+		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/', $status, $matches))
 		{
 			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
 			if ($matches[2]) $role = $matches[2];
@@ -1902,14 +1899,14 @@ 
 	 *		true = only add participants if needed, no participant will be deleted (participants to check/add required in $participants)
 	 * @return int|boolean number of updated recurrences or false on error
 	 */
-	function participants($cal_id,$participants,$change_since=0,$add_only=false)
+	function participants($cal_id, $participants, $change_since = 0, $add_only = false)
 	{
 		//error_log(__METHOD__."($cal_id,".array2string($participants).",$change_since,$add_only");
 
 		$recurrences = array();
 
 		// remove group-invitations, they are NOT stored in the db
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			if ($status[0] == 'G')
 			{
@@ -1918,7 +1915,7 @@ 
 		}
 		$where = array('cal_id' => $cal_id);
 
-		if ((int) $change_since)
+		if ((int)$change_since)
 		{
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.(int)$change_since.')';
 		}
@@ -1926,31 +1923,31 @@ 
 		if ($change_since !== false)
 		{
 			// find all existing recurrences
-			foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$recurrences[] = $row['cal_recur_date'];
 			}
 
 			// update existing entries
-			$existing_entries = $this->db->select($this->user_table,'*',$where,__LINE__,__FILE__,false,'ORDER BY cal_recur_date DESC','calendar');
+			$existing_entries = $this->db->select($this->user_table, '*', $where, __LINE__, __FILE__, false, 'ORDER BY cal_recur_date DESC', 'calendar');
 
 			// create a full list of participants which already exist in the db
 			// with status, quantity and role of the earliest recurence
 			$old_participants = array();
-			foreach($existing_entries as $row)
+			foreach ($existing_entries as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				if ($row['cal_recur_date'] || !isset($old_participants[$uid]))
 				{
-					$old_participants[$uid] = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+					$old_participants[$uid] = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 				}
 			}
 
 			// tag participants which should be deleted
-			if($add_only === false)
+			if ($add_only === false)
 			{
 				$deleted = array();
-				foreach($existing_entries as $row)
+				foreach ($existing_entries as $row)
 				{
 					$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 					// delete not longer set participants
@@ -1963,7 +1960,7 @@ 
 
 			// only keep added OR status (incl. quantity!) changed participants for further steps
 			// we do not touch unchanged (!) existing ones
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				if ($old_participants[$uid] === $status)
 				{
@@ -1975,46 +1972,46 @@ 
 			if ($add_only === false && count($deleted))
 			{
 				$to_or = array();
-				$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-				foreach($deleted as $type => $ids)
+				$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+				foreach ($deleted as $type => $ids)
 				{
-					$to_or[] = $this->db->expression($table_def,array(
+					$to_or[] = $this->db->expression($table_def, array(
 						'cal_user_type' => $type,
 						'cal_user_id'   => $ids,
 					));
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
-				$where[] = "cal_status!='E'";	// do NOT delete exception marker
-				$this->db->update($this->user_table,array('cal_status'=>'X'),$where,__LINE__,__FILE__,'calendar');
+				$where[] = '('.implode(' OR ', $to_or).')';
+				$where[] = "cal_status!='E'"; // do NOT delete exception marker
+				$this->db->update($this->user_table, array('cal_status'=>'X'), $where, __LINE__, __FILE__, 'calendar');
 			}
 		}
 
 		if (count($participants))	// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0; // insert the default recurrence
 
 			$delete_deleted = array();
 
 			// update participants
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				$type = $id = $quantity = $role = null;
 				self::split_user($uid, $type, $id, true);
-				self::split_status($status,$quantity,$role);
+				self::split_status($status, $quantity, $role);
 				$set = array(
 					'cal_status'	  => $status,
 					'cal_quantity'	  => $quantity,
 					'cal_role'        => $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
 				);
-				foreach($recurrences as $recur_date)
+				foreach ($recurrences as $recur_date)
 				{
-					$this->db->insert($this->user_table,$set,array(
+					$this->db->insert($this->user_table, $set, array(
 						'cal_id'	      => $cal_id,
 						'cal_recur_date'  => $recur_date,
 						'cal_user_type'   => $type,
 						'cal_user_id' 	  => $id,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 				// for new or changed group-invitations, remove previously deleted members, so they show up again
 				if ($uid < 0)
@@ -2024,13 +2021,13 @@ 
 			}
 			if ($delete_deleted)
 			{
-				$this->db->delete($this->user_table, $where=array(
+				$this->db->delete($this->user_table, $where = array(
 					'cal_id' => $cal_id,
 					'cal_recur_date' => $recurrences,
 					'cal_user_type' => 'u',
 					'cal_user_id' => array_unique($delete_deleted),
 					'cal_status' => 'X',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				//error_log(__METHOD__."($cal_id, ".array2string($participants).", since=$change_since, add_only=$add_only) db->delete('$this->user_table', ".array2string($where).") affected ".$this->db->affected_rows().' rows');
 			}
 		}
@@ -2049,7 +2046,7 @@ 
 	 * @param string $attendee =null extra attendee information to set for all types (incl. accounts!)
 	 * @return int number of changed recurrences
 	 */
-	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0,$role=null,$attendee=null)
+	function set_status($cal_id, $user_type, $user_id, $status, $recur_date = 0, $role = null, $attendee = null)
 	{
 		static $status_code_short = array(
 			REJECTED 	=> 'R',
@@ -2074,7 +2071,7 @@ 
 			'cal_user_type'	=> $user_type,
 			'cal_user_id'   => $user_id_md5,
 		);
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where['cal_recur_date'] = $recur_date;
 		}
@@ -2085,7 +2082,7 @@ 
 
 		if ($status == 'G')		// remove group invitations, as we dont store them in the db
 		{
-			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+			$this->db->delete($this->user_table, $where, __LINE__, __FILE__, 'calendar');
 			$ret = $this->db->affected_rows();
 		}
 		else
@@ -2093,7 +2090,7 @@ 
 			$set = array('cal_status' => $status);
 			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
 			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
-			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
+			$this->db->insert($this->user_table, $set, $where, __LINE__, __FILE__, 'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
 			{
@@ -2106,7 +2103,7 @@ 
 		// update modified and modifier in main table
 		if ($ret)
 		{
-			$this->updateModified($cal_id, true);	// true = update series master too
+			$this->updateModified($cal_id, true); // true = update series master too
 		}
 		//error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $ret;
@@ -2121,7 +2118,7 @@ 
 	 * @param array $participants uid => status pairs
 	 * @param boolean $exception =null true or false to set recure_exception flag, null leave it unchanged (new are by default no exception)
 	 */
-	function recurrence($cal_id,$start,$end,$participants,$exception=null)
+	function recurrence($cal_id, $start, $end, $participants, $exception = null)
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
@@ -2130,7 +2127,7 @@ 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
 			'cal_start'  => $start,
-		),__LINE__,__FILE__,'calendar');
+		), __LINE__, __FILE__, 'calendar');
 
 		if (!is_array($participants))
 		{
@@ -2138,26 +2135,26 @@ 
 		}
 		if ($exception !== true)
 		{
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G') continue; // dont save group-invitations
 
 				$type = '';
 				$id = null;
 				self::split_user($uid, $type, $id, true);
 				$quantity = $role = null;
-				self::split_status($status,$quantity,$role);
-				$this->db->insert($this->user_table,array(
+				self::split_status($status, $quantity, $role);
+				$this->db->insert($this->user_table, array(
 					'cal_status'	=> $status,
 					'cal_quantity'	=> $quantity,
 					'cal_role'		=> $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
-				),array(
+				), array(
 					'cal_id'		 => $cal_id,
 					'cal_recur_date' => $start,
 					'cal_user_type'  => $type,
 					'cal_user_id' 	 => $id,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 		}
 	}
@@ -2171,7 +2168,7 @@ 
 	function unfinished_recuring($time)
 	{
 		$ids = array();
-		foreach($rs=$this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
+		foreach ($rs = $this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
 			'(range_end IS NULL OR range_end > '.(int)$time.')',
 			__LINE__, __FILE__, false, "GROUP BY $this->repeats_table.cal_id,range_end", 'calendar', 0,
 			" JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id".
@@ -2197,9 +2194,9 @@ 
 		// update timestamp of series master, updates own timestamp too, which does not hurt ;-)
 		$this->updateModified($cal_id, true);
 
-		foreach($this->all_tables as $table)
+		foreach ($this->all_tables as $table)
 		{
-			$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->delete($table, array('cal_id'=>$cal_id), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2215,19 +2212,19 @@ 
 	function purge($date)
 	{
 		// with new range_end we simple delete all with range_end < $date (range_end NULL is never returned)
-		foreach($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
-			foreach($this->all_tables as $table)
+			foreach ($this->all_tables as $table)
 			{
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->update('egw_api_content_history',array(
+			$this->db->update('egw_api_content_history', array(
 				'sync_deleted' => time(),
-			),array(
+			), array(
 				'sync_appname' => 'calendar',
-				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+				'sync_contentid' => $row['cal_id'], // sync_contentid is varchar(60)!
 			), __LINE__, __FILE__);
 			// handle links
 			egw_link::unlink('', 'calendar', $row['cal_id']);
@@ -2250,23 +2247,23 @@ 
 	 * @param boolean $update_cache =null true: re-read given $cal_id, false: delete given $cal_id
 	 * @return array of (cal_id => array of) alarms with alarm-id as key
 	 */
-	function read_alarms($cal_id, $update_cache=null)
+	function read_alarms($cal_id, $update_cache = null)
 	{
 		if (!isset(self::$alarm_cache) && is_array($cal_id))
 		{
 			self::$alarm_cache = array();
 			if (($jobs = $this->async->read('cal:%')))
 			{
-				foreach($jobs as $id => $job)
+				foreach ($jobs as $id => $job)
 				{
-					$alarm         = $job['data'];	// text, enabled
+					$alarm         = $job['data']; // text, enabled
 					$alarm['id']   = $id;
 					$alarm['time'] = $job['next'];
 
 					self::$alarm_cache[$alarm['cal_id']][$id] = $alarm;
 				}
 			}
-			unset($update_cache);	// just done
+			unset($update_cache); // just done
 		}
 		$alarms = array();
 
@@ -2274,13 +2271,13 @@ 
 		{
 			if (isset($update_cache))
 			{
-				foreach((array)$cal_id as $id)
+				foreach ((array)$cal_id as $id)
 				{
 					if ($update_cache === false)
 					{
 						unset(self::$alarm_cache[$cal_id]);
 					}
-					elseif($update_cache === true)
+					elseif ($update_cache === true)
 					{
 						self::$alarm_cache[$cal_id] = $this->read_alarms_nocache($cal_id);
 					}
@@ -2292,7 +2289,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2307,9 +2304,9 @@ 
 	{
 		if (($jobs = $this->async->read('cal:'.(int)$cal_id.':%')))
 		{
-			foreach($jobs as $id => $job)
+			foreach ($jobs as $id => $job)
 			{
-				$alarm         = $job['data'];	// text, enabled
+				$alarm         = $job['data']; // text, enabled
 				$alarm['id']   = $id;
 				$alarm['time'] = $job['next'];
 
@@ -2332,8 +2329,8 @@ 
 		{
 			return False;
 		}
-		list($alarm_id,$job) = each($jobs);
-		$alarm         = $job['data'];	// text, enabled
+		list($alarm_id, $job) = each($jobs);
+		$alarm         = $job['data']; // text, enabled
 		$alarm['id']   = $alarm_id;
 		$alarm['time'] = $job['next'];
 
@@ -2349,12 +2346,12 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
 		//error_log(__METHOD__."($cal_id, ".array2string($alarm).', '.array2string($update_modified).') '.function_backtrace());
 		if (!($id = $alarm['id']))
 		{
-			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+			$alarms = $this->read_alarms($cal_id); // find a free alarm#
 			$n = count($alarms);
 			do
 			{
@@ -2367,12 +2364,12 @@ 
 		{
 			$this->async->cancel_timer($id);
 		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+		$alarm['cal_id'] = $cal_id; // we need the back-reference
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
+		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner']))
 		{
 			return False;
 		}
@@ -2399,7 +2396,7 @@ 
 		//error_log(__METHOD__."($cal_id) ".function_backtrace());
 		if (($alarms = $this->read_alarms($cal_id)))
 		{
-			foreach(array_keys($alarms) as $id)
+			foreach (array_keys($alarms) as $id)
 			{
 				$this->async->cancel_timer($id);
 			}
@@ -2419,7 +2416,7 @@ 
 	{
 		//error_log(__METHOD__."('$id') ".function_backtrace());
 		// update the modification information of the related event
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 		if ($cal_id)
 		{
 			$this->updateModified($cal_id, true);
@@ -2438,7 +2435,7 @@ 
 	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
 	 * @param int $new_user =null
 	 */
-	function deleteaccount($old_user, $new_user=null)
+	function deleteaccount($old_user, $new_user = null)
 	{
 		if (is_array($old_user))
 		{
@@ -2449,52 +2446,52 @@ 
 		{
 			$user_type = '';
 			$user_id = null;
-			self::split_user($old_user,$user_type,$user_id);
+			self::split_user($old_user, $user_type, $user_id);
 
 			if ($user_type == 'u')	// only accounts can be owners of events
 			{
-				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->cal_table, 'cal_id', array('cal_owner' => $old_user), __LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
 				}
 			}
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_user_type' => $user_type,
 				'cal_user_id'   => $user_id,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
-				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
+			foreach ($this->db->select($this->cal_table, "DISTINCT $this->cal_table.cal_id", 'cal_user_id IS NULL', __LINE__, __FILE__,
+				False, '', 'calendar', 0, "LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);
 			}
 		}
 		else
 		{
-			$this->db->update($this->cal_table,array('cal_owner' => $new_user),array('cal_owner' => $old_user),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, array('cal_owner' => $new_user), array('cal_owner' => $old_user), __LINE__, __FILE__, 'calendar');
 			// delete participation of old user, if new user is already a participant
 			$ids = array();
-			foreach($this->db->select($this->user_table,'cal_id',array(		// MySQL does NOT allow to run this as delete!
+			foreach ($this->db->select($this->user_table, 'cal_id', array(		// MySQL does NOT allow to run this as delete!
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				"cal_id IN (SELECT cal_id FROM $this->user_table other WHERE other.cal_id=cal_id AND other.cal_user_id=".$this->db->quote($new_user)." AND cal_user_type='u')",
-			),__LINE__,__FILE__,false,'','calendar') as $row)
+			), __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids) $this->db->delete($this->user_table, array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 			// now change participant in the rest to contain new user instead of old user
-			$this->db->update($this->user_table,array(
+			$this->db->update($this->user_table, array(
 				'cal_user_id' => $new_user,
-			),array(
+			), array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2508,18 +2505,18 @@ 
 	 *
 	 * @return array recur_date => status pairs (index 0 => main status)
 	 */
-	function get_recurrences($cal_id, $uid=null, $start=0, $end=0)
+	function get_recurrences($cal_id, $uid = null, $start = 0, $end = 0)
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
@@ -2533,17 +2530,17 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status,cal_quantity,cal_role',$where2,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_recur_date,cal_status,cal_quantity,cal_role', $where2,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 			$participant_status[$row['cal_recur_date']] = $status;
 		}
 		return $participant_status;
@@ -2592,8 +2589,8 @@ 
 			'cal_uid'		=> $uid,
 		);
 		$related = array();
-		foreach ($this->db->select($this->cal_table,'cal_id,cal_reference',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id,cal_reference', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			if ($row['cal_reference'] != 0)
 			{
@@ -2622,10 +2619,10 @@ 
 	 *
 	 * @return array		Array of exception days (false for non-recurring events).
 	 */
-	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
+	function get_recurrence_exceptions($event, $tz_id = null, $start = 0, $end = 0, $filter = 'all')
 	{
 		if (!is_array($event)) return false;
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
 		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
@@ -2649,27 +2646,27 @@ 
 		while ($egw_rrule->valid())
 		{
 			while ($egw_rrule->exceptions &&
-				in_array($egw_rrule->current->format('Ymd'),$egw_rrule->exceptions))
+				in_array($egw_rrule->current->format('Ymd'), $egw_rrule->exceptions))
 			{
-				if (in_array($filter, array('map','tz_map','rrule','tz_rrule')))
+				if (in_array($filter, array('map', 'tz_map', 'rrule', 'tz_rrule')))
 				{
 					 // real exception
-					$locts = (int)egw_time::to($egw_rrule->current(),'server');
+					$locts = (int)egw_time::to($egw_rrule->current(), 'server');
 					if ($expand_all)
 					{
-						$remts = (int)egw_time::to($remote_rrule->current(),'server');
+						$remts = (int)egw_time::to($remote_rrule->current(), 'server');
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				if ($expand_all)
@@ -2680,14 +2677,14 @@ 
 				if (!$egw_rrule->valid()) return $days;
 			}
 			$day = $egw_rrule->current();
-			$locts = (int)egw_time::to($day,'server');
+			$locts = (int)egw_time::to($day, 'server');
 			$tz_exception = ($filter == 'tz_rrule');
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Server]: ' . $day->format('Ymd\THis') . " ($locts)");
 			if ($expand_all)
 			{
 				$remote_day = $remote_rrule->current();
-				$remts = (int)egw_time::to($remote_day,'server');
+				$remts = (int)egw_time::to($remote_day, 'server');
 			//	error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Device]: ' . $remote_day->format('Ymd\THis') . " ($remts)");
 			}
@@ -2706,11 +2703,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2732,18 +2729,18 @@ 
 							{
 								if ($remote)
 								{
-									$days[$locts]= $remts;
+									$days[$locts] = $remts;
 								}
 								else
 								{
-									$days[$remts]= $locts;
+									$days[$remts] = $locts;
 								}
 							}
 						}
 					}
 					elseif ($filter != 'map')
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				elseif (($filter == 'map' || filter == 'tz_map') &&
@@ -2753,11 +2750,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2781,9 +2778,9 @@ 
 	 */
 	function status_pseudo_exception($cal_id, $recur_date, $filter)
 	{
-		static $recurrence_zero=null;
-		static $cached_id=null;
-		static $user=null;
+		static $recurrence_zero = null;
+		static $cached_id = null;
+		static $user = null;
 
 		if (!isset($cached_id) || $cached_id != $cal_id)
 		{
@@ -2794,8 +2791,8 @@ 
 				'cal_id' => $cal_id,
 				'cal_recur_date' => 0,
 			);
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				switch ($row['cal_user_type'])
 				{
@@ -2818,8 +2815,8 @@ 
 			'cal_id' => $cal_id,
 			'cal_recur_date' => $recur_date,
 		);
-		foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-			__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+			__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			switch ($row['cal_user_type'])
 			{
@@ -2916,14 +2913,14 @@ 
 			}
 			$timezone = self::$tz_cache[$event['tzid']];
 		}
-		$start_time = new egw_time($event['start'],egw_time::$server_timezone);
+		$start_time = new egw_time($event['start'], egw_time::$server_timezone);
 		$start_time->setTimezone($timezone);
-		$end_time = new egw_time($event['end'],egw_time::$server_timezone);
+		$end_time = new egw_time($event['end'], egw_time::$server_timezone);
 		$end_time->setTimezone($timezone);
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//	'(): ' . $start . '-' . $end);
-		$start = egw_time::to($start_time,'array');
-		$end = egw_time::to($end_time,'array');
+		$start = egw_time::to($start_time, 'array');
+		$end = egw_time::to($end_time, 'array');
 
 
 		return !$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59;
@@ -2937,7 +2934,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(egw_time $time, $tz_id=null)
+	function &startOfDay(egw_time $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -2962,14 +2959,14 @@ 
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */
-	function updateModified($id, $update_master=false, $time=null, $modifier=null)
+	function updateModified($id, $update_master = false, $time = null, $modifier = null)
 	{
 		if (is_null($time) || !$time) $time = time();
 		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),
-			array('cal_id' => $id), __LINE__,__FILE__, 'calendar');
+			array('cal_id' => $id), __LINE__, __FILE__, 'calendar');
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
 		if ($update_master)

Braces +366 added lines, -96 removed lines

@@ -150,16 +150,32 @@ 
 	 */
 	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)
 		{
-			return $this->cal_table;	// no need / use for a view
+			// using view without start-date is slower!
+		{
+			return $this->cal_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
-		if ($end) $where[] = "range_start<".(int)$end;
-		if ($start) $where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
+		}
+		if ($end)
+		{
+			$where[] = "range_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		$sql = "(SELECT * FROM $this->cal_table WHERE ".$this->db->expression($this->cal_table, $where).") $this->cal_table";
 
@@ -180,16 +196,32 @@ 
 	 */
 	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)
+		{
+			// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where['recur_exception'] = $deleted;
-		if ($end) $where[] = "cal_start<".(int)$end;
-		if ($start) $where[] = "cal_end>".(int)$start;
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where['recur_exception'] = $deleted;
+		}
+		if ($end)
+		{
+			$where[] = "cal_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "cal_end>".(int)$start;
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		// egw_db::union uses egw_db::select which check if join contains "WHERE"
 		// to support old join syntax like ", other_table WHERE ...",
@@ -239,7 +271,10 @@ 
 			throw new egw_exception_assertion_failed("Unsupported value for parameters!");
 		}
 		$where = is_array($params['query']) ? $params['query'] : array();
-		if ($cat_id) $where[] = $this->cat_filter($cat_id);
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
 		$egw_cal = $this->cal_range_view($start, $end, $where, $filter == 'everything' ? null : $filter != 'deleted');
 
 		$status_filter = $this->status_filter($filter, $params['enum_recuring']);
@@ -260,7 +295,10 @@ 
 		if ($users)
 		{
 			// fix $users to also prefix system users and groups (with 'u')
-			if (!is_array($users)) $users = $users ? (array)$users : array();
+			if (!is_array($users))
+			{
+				$users = $users ? (array)$users : array();
+			}
 			foreach($users as &$uid)
 			{
 				$user_type = $user_id = null;
@@ -280,15 +318,22 @@ 
 			$sql .= " AND\n	".$params['sql_filter'];
 		}
 
-		if ($params['order'])	// only order if requested
+		if ($params['order'])
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			// only order if requested
+		{
+			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
-		if ($offset === false)	// return all rows --> egw_db::query wants offset=0, num_rows=-1
+		if ($offset === false)
+		{
+			// return all rows --> egw_db::query wants offset=0, num_rows=-1
 		{
 			$offset = 0;
+		}
 			$num_rows = -1;
 		}
 		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
@@ -314,26 +359,35 @@ 
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
-		if (is_scalar($ids) && !is_numeric($ids))	// a single uid
+		if (is_scalar($ids) && !is_numeric($ids))
+		{
+			// a single uid
 		{
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
+		}
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))
+		{
+			// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
+		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
 			unset($ids);	// otherwise users get not read!
 		}
-		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
+		if (isset($where['cal_id']))
+		{
+			// prevent non-unique column-name cal_id
 		{
 			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
 				'cal_id' => $where['cal_id'],
 			));
+		}
 			unset($where['cal_id']);
 		}
 		if ((int) $recur_date)
@@ -383,10 +437,16 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 			$events[$row['cal_id']] = egw_db::strip_array_keys($row,'cal_');
 		}
-		if (!$events) return $events;
+		if (!$events)
+		{
+			return $events;
+		}
 
 		$ids = array_keys($events);
-		if (count($ids) == 1) $ids = $ids[0];
+		if (count($ids) == 1)
+		{
+			$ids = $ids[0];
+		}
 
 		foreach ($events as &$event)
 		{
@@ -460,10 +520,13 @@ 
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)
+		{
+			// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
+		}
 			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
@@ -520,7 +583,10 @@ 
 			$last_request = time();
 		}
 		$signature = serialize(func_get_args());
-		if (isset($ctags[$signature])) return $ctags[$signature];
+		if (isset($ctags[$signature]))
+		{
+			return $ctags[$signature];
+		}
 
 		$types = array();
 		foreach((array)$users as $uid)
@@ -553,7 +619,10 @@ 
 			// owner can only by users, no groups or resources
 			foreach($users as $key => $user)
 			{
-				if (!($user > 0)) unset($users[$key]);
+				if (!($user > 0))
+				{
+					unset($users[$key]);
+				}
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
@@ -575,7 +644,10 @@ 
 	 */
 	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
-		if (!is_array($cols)) $cols = explode(',', $cols);
+		if (!is_array($cols))
+		{
+			$cols = explode(',', $cols);
+		}
 
 		// special handling of cal_user_modified "pseudo" column
 		if (($key = array_search('cal_user_modified', $cols)) !== false)
@@ -600,7 +672,10 @@ 
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			if (is_array($cat_id) && count($cat_id)==1)
+			{
+				$cat_id = $cat_id[0];
+			}
 			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
 			foreach($cats as $cat)
 			{
@@ -659,10 +734,13 @@ 
 				$where[] = "$this->user_table.cal_status NOT IN ('X','E')";
 				break;
 			default:
-				if ($enum_recuring)	// regular UI
+				if ($enum_recuring)
+				{
+					// regular UI
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X','E')";
 				}
+				}
 				else	// CalDAV / eSync / iCal need to include 'E' = exceptions
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X')";
@@ -794,7 +872,10 @@ 
 						$user_ids = array();
 						foreach($ids as $user_id)
 						{
-							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
+							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u')
+							{
+								$user_ids[] = $user_id;
+							}
 						}
 						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
 					}
@@ -814,7 +895,10 @@ 
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery)
+			{
+				$where[] = '('.implode(' OR ',$to_or).')';
+			}
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -833,7 +917,11 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order']))
+		{
+			$params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
@@ -843,9 +931,15 @@ 
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
 			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
-			if ($end) $where[] = (int)$end.' > range_start';
+			if ($end)
+			{
+				$where[] = (int)$end.' > range_start';
+			}
   		}
-		elseif ($end) $where[] = (int)$end.' > cal_start';
+  		elseif ($end)
+		{
+			$where[] = (int)$end.' > cal_start';
+		}
 
 		if ($remove_rejected_by_user && $filter != 'everything')
 		{
@@ -859,7 +953,10 @@ 
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
-			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			if ($filter == 'owner')
+			{
+				$or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			}
 			$where[] = '('.implode(' OR ',$or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
@@ -881,7 +978,10 @@ 
 		if ($useUnionQuery)
 		{
 			// allow apps to supply participants and/or icons
-			if (!isset($params['cols'])) $cols .= ',NULL AS participants,NULL AS icons';
+			if (!isset($params['cols']))
+			{
+				$cols .= ',NULL AS participants,NULL AS icons';
+			}
 
 			// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
 			// with time-range views benefit is now at best slim for huge tables or none at all!
@@ -936,9 +1036,12 @@ 
 					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				foreach(array_keys($selects) as $key)
 				{
@@ -949,14 +1052,20 @@ 
 							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration'])
+				{
+					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				}
 
 				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration'])
+			{
+				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			}
 
 			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
 		}
@@ -974,9 +1083,12 @@ 
 				'table_def' => $cal_table_def,
 			));
 
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
@@ -1004,7 +1116,10 @@ 
 		foreach($rs as $row)
 		{
 			$id = $row['cal_id'];
-			if (is_numeric($id)) $ids[] = $id;
+			if (is_numeric($id))
+			{
+				$ids[] = $id;
+			}
 
 			if ($row['cal_recur_date'])
 			{
@@ -1024,7 +1139,10 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id,(array)$recur_ids[$row['cal_id']]))
+			{
+				$recur_ids[$row['cal_id']][] = $id;
+			}
 
 			$events[$id] = egw_db::strip_array_keys($row,'cal_');
 		}
@@ -1043,10 +1161,16 @@ 
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
 				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',$num_rows,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)
+			{
+				// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
-				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
+			}
+				if ($row['cal_recur_date'])
+				{
+					$id .= '-'.$row['cal_recur_date'];
+				}
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
@@ -1065,7 +1189,10 @@ 
 				}
 
 				// set data, if recurrence is requested
-				if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
+				if (isset($events[$id]))
+				{
+					$events[$id]['participants'][$uid] = $status;
+				}
 			}
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
@@ -1081,7 +1208,10 @@ 
 					{
 						foreach($events as $id => $event)
 						{
-							if ($event['id'] == $row['cal_id']) break;
+							if ($event['id'] == $row['cal_id'])
+							{
+								break;
+							}
 						}
 					}
 					$events[$id]['recur_exception'][] = $row['cal_start'];
@@ -1091,7 +1221,10 @@ 
 			if (!is_null($params['cfs']))
 			{
 				$where = array('cal_id' => $ids);
-				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
+				if ($params['cfs'])
+				{
+					$where['cal_extra_name'] = $params['cfs'];
+				}
 				foreach($this->db->select($this->extra_table,'*',$where,
 					__LINE__,__FILE__,false,'','calendar') as $row)
 				{
@@ -1111,14 +1244,20 @@ 
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
-					if (isset($events[$cal_id]))	// none recuring event
+					if (isset($events[$cal_id]))
+					{
+						// none recuring event
 					{
 						$events[$cal_id]['alarm'][$id] = $alarm;
 					}
-					elseif (isset($events[$cal_id.'-'.$event_start]))	// recuring event
+					}
+					elseif (isset($events[$cal_id.'-'.$event_start]))
+					{
+						// recuring event
 					{
 						$events[$cal_id.'-'.$event_start]['alarm'][$id] = $alarm;
 					}
+					}
 				}
 			}
 		}
@@ -1218,10 +1357,13 @@ 
 			}
 			foreach((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col,0,7) == 'egw_cal')
+				{
+					// remove table name
 				{
 					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
 				}
+				}
 				if (isset($app_cols[$col]))
 				{
 					$return_cols[] = $app_cols[$col];
@@ -1315,7 +1457,11 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length<=1)
+			{
+				$minimum_uid_length = 8;
+			}
+			// we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1363,7 +1509,10 @@ 
 			}
 		}
 		// set range_start/_end, but only if we have cal_start/_end, as otherwise we destroy present values!
-		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
+		if (isset($event['cal_start']))
+		{
+			$event['range_start'] = $event['cal_start'];
+		}
 		if (isset($event['cal_end']))
 		{
 			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
@@ -1384,7 +1533,10 @@ 
 		$event['cal_category'] = implode(',',$categories);
 
 		// make sure recurring events never reference to an other recurrent event
-		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
+		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$event['cal_reference'] = 0;
+		}
 
 		if ($cal_id)
 		{
@@ -1401,7 +1553,10 @@ 
 			{
 				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
 			}
-			if (!is_null($etag)) $where['cal_etag'] = $etag;
+			if (!is_null($etag))
+			{
+				$where['cal_etag'] = $etag;
+			}
 
 			unset($event['cal_etag']);
 			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
@@ -1412,14 +1567,24 @@ 
 			{
 				return 0;	// wrong etag, someone else updated the entry
 			}
-			if (!is_null($etag)) ++$etag;
+			if (!is_null($etag))
+			{
+				++$etag;
+			}
 		}
 		else
 		{
 			// new event
-			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!$event['cal_owner'])
+			{
+				$event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid']))
+			{
+				$event['cal_uid'] = '';
+			}
+			// uid is NOT NULL!
 
 			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
 			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
@@ -1571,8 +1736,7 @@ 
 					// recurrences need to be truncated
 					if((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 					}
@@ -1580,8 +1744,7 @@ 
 					// recurrences need to be expanded
 					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$set_recurrences = true;
 						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
 					}
@@ -1728,12 +1891,18 @@ 
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int) $cal_id)
+		{
+			return false;
+		}
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+			if ($change_since !== false)
+			{
+				$row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			}
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
@@ -1835,7 +2004,10 @@ 
 			$user_type = $uid[0];
 			$email = substr($uid, 1);
 			$matches = null;
-			if (preg_match('/<([^<>]+)>$/', $email, $matches)) $email = $matches[1];
+			if (preg_match('/<([^<>]+)>$/', $email, $matches))
+			{
+				$email = $matches[1];
+			}
 			$user_id = md5(trim(strtolower($email)));
 		}
 		else
@@ -1855,8 +2027,14 @@ 
 	 */
 	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
 	{
-		if ((int)$quantity > 1) $status .= (int)$quantity;
-		if ($role != 'REQ-PARTICIPANT') $status .= $role;
+		if ((int)$quantity > 1)
+		{
+			$status .= (int)$quantity;
+		}
+		if ($role != 'REQ-PARTICIPANT')
+		{
+			$status .= $role;
+		}
 
 		return $status;
 	}
@@ -1877,8 +2055,14 @@ 
 		$matches = null;
 		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
 		{
-			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
-			if ($matches[2]) $role = $matches[2];
+			if ((int)$matches[1] > 0)
+			{
+				$quantity = (int)$matches[1];
+			}
+			if ($matches[2])
+			{
+				$role = $matches[2];
+			}
 			$status = $status[0];
 		}
 		elseif ($status === true)
@@ -1989,9 +2173,13 @@ 
 			}
 		}
 
-		if (count($participants))	// participants which need to be added
+		if (count($participants))
+		{
+			// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0;
+		}
+		// insert the default recurrence
 
 			$delete_deleted = array();
 
@@ -2063,7 +2251,10 @@ 
 			return false;
 		}
 
-		if (is_numeric($status)) $status = $status_code_short[$status];
+		if (is_numeric($status))
+		{
+			$status = $status_code_short[$status];
+		}
 
 		$uid = self::combine_user($user_type, $user_id);
 		$user_id_md5 = null;
@@ -2083,16 +2274,25 @@ 
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
 		}
 
-		if ($status == 'G')		// remove group invitations, as we dont store them in the db
+		if ($status == 'G')
+		{
+			// remove group invitations, as we dont store them in the db
 		{
 			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+		}
 			$ret = $this->db->affected_rows();
 		}
 		else
 		{
 			$set = array('cal_status' => $status);
-			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
-			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
+			if ($user_type == 'e' || $attendee)
+			{
+				$set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
+			}
+			if (!is_null($role) && $role != 'REQ-PARTICIPANT')
+			{
+				$set['cal_role'] = $role;
+			}
 			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
@@ -2125,7 +2325,10 @@ 
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
-		if (isset($exception)) $update['recur_exception'] = $exception;
+		if (isset($exception))
+		{
+			$update['recur_exception'] = $exception;
+		}
 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
@@ -2140,7 +2343,11 @@ 
 		{
 			foreach($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G')
+				{
+					continue;
+				}
+				// dont save group-invitations
 
 				$type = '';
 				$id = null;
@@ -2369,7 +2576,10 @@ 
 		}
 		$alarm['cal_id'] = $cal_id;		// we need the back-reference
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid'))
+		{
+			$alarm['uid'] = (string)new Horde_Support_Uuid;
+		}
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
 		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
@@ -2378,10 +2588,16 @@ 
 		}
 
 		// update the modification information of the related event
-		if ($update_modified) $this->updateModified($cal_id, true);
+		if ($update_modified)
+		{
+			$this->updateModified($cal_id, true);
+		}
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $id;
 	}
@@ -2404,7 +2620,10 @@ 
 				$this->async->cancel_timer($id);
 			}
 			// update cache, if used
-			if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, false);
+			if (isset(self::$alarm_cache))
+			{
+				$this->read_alarms($cal_id, false);
+			}
 		}
 		return count($alarms);
 	}
@@ -2427,7 +2646,10 @@ 
 		$ret = $this->async->cancel_timer($id);
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $ret;
 	}
@@ -2451,11 +2673,14 @@ 
 			$user_id = null;
 			self::split_user($old_user,$user_type,$user_id);
 
-			if ($user_type == 'u')	// only accounts can be owners of events
+			if ($user_type == 'u')
+			{
+				// only accounts can be owners of events
 			{
 				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
+			}
 				}
 			}
 			$this->db->delete($this->user_table,array(
@@ -2483,11 +2708,14 @@ 
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids)
+			{
+				$this->db->delete($this->user_table,array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
 			),__LINE__,__FILE__,'calendar');
+			}
 			// now change participant in the rest to contain new user instead of old user
 			$this->db->update($this->user_table,array(
 				'cal_user_id' => $new_user,
@@ -2512,8 +2740,14 @@ 
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2524,7 +2758,10 @@ 
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
 		}
-		if (is_null($uid)) return $participant_status;
+		if (is_null($uid))
+		{
+			return $participant_status;
+		}
 		$user_type = $user_id = null;
 		self::split_user($uid, $user_type, $user_id, true);
 
@@ -2533,8 +2770,14 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2624,17 +2867,26 @@ 
 	 */
 	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		$cal_id = (int) $event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
-		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			return false;
+		}
 
 		$days = array();
 
 		$expand_all = (!$this->isWholeDay($event) && $tz_id && $tz_id != $event['tzid']);
 
-		if ($filter == 'tz_only' && !$expand_all) return $days;
+		if ($filter == 'tz_only' && !$expand_all)
+		{
+			return $days;
+		}
 
 		$remote = in_array($filter, array('tz_rrule', 'rrule'));
 
@@ -2677,7 +2929,10 @@ 
 					$remote_rrule->next_no_exception();
 				}
 				$egw_rrule->next_no_exception();
-				if (!$egw_rrule->valid()) return $days;
+				if (!$egw_rrule->valid())
+				{
+					return $days;
+				}
 			}
 			$day = $egw_rrule->current();
 			$locts = (int)egw_time::to($day,'server');
@@ -2831,7 +3086,11 @@ 
 			}
 		}
 
-		if (empty($participants)) return false; // occurrence does not exist at all yet
+		if (empty($participants))
+		{
+			return false;
+		}
+		// occurrence does not exist at all yet
 
 		foreach ($recurrence_zero as $uid => $status)
 		{
@@ -2888,7 +3147,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2902,7 +3163,10 @@ 
 	 */
 	function isWholeDay($event)
 	{
-		if (!isset($event['start']) || !isset($event['end'])) return false;
+		if (!isset($event['start']) || !isset($event['end']))
+		{
+			return false;
+		}
 
 		if (empty($event['tzid']))
 		{
@@ -2964,8 +3228,14 @@ 
 	 */
 	function updateModified($id, $update_master=false, $time=null, $modifier=null)
 	{
-		if (is_null($time) || !$time) $time = time();
-		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($time) || !$time)
+		{
+			$time = time();
+		}
+		if (is_null($modifier))
+		{
+			$modifier = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),

Doc Comments +14 added lines, -38 removed lines

@@ -207,23 +207,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='default' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string $params['sql_filter'] sql to be and'ed into query (fully quoted)
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
@@ -357,7 +345,7 @@ 
 	/**
 	 * Get full event information from an iterator of a select on egw_cal
 	 *
-	 * @param array|Iterator $rs
+	 * @param ADORecordSet $rs
 	 * @param int $recur_date =0
 	 * @return array
 	 */
@@ -571,7 +559,7 @@ 
 	 *
 	 * @param array $query filter, keys have to use 'cal_' prefix
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
-	 * @return Iterator as egw_db::select
+	 * @return ADORecordSet as egw_db::select
 	 */
 	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
@@ -590,7 +578,7 @@ 
 	/**
 	 * generate SQL to filter after a given category (incl. subcategories)
 	 *
-	 * @param array|int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @param integer $cat_id cat-id or array of cat-ids, or !$cat_id for none
 	 * @return string SQL to include in the query
 	 */
 	function cat_filter($cat_id)
@@ -678,24 +666,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='all' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string|array $params['sql_filter'] sql to be and'ed into query (fully quoted), or usual filter array
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
-	 * @param boolean $params['use_so_events'] =false, true return result of new $this->events()
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
@@ -1136,11 +1111,11 @@ 
 	 * Ask other apps if they want to participate in calendar search / display
 	 *
 	 * @param &$selects parts of union query
-	 * @param $start see search()
-	 * @param $end
+	 * @param integer $start see search()
+	 * @param integer $end
 	 * @param $users as used in calendar_so ($users_raw plus all members and memberships added by calendar_bo)
-	 * @param $cat_id
-	 * @param $filter
+	 * @param integer $cat_id
+	 * @param string $filter
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
@@ -1308,6 +1283,7 @@ 
 	 * @param int &$set_recurrences_start=0 on return: time from which on the recurrences should be rebuilt, default 0=all
 	 * @param int $change_since =0 time from which on the repetitions should be changed, default 0=all
 	 * @param int &$etag etag=null etag to check or null, on return new etag
+	 * @param boolean $set_recurrences
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
 	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
@@ -1718,7 +1694,7 @@ 
 	 * @param int $cal_id
 	 * @param int $start new starttime
 	 * @param int $end new endtime
-	 * @param int|boolean $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param integer $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $old_start =0 old starttime or (default) 0, to query it from the db
 	 * @param int $old_end =0 old starttime or (default) 0
 	 * @todo Recalculate recurrences, if timezone changes
@@ -1895,7 +1871,7 @@ 
 	 *
 	 * @param int $cal_id
 	 * @param array $participants uid => status pairs
-	 * @param int|boolean $change_since =0, false=new event,
+	 * @param integer $change_since =0, false=new event,
 	 * 		0=all, > 0 time from which on the repetitions should be changed
 	 * @param boolean $add_only =false
 	 *		false = add AND delete participants if needed (full list of participants required in $participants)
@@ -2041,7 +2017,7 @@ 
 	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
 	 *
 	 * @param int $cal_id
-	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
+	 * @param string $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int|string $user_id
 	 * @param int|char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date =0 date to change, or 0 = all since now
@@ -2958,7 +2934,7 @@ 
 	 * Updates the modification timestamp to force an etag, ctag and sync-token change
 	 *
 	 * @param int $id event id
-	 * @param int|boolean $update_master =false id of series master or true, to update series master too
+	 * @param boolean $update_master =false id of series master or true, to update series master too
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */

api/src/Vfs.php

Indentation +33 added lines, -33 removed lines

@@ -672,7 +672,7 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+			$type == 'F' && is_dir($path)))	// symlink to a directory
 		{
 			return;	// wrong type
 		}
@@ -1621,13 +1621,13 @@ 
 		{
 			return false;
 		}
-    	// remove the lock info evtl. set in the cache
-    	unset(self::$lock_cache[$path]);
+		// remove the lock info evtl. set in the cache
+		unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
-    	{
-    		$timeout += time();
-    	}
+		if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+		{
+			$timeout += time();
+		}
 
 		if ($update)	// Lock Update
 		{
@@ -1688,32 +1688,32 @@ 
 		return $ret;
 	}
 
-    /**
-     * unlock a ressource/path
-     *
-     * @param string $path path to unlock
-     * @param string $token locktoken
+	/**
+	 * unlock a ressource/path
+	 *
+	 * @param string $path path to unlock
+	 * @param string $token locktoken
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
-     * @return boolean true on success
-     */
-    static function unlock($path,$token,$check_writable=true)
-    {
+	 * @return boolean true on success
+	 */
+	static function unlock($path,$token,$check_writable=true)
+	{
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
-        	'lock_path' => $path,
-        	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
-        {
-        	// remove the lock from the cache too
-        	unset(self::$lock_cache[$path]);
-        }
+		if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+			'lock_path' => $path,
+			'lock_token' => $token,
+		),__LINE__,__FILE__) && self::$db->affected_rows()))
+		{
+			// remove the lock from the cache too
+			unset(self::$lock_cache[$path]);
+		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
 		return $ret;
-    }
+	}
 
 	/**
 	 * checkLock() helper
@@ -1741,13 +1741,13 @@ 
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
-	        	'lock_path' => $result['path'],
-	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+			self::$db->delete(self::LOCK_TABLE,array(
+				'lock_path' => $result['path'],
+				'lock_token' => $result['token'],
+			),__LINE__,__FILE__);
 
 			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
-	        $result = false;
+			$result = false;
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
 		return self::$lock_cache[$path] = $result;
@@ -1887,9 +1887,9 @@ 
 			$image = Image::find($mime_sub, 'navbar');
 		}
 		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
-		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
-		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
-		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
+				 (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
+				 (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
+				 ($stat = self::stat($file)) && $stat['size'] < 1500000)
 		{
 			if (substr($file, 0, 6) == '/apps/')
 			{

Braces +237 added lines, -62 removed lines

@@ -221,7 +221,10 @@ 
 		}
 		foreach($props as &$prop)
 		{
-			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
+			if ($prop['name'] == $name && $prop['ns'] == $ns)
+			{
+				return $prop;
+			}
 		}
 		return null;
 	}
@@ -314,11 +317,17 @@ 
 	 */
 	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url))
+		{
+			$check_url = strpos($url,'$') === false;
+		}
 
-		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
+		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))
+		{
+			// happens eg. in setup
 		{
 			$api_config = Config::read('phpgwapi');
+		}
 			if (isset($api_config['vfs_fstab']) && is_array($api_config['vfs_fstab']))
 			{
 				self::$fstab = $api_config['vfs_fstab'];
@@ -334,12 +343,18 @@ 
 		}
 		if (is_null($url) || is_null($path))
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			}
 			return self::$fstab;
 		}
 		if (!self::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if ($clear_fstab)
@@ -348,14 +363,20 @@ 
 		}
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			}
 			return true;	// already mounted
 		}
 		self::load_wrapper(self::parse_url($url,PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			}
 			return false;	// url does not exist
 		}
 		self::$fstab[$path] = $url;
@@ -370,12 +391,18 @@ 
 			Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
 				$GLOBALS['egw']->invalidate_session_cache();
 			}
+			}
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		return true;
 	}
 
@@ -388,12 +415,18 @@ 
 	{
 		if (!self::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			}
 			return false;	// $path not mounted
 		}
 		unset(self::$fstab[$path]);
@@ -401,11 +434,17 @@ 
 		Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
 		return true;
 	}
 
@@ -460,17 +499,27 @@ 
 		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
 		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		if ($dirsontop)
+		{
+			$options['need_mime'] = true;
+		}
+		// otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
-		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
+		if (isset($options['name']) && !isset($options['name_preg']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
 		}
-		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
+		}
+		if (isset($options['path']) && !isset($options['preg_path']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
 		}
+		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
@@ -517,7 +566,10 @@ 
 		{
 			if (!$url)
 			{
-				if ($path[0] != '/' || !self::stat($path)) continue;
+				if ($path[0] != '/' || !self::stat($path))
+				{
+					continue;
+				}
 				$path = self::PREFIX . $path;
 			}
 			if (!isset($options['remove']))
@@ -535,9 +587,17 @@ 
 			{
 				while(($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..')
+					{
+						continue;
+					}
+					// ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden'])
+					{
+						continue;
+					}
+					// ignore hidden files
 
 					$file = self::concat($path, $fname);
 
@@ -549,8 +609,14 @@ 
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
 					{
 						$opts = $options;
-						if ($opts['mindepth']) $opts['mindepth']--;
-						if ($opts['maxdepth']) $opts['depth']++;
+						if ($opts['mindepth'])
+						{
+							$opts['mindepth']--;
+						}
+						if ($opts['maxdepth'])
+						{
+							$opts['depth']++;
+						}
 						unset($opts['order']);
 						unset($opts['limit']);
 						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
@@ -615,7 +681,10 @@ 
 		if (isset($options['limit']))
 		{
 			list($limit,$start) = explode(',',$options['limit']);
-			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
+			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches']))
+			{
+				$limit = 15;
+			}
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
@@ -672,9 +741,13 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+		    $type == 'F' && is_dir($path)))
 		{
-			return;	// wrong type
+			// symlink to a directory
+		{
+			return;
+		}
+		// wrong type
 		}
 		$stat = array_slice($stat,13);	// remove numerical indices 0-12
 		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
@@ -697,11 +770,15 @@ 
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
-			if ($options['mime'][0] == '/')	// perl regular expression given
+			if ($options['mime'][0] == '/')
+			{
+				// perl regular expression given
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return;
+			}
+			// wrong mime-type
 				}
 			}
 			else
@@ -1018,7 +1095,8 @@ 
 			}
 
 			// sort by length descending, to show precedence
-			usort($eacls, function($a, $b) {
+			usort($eacls, function($a, $b)
+			{
 				return strlen($b['path']) - strlen($a['path']);
 			});
 		}
@@ -1073,14 +1151,21 @@ 
 	 */
 	static function mode2int($set,$mode=0)
 	{
-		if (is_int($set))		// already an integer
+		if (is_int($set))
+		{
+			// already an integer
 		{
 			return $set;
 		}
-		if (is_numeric($set))	// octal string
+		}
+		if (is_numeric($set))
+		{
+			// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set,8,10);
+		}
+		// convert octal to decimal
 		}
 		foreach(explode(',',$set) as $s)
 		{
@@ -1136,34 +1221,55 @@ 
 	 */
 	static function int2mode( $mode )
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if(($mode & self::MODE_LINK) == self::MODE_LINK)
+		{
+			// Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		}
+		elseif(($mode & 0xC000) == 0xC000)
+		{
+			// Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		}
+		elseif($mode & 0x1000)
+		{
+			// FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		}
+		elseif($mode & 0x2000)
+		{
+			// Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		}
+		elseif($mode & 0x4000)
+		{
+			// Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		}
+		elseif($mode & 0x6000)
+		{
+			// Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		}
+		elseif($mode & 0x8000)
+		{
+			// Regular
 		{
 			$sP = '-';
 		}
+		}
 		else                         // UNKNOWN
 		{
 			$sP = 'u';
@@ -1230,9 +1336,18 @@ 
 	 */
 	static function hsize($size)
 	{
-		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		if ($size < 1024)
+		{
+			return $size;
+		}
+		if ($size < 1024*1024)
+		{
+			return sprintf('%3.1lfk',(float)$size/1024);
+		}
+		if ($size < 1024*1024*1024)
+		{
+			return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		}
 		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
 	}
 
@@ -1243,7 +1358,10 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if(empty($_val))
+		{
+			return 0;
+		}
 
 		$val = trim($_val);
 
@@ -1251,11 +1369,13 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if(isset($matches[2]))
+		{
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
+		if(isset($matches[1]))
+		{
 			$val = (int) $matches[1];
 		}
 
@@ -1307,7 +1427,10 @@ 
 			return false;
 		}
 		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		if (substr($url,-1) == '/')
+		{
+			array_pop($parts);
+		}
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
@@ -1328,7 +1451,10 @@ 
 	 */
 	static function has_owner_rights($path,array $stat=null)
 	{
-		if (!$stat) $stat = self::url_stat($path,0);
+		if (!$stat)
+		{
+			$stat = self::url_stat($path,0);
+		}
 
 		return $stat['uid'] == self::$user ||	// user is the owner
 			self::$is_root ||					// class runs with root rights
@@ -1347,7 +1473,10 @@ 
 	static function concat($_url,$relative)
 	{
 		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		if (substr($url,-1) == '/')
+		{
+			$url = substr($url,0,-1);
+		}
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
@@ -1440,7 +1569,8 @@ 
 		if(count($paths) > 0)
 		{
 			// Shortest to longest
-			usort($paths, function($a, $b) {
+			usort($paths, function($a, $b)
+			{
 				return strlen($a) - strlen($b);
 			});
 
@@ -1513,7 +1643,10 @@ 
 			// Don't go infinite with app entries
 			if(self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if(in_array($addfile, $links))
+				{
+					continue;
+				}
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
@@ -1624,12 +1757,17 @@ 
     	// remove the lock info evtl. set in the cache
     	unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+    	if ($timeout < 1000000)
+    	{
+    		// < 1000000 is a relative timestamp, so we add the current time
     	{
     		$timeout += time();
     	}
+    	}
 
-		if ($update)	// Lock Update
+		if ($update)
+		{
+			// Lock Update
 		{
 			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
 				'lock_path' => $path,
@@ -1637,6 +1775,7 @@ 
 			),__LINE__,__FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
+		}
 				$scope = Db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = Db::from_bool($row['lock_write']) ? 'write' : 'read';
 
@@ -1684,7 +1823,10 @@ 
 				$ret = false;	// there's already a lock
 			}
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
 	}
 
@@ -1711,7 +1853,10 @@ 
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
         }
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
     }
 
@@ -1725,7 +1870,10 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			}
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
@@ -1739,17 +1887,26 @@ 
 			$result['scope'] = Db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = Db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
-		if ($result && $result['expires'] < time())	// lock is expired --> remove it
+		if ($result && $result['expires'] < time())
+		{
+			// lock is expired --> remove it
 		{
 	        self::$db->delete(self::LOCK_TABLE,array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
 	        ),__LINE__,__FILE__);
+		}
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			}
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		}
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1763,10 +1920,13 @@ 
 	static function getExtraInfo($path,array $content=null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))
+		{
+			// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
+		}
 
 		if (($vfs_extra = Hooks::process(array(
 			'location' => 'vfs_extra',
@@ -2044,30 +2204,42 @@ 
 		}
 		if ($check_is_uploaded_file && !is_resource($tmp_name) && !is_uploaded_file($tmp_name))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			}
 			return false;
 		}
 		if (!(self::is_writable($target) || self::is_writable(self::dirname($target))))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			}
 			return false;
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props))
+			{
+				$props = array(array('name' => 'comment','val' => $props));
+			}
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
 				foreach($props as $name => $val)
 				{
-					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
+					if (($name == 'comment' || $name[0] == '#') && $val)
+					{
+						// only copy 'comment' and cfs
 					{
 						$vfs_props[] = array(
 							'name' => $name,
 							'val'  => $val,
 						);
 					}
+					}
 				}
 				$props = $vfs_props;
 			}
@@ -2094,7 +2266,10 @@ 
 		{
 			$ret = copy($tmp_name,self::PREFIX.$target) ? self::stat($target) : false;
 		}
-		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL)
+		{
+			error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		}
 		return $ret;
 	}
 

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

@@ -1415,7 +1415,7 @@
 	 *
 	 * @todo use https://github.com/maennchen/ZipStream-PHP to not assamble all files in memmory
 	 */
-	public static function download_zip(Array $_files, $name = false)
+	public static function download_zip(array $_files, $name = false)
 	{
 		//error_log(__METHOD__ . ': '.implode(',',$_files));
 

Doc Comments +5 added lines, -5 removed lines

@@ -165,7 +165,7 @@ 
 	 * dir working on just the eGW VFS: returns directory object
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
-	 * @return Directory
+	 * @return \Directory
 	 */
 	static function dir($path)
 	{
@@ -1313,7 +1313,7 @@ 
 	 * Also works around PHP under Windows returning dirname('/something') === '\\', which is NOT understood by EGroupware's VFS!
 	 *
 	 * @param string $_url path or url
-	 * @return string|boolean parent or false if there's none ($path == '/')
+	 * @return false|string parent or false if there's none ($path == '/')
 	 */
 	static function dirname($_url)
 	{
@@ -1431,7 +1431,7 @@ 
 	 * @param array $_files List of files to include in the zip
 	 * @param string $name optional Zip file name.  If not provided, it will be determined automatically from the files
 	 *
-	 * @return undefined
+	 * @return string|null
 	 */
 	public static function download_zip(Array $_files, $name = false)
 	{
@@ -1741,7 +1741,7 @@ 
 	 * checkLock() helper
 	 *
 	 * @param  string resource path to check for locks
-	 * @return array|boolean false if there's no lock, else array with lock info
+	 * @return string false if there's no lock, else array with lock info
 	 */
 	static function checkLock($path)
 	{
@@ -1957,7 +1957,7 @@ 
 	/**
 	 * Copies the files given in $src to $dst.
 	 *
-	 * @param array $src contains the source file
+	 * @param string[] $src contains the source file
 	 * @param string $dst is the destination directory
 	 * @param int& $errs =null on return number of errors happened
 	 * @param array& $copied =null on return files copied

Spacing +271 added lines, -275 removed lines

@@ -137,13 +137,13 @@ 
 	 * @param string $mode 'r', 'w', ... like fopen
 	 * @return resource
 	 */
-	static function fopen($path,$mode)
+	static function fopen($path, $mode)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("Filename '$path' is not an absolute path!");
 		}
-		return fopen(self::PREFIX.$path,$mode);
+		return fopen(self::PREFIX.$path, $mode);
 	}
 
 	/**
@@ -183,13 +183,13 @@ 
 	 * @param int $sorting_order =0 !$sorting_order (default) alphabetical in ascending order, $sorting_order alphabetical in descending order.
 	 * @return array
 	 */
-	static function scandir($path,$sorting_order=0)
+	static function scandir($path, $sorting_order = 0)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("Directory '$path' is not an absolute path!");
 		}
-		return scandir(self::PREFIX.$path,$sorting_order);
+		return scandir(self::PREFIX.$path, $sorting_order);
 	}
 
 	/**
@@ -199,22 +199,22 @@ 
 	 * @param string $to
 	 * @return boolean
 	 */
-	static function copy($from,$to)
+	static function copy($from, $to)
 	{
-		$old_props = self::file_exists($to) ? self::propfind($to,null) : array();
+		$old_props = self::file_exists($to) ? self::propfind($to, null) : array();
 		// copy properties (eg. file comment), if there are any and evtl. existing old properties
-		$props = self::propfind($from,null);
+		$props = self::propfind($from, null);
 
-		foreach($old_props as $prop)
+		foreach ($old_props as $prop)
 		{
-			if (!self::find_prop($props,$prop))
+			if (!self::find_prop($props, $prop))
 			{
-				$prop['val'] = null;	// null = delete prop
+				$prop['val'] = null; // null = delete prop
 				$props[] = $prop;
 			}
 		}
 		// using self::copy_uploaded() to treat copying incl. properties as atomar operation in respect of notifications
-		return self::copy_uploaded(self::PREFIX.$from,$to,$props,false);	// false = no is_uploaded_file check!
+		return self::copy_uploaded(self::PREFIX.$from, $to, $props, false); // false = no is_uploaded_file check!
 	}
 
 	/**
@@ -225,14 +225,14 @@ 
 	 * @param string $ns =self::DEFAULT_PROP_NAMESPACE namespace, only if $prop is no array
 	 * @return &array reference to property in $props or null if not found
 	 */
-	static function &find_prop(array &$props,$name,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function &find_prop(array &$props, $name, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
 		if (is_array($name))
 		{
 			$ns = $name['ns'];
 			$name = $name['name'];
 		}
-		foreach($props as &$prop)
+		foreach ($props as &$prop)
 		{
 			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
 		}
@@ -246,15 +246,15 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function stat($path,$try_create_home=false)
+	static function stat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,0,$try_create_home)))
+		if (($stat = self::url_stat($path, 0, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -266,15 +266,15 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function lstat($path,$try_create_home=false)
+	static function lstat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,STREAM_URL_STAT_LINK,$try_create_home)))
+		if (($stat = self::url_stat($path, STREAM_URL_STAT_LINK, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -325,9 +325,9 @@ 
 	 * @param boolean $clear_fstab =false true clear current fstab, false (default) only add given mount
 	 * @return array|boolean array with fstab, if called without parameter or true on successful mount
 	 */
-	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
+	static function mount($url = null, $path = null, $check_url = null, $persitent_mount = true, $clear_fstab = false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url)) $check_url = strpos($url, '$') === false;
 
 		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
 		{
@@ -353,7 +353,7 @@ 
 		if (!self::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
 		if ($clear_fstab)
 		{
@@ -362,25 +362,25 @@ 
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
-			return true;	// already mounted
+			return true; // already mounted
 		}
-		self::load_wrapper(self::parse_url($url,PHP_URL_SCHEME));
+		self::load_wrapper(self::parse_url($url, PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
-			return false;	// url does not exist
+			return false; // url does not exist
 		}
 		self::$fstab[$path] = $url;
 
-		uksort(self::$fstab,create_function('$a,$b','return strlen($a)-strlen($b);'));
+		uksort(self::$fstab, create_function('$a,$b', 'return strlen($a)-strlen($b);'));
 
 		if ($persitent_mount)
 		{
-			config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+			config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
 				$GLOBALS['egw']->invalidate_session_cache();
 			}
@@ -399,19 +399,19 @@ 
 		if (!self::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
-		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
+		if (!isset(self::$fstab[$path]) && ($path = array_search($path, self::$fstab)) === false)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
-			return false;	// $path not mounted
+			return false; // $path not mounted
 		}
 		unset(self::$fstab[$path]);
 
-		config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+		config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -426,7 +426,7 @@ 
 	 * @param boolean $allow_versions =false allow .versions or .attic
 	 * @return boolean
 	 */
-	public static function is_hidden($path, $allow_versions=false)
+	public static function is_hidden($path, $allow_versions = false)
 	{
 		$file = self::basename($path);
 
@@ -462,30 +462,30 @@ 
 	 * @param array $exec_params =null further params for exec as array, path is always the first param and stat the last!
 	 * @return array of pathes if no $exec, otherwise path => stat pairs
 	 */
-	static function find($base,$options=null,$exec=null,$exec_params=null)
+	static function find($base, $options = null, $exec = null, $exec_params = null)
 	{
 		//error_log(__METHOD__."(".print_r($base,true).",".print_r($options,true).",".print_r($exec,true).",".print_r($exec_params,true).")\n");
 
-		$type = $options['type'];	// 'd', 'f' or 'F'
-		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
+		$type = $options['type']; // 'd', 'f' or 'F'
+		$dirs_last = $options['depth']; // put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
-		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth']) && $options['maxdepth'] > 0);
+		if ($dirsontop) $options['need_mime'] = true; // otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
 		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
+			$options['name_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['name'])).'$/i';
 		}
 		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
+			$options['path_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['path'])).'$/i';
 		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
 			{
-				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'],'account_lid','u');
+				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'], 'account_lid', 'u');
 			}
 			elseif (isset($options['nouser']))
 			{
@@ -496,7 +496,7 @@ 
 		{
 			if (isset($options['group']))
 			{
-				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'],'account_lid','g'));
+				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'], 'account_lid', 'g'));
 			}
 			elseif (isset($options['nogroup']))
 			{
@@ -505,7 +505,7 @@ 
 		}
 		if ($options['order'] == 'mime')
 		{
-			$options['need_mime'] = true;	// we need to return the mime colum
+			$options['need_mime'] = true; // we need to return the mime colum
 		}
 		// implicit show deleted files, if hidden is enabled (requires versioning!)
 		if (!empty($options['hidden']) && !isset($options['show-deleted']))
@@ -523,37 +523,37 @@ 
 			$base = array($base);
 		}
 		$result = array();
-		foreach($base as $path)
+		foreach ($base as $path)
 		{
 			if (!$url)
 			{
 				if ($path[0] != '/' || !self::stat($path)) continue;
-				$path = self::PREFIX . $path;
+				$path = self::PREFIX.$path;
 			}
 			if (!isset($options['remove']))
 			{
-				$options['remove'] = count($base) == 1 ? count(explode('/',$path))-3+(int)(substr($path,-1)!='/') : 0;
+				$options['remove'] = count($base) == 1 ? count(explode('/', $path)) - 3 + (int)(substr($path, -1) != '/') : 0;
 			}
 			$is_dir = is_dir($path);
 			if ((int)$options['mindepth'] == 0 && (!$dirs_last || !$is_dir))
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 			if ($is_dir && (!isset($options['maxdepth']) || ($options['maxdepth'] > 0 &&
 				$options['depth'] < $options['maxdepth'])) &&
 				($dir = @opendir($path, $context)))
 			{
-				while(($fname = readdir($dir)) !== false)
+				while (($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..') continue; // ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue; // ignore hidden files
 
 					$file = self::concat($path, $fname);
 
 					if ((int)$options['mindepth'] <= 1)
 					{
-						self::_check_add($options,$file,$result);
+						self::_check_add($options, $file, $result);
 					}
 					// only descend into subdirs, if it's a real dir (no link to a dir) or we should follow symlinks
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
@@ -563,7 +563,7 @@ 
 						if ($opts['maxdepth']) $opts['depth']++;
 						unset($opts['order']);
 						unset($opts['limit']);
-						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
+						foreach (self::find($options['url'] ? $file : self::parse_url($file, PHP_URL_PATH), $opts, true) as $p => $s)
 						{
 							unset($result[$p]);
 							$result[$p] = $s;
@@ -574,7 +574,7 @@ 
 			}
 			if ($is_dir && (int)$options['mindepth'] == 0 && $dirs_last)
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 		}
 		// sort code, to place directories before files, if $dirsontop enabled
@@ -584,7 +584,7 @@ 
 		if (isset($options['order']))
 		{
 			$sort = strtolower($options['sort']) == 'desc' ? '-' : '';
-			switch($options['order'])
+			switch ($options['order'])
 			{
 				// sort numerical
 				case 'size':
@@ -596,7 +596,7 @@ 
 					$code = $dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);';
 					// always use name as second sort criteria
 					$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 
 				// sort alphanumerical
@@ -615,7 +615,7 @@ 
 					{
 						$code = 'return '.$code;
 					}
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 			}
 			//echo "<p>order='$options[order]', sort='$options[sort]' --> uasort($result,create_function(,'$code'))=".array2string($ok)."</p>>\n";
@@ -624,13 +624,13 @@ 
 		self::$find_total = count($result);
 		if (isset($options['limit']))
 		{
-			list($limit,$start) = explode(',',$options['limit']);
+			list($limit, $start) = explode(',', $options['limit']);
 			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
 			{
-				$result = array_slice($result,(int)$start,(int)$limit,true);
+				$result = array_slice($result, (int)$start, (int)$limit, true);
 			}
 		}
 		//echo $path; _debug_array($result);
@@ -640,13 +640,13 @@ 
 			{
 				$exec_params = is_null($exec_params) ? array() : array($exec_params);
 			}
-			foreach($result as $path => &$stat)
+			foreach ($result as $path => &$stat)
 			{
 				$options = $exec_params;
-				array_unshift($options,$path);
-				array_push($options,$stat);
+				array_unshift($options, $path);
+				array_push($options, $stat);
 				//echo "calling ".print_r($exec,true).print_r($options,true)."\n";
-				$stat = call_user_func_array($exec,$options);
+				$stat = call_user_func_array($exec, $options);
 			}
 			return $result;
 		}
@@ -665,9 +665,9 @@ 
 	 * @param string $path name of path to add
 	 * @param array &$result here we add the stat for the key $path, if the checks are successful
 	 */
-	private static function _check_add($options,$path,&$result)
+	private static function _check_add($options, $path, &$result)
 	{
-		$type = $options['type'];	// 'd' or 'f'
+		$type = $options['type']; // 'd' or 'f'
 
 		if ($options['url'])
 		{
@@ -675,35 +675,35 @@ 
 		}
 		else
 		{
-			$stat = self::url_stat($path,STREAM_URL_STAT_LINK);
+			$stat = self::url_stat($path, STREAM_URL_STAT_LINK);
 		}
 		if (!$stat)
 		{
-			return;	// not found, should not happen
+			return; // not found, should not happen
 		}
-		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
+		if ($type && (($type == 'd') == !($stat['mode']&Vfs\Sqlfs\StreamWrapper::MODE_DIR) || // != is_dir() which can be true for symlinks
 		    $type == 'F' && is_dir($path)))	// symlink to a directory
 		{
-			return;	// wrong type
+			return; // wrong type
 		}
-		$stat = array_slice($stat,13);	// remove numerical indices 0-12
-		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
-		$stat['name'] = $options['remove'] > 0 ? implode('/',array_slice(explode('/',$stat['path']),$options['remove'])) : self::basename($path);
+		$stat = array_slice($stat, 13); // remove numerical indices 0-12
+		$stat['path'] = self::parse_url($path, PHP_URL_PATH);
+		$stat['name'] = $options['remove'] > 0 ? implode('/', array_slice(explode('/', $stat['path']), $options['remove'])) : self::basename($path);
 
 		if ($options['mime'] || $options['need_mime'])
 		{
 			$stat['mime'] = self::mime_content_type($path);
 		}
-		if (isset($options['name_preg']) && !preg_match($options['name_preg'],$stat['name']) ||
-			isset($options['path_preg']) && !preg_match($options['path_preg'],$path))
+		if (isset($options['name_preg']) && !preg_match($options['name_preg'], $stat['name']) ||
+			isset($options['path_preg']) && !preg_match($options['path_preg'], $path))
 		{
 			//echo "<p>!preg_match('{$options['name_preg']}','{$stat['name']}')</p>\n";
-			return;	// wrong name or path
+			return; // wrong name or path
 		}
 		if (isset($options['gid']) && $stat['gid'] != $options['gid'] ||
 			isset($options['uid']) && $stat['uid'] != $options['uid'])
 		{
-			return;	// wrong user or group
+			return; // wrong user or group
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
@@ -711,40 +711,40 @@ 
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 			else
 			{
-				list($type,$subtype) = explode('/',$options['mime']);
+				list($type, $subtype) = explode('/', $options['mime']);
 				// no subtype (eg. 'image') --> check only the main type
-				if ($subtype || substr($stat['mime'],0,strlen($type)+1) != $type.'/')
+				if ($subtype || substr($stat['mime'], 0, strlen($type) + 1) != $type.'/')
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 		}
-		if (isset($options['size']) && !self::_check_num($stat['size'],$options['size']) ||
+		if (isset($options['size']) && !self::_check_num($stat['size'], $options['size']) ||
 			(isset($options['empty']) && !!$options['empty'] !== !$stat['size']))
 		{
-			return;	// wrong size
+			return; // wrong size
 		}
-		if (isset($options['cmin']) && !self::_check_num(round((time()-$stat['ctime'])/60),$options['cmin']) ||
-			isset($options['mmin']) && !self::_check_num(round((time()-$stat['mtime'])/60),$options['mmin']) ||
-			isset($options['ctime']) && !self::_check_num(round((time()-$stat['ctime'])/86400),$options['ctime']) ||
-			isset($options['mtime']) && !self::_check_num(round((time()-$stat['mtime'])/86400),$options['mtime']))
+		if (isset($options['cmin']) && !self::_check_num(round((time() - $stat['ctime']) / 60), $options['cmin']) ||
+			isset($options['mmin']) && !self::_check_num(round((time() - $stat['mtime']) / 60), $options['mmin']) ||
+			isset($options['ctime']) && !self::_check_num(round((time() - $stat['ctime']) / 86400), $options['ctime']) ||
+			isset($options['mtime']) && !self::_check_num(round((time() - $stat['mtime']) / 86400), $options['mtime']))
 		{
-			return;	// not create/modified in the spezified time
+			return; // not create/modified in the spezified time
 		}
 		// do we return url or just vfs pathes
 		if (!$options['url'])
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		$result[$path] = $stat;
 	}
 
-	private static function _check_num($value,$argument)
+	private static function _check_num($value, $argument)
 	{
 		if (is_int($argument) && $argument >= 0 || $argument[0] != '-' && $argument[0] != '+')
 		{
@@ -757,7 +757,7 @@ 
 			return $value < abs($argument);
 		}
 		//echo "_check_num($value,$argument) check > == ".(int)($value > (int)substr($argument,1))."\n";
-		return $value > (int) substr($argument,1);
+		return $value > (int)substr($argument, 1);
 	}
 
 	/**
@@ -768,18 +768,18 @@ 
 	 * @throws egw_exception_assertion_failed when trainig to remove /, /apps or /home
 	 * @return array
 	 */
-	static function remove($urls,$allow_urls=false)
+	static function remove($urls, $allow_urls = false)
 	{
 		//error_log(__METHOD__.'('.array2string($urls).')');
 		// some precaution to never allow to (recursivly) remove /, /apps or /home
-		foreach((array)$urls as $url)
+		foreach ((array)$urls as $url)
 		{
-			if (preg_match('/^\/?(home|apps|)\/*$/',self::parse_url($url,PHP_URL_PATH)))
+			if (preg_match('/^\/?(home|apps|)\/*$/', self::parse_url($url, PHP_URL_PATH)))
 			{
 				throw new egw_exception_assertion_failed(__METHOD__.'('.array2string($urls).") Cautiously rejecting to remove folder '$url'!");
 			}
 		}
-		return self::find($urls,array('depth'=>true,'url'=>$allow_urls,'hidden'=>true),array(__CLASS__,'_rm_rmdir'));
+		return self::find($urls, array('depth'=>true, 'url'=>$allow_urls, 'hidden'=>true), array(__CLASS__, '_rm_rmdir'));
 	}
 
 	/**
@@ -792,11 +792,11 @@ 
 	{
 		if ($url[0] == '/')
 		{
-			$url = self::PREFIX . $url;
+			$url = self::PREFIX.$url;
 		}
 		if (is_dir($url) && !is_link($url))
 		{
-			return self::rmdir($url,0);
+			return self::rmdir($url, 0);
 		}
 		return self::unlink($url);
 	}
@@ -810,9 +810,9 @@ 
 	 * 	2 = self::WRITABLE, 1 = self::EXECUTABLE
 	 * @return boolean
 	 */
-	static function is_readable($path,$check = self::READABLE)
+	static function is_readable($path, $check = self::READABLE)
 	{
-		return self::check_access($path,$check);
+		return self::check_access($path, $check);
 	}
 
 	/**
@@ -826,7 +826,7 @@ 
 	 * @param int $user =null user used for check, if not current user (self::$user)
 	 * @return boolean
 	 */
-	static function check_access($path, $check, $stat=null, $user=null)
+	static function check_access($path, $check, $stat = null, $user = null)
 	{
 		if (is_null($stat) && $user && $user != self::$user)
 		{
@@ -841,7 +841,7 @@ 
 
 				$path_user_stat[$path][$user] = self::url_stat($path, 0);
 
-				self::clearstatcache($path);	// we need to clear the stat-cache after the call too, as the next call might be the regular user again!
+				self::clearstatcache($path); // we need to clear the stat-cache after the call too, as the next call might be the regular user again!
 			}
 			if (($stat = $path_user_stat[$path][$user]))
 			{
@@ -857,7 +857,7 @@ 
 			}
 			else
 			{
-				$ret = false;	// no access, if we can not stat the file
+				$ret = false; // no access, if we can not stat the file
 			}
 			self::$user = $backup_user;
 
@@ -881,20 +881,20 @@ 
 		// query stat array, if not given
 		if (is_null($stat))
 		{
-			$stat = self::url_stat($path,0);
+			$stat = self::url_stat($path, 0);
 		}
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check)");
 
 		if (!$stat)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) no stat array!");
-			return false;	// file not found
+			return false; // file not found
 		}
 		// check if we use an EGroupwre stream wrapper, or a stock php one
 		// if it's not an EGroupware one, we can NOT use uid, gid and mode!
-		if (($scheme = self::parse_url($stat['url'],PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
+		if (($scheme = self::parse_url($stat['url'], PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
 		{
-			switch($check)
+			switch ($check)
 			{
 				case self::READABLE:
 					return is_readable($stat['url']);
@@ -905,19 +905,19 @@ 
 			}
 		}
 		// check if other rights grant access
-		if (($stat['mode'] & $check) == $check)
+		if (($stat['mode']&$check) == $check)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via other rights!");
 			return true;
 		}
 		// check if there's owner access and we are the owner
-		if (($stat['mode'] & ($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
+		if (($stat['mode']&($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via owner rights!");
 			return true;
 		}
 		// check if there's a group access and we have the right membership
-		if (($stat['mode'] & ($check << 3)) == ($check << 3) && $stat['gid'])
+		if (($stat['mode']&($check << 3)) == ($check << 3) && $stat['gid'])
 		{
 			if (($memberships = $GLOBALS['egw']->accounts->memberships(self::$user, true)) && in_array(-abs($stat['gid']), $memberships))
 			{
@@ -926,7 +926,7 @@ 
 			}
 		}
 		// check backend for extended acls (only if path given)
-		$ret = $path && self::_call_on_backend('check_extended_acl',array(isset($stat['url'])?$stat['url']:$path,$check),true);	// true = fail silent if backend does not support
+		$ret = $path && self::_call_on_backend('check_extended_acl', array(isset($stat['url']) ? $stat['url'] : $path, $check), true); // true = fail silent if backend does not support
 
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) ".($ret ? 'backend extended acl granted access.' : 'no access!!!'));
 		return $ret;
@@ -941,7 +941,7 @@ 
 	 */
 	static function is_writable($path)
 	{
-		return self::is_readable($path,self::WRITABLE);
+		return self::is_readable($path, self::WRITABLE);
 	}
 
 	/**
@@ -953,7 +953,7 @@ 
 	 */
 	static function is_executable($path)
 	{
-		return self::is_readable($path,self::EXECUTABLE);
+		return self::is_readable($path, self::EXECUTABLE);
 	}
 
 	/**
@@ -964,7 +964,7 @@ 
 	 */
 	static function deny_script($path)
 	{
-		return self::_call_on_backend('deny_script',array($path),true);
+		return self::_call_on_backend('deny_script', array($path), true);
 	}
 
 	/**
@@ -983,11 +983,11 @@ 
 	 * @param boolean $session_only =false true: set eacl only for this session, does NO further checks currently!
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($url,$rights=null,$owner=null,$session_only=false)
+	static function eacl($url, $rights = null, $owner = null, $session_only = false)
 	{
 		if ($session_only)
 		{
-			$session_eacls =& egw_cache::getSession(__CLASS__, self::SESSION_EACL);
+			$session_eacls = & egw_cache::getSession(__CLASS__, self::SESSION_EACL);
 			$session_eacls[] = array(
 				'path'   => $url[0] == '/' ? $url : self::parse_url($url, PHP_URL_PATH),
 				'owner'  => $owner ? $owner : self::$user,
@@ -995,7 +995,7 @@ 
 			);
 			return true;
 		}
-		return self::_call_on_backend('eacl',array($url,$rights,$owner));
+		return self::_call_on_backend('eacl', array($url, $rights, $owner));
 	}
 
 	/**
@@ -1008,9 +1008,9 @@ 
 	 */
 	static function get_eacl($path)
 	{
-		$eacls = self::_call_on_backend('get_eacl',array($path),true);	// true = fail silent (no PHP Warning)
+		$eacls = self::_call_on_backend('get_eacl', array($path), true); // true = fail silent (no PHP Warning)
 
-		$session_eacls =& egw_cache::getSession(__CLASS__, self::SESSION_EACL);
+		$session_eacls = & egw_cache::getSession(__CLASS__, self::SESSION_EACL);
 		if ($session_eacls)
 		{
 			// eacl is recursive, therefore we have to match all parent-dirs too
@@ -1019,7 +1019,7 @@ 
 			{
 				$paths[] = $path = self::dirname($path);
 			}
-			foreach((array)$session_eacls as $eacl)
+			foreach ((array)$session_eacls as $eacl)
 			{
 				if (in_array($eacl['path'], $paths))
 				{
@@ -1042,9 +1042,9 @@ 
 	 * @param array $props array of array with values for keys 'name', 'ns', 'val' (null to delete the prop)
 	 * @return boolean true if props are updated, false otherwise (eg. ressource not found)
 	 */
-	static function proppatch($path,array $props)
+	static function proppatch($path, array $props)
 	{
-		return self::_call_on_backend('proppatch',array($path,$props));
+		return self::_call_on_backend('proppatch', array($path, $props));
 	}
 
 	/**
@@ -1061,9 +1061,9 @@ 
 	 * @return array|boolean array with props (values for keys 'name', 'ns', 'val'), or path => array of props for is_array($path)
 	 * 	false if $path does not exist
 	 */
-	static function propfind($path,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function propfind($path, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
-		return self::_call_on_backend('propfind',array($path,$ns),true);	// true = fail silent (no PHP Warning)
+		return self::_call_on_backend('propfind', array($path, $ns), true); // true = fail silent (no PHP Warning)
 	}
 
 	/**
@@ -1081,7 +1081,7 @@ 
 	 * @param int $mode =0 current mode of the file, necessary for +/- operation
 	 * @return int
 	 */
-	static function mode2int($set,$mode=0)
+	static function mode2int($set, $mode = 0)
 	{
 		if (is_int($set))		// already an integer
 		{
@@ -1090,23 +1090,23 @@ 
 		if (is_numeric($set))	// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set, 8, 10); // convert octal to decimal
 		}
-		foreach(explode(',',$set) as $s)
+		foreach (explode(',', $set) as $s)
 		{
 			$matches = null;
-			if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches))
+			if (!preg_match($use = '/^([ugoa]*)([+=-]+)([rwx]+)$/', $s, $matches))
 			{
-				$use = str_replace(array('/','^','$','(',')'),'',$use);
+				$use = str_replace(array('/', '^', '$', '(', ')'), '', $use);
 				throw new egw_exception_wrong_userinput("$s is not an allowed mode, use $use !");
 			}
-			$base = (strpos($matches[3],'r') !== false ? self::READABLE : 0) |
-				(strpos($matches[3],'w') !== false ? self::WRITABLE : 0) |
-				(strpos($matches[3],'x') !== false ? self::EXECUTABLE : 0);
+			$base = (strpos($matches[3], 'r') !== false ? self::READABLE : 0)|
+				(strpos($matches[3], 'w') !== false ? self::WRITABLE : 0)|
+				(strpos($matches[3], 'x') !== false ? self::EXECUTABLE : 0);
 
-			for($n = $m = 0; $n < strlen($matches[1]); $n++)
+			for ($n = $m = 0; $n < strlen($matches[1]); $n++)
 			{
-				switch($matches[1][$n])
+				switch ($matches[1][$n])
 				{
 					case 'o':
 						$m |= $base;
@@ -1119,10 +1119,10 @@ 
 						break;
 					default:
 					case 'a':
-						$m = $base | ($base << 3) | ($base << 6);
+						$m = $base|($base << 3)|($base << 6);
 				}
 			}
-			switch($matches[2])
+			switch ($matches[2])
 			{
 				case '+':
 					$mode |= $m;
@@ -1144,33 +1144,33 @@ 
 	 * @param int $mode
 	 * @return string
 	 */
-	static function int2mode( $mode )
+	static function int2mode($mode)
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if (($mode&self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		elseif (($mode&0xC000) == 0xC000) // Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		elseif ($mode&0x1000)     // FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		elseif ($mode&0x2000) // Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		elseif ($mode&0x4000) // Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		elseif ($mode&0x6000) // Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		elseif ($mode&0x8000) // Regular
 		{
 			$sP = '-';
 		}
@@ -1180,22 +1180,19 @@ 
 		}
 
 		// owner
-		$sP .= (($mode & 0x0100) ? 'r' : '-') .
-		(($mode & 0x0080) ? 'w' : '-') .
-		(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-		(($mode & 0x0800) ? 'S' : '-'));
+		$sP .= (($mode&0x0100) ? 'r' : '-').
+		(($mode&0x0080) ? 'w' : '-').
+		(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 		// group
-		$sP .= (($mode & 0x0020) ? 'r' : '-') .
-		(($mode & 0x0010) ? 'w' : '-') .
-		(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-		(($mode & 0x0400) ? 'S' : '-'));
+		$sP .= (($mode&0x0020) ? 'r' : '-').
+		(($mode&0x0010) ? 'w' : '-').
+		(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 		// world
-		$sP .= (($mode & 0x0004) ? 'r' : '-') .
-		(($mode & 0x0002) ? 'w' : '-') .
-		(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-		(($mode & 0x0200) ? 'T' : '-'));
+		$sP .= (($mode&0x0004) ? 'r' : '-').
+		(($mode&0x0002) ? 'w' : '-').
+		(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 		return $sP;
 	}
@@ -1208,26 +1205,26 @@ 
 	 * @param int $size =128
 	 * @return string
 	 */
-	static function mime_icon($mime_type, $et_image=true, $size=128)
+	static function mime_icon($mime_type, $et_image = true, $size = 128)
 	{
 		if ($mime_type == self::DIR_MIME_TYPE)
 		{
 			$mime_type = 'Directory';
 		}
-		if(!$mime_type)
+		if (!$mime_type)
 		{
 			$mime_type = 'unknown';
 		}
-		$mime_full = strtolower(str_replace	('/','_',$mime_type));
-		list($mime_part) = explode('_',$mime_full);
+		$mime_full = strtolower(str_replace('/', '_', $mime_type));
+		list($mime_part) = explode('_', $mime_full);
 
-		if (!($img=common::image('etemplate',$icon='mime'.$size.'_'.$mime_full)) &&
+		if (!($img = common::image('etemplate', $icon = 'mime'.$size.'_'.$mime_full)) &&
 			// check mime-alias-map before falling back to more generic icons
 			!(isset(mime_magic::$mime_alias_map[$mime_type]) &&
-				($img=common::image('etemplate',$icon='mime'.$size.'_'.str_replace('/','_',mime_magic::$mime_alias_map[$mime_full])))) &&
-			!($img=common::image('etemplate',$icon='mime'.$size.'_'.$mime_part)))
+				($img = common::image('etemplate', $icon = 'mime'.$size.'_'.str_replace('/', '_', mime_magic::$mime_alias_map[$mime_full])))) &&
+			!($img = common::image('etemplate', $icon = 'mime'.$size.'_'.$mime_part)))
 		{
-			$img = common::image('etemplate',$icon='mime'.$size.'_unknown');
+			$img = common::image('etemplate', $icon = 'mime'.$size.'_unknown');
 		}
 		if ($et_image === 'url')
 		{
@@ -1237,7 +1234,7 @@ 
 		{
 			return 'etemplate/'.$icon;
 		}
-		return html::image('etemplate',$icon,mime_magic::mime2label($mime_type));
+		return html::image('etemplate', $icon, mime_magic::mime2label($mime_type));
 	}
 
 	/**
@@ -1249,9 +1246,9 @@ 
 	static function hsize($size)
 	{
 		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
-		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
+		if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+		if ($size < 1024 * 1024 * 1024) return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
+		return sprintf('%3.1lfG', (float)$size / (1024 * 1024 * 1024));
 	}
 
 	/**
@@ -1261,7 +1258,7 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if (empty($_val))return 0;
 
 		$val = trim($_val);
 
@@ -1269,12 +1266,12 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if (isset($matches[2])) {
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
-			$val = (int) $matches[1];
+		if (isset($matches[1])) {
+			$val = (int)$matches[1];
 		}
 
 		switch (strtolower($last))
@@ -1290,7 +1287,7 @@ 
 			$val *= 1024;
 		}
 
-		return (int) $val;
+		return (int)$val;
 	}
 
 	/**
@@ -1301,8 +1298,8 @@ 
 	 */
 	static function basename($_path)
 	{
-		list($path) = explode('?',$_path);	// remove query
-		$parts = explode('/',$path);
+		list($path) = explode('?', $_path); // remove query
+		$parts = explode('/', $path);
 
 		return array_pop($parts);
 	}
@@ -1317,22 +1314,22 @@ 
 	 */
 	static function dirname($_url)
 	{
-		list($url,$query) = explode('?',$_url,2);	// strip the query first, as it can contain slashes
+		list($url, $query) = explode('?', $_url, 2); // strip the query first, as it can contain slashes
 
-		if ($url == '/' || $url[0] != '/' && self::parse_url($url,PHP_URL_PATH) == '/')
+		if ($url == '/' || $url[0] != '/' && self::parse_url($url, PHP_URL_PATH) == '/')
 		{
 			//error_log(__METHOD__."($url) returning FALSE: already in root!");
 			return false;
 		}
-		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		$parts = explode('/', $url);
+		if (substr($url, -1) == '/') array_pop($parts);
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
-			array_push($parts,'');	// scheme://host is wrong (no path), has to be scheme://host/
+			array_push($parts, ''); // scheme://host is wrong (no path), has to be scheme://host/
 		}
 		//error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : ''));
-		return implode('/',$parts).($query ? '?'.$query : '');
+		return implode('/', $parts).($query ? '?'.$query : '');
 	}
 
 	/**
@@ -1344,13 +1341,13 @@ 
 	 * @param array $stat =null stat for path, default queried by this function
 	 * @return boolean
 	 */
-	static function has_owner_rights($path,array $stat=null)
+	static function has_owner_rights($path, array $stat = null)
 	{
-		if (!$stat) $stat = self::url_stat($path,0);
+		if (!$stat) $stat = self::url_stat($path, 0);
 
-		return $stat['uid'] == self::$user ||	// user is the owner
-			self::$is_root ||					// class runs with root rights
-			!$stat['uid'] && $stat['gid'] && self::$is_admin;	// group directory and user is an eGW admin
+		return $stat['uid'] == self::$user || // user is the owner
+			self::$is_root || // class runs with root rights
+			!$stat['uid'] && $stat['gid'] && self::$is_admin; // group directory and user is an eGW admin
 	}
 
 	/**
@@ -1362,22 +1359,22 @@ 
 	 * @param string $relative relative path to add to $url
 	 * @return string
 	 */
-	static function concat($_url,$relative)
+	static function concat($_url, $relative)
 	{
-		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		list($url, $query) = explode('?', $_url, 2);
+		if (substr($url, -1) == '/') $url = substr($url, 0, -1);
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
-		while (strpos($ret,'/../') !== false)
+		while (strpos($ret, '/../') !== false)
 		{
-			list($a_str,$b_str) = explode('/../',$ret,2);
-			$a = explode('/',$a_str);
+			list($a_str, $b_str) = explode('/../', $ret, 2);
+			$a = explode('/', $a_str);
 			array_pop($a);
-			$b = explode('/',$b_str);
-			$ret = implode('/',array_merge($a,$b));
+			$b = explode('/', $b_str);
+			$ret = implode('/', array_merge($a, $b));
 		}
-		return $ret.($query ? (strpos($url,'?')===false ? '?' : '&').$query : '');
+		return $ret.($query ? (strpos($url, '?') === false ? '?' : '&').$query : '');
 	}
 
 	/**
@@ -1388,11 +1385,11 @@ 
 	 */
 	static function build_url(array $url_parts)
 	{
-		$url = (!isset($url_parts['scheme'])?'':$url_parts['scheme'].'://'.
-			(!isset($url_parts['user'])?'':$url_parts['user'].(!isset($url_parts['pass'])?'':':'.$url_parts['pass']).'@').
+		$url = (!isset($url_parts['scheme']) ? '' : $url_parts['scheme'].'://'.
+			(!isset($url_parts['user']) ? '' : $url_parts['user'].(!isset($url_parts['pass']) ? '' : ':'.$url_parts['pass']).'@').
 			$url_parts['host']).$url_parts['path'].
-			(!isset($url_parts['query'])?'':'?'.$url_parts['query']).
-			(!isset($url_parts['fragment'])?'':'?'.$url_parts['fragment']);
+			(!isset($url_parts['query']) ? '' : '?'.$url_parts['query']).
+			(!isset($url_parts['fragment']) ? '' : '?'.$url_parts['fragment']);
 		//error_log(__METHOD__.'('.array2string($url_parts).") = '".$url."'");
 		return $url;
 	}
@@ -1410,19 +1407,19 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string
 	 */
-	static function download_url($path,$force_download=false)
+	static function download_url($path, $force_download = false)
 	{
-		if (($url = self::_call_on_backend('download_url',array($path,$force_download),true)))
+		if (($url = self::_call_on_backend('download_url', array($path, $force_download), true)))
 		{
 			return $url;
 		}
 		if ($path[0] != '/')
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		// we do NOT need to encode % itself, as our path are already url encoded, with the exception of ' ' and '+'
 		// we urlencode double quotes '"', as that fixes many problems in html markup
-		return '/webdav.php'.strtr($path,array('+' => '%2B',' ' => '%20','"' => '%22')).($force_download ? '?download' : '');
+		return '/webdav.php'.strtr($path, array('+' => '%2B', ' ' => '%20', '"' => '%22')).($force_download ? '?download' : '');
 	}
 
 	/**
@@ -1450,12 +1447,12 @@ 
 		// eg: User selected /home/nathan/picture.jpg, /home/Pictures/logo.jpg
 		// We want /home
 		$dirs = array();
-		foreach($_files as $file)
+		foreach ($_files as $file)
 		{
 			$dirs[] = self::dirname($file);
 		}
 		$paths = array_unique($dirs);
-		if(count($paths) > 0)
+		if (count($paths) > 0)
 		{
 			// Shortest to longest
 			usort($paths, function($a, $b) {
@@ -1463,13 +1460,13 @@ 
 			});
 
 			// Start with shortest, pop off sub-directories that don't match
-			$parts = explode('/',$paths[0]);
-			foreach($paths as $path)
+			$parts = explode('/', $paths[0]);
+			foreach ($paths as $path)
 			{
-				$dirs = explode('/',$path);
-				foreach($dirs as $dir_index => $dir)
+				$dirs = explode('/', $path);
+				foreach ($dirs as $dir_index => $dir)
 				{
-					if($parts[$dir_index] && $parts[$dir_index] != $dir)
+					if ($parts[$dir_index] && $parts[$dir_index] != $dir)
 					{
 						unset($parts[$dir_index]);
 					}
@@ -1488,24 +1485,23 @@ 
 			// Linux
 			'/',
 			// Windows
-			'\\','?','%','*',':','|',/*'.',*/ '"','<','>'
+			'\\', '?', '%', '*', ':', '|', /*'.',*/ '"', '<', '>'
 		);
 
 		// A nice name for the user,
-		$filename = $GLOBALS['egw_info']['server']['site_title'] . '_' .
-			str_replace($replace,'_',(
+		$filename = $GLOBALS['egw_info']['server']['site_title'].'_'.
+			str_replace($replace, '_', (
 			$name ? $name : (
 			count($_files) == 1 ?
 			// Just one file (hopefully a directory?) selected
-			self::basename($_files[0]) :
-			// Use the lowest common directory (eg: Infolog, Open, nathan)
+			self::basename($_files[0]) : // Use the lowest common directory (eg: Infolog, Open, nathan)
 			self::basename($base_dir))
-		)) . '.zip';
+		)).'.zip';
 
 		// Make sure basename is a dir
-		if(substr($base_dir, -1) != '/')
+		if (substr($base_dir, -1) != '/')
 		{
-			$base_dir .='/';
+			$base_dir .= '/';
 		}
 
 		// Go into directories, find them all
@@ -1516,37 +1512,37 @@ 
 		$tempfiles = array();
 
 		// Give 1 second per file, but try to allow more time for big files when amount of files is low
-		set_time_limit((count($files)<=9?10:count($files)));
+		set_time_limit((count($files) <= 9 ? 10 : count($files)));
 
 		// Add files to archive
-		foreach($files as &$addfile)
+		foreach ($files as &$addfile)
 		{
 			// Use relative paths inside zip
 			$relative = substr($addfile, strlen($base_dir));
 
 			// Use safe names - replace unsafe chars, convert to ASCII (ZIP spec says CP437, but we'll try)
-			$path = explode('/',$relative);
-			$_name = translation::convert(translation::to_ascii(implode('/', str_replace($replace,'_',$path))),false,'ASCII');
+			$path = explode('/', $relative);
+			$_name = translation::convert(translation::to_ascii(implode('/', str_replace($replace, '_', $path))), false, 'ASCII');
 
 			// Don't go infinite with app entries
-			if(self::is_link($addfile))
+			if (self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if (in_array($addfile, $links)) continue;
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
-			if(self::is_dir($addfile))
+			if (self::is_dir($addfile))
 			{
 				// Zip directories
 				$zip->addEmptyDir($addfile);
 			}
-			else if(self::is_readable($addfile))
+			else if (self::is_readable($addfile))
 			{
 				// Copy to temp file, as ZipArchive fails to read VFS
 				$temp = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'zip_');
-				$from = self::fopen($addfile,'r');
-		 		$to = fopen($temp,'w');
-				if(!stream_copy_to_stream($from,$to) || !$zip->addFile($temp, $_name))
+				$from = self::fopen($addfile, 'r');
+		 		$to = fopen($temp, 'w');
+				if (!stream_copy_to_stream($from, $to) || !$zip->addFile($temp, $_name))
 				{
 					unlink($temp);
 					trigger_error("Could not add $addfile to ZIP file", E_USER_ERROR);
@@ -1557,10 +1553,10 @@ 
 
 				// Add comment in
 				$props = self::propfind($addfile);
-				if($props)
+				if ($props)
 				{
-					$comment = self::find_prop($props,'comment');
-					if($comment)
+					$comment = self::find_prop($props, 'comment');
+					if ($comment)
 					{
 						$zip->setCommentName($_name, $comment);
 					}
@@ -1570,34 +1566,34 @@ 
 		}
 
 		// Set a comment to help tell them apart
-		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']) . ' ' .egw_time::to());
+		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']).' '.egw_time::to());
 
 		// Record total for debug, not available after close()
 		$total_files = $zip->numFiles;
 
 		$result = $zip->close();
-		if(!$result || !filesize($zip_file))
+		if (!$result || !filesize($zip_file))
 		{
 			error_log('close() result: '.array2string($result));
 			return 'Error creating zip file';
 		}
 
-		error_log("Total files: " . $total_files . " Peak memory to zip: " . self::hsize(memory_get_peak_usage(true)));
+		error_log("Total files: ".$total_files." Peak memory to zip: ".self::hsize(memory_get_peak_usage(true)));
 
 		// Stop any buffering
-		while(ob_get_level() > 0)
+		while (ob_get_level() > 0)
 		{
 			ob_end_clean();
 		}
 
 		// Stream the file to the client
 		header("Content-Type: application/zip");
-		header("Content-Length: " . filesize($zip_file));
+		header("Content-Length: ".filesize($zip_file));
 		header("Content-Disposition: attachment; filename=\"$filename\"");
 		readfile($zip_file);
 
 		unlink($zip_file);
-		foreach($tempfiles as $temp_file)
+		foreach ($tempfiles as $temp_file)
 		{
 			unlink($temp_file);
 		}
@@ -1631,7 +1627,7 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
 	 * @return boolean true on success
 	 */
-	static function lock($path,&$token,&$timeout,&$owner,&$scope,&$type,$update=false,$check_writable=true)
+	static function lock($path, &$token, &$timeout, &$owner, &$scope, &$type, $update = false, $check_writable = true)
 	{
 		// we require write rights to lock/unlock a resource
 		if (!$path || $update && !$token || $check_writable &&
@@ -1649,28 +1645,28 @@ 
 
 		if ($update)	// Lock Update
 		{
-			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
+			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE, array('lock_owner', 'lock_exclusive', 'lock_write'), array(
 				'lock_path' => $path,
 				'lock_token' => $token,
-			),__LINE__,__FILE__)->fetch())))
+			), __LINE__, __FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
 				$scope = egw_db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = egw_db::from_bool($row['lock_write']) ? 'write' : 'read';
 
-				self::$db->update(self::LOCK_TABLE,array(
+				self::$db->update(self::LOCK_TABLE, array(
 					'lock_expires' => $timeout,
 					'lock_modified' => time(),
-				),array(
+				), array(
 					'lock_path' => $path,
 					'lock_token' => $token,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// HTTP_WebDAV_Server does this check before calling LOCK, but we want to be complete and usable outside WebDAV
-		elseif(($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
+		elseif (($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
 		{
-			$ret = false;	// there's alread a lock
+			$ret = false; // there's alread a lock
 		}
 		else
 		{
@@ -1689,7 +1685,7 @@ 
 				$token = HTTP_WebDAV_Server::_new_locktoken();
 			}
 			try {
-				self::$db->insert(self::LOCK_TABLE,array(
+				self::$db->insert(self::LOCK_TABLE, array(
 					'lock_token' => $token,
 					'lock_path'  => $path,
 					'lock_created' => time(),
@@ -1698,12 +1694,12 @@ 
 					'lock_expires' => $timeout,
 					'lock_exclusive' => $scope == 'exclusive',
 					'lock_write' => $type == 'write',
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 				$ret = true;
 			}
-			catch(egw_exception_db $e) {
+			catch (egw_exception_db $e) {
 				unset($e);
-				$ret = false;	// there's already a lock
+				$ret = false; // there's already a lock
 			}
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
@@ -1718,17 +1714,17 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
      * @return boolean true on success
      */
-    static function unlock($path,$token,$check_writable=true)
+    static function unlock($path, $token, $check_writable = true)
     {
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+        if (($ret = self::$db->delete(self::LOCK_TABLE, array(
         	'lock_path' => $path,
         	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
+        ), __LINE__, __FILE__) && self::$db->affected_rows()))
         {
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
@@ -1747,31 +1743,31 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n", '    '), '', print_r(self::$lock_cache[$path], true)));
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
 		// ToDo: additional check parent dirs for locks and children of the requested directory
 		//$where .= ' OR '.self::$db->quote($path).' LIKE '.self::$db->concat('lock_path',"'%'").' OR lock_path LIKE '.self::$db->quote($path.'%');
 		// ToDo: shared locks can return multiple rows
-		if (($result = self::$db->select(self::LOCK_TABLE,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (($result = self::$db->select(self::LOCK_TABLE, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
-			$result = egw_db::strip_array_keys($result,'lock_');
+			$result = egw_db::strip_array_keys($result, 'lock_');
 			$result['type']  = egw_db::from_bool($result['write']) ? 'write' : 'read';
 			$result['scope'] = egw_db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = egw_db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
+	        self::$db->delete(self::LOCK_TABLE, array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+	        ), __LINE__, __FILE__);
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s', $result['expires'])." --> removed");
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result ? array2string($result) : 'false'));
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1782,10 +1778,10 @@ 
 	 * @param array $content =null
 	 * @return array|boolean array with values for keys 'data','etemplate','name','label','help' or false if not supported by backend
 	 */
-	static function getExtraInfo($path,array $content=null)
+	static function getExtraInfo($path, array $content = null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info', array($path, $content), true)))	// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
@@ -1796,7 +1792,7 @@ 
 			'content' => $content,
 		))))
 		{
-			foreach($vfs_extra as $data)
+			foreach ($vfs_extra as $data)
 			{
 				$extra = $extra ? array_merge($extra, $data) : $data;
 			}
@@ -1811,7 +1807,7 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function app_entry_lock_path($app,$id)
+	static function app_entry_lock_path($app, $id)
 	{
 		return "/apps/$app/entry/$id";
 	}
@@ -1825,7 +1821,7 @@ 
 		//'%' => '%25',	// % should be encoded, but easily leads to double encoding, therefore better NOT encodig it
 		'#' => '%23',
 		'?' => '%3F',
-		'/' => '',	// better remove it completly
+		'/' => '', // better remove it completly
 	);
 
 	/**
@@ -1840,7 +1836,7 @@ 
 	 */
 	static public function encodePathComponent($component)
 	{
-		return str_replace(array_keys(self::$encode),array_values(self::$encode),$component);
+		return str_replace(array_keys(self::$encode), array_values(self::$encode), $component);
 	}
 
 	/**
@@ -1853,7 +1849,7 @@ 
 	 */
 	static public function encodePath($path)
 	{
-		return implode('/',self::encodePathComponent(explode('/',$path)));
+		return implode('/', self::encodePathComponent(explode('/', $path)));
 	}
 
 	/**
@@ -1908,7 +1904,7 @@ 
 		{
 			$image = common::image($mime_sub, 'navbar');
 		}
-		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
+		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png', 'jpeg', 'jpg', 'gif', 'bmp')) &&
 		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
@@ -1963,7 +1959,7 @@ 
 	 * @param array& $copied =null on return files copied
 	 * @return boolean true for no errors, false otherwise
 	 */
-	static public function copy_files(array $src, $dst, &$errs=null, array &$copied=null)
+	static public function copy_files(array $src, $dst, &$errs = null, array &$copied = null)
 	{
 		if (self::is_dir($dst))
 		{
@@ -1981,7 +1977,7 @@ 
 						if ($file !== $target)
 						{
 							// Create the target directory
-							self::mkdir($target,null,STREAM_MKDIR_RECURSIVE);
+							self::mkdir($target, null, STREAM_MKDIR_RECURSIVE);
 
 							$copied[] = $file;
 							$copied[] = $target; // < newly created folder must not be copied again!
@@ -2024,7 +2020,7 @@ 
 	{
 		if (self::is_dir($dst))
 		{
-			foreach($src as $file)
+			foreach ($src as $file)
 			{
 				$target = self::concat($dst, self::basename($file));
 
@@ -2056,7 +2052,7 @@ 
 	 * @param boolean $check_is_uploaded_file =true should method perform an is_uploaded_file check, default yes
 	 * @return boolean|array stat array on success, false on error
 	 */
-	static public function copy_uploaded($src,$target,$props=null,$check_is_uploaded_file=true)
+	static public function copy_uploaded($src, $target, $props = null, $check_is_uploaded_file = true)
 	{
 		$tmp_name = is_array($src) ? $src['tmp_name'] : $src;
 
@@ -2076,12 +2072,12 @@ 
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props)) $props = array(array('name' => 'comment', 'val' => $props));
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
-				foreach($props as $name => $val)
+				foreach ($props as $name => $val)
 				{
 					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
 					{
@@ -2099,8 +2095,8 @@ 
 			// set props before copying the file, so notifications already contain them
 			if (!self::stat($target))
 			{
-				self::touch($target);	// create empty file, to be able to attach properties
-				self::$treat_as_new = true;	// notify as new
+				self::touch($target); // create empty file, to be able to attach properties
+				self::$treat_as_new = true; // notify as new
 			}
 			self::proppatch($target, $props);
 		}
@@ -2114,7 +2110,7 @@ 
 		}
 		else
 		{
-			$ret = copy($tmp_name,self::PREFIX.$target) ? self::stat($target) : false;
+			$ret = copy($tmp_name, self::PREFIX.$target) ? self::stat($target) : false;
 		}
 		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
 		return $ret;

api/src/Vfs/Sqlfs/StreamWrapper.php

Indentation +5 added lines, -5 removed lines

@@ -447,10 +447,10 @@ 
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( )
@@ -485,7 +485,7 @@ 
  	 * See fseek() for more information about these parameters.
  	 *
  	 * @param integer $offset
-  	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
+ 	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
  	 * 							SEEK_CUR - 1 - Set position to current location plus offset.
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
@@ -681,8 +681,8 @@ 
 		$maxdepth=10;
 		$depth2propagate = (int)$depth + 1;
 		if ($depth2propagate > $maxdepth) return is_dir($pathname);
-    	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
-    	return is_dir($pathname) || @mkdir($pathname, $mode);
+		is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
+		return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
 
 	/**

Doc Comments +8 added lines, -4 removed lines

@@ -515,7 +515,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
+	 * @return boolean TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
 	function stream_flush ( )
 	{
@@ -556,6 +556,7 @@ 
 	 * In order for the appropriate error message to be returned, do not define this method if your wrapper does not support unlinking!
 	 *
 	 * @param string $url
+	 * @param integer $parent_stat
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
 	static function unlink ( $url, $parent_stat=null )
@@ -684,6 +685,8 @@ 
 
 	/**
 	 * due to problems with recursive directory creation, we have our own here
+	 * @param false|string $pathname
+	 * @param integer $mode
 	 */
 	protected static function mkdir_recursive($pathname, $mode, $depth=0)
 	{
@@ -1014,7 +1017,7 @@ 
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param int $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{
@@ -1717,7 +1720,7 @@ 
 	/**
 	 * Just a little abstration 'til I know how to organise stuff like that with PDO
 	 *
-	 * @param mixed $time
+	 * @param integer $time
 	 * @return string Y-m-d H:i:s
 	 */
 	static protected function _pdo_timestamp($time)
@@ -1802,6 +1805,7 @@ 
 	 * Replace the password of an url with '...' for error messages
 	 *
 	 * @param string &$url
+	 * @param string $url
 	 */
 	static protected function _remove_password(&$url)
 	{
@@ -1817,7 +1821,7 @@ 
 	/**
 	 * Get storage mode from url (get parameter 'storage', eg. ?storage=db)
 	 *
-	 * @param string|array $url complete url or array of url-parts from parse_url
+	 * @param string $url complete url or array of url-parts from parse_url
 	 * @return int self::STORE2FS or self::STORE2DB
 	 */
 	static function url2operation($url)

Spacing +234 added lines, -236 removed lines

@@ -76,7 +76,7 @@ 
 	/**
 	 * mode-bits, which have to be set for directories
 	 */
-	const MODE_DIR =   040000;
+	const MODE_DIR = 040000;
 	/**
 	 * mode-bits, which have to be set for links
 	 */
@@ -179,10 +179,10 @@ 
 	 *
 	 * @param string $path ='/'
 	 */
-	public static function clearstatcache($path='/')
+	public static function clearstatcache($path = '/')
 	{
 		//error_log(__METHOD__."('$path')");
-		unset($path);	// not used
+		unset($path); // not used
 
 		self::$stat_cache = array();
 
@@ -202,32 +202,32 @@ 
 	 * @param array $overwrite_new =null if set create new file with values overwriten by the given ones
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $url, $mode, $options, &$opened_path, array $overwrite_new=null )
+	function stream_open($url, $mode, $options, &$opened_path, array $overwrite_new = null)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 		$this->operation = self::url2operation($url);
 		$dir = Vfs::dirname($url);
 
 		$this->opened_path = $opened_path = $path;
-		$this->opened_mode = $mode = str_replace('b','',$mode);	// we are always binary, like every Linux system
+		$this->opened_mode = $mode = str_replace('b', '', $mode); // we are always binary, like every Linux system
 		$this->opened_stream = null;
 
 		parse_str(parse_url($url, PHP_URL_QUERY), $this->dir_url_params);
 
-		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($overwrite_new) || !($stat = static::url_stat($path, STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
-			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
-				$mode[0] == 'x' && $stat ||	// or file should not exist, but does
-				!($dir_stat=static::url_stat($dir,STREAM_URL_STAT_QUIET)) ||	// or parent dir does not exist																																			create it
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat))	// or we are not allowed to 																																			create it
+			if ($mode[0] == 'r' || // does $mode require the file to exist (r,r+)
+				$mode[0] == 'x' && $stat || // or file should not exist, but does
+				!($dir_stat = static::url_stat($dir, STREAM_URL_STAT_QUIET)) || // or parent dir does not exist																																			create it
+				!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat))	// or we are not allowed to 																																			create it
 			{
 				self::_remove_password($url);
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!", E_USER_WARNING);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
@@ -242,7 +242,7 @@ 
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
 				'fs_dir'  => $dir_stat['ino'],
 				// we use the mode of the dir, so files in group dirs stay accessible by all members
-				'fs_mode' => $dir_stat['mode'] & 0666,
+				'fs_mode' => $dir_stat['mode']&0666,
 				// for the uid we use the uid of the dir if not 0=root or the current user otherwise
 				'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : Vfs::$user,
 				// we allways use the group of the dir
@@ -250,11 +250,11 @@ 
 				'fs_created'  => self::_pdo_timestamp(time()),
 				'fs_modified' => self::_pdo_timestamp(time()),
 				'fs_creator'  => Vfs::$user,
-				'fs_mime'     => 'application/octet-stream',	// required NOT NULL!
+				'fs_mime'     => 'application/octet-stream', // required NOT NULL!
 				'fs_size'     => 0,
 				'fs_active'   => self::_pdo_boolean(true),
 			);
-			if ($overwrite_new) $values = array_merge($values,$overwrite_new);
+			if ($overwrite_new) $values = array_merge($values, $overwrite_new);
 			if (!$stmt->execute($values) || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
 			{
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
@@ -267,35 +267,35 @@ 
 				$this->opened_stream = tmpfile();
 			}
 			// create the hash-dirs, if they not yet exist
-			elseif(!file_exists($fs_dir=Vfs::dirname(self::_fs_path($this->opened_fs_id))))
+			elseif (!file_exists($fs_dir = Vfs::dirname(self::_fs_path($this->opened_fs_id))))
 			{
 				$umaskbefore = umask();
 				if (self::LOG_LEVEL > 1) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
-				self::mkdir_recursive($fs_dir,0700,true);
+				self::mkdir_recursive($fs_dir, 0700, true);
 			}
 		}
 		// check if opend file is a directory
-		elseif($stat && ($stat['mode'] & self::MODE_DIR) == self::MODE_DIR)
+		elseif ($stat && ($stat['mode']&self::MODE_DIR) == self::MODE_DIR)
 		{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) Is a directory!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!", E_USER_WARNING);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
 		}
 		else
 		{
-			if ($mode == 'r' && !Vfs::check_access($url,Vfs::READABLE ,$stat) ||// we are not allowed to read
-				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// or edit it
+			if ($mode == 'r' && !Vfs::check_access($url, Vfs::READABLE, $stat) || // we are not allowed to read
+				$mode != 'r' && !Vfs::check_access($url, Vfs::WRITABLE, $stat))	// or edit it
 			{
 				self::_remove_password($url);
 				$op = $mode == 'r' ? 'read' : 'edited';
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!", E_USER_WARNING);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
@@ -304,9 +304,9 @@ 
 
 			if ($this->operation == self::STORE2DB)
 			{
-				$stmt = self::$pdo->prepare($sql='SELECT fs_content FROM '.self::TABLE.' WHERE fs_id=?');
+				$stmt = self::$pdo->prepare($sql = 'SELECT fs_content FROM '.self::TABLE.' WHERE fs_id=?');
 				$stmt->execute(array($stat['ino']));
-				$stmt->bindColumn(1,$this->opened_stream,\PDO::PARAM_LOB);
+				$stmt->bindColumn(1, $this->opened_stream, \PDO::PARAM_LOB);
 				$stmt->fetch(\PDO::FETCH_BOUND);
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
 				// PDOStatement::bindColumn(,,\PDO::PARAM_LOB) is not working for MySQL, content is returned as string :-(
@@ -325,7 +325,7 @@ 
 		if ($this->operation == self::STORE2FS)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
-			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id),$mode)) && $new_file)
+			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id), $mode)) && $new_file)
 			{
 				// delete db entry again, if we are not able to open a new(!) file
 				unset($stmt);
@@ -335,7 +335,7 @@ 
 		}
 		if ($mode[0] == 'a')	// append modes: a, a+
 		{
-			$this->stream_seek(0,SEEK_END);
+			$this->stream_seek(0, SEEK_END);
 		}
 		if (!is_resource($this->opened_stream)) error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
 
@@ -347,7 +347,7 @@ 
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -358,7 +358,7 @@ 
 
 		if ($this->opened_mode != 'r')
 		{
-			$this->stream_seek(0,SEEK_END);
+			$this->stream_seek(0, SEEK_END);
 
 			// we need to update the mime-type, size and content (if STORE2DB)
 			$values = array(
@@ -381,10 +381,10 @@ 
 			else
 			{
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_modified=:fs_modified,fs_content=:fs_content WHERE fs_id=:fs_id');
-				$this->stream_seek(0,SEEK_SET);	// rewind to the start
-				foreach($values as $name => &$value)
+				$this->stream_seek(0, SEEK_SET); // rewind to the start
+				foreach ($values as $name => &$value)
 				{
-					$stmt->bindParam($name,$value);
+					$stmt->bindParam($name, $value);
 				}
 				$stmt->bindParam('fs_content', $this->opened_stream, \PDO::PARAM_LOB);
 				if (!($ret = $stmt->execute()))
@@ -417,13 +417,13 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count )
+	function stream_read($count)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($count) pos=$this->opened_pos");
 
 		if (is_resource($this->opened_stream))
 		{
-			return fread($this->opened_stream,$count);
+			return fread($this->opened_stream, $count);
 		}
 		return false;
 	}
@@ -439,13 +439,13 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data )
+	function stream_write($data)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($data)");
 
 		if (is_resource($this->opened_stream))
 		{
-			return fwrite($this->opened_stream,$data);
+			return fwrite($this->opened_stream, $data);
 		}
 		return false;
 	}
@@ -462,7 +462,7 @@ 
   	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
-	function stream_eof ( )
+	function stream_eof( )
 	{
 		if (is_resource($this->opened_stream))
 		{
@@ -476,7 +476,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -499,13 +499,13 @@ 
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
  	 */
-	function stream_seek ( $offset, $whence )
+	function stream_seek($offset, $whence)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($offset,$whence)");
 
 		if (is_resource($this->opened_stream))
 		{
-			return !fseek($this->opened_stream,$offset,$whence);	// fseek returns 0 on success and -1 on failure
+			return !fseek($this->opened_stream, $offset, $whence); // fseek returns 0 on success and -1 on failure
 		}
 		return false;
 	}
@@ -517,7 +517,7 @@ 
 	 *
 	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
-	function stream_flush ( )
+	function stream_flush( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -542,11 +542,11 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($this->opened_path)");
 
-		return $this->url_stat($this->opened_path,0);
+		return $this->url_stat($this->opened_path, 0);
 	}
 
 	/**
@@ -558,27 +558,27 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $url, $parent_stat=null )
+	static function unlink($url, $parent_stat = null)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		// need to get parent stat from Sqlfs, not Vfs
 		if (!isset($parent_stat)) $parent_stat = static::url_stat(Vfs::dirname($path), STREAM_URL_STAT_LINK);
 
-		if (!$parent_stat || !($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) ||
-			!Vfs::check_access(Vfs::dirname($path),Vfs::WRITABLE, $parent_stat))
+		if (!$parent_stat || !($stat = self::url_stat($path, STREAM_URL_STAT_LINK)) ||
+			!Vfs::check_access(Vfs::dirname($path), Vfs::WRITABLE, $parent_stat))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		if ($stat['mime'] == self::DIR_MIME_TYPE)
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) is NO file!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
 		unset(self::$stat_cache[$path]);
@@ -586,7 +586,7 @@ 
 		if (($ret = $stmt->execute(array('fs_id' => $stat['ino']))))
 		{
 			if (self::url2operation($url) == self::STORE2FS &&
-				($stat['mode'] & self::MODE_LINK) != self::MODE_LINK)
+				($stat['mode']&self::MODE_LINK) != self::MODE_LINK)
 			{
 				unlink(self::_fs_path($stat['ino']));
 			}
@@ -610,13 +610,13 @@ 
 	 * @param string $url_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function rename ( $url_from, $url_to)
+	static function rename($url_from, $url_to)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url_from,$url_to)");
 
-		$path_from = Vfs::parse_url($url_from,PHP_URL_PATH);
+		$path_from = Vfs::parse_url($url_from, PHP_URL_PATH);
 		$from_dir = Vfs::dirname($path_from);
-		$path_to = Vfs::parse_url($url_to,PHP_URL_PATH);
+		$path_to = Vfs::parse_url($url_to, PHP_URL_PATH);
 		$to_dir = Vfs::dirname($path_to);
 		$operation = self::url2operation($url_from);
 
@@ -627,14 +627,14 @@ 
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		if (!Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = static::url_stat($to_dir, 0)))
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
-			return false;	// no permission or parent-dir does not exist
+			return false; // no permission or parent-dir does not exist
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
 		// for our vfs too, we abort here with an error, like the filesystem one does
@@ -645,10 +645,10 @@ 
 			self::_remove_password($url_to);
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		// if destination file already exists, delete it
-		if ($to_stat && !static::unlink($url_to,$operation))
+		if ($to_stat && !static::unlink($url_to, $operation))
 		{
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
@@ -669,7 +669,7 @@ 
 
 		// check if extension changed and update mime-type in that case (as we currently determine mime-type by it's extension!)
 		// fixes eg. problems with MsWord storing file with .tmp extension and then renaming to .doc
-		if ($ok && ($new_mime = Vfs::mime_content_type($url_to,true)) != Vfs::mime_content_type($url_to))
+		if ($ok && ($new_mime = Vfs::mime_content_type($url_to, true)) != Vfs::mime_content_type($url_to))
 		{
 			//echo "<p>Vfs::nime_content_type($url_to,true) = $new_mime</p>\n";
 			$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mime=:fs_mime WHERE fs_id=:fs_id');
@@ -685,9 +685,9 @@ 
 	/**
 	 * due to problems with recursive directory creation, we have our own here
 	 */
-	protected static function mkdir_recursive($pathname, $mode, $depth=0)
+	protected static function mkdir_recursive($pathname, $mode, $depth = 0)
 	{
-		$maxdepth=10;
+		$maxdepth = 10;
 		$depth2propagate = (int)$depth + 1;
 		if ($depth2propagate > $maxdepth) return is_dir($pathname);
     	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
@@ -705,47 +705,47 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ( $url, $mode, $options )
+	static function mkdir($url, $mode, $options)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__." called from:".function_backtrace());
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (self::url_stat($path,STREAM_URL_STAT_QUIET))
+		if (self::url_stat($path, STREAM_URL_STAT_QUIET))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
 				//throw new Exception(__METHOD__."('$url',$mode,$options) already exist!");
-				trigger_error(__METHOD__."('$url',$mode,$options) already exist!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$mode,$options) already exist!", E_USER_WARNING);
 			}
 			return false;
 		}
 		$parent_path = Vfs::dirname($path);
-		if (($query = Vfs::parse_url($url,PHP_URL_QUERY))) $parent_path .= '?'.$query;
-		$parent = self::url_stat($parent_path,STREAM_URL_STAT_QUIET);
+		if (($query = Vfs::parse_url($url, PHP_URL_QUERY))) $parent_path .= '?'.$query;
+		$parent = self::url_stat($parent_path, STREAM_URL_STAT_QUIET);
 
 		// check if we should also create all non-existing path components and our parent does not exist,
 		// if yes call ourself recursive with the parent directory
-		if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
+		if (($options&STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
-			if (!self::mkdir($parent_path,$mode,$options))
+			if (!self::mkdir($parent_path, $mode, $options))
 			{
 				return false;
 			}
-			$parent = self::url_stat($parent_path,0);
+			$parent = self::url_stat($parent_path, 0);
 		}
-		if (!$parent || !Vfs::check_access($parent_path,Vfs::WRITABLE,$parent))
+		if (!$parent || !Vfs::check_access($parent_path, Vfs::WRITABLE, $parent))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) permission denied!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!", E_USER_WARNING);
 			}
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_creator'.
@@ -766,9 +766,9 @@ 
 			// check if some other process created the directory parallel to us (sqlfs would gives SQL errors later!)
 			$new_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq');
 
-			unset($stmt);	// free statement object, on some installs a new prepare fails otherwise!
+			unset($stmt); // free statement object, on some installs a new prepare fails otherwise!
 
-			$stmt = self::$pdo->prepare($q='SELECT COUNT(*) FROM '.self::TABLE.
+			$stmt = self::$pdo->prepare($q = 'SELECT COUNT(*) FROM '.self::TABLE.
 				' WHERE fs_dir=:fs_dir AND fs_active=:fs_active AND fs_name'.self::$case_sensitive_equal.':fs_name');
 			if ($stmt->execute(array(
 				'fs_dir'  => $parent['ino'],
@@ -792,25 +792,24 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	static function rmdir ( $url, $options )
+	static function rmdir($url, $options)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 		$parent = Vfs::dirname($path);
 
-		if (!($stat = self::url_stat($path,0)) || $stat['mime'] != self::DIR_MIME_TYPE ||
-			!Vfs::check_access($parent, Vfs::WRITABLE, static::url_stat($parent,0)))
+		if (!($stat = self::url_stat($path, 0)) || $stat['mime'] != self::DIR_MIME_TYPE ||
+			!Vfs::check_access($parent, Vfs::WRITABLE, static::url_stat($parent, 0)))
 		{
 			self::_remove_password($url);
-			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
-				($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
+			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' : ($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
 			if (self::LOG_LEVEL) error_log($err_msg);
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error($err_msg,E_USER_WARNING);
+				trigger_error($err_msg, E_USER_WARNING);
 			}
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('SELECT COUNT(*) FROM '.self::TABLE.' WHERE fs_dir=?');
 		$stmt->execute(array($stat['ino']));
@@ -818,19 +817,19 @@ 
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$options) dir is not empty!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error(__METHOD__."('$url',$options) dir is not empty!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$options) dir is not empty!", E_USER_WARNING);
 			}
 			return false;
 		}
 		unset(self::$stat_cache[$path]);
-		unset($stmt);	// free statement object, on some installs a new prepare fails otherwise!
+		unset($stmt); // free statement object, on some installs a new prepare fails otherwise!
 
 		$del_stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=?');
 		if (($ret = $del_stmt->execute(array($stat['ino']))))
 		{
-			self::eacl($path,null,false,$stat['ino']);	// remove all (=false) evtl. existing extended acl for that dir
+			self::eacl($path, null, false, $stat['ino']); // remove all (=false) evtl. existing extended acl for that dir
 			// delete props
 			unset($del_stmt);
 			$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=?');
@@ -846,25 +845,25 @@ 
 	 * @param int $time =null modification time (unix timestamp), default null = current time
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 */
-	static function touch($url,$time=null,$atime=null)
+	static function touch($url, $time = null, $atime = null)
 	{
-		unset($atime);	// not used
+		unset($atime); // not used
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $time)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,STREAM_URL_STAT_QUIET)))
+		if (!($stat = self::url_stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			// file does not exist --> create an empty one
-			if (!($f = fopen(self::SCHEME.'://default'.$path,'w')) || !fclose($f))
+			if (!($f = fopen(self::SCHEME.'://default'.$path, 'w')) || !fclose($f))
 			{
 				return false;
 			}
 			if (is_null($time))
 			{
-				return true;	// new (empty) file created with current mod time
+				return true; // new (empty) file created with current mod time
 			}
-			$stat = self::url_stat($path,0);
+			$stat = self::url_stat($path, 0);
 		}
 		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_modified=:fs_modified,fs_modifier=:fs_modifier WHERE fs_id=:fs_id');
@@ -883,39 +882,39 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	static function chown($url,$owner)
+	static function chown($url, $owner)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::$is_root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only root can do that!");
-			trigger_error("Only root can do that!",E_USER_WARNING);
+			trigger_error("Only root can do that!", E_USER_WARNING);
 			return false;
 		}
 		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))	// not a user (0 == root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!");
-			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!",E_USER_WARNING);
+			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!", E_USER_WARNING);
 			//throw new Exception(__METHOD__."($url,$owner) Unknown (numeric) user id!");
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
 		self::$stat_cache[$path]['fs_uid'] = $owner;
 
 		return $stmt->execute(array(
-			'fs_uid' => (int) $owner,
+			'fs_uid' => (int)$owner,
 			'fs_id' => $stat['ino'],
 		));
 	}
@@ -927,36 +926,36 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	static function chgrp($url,$owner)
+	static function chgrp($url, $owner)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
-		if (!Vfs::has_owner_rights($path,$stat))
+		if (!Vfs::has_owner_rights($path, $stat))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only owner or root can do that!");
-			trigger_error("Only owner or root can do that!",E_USER_WARNING);
+			trigger_error("Only owner or root can do that!", E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0) $owner = -$owner;	// sqlfs uses a positiv group id's!
+		if ($owner < 0) $owner = -$owner; // sqlfs uses a positiv group id's!
 
 		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))	// not a group
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) group id!");
-			trigger_error("Unknown (numeric) group id!",E_USER_WARNING);
+			trigger_error("Unknown (numeric) group id!", E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_gid=:fs_gid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
 		self::$stat_cache[$path]['fs_gid'] = $owner;
 
 		return $stmt->execute(array(
@@ -972,38 +971,38 @@ 
 	 * @param int $mode
 	 * @return boolean
 	 */
-	static function chmod($url,$mode)
+	static function chmod($url, $mode)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $mode)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
-		if (!Vfs::has_owner_rights($path,$stat))
+		if (!Vfs::has_owner_rights($path, $stat))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) only owner or root can do that!");
-			trigger_error("Only owner or root can do that!",E_USER_WARNING);
+			trigger_error("Only owner or root can do that!", E_USER_WARNING);
 			return false;
 		}
 		if (!is_numeric($mode))	// not a mode
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no (numeric) mode!");
-			trigger_error("No (numeric) mode!",E_USER_WARNING);
+			trigger_error("No (numeric) mode!", E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mode=:fs_mode WHERE fs_id=:fs_id');
 
 		// update stat cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
-		self::$stat_cache[$path]['fs_mode'] = ((int) $mode) & 0777;
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
+		self::$stat_cache[$path]['fs_mode'] = ((int)$mode)&0777;
 
 		return $stmt->execute(array(
-			'fs_mode' => ((int) $mode) & 0777,		// we dont store the file and dir bits, give int overflow!
+			'fs_mode' => ((int)$mode)&0777, // we dont store the file and dir bits, give int overflow!
 			'fs_id' => $stat['ino'],
 		));
 	}
@@ -1016,15 +1015,15 @@ 
 	 * @param int $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		$this->opened_dir = null;
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($url,0)) || 		// dir not found
-			$stat['mime'] != self::DIR_MIME_TYPE ||		// no dir
-			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))	// no access
+		if (!($stat = self::url_stat($url, 0)) || // dir not found
+			$stat['mime'] != self::DIR_MIME_TYPE || // no dir
+			!Vfs::check_access($url, Vfs::EXECUTABLE|Vfs::READABLE, $stat))	// no access
 		{
 			self::_remove_password($url);
 			$msg = $stat['mime'] != self::DIR_MIME_TYPE ? "$url is no directory" : 'permission denied';
@@ -1043,13 +1042,13 @@ 
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
 		if ($stmt->execute(array($stat['ino'])))
 		{
-			foreach($stmt as $file)
+			foreach ($stmt as $file)
 			{
 				$this->opened_dir[] = $file['fs_name'];
-				self::$stat_cache[Vfs::concat($path,$file['fs_name'])] = $file;
+				self::$stat_cache[Vfs::concat($path, $file['fs_name'])] = $file;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ', $this->opened_dir));
 		reset($this->opened_dir);
 
 		return true;
@@ -1082,26 +1081,26 @@ 
 	 * @param boolean $eacl_access =null allows extending classes to pass the value of their check_extended_acl() method (no lsb!)
 	 * @return array
 	 */
-	static function url_stat ( $url, $flags, $eacl_access=null )
+	static function url_stat($url, $flags, $eacl_access = null)
 	{
-		static $max_subquery_depth=null;
+		static $max_subquery_depth = null;
 		if (is_null($max_subquery_depth))
 		{
 			$max_subquery_depth = $GLOBALS['egw_info']['server']['max_subquery_depth'];
-			if (!$max_subquery_depth) $max_subquery_depth = 7;	// setting current default of 7, if nothing set
+			if (!$max_subquery_depth) $max_subquery_depth = 7; // setting current default of 7, if nothing set
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags,$eacl_access)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		// webdav adds a trailing slash to dirs, which causes url_stat to NOT find the file otherwise
-		if ($path != '/' && substr($path,-1) == '/')
+		if ($path != '/' && substr($path, -1) == '/')
 		{
-			$path = substr($path,0,-1);
+			$path = substr($path, 0, -1);
 		}
 		if (empty($path))
 		{
-			return false;	// is invalid and gives sql error
+			return false; // is invalid and gives sql error
 		}
 		// check if we already have the info from the last dir_open call, as the old vfs reads it anyway from the db
 		if (self::$stat_cache && isset(self::$stat_cache[$path]) && (is_null($eacl_access) || self::$stat_cache[$path] !== false))
@@ -1116,28 +1115,28 @@ 
 		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.self::$extra_columns.
 			' FROM '.self::TABLE.' WHERE fs_active='.self::_pdo_boolean(true).
 			' AND fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
-		$parts = explode('/',$path);
+		$parts = explode('/', $path);
 
 		// if we have extendes acl access to the url, we dont need and can NOT include the sql for the readable check
 		if (is_null($eacl_access))
 		{
-			$eacl_access = self::check_extended_acl($path,Vfs::READABLE);	// should be static::check_extended_acl, but no lsb!
+			$eacl_access = self::check_extended_acl($path, Vfs::READABLE); // should be static::check_extended_acl, but no lsb!
 		}
 
 		try {
-			foreach($parts as $n => $name)
+			foreach ($parts as $n => $name)
 			{
 				if ($n == 0)
 				{
-					$query = (int) ($path != '/');	// / always has fs_id == 1, no need to query it ($path=='/' needs fs_dir=0!)
+					$query = (int)($path != '/'); // / always has fs_id == 1, no need to query it ($path=='/' needs fs_dir=0!)
 				}
-				elseif ($n < count($parts)-1)
+				elseif ($n < count($parts) - 1)
 				{
 					// MySQL 5.0 has a nesting limit for subqueries
 					// --> we replace the so far cumulated subqueries with their result
 					// no idea about the other DBMS, but this does NOT hurt ...
 					// --> depth limit of subqueries is now dynamicly decremented in catch
-					if ($n > 1 && !(($n-1) % $max_subquery_depth) && !($query = self::$pdo->query($query)->fetchColumn()))
+					if ($n > 1 && !(($n - 1) % $max_subquery_depth) && !($query = self::$pdo->query($query)->fetchColumn()))
 					{
 						if (self::LOG_LEVEL > 1)
 						{
@@ -1164,7 +1163,7 @@ 
 				}
 				else
 				{
-					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
+					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?', 'fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name), $base_query).'('.$query.')';
 				}
 			}
 			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
@@ -1190,7 +1189,7 @@ 
 			$GLOBALS['egw_info']['server']['max_subquery_depth'] = --$max_subquery_depth;
 			error_log(__METHOD__."() decremented max_subquery_depth to $max_subquery_depth");
 			config::save_value('max_subquery_depth', $max_subquery_depth, 'phpgwapi');
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
+			if (method_exists($GLOBALS['egw'], 'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
 			return self::url_stat($url, $flags, $eacl_access);
 		}
 		self::$stat_cache[$path] = $info;
@@ -1206,18 +1205,18 @@ 
 	 */
 	protected function _sql_readable()
 	{
-		static $sql_read_acl=null;
+		static $sql_read_acl = null;
 
 		if (is_null($sql_read_acl))
 		{
-			foreach($GLOBALS['egw']->accounts->memberships(Vfs::$user,true) as $gid)
+			foreach ($GLOBALS['egw']->accounts->memberships(Vfs::$user, true) as $gid)
 			{
-				$memberships[] = abs($gid);	// sqlfs stores the gid's positiv
+				$memberships[] = abs($gid); // sqlfs stores the gid's positiv
 			}
 			// using octal numbers with mysql leads to funny results (select 384 & 0400 --> 384 not 256=0400)
 			// 256 = 0400, 32 = 040
 			$sql_read_acl = '((fs_mode & 4)=4 OR (fs_mode & 256)=256 AND fs_uid='.(int)Vfs::$user.
-				($memberships ? ' OR (fs_mode & 32)=32 AND fs_gid IN('.implode(',',$memberships).')' : '').')';
+				($memberships ? ' OR (fs_mode & 32)=32 AND fs_gid IN('.implode(',', $memberships).')' : '').')';
 			//error_log(__METHOD__."() Vfs::\$user=".array2string(Vfs::$user).' --> memberships='.array2string($memberships).' --> '.$sql_read_acl.($memberships?'':': '.function_backtrace()));
 		}
 		return $sql_read_acl;
@@ -1230,7 +1229,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1249,7 +1248,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1267,7 +1266,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1288,7 +1287,7 @@ 
 	 */
 	static function readlink($path)
 	{
-		$link = !($lstat = self::url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
+		$link = !($lstat = self::url_stat($path, STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
 
@@ -1302,31 +1301,31 @@ 
 	 * @param string $link
 	 * @return boolean true on success false on error
 	 */
-	static function symlink($target,$link)
+	static function symlink($target, $link)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
 
-		if (self::url_stat($link,0))
+		if (self::url_stat($link, 0))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') $link exists, returning false!");
-			return false;	// $link already exists
+			return false; // $link already exists
 		}
 		if (!($dir = Vfs::dirname($link)) ||
-			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=static::url_stat($dir,0)))
+			!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = static::url_stat($dir, 0)))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
-			return false;	// parent dir does not exist or is not writable
+			return false; // parent dir does not exist or is not writable
 		}
 		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		$stmt = self::$pdo->prepare($query);
-		unset(self::$stat_cache[Vfs::parse_url($link,PHP_URL_PATH)]);
+		unset(self::$stat_cache[Vfs::parse_url($link, PHP_URL_PATH)]);
 
 		return !!$stmt->execute(array(
 			'fs_name' => self::limit_filename(Vfs::basename($link)),
 			'fs_dir'  => $dir_stat['ino'],
-			'fs_mode' => ($dir_stat['mode'] & 0666),
+			'fs_mode' => ($dir_stat['mode']&0666),
 			'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : Vfs::$user,
 			'fs_gid'  => $dir_stat['gid'],
 			'fs_created'  => self::_pdo_timestamp(time()),
@@ -1350,24 +1349,24 @@ 
 	 * @param int $check mode to check: one or more or'ed together of: 4 = read, 2 = write, 1 = executable
 	 * @return boolean
 	 */
-	static function check_extended_acl($url,$check)
+	static function check_extended_acl($url, $check)
 	{
-		$url_path = Vfs::parse_url($url,PHP_URL_PATH);
+		$url_path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		if (is_null(self::$extended_acl))
 		{
 			self::_read_extended_acl();
 		}
 		$access = false;
-		foreach(self::$extended_acl as $path => $rights)
+		foreach (self::$extended_acl as $path => $rights)
 		{
-			if ($path == $url_path || substr($url_path,0,strlen($path)+1) == $path.'/')
+			if ($path == $url_path || substr($url_path, 0, strlen($path) + 1) == $path.'/')
 			{
-				$access = ($rights & $check) == $check;
+				$access = ($rights&$check) == $check;
 				break;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access ? "access granted by $path=$rights" : 'no access!!!'));
 		return $access;
 	}
 
@@ -1379,14 +1378,14 @@ 
 	{
 		if ((self::$extended_acl = egw_cache::getSession(self::EACL_APPNAME, 'extended_acl')))
 		{
-			return;		// ext. ACL read from session.
+			return; // ext. ACL read from session.
 		}
 		self::$extended_acl = array();
-		if (($rights = $GLOBALS['egw']->acl->get_all_location_rights(Vfs::$user,self::EACL_APPNAME)))
+		if (($rights = $GLOBALS['egw']->acl->get_all_location_rights(Vfs::$user, self::EACL_APPNAME)))
 		{
 			$pathes = self::id2path(array_keys($rights));
 		}
-		foreach($rights as $fs_id => $right)
+		foreach ($rights as $fs_id => $right)
 		{
 			$path = $pathes[$fs_id];
 			if (isset($path))
@@ -1395,8 +1394,8 @@ 
 			}
 		}
 		// sort by length descending, to allow more specific pathes to have precedence
-		uksort(self::$extended_acl, function($a,$b) {
-			return strlen($b)-strlen($a);
+		uksort(self::$extended_acl, function($a, $b) {
+			return strlen($b) - strlen($a);
 		});
 		egw_cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() '.array2string(self::$extended_acl));
@@ -1418,23 +1417,23 @@ 
 	 * @param int $fs_id =null fs_id to use, to not query it again (eg. because it's already deleted)
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($path,$rights=null,$owner=null,$fs_id=null)
+	static function eacl($path, $rights = null, $owner = null, $fs_id = null)
 	{
 		if ($path[0] != '/')
 		{
-			$path = Vfs::parse_url($path,PHP_URL_PATH);
+			$path = Vfs::parse_url($path, PHP_URL_PATH);
 		}
 		if (is_null($fs_id))
 		{
-			if (!($stat = self::url_stat($path,0)))
+			if (!($stat = self::url_stat($path, 0)))
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
-				return false;	// $path not found
+				return false; // $path not found
 			}
-			if (!Vfs::has_owner_rights($path,$stat))		// not group dir and user is eGW admin
+			if (!Vfs::has_owner_rights($path, $stat))		// not group dir and user is eGW admin
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) permission denied!");
-				return false;	// permission denied
+				return false; // permission denied
 			}
 			$fs_id = $stat['ino'];
 		}
@@ -1446,21 +1445,21 @@ 
 		{
 			// delete eacl
 			if (is_null($owner) || $owner == Vfs::$user ||
-				$owner < 0 && Vfs::$user && in_array($owner,$GLOBALS['egw']->accounts->memberships(Vfs::$user,true)))
+				$owner < 0 && Vfs::$user && in_array($owner, $GLOBALS['egw']->accounts->memberships(Vfs::$user, true)))
 			{
-				self::$extended_acl = null;	// force new read of eACL, as there could be multiple eACL for that path
+				self::$extended_acl = null; // force new read of eACL, as there could be multiple eACL for that path
 			}
-			$ret = $GLOBALS['egw']->acl->delete_repository(self::EACL_APPNAME,$fs_id,(int)$owner);
+			$ret = $GLOBALS['egw']->acl->delete_repository(self::EACL_APPNAME, $fs_id, (int)$owner);
 		}
 		else
 		{
 			if (isset(self::$extended_acl) && ($owner == Vfs::$user ||
-				$owner < 0 && Vfs::$user && in_array($owner,$GLOBALS['egw']->accounts->memberships(Vfs::$user,true))))
+				$owner < 0 && Vfs::$user && in_array($owner, $GLOBALS['egw']->accounts->memberships(Vfs::$user, true))))
 			{
 				// set rights for this class, if applicable
 				self::$extended_acl[$path] |= $rights;
 			}
-			$ret = $GLOBALS['egw']->acl->add_repository(self::EACL_APPNAME,$fs_id,$owner,$rights);
+			$ret = $GLOBALS['egw']->acl->add_repository(self::EACL_APPNAME, $fs_id, $owner, $rights);
 		}
 		if ($ret)
 		{
@@ -1483,10 +1482,10 @@ 
 		if (!($stat = static::url_stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			error_log(__METHOD__.__LINE__.' '.array2string($path).' not found!');
-			return false;	// not found
+			return false; // not found
 		}
 		$eacls = array();
-		foreach($GLOBALS['egw']->acl->get_all_rights($stat['ino'],self::EACL_APPNAME) as $owner => $rights)
+		foreach ($GLOBALS['egw']->acl->get_all_rights($stat['ino'], self::EACL_APPNAME) as $owner => $rights)
 		{
 			$eacls[] = array(
 				'path'   => $path,
@@ -1497,7 +1496,7 @@ 
 		}
 		if (($path = Vfs::dirname($path)))
 		{
-			$eacls = array_merge((array)self::get_eacl($path),$eacls);
+			$eacls = array_merge((array)self::get_eacl($path), $eacls);
 		}
 		// sort by length descending, to show precedence
 		usort($eacls, function($a, $b) {
@@ -1522,9 +1521,9 @@ 
 		$ids = (array)$fs_ids;
 		$pathes = array();
 		// first check our stat-cache for the ids
-		foreach(self::$stat_cache as $path => $stat)
+		foreach (self::$stat_cache as $path => $stat)
 		{
-			if (($key = array_search($stat['fs_id'],$ids)) !== false)
+			if (($key = array_search($stat['fs_id'], $ids)) !== false)
 			{
 				$pathes[$stat['fs_id']] = $path;
 				unset($ids[$key]);
@@ -1538,7 +1537,7 @@ 
 		// now search via the database
 		if (count($ids) > 1) array_map(function(&$v) { $v = (int)$v; },$ids);
 		$query = 'SELECT fs_id,fs_dir,fs_name FROM '.self::TABLE.' WHERE fs_id'.
-			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')');
+			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',', $ids).')');
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		if (!is_object(self::$pdo))
@@ -1549,12 +1548,12 @@ 
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
 		if (!$stmt->execute())
 		{
-			return false;	// not found
+			return false; // not found
 		}
 		$parents = array();
-		foreach($stmt as $row)
+		foreach ($stmt as $row)
 		{
-			if ($row['fs_dir'] > 1 && !in_array($row['fs_dir'],$parents))
+			if ($row['fs_dir'] > 1 && !in_array($row['fs_dir'], $parents))
 			{
 				$parents[] = $row['fs_dir'];
 			}
@@ -1564,14 +1563,14 @@ 
 
 		if ($parents && !($parents = self::id2path($parents)))
 		{
-			return false;	// parent not found, should never happen ...
+			return false; // parent not found, should never happen ...
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
-		foreach((array)$rows as $fs_id => $row)
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows, true)."#");
+		foreach ((array)$rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
 
-			$pathes[$fs_id] = $parent . '/' . $row['fs_name'];
+			$pathes[$fs_id] = $parent.'/'.$row['fs_name'];
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
 		return is_array($fs_ids) ? $pathes : array_shift($pathes);
@@ -1595,7 +1594,7 @@ 
 			$parts = explode('.', $name);
 			if ($parts > 1 && mb_strlen($extension = '.'.array_pop($parts)) <= $fs_name_precision)
 			{
-				$name = mb_substr(implode('.', $parts), 0, $fs_name_precision-mb_strlen($extension)).$extension;
+				$name = mb_substr(implode('.', $parts), 0, $fs_name_precision - mb_strlen($extension)).$extension;
 			}
 			else
 			{
@@ -1616,9 +1615,8 @@ 
 		$stat = array(
 			'ino'   => $info['fs_id'],
 			'name'  => $info['fs_name'],
-			'mode'  => $info['fs_mode'] |
-				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR :
-				($info['fs_mime'] == self::SYMLINK_MIME_TYPE ? self::MODE_LINK : self::MODE_FILE)),	// required by the stream wrapper
+			'mode'  => $info['fs_mode']|
+				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR : ($info['fs_mime'] == self::SYMLINK_MIME_TYPE ? self::MODE_LINK : self::MODE_FILE)), // required by the stream wrapper
 			'size'  => $info['fs_size'],
 			'uid'   => $info['fs_uid'],
 			'gid'   => $info['fs_gid'],
@@ -1658,7 +1656,7 @@ 
 	{
 		$egw_db = isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		switch($egw_db->Type)
+		switch ($egw_db->Type)
 		{
 			case 'mysqli':
 			case 'mysqlt':
@@ -1676,29 +1674,29 @@ 
 
 		$dsn = self::$pdo_type.':dbname='.$egw_db->Database.($host ? ';host='.$host.($egw_db->Port ? ';port='.$egw_db->Port : '') : '');
 		// check once if pdo extension and DB specific driver is loaded or can be loaded
-		static $pdo_available=null;
+		static $pdo_available = null;
 		if (is_null($pdo_available))
 		{
-			foreach(array('pdo','pdo_'.self::$pdo_type) as $ext)
+			foreach (array('pdo', 'pdo_'.self::$pdo_type) as $ext)
 			{
-				check_load_extension($ext,true);	// true = throw Exception
+				check_load_extension($ext, true); // true = throw Exception
 			}
 			$pdo_available = true;
 		}
 		try {
-			self::$pdo = new \PDO($dsn,$egw_db->User,$egw_db->Password,array(
+			self::$pdo = new \PDO($dsn, $egw_db->User, $egw_db->Password, array(
 				\PDO::ATTR_ERRMODE=>\PDO::ERRMODE_EXCEPTION,
 			));
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
-			self::$pdo = new \PDO($dsn,$egw_db->User,'$egw_db->Password');
+			self::$pdo = new \PDO($dsn, $egw_db->User, '$egw_db->Password');
 		}
 		// set client charset of the connection
 		$charset = translation::charset();
-		switch(self::$pdo_type)
+		switch (self::$pdo_type)
 		{
 			case 'mysql':
 				if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset];
@@ -1724,7 +1722,7 @@ 
 	{
 		if (is_numeric($time))
 		{
-			$time = date('Y-m-d H:i:s',$time);
+			$time = date('Y-m-d H:i:s', $time);
 		}
 		return $time;
 	}
@@ -1774,10 +1772,10 @@ 
 		{
 			if (is_object($GLOBALS['egw_setup']->db))	// if we run under setup, query the db for the files dir
 			{
-				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
+				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config', 'config_value', array(
 					'config_name' => 'files_dir',
 					'config_app' => 'phpgwapi',
-				),__LINE__,__FILE__)->fetchColumn();
+				), __LINE__, __FILE__)->fetchColumn();
 			}
 		}
 		if (!$GLOBALS['egw_info']['server']['files_dir'])
@@ -1786,14 +1784,14 @@ 
 		}
 		$hash = array();
 		$n = $id;
-		while(($n = (int) ($n / self::HASH_MAX)))
+		while (($n = (int)($n / self::HASH_MAX)))
 		{
-			$hash[] = sprintf('%02d',$n % self::HASH_MAX);
+			$hash[] = sprintf('%02d', $n % self::HASH_MAX);
 		}
-		if (!$hash) $hash[] = '00';		// we need at least one directory, to not conflict with the dir-names
-		array_unshift($hash,$id);
+		if (!$hash) $hash[] = '00'; // we need at least one directory, to not conflict with the dir-names
+		array_unshift($hash, $id);
 
-		$path = '/sqlfs/'.implode('/',array_reverse($hash));
+		$path = '/sqlfs/'.implode('/', array_reverse($hash));
 		//error_log(__METHOD__."($id) = '$path'");
 		return $GLOBALS['egw_info']['server']['files_dir'].$path;
 	}
@@ -1809,7 +1807,7 @@ 
 
 		if ($parts['pass'] || $parts['scheme'])
 		{
-			$url = $parts['scheme'].'://'.($parts['user'] ? $parts['user'].($parts['pass']?':...':'').'@' : '').
+			$url = $parts['scheme'].'://'.($parts['user'] ? $parts['user'].($parts['pass'] ? ':...' : '').'@' : '').
 				$parts['host'].$parts['path'];
 		}
 	}
@@ -1824,10 +1822,10 @@ 
 	{
 		$operation = self::DEFAULT_OPERATION;
 
-		if (strpos(is_array($url) ? $url['query'] : $url,'storage=') !== false)
+		if (strpos(is_array($url) ? $url['query'] : $url, 'storage=') !== false)
 		{
 			$query = null;
-			parse_str(is_array($url) ? $url['query'] : Vfs::parse_url($url,PHP_URL_QUERY), $query);
+			parse_str(is_array($url) ? $url['query'] : Vfs::parse_url($url, PHP_URL_QUERY), $query);
 			switch ($query['storage'])
 			{
 				case 'db':
@@ -1850,27 +1848,27 @@ 
 	 * @param array $props array of array with values for keys 'name', 'ns', 'val' (null to delete the prop)
 	 * @return boolean true if props are updated, false otherwise (eg. ressource not found)
 	 */
-	static function proppatch($path,array $props)
+	static function proppatch($path, array $props)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."(".array2string($path).','.array2string($props));
 		if (!is_numeric($path))
 		{
-			if (!($stat = self::url_stat($path,0)))
+			if (!($stat = self::url_stat($path, 0)))
 			{
 				return false;
 			}
 			$id = $stat['ino'];
 		}
-		elseif(!($path = self::id2path($id=$path)))
+		elseif (!($path = self::id2path($id = $path)))
 		{
 			return false;
 		}
-		if (!Vfs::check_access($path,EGW_ACL_EDIT,$stat))
+		if (!Vfs::check_access($path, EGW_ACL_EDIT, $stat))
 		{
-			return false;	// permission denied
+			return false; // permission denied
 		}
 		$ins_stmt = $del_stmt = null;
-		foreach($props as &$prop)
+		foreach ($props as &$prop)
 		{
 			if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
 
@@ -1915,14 +1913,14 @@ 
 	 * @return array|boolean false on error ($path_ids does not exist), array with props (values for keys 'name', 'ns', 'value'), or
 	 * 	fs_id/path => array of props for $depth==1 or is_array($path_ids)
 	 */
-	static function propfind($path_ids,$ns=Vfs::DEFAULT_PROP_NAMESPACE)
+	static function propfind($path_ids, $ns = Vfs::DEFAULT_PROP_NAMESPACE)
 	{
 		$ids = is_array($path_ids) ? $path_ids : array($path_ids);
-		foreach($ids as &$id)
+		foreach ($ids as &$id)
 		{
 			if (!is_numeric($id))
 			{
-				if (!($stat = self::url_stat($id,0)))
+				if (!($stat = self::url_stat($id, 0)))
 				{
 					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
 					return false;
@@ -1932,7 +1930,7 @@ 
 		}
 		if (count($ids) >= 1) array_map(function(&$v) { $v = (int)$v; },$ids);
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
-			(count($ids) == 1 ? '='.(int)implode('',$ids) : ' IN ('.implode(',',$ids).')').')'.
+			(count($ids) == 1 ? '='.(int)implode('', $ids) : ' IN ('.implode(',', $ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
@@ -1941,7 +1939,7 @@ 
 		$stmt->execute(!is_null($ns) ? array($ns) : array());
 
 		$props = array();
-		foreach($stmt as $row)
+		foreach ($stmt as $row)
 		{
 			$props[$row['fs_id']][] = array(
 				'val'  => $row['prop_value'],
@@ -1951,19 +1949,19 @@ 
 		}
 		if (!is_array($path_ids))
 		{
-			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array();	// return empty array for no props
+			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array(); // return empty array for no props
 		}
 		elseif ($props && isset($stat))	// need to map fs_id's to pathes
 		{
-			foreach(self::id2path(array_keys($props)) as $id => $path)
+			foreach (self::id2path(array_keys($props)) as $id => $path)
 			{
-				$props[$path] =& $props[$id];
+				$props[$path] = & $props[$id];
 				unset($props[$id]);
 			}
 		}
 		if (self::LOG_LEVEL > 1)
 		{
-			foreach((array)$props as $k => $v)
+			foreach ((array)$props as $k => $v)
 			{
 				error_log(__METHOD__."($path_ids,$ns) $k => ".array2string($v));
 			}

Braces +409 added lines, -102 removed lines

@@ -204,7 +204,10 @@ 
 	 */
 	function stream_open ( $url, $mode, $options, &$opened_path, array $overwrite_new=null )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$mode,$options)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 		$this->operation = self::url2operation($url);
@@ -216,7 +219,9 @@ 
 
 		parse_str(parse_url($url, PHP_URL_QUERY), $this->dir_url_params);
 
-		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' && $stat ||	// or file should not exist, but does
@@ -224,7 +229,11 @@ 
 				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat))	// or we are not allowed to 																																			create it
 			{
 				self::_remove_password($url);
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+		}
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -236,7 +245,10 @@ 
 			$new_file = true;
 			$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_active'.
 				') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_active)';
-			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+			if (self::LOG_LEVEL > 2)
+			{
+				$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+			}
 			$stmt = self::$pdo->prepare($query);
 			$values = array(
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
@@ -254,11 +266,17 @@ 
 				'fs_size'     => 0,
 				'fs_active'   => self::_pdo_boolean(true),
 			);
-			if ($overwrite_new) $values = array_merge($values,$overwrite_new);
+			if ($overwrite_new)
+			{
+				$values = array_merge($values,$overwrite_new);
+			}
 			if (!$stmt->execute($values) || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
 			{
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) execute() failed: ".self::$pdo->errorInfo());
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) execute() failed: ".self::$pdo->errorInfo());
+				}
 				return false;
 			}
 			if ($this->operation == self::STORE2DB)
@@ -270,14 +288,20 @@ 
 			elseif(!file_exists($fs_dir=Vfs::dirname(self::_fs_path($this->opened_fs_id))))
 			{
 				$umaskbefore = umask();
-				if (self::LOG_LEVEL > 1) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				if (self::LOG_LEVEL > 1)
+				{
+					error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				}
 				self::mkdir_recursive($fs_dir,0700,true);
 			}
 		}
 		// check if opend file is a directory
 		elseif($stat && ($stat['mode'] & self::MODE_DIR) == self::MODE_DIR)
 		{
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) Is a directory!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) Is a directory!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!",E_USER_WARNING);
@@ -288,11 +312,17 @@ 
 		else
 		{
 			if ($mode == 'r' && !Vfs::check_access($url,Vfs::READABLE ,$stat) ||// we are not allowed to read
-				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// or edit it
+				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+			{
+				// or edit it
 			{
 				self::_remove_password($url);
+			}
 				$op = $mode == 'r' ? 'read' : 'edited';
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!",E_USER_WARNING);
@@ -324,7 +354,10 @@ 
 		// do we operate directly on the filesystem --> open file from there
 		if ($this->operation == self::STORE2FS)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
+			}
 			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id),$mode)) && $new_file)
 			{
 				// delete db entry again, if we are not able to open a new(!) file
@@ -333,11 +366,17 @@ 
 				$stmt->execute(array('fs_id' => $this->opened_fs_id));
 			}
 		}
-		if ($mode[0] == 'a')	// append modes: a, a+
+		if ($mode[0] == 'a')
+		{
+			// append modes: a, a+
 		{
 			$this->stream_seek(0,SEEK_END);
 		}
-		if (!is_resource($this->opened_stream)) error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
+		}
+		if (!is_resource($this->opened_stream))
+		{
+			error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
+		}
 
 		return is_resource($this->opened_stream);
 	}
@@ -349,7 +388,10 @@ 
 	 */
 	function stream_close ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_null($this->opened_path) || !is_resource($this->opened_stream) || !$this->opened_fs_id)
 		{
@@ -419,7 +461,10 @@ 
 	 */
 	function stream_read ( $count )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($count) pos=$this->opened_pos");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($count) pos=$this->opened_pos");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -441,7 +486,10 @@ 
 	 */
 	function stream_write ( $data )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($data)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($data)");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -478,7 +526,10 @@ 
 	 */
  	function stream_tell ( )
  	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -501,7 +552,10 @@ 
  	 */
 	function stream_seek ( $offset, $whence )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($offset,$whence)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($offset,$whence)");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -519,7 +573,10 @@ 
 	 */
 	function stream_flush ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -544,7 +601,10 @@ 
 	 */
 	function stream_stat ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($this->opened_path)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($this->opened_path)");
+		}
 
 		return $this->url_stat($this->opened_path,0);
 	}
@@ -560,24 +620,36 @@ 
 	 */
 	static function unlink ( $url, $parent_stat=null )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		// need to get parent stat from Sqlfs, not Vfs
-		if (!isset($parent_stat)) $parent_stat = static::url_stat(Vfs::dirname($path), STREAM_URL_STAT_LINK);
+		if (!isset($parent_stat))
+		{
+			$parent_stat = static::url_stat(Vfs::dirname($path), STREAM_URL_STAT_LINK);
+		}
 
 		if (!$parent_stat || !($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) ||
 			!Vfs::check_access(Vfs::dirname($path),Vfs::WRITABLE, $parent_stat))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		if ($stat['mime'] == self::DIR_MIME_TYPE)
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) is NO file!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) is NO file!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
@@ -612,7 +684,10 @@ 
 	 */
 	static function rename ( $url_from, $url_to)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url_from,$url_to)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url_from,$url_to)");
+		}
 
 		$path_from = Vfs::parse_url($url_from,PHP_URL_PATH);
 		$from_dir = Vfs::dirname($path_from);
@@ -626,14 +701,20 @@ 
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		if (!Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = static::url_stat($to_dir, 0)))
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -644,14 +725,20 @@ 
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !static::unlink($url_to,$operation))
 		{
 			self::_remove_password($url_to);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			}
 			return false;
 		}
 		unset(self::$stat_cache[$path_from]);
@@ -689,7 +776,10 @@ 
 	{
 		$maxdepth=10;
 		$depth2propagate = (int)$depth + 1;
-		if ($depth2propagate > $maxdepth) return is_dir($pathname);
+		if ($depth2propagate > $maxdepth)
+		{
+			return is_dir($pathname);
+		}
     	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
     	return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
@@ -707,14 +797,23 @@ 
 	 */
 	static function mkdir ( $url, $mode, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." called from:".function_backtrace());
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$mode,$options)");
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__." called from:".function_backtrace());
+		}
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (self::url_stat($path,STREAM_URL_STAT_QUIET))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$mode,$options) already exist!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				//throw new Exception(__METHOD__."('$url',$mode,$options) already exist!");
@@ -723,14 +822,20 @@ 
 			return false;
 		}
 		$parent_path = Vfs::dirname($path);
-		if (($query = Vfs::parse_url($url,PHP_URL_QUERY))) $parent_path .= '?'.$query;
+		if (($query = Vfs::parse_url($url,PHP_URL_QUERY)))
+		{
+			$parent_path .= '?'.$query;
+		}
 		$parent = self::url_stat($parent_path,STREAM_URL_STAT_QUIET);
 
 		// check if we should also create all non-existing path components and our parent does not exist,
 		// if yes call ourself recursive with the parent directory
 		if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__." creating parents: $parent_path, $mode");
+			}
 			if (!self::mkdir($parent_path,$mode,$options))
 			{
 				return false;
@@ -740,7 +845,10 @@ 
 		if (!$parent || !Vfs::check_access($parent_path,Vfs::WRITABLE,$parent))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$mode,$options) permission denied!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!",E_USER_WARNING);
@@ -774,10 +882,13 @@ 
 				'fs_dir'  => $parent['ino'],
 				'fs_active' => self::_pdo_boolean(true),
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
-			)) && $stmt->fetchColumn() > 1)	// if there's more then one --> remove our new dir
+			)) && $stmt->fetchColumn() > 1)
+			{
+				// if there's more then one --> remove our new dir
 			{
 				self::$pdo->query('DELETE FROM '.self::TABLE.' WHERE fs_id='.$new_fs_id);
 			}
+			}
 		}
 		return $ok;
 	}
@@ -794,7 +905,10 @@ 
 	 */
 	static function rmdir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 		$parent = Vfs::dirname($path);
@@ -805,7 +919,10 @@ 
 			self::_remove_password($url);
 			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
 				($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
-			if (self::LOG_LEVEL) error_log($err_msg);
+			if (self::LOG_LEVEL)
+			{
+				error_log($err_msg);
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error($err_msg,E_USER_WARNING);
@@ -817,7 +934,10 @@ 
 		if ($stmt->fetchColumn())
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$options) dir is not empty!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$options) dir is not empty!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$options) dir is not empty!",E_USER_WARNING);
@@ -849,7 +969,10 @@ 
 	static function touch($url,$time=null,$atime=null)
 	{
 		unset($atime);	// not used
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $time)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url, $time)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -885,25 +1008,37 @@ 
 	 */
 	static function chown($url,$owner)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$owner)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::$is_root)
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) only root can do that!");
+			}
 			trigger_error("Only root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))	// not a user (0 == root)
+		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))
+		{
+			// not a user (0 == root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!");
+		}
 			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!",E_USER_WARNING);
 			//throw new Exception(__METHOD__."($url,$owner) Unknown (numeric) user id!");
 			return false;
@@ -911,7 +1046,10 @@ 
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_uid'] = $owner;
 
 		return $stmt->execute(array(
@@ -929,34 +1067,53 @@ 
 	 */
 	static function chgrp($url,$owner)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$owner)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::has_owner_rights($path,$stat))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only owner or root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) only owner or root can do that!");
+			}
 			trigger_error("Only owner or root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0) $owner = -$owner;	// sqlfs uses a positiv group id's!
+		if ($owner < 0)
+		{
+			$owner = -$owner;
+		}
+		// sqlfs uses a positiv group id's!
 
-		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))	// not a group
+		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))
+		{
+			// not a group
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) group id!");
+		}
 			trigger_error("Unknown (numeric) group id!",E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_gid=:fs_gid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_gid'] = $owner;
 
 		return $stmt->execute(array(
@@ -974,32 +1131,47 @@ 
 	 */
 	static function chmod($url,$mode)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $mode)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url, $mode)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url, $mode) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::has_owner_rights($path,$stat))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) only owner or root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url, $mode) only owner or root can do that!");
+			}
 			trigger_error("Only owner or root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if (!is_numeric($mode))	// not a mode
+		if (!is_numeric($mode))
+		{
+			// not a mode
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no (numeric) mode!");
+		}
 			trigger_error("No (numeric) mode!",E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mode=:fs_mode WHERE fs_id=:fs_id');
 
 		// update stat cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_mode'] = ((int) $mode) & 0777;
 
 		return $stmt->execute(array(
@@ -1024,11 +1196,17 @@ 
 
 		if (!($stat = self::url_stat($url,0)) || 		// dir not found
 			$stat['mime'] != self::DIR_MIME_TYPE ||		// no dir
-			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))	// no access
+			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))
+		{
+			// no access
 		{
 			self::_remove_password($url);
+		}
 			$msg = $stat['mime'] != self::DIR_MIME_TYPE ? "$url is no directory" : 'permission denied';
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$options) $msg!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$options) $msg!");
+			}
 			$this->opened_dir = null;
 			return false;
 		}
@@ -1037,7 +1215,10 @@ 
 			' FROM '.self::TABLE.' WHERE fs_dir=? AND fs_active='.self::_pdo_boolean(true).
 			" ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
 		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
+		}
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
@@ -1049,7 +1230,10 @@ 
 				self::$stat_cache[Vfs::concat($path,$file['fs_name'])] = $file;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		}
 		reset($this->opened_dir);
 
 		return true;
@@ -1088,9 +1272,16 @@ 
 		if (is_null($max_subquery_depth))
 		{
 			$max_subquery_depth = $GLOBALS['egw_info']['server']['max_subquery_depth'];
-			if (!$max_subquery_depth) $max_subquery_depth = 7;	// setting current default of 7, if nothing set
+			if (!$max_subquery_depth)
+			{
+				$max_subquery_depth = 7;
+			}
+			// setting current default of 7, if nothing set
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$url',$flags,$eacl_access)");
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags,$eacl_access)");
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -1156,7 +1347,10 @@ 
 						if (!Vfs::$user)
 						{
 							self::_remove_password($url);
-							if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags) permission denied, no user-id and not root!");
+							if (self::LOG_LEVEL > 1)
+							{
+								error_log(__METHOD__."('$url',$flags) permission denied, no user-id and not root!");
+							}
 							return false;
 						}
 						$query .= ' AND '.self::_sql_readable();
@@ -1167,7 +1361,10 @@ 
 					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
 				}
 			}
-			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
+			if (self::LOG_LEVEL > 2)
+			{
+				$query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
+			}
 			//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 			if (!($result = self::$pdo->query($query)) || !($info = $result->fetch(\PDO::FETCH_ASSOC)))
@@ -1190,12 +1387,18 @@ 
 			$GLOBALS['egw_info']['server']['max_subquery_depth'] = --$max_subquery_depth;
 			error_log(__METHOD__."() decremented max_subquery_depth to $max_subquery_depth");
 			config::save_value('max_subquery_depth', $max_subquery_depth, 'phpgwapi');
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
+			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
 			return self::url_stat($url, $flags, $eacl_access);
 		}
 		self::$stat_cache[$path] = $info;
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags)=".array2string($info));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags)=".array2string($info));
+		}
 		return self::_vfsinfo2stat($info);
 	}
 
@@ -1232,9 +1435,15 @@ 
 	 */
 	function dir_readdir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		$file = current($this->opened_dir); next($this->opened_dir);
 
@@ -1251,9 +1460,15 @@ 
 	 */
 	function dir_rewinddir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		reset($this->opened_dir);
 
@@ -1269,9 +1484,15 @@ 
 	 */
 	function dir_closedir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		$this->opened_dir = null;
 
@@ -1290,7 +1511,10 @@ 
 	{
 		$link = !($lstat = self::url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path') = $link");
+		}
 
 		return $link;
 	}
@@ -1304,22 +1528,34 @@ 
 	 */
 	static function symlink($target,$link)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$target','$link')");
+		}
 
 		if (self::url_stat($link,0))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') $link exists, returning false!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$target','$link') $link exists, returning false!");
+			}
 			return false;	// $link already exists
 		}
 		if (!($dir = Vfs::dirname($link)) ||
 			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=static::url_stat($dir,0)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
+			}
 			return false;	// parent dir does not exist or is not writable
 		}
 		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 		$stmt = self::$pdo->prepare($query);
 		unset(self::$stat_cache[Vfs::parse_url($link,PHP_URL_PATH)]);
 
@@ -1367,7 +1603,10 @@ 
 				break;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		}
 		return $access;
 	}
 
@@ -1395,11 +1634,15 @@ 
 			}
 		}
 		// sort by length descending, to allow more specific pathes to have precedence
-		uksort(self::$extended_acl, function($a,$b) {
+		uksort(self::$extended_acl, function($a,$b)
+		{
 			return strlen($b)-strlen($a);
 		});
 		egw_cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() '.array2string(self::$extended_acl));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() '.array2string(self::$extended_acl));
+		}
 	}
 
 	/**
@@ -1428,12 +1671,18 @@ 
 		{
 			if (!($stat = self::url_stat($path,0)))
 			{
-				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
+				}
 				return false;	// $path not found
 			}
-			if (!Vfs::has_owner_rights($path,$stat))		// not group dir and user is eGW admin
+			if (!Vfs::has_owner_rights($path,$stat))
+			{
+				// not group dir and user is eGW admin
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) permission denied!");
+			}
 				return false;	// permission denied
 			}
 			$fs_id = $stat['ino'];
@@ -1466,7 +1715,10 @@ 
 		{
 			egw_cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$rights,$owner,$fs_id)=".(int)$ret);
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path,$rights,$owner,$fs_id)=".(int)$ret);
+		}
 		return $ret;
 	}
 
@@ -1500,7 +1752,8 @@ 
 			$eacls = array_merge((array)self::get_eacl($path),$eacls);
 		}
 		// sort by length descending, to show precedence
-		usort($eacls, function($a, $b) {
+		usort($eacls, function($a, $b)
+		{
 			return strlen($b['path']) - strlen($a['path']);
 		});
 		//error_log(__METHOD__."('$_path') returning ".array2string($eacls));
@@ -1518,7 +1771,10 @@ 
 	 */
 	static function id2path($fs_ids)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')');
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($fs_ids).')');
+		}
 		$ids = (array)$fs_ids;
 		$pathes = array();
 		// first check our stat-cache for the ids
@@ -1530,16 +1786,26 @@ 
 				unset($ids[$key]);
 				if (!$ids)
 				{
-					if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes).' *from stat_cache*');
+					if (self::LOG_LEVEL > 1)
+					{
+						error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes).' *from stat_cache*');
+					}
 					return is_array($fs_ids) ? $pathes : array_shift($pathes);
 				}
 			}
 		}
 		// now search via the database
-		if (count($ids) > 1) array_map(function(&$v) { $v = (int)$v; },$ids);
+		if (count($ids) > 1)
+		{
+			array_map(function(&$v) { $v = (int)$v;
+		}
+		},$ids);
 		$query = 'SELECT fs_id,fs_dir,fs_name FROM '.self::TABLE.' WHERE fs_id'.
 			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')');
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 
 		if (!is_object(self::$pdo))
 		{
@@ -1566,14 +1832,20 @@ 
 		{
 			return false;	// parent not found, should never happen ...
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
+		}
 		foreach((array)$rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
 
 			$pathes[$fs_id] = $parent . '/' . $row['fs_name'];
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
+		}
 		return is_array($fs_ids) ? $pathes : array_shift($pathes);
 	}
 
@@ -1629,7 +1901,10 @@ 
 			'mime'  => $info['fs_mime'],
 			'readlink' => $info['fs_link'],
 		);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($info[name]) = ".array2string($stat));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($info[name]) = ".array2string($stat));
+		}
 		return $stat;
 	}
 
@@ -1701,7 +1976,10 @@ 
 		switch(self::$pdo_type)
 		{
 			case 'mysql':
-				if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset];
+				if (isset($egw_db->Link_ID->charset2mysql[$charset]))
+				{
+					$charset = $egw_db->Link_ID->charset2mysql[$charset];
+				}
 				// fall throught
 			case 'pgsql':
 				$query = "SET NAMES '$charset'";
@@ -1772,13 +2050,16 @@ 
 		}
 		if (!isset($GLOBALS['egw_info']['server']['files_dir']))
 		{
-			if (is_object($GLOBALS['egw_setup']->db))	// if we run under setup, query the db for the files dir
+			if (is_object($GLOBALS['egw_setup']->db))
+			{
+				// if we run under setup, query the db for the files dir
 			{
 				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
 					'config_name' => 'files_dir',
 					'config_app' => 'phpgwapi',
 				),__LINE__,__FILE__)->fetchColumn();
 			}
+			}
 		}
 		if (!$GLOBALS['egw_info']['server']['files_dir'])
 		{
@@ -1790,7 +2071,11 @@ 
 		{
 			$hash[] = sprintf('%02d',$n % self::HASH_MAX);
 		}
-		if (!$hash) $hash[] = '00';		// we need at least one directory, to not conflict with the dir-names
+		if (!$hash)
+		{
+			$hash[] = '00';
+		}
+		// we need at least one directory, to not conflict with the dir-names
 		array_unshift($hash,$id);
 
 		$path = '/sqlfs/'.implode('/',array_reverse($hash));
@@ -1852,7 +2137,10 @@ 
 	 */
 	static function proppatch($path,array $props)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."(".array2string($path).','.array2string($props));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."(".array2string($path).','.array2string($props));
+		}
 		if (!is_numeric($path))
 		{
 			if (!($stat = self::url_stat($path,0)))
@@ -1872,13 +2160,19 @@ 
 		$ins_stmt = $del_stmt = null;
 		foreach($props as &$prop)
 		{
-			if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
+			if (!isset($prop['ns']))
+			{
+				$prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
+			}
 
-			if (!isset($prop['val']) || self::$pdo_type != 'mysql')	// for non mysql, we have to delete the prop anyway, as there's no REPLACE!
+			if (!isset($prop['val']) || self::$pdo_type != 'mysql')
+			{
+				// for non mysql, we have to delete the prop anyway, as there's no REPLACE!
 			{
 				if (!isset($del_stmt))
 				{
 					$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=:fs_id AND prop_namespace=:prop_namespace AND prop_name=:prop_name');
+			}
 				}
 				$del_stmt->execute(array(
 					'fs_id'          => $id,
@@ -1924,17 +2218,27 @@ 
 			{
 				if (!($stat = self::url_stat($id,0)))
 				{
-					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
+					if (self::LOG_LEVEL)
+					{
+						error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
+					}
 					return false;
 				}
 				$id = $stat['ino'];
 			}
 		}
-		if (count($ids) >= 1) array_map(function(&$v) { $v = (int)$v; },$ids);
+		if (count($ids) >= 1)
+		{
+			array_map(function(&$v) { $v = (int)$v;
+		}
+		},$ids);
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
 			(count($ids) == 1 ? '='.(int)implode('',$ids) : ' IN ('.implode(',',$ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
@@ -1953,11 +2257,14 @@ 
 		{
 			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array();	// return empty array for no props
 		}
-		elseif ($props && isset($stat))	// need to map fs_id's to pathes
+		elseif ($props && isset($stat))
+		{
+			// need to map fs_id's to pathes
 		{
 			foreach(self::id2path(array_keys($props)) as $id => $path)
 			{
 				$props[$path] =& $props[$id];
+		}
 				unset($props[$id]);
 			}
 		}

setup/fix_mysql_charset.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 // if we are NOT called as part of an update script, behave like a regular setup script
 if (!isset($GLOBALS['egw_setup']) || !is_object($GLOBALS['egw_setup']))
 {
-	$diagnostics = 1;	// can be set to 0=non, 1=some (default for now), 2=all
+	$diagnostics = 1; // can be set to 0=non, 1=some (default for now), 2=all
 
 	include('./inc/functions.inc.php');
 	// Authorize the user to use setup app and load the database
@@ -25,50 +25,50 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+	$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 	$setup_tpl->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$GLOBALS['egw_setup']->html->show_header('',False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header('', False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 	echo '<h3>'.'Fix mysql DB to match the eGroupWare system_charset'."</h3>\n";
 	$running_standalone = true;
 }
-$db =& $GLOBALS['egw_setup']->db;
-$charset2mysql =& $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
+$db = & $GLOBALS['egw_setup']->db;
+$charset2mysql = & $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
 $mysql2charset = array_flip($charset2mysql);
 
 $ServerInfo = $db->Link_ID->ServerInfo();
-$db_version = (float) $ServerInfo['version'];
+$db_version = (float)$ServerInfo['version'];
 
 if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
 
-if (substr($db->Type,0,5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
+if (substr($db->Type, 0, 5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
 	$GLOBALS['egw_setup']->system_charset != $GLOBALS['egw_setup']->db_charset_was)
 {
 	$tables_modified = 'no';
 
 	$tables = array();
-	$db->query("SHOW TABLE STATUS",__LINE__,__FILE__);
+	$db->query("SHOW TABLE STATUS", __LINE__, __FILE__);
 	while (($row = $db->row(true)))
 	{
 		$tables[$row['Name']] = $row['Collation'];
 	}
-	foreach($tables as $table => $collation)
+	foreach ($tables as $table => $collation)
 	{
 		$columns = array();
-		$db->query("SHOW FULL FIELDS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW FULL FIELDS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			$columns[] = $row;
 		}
 		//echo $table; _debug_array($columns);
 		$fulltext = $fulltext_back = array();
-		$db->query("SHOW KEYS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW KEYS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			if ($row['Index_type'] == 'FULLTEXT')
 			{
@@ -77,12 +77,12 @@ 
 		}
 
 		$alter_table = $alter_table_back = array();
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i',$column['Type'],$matches))
+			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i', $column['Type'], $matches))
 			{
-				list(,$type,$size) = $matches;
-				list($charset) = explode('_',$column['Collation']);
+				list(,$type, $size) = $matches;
+				list($charset) = explode('_', $column['Collation']);
 
 				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 
@@ -97,7 +97,7 @@ 
 					}
 					else
 					{
-						$bintype = str_replace('text','blob',$type);
+						$bintype = str_replace('text', 'blob', $type);
 					}
 					//echo "<p>$table.$col $type CHARACTER SET $charset $default $null</p>\n";
 
@@ -108,7 +108,7 @@ 
 					{
 						$idx_name = $fulltext[$col];
 						$idx_cols = array();
-						foreach($fulltext as $c => $i)
+						foreach ($fulltext as $c => $i)
 						{
 							if ($i == $idx_name)
 							{
@@ -124,7 +124,7 @@ 
 				}
 			}
 		}
-		list($charset) = explode('_',$collation);
+		list($charset) = explode('_', $collation);
 		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
@@ -132,26 +132,26 @@ 
 		}
 		if (count($alter_table))
 		{
-			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
+			$alter_table = "ALTER TABLE $table\n".implode(",\n", $alter_table);
 
 			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
-			if (!$db->query($alter_table,__LINE__,__FILE__))
+			if (!$db->query($alter_table, __LINE__, __FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
 				echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
 				echo "<p>continuing ...</p>\n";
 				continue;
 			}
-			foreach($fulltext_back as $idx_name => $idx_cols)
+			foreach ($fulltext_back as $idx_name => $idx_cols)
 			{
-				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`',$idx_cols)."`)";
+				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`', $idx_cols)."`)";
 			}
 			if (count($alter_table_back))
 			{
-				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
+				$alter_table_back = "ALTER TABLE $table\n".implode(",\n", $alter_table_back);
 
 				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
-				if (!$db->query($alter_table_back,__LINE__,__FILE__))
+				if (!$db->query($alter_table_back, __LINE__, __FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
 					echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
@@ -163,13 +163,13 @@ 
 		}
 	}
 	// change the default charset of the DB
-	$db->query("SHOW CREATE DATABASE `$db->Database`",__LINE__,__FILE__);
+	$db->query("SHOW CREATE DATABASE `$db->Database`", __LINE__, __FILE__);
 	$create_db = $db->next_record() ? $db->f(1) : '';
-	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
+	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i', $create_db, $matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
 		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
-		$db->query($alter_db,__LINE__,__FILE__);
+		$db->query($alter_db, __LINE__, __FILE__);
 	}
 }
 if ($running_standalone || $_REQUEST['debug'])

Braces +33 added lines, -9 removed lines

@@ -41,7 +41,10 @@ 
 $ServerInfo = $db->Link_ID->ServerInfo();
 $db_version = (float) $ServerInfo['version'];
 
-if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
+if ($running_standalone || $_REQUEST['debug'])
+{
+	echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
+}
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
@@ -84,15 +87,21 @@ 
 				list(,$type,$size) = $matches;
 				list($charset) = explode('_',$column['Collation']);
 
-				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
+				if (isset($mysql2charset[$charset]))
+				{
+					$charset = $mysql2charset[$charset];
+				}
 
 				if ($charset != $GLOBALS['egw_setup']->system_charset)
 				{
 					$col = $column['Field'];
 
-					if ($type == 'varchar' || $type == 'char')	// old schema_proc (pre 1.0.1) used also char
+					if ($type == 'varchar' || $type == 'char')
+					{
+						// old schema_proc (pre 1.0.1) used also char
 					{
 						$type = 'varchar('.$size.')';
+					}
 						$bintype = 'varbinary('.$size.')';
 					}
 					else
@@ -125,7 +134,10 @@ 
 			}
 		}
 		list($charset) = explode('_',$collation);
-		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
+		if (isset($mysql2charset[$charset]))
+		{
+			$charset = $mysql2charset[$charset];
+		}
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
 			$alter_table[] = " DEFAULT CHARACTER SET $mysql_system_charset";
@@ -134,7 +146,10 @@ 
 		{
 			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
 
-			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
+			if ($running_standalone || $_REQUEST['debug'])
+			{
+				echo '<p>'.nl2br($alter_table)."</p>\n";
+			}
 			if (!$db->query($alter_table,__LINE__,__FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
@@ -150,7 +165,10 @@ 
 			{
 				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
 
-				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
+				if ($running_standalone || $_REQUEST['debug'])
+				{
+					echo '<p>'.nl2br($alter_table_back)."</p>\n";
+				}
 				if (!$db->query($alter_table_back,__LINE__,__FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
@@ -168,7 +186,10 @@ 
 	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
-		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
+		if ($running_standalone || $_REQUEST['debug'])
+		{
+			echo '<p>'.$alter_db."</p>\n";
+		}
 		$db->query($alter_db,__LINE__,__FILE__);
 	}
 }
@@ -176,5 +197,8 @@ 
 {
 	echo "<p>$tables_modified tables changed to our system_charset {$GLOBALS['egw_setup']->system_charset}($mysql_system_charset)</p>\n";
 
-	if ($running_standalone) $GLOBALS['egw_setup']->html->show_footer();
-}
+	if ($running_standalone)
+	{
+		$GLOBALS['egw_setup']->html->show_footer();
+	}
+	}

setup/inc/class.setup_cmd_hooks.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $config_passwd=null pw of above user
 	 * @param boolean $verbose=false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null)
+	function __construct($domain, $config_user = null, $config_passwd = null)
 	{
 		if (!is_array($domain))
 		{
@@ -45,17 +45,17 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only) return true; // nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		global $setup_info;
-		foreach($setup_info as $appname => $info)
+		foreach ($setup_info as $appname => $info)
 		{
 			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
 		}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,11 @@ 
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only)
+		{
+			return true;
+		}
+		// nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
 		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
@@ -57,7 +61,10 @@ 
 		global $setup_info;
 		foreach($setup_info as $appname => $info)
 		{
-			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
+			if ($info['currentver'])
+			{
+				self::$egw_setup->register_hooks($appname);
+			}
 		}
 		$this->restore_db();
 

Doc Comments +3 added lines, -4 removed lines

@@ -19,9 +19,8 @@ 
 	 * Constructor
 	 *
 	 * @param string $domain string with domain-name or array with all arguments
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param boolean $verbose=false if true, echos out some status information during the run
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
 	 */
 	function __construct($domain,$config_user=null,$config_passwd=null)
 	{
@@ -40,7 +39,7 @@ 
 	/**
 	 * run the command: register all hooks
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');

setup/inc/hook_config.inc.php

Spacing +35 added lines, -35 removed lines

@@ -20,14 +20,14 @@ 
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default = array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
 	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == json_encode($default_db=array(
+	elseif ($config['vfs_fstab'] == json_encode($default_db = array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
 	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
@@ -39,10 +39,10 @@ 
 		$config['vfs_storage_mode'] = 'custom';
 	}
 	//_debug_array(array_intersect_key($config,array('vfs_fstab'=>1,'vfs_storage_mode'=>1)));
-	foreach(array(
+	foreach (array(
 		'fs' => lang('Filesystem (default)'),
 		'db' => lang('Database').' (problems with files > 1MB)',
-		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
+		'custom' => lang('Custom set via %1', 'filemanager/cli.php mount'),
 	) as $name => $label)
 	{
 		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
@@ -57,24 +57,24 @@ 
 
 function encryptalgo($config)
 {
-	if(@function_exists('mcrypt_list_algorithms'))
+	if (@function_exists('mcrypt_list_algorithms'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_algo']))
+		if (!isset($config['mcrypt_algo']))
 		{
-			$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			$config['mcrypt_algo'] = 'tripledes'; /* MCRYPT_TRIPLEDES */
 		}
 		$algos = @mcrypt_list_algorithms();
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($algos))
+		while (list($key, $value) = each($algos))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_algo'] == $value)
+				if ($config['mcrypt_algo'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -84,29 +84,29 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
+			$out = '<option value="">'.lang('no algorithms available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
+		$out = '<option value="tripledes">TRIPLEDES</option>'."\n";
 	}
 	return $out;
 }
 
 function encryptmode($config)
 {
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_mode']))
+		if (!isset($config['mcrypt_mode']))
 		{
 			$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
 		}
@@ -114,13 +114,13 @@ 
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($modes))
+		while (list($key, $value) = each($modes))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_mode'] == $value)
+				if ($config['mcrypt_mode'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -130,34 +130,34 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="" selected="selected">' . lang('no modes available') . '</option>' . "\n";
+			$out = '<option value="" selected="selected">'.lang('no modes available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="cbc" selected="selected">CBC</option>' . "\n";
+		$out = '<option value="cbc" selected="selected">CBC</option>'."\n";
 	}
 	return $out;
 }
 
-function passwdhashes($config,$return_hashes=false)
+function passwdhashes($config, $return_hashes = false)
 {
-	$hashes = sql_passwdhashes($config,true);
+	$hashes = sql_passwdhashes($config, true);
 	if (isset($hashes['crypt']))
 	{
-		$hashes['des'] = 'des (=crypt)';	// old LDAP name for crypt
+		$hashes['des'] = 'des (=crypt)'; // old LDAP name for crypt
 	}
 	return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
 }
 
-function sql_passwdhashes($config, $return_hashes=false, &$securest=null)
+function sql_passwdhashes($config, $return_hashes = false, &$securest = null)
 {
 	$hashes = Api\Auth::passwdhashes($securest);
 
@@ -172,19 +172,19 @@ 
  */
 function auth_types($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type']);
 }
 function auth_type_syncml($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_syncml']);
 }
 function auth_type_groupdav($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_groupdav']);
 }
 function auth_type_activesync($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_activesync']);
 }
 
 /**
@@ -205,12 +205,12 @@ 
  * @param string $selected value of selected optino
  * @return string
  */
-function _options_from(array $options,$selected)
+function _options_from(array $options, $selected)
 {
-	foreach($options as $value => $label)
+	foreach ($options as $value => $label)
 	{
-		$out .= '<option value="' . htmlspecialchars($value) . '"' .
-			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="'.htmlspecialchars($value).'"'.
+			($selected == $value ? ' selected="selected"' : '').'>'.$label.'</option>'."\n";
 	}
 	return $out;
 }

Braces +12 added lines, -3 removed lines

@@ -23,17 +23,23 @@ 
 	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
+	}
 	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default_db))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
+	}
 	else
 	{
 		$config['vfs_storage_mode'] = 'custom';
@@ -45,11 +51,14 @@ 
 		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
 	) as $name => $label)
 	{
-		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
+		if ($name != 'custom' || $name === $config['vfs_storage_mode'])
+		{
+			// dont show custom, if not custom
 		{
 			$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
 				'">'.htmlspecialchars($label)."</options>\n";
 		}
+		}
 	}
 	//echo "<pre>".htmlspecialchars($options)."</pre>\n";
 	return $options;

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

Braces +8 added lines, -2 removed lines

@@ -70,7 +70,10 @@ 
 		{
 			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
-		if ($check_only) return lang('Update necessary.');
+		if ($check_only)
+		{
+			return lang('Update necessary.');
+		}
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -119,7 +122,10 @@ 
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();
-		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+		if ($messages && $this->verbose)
+		{
+			echo strip_tags($messages)."\n";
+		}
 
 		$this->restore_db();
 

Doc Comments +5 added lines, -6 removed lines

@@ -24,11 +24,10 @@ 
 	 * Constructor
 	 *
 	 * @param string|array $domain string with domain-name or array with all arguments
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param string $backup=null filename of backup to use instead of new install, default new install
-	 * @param boolean $verbose=false if true, echos out some status information during the run
-	 * @param string $app=null single application to update or install
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
+	 * @param string $backup filename of backup to use instead of new install, default new install
+	 * @param boolean $verbose if true, echos out some status information during the run
 	 */
 	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
 	{
@@ -50,7 +49,7 @@ 
 	/**
 	 * run the command: update or install/update a single app ($this->app)
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');

setup/inc/class.setup.inc.php

Indentation +27 added lines, -27 removed lines

@@ -151,10 +151,10 @@ 
 	}
 
 	/**
-	* Set the domain used for cookies
-	*
-	* @return string domain
-	*/
+	 * Set the domain used for cookies
+	 *
+	 * @return string domain
+	 */
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
@@ -175,12 +175,12 @@ 
 	}
 
 	/**
-	* Set a cookie
-	*
-	* @param string $cookiename name of cookie to be set
-	* @param string $cookievalue value to be used, if unset cookie is cleared (optional)
-	* @param int $cookietime when cookie should expire, 0 for session only (optional)
-	*/
+	 * Set a cookie
+	 *
+	 * @param string $cookiename name of cookie to be set
+	 * @param string $cookievalue value to be used, if unset cookie is cleared (optional)
+	 * @param int $cookietime when cookie should expire, 0 for session only (optional)
+	 */
 	function set_cookie($cookiename,$cookievalue='',$cookietime=0)
 	{
 		if(!isset($this->cookie_domain))
@@ -344,19 +344,19 @@ 
 		return true;
 	}
 
-    /**
-    * check if username and password is valid
-    *
-    * this function compares the supplied and stored username and password
-	* as any of the passwords can be clear text or md5 we convert them to md5
-	* internal and compare always the md5 hashs
-    *
-    * @param string $user the user supplied username
-    * @param string $pw the user supplied password
-    * @param string $conf_user the configured username
-    * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
-    * @returns bool true on success
-    */
+	/**
+	 * check if username and password is valid
+	 *
+	 * this function compares the supplied and stored username and password
+	 * as any of the passwords can be clear text or md5 we convert them to md5
+	 * internal and compare always the md5 hashs
+	 *
+	 * @param string $user the user supplied username
+	 * @param string $pw the user supplied password
+	 * @param string $conf_user the configured username
+	 * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
+	 * @returns bool true on success
+	 */
 	static function check_auth($user, $pw, $conf_user, $hash)
 	{
 		if ($user !== $conf_user)
@@ -728,10 +728,10 @@ 
 	}
 
 	/**
-	  * call the hooks for a single application
-	  *
-	  * @param $location hook location - required
-	  * @param $appname application name - optional
+	 * call the hooks for a single application
+	 *
+	 * @param $location hook location - required
+	 * @param $appname application name - optional
 	 */
 	static function hook($location, $appname='')
 	{

Doc Comments +6 added lines, -6 removed lines

@@ -793,9 +793,9 @@ 
 
 	/**
 	 * egw version checking, is param 1 < param 2 in phpgw versionspeak?
-	 * @param	$a	phpgw version number to check if less than $b
-	 * @param	$b	phpgw version number to check $a against
-	 * @return	True if $a < $b
+	 * @param	string $a	phpgw version number to check if less than $b
+	 * @param	string $b	phpgw version number to check $a against
+	 * @return	boolean if $a < $b
 	 */
 	function alessthanb($a,$b,$DEBUG=False)
 	{
@@ -882,7 +882,7 @@ 
 	 *
 	 * @param	$a	phpgw version number to check if more than $b
 	 * @param	$b	phpgw version number to check $a against
-	 * @return	True if $a < $b
+	 * @return	boolean if $a < $b
 	 */
 	function amorethanb($a,$b,$DEBUG=False)
 	{
@@ -1152,7 +1152,7 @@ 
 	 *
 	 * Dont use it to set group-membership, use set_memberships instead!
 	 *
-	 * @param string|array $apps app-names
+	 * @param string $apps app-names
 	 * @param string $location eg. "run"
 	 * @param int|string $account accountid or account_lid
 	 * @param int $rights rights to set, default 1
@@ -1198,7 +1198,7 @@ 
 	/**
 	 * checks if one of the given tables exist, returns the first match
 	 *
-	 * @param array $tables array with possible table-names
+	 * @param string[] $tables array with possible table-names
 	 * @return string/boolean tablename or false
 	 */
 	function table_exist($tables,$force_refresh=False)

Spacing +185 added lines, -185 removed lines

@@ -75,10 +75,10 @@ 
 	 */
 	var $recommended_php_version = '5.5';
 
-	function __construct($html=False, $translation=False)
+	function __construct($html = False, $translation = False)
 	{
 		// setup us as $GLOBALS['egw_setup'], as this gets used in our sub-objects
-		$GLOBALS['egw_setup'] =& $this;
+		$GLOBALS['egw_setup'] = & $this;
 
 		if (!is_object($GLOBALS['egw']))
 		{
@@ -98,11 +98,11 @@ 
 	/**
 	 * include api db class for the ConfigDomain and connect to the db
 	 */
-	function loaddb($connect_and_setcharset=true)
+	function loaddb($connect_and_setcharset = true)
 	{
-		if(!isset($this->ConfigDomain) || empty($this->ConfigDomain))
+		if (!isset($this->ConfigDomain) || empty($this->ConfigDomain))
 		{
-			$this->ConfigDomain = get_var('ConfigDomain',array('COOKIE','POST'),$_POST['FormDomain']);
+			$this->ConfigDomain = get_var('ConfigDomain', array('COOKIE', 'POST'), $_POST['FormDomain']);
 		}
 		$GLOBALS['egw_info']['server']['db_type'] = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type'];
 
@@ -123,27 +123,27 @@ 
 		if ($connect_and_setcharset)
 		{
 			try {
-				$this->set_table_names();		// sets/checks config- and applications-table-name
+				$this->set_table_names(); // sets/checks config- and applications-table-name
 
 				// Set the DB's client charset if a system-charset is set
-				$this->db->select($this->config_table,'config_value',array(
+				$this->db->select($this->config_table, 'config_value', array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'system_charset',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				if ($this->db->next_record() && $this->db->f(0))
 				{
 					$this->system_charset = $this->db->f(0);
-					$this->db_charset_was = $this->db->Link_ID->GetCharSet();	// needed for the update
+					$this->db_charset_was = $this->db->Link_ID->GetCharSet(); // needed for the update
 
 					// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
-					if (substr($this->db->Type,0,5) == 'mysql')	// we need to check the api version
+					if (substr($this->db->Type, 0, 5) == 'mysql')	// we need to check the api version
 					{
-						$this->db->select($this->applications_table,'app_version',array(
+						$this->db->select($this->applications_table, 'app_version', array(
 							'app_name'  => 'phpgwapi',
-						),__LINE__,__FILE__);
+						), __LINE__, __FILE__);
 						$api_version = $this->db->next_record() ? $this->db->f(0) : false;
 					}
-					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
+					if (!$api_version || !$this->alessthanb($api_version, '1.0.1.019'))
 					{
 						$this->db->Link_ID->SetCharSet($this->system_charset);
 					}
@@ -163,15 +163,15 @@ 
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
-		$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+		$cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
 
 		// remove port from HTTP_HOST
 		$arr = null;
-		if (preg_match("/^(.*):(.*)$/",$cookie_domain,$arr))
+		if (preg_match("/^(.*):(.*)$/", $cookie_domain, $arr))
 		{
 			$cookie_domain = $arr[1];
 		}
-		if (count(explode('.',$cookie_domain)) <= 1)
+		if (count(explode('.', $cookie_domain)) <= 1)
 		{
 			// setcookie dont likes domains without dots, leaving it empty, gets setcookie to fill the domain in
 			$cookie_domain = '';
@@ -186,9 +186,9 @@ 
 	* @param string $cookievalue value to be used, if unset cookie is cleared (optional)
 	* @param int $cookietime when cookie should expire, 0 for session only (optional)
 	*/
-	function set_cookie($cookiename,$cookievalue='',$cookietime=0)
+	function set_cookie($cookiename, $cookievalue = '', $cookietime = 0)
 	{
-		if(!isset($this->cookie_domain))
+		if (!isset($this->cookie_domain))
 		{
 			$this->cookie_domain = self::cookiedomain();
 		}
@@ -213,9 +213,9 @@ 
 			if (!isset($_SESSION)) self::session_start();
 			$ConfigLang = $_SESSION['ConfigLang'];
 		}
-		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$ConfigLang))
+		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $ConfigLang))
 		{
-			$ConfigLang = null;	// not returning 'en', as it suppresses the language selection in check_install and manageheader
+			$ConfigLang = null; // not returning 'en', as it suppresses the language selection in check_install and manageheader
 		}
 		//error_log(__METHOD__."() \$_POST['ConfigLang']=".array2string($_POST['ConfigLang']).", \$_SESSION['ConfigLang']=".array2string($_SESSION['ConfigLang'])." returning ".array2string($ConfigLang));
 		return $ConfigLang;
@@ -247,7 +247,7 @@ 
 
 		if (isset($_COOKIE[self::SESSIONID])) session_id($_COOKIE[self::SESSIONID]);
 
-		$ok = @session_start();	// suppress notice if session already started or warning in CLI
+		$ok = @session_start(); // suppress notice if session already started or warning in CLI
 		// need to decrypt session, in case session encryption is switched on in header.inc.php
 		egw_session::decrypt();
 		//error_log(__METHOD__."() returning ".array2string($ok).' _SESSION='.array2string($_SESSION));
@@ -259,12 +259,12 @@ 
 	 *
 	 * @param string $_auth_type ='config' 'config' or 'header' (caseinsensitiv)
 	 */
-	function auth($_auth_type='config')
+	function auth($_auth_type = 'config')
 	{
 		$auth_type = strtolower($_auth_type);
 		$GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = '';
 
-		if(!$this->checkip($_SERVER['REMOTE_ADDR']))
+		if (!$this->checkip($_SERVER['REMOTE_ADDR']))
 		{
 			//error_log(__METHOD__."('$auth_type') invalid IP");
 			return false;
@@ -276,7 +276,7 @@ 
 			//error_log(__METHOD__."('$auth_type') \$_COOKIE['".self::SESSIONID."'] = ".array2string($_COOKIE[self::SESSIONID]).", \$_SESSION=".array2string($_SESSION).", \$_POST=".array2string($_POST));
 			if (isset($_REQUEST['FormLogout']))
 			{
-				$this->set_cookie(self::SESSIONID, '', time()-86400);
+				$this->set_cookie(self::SESSIONID, '', time() - 86400);
 				session_destroy();
 				if ($_REQUEST['FormLogout'] == 'config')
 				{
@@ -292,7 +292,7 @@ 
 			{
 				return false;
 			}
-			switch($auth_type)
+			switch ($auth_type)
 			{
 				case 'config':
 					if (!isset($GLOBALS['egw_domain'][$_POST['FormDomain']]) ||
@@ -332,7 +332,7 @@ 
 		//error_log(__METHOD__."('$auth_type') \$_COOKIE['".self::SESSIONID."'] = ".array2string($_COOKIE[self::SESSIONID]).", \$_SESSION=".array2string($_SESSION));
 		if ($_SESSION['egw_last_action_time'] < time() - self::TIMEOUT)
 		{
-			$this->set_cookie(self::SESSIONID, '', time()-86400);
+			$this->set_cookie(self::SESSIONID, '', time() - 86400);
 			session_destroy();
 			$GLOBALS['egw_info']['setup'][$_SESSION['egw_setup_auth_type'] == 'config' ? 'ConfigLoginMSG' : 'HeaderLoginMSG'] =
 				lang('Session expired');
@@ -387,37 +387,37 @@ 
 	 * @param string $remoteip
 	 * @return boolean
 	 */
-	function checkip($remoteip='')
+	function checkip($remoteip = '')
 	{
 		//echo "<p>setup::checkip($remoteip) against setup_acl='".$GLOBALS['egw_info']['server']['setup_acl']."'</p>\n";
-		$allowed_ips = explode(',',@$GLOBALS['egw_info']['server']['setup_acl']);
-		if(empty($GLOBALS['egw_info']['server']['setup_acl']) || !is_array($allowed_ips))
+		$allowed_ips = explode(',', @$GLOBALS['egw_info']['server']['setup_acl']);
+		if (empty($GLOBALS['egw_info']['server']['setup_acl']) || !is_array($allowed_ips))
 		{
-			return True;	// no test
+			return True; // no test
 		}
-		$remotes = explode('.',$remoteip);
-		foreach($allowed_ips as $value)
+		$remotes = explode('.', $remoteip);
+		foreach ($allowed_ips as $value)
 		{
-			if (!preg_match('/^[0-9.]+$/',$value))
+			if (!preg_match('/^[0-9.]+$/', $value))
 			{
-				$value = gethostbyname($was=$value);		// resolve domain-name, eg. a dyndns account
+				$value = gethostbyname($was = $value); // resolve domain-name, eg. a dyndns account
 				//echo "resolving '$was' to '$value'<br>\n";
 			}
-			$values = explode('.',$value);
-			for($i = 0; $i < count($values); ++$i)
+			$values = explode('.', $value);
+			for ($i = 0; $i < count($values); ++$i)
 			{
-				if ((int) $values[$i] != (int) $remotes[$i])
+				if ((int)$values[$i] != (int)$remotes[$i])
 				{
 					break;
 				}
 			}
 			if ($i == count($values))
 			{
-				return True;	// match
+				return True; // match
 			}
 		}
 		$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address').' '.$remoteip;
-		error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true));
+		error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip, true));
 		return False;
 	}
 
@@ -428,14 +428,14 @@ 
 	 */
 	function get_major($versionstring)
 	{
-		if(!$versionstring)
+		if (!$versionstring)
 		{
 			return False;
 		}
 
-		$version = str_replace('pre','.',$versionstring);
-		$varray  = explode('.',$version);
-		$major   = implode('.',array($varray[0],$varray[1],$varray[2]));
+		$version = str_replace('pre', '.', $versionstring);
+		$varray  = explode('.', $version);
+		$major   = implode('.', array($varray[0], $varray[1], $varray[2]));
 
 		return $major;
 	}
@@ -455,55 +455,55 @@ 
 	 * @param $appname Application 'name' with a matching $setup_info[$appname] array slice
 	 * @param $_enable =99 set to True/False to override setup.inc.php setting
 	 */
-	function register_app($appname, $_enable=99)
+	function register_app($appname, $_enable = 99)
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($_enable == 99)
+		if ($_enable == 99)
 		{
 			$_enable = $setup_info[$appname]['enable'];
 		}
 		$enable = (int)$_enable;
 
-		if($GLOBALS['DEBUG'])
+		if ($GLOBALS['DEBUG'])
 		{
-			echo '<br>register_app(): ' . $appname . ', version: ' . $setup_info[$appname]['version'] . ', tables: ' . implode(', ',$setup_info[$appname]['tables']) . '<br>';
+			echo '<br>register_app(): '.$appname.', version: '.$setup_info[$appname]['version'].', tables: '.implode(', ', $setup_info[$appname]['tables']).'<br>';
 			// _debug_array($setup_info[$appname]);
 		}
 
-		if($setup_info[$appname]['version'])
+		if ($setup_info[$appname]['version'])
 		{
-			if($setup_info[$appname]['tables'])
+			if ($setup_info[$appname]['tables'])
 			{
-				$tables = implode(',',$setup_info[$appname]['tables']);
+				$tables = implode(',', $setup_info[$appname]['tables']);
 			}
 			if ($setup_info[$appname]['tables_use_prefix'] == True)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo "<br>$appname uses tables_use_prefix, storing ". $setup_info[$appname]['tables_prefix']." as prefix for tables\n";
+					echo "<br>$appname uses tables_use_prefix, storing ".$setup_info[$appname]['tables_prefix']." as prefix for tables\n";
 				}
-				$this->db->insert($this->config_table,array(
+				$this->db->insert($this->config_table, array(
 						'config_app'	=> $appname,
 						'config_name'	=> $appname.'_tables_prefix',
 						'config_value'	=> $setup_info[$appname]['tables_prefix'],
-					),False,__LINE__,__FILE__);
+					), False, __LINE__, __FILE__);
 			}
-			$this->db->insert($this->applications_table,array(
+			$this->db->insert($this->applications_table, array(
 					'app_name'		=> $appname,
 					'app_enabled'	=> $enable,
 					'app_order'		=> $setup_info[$appname]['app_order'],
-					'app_tables'	=> (string)$tables,	// app_tables is NOT NULL
+					'app_tables'	=> (string)$tables, // app_tables is NOT NULL
 					'app_version'	=> $setup_info[$appname]['version'],
 					'app_index'     => $setup_info[$appname]['index'],
 					'app_icon'      => $setup_info[$appname]['icon'],
 					'app_icon_app'  => $setup_info[$appname]['icon_app'],
-				),False,__LINE__,__FILE__);
+				), False, __LINE__, __FILE__);
 
 			$this->clear_session_cache();
 		}
@@ -517,27 +517,27 @@ 
 	 */
 	function app_registered($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if(@$GLOBALS['DEBUG'])
+		if (@$GLOBALS['DEBUG'])
 		{
-			echo '<br>app_registered(): checking ' . $appname . ', table: ' . $this->applications_table;
+			echo '<br>app_registered(): checking '.$appname.', table: '.$this->applications_table;
 			// _debug_array($setup_info[$appname]);
 		}
 
-		$this->db->select($this->applications_table,'COUNT(*)',array('app_name' => $appname),__LINE__,__FILE__);
-		if($this->db->next_record() && $this->db->f(0))
+		$this->db->select($this->applications_table, 'COUNT(*)', array('app_name' => $appname), __LINE__, __FILE__);
+		if ($this->db->next_record() && $this->db->f(0))
 		{
-			if(@$GLOBALS['DEBUG'])
+			if (@$GLOBALS['DEBUG'])
 			{
 				echo '... app previously registered.';
 			}
 			return True;
 		}
-		if(@$GLOBALS['DEBUG'])
+		if (@$GLOBALS['DEBUG'])
 		{
 			echo '... app not registered';
 		}
@@ -554,38 +554,38 @@ 
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($GLOBALS['DEBUG'])
+		if ($GLOBALS['DEBUG'])
 		{
-			echo '<br>update_app(): ' . $appname . ', version: ' . $setup_info[$appname]['currentver'] . ', table: ' . $this->applications_table . '<br>';
+			echo '<br>update_app(): '.$appname.', version: '.$setup_info[$appname]['currentver'].', table: '.$this->applications_table.'<br>';
 			// _debug_array($setup_info[$appname]);
 		}
 
-		if(!$this->app_registered($appname))
+		if (!$this->app_registered($appname))
 		{
 			return False;
 		}
 
-		if($setup_info[$appname]['version'])
+		if ($setup_info[$appname]['version'])
 		{
 			//echo '<br>' . $setup_info[$appname]['version'];
-			if($setup_info[$appname]['tables'])
+			if ($setup_info[$appname]['tables'])
 			{
-				$tables = implode(',',$setup_info[$appname]['tables']);
+				$tables = implode(',', $setup_info[$appname]['tables']);
 			}
-			$this->db->update($this->applications_table,array(
+			$this->db->update($this->applications_table, array(
 					'app_enabled'	=> $setup_info[$appname]['enable'],
 					'app_order'		=> $setup_info[$appname]['app_order'],
-					'app_tables'	=> (string)$tables,	// app_tables is NOT NULL
+					'app_tables'	=> (string)$tables, // app_tables is NOT NULL
 					'app_version'	=> $setup_info[$appname]['version'],
 					'app_index'     => $setup_info[$appname]['index'],
 					'app_icon'      => $setup_info[$appname]['icon'],
 					'app_icon_app'  => $setup_info[$appname]['icon_app'],
-				),array('app_name'=>$appname),__LINE__,__FILE__);
+				), array('app_name'=>$appname), __LINE__, __FILE__);
 		}
 	}
 
@@ -598,20 +598,20 @@ 
 	 */
 	function update_app_version($setup_info, $appname, $tableschanged = True)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if($tableschanged == True)
+		if ($tableschanged == True)
 		{
 			$GLOBALS['egw_info']['setup']['tableschanged'] = True;
 		}
-		if($setup_info[$appname]['currentver'])
+		if ($setup_info[$appname]['currentver'])
 		{
-			$this->db->update($this->applications_table,array(
+			$this->db->update($this->applications_table, array(
 					'app_version'	=> $setup_info[$appname]['currentver'],
-				),array('app_name'=>$appname),__LINE__,__FILE__);
+				), array('app_name'=>$appname), __LINE__, __FILE__);
 		}
 		return $setup_info;
 	}
@@ -623,19 +623,19 @@ 
 	 */
 	function deregister_app($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
 		// Remove categories
-		$this->db->delete(categories::TABLE, array('cat_appname'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(categories::TABLE, array('cat_appname'=>$appname), __LINE__, __FILE__);
 		categories::invalidate_cache($appname);
 
 		// Remove config
-		$this->db->delete(config::TABLE, array('config_app'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(config::TABLE, array('config_app'=>$appname), __LINE__, __FILE__);
 		//echo 'DELETING application: ' . $appname;
-		$this->db->delete($this->applications_table,array('app_name'=>$appname),__LINE__,__FILE__);
+		$this->db->delete($this->applications_table, array('app_name'=>$appname), __LINE__, __FILE__);
 
 		// Remove links to the app
 		egw_link::unlink(0, $appname);
@@ -652,21 +652,21 @@ 
 	{
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
-		if(!$this->hooks_table)	// No hooks table yet
+		if (!$this->hooks_table)	// No hooks table yet
 		{
 			return False;
 		}
 
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
-		$this->hooks->register_hooks($appname,$setup_info[$appname]['hooks']);
+		$this->hooks->register_hooks($appname, $setup_info[$appname]['hooks']);
 	}
 
 	/**
@@ -681,20 +681,20 @@ 
 
 		if (!isset($setup_info) || !isset($setup_info['hooks']))
 		{
-			return false;	// app not found or no hook
+			return false; // app not found or no hook
 		}
 		$GLOBALS['settings'] = array();
 		if (isset($setup_info['hooks']['settings']))
 		{
-			$settings = ExecMethod($setup_info['hooks']['settings'],array('location' => 'settings','setup' => true));
+			$settings = ExecMethod($setup_info['hooks']['settings'], array('location' => 'settings', 'setup' => true));
 		}
-		elseif(in_array('settings',$setup_info['hooks']) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/hook_settings.inc.php'))
+		elseif (in_array('settings', $setup_info['hooks']) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/hook_settings.inc.php'))
 		{
 			include_once($file);
 		}
 		if (!isset($settings) || !is_array($settings))
 		{
-			$settings = $GLOBALS['settings'];	// old file hook or not updated new hook
+			$settings = $GLOBALS['settings']; // old file hook or not updated new hook
 		}
 		if (!is_array($settings) || !count($settings))
 		{
@@ -705,10 +705,10 @@ 
 		{
 			$GLOBALS['settings'] = array();
 			include_once($file);
-			if ($GLOBALS['settings']) $settings = array_merge($settings,$GLOBALS['settings']);
+			if ($GLOBALS['settings']) $settings = array_merge($settings, $GLOBALS['settings']);
 		}
 		$default = $forced = array();
-		foreach($settings as $name => $setting)
+		foreach ($settings as $name => $setting)
 		{
 			if (isset($setting['default']))
 			{
@@ -722,14 +722,14 @@ 
 		// store default/forced preferences, if any found
 		$preferences = new preferences();
 		$preferences->read_repository(false);
-		foreach(array(
+		foreach (array(
 			'default' => $default,
 			'forced'  => $forced,
 		) as $type => $prefs)
 		{
 			if ($prefs)
 			{
-				foreach($prefs as $name => $value)
+				foreach ($prefs as $name => $value)
 				{
 					$preferences->add($appname == 'preferences' ? 'common' : $appname, $name, $value, $type);
 				}
@@ -758,12 +758,12 @@ 
 	 */
 	function deregister_hooks($appname)
 	{
-		if(!$this->hooks_table)	// No hooks table yet
+		if (!$this->hooks_table)	// No hooks table yet
 		{
 			return False;
 		}
 
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
@@ -771,7 +771,7 @@ 
 		//echo "DELETING hooks for: " . $setup_info[$appname]['name'];
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
 		return $this->hooks->register_hooks($appname);
 	}
@@ -782,13 +782,13 @@ 
 	  * @param $location hook location - required
 	  * @param $appname application name - optional
 	 */
-	function hook($location, $appname='')
+	function hook($location, $appname = '')
 	{
 		if (!is_object($this->hooks))
 		{
-			$this->hooks =& CreateObject('phpgwapi.hooks',$this->db,$this->hooks_table);
+			$this->hooks = & CreateObject('phpgwapi.hooks', $this->db, $this->hooks_table);
 		}
-		return $this->hooks->single($location,$appname,True,True);
+		return $this->hooks->single($location, $appname, True, True);
 	}
 
 	/**
@@ -797,82 +797,82 @@ 
 	 * @param	$b	phpgw version number to check $a against
 	 * @return	True if $a < $b
 	 */
-	function alessthanb($a,$b,$DEBUG=False)
+	function alessthanb($a, $b, $DEBUG = False)
 	{
-		$num = array('1st','2nd','3rd','4th');
+		$num = array('1st', '2nd', '3rd', '4th');
 
-		if($DEBUG)
+		if ($DEBUG)
 		{
 			echo'<br>Input values: '
 				. 'A="'.$a.'", B="'.$b.'"';
 		}
-		$newa = str_replace('pre','.',$a);
-		$newb = str_replace('pre','.',$b);
-		$testa = explode('.',$newa);
-		if(@$testa[1] == '')
+		$newa = str_replace('pre', '.', $a);
+		$newb = str_replace('pre', '.', $b);
+		$testa = explode('.', $newa);
+		if (@$testa[1] == '')
 		{
 			$testa[1] = 0;
 		}
 
-		$testb = explode('.',$newb);
-		if(@$testb[1] == '')
+		$testb = explode('.', $newb);
+		if (@$testb[1] == '')
 		{
 			$testb[1] = 0;
 		}
-		if(@$testb[3] == '')
+		if (@$testb[3] == '')
 		{
 			$testb[3] = 0;
 		}
 		$less = 0;
 
-		for($i=0;$i<count($testa);$i++)
+		for ($i = 0; $i < count($testa); $i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
-			if((int)$testa[$i] < (int)$testb[$i])
+			if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is less than '.(int)$testb[$i].' ...'; }
+			if ((int)$testa[$i] < (int)$testb[$i])
 			{
 				if ($DEBUG) { echo ' yes.'; }
 				$less++;
-				if($i<3)
+				if ($i < 3)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = 5;
 					break;
 				}
 			}
-			elseif((int)$testa[$i] > (int)$testb[$i])
+			elseif ((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if ($DEBUG) { echo ' no.'; }
 				$less--;
-				if($i<2)
+				if ($i < 2)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal or of different length.'; }
+				if ($DEBUG) { echo ' no, they are equal or of different length.'; }
 				// makes sure eg. '1.0.0' is counted less the '1.0.0.xxx' !
 				$less = count($testa) < count($testb) ? 1 : 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-		if($less>0)
+		if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if ($less > 0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if ($DEBUG) { echo '<br>A is less than B'; }
 			return True;
 		}
-		elseif($less<0)
+		elseif ($less < 0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if ($DEBUG) { echo '<br>A is greater than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if ($DEBUG) { echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -884,76 +884,76 @@ 
 	 * @param	$b	phpgw version number to check $a against
 	 * @return	True if $a < $b
 	 */
-	function amorethanb($a,$b,$DEBUG=False)
+	function amorethanb($a, $b, $DEBUG = False)
 	{
-		$num = array('1st','2nd','3rd','4th');
+		$num = array('1st', '2nd', '3rd', '4th');
 
-		if($DEBUG)
+		if ($DEBUG)
 		{
 			echo'<br>Input values: '
 				. 'A="'.$a.'", B="'.$b.'"';
 		}
-		$newa = str_replace('pre','.',$a);
-		$newb = str_replace('pre','.',$b);
-		$testa = explode('.',$newa);
-		if($testa[3] == '')
+		$newa = str_replace('pre', '.', $a);
+		$newb = str_replace('pre', '.', $b);
+		$testa = explode('.', $newa);
+		if ($testa[3] == '')
 		{
 			$testa[3] = 0;
 		}
-		$testb = explode('.',$newb);
-		if($testb[3] == '')
+		$testb = explode('.', $newb);
+		if ($testb[3] == '')
 		{
 			$testb[3] = 0;
 		}
 		$less = 0;
 
-		for($i=0;$i<count($testa);$i++)
+		for ($i = 0; $i < count($testa); $i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
-			if((int)$testa[$i] > (int)$testb[$i])
+			if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is more than '.(int)$testb[$i].' ...'; }
+			if ((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' yes.'; }
+				if ($DEBUG) { echo ' yes.'; }
 				$less++;
-				if($i<3)
+				if ($i < 3)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = 5;
 					break;
 				}
 			}
-			elseif((int)$testa[$i] < (int)$testb[$i])
+			elseif ((int)$testa[$i] < (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if ($DEBUG) { echo ' no.'; }
 				$less--;
-				if($i<2)
+				if ($i < 2)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal.'; }
+				if ($DEBUG) { echo ' no, they are equal.'; }
 				$less = 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-		if($less>0)
+		if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if ($less > 0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if ($DEBUG) { echo '<br>A is greater than B'; }
 			return True;
 		}
-		elseif($less<0)
+		elseif ($less < 0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if ($DEBUG) { echo '<br>A is less than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if ($DEBUG) { echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -965,7 +965,7 @@ 
 	 */
 	var $accounts;
 
-	function setup_account_object(array $config=array())
+	function setup_account_object(array $config = array())
 	{
 		if (!isset($this->accounts) || $this->accounts->config || $config)
 		{
@@ -976,9 +976,9 @@ 
 			if (!$config)
 			{
 				// load the configuration from the database
-				foreach($this->db->select($this->config_table,'config_name,config_value',
+				foreach ($this->db->select($this->config_table, 'config_name,config_value',
 					"config_name LIKE 'ads%' OR config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%' OR config_name='auth_type'",
-					__LINE__,__FILE__) as $row)
+					__LINE__, __FILE__) as $row)
 				{
 					$GLOBALS['egw_info']['server'][$row['config_name']] = $config[$row['config_name']] = $row['config_value'];
 				}
@@ -991,7 +991,7 @@ 
 				return false;
 			}
 			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
-			accounts::cache_invalidate();	// the cache is shared for all instances of the class
+			accounts::cache_invalidate(); // the cache is shared for all instances of the class
 		}
 		return true;
 	}
@@ -1017,7 +1017,7 @@ 
 	 * @param string &$anonpw=null on return password for anonymous user
 	 * @return int the numerical user-id
 	 */
-	function add_account($username,$first,$last,$passwd,$primary_group='Default',$changepw=False,$email='',&$anonpw=null)
+	function add_account($username, $first, $last, $passwd, $primary_group = 'Default', $changepw = False, $email = '', &$anonpw = null)
 	{
 		$this->setup_account_object();
 
@@ -1029,7 +1029,7 @@ 
 			$passwd = $anonpw = $this->anonpw;
 		}
 
-		if(!($accountid = $this->accounts->name2id($username, 'account_lid', $primary_group ? 'u' : 'g')))
+		if (!($accountid = $this->accounts->name2id($username, 'account_lid', $primary_group ? 'u' : 'g')))
 		{
 			$account = array(
 				'account_type'      => $primary_group ? 'u' : 'g',
@@ -1050,7 +1050,7 @@ 
 			}
 		}
 		// set password for existing account, if given and not '*unchanged*'
-		elseif($passwd && $passwd != '*unchanged*')
+		elseif ($passwd && $passwd != '*unchanged*')
 		{
 			try {
 				$auth = new auth;
@@ -1088,7 +1088,7 @@ 
 		{
 			$this->set_memberships(array($primary_group_id), $accountid);
 
-			if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid);
+			if (!$changepw) $this->add_acl('preferences', 'nopasswordchange', $accountid);
 		}
 		//error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid");
 		return $accountid;
@@ -1136,7 +1136,7 @@ 
 		{
 			return false;
 		}
-		foreach($accounts as $account)
+		foreach ($accounts as $account)
 		{
 			if ($account['account_lid'] != 'anonymous')
 			{
@@ -1157,7 +1157,7 @@ 
 	 * @param int|string $account accountid or account_lid
 	 * @param int $rights rights to set, default 1
 	 */
-	function add_acl($apps,$location,$account,$rights=1)
+	function add_acl($apps, $location, $account, $rights = 1)
 	{
 		//error_log("setup::add_acl(".(is_array($apps) ? "array('".implode("','",$apps)."')" : "'$apps'").",'$location',$account,$rights)");
 		if (!is_numeric($account))
@@ -1165,32 +1165,32 @@ 
 			$this->setup_account_object();
 			$account = $this->accounts->name2id($account);
 		}
-		if(!is_object($this->db))
+		if (!is_object($this->db))
 		{
 			$this->loaddb();
 		}
 
-		if(!is_array($apps))
+		if (!is_array($apps))
 		{
 			$apps = array($apps);
 		}
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
-			$this->db->delete($this->acl_table,array(
+			$this->db->delete($this->acl_table, array(
 				'acl_appname'  => $app,
 				'acl_location' => $location,
 				'acl_account'  => $account
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 
-			if ((int) $rights)
+			if ((int)$rights)
 			{
-				$this->db->insert($this->acl_table,array(
+				$this->db->insert($this->acl_table, array(
 					'acl_rights' => $rights
-				),array(
+				), array(
 					'acl_appname'  => $app,
 					'acl_location' => $location,
 					'acl_account'  => $account,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 	}
@@ -1201,7 +1201,7 @@ 
 	 * @param array $tables array with possible table-names
 	 * @return string/boolean tablename or false
 	 */
-	function table_exist($tables,$force_refresh=False)
+	function table_exist($tables, $force_refresh = False)
 	{
 		static $table_names = False;
 
@@ -1209,9 +1209,9 @@ 
 
 		if (!$table_names) return false;
 
-		foreach($table_names as $data)
+		foreach ($table_names as $data)
 		{
-			if (($key = array_search($data['table_name'],$tables)) !== false)
+			if (($key = array_search($data['table_name'], $tables)) !== false)
 			{
 				return $tables[$key];
 			}
@@ -1224,18 +1224,18 @@ 
 	 *
 	 * Other tables can always use the most up to date name
 	 */
-	function set_table_names($force_refresh=False)
+	function set_table_names($force_refresh = False)
 	{
-		foreach(array(
-			'config_table'       => array('egw_config','phpgw_config','config'),
-			'applications_table' => array('egw_applications','phpgw_applications','applications'),
-			'accounts_table'     => array('egw_accounts','phpgw_accounts'),
-			'acl_table'          => array('egw_acl','phpgw_acl'),
-			'lang_table'         => array('egw_lang','phpgw_lang','lang'),
-			'languages_table'    => array('egw_languages','phpgw_languages','languages'),
+		foreach (array(
+			'config_table'       => array('egw_config', 'phpgw_config', 'config'),
+			'applications_table' => array('egw_applications', 'phpgw_applications', 'applications'),
+			'accounts_table'     => array('egw_accounts', 'phpgw_accounts'),
+			'acl_table'          => array('egw_acl', 'phpgw_acl'),
+			'lang_table'         => array('egw_lang', 'phpgw_lang', 'lang'),
+			'languages_table'    => array('egw_languages', 'phpgw_languages', 'languages'),
 		) as $name => $tables)
 		{
-			$table = $this->table_exist($tables,$force_refresh);
+			$table = $this->table_exist($tables, $force_refresh);
 
 			if ($table && $table != $this->$name)	// only overwrite the default name, if we realy got one (important for new installs)
 			{

Braces +128 added lines, -37 removed lines

@@ -88,11 +88,20 @@ 
 		$this->detection = new setup_detection();
 		$this->process   = new setup_process();
 
-		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset'])) $this->system_charset = $_REQUEST['system_charset'];
+		if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['system_charset']))
+		{
+			$this->system_charset = $_REQUEST['system_charset'];
+		}
 
 		/* The setup application needs these */
-		if ($html) $this->html = new setup_html();
-		if ($translation) $this->translation = new setup_translation();
+		if ($html)
+		{
+			$this->html = new setup_html();
+		}
+		if ($translation)
+		{
+			$this->translation = new setup_translation();
+		}
 	}
 
 	/**
@@ -136,11 +145,14 @@ 
 					$this->db_charset_was = $this->db->Link_ID->GetCharSet();	// needed for the update
 
 					// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
-					if (substr($this->db->Type,0,5) == 'mysql')	// we need to check the api version
+					if (substr($this->db->Type,0,5) == 'mysql')
+					{
+						// we need to check the api version
 					{
 						$this->db->select($this->applications_table,'app_version',array(
 							'app_name'  => 'phpgwapi',
 						),__LINE__,__FILE__);
+					}
 						$api_version = $this->db->next_record() ? $this->db->f(0) : false;
 					}
 					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
@@ -210,7 +222,10 @@ 
 		}
 		else
 		{
-			if (!isset($_SESSION)) self::session_start();
+			if (!isset($_SESSION))
+			{
+				self::session_start();
+			}
 			$ConfigLang = $_SESSION['ConfigLang'];
 		}
 		if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$ConfigLang))
@@ -245,7 +260,10 @@ 
 			// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 			!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off', true);
 
-		if (isset($_COOKIE[self::SESSIONID])) session_id($_COOKIE[self::SESSIONID]);
+		if (isset($_COOKIE[self::SESSIONID]))
+		{
+			session_id($_COOKIE[self::SESSIONID]);
+		}
 
 		$ok = @session_start();	// suppress notice if session already started or warning in CLI
 		// need to decrypt session, in case session encryption is switched on in header.inc.php
@@ -657,10 +675,13 @@ 
 			return False;
 		}
 
-		if(!$this->hooks_table)	// No hooks table yet
+		if(!$this->hooks_table)
+		{
+			// No hooks table yet
 		{
 			return False;
 		}
+		}
 
 		if (!is_object($this->hooks))
 		{
@@ -705,7 +726,10 @@ 
 		{
 			$GLOBALS['settings'] = array();
 			include_once($file);
-			if ($GLOBALS['settings']) $settings = array_merge($settings,$GLOBALS['settings']);
+			if ($GLOBALS['settings'])
+			{
+				$settings = array_merge($settings,$GLOBALS['settings']);
+			}
 		}
 		$default = $forced = array();
 		foreach($settings as $name => $setting)
@@ -758,10 +782,13 @@ 
 	 */
 	function deregister_hooks($appname)
 	{
-		if(!$this->hooks_table)	// No hooks table yet
+		if(!$this->hooks_table)
+		{
+			// No hooks table yet
 		{
 			return False;
 		}
+		}
 
 		if(!$appname)
 		{
@@ -827,52 +854,72 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
+			if($DEBUG)
+			{
+echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
 			if((int)$testa[$i] < (int)$testb[$i])
 			{
-				if ($DEBUG) { echo ' yes.'; }
+				if ($DEBUG)
+				{
+echo ' yes.'; }
 				$less++;
 				if($i<3)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = 5;
 					break;
 				}
 			}
 			elseif((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				if($i<2)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal or of different length.'; }
+				if($DEBUG)
+				{
+echo ' no, they are equal or of different length.'; }
 				// makes sure eg. '1.0.0' is counted less the '1.0.0.xxx' !
 				$less = count($testa) < count($testb) ? 1 : 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if($DEBUG)
+		{
+echo '<br>Check value is: "'.$less.'"'; }
 		if($less>0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is less than B'; }
 			return True;
 		}
 		elseif($less<0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is greater than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if($DEBUG)
+			{
+echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -909,51 +956,71 @@ 
 
 		for($i=0;$i<count($testa);$i++)
 		{
-			if($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
+			if($DEBUG)
+			{
+echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
 			if((int)$testa[$i] > (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' yes.'; }
+				if($DEBUG)
+				{
+echo ' yes.'; }
 				$less++;
 				if($i<3)
 				{
 					/* Ensure that this is definitely greater */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 					$less = 5;
 					break;
 				}
 			}
 			elseif((int)$testa[$i] < (int)$testb[$i])
 			{
-				if($DEBUG) { echo ' no.'; }
+				if($DEBUG)
+				{
+echo ' no.'; }
 				$less--;
 				if($i<2)
 				{
 					/* Ensure that this is definitely smaller */
-					if($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+					if($DEBUG)
+					{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 					$less = -5;
 					break;
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo ' no, they are equal.'; }
+				if($DEBUG)
+				{
+echo ' no, they are equal.'; }
 				$less = 0;
 			}
 		}
-		if($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+		if($DEBUG)
+		{
+echo '<br>Check value is: "'.$less.'"'; }
 		if($less>0)
 		{
-			if($DEBUG) { echo '<br>A is greater than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is greater than B'; }
 			return True;
 		}
 		elseif($less<0)
 		{
-			if($DEBUG) { echo '<br>A is less than B'; }
+			if($DEBUG)
+			{
+echo '<br>A is less than B'; }
 			return False;
 		}
 		else
 		{
-			if($DEBUG) { echo '<br>A is equal to B'; }
+			if($DEBUG)
+			{
+echo '<br>A is equal to B'; }
 			return False;
 		}
 	}
@@ -990,7 +1057,10 @@ 
 				echo "<p><b>".$e->getMessage()."</b></p>\n";
 				return false;
 			}
-			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
+			if (!isset($GLOBALS['egw']->accounts))
+			{
+				$GLOBALS['egw']->accounts = $this->accounts;
+			}
 			accounts::cache_invalidate();	// the cache is shared for all instances of the class
 		}
 		return true;
@@ -1025,7 +1095,10 @@ 
 
 		if ($username == 'anonymous')
 		{
-			if (!isset($this->anonpw)) $this->anonpw = auth::randomstring(16);
+			if (!isset($this->anonpw))
+			{
+				$this->anonpw = auth::randomstring(16);
+			}
 			$passwd = $anonpw = $this->anonpw;
 		}
 
@@ -1084,11 +1157,17 @@ 
 				'account_lid' => $username,
 			));
 		}
-		if ($primary_group)	// only for users, NOT groups
+		if ($primary_group)
+		{
+			// only for users, NOT groups
 		{
 			$this->set_memberships(array($primary_group_id), $accountid);
+		}
 
-			if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid);
+			if (!$changepw)
+			{
+				$this->add_acl('preferences','nopasswordchange',$accountid);
+			}
 		}
 		//error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid");
 		return $accountid;
@@ -1124,7 +1203,10 @@ 
 	 */
 	function accounts_exist()
 	{
-		if (!$this->setup_account_object()) return false;
+		if (!$this->setup_account_object())
+		{
+			return false;
+		}
 
 		$accounts = $this->accounts->search(array(
 			'type'   => 'accounts',
@@ -1205,9 +1287,15 @@ 
 	{
 		static $table_names = False;
 
-		if (!$table_names || $force_refresh) $table_names = $this->db->table_names();
+		if (!$table_names || $force_refresh)
+		{
+			$table_names = $this->db->table_names();
+		}
 
-		if (!$table_names) return false;
+		if (!$table_names)
+		{
+			return false;
+		}
 
 		foreach($table_names as $data)
 		{
@@ -1237,10 +1325,13 @@ 
 		{
 			$table = $this->table_exist($tables,$force_refresh);
 
-			if ($table && $table != $this->$name)	// only overwrite the default name, if we realy got one (important for new installs)
+			if ($table && $table != $this->$name)
+			{
+				// only overwrite the default name, if we realy got one (important for new installs)
 			{
 				$this->$name = $table;
 			}
+			}
 			//echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n";
 		}
 	}

setup/index.php

Indentation +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
 					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+										 "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

Switch Indentation +92 added lines, -92 removed lines

@@ -180,17 +180,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -223,76 +223,76 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -371,7 +371,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (egw_exception_db $e)
 		{
@@ -383,21 +383,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

Spacing +182 added lines, -184 removed lines

@@ -16,9 +16,8 @@ 
 @set_time_limit(0);
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
-$setup_tpl->set_file(array
-(
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
+$setup_tpl->set_file(array(
 	'T_head'       => 'head.tpl',
 	'T_footer'     => 'footer.tpl',
 	'T_alert_msg'  => 'msg_alert_msg.tpl',
@@ -28,19 +27,19 @@ 
 	'T_setup_db_blocks'    => 'setup_db_blocks.tpl'
 ));
 
-$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
 
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1','V_db_stage_1');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1a','V_db_stage_1a');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_3','V_db_stage_3');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_4','V_db_stage_4');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_5','V_db_stage_5');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_pre','V_db_stage_6_pre');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_post','V_db_stage_6_post');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_10','V_db_stage_10');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_default','V_db_stage_default');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1', 'V_db_stage_1');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1a', 'V_db_stage_1a');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_2', 'V_db_stage_2');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_3', 'V_db_stage_3');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_4', 'V_db_stage_4');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_5', 'V_db_stage_5');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_pre', 'V_db_stage_6_pre');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_post', 'V_db_stage_6_post');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_10', 'V_db_stage_10');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_default', 'V_db_stage_default');
 
 // Check header and authentication
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
@@ -56,9 +55,9 @@ 
 	}
 	exit;
 }
-elseif(!$GLOBALS['egw_setup']->auth('Config'))
+elseif (!$GLOBALS['egw_setup']->auth('Config'))
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Please login'),True);
+	$GLOBALS['egw_setup']->html->show_header(lang('Please login'), True);
 	$GLOBALS['egw_setup']->html->login_form();
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
@@ -70,11 +69,11 @@ 
 	$GLOBALS['egw_info']['setup']['header_msg'],
 	False,
 	'config',
-	$GLOBALS['egw_setup']->ConfigDomain . ' (' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
+	$GLOBALS['egw_setup']->ConfigDomain.' ('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_user'].'@'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_host'].':'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_port'].'/'.
-		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'] . ')'
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'].')'
 );
 /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */
 /* $GLOBALS['egw_setup']->clear_session_cache(); */
@@ -87,23 +86,23 @@ 
 	$setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 	$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
 	$GLOBALS['egw_info']['setup']['stage']['db'] = $GLOBALS['egw_setup']->detection->check_db($setup_info);
-	if($GLOBALS['DEBUG'])
+	if ($GLOBALS['DEBUG'])
 	{
 		_debug_array($setup_info);
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG']) { echo 'Stage: '.$GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
 // end DEBUG code
 
-switch(@get_var('action',Array('POST')))
+switch (@get_var('action', Array('POST')))
 {
 	case 'Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('Are you sure you want to delete your existing tables and data?') . '.';
+		$submsg = lang('Are you sure you want to delete your existing tables and data?').'.';
 		$subaction = lang('uninstall');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'predrop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 5;
@@ -117,7 +116,7 @@ 
 		break;
 	case 'REALLY Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data') . '.';
+		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data').'.';
 		$subaction = lang('uninstalled');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'drop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
@@ -148,17 +147,17 @@ 
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
 		break;
 }
-$setup_tpl->set_var('subtitle',@$subtitle);
-$setup_tpl->set_var('submsg',@$submsg);
-$setup_tpl->set_var('subaction',@$subaction);
+$setup_tpl->set_var('subtitle', @$subtitle);
+$setup_tpl->set_var('submsg', @$submsg);
+$setup_tpl->set_var('subaction', @$subaction);
 
 // Old PHP
-if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 {
-	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
+	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'], True);
 	$GLOBALS['egw_setup']->html->show_alert_msg('Error',
 		lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',
-		PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
+		PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, $GLOBALS['egw_setup']->recommended_php_version));
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
 }
@@ -167,134 +166,133 @@ 
 
 //$GLOBALS['egw_setup']->app_status();
 $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images';
-$incomplete = $GLOBALS['egw_info']['server']['app_images'] . '/incomplete.png';
-$completed  = $GLOBALS['egw_info']['server']['app_images'] . '/completed.png';
+$incomplete = $GLOBALS['egw_info']['server']['app_images'].'/incomplete.png';
+$completed  = $GLOBALS['egw_info']['server']['app_images'].'/completed.png';
 
-$setup_tpl->set_var('img_incomplete',$incomplete);
-$setup_tpl->set_var('img_completed',$completed);
+$setup_tpl->set_var('img_incomplete', $incomplete);
+$setup_tpl->set_var('img_completed', $completed);
 
-$setup_tpl->set_var('db_step_text',lang('Step %1 - Simple Application Management', ++$num));
-$setup_tpl->set_var('lang_system_charset',lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
-$setup_tpl->set_var('system_charset',str_replace('&amp;','&',
-	$GLOBALS['egw_setup']->translation->get_charsets('system_charset',$GLOBALS['egw_setup']->system_charset)));
+$setup_tpl->set_var('db_step_text', lang('Step %1 - Simple Application Management', ++$num));
+$setup_tpl->set_var('lang_system_charset', lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
+$setup_tpl->set_var('system_charset', str_replace('&amp;', '&',
+	$GLOBALS['egw_setup']->translation->get_charsets('system_charset', $GLOBALS['egw_setup']->system_charset)));
 
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
+		$setup_tpl->set_var('dbnotexist', '<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+		$setup_tpl->set_var('makesure', lang('Make sure that your database is created and the account permissions are set'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('oncesetup', lang('Once the database is setup correctly'));
+		$setup_tpl->set_var('createdb', '<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+		$setup_tpl->set_var('create_database', lang('Create database'));
+		$setup_tpl->set_var('instr', '');
 		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
 		switch ($info['db_type'])
 		{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
-				$set_charset = (float) $GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
+				$set_charset = (float)$GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang("Instructions for creating the database in %1:",'MySql').'</b>'
+					'<b>'.lang("Instructions for creating the database in %1:", 'MySql').'</b>'
 					. '<br />'.lang('Login to mysql -')
 					. '<br /><i>[user@server user]# <b>mysql -u root -p</b></i><br />'
 					. lang('Create the empty database and grant user permissions -')
 					. "<br /><i>mysql> <b>CREATE DATABASE $info[db_name]$set_charset;</b></i>"
-					. "<br /><i>mysql> <b>GRANT ALL ON " . $info['db_name']
-					. ".* TO " . $info['db_user'] . "@localhost IDENTIFIED BY '" . $info['db_pass'] . "';</b></i>");
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
+					. "<br /><i>mysql> <b>GRANT ALL ON ".$info['db_name']
+					. ".* TO ".$info['db_user']."@localhost IDENTIFIED BY '".$info['db_pass']."';</b></i>");
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1');
 				break;
 			case 'pgsql':
 				$ip = $info['db_host'] == 'localhost' ? '127.0.0.1' : '&lt;ip-address webserver&gt;';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang('Instructions for creating the database in %1:','PostgreSQL').'</b>'
+					'<b>'.lang('Instructions for creating the database in %1:', 'PostgreSQL').'</b>'
 					. '<br />'.lang('Login as user postgres, eg. by using su as root')
 					. "<br /><i>[root@server /root]# <b>su - postgres</b></i><br />"
 					. lang('Create the empty database and grant user permissions -')
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P " . $info['db_user'] . "</b></i>"
-					. "<br /><i>Enter password for new user: <b>" . $info['db_pass'] . "</b></i>"
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner " .  $info['db_user'] . ' ' . $info['db_name'] . "</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P ".$info['db_user']."</b></i>"
+					. "<br /><i>Enter password for new user: <b>".$info['db_pass']."</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner ".$info['db_user'].' '.$info['db_name']."</b></i>"
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
-					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" : "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1a');
 		}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+		$setup_tpl->set_var('prebeta', lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->parse('V_db_stage_2', 'B_db_stage_2');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+		$setup_tpl->set_var('dbexists', '<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+		$setup_tpl->set_var('install', lang('Install'));
+		$setup_tpl->set_var('proceed', lang('We can proceed'));
+		$setup_tpl->set_var('coreapps', lang('all applications'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('lang_restore', lang('Or you can install a previous backup.'));
+		$setup_tpl->set_var('upload', '<input type="file" name="uploaded" /> &nbsp;'.
 			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+		$setup_tpl->set_var('convert_checkbox', '<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+		$setup_tpl->set_var('lang_convert_charset', '<label for="convert_checkbox">'.
 			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+		$setup_tpl->parse('V_db_stage_3', 'B_db_stage_3');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 4:
 		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',$setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['phpgwapi']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('oldver', lang('You appear to be running version %1 of eGroupWare', $setup_info['phpgwapi']['currentver']));
+		$setup_tpl->set_var('automatic', lang('We will automatically update your tables/records to %1', $setup_info['phpgwapi']['version']));
+		$setup_tpl->set_var('backupwarn', lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+		$setup_tpl->set_var('lang_backup', lang('create a backup before upgrading the DB'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('upgrade', lang('Upgrade'));
+		$setup_tpl->set_var('goto', lang('Go to'));
+		$setup_tpl->set_var('configuration', lang('configuration'));
+		$setup_tpl->set_var('admin_account', lang('Create admin account'));
+		$setup_tpl->set_var('applications', lang('Manage Applications'));
+		$setup_tpl->set_var('db_backup', lang('DB backup and restore'));
+		$setup_tpl->set_var('language_management', lang('Manage Languages'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dont_touch_my_data', lang('Dont touch my data'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+		$setup_tpl->parse('V_db_stage_4', 'B_db_stage_4');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 5:
 		$setup_tpl->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+		$setup_tpl->set_var('are_you_sure', lang('ARE YOU SURE?'));
+		$setup_tpl->set_var('really_uninstall_all_applications', lang('REALLY Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('cancel', lang('cancel'));
+		$setup_tpl->parse('V_db_stage_5', 'B_db_stage_5');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+		$setup_tpl->set_var('status', lang('Status'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('tblchange', lang('Table Change Messages'));
+		$setup_tpl->parse('V_db_stage_6_pre', 'B_db_stage_6_pre');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+		$setup_tpl->set_var('tableshave', lang('If you did not receive any errors, your applications have been'));
 
 		try {	// catch DB errors to report them
 			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
 			{
 				case 'dbcreate':
-					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
+					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8', // create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
 					break;
 				case 'drop':
@@ -310,25 +308,25 @@ 
 						if (is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 							is_uploaded_file($_FILES['uploaded']['tmp_name']))
 						{
-							if (preg_match('/\.(bz2|gz)$/i',$_FILES['uploaded']['name'],$matches))
+							if (preg_match('/\.(bz2|gz)$/i', $_FILES['uploaded']['name'], $matches))
 							{
 								$ext = '.'.$matches[1];
-								move_uploaded_file($_FILES['uploaded']['tmp_name'],$_FILES['uploaded']['tmp_name'].$ext);
+								move_uploaded_file($_FILES['uploaded']['tmp_name'], $_FILES['uploaded']['tmp_name'].$ext);
 								$_FILES['uploaded']['tmp_name'] .= $ext;
 							}
-							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'],true)))
+							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'], true)))
 							{
-								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
-								$db_backup->restore($f,$_POST['convert_charset'],$_FILES['uploaded']['tmp_name'],false);
+								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
+								$db_backup->restore($f, $_POST['convert_charset'], $_FILES['uploaded']['tmp_name'], false);
 								fclose($f);
 								echo '<p align="center">'.lang('restore finished')."</p>\n";
 								unlink($_FILES['uploaded']['tmp_name']);
 							}
 							else	// backup failed ==> dont start the upgrade
 							{
-								$setup_tpl->set_var('submsg',lang('Restore failed'));
-								$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-								$setup_tpl->set_var('subaction','');
+								$setup_tpl->set_var('submsg', lang('Restore failed'));
+								$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+								$setup_tpl->set_var('subaction', '');
 							}
 						}
 					}
@@ -341,7 +339,7 @@ 
 							$GLOBALS['egw_setup']->system_charset = $_REQUEST['system_charset'];
 							$GLOBALS['egw_setup']->db->Link_ID->SetCharSet($_REQUEST['system_charset']);
 						}
-						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info,'new',$_REQUEST['debug'],True);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info, 'new', $_REQUEST['debug'], True);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -350,24 +348,24 @@ 
 					// create a backup, before upgrading the tables
 					if ($_POST['backup'])
 					{
-						$db_backup =& CreateObject('phpgwapi.db_backup');
+						$db_backup = & CreateObject('phpgwapi.db_backup');
 						if (is_resource($f = $db_backup->fopen_backup()))
 						{
-							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
+							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
 							$db_backup->backup($f);
 							fclose($f);
 							echo '<p align="center">'.lang('backup finished')."</p>\n";
 						}
 						else	// backup failed ==> dont start the upgrade
 						{
-							$setup_tpl->set_var('submsg',lang('Backup failed'));
-							$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-							$setup_tpl->set_var('subaction','');
+							$setup_tpl->set_var('submsg', lang('Backup failed'));
+							$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+							$setup_tpl->set_var('subaction', '');
 						}
 					}
 					if (!@$_POST['backup'] || !is_string($f))
 					{
-						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info,'upgrade',$_REQUEST['debug']);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info, 'upgrade', $_REQUEST['debug']);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -377,93 +375,93 @@ 
 		{
 			echo "<pre>".$e->getMessage()."</pre>\n";
 		}
-		$setup_tpl->set_var('re-check_my_installation',lang('Re-Check My Installation'));
-		$setup_tpl->set_var('system_charset',$GLOBALS['egw']->system_charset);
-		$setup_tpl->parse('V_db_stage_6_post','B_db_stage_6_post');
-		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('re-check_my_installation', lang('Re-Check My Installation'));
+		$setup_tpl->set_var('system_charset', $GLOBALS['egw']->system_charset);
+		$setup_tpl->parse('V_db_stage_6_post', 'B_db_stage_6_post');
+		$db_filled_block = $db_filled_block.$setup_tpl->get_var('V_db_stage_6_post');
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+		$setup_tpl->set_var('tablescurrent', lang('Your eGroupWare API is current'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('deletetables', lang('Uninstall all applications'));
+		$setup_tpl->parse('V_db_stage_10', 'B_db_stage_10');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+		$setup_tpl->set_var('dbnotexist', lang('Your database does not exist'));
+		$setup_tpl->parse('V_db_stage_default', 'B_db_stage_default');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 }
 
 // Config Section
-$setup_tpl->set_var('config_step_text',lang('Step %1 - Configuration', ++$num));
+$setup_tpl->set_var('config_step_text', lang('Step %1 - Configuration', ++$num));
 $GLOBALS['egw_info']['setup']['stage']['config'] = $GLOBALS['egw_setup']->detection->check_config();
 
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['config'] = 10;
 // end DEBUG code
 
-$setup_tpl->set_var('config_status_img',$incomplete);
-$setup_tpl->set_var('config_status_alt',lang('not completed'));
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+$setup_tpl->set_var('config_status_img', $incomplete);
+$setup_tpl->set_var('config_status_alt', lang('not completed'));
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 1:	// AFAIK this dont happen any more, as we have setup_process::save_minimal_config() now -- RalfBecker
 		$btn_config_now = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			lang('Please configure eGroupWare for your environment'),
-			'post','config.php',
-			'submit',lang('Configure Now'),
+			'post', 'config.php',
+			'submit', lang('Configure Now'),
 			'');
-		$setup_tpl->set_var('config_table_data',$btn_config_now);
+		$setup_tpl->set_var('config_table_data', $btn_config_now);
 		break;
 	case 10:
-		$setup_tpl->set_var('config_status_img',$completed);
-		$setup_tpl->set_var('config_status_alt',lang('completed'));
+		$setup_tpl->set_var('config_status_img', $completed);
+		$setup_tpl->set_var('config_status_alt', lang('completed'));
 		$config_msg = lang('Configuration completed');
 	case 2:
 		if ($GLOBALS['egw_info']['setup']['config_errors'])
 		{
-			$config_msg = implode('<br />',$GLOBALS['egw_info']['setup']['config_errors']);
+			$config_msg = implode('<br />', $GLOBALS['egw_info']['setup']['config_errors']);
 		}
 		$btn_edit_config = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$config_msg,
-			'post','config.php',
-			'submit',lang('Edit Current Configuration'),
+			'post', 'config.php',
+			'submit', lang('Edit Current Configuration'),
 			''
 		);
-		$setup_tpl->set_var('config_table_data',$btn_edit_config);
+		$setup_tpl->set_var('config_table_data', $btn_edit_config);
 		break;
 	default:
-		$setup_tpl->set_var('config_status_img',$incomplete);
-		$setup_tpl->set_var('config_status_alt',lang('not completed'));
-		$setup_tpl->set_var('config_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('config_status_img', $incomplete);
+		$setup_tpl->set_var('config_status_alt', lang('not completed'));
+		$setup_tpl->set_var('config_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Admin Account Section
-$setup_tpl->set_var('admin_step_text',lang('Step %1 - Admin Account', ++$num));
+$setup_tpl->set_var('admin_step_text', lang('Step %1 - Admin Account', ++$num));
 
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 10:
 		// check if there is already a user account (not the anonymous account of sitemgr or a group)
 		$no_accounts = !$GLOBALS['egw_setup']->accounts_exist();
-		$setup_tpl->set_var('admin_status_img',$no_accounts ? $incomplete : $completed);
-		$setup_tpl->set_var('admin_status_alt',$no_accounts ? lang('not completed') : lang('completed'));
-		$setup_tpl->set_var('admin_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+		$setup_tpl->set_var('admin_status_img', $no_accounts ? $incomplete : $completed);
+		$setup_tpl->set_var('admin_status_alt', $no_accounts ? lang('not completed') : lang('completed'));
+		$setup_tpl->set_var('admin_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$no_accounts ? lang('No accounts existing') : lang('Accounts existing'),
-			'post','admin_account.php',
-			'submit',lang('Create admin account'),
+			'post', 'admin_account.php',
+			'submit', lang('Create admin account'),
 			''
 		));
 		break;
 	default:
-		$setup_tpl->set_var('admin_status_img',$incomplete);
-		$setup_tpl->set_var('admin_status_alt',lang('not completed'));
-		$setup_tpl->set_var('admin_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('admin_status_img', $incomplete);
+		$setup_tpl->set_var('admin_status_alt', lang('not completed'));
+		$setup_tpl->set_var('admin_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 /*
@@ -514,69 +512,69 @@ 
 		break;
 }
 */
-$setup_tpl->set_var('apps_step_text',lang('Step %1 - Advanced Application Management', ++$num));
+$setup_tpl->set_var('apps_step_text', lang('Step %1 - Advanced Application Management', ++$num));
 //	$GLOBALS['egw_info']['setup']['stage']['apps'] = $GLOBALS['egw_setup']->check_apps();
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 10:
-		$setup_tpl->set_var('apps_status_img',$completed);
-		$setup_tpl->set_var('apps_status_alt',lang('completed'));
+		$setup_tpl->set_var('apps_status_img', $completed);
+		$setup_tpl->set_var('apps_status_alt', lang('completed'));
 		// check if we have apps to upgrade or essential apps not installed
 		$to_upgrade = $to_install = array();
-		foreach($setup_info as $app => $data)
+		foreach ($setup_info as $app => $data)
 		{
 			if ($data['currentver'] && $data['version'] && $data['version'] != $data['currentver'])
 			{
 				$to_upgrade[] = $app;
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		// warn if essential apps are not installed
-		foreach(array('phpgwapi','etemplate','home','admin','preferences','emailadmin') as $app)
+		foreach (array('phpgwapi', 'etemplate', 'home', 'admin', 'preferences', 'emailadmin') as $app)
 		{
 			if (!isset($setup_info[$app]) || empty($setup_info[$app]['currentver']))
 			{
 				$to_install[] = $app;
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ', $to_upgrade);
+			if ($to_install) $msg .= ($msg ? '<br />' : '').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ', $to_install);
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),
-			'post','applications.php',
-			'submit',lang('Manage Applications'),
+			'post', 'applications.php',
+			'submit', lang('Manage Applications'),
 			'');
-		$setup_tpl->set_var('apps_table_data',$btn_manage_apps);
+		$setup_tpl->set_var('apps_table_data', $btn_manage_apps);
 		break;
 	default:
-		$setup_tpl->set_var('apps_status_img',$incomplete);
-		$setup_tpl->set_var('apps_status_alt',lang('not completed'));
-		$setup_tpl->set_var('apps_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('apps_status_img', $incomplete);
+		$setup_tpl->set_var('apps_status_alt', lang('not completed'));
+		$setup_tpl->set_var('apps_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Backup and restore section
-$setup_tpl->set_var('backup_step_text',lang('Step %1 - DB backup and restore', ++$num));
+$setup_tpl->set_var('backup_step_text', lang('Step %1 - DB backup and restore', ++$num));
 if ($GLOBALS['egw_info']['setup']['stage']['db'] == 10 && !$no_backup_dir)
 {
-	$setup_tpl->set_var('backup_status_img',$completed);
-	$setup_tpl->set_var('backup_status_alt',lang('completed'));
-	$setup_tpl->set_var('backup_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+	$setup_tpl->set_var('backup_status_img', $completed);
+	$setup_tpl->set_var('backup_status_alt', lang('completed'));
+	$setup_tpl->set_var('backup_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 		''/*lang('This stage is completed<br />')*/,
-		'post','db_backup.php',
-		'submit',lang('backup and restore'),
+		'post', 'db_backup.php',
+		'submit', lang('backup and restore'),
 		''));
 }
 else
 {
-	$setup_tpl->set_var('backup_status_img',$incomplete);
-	$setup_tpl->set_var('backup_status_alt',lang('not completed'));
-	$setup_tpl->set_var('backup_table_data',$no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
+	$setup_tpl->set_var('backup_status_img', $incomplete);
+	$setup_tpl->set_var('backup_status_alt', lang('not completed'));
+	$setup_tpl->set_var('backup_table_data', $no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
 }
 
-$setup_tpl->pparse('out','T_setup_main');
+$setup_tpl->pparse('out', 'T_setup_main');
 $GLOBALS['egw_setup']->html->show_footer();

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

@@ -99,7 +99,7 @@
 //$action = 'Upgrade';
 // end DEBUG code
 
-switch(@get_var('action',Array('POST')))
+switch(@get_var('action',array('POST')))
 {
 	case 'Uninstall all applications':
 		$subtitle = lang('Deleting Tables');