EGroupware / egroupware

resources/inc/class.resources_bo.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param int $user=null account_id of user to use for Acl, default current user
+	 * @param integer $user
 	 */
 	function __construct($user=null)
 	{
@@ -774,8 +774,8 @@ 
 	 *
 	 * Cornelius Weiss <egw@von-und-zu-weiss.de>
 	 * @param array $file array with key => value
-	 * @param int $resource_id
-	 * @return mixed string with msg if somthing went wrong; nothing if all right
+	 * @param int $resouce_id
+	 * @return string|null string with msg if somthing went wrong; nothing if all right
 	 */
 	function save_picture($file,$resouce_id)
 	{

Indentation +5 added lines, -5 removed lines

@@ -368,10 +368,10 @@ 
 		}
 
 		// Check for restore of deleted, restore held links
-                if($old && $old['deleted'] && !$resource['deleted'])
-                {
-                        Link::restore('resources', $resource['res_id']);
-                }
+				if($old && $old['deleted'] && !$resource['deleted'])
+				{
+						Link::restore('resources', $resource['res_id']);
+				}
 
 		// delete old pictures
 		if($resource['picture_src'] != 'own_src')
@@ -695,7 +695,7 @@ 
 						$list[$id] = ' ('.lang('conflict').') '.$resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
 					}
 				} else {
-				        $list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+						$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
 				}
 			}
 		} else {

Spacing +137 added lines, -137 removed lines

@@ -81,7 +81,7 @@ 
 	 *
 	 * @param int $user=null account_id of user to use for Acl, default current user
 	 */
-	function __construct($user=null)
+	function __construct($user = null)
 	{
 		$this->so = new resources_so();
 		$this->acl = new resources_acl_bo($user);
@@ -89,8 +89,8 @@ 
 
 		$this->cal_right_transform = array(
 			resources_acl_bo::CAL_READ	=> Acl::READ,
-			resources_acl_bo::DIRECT_BOOKING 	=> Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE,
-			resources_acl_bo::CAT_ADMIN 	=> Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE,
+			resources_acl_bo::DIRECT_BOOKING 	=> Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE,
+			resources_acl_bo::CAT_ADMIN 	=> Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE,
 		);
 	}
 
@@ -99,19 +99,19 @@ 
 	 *
 	 * Cornelius Weiss <egw@von-und-zu-weiss.de>
 	 */
-	function get_rows($query,&$rows,&$readonlys)
+	function get_rows($query, &$rows, &$readonlys)
 	{
-		if(!$query['csv_export'])
+		if (!$query['csv_export'])
 		{
 			Api\Cache::setSession('resources', 'index_nm', $query);
 		}
 		if ($query['store_state'])	// request to store state in session and filter in prefs?
 		{
-			Api\Cache::setSession('resources',$query['store_state'],$query);
+			Api\Cache::setSession('resources', $query['store_state'], $query);
 			//echo "<p>".__METHOD__."() query[filter]=$query[filter], prefs[resources][filter]={$GLOBALS['egw_info']['user']['preferences']['resources']['filter']}</p>\n";
 			if ($query['filter'] != $GLOBALS['egw_info']['user']['preferences']['resources']['filter'])
 			{
-				$GLOBALS['egw']->preferences->add('resources','filter',$query['filter'],'user');
+				$GLOBALS['egw']->preferences->add('resources', 'filter', $query['filter'], 'user');
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
@@ -125,7 +125,7 @@ 
 		// Sub-query to get the count of accessories
 		$acc_join = "LEFT JOIN (SELECT accessory_of AS accessory_id, count(res_id) as acc_count FROM {$this->so->table_name} GROUP BY accessory_of) AS acc ON acc.accessory_id = {$this->so->table_name}.res_id ";
 
-		switch($query['filter2'])
+		switch ($query['filter2'])
 		{
 			case -1:
 				// Resources only
@@ -150,14 +150,14 @@ 
 			default:
 				$filter['accessory_of'] = $query['filter2'];
 		}
-		if($query['filter2'] != self::DELETED)
+		if ($query['filter2'] != self::DELETED)
 		{
 			$filter['deleted'] = null;
 		}
 
 		if ($query['filter'])
 		{
-			if (($children = $this->acl->get_cats(Acl::READ,$query['filter'])))
+			if (($children = $this->acl->get_cats(Acl::READ, $query['filter'])))
 			{
 				$filter['cat_id'] = array_keys($children);
 				$filter['cat_id'][] = $query['filter'];
@@ -180,7 +180,7 @@ 
 		{
 			$filter['bookable'] = true;
 		}
-		$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
+		$order_by = $query['order'] ? $query['order'].' '.$query['sort'] : '';
 		$start = (int)$query['start'];
 
 		foreach ($filter as $k => $v) $query['col_filter'][$k] = $v;
@@ -188,10 +188,10 @@ 
 		$nr = $this->so->total;
 
 		// we are called to serve bookable resources (e.g. calendar-dialog)
-		if($query['show_bookable'])
+		if ($query['show_bookable'])
 		{
 			// This is somehow ugly, i know...
-			foreach((array)$rows as $num => $resource)
+			foreach ((array)$rows as $num => $resource)
 			{
 				$rows[$num]['default_qty'] = 1;
 			}
@@ -200,24 +200,24 @@ 
 		}
 
 		$config = Api\Config::read('resources');
-		foreach($rows as $num => &$resource)
+		foreach ($rows as $num => &$resource)
 		{
-			if (!$this->acl->is_permitted($resource['cat_id'],Acl::EDIT))
+			if (!$this->acl->is_permitted($resource['cat_id'], Acl::EDIT))
 			{
 				$readonlys["edit[$resource[res_id]]"] = true;
 			}
-			elseif($resource['deleted'])
+			elseif ($resource['deleted'])
 			{
 				$resource['class'] .= 'deleted ';
 			}
-			if (!$this->acl->is_permitted($resource['cat_id'],Acl::DELETE) ||
+			if (!$this->acl->is_permitted($resource['cat_id'], Acl::DELETE) ||
 				($resource['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history')
 			)
 			{
 				$readonlys["delete[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_delete ';
 			}
-			if ((!$this->acl->is_permitted($resource['cat_id'],Acl::ADD)) ||
+			if ((!$this->acl->is_permitted($resource['cat_id'], Acl::ADD)) ||
 				// Allow new accessory action when viewing accessories of a certain resource
 				$query['filter2'] <= 0 && $resource['accessory_of'] != -1)
 			{
@@ -231,7 +231,7 @@ 
 				$resource['class'] .= 'no_book ';
 				$resource['class'] .= 'no_view_calendar ';
 			}
-			if(!$this->acl->is_permitted($resource['cat_id'],resources_acl_bo::CAL_READ))
+			if (!$this->acl->is_permitted($resource['cat_id'], resources_acl_bo::CAL_READ))
 			{
 				$readonlys["calendar[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_view_calendar ';
@@ -242,12 +242,12 @@ 
 				$resource['class'] .= 'no_buy ';
 			}
 			$readonlys["view_acc[{$resource['res_id']}]"] = ($resource['acc_count'] == 0);
-			$resource['class'] .= ($resource['accessory_of']==-1 ? 'resource ' : 'accessory ');
-			if($resource['acc_count'])
+			$resource['class'] .= ($resource['accessory_of'] == -1 ? 'resource ' : 'accessory ');
+			if ($resource['acc_count'])
 			{
 				$resource['class'] .= 'hasAccessories ';
-				$accessories = $this->get_acc_list($resource['res_id'],$query['filter2']==self::DELETED);
-				foreach($accessories as $acc_id => $acc_name)
+				$accessories = $this->get_acc_list($resource['res_id'], $query['filter2'] == self::DELETED);
+				foreach ($accessories as $acc_id => $acc_name)
 				{
 					$resource['accessories'][] = array('acc_id' => $acc_id, 'name' => $this->link_title($acc_id));
 				}
@@ -255,7 +255,7 @@ 
 				$resource['accessory_of_label'] = $this->link_title($resource['accessory_of']);
 			}
 
-			if($resource['deleted'])
+			if ($resource['deleted'])
 			{
 				$rows[$num]['picture_thumb'] = 'deleted';
 			}
@@ -276,7 +276,7 @@ 
 			$rows[$num]['admin'] = $this->acl->get_cat_admin($resource['cat_id']);
 		}
 
-		if(!Api\Storage\Customfields::get('resources'))
+		if (!Api\Storage\Customfields::get('resources'))
 		{
 			$rows['no_customfields'] = true;
 		}
@@ -294,11 +294,11 @@ 
 	{
 		if (!($data = $this->so->read(array('res_id' => $res_id))))
 		{
-			return null;	// not found
+			return null; // not found
 		}
-		if (!$this->acl->is_permitted($data['cat_id'],Acl::READ))
+		if (!$this->acl->is_permitted($data['cat_id'], Acl::READ))
 		{
-			return false;	// permission denied
+			return false; // permission denied
 		}
 		return $data;
 	}
@@ -312,35 +312,35 @@ 
 	 */
 	function save($resource)
 	{
-		if(!$this->acl->is_permitted($resource['cat_id'],Acl::EDIT))
+		if (!$this->acl->is_permitted($resource['cat_id'], Acl::EDIT))
 		{
 			return lang('You are not permitted to edit this resource!');
 		}
 		$old = array();
 		// we need an id to save pictures and make links...
-		if(!$resource['res_id'])
+		if (!$resource['res_id'])
 		{
 			$resource['res_owner'] = $GLOBALS['egw_info']['user']['account_id'];
-			$resource['res_created'] = Api\DateTime::server2user(time(),'ts');
+			$resource['res_created'] = Api\DateTime::server2user(time(), 'ts');
 			$resource['res_id'] = $this->so->save($resource);
 		}
 		else
 		{
 			$resource['res_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-			$resource['res_modified'] = Api\DateTime::server2user(time(),'ts');
+			$resource['res_modified'] = Api\DateTime::server2user(time(), 'ts');
 			$old = $this->read($resource['res_id']);
 		}
 
 		switch ($resource['picture_src'])
 		{
 			case 'own_src':
-				if($resource['own_file']['size'] > 0)
+				if ($resource['own_file']['size'] > 0)
 				{
-					$msg = $this->save_picture($resource['own_file'],$resource['res_id']);
+					$msg = $this->save_picture($resource['own_file'], $resource['res_id']);
 					unset($resource['own_file']);
 					break;
 				}
-				elseif(@egw_vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
+				elseif (@egw_vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
 				{
 					break;
 				}
@@ -351,10 +351,10 @@ 
 				$resource['picture_src'] = 'gen_src';
 				break;
 			default:
-				if($resource['own_file']['size'] > 0)
+				if ($resource['own_file']['size'] > 0)
 				{
 					$resource['picture_src'] = 'own_src';
-					$msg = $this->save_picture($resource['own_file'],$resource['res_id']);
+					$msg = $this->save_picture($resource['own_file'], $resource['res_id']);
 				}
 				else
 				{
@@ -362,55 +362,55 @@ 
 				}
 		}
 		// somthing went wrong on saving own picture
-		if($msg)
+		if ($msg)
 		{
 			return $msg;
 		}
 
 		// Check for restore of deleted, restore held links
-                if($old && $old['deleted'] && !$resource['deleted'])
+                if ($old && $old['deleted'] && !$resource['deleted'])
                 {
                         Link::restore('resources', $resource['res_id']);
                 }
 
 		// delete old pictures
-		if($resource['picture_src'] != 'own_src')
+		if ($resource['picture_src'] != 'own_src')
 		{
 			$this->remove_picture($resource['res_id']);
 		}
 
 		// Update link title
-		Link::notify_update('resources',$resource['res_id'], $resource);
+		Link::notify_update('resources', $resource['res_id'], $resource);
 		// save links
-		if(is_array($resource['link_to']['to_id']))
+		if (is_array($resource['link_to']['to_id']))
 		{
-			Link::link('resources',$resource['res_id'],$resource['link_to']['to_id']);
+			Link::link('resources', $resource['res_id'], $resource['link_to']['to_id']);
 		}
-		if($resource['accessory_of'] != $old['accessory_of'])
+		if ($resource['accessory_of'] != $old['accessory_of'])
 		{
-			Link::unlink(0,'resources',$resource['res_id'],'','resources',$old['accessory_of']);
+			Link::unlink(0, 'resources', $resource['res_id'], '', 'resources', $old['accessory_of']);
 
 			// Check for resource changing to accessory - move its accessories to resource
-			if($old['accessory_of'] == -1 && $accessories = $this->get_acc_list($resource['res_id']))
+			if ($old['accessory_of'] == -1 && $accessories = $this->get_acc_list($resource['res_id']))
 			{
-				foreach($accessories as $accessory => $name)
+				foreach ($accessories as $accessory => $name)
 				{
-					Link::unlink(0,'resources',$accessory,'','resources',$resource['res_id']);
+					Link::unlink(0, 'resources', $accessory, '', 'resources', $resource['res_id']);
 					$acc = $this->read($accessory);
 					$acc['accessory_of'] = -1;
 					$this->so->save($acc);
 				}
 			}
 		}
-		if($resource['accessory_of'] != -1)
+		if ($resource['accessory_of'] != -1)
 		{
-			Link::link('resources',$resource['res_id'],'resources',$resource['accessory_of']);
+			Link::link('resources', $resource['res_id'], 'resources', $resource['accessory_of']);
 		}
 
-		if(!empty($resource['res_id']) && $this->so->get_value("cat_id",$resource['res_id']) != $resource['cat_id'] && $resource['accessory_of'] == -1)
+		if (!empty($resource['res_id']) && $this->so->get_value("cat_id", $resource['res_id']) != $resource['cat_id'] && $resource['accessory_of'] == -1)
 		{
 			$accessories = $this->get_acc_list($resource['res_id']);
-			foreach($accessories as $accessory => $name)
+			foreach ($accessories as $accessory => $name)
 			{
 				$acc = $this->so->read($accessory);
 				$acc['cat_id'] = $resource['cat_id'];
@@ -426,9 +426,9 @@ 
 		{
 			$this->tracking = new resources_tracking();
 		}
-		if ($this->tracking->track($resource,$old,$this->user) === false)
+		if ($this->tracking->track($resource, $old, $this->user) === false)
 		{
-			return implode(', ',$this->tracking->errors);
+			return implode(', ', $this->tracking->errors);
 		}
 
 		return $res_id ? $res_id : lang('Something went wrong by saving resource');
@@ -442,7 +442,7 @@ 
 	 */
 	function delete($res_id)
 	{
-		if(!$this->acl->is_permitted($this->so->get_value('cat_id',$res_id),Acl::DELETE))
+		if (!$this->acl->is_permitted($this->so->get_value('cat_id', $res_id), Acl::DELETE))
 		{
 			return lang('You are not permitted to delete this resource!');
 		}
@@ -454,17 +454,17 @@ 
 		{
 			$old['deleted'] = time();
 			$this->save($old);
-			Link::unlink(0,'resources',$res_id,'','','',true);
+			Link::unlink(0, 'resources', $res_id, '', '', '', true);
 			$accessories = $this->get_acc_list($res_id);
-			foreach($accessories as $acc_id => $name)
+			foreach ($accessories as $acc_id => $name)
 			{
 				// Don't purge already deleted accessories
 				$acc = $this->read($acc_id);
-				if(!$acc['deleted'])
+				if (!$acc['deleted'])
 				{
 					$acc['deleted'] = time();
 					$this->save($acc);
-					Link::unlink(0,'resources',$acc_id,'','','',true);
+					Link::unlink(0, 'resources', $acc_id, '', '', '', true);
 				}
 			}
 			return false;
@@ -472,9 +472,9 @@ 
 		elseif ($this->so->delete(array('res_id'=>$res_id)))
 		{
 			$accessories = $this->get_acc_list($res_id, true);
-			foreach($accessories as $acc_id => $name)
+			foreach ($accessories as $acc_id => $name)
 			{
-				if($this->delete($acc_id))
+				if ($this->delete($acc_id))
 				{
 					$acc = $this->read($acc_id);
 					$acc['accessory_of'] = -1;
@@ -482,9 +482,9 @@ 
 				}
 			};
 			$this->remove_picture($res_id);
-	 		Link::unlink(0,'resources',$res_id);
+	 		Link::unlink(0, 'resources', $res_id);
 	 		// delete the resource from the calendar
-	 		ExecMethod('calendar.calendar_so.deleteaccount','r'.$res_id);
+	 		ExecMethod('calendar.calendar_so.deleteaccount', 'r'.$res_id);
 	 		return false;
 		}
 		return lang('Something went wrong by deleting resource');
@@ -498,15 +498,15 @@ 
 	 * @param boolean $deleted Include deleted accessories
 	 * @return array
 	 */
-	function get_acc_list($res_id,$deleted=false)
+	function get_acc_list($res_id, $deleted = false)
 	{
-		if($res_id < 1){return;}
-		$data = $this->so->search('','res_id,name,deleted','','','','','',$start,array('accessory_of' => $res_id),'',$need_full_no_count=true);
+		if ($res_id < 1) {return; }
+		$data = $this->so->search('', 'res_id,name,deleted', '', '', '', '', '', $start, array('accessory_of' => $res_id), '', $need_full_no_count = true);
 		$acc_list = array();
-		if($data) {
-			foreach($data as $num => $resource)
+		if ($data) {
+			foreach ($data as $num => $resource)
 			{
-				if($resource['deleted'] && !$deleted) continue;
+				if ($resource['deleted'] && !$deleted) continue;
 				$acc_list[$resource['res_id']] = $resource['name'];
 			}
 		}
@@ -522,20 +522,20 @@ 
 	function get_calendar_info($res_id)
 	{
 		//echo "<p>resources_bo::get_calendar_info(".print_r($res_id,true).")</p>\n";
-		if(!is_array($res_id) && $res_id < 1) return;
+		if (!is_array($res_id) && $res_id < 1) return;
 
-		$data = $this->so->search(array('res_id' => $res_id),self::TITLE_COLS.',useable');
+		$data = $this->so->search(array('res_id' => $res_id), self::TITLE_COLS.',useable');
 		if (!is_array($data))
 		{
 			error_log(__METHOD__." No Calendar Data found for Resource with id $res_id");
 			return array();
 		}
-		foreach($data as $num => &$resource)
+		foreach ($data as $num => &$resource)
 		{
 			$resource['rights'] = false;
-			foreach($this->cal_right_transform as $res_right => $cal_right)
+			foreach ($this->cal_right_transform as $res_right => $cal_right)
 			{
-				if($this->acl->is_permitted($resource['cat_id'],$res_right))
+				if ($this->acl->is_permitted($resource['cat_id'], $res_right))
 				{
 					$resource['rights'] = $cal_right;
 				}
@@ -543,7 +543,7 @@ 
 			$resource['responsible'] = $this->acl->get_cat_admin($resource['cat_id']);
 
 			// preseed the cache
-			Link::set_cache('resources',$resource['res_id'],$t=$this->link_title($resource));
+			Link::set_cache('resources', $resource['res_id'], $t = $this->link_title($resource));
 		}
 		return $data;
 	}
@@ -560,7 +560,7 @@ 
 		{
 			return false;
 		}
-		return $this->acl->is_permitted($data['cat_id'],resources_acl_bo::DIRECT_BOOKING) ? A : U;
+		return $this->acl->is_permitted($data['cat_id'], resources_acl_bo::DIRECT_BOOKING) ? A : U;
 	}
 
 	/**
@@ -572,11 +572,11 @@ 
 	 * @param array $options Array of options for the search
 	 *
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query($pattern, Array &$options = array())
 	{
 		if (is_array($pattern))
 		{
-			$criteria =array('name' => $pattern['search']
+			$criteria = array('name' => $pattern['search']
 					,'short_description' => $pattern['search']);
 		}
 		else
@@ -587,7 +587,7 @@ 
 		$only_keys = 'res_id,name,short_description,bookable,useable';
 
 		// If no read access to any category, just stop
-		if(!$this->acl->get_cats(Acl::READ))
+		if (!$this->acl->get_cats(Acl::READ))
 		{
 			$options['total'] = 0;
 			return array();
@@ -598,30 +598,30 @@ 
 			'deleted' => null
 		);
 		$limit = false;
-		if($options['start'] || $options['num_rows']) {
+		if ($options['start'] || $options['num_rows']) {
 			$limit = array($options['start'], $options['num_rows']);
 		}
-		if($options['accessory_of'])
+		if ($options['accessory_of'])
 		{
 			$filter['accessory_of'] = $options['accessory_of'];
 		}
-		$data = $this->so->search($criteria,$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',$limit,$filter);
+		$data = $this->so->search($criteria, $only_keys, $order_by = 'name', $extra_cols = '', $wildcard = '%', $empty, $op = 'OR', $limit, $filter);
 		// maybe we need to check disponibility of the searched resources in the calendar if $pattern ['exec'] contains some extra args
-		$show_conflict=False;
+		$show_conflict = False;
 		if ($options['exec'] && $GLOBALS['egw_info']['preferences']['calendar']['defaultresource_sel'] !== 'resources')
 		{
 			// we'll use a cache for resources info taken from database
 			static $res_info_cache = array();
-			$cal_info=$options['exec'];
-			if ( isset($cal_info['start']) && isset($cal_info['duration']))
+			$cal_info = $options['exec'];
+			if (isset($cal_info['start']) && isset($cal_info['duration']))
 			{
 				//get a calendar objet for reservations
-				if ( (!isset($this->bocal)) || !(is_object($this->bocal)))
+				if ((!isset($this->bocal)) || !(is_object($this->bocal)))
 				{
 					$this->bocal = new calendar_bo();
 				}
 				$start = new Api\DateTime($cal_info['start']);
-				$startarr= getdate($start->format('ts'));
+				$startarr = getdate($start->format('ts'));
 				if (isset($cal_info['whole_day']) && $cal_info['whole_day']) {
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new Api\DateTime($startarr);
@@ -632,39 +632,39 @@ 
 				}
 
 				// search events matching our timestamps
- 				$resource_list=array();
-				foreach($data as $num => $resource)
+ 				$resource_list = array();
+				foreach ($data as $num => $resource)
 				{
 					// we only need resources id for the search, but with a 'r' prefix
 					// now we take this loop to store a new resource array indexed with resource id
 					// and as we work for calendar we use only bookable resources
-					if ((isset($resource['bookable'])) && ($resource['bookable'])){
-						$res_info_cache[$resource['res_id']]=$resource;
-						$resource_list[]='r'.$resource['res_id'];
+					if ((isset($resource['bookable'])) && ($resource['bookable'])) {
+						$res_info_cache[$resource['res_id']] = $resource;
+						$resource_list[] = 'r'.$resource['res_id'];
 					}
 				}
-				$overlapping_events =& $this->bocal->search(array(
+				$overlapping_events = & $this->bocal->search(array(
 					'start' => $start,
 					'end'   => $end,
 					'users' => $resource_list,
-					'ignore_acl' => true,   // otherwise we get only events readable by the user
-					'enum_groups' => false,  // otherwise group-events would not block time
+					'ignore_acl' => true, // otherwise we get only events readable by the user
+					'enum_groups' => false, // otherwise group-events would not block time
 				));
 
 				// parse theses overlapping events
-				foreach($overlapping_events as $event)
+				foreach ($overlapping_events as $event)
 				{
 					if ($event['non_blocking']) continue; // ignore non_blocking events
-					if (isset($cal_info['event_id']) && $event['id']==$cal_info['event_id']) {
+					if (isset($cal_info['event_id']) && $event['id'] == $cal_info['event_id']) {
 						continue; //ignore this event, it's the current edited event, no conflict by def
 					}
 					// now we are interested only on resources booked by theses events
-					if (isset($event['participants']) && is_array($event['participants'])){
-						foreach($event['participants'] as $part_key => $part_detail){
-							if ($part_key{0}=='r')
+					if (isset($event['participants']) && is_array($event['participants'])) {
+						foreach ($event['participants'] as $part_key => $part_detail) {
+							if ($part_key{0} == 'r')
 							{ //now we gatta resource here
 								//need to check the quantity of this resource
-								$resource_id=substr($part_key,1);
+								$resource_id = substr($part_key, 1);
 								// if we do not find this resource in our indexed array it's certainly
 								// because it was unset, non bookable maybe
 								if (!isset($res_info_cache[$resource_id])) continue;
@@ -674,9 +674,9 @@ 
 								}
 								// now decrement this quantity useable
 								$quantity = 1;
-								$this->bocal->so->split_status($part_detail,$quantity);
+								$this->bocal->so->split_status($part_detail, $quantity);
 								
-								$res_info_cache[$resource_id]['useable']-=$quantity;
+								$res_info_cache[$resource_id]['useable'] -= $quantity;
 							}
 						}
 					}
@@ -684,27 +684,27 @@ 
 			}
 		}
 		if (isset($res_info_cache)) {
-			$show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] === 'resources_conflict';
+			$show_conflict = $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] === 'resources_conflict';
 			// if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar
 			// so we'll loop on this one and not $data
-			foreach($res_info_cache as $id => $resource) {
+			foreach ($res_info_cache as $id => $resource) {
 				//maybe this resource is reserved
-				if ( ($resource['useable'] < 1) )
+				if (($resource['useable'] < 1))
 				{
-					if($show_conflict) {
-						$list[$id] = ' ('.lang('conflict').') '.$resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+					if ($show_conflict) {
+						$list[$id] = ' ('.lang('conflict').') '.$resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 					}
 				} else {
-				        $list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+				        $list[$id] = $resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 				}
 			}
 		} else {
 			// we are not working for the calendar, we loop on the initial $data
 			if (is_array($data)) {
-				foreach($data as $num => $resource)
+				foreach ($data as $num => $resource)
 				{
-					$id=$resource['res_id'];
-					$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+					$id = $resource['res_id'];
+					$list[$id] = $resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 				}
 			} else {
 				error_log(__METHOD__." No Data found for Resource with id ".$resource['res_id']);
@@ -721,17 +721,17 @@ 
 	 * @param int|array $resource
 	 * @return string|boolean string with title, null if resource does not exist or false if no perms to view it
 	 */
-	function link_title( $resource )
+	function link_title($resource)
 	{
 		if (!is_array($resource))
 		{
-			if (!($resource  = $this->read(array('res_id' => $resource)))) return $resource;
+			if (!($resource = $this->read(array('res_id' => $resource)))) return $resource;
 		}
-		elseif (!$this->acl->is_permitted($resource['cat_id'],Acl::READ))
+		elseif (!$this->acl->is_permitted($resource['cat_id'], Acl::READ))
 		{
 			return false;
 		}
-		return $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+		return $resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 	}
 
 	/**
@@ -751,15 +751,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($resources =& $this->so->search(array('res_id' => $ids),self::TITLE_COLS)))
+		if (($resources = & $this->so->search(array('res_id' => $ids), self::TITLE_COLS)))
 		{
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$titles[$resource['res_id']] = $this->link_title($resource);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to Link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -777,9 +777,9 @@ 
 	 * @param int $resource_id
 	 * @return mixed string with msg if somthing went wrong; nothing if all right
 	 */
-	function save_picture($file,$resouce_id)
+	function save_picture($file, $resouce_id)
 	{
-		switch($file['type'])
+		switch ($file['type'])
 		{
 			case 'image/gif':
 				$src_img = imagecreatefromgif($file['tmp_name']);
@@ -796,11 +796,11 @@ 
 				return lang('Picture type is not supported, sorry!');
 		}
 
-		$tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'resources-picture');
-		imagejpeg($src_img,$tmp_name);
+		$tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'resources-picture');
+		imagejpeg($src_img, $tmp_name);
 		imagedestroy($src_img);
 
-		Link::attach_file('resources',$resouce_id,array(
+		Link::attach_file('resources', $resouce_id, array(
 			'tmp_name' => $tmp_name,
 			'name'     => self::PICTURE_NAME,
 			'type'     => 'image/jpeg',
@@ -814,14 +814,14 @@ 
 	 * @param bool $fullsize false = thumb, true = full pic
 	 * @return string url of picture
 	 */
-	function get_picture($resource,$fullsize=false)
+	function get_picture($resource, $fullsize = false)
 	{
 		if ($resource && !is_array($resource)) $resource = $this->read($resource);
 
-		switch($resource['picture_src'])
+		switch ($resource['picture_src'])
 		{
 			case 'own_src':
-				$picture = Link::vfs_path('resources',$resource['res_id'],self::PICTURE_NAME,true);	// vfs path
+				$picture = Link::vfs_path('resources', $resource['res_id'], self::PICTURE_NAME, true); // vfs path
 				if ($fullsize)
 				{
 					$picture = Egw::link(Vfs::download_url($picture));
@@ -830,23 +830,23 @@ 
 				{
 					$picture = Egw::link('/api/thumbnail.php', array(
 						'path' => $picture
-					),false);
+					), false);
 				}
 				break;
 
 			case 'cat_src':
 				$picture = Api\Categories::id2name($resource['cat_id'], 'data');
-				if($picture['icon'])
+				if ($picture['icon'])
 				{
-					$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$picture['icon']:self::ICON_PATH.'/'.$picture['icon'];
+					$picture = !$fullsize ? $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$picture['icon'] : self::ICON_PATH.'/'.$picture['icon'];
 					break;
 				}
 				// fall through
 			case 'gen_src':
 			default :
 				$src = $resource['picture_src'];
-				$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].$this->resource_icons:$this->resource_icons;
-				$picture .= strpos($src,'.') !== false ? $src : 'generic.png';
+				$picture = !$fullsize ? $GLOBALS['egw_info']['server']['webserver_url'].$this->resource_icons : $this->resource_icons;
+				$picture .= strpos($src, '.') !== false ? $src : 'generic.png';
 		}
 		return $picture;
 	}
@@ -860,9 +860,9 @@ 
 	 */
 	function remove_picture($res_id)
 	{
-		if (($arr = Link::delete_attached('resources',$res_id,self::PICTURE_NAME)) && is_array($arr))
+		if (($arr = Link::delete_attached('resources', $res_id, self::PICTURE_NAME)) && is_array($arr))
 		{
-			return array_shift($arr);	// $arr = array($path => (bool)$ok);
+			return array_shift($arr); // $arr = array($path => (bool)$ok);
 		}
 		return false;
 	}
@@ -878,11 +878,11 @@ 
 	{
 		$icons['generic.png'] = lang('gernal resource');
 		$dir = dir(EGW_SERVER_ROOT.$this->resource_icons);
-		while($file = $dir->read())
+		while ($file = $dir->read())
 		{
-			if (preg_match('/\\.(png|gif|jpe?g)$/i',$file) && $file != 'generic.png')
+			if (preg_match('/\\.(png|gif|jpe?g)$/i', $file) && $file != 'generic.png')
 			{
-				$icons[$file] = substr($file,0,strpos($file,'.'));
+				$icons[$file] = substr($file, 0, strpos($file, '.'));
 			}
 		}
 		$dir->close();

Braces +84 added lines, -31 removed lines

@@ -105,9 +105,12 @@ 
 		{
 			Api\Cache::setSession('resources', 'index_nm', $query);
 		}
-		if ($query['store_state'])	// request to store state in session and filter in prefs?
+		if ($query['store_state'])
+		{
+			// request to store state in session and filter in prefs?
 		{
 			Api\Cache::setSession('resources',$query['store_state'],$query);
+		}
 			//echo "<p>".__METHOD__."() query[filter]=$query[filter], prefs[resources][filter]={$GLOBALS['egw_info']['user']['preferences']['resources']['filter']}</p>\n";
 			if ($query['filter'] != $GLOBALS['egw_info']['user']['preferences']['resources']['filter'])
 			{
@@ -115,7 +118,10 @@ 
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
-		if ($this->debug) _debug_array($query);
+		if ($this->debug)
+		{
+			_debug_array($query);
+		}
 		$read_onlys = 'res_id,name,short_description,quantity,useable,bookable,buyable,cat_id,location,storage_info';
 
 		$filter = array();
@@ -172,7 +178,8 @@ 
 			$filter['cat_id'] = array_keys($readcats);
 		}
 		// if there is no catfilter -> this means you have no rights, so set the cat filter to null
-		if (!isset($filter['cat_id']) || empty($filter['cat_id'])) {
+		if (!isset($filter['cat_id']) || empty($filter['cat_id']))
+		{
 			$filter['cat_id'] = NUll;
 		}
 
@@ -183,7 +190,10 @@ 
 		$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
 		$start = (int)$query['start'];
 
-		foreach ($filter as $k => $v) $query['col_filter'][$k] = $v;
+		foreach ($filter as $k => $v)
+		{
+			$query['col_filter'][$k] = $v;
+		}
 		$this->so->get_rows($query, $rows, $readonlys, $join, false, false, $extra_cols);
 		$nr = $this->so->total;
 
@@ -212,8 +222,7 @@ 
 			}
 			if (!$this->acl->is_permitted($resource['cat_id'],Acl::DELETE) ||
 				($resource['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history')
-			)
-			{
+			) {
 				$readonlys["delete[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_delete ';
 			}
@@ -251,7 +260,9 @@ 
 				{
 					$resource['accessories'][] = array('acc_id' => $acc_id, 'name' => $this->link_title($acc_id));
 				}
-			} elseif ($resource['accessory_of'] > 0) {
+			}
+			elseif ($resource['accessory_of'] > 0)
+			{
 				$resource['accessory_of_label'] = $this->link_title($resource['accessory_of']);
 			}
 
@@ -500,13 +511,19 @@ 
 	 */
 	function get_acc_list($res_id,$deleted=false)
 	{
-		if($res_id < 1){return;}
+		if($res_id < 1)
+		{
+return;}
 		$data = $this->so->search('','res_id,name,deleted','','','','','',$start,array('accessory_of' => $res_id),'',$need_full_no_count=true);
 		$acc_list = array();
-		if($data) {
+		if($data)
+		{
 			foreach($data as $num => $resource)
 			{
-				if($resource['deleted'] && !$deleted) continue;
+				if($resource['deleted'] && !$deleted)
+				{
+					continue;
+				}
 				$acc_list[$resource['res_id']] = $resource['name'];
 			}
 		}
@@ -522,7 +539,10 @@ 
 	function get_calendar_info($res_id)
 	{
 		//echo "<p>resources_bo::get_calendar_info(".print_r($res_id,true).")</p>\n";
-		if(!is_array($res_id) && $res_id < 1) return;
+		if(!is_array($res_id) && $res_id < 1)
+		{
+			return;
+		}
 
 		$data = $this->so->search(array('res_id' => $res_id),self::TITLE_COLS.',useable');
 		if (!is_array($data))
@@ -598,7 +618,8 @@ 
 			'deleted' => null
 		);
 		$limit = false;
-		if($options['start'] || $options['num_rows']) {
+		if($options['start'] || $options['num_rows'])
+		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		if($options['accessory_of'])
@@ -622,11 +643,14 @@ 
 				}
 				$start = new Api\DateTime($cal_info['start']);
 				$startarr= getdate($start->format('ts'));
-				if (isset($cal_info['whole_day']) && $cal_info['whole_day']) {
+				if (isset($cal_info['whole_day']) && $cal_info['whole_day'])
+				{
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new Api\DateTime($startarr);
 					$end = $start->format('ts') + 86399;
-				} else {
+				}
+				else
+				{
 					$start = $start->format('ts');
 					$end = $start + ($cal_info['duration']);
 				}
@@ -638,7 +662,8 @@ 
 					// we only need resources id for the search, but with a 'r' prefix
 					// now we take this loop to store a new resource array indexed with resource id
 					// and as we work for calendar we use only bookable resources
-					if ((isset($resource['bookable'])) && ($resource['bookable'])){
+					if ((isset($resource['bookable'])) && ($resource['bookable']))
+					{
 						$res_info_cache[$resource['res_id']]=$resource;
 						$resource_list[]='r'.$resource['res_id'];
 					}
@@ -654,22 +679,34 @@ 
 				// parse theses overlapping events
 				foreach($overlapping_events as $event)
 				{
-					if ($event['non_blocking']) continue; // ignore non_blocking events
-					if (isset($cal_info['event_id']) && $event['id']==$cal_info['event_id']) {
+					if ($event['non_blocking'])
+					{
+						continue;
+					}
+					// ignore non_blocking events
+					if (isset($cal_info['event_id']) && $event['id']==$cal_info['event_id'])
+					{
 						continue; //ignore this event, it's the current edited event, no conflict by def
 					}
 					// now we are interested only on resources booked by theses events
-					if (isset($event['participants']) && is_array($event['participants'])){
-						foreach($event['participants'] as $part_key => $part_detail){
+					if (isset($event['participants']) && is_array($event['participants']))
+					{
+						foreach($event['participants'] as $part_key => $part_detail)
+						{
 							if ($part_key{0}=='r')
-							{ //now we gatta resource here
+							{
+//now we gatta resource here
 								//need to check the quantity of this resource
 								$resource_id=substr($part_key,1);
 								// if we do not find this resource in our indexed array it's certainly
 								// because it was unset, non bookable maybe
-								if (!isset($res_info_cache[$resource_id])) continue;
+								if (!isset($res_info_cache[$resource_id]))
+								{
+									continue;
+								}
 								// to detect ressources with default to 1 quantity
-								if (!isset($res_info_cache[$resource_id]['useable'])) {
+								if (!isset($res_info_cache[$resource_id]['useable']))
+								{
 									$res_info_cache[$resource_id]['useable'] = 1;
 								}
 								// now decrement this quantity useable
@@ -683,30 +720,40 @@ 
 				}
 			}
 		}
-		if (isset($res_info_cache)) {
+		if (isset($res_info_cache))
+		{
 			$show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] === 'resources_conflict';
 			// if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar
 			// so we'll loop on this one and not $data
-			foreach($res_info_cache as $id => $resource) {
+			foreach($res_info_cache as $id => $resource)
+			{
 				//maybe this resource is reserved
 				if ( ($resource['useable'] < 1) )
 				{
-					if($show_conflict) {
+					if($show_conflict)
+					{
 						$list[$id] = ' ('.lang('conflict').') '.$resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
 					}
-				} else {
+				}
+				else
+				{
 				        $list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
 				}
 			}
-		} else {
+		}
+		else
+		{
 			// we are not working for the calendar, we loop on the initial $data
-			if (is_array($data)) {
+			if (is_array($data))
+			{
 				foreach($data as $num => $resource)
 				{
 					$id=$resource['res_id'];
 					$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
 				}
-			} else {
+			}
+			else
+			{
 				error_log(__METHOD__." No Data found for Resource with id ".$resource['res_id']);
 			}
 		}
@@ -725,7 +772,10 @@ 
 	{
 		if (!is_array($resource))
 		{
-			if (!($resource  = $this->read(array('res_id' => $resource)))) return $resource;
+			if (!($resource  = $this->read(array('res_id' => $resource))))
+			{
+				return $resource;
+			}
 		}
 		elseif (!$this->acl->is_permitted($resource['cat_id'],Acl::READ))
 		{
@@ -816,7 +866,10 @@ 
 	 */
 	function get_picture($resource,$fullsize=false)
 	{
-		if ($resource && !is_array($resource)) $resource = $this->read($resource);
+		if ($resource && !is_array($resource))
+		{
+			$resource = $this->read($resource);
+		}
 
 		switch($resource['picture_src'])
 		{

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

@@ -572,7 +572,7 @@
 	 * @param array $options Array of options for the search
 	 *
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query( $pattern, array &$options = array() )
 	{
 		if (is_array($pattern))
 		{

resources/inc/class.resources_export_csv.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

Indentation +2 added lines, -2 removed lines

@@ -170,9 +170,9 @@
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+		{
 		$this->selects = array();
-        }
+		}
 
 	/**
 	 * Customize automatically generated filter fields

Spacing +27 added lines, -27 removed lines

@@ -31,54 +31,54 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
 		if ($options['selection'] == 'search') {
 			// ui selection with checkbox 'selected'
 			$query = Api\Cache::getSession('resources', 'get_rows');
-			$query['num_rows'] = -1;	// all
+			$query['num_rows'] = -1; // all
 			unset($query['store_state']);
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->bo->get_rows($query, $selection, $readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ($options['selection'] == 'all' || $options['selection'] == 'filter') {
 			$query = array(
 				'num_rows'	=> -1,
-				'filter2'	=> -3,  // Accessories & resources
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
-			);	// all
+				'filter2'	=> -3, // Accessories & resources
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
+			); // all
 			
-			if($options['selection'] == 'filter')
+			if ($options['selection'] == 'filter')
 			{
 				$filter = $_definition->filter;
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'cat_id')
+					if ($field == 'cat_id')
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if($field == 'filter2')
+					if ($field == 'filter2')
 					{
 						$query['filter2'] = $value;
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+					if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$this->bo->get_rows($query, $selection, $readonlys);
 		} else {
-			$selection = explode(',',$options['selection']);
+			$selection = explode(',', $options['selection']);
 		}
 
 		$export_object = new importexport_export_csv($_stream, (array)$options);
@@ -86,28 +86,28 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(Api\Storage\Customfields::get('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach (Api\Storage\Customfields::get('resources') as $field => $settings) {
+			if ($options['mapping']['#'.$field]) {
 				$need_custom = true;
 				break;
 			}
 		}
 
 		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+			if (!is_array($record) || !$record['res_id']) continue;
 
-			if($need_custom) {
+			if ($need_custom) {
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach ($resource->get_record_array() as $key => $value) {
+					if (is_array($value)) $resource->$key = implode(',', $value);
 				}
  			}
 
@@ -182,7 +182,7 @@ 
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';
 		$filters['cat_id']['name'] = 'filter';
-		$filters['cat_id']['values']= (array)$this->bo->acl->get_cats(Acl::READ);
+		$filters['cat_id']['values'] = (array)$this->bo->acl->get_cats(Acl::READ);
 
 		// Add in resources / accessories
 		$filters['filter2'] = array(
@@ -192,9 +192,9 @@ 
 			'rows' => 5,
 			'values' => resources_bo::$filter_options
 		);
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +63 added lines, -25 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * export resources to CSV
  */
-class resources_export_csv implements importexport_iface_export_plugin {
+class resources_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -31,11 +32,13 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// ui selection with checkbox 'selected'
 			$query = Api\Cache::getSession('resources', 'get_rows');
 			$query['num_rows'] = -1;	// all
@@ -43,7 +46,8 @@ 
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->bo->get_rows($query,$selection,$readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter')
+		{
 			$query = array(
 				'num_rows'	=> -1,
 				'filter2'	=> -3,  // Accessories & resources
@@ -67,17 +71,28 @@ 
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					{
+						continue;
+					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['col_filter'][] = "$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['col_filter'][] = "$field <= " . (int)$value['to'];
+					}
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
 			$this->bo->get_rows($query,$selection,$readonlys);
-		} else {
+		}
+		else
+		{
 			$selection = explode(',',$options['selection']);
 		}
 
@@ -86,28 +101,42 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(Api\Storage\Customfields::get('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach(Api\Storage\Customfields::get('resources') as $field => $settings)
+		{
+			if($options['mapping']['#'.$field])
+			{
 				$need_custom = true;
 				break;
 			}
 		}
 
-		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+		foreach ($selection as $record)
+		{
+			if(!is_array($record) || !$record['res_id'])
+			{
+				continue;
+			}
 
-			if($need_custom) {
+			if($need_custom)
+			{
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach($resource->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$resource->$key = implode(',', $value);
+					}
 				}
  			}
 
@@ -122,7 +151,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV export');
 	}
 
@@ -131,7 +161,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports a list of resources to a CSV File.");
 	}
 
@@ -140,11 +171,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -153,14 +186,16 @@ 
 	 * this way the plugin has all opportunities for options tab
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors information
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -170,7 +205,7 @@ 
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+	{
 		$this->selects = array();
         }
 
@@ -194,7 +229,10 @@ 
 		);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

resources/inc/class.resources_import_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -28,9 +28,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition $_definition ) {
 
@@ -52,7 +50,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 }

Spacing +32 added lines, -32 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv {
 
 
 	/**
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * imports entries according to given definition object.
@@ -32,7 +32,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition) {
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -54,33 +54,33 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
-		if(!is_numeric($record->accessory_of))
+		if (!is_numeric($record->accessory_of))
 		{
 			$accessory_of = $record->accessory_of;
 
 			// Look for exact match in just name
-			$results = $this->bo->so->search(array('name' => $record->accessory_of),array('res_id','name'));
-			if(count($results) >= 1)
+			$results = $this->bo->so->search(array('name' => $record->accessory_of), array('res_id', 'name'));
+			if (count($results) >= 1)
 			{
 				// More than 1 result?  Bad names.  Pick one.
-				foreach($results as $result)
+				foreach ($results as $result)
 				{
-					if($result['name'] == $record->accessory_of)
+					if ($result['name'] == $record->accessory_of)
 					{
 						$record->accessory_of = $result['res_id'];
 						break;
 					}
 				}
-				if(is_numeric($record->accessory_of))
+				if (is_numeric($record->accessory_of))
 				{
 					// Import/Export conversion gave a warning, so cancel it
-					$pattern = lang('Unable to link to %1 "%2"',lang('resources'),$accessory_of) . ' - ('.lang('too many matches') . '|'.lang('no matches') . ')';
+					$pattern = lang('Unable to link to %1 "%2"', lang('resources'), $accessory_of).' - ('.lang('too many matches').'|'.lang('no matches').')';
 					$this->warnings[$import_csv->get_current_position()] = preg_replace($pattern, '', $this->warnings[$import_csv->get_current_position()], 1);
 					// If that was the only warning, clear it for this row
-					if(trim($this->warnings[$import_csv->get_current_position()]) == '')
+					if (trim($this->warnings[$import_csv->get_current_position()]) == '')
 					{
 						unset($this->warnings[$import_csv->get_current_position()]);
 					}
@@ -92,7 +92,7 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if ($category['last_mod'] >= $this->start_time) {
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,37 +104,37 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if (!$record->accessory_of) $record->accessory_of = -1;
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
 		if ($this->definition->plugin_options['conditions']) {
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record->$condition['string']) {
+						if ($record->$condition['string']) {
 							$results = $this->bo->so->search(
-								array( $condition['string'] => $record->$condition['string']),
+								array($condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if (is_array($results) && count(array_keys($results)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ((array)$results as $resource) {
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($resource['cat_id'])) $resource['cat_id'] = explode(',', $resource['cat_id']);
+									if (!is_array($record->cat_id)) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $resource['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -147,7 +147,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -159,7 +159,7 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
@@ -173,17 +173,17 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					$result = $this->bo->save($_data);
+					if ($result && !is_numeric($result)) {
 						$this->errors[$record_num] = $result;
 						return false;
 					} else {

Braces +70 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv
+{
 
 
 	/**
@@ -32,7 +33,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition )
+	{
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -92,7 +94,8 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if($category['last_mod'] >= $this->start_time)
+		{
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,35 +107,53 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if(!$record->accessory_of)
+		{
+			$record->accessory_of = -1;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
-		if ($this->definition->plugin_options['conditions']) {
+		if ($this->definition->plugin_options['conditions'])
+		{
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record->$condition['string']) {
+						if($record->$condition['string'])
+						{
 							$results = $this->bo->so->search(
 								array( $condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ( (array)$results as $resource )
+							{
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $resource['cat_id'] ) )
+									{
+										$resource['cat_id'] = explode( ',', $resource['cat_id'] );
+									}
+									if ( !is_array( $record->cat_id ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -143,9 +164,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -159,9 +185,11 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -173,20 +201,27 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					if($result && !is_numeric($result))
+					{
 						$this->errors[$record_num] = $result;
 						return false;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						return true;
 					}
@@ -202,7 +237,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV import');
 	}
 
@@ -211,7 +247,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports a list of resources from a CSV file.");
 	}
 
@@ -220,7 +257,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -236,7 +274,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -245,7 +284,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +297,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 }

resources/inc/class.resources_so.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *
 	 * @param string $key key of value to get
 	 * @param int $res_id resource id
-	 * @return mixed value of key and resource, false if key or id not found.
+	 * @return integer value of key and resource, false if key or id not found.
 	 */
 	function get_value($key,$res_id)
 	{

Spacing +6 added lines, -7 removed lines

@@ -22,10 +22,10 @@ 
 {
 	function __construct()
 	{
-		parent::__construct('resources','egw_resources', 'egw_resources_extra', '',
-			'extra_name', 'extra_value', 'extra_id' );
+		parent::__construct('resources', 'egw_resources', 'egw_resources_extra', '',
+			'extra_name', 'extra_value', 'extra_id');
 
-		$this->columns_to_search = array('name','short_description','inventory_number','long_description','location');
+		$this->columns_to_search = array('name', 'short_description', 'inventory_number', 'long_description', 'location');
 	}
 
 	/**
@@ -35,10 +35,9 @@ 
 	 * @param int $res_id resource id
 	 * @return mixed value of key and resource, false if key or id not found.
 	 */
-	function get_value($key,$res_id)
+	function get_value($key, $res_id)
 	{
-		return $res_id == $this->data['res_id'] ? $this->data[$key] :
-			$this->db->select($this->table_name,$key,array('res_id' => $res_id),__LINE__,__FILE__)->fetchColumn();
+		return $res_id == $this->data['res_id'] ? $this->data[$key] : $this->db->select($this->table_name, $key, array('res_id' => $res_id), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -90,7 +89,7 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if (parent::save() != 0) return false;
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

Braces +8 added lines, -2 removed lines

@@ -51,7 +51,10 @@ 
 	 */
 	function read($res_id)
 	{
-		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id'])) $res_id = $res_id['res_id'];
+		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id']))
+		{
+			$res_id = $res_id['res_id'];
+		}
 
 		/*if (!is_array($res_id) && $res_id == $this->data['res_id'])
 		{
@@ -90,7 +93,10 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if(parent::save() != 0)
+		{
+			return false;
+		}
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

setup/check_install.php

Doc Comments +1 added lines

@@ -316,6 +316,7 @@
  * Check if given package is installed via composer in EGroupware's vendor directory
  *
  * @param string $package package-name in composer notation eg. "pear-pear.horde.org/Horde_Imap_Client" or "pear-pear.php.net/Net_Sieve"
+ * @return string|null
  */
 function composer_check($package)
 {

Spacing +119 added lines, -123 removed lines

@@ -13,7 +13,7 @@ 
 use EGroupware\Api;
 
 $run_by_webserver = !!$_SERVER['PHP_SELF'];
-$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 
 if ($run_by_webserver)
 {
@@ -41,9 +41,9 @@ 
 	$error_icon = '*** Error: ';
 	$warning_icon = '!!! Warning: ';
 
-	function lang($msg,$arg1=NULL,$arg2=NULL,$arg3=NULL,$arg4=NULL)
+	function lang($msg, $arg1 = NULL, $arg2 = NULL, $arg3 = NULL, $arg4 = NULL)
 	{
-		return is_null($arg1) ? $msg : str_replace(array('%1','%2','%3','%4'),array($arg1,$arg2,$arg3,$arg4),$msg);
+		return is_null($arg1) ? $msg : str_replace(array('%1', '%2', '%3', '%4'), array($arg1, $arg2, $arg3, $arg4), $msg);
 	}
 }
 
@@ -79,13 +79,13 @@ 
 		'func' => 'php_ini_check',
 		'value' => 0,
 		'verbose_value' => 'Off',
-		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!','display_errors',ini_get('display_errors')),
+		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!', 'display_errors', ini_get('display_errors')),
 	),
 	'memory_limit' => array(
 		'func' => 'php_ini_check',
 		'value' => '128M',
 		'check' => '>=',
-		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures','24M'),
+		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures', '24M'),
 		'change' => 'memory_limit = 24M'
 	),
 	'max_execution_time' => array(
@@ -105,14 +105,14 @@ 
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','upload_max_filesize',ini_get('upload_max_filesize')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'upload_max_filesize', ini_get('upload_max_filesize')),
 		'change' => 'upload_max_filesize = 8M'
 	),
 	'post_max_size' => array(
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','post_max_size',ini_get('max_post_size')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'post_max_size', ini_get('max_post_size')),
 		'change' => 'post_max_size = 8M'
 	),
 	'allow_url_fopen' => array(
@@ -138,7 +138,7 @@ 
 		'verbose_value' => '"System/Localtime"',
 		'check' => '!=',
 		'error' => lang('No VALID timezone set! ("%1" is NOT sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)',
-			'System/Localtime','Europe/Berlin','<a href="http://www.php.net/manual/en/timezones.php" target="_blank">','</a>'),
+			'System/Localtime', 'Europe/Berlin', '<a href="http://www.php.net/manual/en/timezones.php" target="_blank">', '</a>'),
 	),
 	'pdo' => array(
 		'func' => 'extension_check',
@@ -146,19 +146,19 @@ 
 	),
 	'mysqli' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'mysql', 'MySQL')
 	),
 	'pdo_mysql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_mysql', 'MySQL')
 	),
 	'pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pgsql', 'pgSQL')
 	),
 	'pdo_pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_pgsql', 'pgSQL')
 	),
 	/* disable checks for other database extensions, as we are not really supporting them anymore
 	'mssql' => array(
@@ -202,7 +202,7 @@ 
 	realpath('..') => array(
 		'func' => 'permission_check',
 		'is_world_writable' => False,
-		'only_if_exists' => true,	// quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
+		'only_if_exists' => true, // quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
 		'recursiv' => True
 	),
 	realpath('../header.inc.php') => array(
@@ -236,10 +236,10 @@ 
 	$sp_visible = true;
 	if (($open_basedir = ini_get('open_basedir')) && $open_basedir != 'none')
 	{
-		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
+		foreach (explode(PATH_SEPARATOR, $open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path, 0, strlen($dir)) == $dir)) break;
 		}
 	}
 	if ($sp_visible)	// only check if session_save_path is visible by webserver
@@ -247,13 +247,13 @@ 
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
 			'is_writable' => true,
-			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()),
+			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver", session_save_path()),
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
-foreach($setup_info as $app => $app_data)
+foreach ($setup_info as $app => $app_data)
 {
 	if (!isset($app_data['check_install'])) continue;
 
@@ -261,9 +261,9 @@ 
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data) continue; // identical check --> ignore it
 
-			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
+			if ($data['func'] == 'pear_check' || in_array($data['func'], array('extension_check', 'php_ini_check')) && !isset($data['warning']))
 			{
 				if (isset($checks[$name]['from']) && $checks[$name]['from'] && !is_array($checks[$name]['from']))
 				{
@@ -271,7 +271,7 @@ 
 				}
 				if (!isset($data['from'])) $data['from'] = $app;
 				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!in_array($data['from'], $checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
 			}
 			else
 			{
@@ -287,9 +287,9 @@ 
 	}
 }
 $sorted_checks = array();
-foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_check','permission_check') as $func)
+foreach (array('php_version', 'php_ini_check', 'extension_check', 'pear_check', 'gd_check', 'permission_check') as $func)
 {
-	foreach($checks as $name => $data)
+	foreach ($checks as $name => $data)
 	{
 		if ($data['func'] == $func)
 		{
@@ -300,15 +300,15 @@ 
 }
 if ($checks) $sorted_checks += $checks;
 
-function php_version($name,$args)
+function php_version($name, $args)
 {
 	global $passed_icon, $error_icon;
-	unset($name);	// not used, but required by function signature
+	unset($name); // not used, but required by function signature
 
-	$version_ok = version_compare(phpversion(),$args['value']) >= 0;
+	$version_ok = version_compare(phpversion(), $args['value']) >= 0;
 
 	echo '<div>'.($version_ok ? $passed_icon : $error_icon).' <span'.($version_ok ? '' : ' class="setup_error"').'>'.
-		lang('Checking required PHP version %1 (recommended %2)',$args['verbose_value'],$args['recommended']).': '.
+		lang('Checking required PHP version %1 (recommended %2)', $args['verbose_value'], $args['recommended']).': '.
 		phpversion().' ==> '.($version_ok ? lang('True') : lang('False'))."</span></div>\n";
 }
 
@@ -319,13 +319,13 @@ 
  */
 function composer_check($package)
 {
-	static $installed=null;
+	static $installed = null;
 	if (!isset($installed))
 	{
 		$installed = array();
-		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json=EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
+		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json = EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
 		{
-			foreach(json_decode(file_get_contents($json), true) as $package_data)
+			foreach (json_decode(file_get_contents($json), true) as $package_data)
 			{
 				$installed[strtolower($package_data['name'])] = $package_data['version'];
 			}
@@ -341,9 +341,9 @@ 
  * @param $channel =null use default or given channel
  * @return array with package-name => version pairs, eg. array('Log' => '1.9.8','PEAR' => '1.4.11')
  */
-function get_installed_pear_packages($channel=null)
+function get_installed_pear_packages($channel = null)
 {
-	$pear_config = '';	// use the system default
+	$pear_config = ''; // use the system default
 	// fix for SuSE having the pear.conf only for cli, will fail with open_basedir - no idea what to do then
 	if (@is_dir('/etc/php5/apache2') && !file_exists('/etc/php5/apache2/pear.conf') && @file_exists('/etc/php5/cli/pear.conf'))
 	{
@@ -353,13 +353,13 @@ 
 
 	if (!class_exists('PEAR_Config')) return false;
 
-	$config = new PEAR_Config('',$pear_config);
+	$config = new PEAR_Config('', $pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
 	if (empty($channel)) $channel = $config->get('default_channel');
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config, 'getRegistry')) return false; // PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
@@ -368,11 +368,11 @@ 
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
 	if (!file_exists($reg->install_dir)) return false;
 
-	$installed = $reg->packageInfo(null,null,$channel);
+	$installed = $reg->packageInfo(null, null, $channel);
 
 	//echo "<pre>installed =".print_r($installed,true)."</pre>\n";
 	$packages = array();
-	foreach($installed as $package)
+	foreach ($installed as $package)
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
@@ -386,7 +386,7 @@ 
 	return $packages;
 }
 
-function pear_check($package,$args)
+function pear_check($package, $args)
 {
 	global $passed_icon, $warning_icon;
 	static $pear_available = null;
@@ -430,7 +430,7 @@ 
 			$found = $pear_available;
 			if ($pear_available && $package)
 			{
-				$file = str_replace('_','/',$package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
+				$file = str_replace('_', '/', $package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
 
 				$found = @include_once($file);
 
@@ -439,16 +439,15 @@ 
 		}
 	}
 	// is the right version availible
-	$available = $found && (!$min_version || version_compare($min_version,$version_available) <= 0);
+	$available = $found && (!$min_version || version_compare($min_version, $version_available) <= 0);
 	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.
-		lang('Checking PEAR%1 is installed',($package?($channel?' '.$channel.'/':'::').$package:'').($min_version?" ($min_version)":'')).': '.
-		($available ? ($version_available ? $version_available : lang('True')) :
-		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
+		lang('Checking PEAR%1 is installed', ($package ? ($channel ? ' '.$channel.'/' : '::').$package : '').($min_version ? " ($min_version)" : '')).': '.
+		($available ? ($version_available ? $version_available : lang('True')) : ($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
 	if (!$available)	// give further info only if not availible
 	{
-		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
-			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+		echo '<div class="setup_info">'.lang('PEAR%1 is needed by: %2.', $package ? '::'.$package : '',
+			is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -461,7 +460,7 @@ 
 			if (!$pear_available)
 			{
 				echo '<br/>'.lang('PEAR (%1) is a PHP repository and is usually in a package called %2.',
-					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>','php-pear');
+					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>', 'php-pear');
 			}
 			elseif ($package && !$found)
 			{
@@ -471,12 +470,12 @@ 
 			}
 			elseif ($min_version && !$version_available)
 			{
-				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2',$package,$min_version);
+				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2', $package, $min_version);
 			}
-			elseif ($min_version && version_compare($min_version,$version_available) > 0)
+			elseif ($min_version && version_compare($min_version, $version_available) > 0)
 			{
 				echo '<br/>'.lang('Your installed version of %1 is %2, required is at least %3, please run: ',
-					$package,$version_available,$min_version).' pear upgrade '.$package;
+					$package, $version_available, $min_version).' pear upgrade '.$package;
 			}
 			echo '<br/>'.lang('Alternatively you can use %1Composer%2 to install all requirements at once. Downloading it and run:',
 				'<a href="https://getcomposer.org/" target="_blank">', '</a>').
@@ -489,26 +488,26 @@ 
 	return $available;
 }
 
-function extension_check($name,$args)
+function extension_check($name, $args)
 {
 	//echo "<p>extension_check($name,".print_r($args,true).")</p>\n";
 	global $passed_icon, $warning_icon, $is_windows;
 
 	if (isset($args['win_only']) && $args['win_only'] && !$is_windows)
 	{
-		return True;	// check only under windows
+		return True; // check only under windows
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it !!!
 	$available = check_load_extension($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The %1 extension is needed from: %2.',$name,
-				is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+			$args['warning'] = lang('The %1 extension is needed from: %2.', $name,
+				is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -517,20 +516,20 @@ 
 	return $available;
 }
 
-function function_check($name,$args)
+function function_check($name, $args)
 {
 	global $passed_icon, $warning_icon;
 
 	$available = function_exists($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The function %1 is needed from: %2.',$name,
-				is_array($args['from'] ? implode(', ',$args['from']) : $args['from']));
+			$args['warning'] = lang('The function %1 is needed from: %2.', $name,
+				is_array($args['from'] ? implode(', ', $args['from']) : $args['from']));
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -539,33 +538,33 @@ 
 	return $available;
 }
 
-function verbosePerms( $in_Perms )
+function verbosePerms($in_Perms)
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if ($in_Perms&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	elseif ($in_Perms&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	elseif ($in_Perms&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	elseif ($in_Perms&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	elseif ($in_Perms&0x8000) // Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	elseif ($in_Perms&0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	elseif ($in_Perms&0xC000) // Socket
 	{
 		$sP = 's';
 	}
@@ -575,33 +574,30 @@ 
 	}
 
 	// owner
-	$sP .= (($in_Perms & 0x0100) ? 'r' : '-') .
-	(($in_Perms & 0x0080) ? 'w' : '-') .
-	(($in_Perms & 0x0040) ? (($in_Perms & 0x0800) ? 's' : 'x' ) :
-	(($in_Perms & 0x0800) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0100) ? 'r' : '-').
+	(($in_Perms&0x0080) ? 'w' : '-').
+	(($in_Perms&0x0040) ? (($in_Perms&0x0800) ? 's' : 'x') : (($in_Perms&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($in_Perms & 0x0020) ? 'r' : '-') .
-	(($in_Perms & 0x0010) ? 'w' : '-') .
-	(($in_Perms & 0x0008) ? (($in_Perms & 0x0400) ? 's' : 'x' ) :
-	(($in_Perms & 0x0400) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0020) ? 'r' : '-').
+	(($in_Perms&0x0010) ? 'w' : '-').
+	(($in_Perms&0x0008) ? (($in_Perms&0x0400) ? 's' : 'x') : (($in_Perms&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($in_Perms & 0x0004) ? 'r' : '-') .
-	(($in_Perms & 0x0002) ? 'w' : '-') .
-	(($in_Perms & 0x0001) ? (($in_Perms & 0x0200) ? 't' : 'x' ) :
-	(($in_Perms & 0x0200) ? 'T' : '-'));
+	$sP .= (($in_Perms&0x0004) ? 'r' : '-').
+	(($in_Perms&0x0002) ? 'w' : '-').
+	(($in_Perms&0x0001) ? (($in_Perms&0x0200) ? 't' : 'x') : (($in_Perms&0x0200) ? 'T' : '-'));
 	return $sP;
 }
 
-function permission_check($name,$args,$verbose=True)
+function permission_check($name, $args, $verbose = True)
 {
-	global $passed_icon, $error_icon, $warning_icon,$is_windows;
+	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 	//echo "<p>permision_check('$name',".print_r($args,True).",'$verbose')</p>\n";
 
 	// add a ../ for non-absolute pathes
 	$rel_name = $name;
-	if ($name && substr($name,0,3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name,':') === false)
+	if ($name && substr($name, 0, 3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name, ':') === false)
 	{
 		$name = '../'.$name;
 	}
@@ -623,22 +619,22 @@ 
 	if (isset($args['is_readable']))
 	{
 		$checks[] = lang('readable by the webserver');
-		$check_not = (!$args['is_readable']?lang('not'):'');
+		$check_not = (!$args['is_readable'] ? lang('not') : '');
 	}
 	if (isset($args['is_writable']))
 	{
 		$checks[] = lang('writable by the webserver');
-		$check_not = (!$args['is_writable']?lang('not'):'');
+		$check_not = (!$args['is_writable'] ? lang('not') : '');
 	}
 	if (isset($args['is_world_readable']))
 	{
 		$checks[] = lang('world readable');
-		$check_not = (!$args['is_world_readable']?lang('not'):'');
+		$check_not = (!$args['is_world_readable'] ? lang('not') : '');
 	}
 	if (isset($args['is_world_writable']))
 	{
 		$checks[] = lang('world writable');
-		$check_not = (!$args['is_world_writable']?lang('not'):'');
+		$check_not = (!$args['is_world_writable'] ? lang('not') : '');
 	}
 
 	if (isset($args['msg']) && ($msg = $args['msg']))
@@ -647,7 +643,7 @@ 
 	}
 	else
 	{
-		$msg = lang('Checking file-permissions of %1 for %2 %3: %4',$rel_name,$check_not,implode(', ',$checks),$perms)."<br />\n";
+		$msg = lang('Checking file-permissions of %1 for %2 %3: %4', $rel_name, $check_not, implode(', ', $checks), $perms)."<br />\n";
 	}
 	$extra_error_msg = '';
 	if (isset($args['error']) && $args['error'])
@@ -656,13 +652,13 @@ 
 	}
 	if (!file_exists($name))
 	{
-		echo '<div>'. $error_icon . '<span class="setup_error">' . $msg . lang('%1 does not exist !!!',$rel_name).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.'<span class="setup_error">'.$msg.lang('%1 does not exist !!!', $rel_name).$extra_error_msg."</span></div>\n";
 		return False;
 	}
 	$warning = False;
 	if (!$GLOBALS['run_by_webserver'] && (@$args['is_readable'] || @$args['is_writable']))
 	{
-		echo $warning_icon.' '.$msg. lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
+		echo $warning_icon.' '.$msg.lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
 		unset($args['is_readable']);
 		unset($args['is_writable']);
 		$warning = True;
@@ -670,22 +666,22 @@ 
 	$Ok = True;
 	if (isset($args['is_writable']) && is_writable($name) != $args['is_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_writable']?lang('not').' ':'',lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_writable'] ? lang('not').' ' : '', lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if (isset($args['is_readable']) && is_readable($name) != $args['is_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_readable']?lang('not').' ':'',lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_readable'] ? lang('not').' ' : '', lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name) & 04) == $args['is_world_readable'])
+	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name)&04) == $args['is_world_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_readable']?lang('not').' ':'',lang('world readable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_readable'] ? lang('not').' ' : '', lang('world readable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name) & 02) == $args['is_world_writable'])
+	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name)&02) == $args['is_world_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_writable']?lang('not').' ':'',lang('world writable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_writable'] ? lang('not').' ' : '', lang('world writable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if ($Ok && !$warning && $verbose)
@@ -697,16 +693,16 @@ 
 		if ($verbose)
 		{
 			@set_time_limit(0);
-			echo "<div class='setup_info'>" . lang('This might take a while, please wait ...')."</div>\n";
+			echo "<div class='setup_info'>".lang('This might take a while, please wait ...')."</div>\n";
 			flush();
 		}
 		@set_time_limit(0);
 		$handle = @opendir($name);
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			if ($file != '.' && $file != '..')
 			{
-				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
+				$Ok = $Ok && permission_check(($name != '.' ? $name.'/' : '').$file, $args, False);
 			}
 		}
 		if ($handle) closedir($handle);
@@ -719,12 +715,12 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i', $value, $matches)) return $value;
 
-	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
+	return (strtolower($matches[2]) == 'm' ? 1024 * 1024 : 1024) * (int)$matches[1];
 }
 
-function php_ini_check($name,$args)
+function php_ini_check($name, $args)
 {
 	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 
@@ -742,20 +738,20 @@ 
 	{
 		case 'not set':
 			$check = lang('not set');
-			$result = !($ini_value & $args['value']);
+			$result = !($ini_value&$args['value']);
 			break;
 		case 'set':
 			$check = lang('set');
-			$result = !!($ini_value & $args['value']);
+			$result = !!($ini_value&$args['value']);
 			break;
 		case '>=':
-			$result = !$ini_value ||	// value not used, eg. no memory limit
-			(int) mk_value($ini_value) >= (int) mk_value($args['value']);
+			$result = !$ini_value || // value not used, eg. no memory limit
+			(int)mk_value($ini_value) >= (int)mk_value($args['value']);
 			break;
 		case 'contain':
 			$check = lang('contain');
 			$sep = $is_windows ? '/[; ]+/' : '/[: ]+/';
-			$result = in_array($args['value'],preg_split($sep,$ini_value));
+			$result = in_array($args['value'], preg_split($sep, $ini_value));
 			break;
 		case '!=':
 			$check = lang('set and not');
@@ -772,9 +768,9 @@ 
 			$tz = new DateTimeZone($ini_value);
 			unset($tz);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
-			$result = false;	// no valid timezone
+			$result = false; // no valid timezone
 		}
 	}
 	$msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: <span class='setup_info'>ini_get('$name')='$ini_value'$ini_value_verbose</span>";
@@ -796,7 +792,7 @@ 
 		elseif (!isset($args['safe_mode']))
 		{
 			echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.
-				lang('%1 is needed by: %2.',$name,is_array($args['from']) ? implode(', ',$args['from']) : $args['from'])
+				lang('%1 is needed by: %2.', $name, is_array($args['from']) ? implode(', ', $args['from']) : $args['from'])
 				."</div></div>\n";
 		}
 		if (isset($args['safe_mode']) && $safe_mode || @$args['change'])
@@ -806,7 +802,7 @@ 
 				echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.'</span></div>';
 			}
 			echo "<div class='setup_error'>\n";
-			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])."<br />\n";
+			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode'] ? $args['safe_mode'] : $args['change'])."<br />\n";
 			echo '*** '.lang('AND reload your webserver, so the above changes take effect !!!')."</div>\n";
 		}
 	}
@@ -821,16 +817,16 @@ 
 	ob_end_clean();
 
 	$found = null;
-	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/',$phpinfo,$found) ? $found[1] : False;
+	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/', $phpinfo, $found) ? $found[1] : False;
 }
 
 function gd_check()
 {
 	global $passed_icon, $warning_icon;
 
-	$available = (function_exists('imagecopyresampled')  || function_exists('imagecopyresized'));
+	$available = (function_exists('imagecopyresampled') || function_exists('imagecopyresized'));
 
-	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available?'':' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
@@ -849,24 +845,24 @@ 
 	));
 	$ConfigDomain = $_REQUEST['ConfigDomain'];
 	if (@$_GET['intro']) {
-		if(($ConfigLang = setup::get_lang()))
+		if (($ConfigLang = setup::get_lang()))
 		{
-			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
+			$GLOBALS['egw_setup']->set_cookie('ConfigLang', $ConfigLang, (int)(time() + (1200 * 9)), '/');
 		}
-		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'),False,'config');
+		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'), False, 'config');
 		echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
-		if(!$ConfigLang)
+		if (!$ConfigLang)
 		{
-			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True,'en')."</form></p>\n";
+			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True, 'en')."</form></p>\n";
 		}
 		echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>';
 		echo '<p>'.lang('We will now run a series of tests, which may take a few minutes.  Click the link below to proceed.').'</p>';
 		echo '<h3><a href="check_install.php">'.lang('Run installation tests').'</a></h3>';
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
-		$setup_tpl->pparse('out','T_footer');
+		$setup_tpl->pparse('out', 'T_footer');
 		exit;
 	} else {
-		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
+		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'), False, 'config', $ConfigDomain ? $ConfigDomain.'('.@$GLOBALS['egw_domain'][$ConfigDomain]['db_type'].')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;
 	}
@@ -880,7 +876,7 @@ 
 $Ok = True;
 foreach ($sorted_checks as $name => $args)
 {
-	$check_ok = $args['func']($name,$args);
+	$check_ok = $args['func']($name, $args);
 	$Ok = $Ok && $check_ok;
 }
 
@@ -892,9 +888,9 @@ 
 	{
 		if (!$Ok)
 		{
-			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon)."</h3>\n";
+			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon)."</h3>\n";
 			echo '<h3><a href="check_install.php">'.lang('Click here to re-run the installation tests')."</a></h3>\n";
-			echo '<h3>'.lang('or %1Continue to the Header Admin%2','<a href="manageheader.php">','</a>')."</h3>\n";
+			echo '<h3>'.lang('or %1Continue to the Header Admin%2', '<a href="manageheader.php">', '</a>')."</h3>\n";
 		}
 		else
 		{
@@ -906,10 +902,10 @@ 
 		echo '<h3>';
 		if (!$Ok)
 		{
-			echo lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon).'. ';
+			echo lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon).'. ';
 		}
-		echo '<br /><a href="'.str_replace('check_install.php','',@$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
+		echo '<br /><a href="'.str_replace('check_install.php', '', @$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
 	}
-	$setup_tpl->pparse('out','T_footer');
+	$setup_tpl->pparse('out', 'T_footer');
 	//echo "</body>\n</html>\n";
 }

Braces +119 added lines, -30 removed lines

@@ -239,10 +239,15 @@ 
 		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir))
+			{
+				break;
+			}
 		}
 	}
-	if ($sp_visible)	// only check if session_save_path is visible by webserver
+	if ($sp_visible)
+	{
+		// only check if session_save_path is visible by webserver
 	{
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
@@ -251,17 +256,25 @@ 
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
+	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 foreach($setup_info as $app => $app_data)
 {
-	if (!isset($app_data['check_install'])) continue;
+	if (!isset($app_data['check_install']))
+	{
+		continue;
+	}
 
 	foreach ($app_data['check_install'] as $name => $data)
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data)
+			{
+				continue;
+			}
+			// identical check --> ignore it
 
 			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
 			{
@@ -269,9 +282,18 @@ 
 				{
 					$checks[$name]['from'] = array($checks[$name]['from']);
 				}
-				if (!isset($data['from'])) $data['from'] = $app;
-				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!isset($data['from']))
+				{
+					$data['from'] = $app;
+				}
+				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from']))
+				{
+					$checks[$name]['from'] = array();
+				}
+				if (!in_array($data['from'],$checks[$name]['from']))
+				{
+					$checks[$name]['from'][] = $data['from'];
+				}
 			}
 			else
 			{
@@ -280,7 +302,10 @@ 
 		}
 		else
 		{
-			if (!isset($data['from'])) $data['from'] = $app;
+			if (!isset($data['from']))
+			{
+				$data['from'] = $app;
+			}
 			$checks[$name] = $data;
 		}
 		//echo "added check $data[func]($name) for $app"; _debug_array($data);
@@ -298,7 +323,10 @@ 
 		}
 	}
 }
-if ($checks) $sorted_checks += $checks;
+if ($checks)
+{
+	$sorted_checks += $checks;
+}
 
 function php_version($name,$args)
 {
@@ -351,22 +379,35 @@ 
 	}
 	@include_once 'PEAR/Config.php';
 
-	if (!class_exists('PEAR_Config')) return false;
+	if (!class_exists('PEAR_Config'))
+	{
+		return false;
+	}
 
 	$config = new PEAR_Config('',$pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
-	if (empty($channel)) $channel = $config->get('default_channel');
+	if (empty($channel))
+	{
+		$channel = $config->get('default_channel');
+	}
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config,'getRegistry'))
+	{
+		return false;
+	}
+	// PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
 
 	// a bug in pear causes an endless loop if the install-dir does not exist
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
-	if (!file_exists($reg->install_dir)) return false;
+	if (!file_exists($reg->install_dir))
+	{
+		return false;
+	}
 
 	$installed = $reg->packageInfo(null,null,$channel);
 
@@ -376,7 +417,10 @@ 
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
-		if (is_array($version)) $version = $version['release'];
+		if (is_array($version))
+		{
+			$version = $version['release'];
+		}
 
 		$packages[$name] = $version;
 		//echo "<p>$name: ".print_r($package['version'],true)."</p>\n";
@@ -415,7 +459,10 @@ 
 		{
 			$pear_available = $found = true;
 			// check if package is installed
-			if ($package && isset($pear_packages[$package])) $available = true;
+			if ($package && isset($pear_packages[$package]))
+			{
+				$available = true;
+			}
 			// check if it's the right version
 			$version_available = $pear_packages[$package ? $package : 'PEAR'];
 		}
@@ -425,7 +472,10 @@ 
 			{
 				$pear_available = @include_once('PEAR.php');
 
-				if (!class_exists('PEAR')) $pear_available = false;
+				if (!class_exists('PEAR'))
+				{
+					$pear_available = false;
+				}
 			}
 			$found = $pear_available;
 			if ($pear_available && $package)
@@ -434,7 +484,10 @@ 
 
 				$found = @include_once($file);
 
-				if (!class_exists($package)) $found = false;
+				if (!class_exists($package))
+				{
+					$found = false;
+				}
 			}
 		}
 	}
@@ -445,10 +498,13 @@ 
 		($available ? ($version_available ? $version_available : lang('True')) :
 		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
-	if (!$available)	// give further info only if not availible
+	if (!$available)
+	{
+		// give further info only if not availible
 	{
 		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
 			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+	}
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -541,34 +597,55 @@ 
 
 function verbosePerms( $in_Perms )
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if($in_Perms & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	}
+	elseif($in_Perms & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	}
+	elseif($in_Perms & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	}
+	elseif($in_Perms & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	}
+	elseif($in_Perms & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	}
+	elseif($in_Perms & 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	}
+	elseif($in_Perms & 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';
@@ -709,9 +786,15 @@ 
 				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
+	}
+	if ($verbose)
+	{
+		echo "\n";
 	}
-	if ($verbose) echo "\n";
 
 	return $Ok;
 }
@@ -719,7 +802,10 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches))
+	{
+		return $value;
+	}
 
 	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
 }
@@ -848,7 +934,8 @@ 
 		'T_footer' => 'footer.tpl',
 	));
 	$ConfigDomain = $_REQUEST['ConfigDomain'];
-	if (@$_GET['intro']) {
+	if (@$_GET['intro'])
+	{
 		if(($ConfigLang = setup::get_lang()))
 		{
 			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
@@ -865,7 +952,9 @@ 
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
 		$setup_tpl->pparse('out','T_footer');
 		exit;
-	} else {
+	}
+	else
+	{
 		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;

setup/inc/class.setup.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -741,8 +741,8 @@ 
 	/**
 	 * 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 $b	phpgw version number to check $a against
+	 * @return	boolean if $a < $b
 	 */
 	function alessthanb($a,$b,$DEBUG=False)
 	{
@@ -829,7 +829,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)
 	{
@@ -1101,7 +1101,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
@@ -1147,7 +1147,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)

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='')
 	{

Spacing +177 added lines, -177 removed lines

@@ -73,10 +73,10 @@ 
 	 */
 	var $recommended_php_version = '5.6';
 
-	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']))
 		{
@@ -95,9 +95,9 @@ 
 	/**
 	 * 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 = isset($_REQUEST['ConfigDomain']) ? $_REQUEST['ConfigDomain'] : $_POST['FormDomain'];
 		}
@@ -121,24 +121,24 @@ 
 		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
-				if (($this->system_charset = $this->db->select($this->config_table,'config_value',array(
+				if (($this->system_charset = $this->db->select($this->config_table, 'config_value', array(
 						'config_app'  => 'phpgwapi',
 						'config_name' => 'system_charset',
-					),__LINE__,__FILE__)->fetchColumn()))
+					), __LINE__, __FILE__)->fetchColumn()))
 				{
-					$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
 					{
-						$api_version = $this->db->select($this->applications_table,'app_version',array(
+						$api_version = $this->db->select($this->applications_table, 'app_version', array(
 								'app_name'  => 'phpgwapi',
-							),__LINE__,__FILE__)->fetchColumn();
+							), __LINE__, __FILE__)->fetchColumn();
 					}
-					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);
 					}
@@ -158,15 +158,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 = '';
@@ -181,9 +181,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();
 		}
@@ -208,9 +208,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;
@@ -242,7 +242,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
 		Api\Session::decrypt();
 		//error_log(__METHOD__."() returning ".array2string($ok).' _SESSION='.array2string($_SESSION));
@@ -254,12 +254,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;
@@ -271,7 +271,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')
 				{
@@ -287,7 +287,7 @@ 
 			{
 				return false;
 			}
-			switch($auth_type)
+			switch ($auth_type)
 			{
 				case 'config':
 					if (!isset($GLOBALS['egw_domain'][$_POST['FormDomain']]) ||
@@ -327,7 +327,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');
@@ -382,37 +382,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;
 	}
 
@@ -423,14 +423,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;
 	}
@@ -451,55 +451,55 @@ 
 	 * @param $_enable =99 set to True/False to override setup.inc.php setting
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 */
-	function register_app($appname, $_enable=99, array $setup_info=null)
+	function register_app($appname, $_enable = 99, array $setup_info = null)
 	{
 		if (!isset($setup_info)) $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();
 		}
@@ -513,26 +513,26 @@ 
 	 */
 	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]);
 		}
 
-		if ($this->db->select($this->applications_table,'COUNT(*)',array('app_name' => $appname),__LINE__,__FILE__)->fetchColumn())
+		if ($this->db->select($this->applications_table, 'COUNT(*)', array('app_name' => $appname), __LINE__, __FILE__)->fetchColumn())
 		{
-			if(@$GLOBALS['DEBUG'])
+			if (@$GLOBALS['DEBUG'])
 			{
 				echo '... app previously registered.';
 			}
 			return True;
 		}
-		if(@$GLOBALS['DEBUG'])
+		if (@$GLOBALS['DEBUG'])
 		{
 			echo '... app not registered';
 		}
@@ -545,42 +545,42 @@ 
 	 * @param string $appname	Application 'name' with a matching $setup_info[$appname] array slice
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 */
-	function update_app($appname, array $setup_info=null)
+	function update_app($appname, array $setup_info = null)
 	{
 		if (!isset($setup_info)) $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__);
 		}
 	}
 
@@ -593,20 +593,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;
 	}
@@ -618,19 +618,19 @@ 
 	 */
 	function deregister_app($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
 
 		// Remove categories
-		$this->db->delete(Api\Categories::TABLE, array('cat_appname'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(Api\Categories::TABLE, array('cat_appname'=>$appname), __LINE__, __FILE__);
 		Api\Categories::invalidate_cache($appname);
 
 		// Remove config
-		$this->db->delete(Api\Config::TABLE, array('config_app'=>$appname),__LINE__,__FILE__);
+		$this->db->delete(Api\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
 		Link::unlink(0, $appname);
@@ -645,7 +645,7 @@ 
 	 */
 	function register_hooks($appname)
 	{
-		if(!$appname)
+		if (!$appname)
 		{
 			return False;
 		}
@@ -665,21 +665,21 @@ 
 
 		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();
-		$hook_data = array('location' => 'settings','setup' => true);
+		$hook_data = array('location' => 'settings', 'setup' => true);
 		if (isset($setup_info['hooks']['settings']))
 		{
-			$settings = ExecMethod($setup_info['hooks']['settings'],$hook_data);
+			$settings = ExecMethod($setup_info['hooks']['settings'], $hook_data);
 		}
-		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))
 		{
@@ -692,10 +692,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']))
 			{
@@ -709,14 +709,14 @@ 
 		// store default/forced preferences, if any found
 		$preferences = new Api\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);
 				}
@@ -733,9 +733,9 @@ 
 	  * @param $location hook location - required
 	  * @param $appname application name - optional
 	 */
-	static function hook($location, $appname='')
+	static function hook($location, $appname = '')
 	{
-		return Api\Hooks::single($location,$appname,True,True);
+		return Api\Hooks::single($location, $appname, True, True);
 	}
 
 	/**
@@ -744,82 +744,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;
 		}
 	}
@@ -831,76 +831,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;
 		}
 	}
@@ -912,7 +912,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)
 		{
@@ -923,9 +923,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'];
 				}
@@ -938,7 +938,7 @@ 
 				return false;
 			}
 			if (!isset($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
-			Api\Accounts::cache_invalidate();	// the cache is shared for all instances of the class
+			Api\Accounts::cache_invalidate(); // the cache is shared for all instances of the class
 		}
 		return true;
 	}
@@ -964,7 +964,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();
 
@@ -976,7 +976,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',
@@ -997,7 +997,7 @@ 
 			}
 		}
 		// set password for existing account, if given and not '*unchanged*'
-		elseif($passwd && $passwd != '*unchanged*')
+		elseif ($passwd && $passwd != '*unchanged*')
 		{
 			try {
 				$auth = new Api\Auth;
@@ -1035,7 +1035,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;
@@ -1106,7 +1106,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))
@@ -1114,32 +1114,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__);
 			}
 		}
 	}
@@ -1150,7 +1150,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;
 
@@ -1158,9 +1158,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];
 			}
@@ -1173,18 +1173,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

@@ -85,11 +85,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();
+		}
 	}
 
 	/**
@@ -132,12 +141,15 @@ 
 					$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
 					{
 						$api_version = $this->db->select($this->applications_table,'app_version',array(
 								'app_name'  => 'phpgwapi',
 							),__LINE__,__FILE__)->fetchColumn();
 					}
+					}
 					if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
 					{
 						$this->db->Link_ID->SetCharSet($this->system_charset);
@@ -205,7 +217,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))
@@ -240,7 +255,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
@@ -453,7 +471,10 @@ 
 	 */
 	function register_app($appname, $_enable=99, array $setup_info=null)
 	{
-		if (!isset($setup_info)) $setup_info = $GLOBALS['setup_info'];
+		if (!isset($setup_info))
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		if(!$appname)
 		{
@@ -547,7 +568,10 @@ 
 	 */
 	function update_app($appname, array $setup_info=null)
 	{
-		if (!isset($setup_info)) $setup_info = $GLOBALS['setup_info'];
+		if (!isset($setup_info))
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		if(!$appname)
 		{
@@ -692,7 +716,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)
@@ -774,52 +801,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;
 		}
 	}
@@ -856,51 +903,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;
 		}
 	}
@@ -937,7 +1004,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;
+			}
 			Api\Accounts::cache_invalidate();	// the cache is shared for all instances of the class
 		}
 		return true;
@@ -972,7 +1042,10 @@ 
 
 		if ($username == 'anonymous')
 		{
-			if (!isset($this->anonpw)) $this->anonpw = Api\Auth::randomstring(16);
+			if (!isset($this->anonpw))
+			{
+				$this->anonpw = Api\Auth::randomstring(16);
+			}
 			$passwd = $anonpw = $this->anonpw;
 		}
 
@@ -1031,11 +1104,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;
@@ -1071,7 +1150,10 @@ 
 	 */
 	function accounts_exist()
 	{
-		if (!$this->setup_account_object()) return false;
+		if (!$this->setup_account_object())
+		{
+			return false;
+		}
 
 		$this->accounts->search(array(
 			'type'   => 'accounts',
@@ -1154,9 +1236,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)
 		{
@@ -1186,10 +1274,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/inc/class.setup_cmd_header.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	/**
 	 * Constructor
 	 *
-	 * @param string|array $sub_command ='create' 'create','edit','delete'(-domain) or array with all arguments
+	 * @param string $sub_command ='create' 'create','edit','delete'(-domain) or array with all arguments
 	 * @param array $arguments =null comand line arguments
 	 */
 	function __construct($sub_command='create',$arguments=null)

Spacing +46 added lines, -46 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param string|array $sub_command ='create' 'create','edit','delete'(-domain) or array with all arguments
 	 * @param array $arguments =null comand line arguments
 	 */
-	function __construct($sub_command='create',$arguments=null)
+	function __construct($sub_command = 'create', $arguments = null)
 	{
 		if (!is_array($sub_command))
 		{
@@ -73,17 +73,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 && $this->remote_id)
 		{
-			return true;	// can only check locally
+			return true; // can only check locally
 		}
 		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)	// redirect header in rpms is ~150 byte
 		{
 			if ($this->sub_command != 'create')
 			{
-				throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'),1);
+				throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'), 1);
 			}
 			$this->defaults(false);
 		}
@@ -92,13 +92,13 @@ 
 			if ($this->sub_command == 'create')
 			{
 				throw new Api\Exception\WrongUserinput(
-					lang('EGroupware configuration file header.inc.php already exists, you need to use --edit-header or delete it first!'),20);
+					lang('EGroupware configuration file header.inc.php already exists, you need to use --edit-header or delete it first!'), 20);
 			}
 			if ($this->arguments)
 			{
-				list($this->header_admin_password,$this->header_admin_user) = explode(',',$this->arguments[1]);
+				list($this->header_admin_password, $this->header_admin_user) = explode(',', $this->arguments[1]);
 			}
-			$this->check_setup_auth($this->header_admin_user,$this->header_admin_password);	// no domain, we require header access!
+			$this->check_setup_auth($this->header_admin_user, $this->header_admin_password); // no domain, we require header access!
 
 			$GLOBALS['egw_info']['server']['server_root'] = EGW_SERVER_ROOT;
 			$GLOBALS['egw_info']['server']['include_root'] = EGW_INCLUDE_ROOT;
@@ -125,17 +125,17 @@ 
 				echo '$GLOBALS[egw_info] = '; print_r($GLOBALS['egw_info']);
 				echo '$GLOBALS[egw_domain] = '; print_r($GLOBALS['egw_domain']);
 			}
-			throw new Api\Exception\WrongUserinput(lang('Configuration errors:')."\n- ".implode("\n- ",$errors)."\n".lang("You need to fix the above errors, before the configuration file header.inc.php can be written!"),23);
+			throw new Api\Exception\WrongUserinput(lang('Configuration errors:')."\n- ".implode("\n- ", $errors)."\n".lang("You need to fix the above errors, before the configuration file header.inc.php can be written!"), 23);
 		}
 		if ($check_only)
 		{
 			return true;
 		}
-		$header = $this->generate($GLOBALS['egw_info'],$GLOBALS['egw_domain']);
+		$header = $this->generate($GLOBALS['egw_info'], $GLOBALS['egw_domain']);
 
 		if ($this->arguments)
 		{
-			echo $header;	// for cli, we echo the header
+			echo $header; // for cli, we echo the header
 		}
 		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
 			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
@@ -144,13 +144,13 @@ 
 			{
 				unlink($this->header_path);
 			}
-			if (($f = fopen($this->header_path,'wb')) && fwrite($f,$header))
+			if (($f = fopen($this->header_path, 'wb')) && fwrite($f, $header))
 			{
 				fclose($f);
 				return lang('header.inc.php successful written.');
 			}
 		}
-		throw new Api\Exception\NoPermission(lang("Failed writing configuration file header.inc.php, check the permissions !!!"),24);
+		throw new Api\Exception\NoPermission(lang("Failed writing configuration file header.inc.php, check the permissions !!!"), 24);
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 * @param array $args =null
 	 * @return mixed
 	 */
-	function __call($method,array $args=null)
+	function __call($method, array $args = null)
 	{
-		if (method_exists($this->setup_header,$method))
+		if (method_exists($this->setup_header, $method))
 		{
-			return call_user_func_array(array($this->setup_header,$method),$args);
+			return call_user_func_array(array($this->setup_header, $method), $args);
 		}
 	}
 
@@ -189,21 +189,21 @@ 
 		'--session-type' => array(
 			'sessions_type' => array(
 				'type' => 'egw_info/server/',
-				'allowed' => array('php'=>'php4','php4'=>'php4','php-restore'=>'php4-restore','php4-restore'=>'php4-restore','db'=>'db'),
+				'allowed' => array('php'=>'php4', 'php4'=>'php4', 'php-restore'=>'php4-restore', 'php4-restore'=>'php4-restore', 'db'=>'db'),
 			),
 		),
 		'--session-handler' => array(
 			'session_handler' => array(
 				'type' => 'egw_info/server/',
-				'allowed' => array('files'=>'files','memcache'=>'memcache','db'=>'db'),
+				'allowed' => array('files'=>'files', 'memcache'=>'memcache', 'db'=>'db'),
 			),
 		),
-		'--limit-access' => 'egw_info/server/setup_acl',	// name used in setup
-		'--setup-acl'    => 'egw_info/server/setup_acl',	// alias to match the real name
+		'--limit-access' => 'egw_info/server/setup_acl', // name used in setup
+		'--setup-acl'    => 'egw_info/server/setup_acl', // alias to match the real name
 		'--mcrypt' => array(
 			'mcrypt_enabled' => array(
 				'type' => 'egw_info/server/',
-				'allowed' => array('on' => true,'off' => false),
+				'allowed' => array('on' => true, 'off' => false),
 			),
 			'mcrypt_iv' => 'egw_info/server/',
 			'mcrypt' => 'egw_info/versions/mcrypt',
@@ -211,13 +211,13 @@ 
 		'--domain-selectbox' => array(
 			'show_domain_selectbox' => array(
 				'type' => 'egw_info/server/',
-				'allowed' => array('on' => true,'off' => false),
+				'allowed' => array('on' => true, 'off' => false),
 			),
 		),
 		'--db-persistent' => array(
 			'db_persistent' => array(
 				'type' => 'egw_info/server/',
-				'allowed' => array('on' => true,'off' => false),
+				'allowed' => array('on' => true, 'off' => false),
 			),
 		),
 		'--domain' => array(
@@ -239,17 +239,17 @@ 
 	 */
 	private function _parse_properties()
 	{
-		foreach(self::$options as $arg => $option)
+		foreach (self::$options as $arg => $option)
 		{
-			foreach(is_array($option) ? $option : array($option => $option) as $name => $data)
+			foreach (is_array($option) ? $option : array($option => $option) as $name => $data)
 			{
-				if (strpos($name,'/') !== false)
+				if (strpos($name, '/') !== false)
 				{
-					$name = array_pop($parts = explode('/',$name));
+					$name = array_pop($parts = explode('/', $name));
 				}
 				if (isset($this->$name))
 				{
-					$this->_parse_value($arg,$name,$data,$this->$name);
+					$this->_parse_value($arg, $name, $data, $this->$name);
 				}
 			}
 		}
@@ -261,9 +261,9 @@ 
 	private function _parse_cli_arguments()
 	{
 		$arguments = $this->arguments;
-		while(($arg = array_shift($arguments)))
+		while (($arg = array_shift($arguments)))
 		{
-			$values = count($arguments) && substr($arguments[0],0,2) !== '--' ? array_shift($arguments) : 'on';
+			$values = count($arguments) && substr($arguments[0], 0, 2) !== '--' ? array_shift($arguments) : 'on';
 
 			if ($arg == '--delete-domain')
 			{
@@ -273,18 +273,18 @@ 
 
 			if (!isset(self::$options[$arg]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$arg),90);
+				throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!", $arg), 90);
 			}
 
 			$option = self::$options[$arg];
-			$vals = !is_array($option) ? array($values) : explode(',',$values);
+			$vals = !is_array($option) ? array($values) : explode(',', $values);
 			if (!is_array($option)) $option = array($option => $option);
 			$n = 0;
-			foreach($option as $name => $data)
+			foreach ($option as $name => $data)
 			{
 				if ($n >= count($vals)) break;
 
-				$this->_parse_value($arg,$name,$data,$vals[$n++]);
+				$this->_parse_value($arg, $name, $data, $vals[$n++]);
 			}
 		}
 	}
@@ -298,7 +298,7 @@ 
 	{
 		if (!isset($GLOBALS['egw_domain'][$domain]))
 		{
-			throw new Api\Exception\WrongUserinput(lang("Domain '%1' does NOT exist !!!",$domain),92);
+			throw new Api\Exception\WrongUserinput(lang("Domain '%1' does NOT exist !!!", $domain), 92);
 		}
 		unset($GLOBALS['egw_domain'][$domain]);
 	}
@@ -311,9 +311,9 @@ 
 	 * @param array/string $data string with type or array containing values for type, allowed
 	 * @param mixed $value value to set
 	 */
-	private function _parse_value($arg,$name,$data,$value)
+	private function _parse_value($arg, $name, $data, $value)
 	{
-		static $domain=null;
+		static $domain = null;
 
 		if (!is_array($data)) $data = array('type' => $data);
 		$type = $data['type'];
@@ -322,7 +322,7 @@ 
 		{
 			if (!isset($data['allowed'][$value]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!",$value,1,$arg),91);
+				throw new Api\Exception\WrongUserinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!", $value, 1, $arg), 91);
 			}
 			$value = $data['allowed'][$value];
 		}
@@ -331,15 +331,15 @@ 
 			$domain = $arg == '--domain' && !$value ? 'default' : $value;
 			if ($arg == '--domain' && (!isset($GLOBALS['egw_domain'][$domain]) || $this->sub_command == 'create'))
 			{
-				$GLOBALS['egw_domain'][$domain] = $this->domain_defaults($GLOBALS['egw_info']['server']['header_admin_user'],$GLOBALS['egw_info']['server']['header_admin_password']);
+				$GLOBALS['egw_domain'][$domain] = $this->domain_defaults($GLOBALS['egw_info']['server']['header_admin_user'], $GLOBALS['egw_info']['server']['header_admin_password']);
 			}
 		}
 		elseif ($value !== '')
 		{
-			self::_set_value($GLOBALS,str_replace('@',$domain,$type),$name,$value);
+			self::_set_value($GLOBALS, str_replace('@', $domain, $type), $name, $value);
 			if ($type == 'egw_info/server/server_root')
 			{
-				self::_set_value($GLOBALS,'egw_info/server/include_root',$name,$value);
+				self::_set_value($GLOBALS, 'egw_info/server/include_root', $name, $value);
 			}
 		}
 	}
@@ -352,15 +352,15 @@ 
 	 * @param string $name additional index to use if $index end with a slash
 	 * @param mixed $value value to set
 	 */
-	static private function _set_value(&$arr,$index,$name,$value)
+	static private function _set_value(&$arr, $index, $name, $value)
 	{
-		if (substr($index,-1) == '/') $index .= $name;
+		if (substr($index, -1) == '/') $index .= $name;
 
-		$var =& $arr;
-		foreach(explode('/',$index) as $name)
+		$var = & $arr;
+		foreach (explode('/', $index) as $name)
 		{
-			$var =& $var[$name];
+			$var = & $var[$name];
 		}
-		if (true) $var = strpos($name,'passw') !== false ? md5($value) : $value;
+		if (true) $var = strpos($name, 'passw') !== false ? md5($value) : $value;
 	}
 }

Braces +32 added lines, -8 removed lines

@@ -79,11 +79,14 @@ 
 		{
 			return true;	// can only check locally
 		}
-		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)	// redirect header in rpms is ~150 byte
+		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)
+		{
+			// redirect header in rpms is ~150 byte
 		{
 			if ($this->sub_command != 'create')
 			{
 				throw new Api\Exception\WrongUserinput(lang('EGroupware configuration file (header.inc.php) does NOT exist.')."\n".lang('Use --create-header to create the configuration file (--usage gives more options).'),1);
+		}
 			}
 			$this->defaults(false);
 		}
@@ -104,10 +107,13 @@ 
 			$GLOBALS['egw_info']['server']['include_root'] = EGW_INCLUDE_ROOT;
 		}
 
-		if ($this->arguments)	// we have command line arguments
+		if ($this->arguments)
+		{
+			// we have command line arguments
 		{
 			$this->_parse_cli_arguments();
 		}
+		}
 		elseif ($this->sub_command == 'delete')
 		{
 			self::_delete_domain($this->domain);
@@ -138,11 +144,14 @@ 
 			echo $header;	// for cli, we echo the header
 		}
 		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
-			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
+			function_exists('posix_getuid') && !posix_getuid())
+		{
+			// root has all rights
 		{
 			if (file_exists($this->header_path) && !is_writable($this->header_path))
 			{
 				unlink($this->header_path);
+		}
 			}
 			if (($f = fopen($this->header_path,'wb')) && fwrite($f,$header))
 			{
@@ -278,11 +287,17 @@ 
 
 			$option = self::$options[$arg];
 			$vals = !is_array($option) ? array($values) : explode(',',$values);
-			if (!is_array($option)) $option = array($option => $option);
+			if (!is_array($option))
+			{
+				$option = array($option => $option);
+			}
 			$n = 0;
 			foreach($option as $name => $data)
 			{
-				if ($n >= count($vals)) break;
+				if ($n >= count($vals))
+				{
+					break;
+				}
 
 				$this->_parse_value($arg,$name,$data,$vals[$n++]);
 			}
@@ -315,7 +330,10 @@ 
 	{
 		static $domain=null;
 
-		if (!is_array($data)) $data = array('type' => $data);
+		if (!is_array($data))
+		{
+			$data = array('type' => $data);
+		}
 		$type = $data['type'];
 
 		if (isset($data['allowed']))
@@ -354,13 +372,19 @@ 
 	 */
 	static private function _set_value(&$arr,$index,$name,$value)
 	{
-		if (substr($index,-1) == '/') $index .= $name;
+		if (substr($index,-1) == '/')
+		{
+			$index .= $name;
+		}
 
 		$var =& $arr;
 		foreach(explode('/',$index) as $name)
 		{
 			$var =& $var[$name];
 		}
-		if (true) $var = strpos($name,'passw') !== false ? md5($value) : $value;
+		if (true)
+		{
+			$var = strpos($name,'passw') !== false ? md5($value) : $value;
+		}
 	}
 }

setup/inc/class.setup_cmd_hooks.inc.php

Doc Comments +2 added lines, -3 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)
 	{

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();
 

setup/inc/class.setup_cmd_ldap.inc.php

Doc Comments -3 removed lines

@@ -936,9 +936,6 @@
 	 *
 	 * Uses $this->ldap_host, $this->ldap_admin and $this->ldap_admin_pw to connect.
 	 *
-	 * @param string $this->object_class ='qmailUser'
-	 * @param string $this->mbox_attr ='mailmessagestore' lowercase!!!
-	 * @param string $this->mail_login_type ='email' 'email', 'vmailmgr', 'standard' or 'uidNumber'
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */

Spacing +141 added lines, -144 removed lines

@@ -84,9 +84,9 @@ 
 	 * @param string $ldap_encryption_type ='des'
 	 * @param boolean $truncate_egw_accounts =false truncate accounts table before migration to SQL
 	 */
-	function __construct($domain,$ldap_host=null,$ldap_suffix=null,$ldap_admin=null,$ldap_admin_pw=null,
-		$ldap_base=null,$ldap_root_dn=null,$ldap_root_pw=null,$ldap_context=null,$ldap_search_filter=null,
-		$ldap_group_context=null,$sub_command='create_ldap',$ldap_encryption_type='des',$truncate_egw_accounts=false)
+	function __construct($domain, $ldap_host = null, $ldap_suffix = null, $ldap_admin = null, $ldap_admin_pw = null,
+		$ldap_base = null, $ldap_root_dn = null, $ldap_root_pw = null, $ldap_context = null, $ldap_search_filter = null,
+		$ldap_group_context = null, $sub_command = 'create_ldap', $ldap_encryption_type = 'des', $truncate_egw_accounts = false)
 	{
 		if (!is_array($domain))
 		{
@@ -119,23 +119,23 @@ 
 	 * @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 (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
 		if ($this->remote_id && $check_only && !in_array($this->sub_command, array('set_mailbox', 'sid2uidnumber', 'copy2ad')))
 		{
-			return true;	// further checks can only done locally
+			return true; // further checks can only done locally
 		}
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
-		switch($this->sub_command)
+		switch ($this->sub_command)
 		{
 			case 'test_ldap_root':
-				$msg = $this->connect($this->ldap_admin,$this->ldap_admin_pw);
+				$msg = $this->connect($this->ldap_admin, $this->ldap_admin_pw);
 				break;
 			case 'test_ldap':
 				$msg = $this->connect();
@@ -180,28 +180,28 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function sid2uidnumber($check_only=false)
+	private function sid2uidnumber($check_only = false)
 	{
 		$msg = array();
 		$this->connect();
 
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search='(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
-			array('uidNumber','gidNumber','uid','cn', 'objectClass',self::sambaSID))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = '(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
+			array('uidNumber', 'gidNumber', 'uid', 'cn', 'objectClass', self::sambaSID))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$change = $accounts = array();
 		$cmd_change_account_id = 'admin/admin-cli.php --change-account-id <admin>@<domain>,<adminpw>';
 		$change_account_id = '';
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -236,7 +236,7 @@ 
 
 		// now change them in LDAP
 		$changed = 0;
-		foreach($accounts as $dn => $account)
+		foreach ($accounts as $dn => $account)
 		{
 			$modify = array();
 			if (!empty($account['uidnumber']) && isset($change[$account['uidnumber']]))
@@ -250,7 +250,7 @@ 
 			if (!$check_only && $modify && !ldap_modify($this->test_ldap->ds, $dn, $modify))
 			{
 				throw new Api\Exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
-					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
+					"\n- ".implode("\n- ", $msg)); // EGroupware change already run successful
 			}
 			if ($modify) ++$changed;
 		}
@@ -265,13 +265,13 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function copy2ad($check_only=false)
+	private function copy2ad($check_only = false)
 	{
 		$msg = array();
 		$attrs = $rename = array();
-		foreach(explode(',', $this->attributes) as $attr)
+		foreach (explode(',', $this->attributes) as $attr)
 		{
-			if ($attr[0] == '@' ||	// copy whole objectclass without renaming, eg. @inetOrgPerson
+			if ($attr[0] == '@' || // copy whole objectclass without renaming, eg. @inetOrgPerson
 				strpos($attr, '=') === false)
 			{
 				$attrs[] = $attr;
@@ -286,7 +286,7 @@ 
 		$ignore_attr = array_flip(array('dn', 'objectclass', 'cn', 'userpassword'));
 		if (!in_array('uid', $attrs))
 		{
-			$attrs[] = 'uid';	// need to match account
+			$attrs[] = 'uid'; // need to match account
 			$ignore_attr['uid'] = true;
 		}
 		// connect to destination ads
@@ -295,9 +295,8 @@ 
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
 		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
-		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
-			'CN='.$this->ads_admin_user.','.$this->ads_context;
-		switch($this->ads_connection)
+		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user : 'CN='.$this->ads_admin_user.','.$this->ads_context;
+		switch ($this->ads_connection)
 		{
 			case 'ssl':
 				$url = 'ldaps://'.$this->ads_host.'/';
@@ -315,28 +314,27 @@ 
 		// check if ads base does exist
 		if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Ads dn "%1" NOT found!',$this->ads_context));
+			throw new Api\Exception\WrongUserinput(lang('Ads dn "%1" NOT found!', $this->ads_context));
 		}
 
 		// connect to source ldap
 		$this->connect();
 
 		// check if ldap base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search = $this->no_sid_check ? '(objectClass=posixAccount)' :
-				'(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = $this->no_sid_check ? '(objectClass=posixAccount)' : '(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$changed = 0;
 		$utc_diff = null;
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -345,7 +343,7 @@ 
 			$entry = array_diff_key($entry_arr, $ignore_attr);
 
 			if (!($sr = ldap_search($ads->ds, $this->ads_context,
-				$search='(&(objectClass=user)(sAMAccountName='.Api\Ldap::quote($uid).'))', array('dn'))) ||
+				$search = '(&(objectClass=user)(sAMAccountName='.Api\Ldap::quote($uid).'))', array('dn'))) ||
 				!($dest = ldap_get_entries($ads->ds, $sr)))
 			{
 				$msg[] = lang('User "%1" not found!', $uid);
@@ -365,11 +363,11 @@ 
 				{
 					if (is_null($utc_diff)) $utc_diff = date('Z');
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
-						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
+						$entry['shadowexpire'] * 24 * 3600 + $utc_diff); // ldap time to unixTime
 				}
 			}
 			$update = array();
-			foreach($entry as $attr => $value)
+			foreach ($entry as $attr => $value)
 			{
 				if ($value || $attr === '')
 				{
@@ -379,14 +377,14 @@ 
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
-					foreach((array)$value as $val)
+					foreach ((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
 							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
-							foreach($update[$to] as $v)
+							foreach ($update[$to] as $v)
 							{
 								if (!strcasecmp($v, $prefix.$val)) continue 2;
 							}
@@ -418,7 +416,7 @@ 
 		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
 
 		return "Copied data of $changed accounts from LDAP to AD ".
-			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
+			(count($msg) > $changed ? ' ('.(count($msg) - $changed).' errors!)' : '');
 	}
 
 	/**
@@ -461,9 +459,9 @@ 
 		$accounts_created = $groups_created = $errors = $egw_info_set = 0;
 		$emailadmin_src = $ldap_class = null;
 		$target = strtoupper($to);
-		foreach($accounts as $account_id => $account)
+		foreach ($accounts as $account_id => $account)
 		{
-			if (isset($this->only) && !in_array($account_id,$this->only))
+			if (isset($this->only) && !in_array($account_id, $this->only))
 			{
 				continue;
 			}
@@ -483,12 +481,12 @@ 
 			{
 				if (!($sql_account = $accounts_obj->read($account_id)))
 				{
-					$msg[] = lang('%1 does NOT exist in %2.',$what,$target);
+					$msg[] = lang('%1 does NOT exist in %2.', $what, $target);
 					$errors++;
 				}
-				elseif(empty($account['account_pwd']))
+				elseif (empty($account['account_pwd']))
 				{
-					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!',$what);
+					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!', $what);
 					$errors++;
 				}
 				else
@@ -497,12 +495,12 @@ 
 
 					if (!$accounts_obj->save($sql_account))
 					{
-						$msg[] = lang('Update of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Update of %1 in %2 failed !!!', $what, $target);
 						$errors++;
 					}
 					else
 					{
-						$msg[] = lang('%1 password set in %2.',$what,$target);
+						$msg[] = lang('%1 password set in %2.', $what, $target);
 						$accounts_created++;
 					}
 				}
@@ -513,7 +511,7 @@ 
 			{
 				if ($accounts_obj->exists($account_id))
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 					continue;
 				}
@@ -521,7 +519,7 @@ 
 				{
 					if ($GLOBALS['egw_info']['server']['ldap_extra_attributes'])
 					{
-						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'] . '/' . $account['account_lid'];
+						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'].'/'.$account['account_lid'];
 						$account['loginshell'] = $GLOBALS['egw_info']['server']['ldap_account_shell'];
 					}
 					$account['account_passwd'] = self::hash_sql2ldap($account['account_pwd']);
@@ -534,12 +532,12 @@ 
 
 				if (!$accounts_obj->save($account))
 				{
-					$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+					$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 					$errors++;
 					continue;
 				}
-				$accounts_obj->set_memberships($account['memberships'],$account_id);
-				$msg[] = lang('%1 created in %2.',$what,$target);
+				$accounts_obj->set_memberships($account['memberships'], $account_id);
+				$msg[] = lang('%1 created in %2.', $what, $target);
 				$accounts_created++;
 
 				// check if we need to migrate mail-account
@@ -548,7 +546,7 @@ 
 					$ldap_class = false;
 					$ldap = new ldap();
 					$ldap->ldapConnect();
-					foreach(array(	// todo: have these enumerated by emailadmin ...
+					foreach (array(	// todo: have these enumerated by emailadmin ...
 						'qmailUser' => 'EGroupware\\Api\\Mail\\Smtp\\Oldqmailuser',
 						'dbMailUser' => 'EGroupware\\Api\\Mail\\Smtp\\Dbmailuser',
 						// nothing to migrate for inetOrgPerson ...
@@ -595,7 +593,7 @@ 
 					// setting up egw_info array with new ldap information, so hook can use Api\Ldap::ldapConnect()
 					if (!$egw_info_set++)
 					{
-						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
+						foreach (array('ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', 'ldap_encryptin_type', 'mail_suffix', 'mail_login_type') as $name)
 						{
 							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
 						}
@@ -609,12 +607,12 @@ 
 						{
 							Api\Hooks::process($account, array(), true);
 						}
-						elseif(is_callable($this->add_account_hook))
+						elseif (is_callable($this->add_account_hook))
 						{
-							call_user_func($this->add_account_hook,$account);
+							call_user_func($this->add_account_hook, $account);
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$msg[] = $e->getMessage();
 						$errors++;
@@ -628,38 +626,38 @@ 
 				{
 					if (!$accounts_obj->save($account))
 					{
-						$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 						++$errors;
 						continue;
 					}
-					$msg[] = lang('%1 created in %2.',$what,$target);
+					$msg[] = lang('%1 created in %2.', $what, $target);
 					$groups_created++;
 				}
 				else
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 
 					if ($accounts_obj->id2name($account_id) != $account['account_lid'])
 					{
-						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!",$account['account_lid'],$account_id);
+						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!", $account['account_lid'], $account_id);
 						++$errors;
-						continue;	// different group under that gidnumber!
+						continue; // different group under that gidnumber!
 					}
 				}
 				// now saving / updating the memberships
-				$accounts_obj->set_members($account['members'],$account_id);
+				$accounts_obj->set_members($account['members'], $account_id);
 			}
 		}
 		if ($passwords2sql)
 		{
-			return lang('%1 passwords updated, %3 errors',$accounts_created,$groups_created,$errors).
-				($errors || $this->verbose ? "\n- ".implode("\n- ",$msg) : '');
+			return lang('%1 passwords updated, %3 errors', $accounts_created, $groups_created, $errors).
+				($errors || $this->verbose ? "\n- ".implode("\n- ", $msg) : '');
 		}
 		// migrate addressbook data
-		$GLOBALS['egw_info']['user']['apps']['admin'] = true;	// otherwise migration will not run in setup!
+		$GLOBALS['egw_info']['user']['apps']['admin'] = true; // otherwise migration will not run in setup!
 		$addressbook = new Api\Contacts\Storage();
-		foreach($this->as_array() as $name => $value)
+		foreach ($this->as_array() as $name => $value)
 		{
 			if (substr($name, 5) == 'ldap_')
 			{
@@ -672,8 +670,8 @@ 
 
 		$this->restore_db();
 
-		return lang('%1 users and %2 groups created, %3 errors',$accounts_created,$groups_created,$errors).
-			($errors || $this->verbose ? "\n- ".implode("\n- ",$msgs) : '');
+		return lang('%1 users and %2 groups created, %3 errors', $accounts_created, $groups_created, $errors).
+			($errors || $this->verbose ? "\n- ".implode("\n- ", $msgs) : '');
 	}
 
 	/**
@@ -687,22 +685,22 @@ 
 		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
 
 		$matches = null;
-		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
+		if (preg_match('/^\\{(.*)\\}(.*)$/', $hash, $matches))
 		{
-			list(,$type,$hash) = $matches;
+			list(,$type, $hash) = $matches;
 		}
-		elseif (preg_match('/^[0-9a-f]{32}$/',$hash))
+		elseif (preg_match('/^[0-9a-f]{32}$/', $hash))
 		{
 			$type = 'md5';
 		}
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'plain':
 				// ldap stores plaintext passwords without {plain} prefix
 				break;
 
 			case 'md5':
-				$hash = base64_encode(pack("H*",$hash));
+				$hash = base64_encode(pack("H*", $hash));
 				// fall through
 			default:
 				$hash = '{'.strtoupper($type).'}'.$hash;
@@ -732,14 +730,14 @@ 
 	 * @param string $type ='both'
 	 * @return array
 	 */
-	public function accounts($from='ldap', $type='both')
+	public function accounts($from = 'ldap', $type = 'both')
 	{
 		$accounts_obj = $this->accounts_obj($from);
 		//error_log(__METHOD__."(from_ldap=".array2string($from_ldap).') get_class(accounts_obj->backend)='.get_class($accounts_obj->backend));
 
 		$accounts = $accounts_obj->search(array('type' => $type, 'objectclass' => true, 'active' => false));
 
-		foreach($accounts as $account_id => &$account)
+		foreach ($accounts as $account_id => &$account)
 		{
 			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
 			{
@@ -750,11 +748,11 @@ 
 
 			if ($account['account_type'] == 'g')
 			{
-				$account['members'] = $accounts_obj->members($account_id,true);
+				$account['members'] = $accounts_obj->members($account_id, true);
 			}
 			else
 			{
-				$account['memberships'] = $accounts_obj->memberships($account_id,true);
+				$account['memberships'] = $accounts_obj->memberships($account_id, true);
 			}
 		}
 		Api\Accounts::cache_invalidate();
@@ -770,13 +768,13 @@ 
 	 */
 	private function accounts_obj($type)
 	{
-		static $enviroment_setup=null;
+		static $enviroment_setup = null;
 		if (!$enviroment_setup)
 		{
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql') $this->connect(); // throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -785,8 +783,8 @@ 
 			array(
 				'account_repository' => $GLOBALS['egw_info']['server']['account_repository'],
 			) + $this->as_array()) ||
-			!is_a(self::$egw_setup->accounts,'accounts') ||
-			!is_a(self::$egw_setup->accounts->backend,'accounts_'.$type))
+			!is_a(self::$egw_setup->accounts, 'accounts') ||
+			!is_a(self::$egw_setup->accounts->backend, 'accounts_'.$type))
 		{
 			throw new Exception(lang("Can NOT instancate accounts object for %1", strtoupper($type)));
 		}
@@ -801,7 +799,7 @@ 
 	 * @param string $host =null default $this->ldap_host, hostname, ip or ldap-url
 	 * @throws Api\Exception\WrongUserinput Can not connect to ldap ...
 	 */
-	private function connect($dn=null,$pw=null,$host=null)
+	private function connect($dn = null, $pw = null, $host = null)
 	{
 		if (is_null($dn)) $dn = $this->ldap_root_dn;
 		if (is_null($pw)) $pw = $this->ldap_root_pw;
@@ -818,9 +816,9 @@ 
 		catch (Api\Exception\NoPermission $e) {
 			_egw_log_exception($e);
 			throw new Api\Exception\WrongUserinput(lang('Can not connect to LDAP server on host %1 using DN %2!',
-				$host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
+				$host, $dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
 		}
-		return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn);
+		return lang('Successful connected to LDAP server on %1 using DN %2.', $this->ldap_host, $dn);
 	}
 
 	/**
@@ -833,16 +831,16 @@ 
 	{
 		$this->connect();
 
-		$sr = ldap_list($this->test_ldap->ds,$this->ldap_context,'ObjectClass=posixAccount',array('dn','shadowExpire'));
+		$sr = ldap_list($this->test_ldap->ds, $this->ldap_context, 'ObjectClass=posixAccount', array('dn', 'shadowExpire'));
 		if (!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception('Error listing "dn=%1"!',$this->ldap_context);
+			throw new Api\Exception('Error listing "dn=%1"!', $this->ldap_context);
 		}
 		$num = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0] * 24 * 3600 < time()) continue;
 			++$num;
 		}
 		return $num;
@@ -856,23 +854,23 @@ 
 	 */
 	private function create()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
-		foreach(array(
+		foreach (array(
 			$this->ldap_base => array(),
 			$this->ldap_context => array(),
 			$this->ldap_group_context => array(),
-			$this->ldap_root_dn => array('userPassword' => Api\Auth::encrypt_ldap($this->ldap_root_pw,'ssha')),
+			$this->ldap_root_dn => array('userPassword' => Api\Auth::encrypt_ldap($this->ldap_root_pw, 'ssha')),
 		) as $dn => $extra)
 		{
-			if (!$this->_create_node($dn,$extra,$this->check_only) && $dn == $this->ldap_root_dn)
+			if (!$this->_create_node($dn, $extra, $this->check_only) && $dn == $this->ldap_root_dn)
 			{
 				// ldap_root already existed, lets check the pw is correct
 				$this->connect();
 			}
 		}
 		return lang('Successful connected to LDAP server on %1 and created/checked required structur %2.',
-			$this->ldap_host,$this->ldap_base);
+			$this->ldap_host, $this->ldap_base);
 	}
 
 	/**
@@ -883,25 +881,25 @@ 
 	 */
 	private function delete_base()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// some precausion to not delete whole ldap tree!
-		if (count(explode(',',$this->ldap_base)) < 2)
+		if (count(explode(',', $this->ldap_base)) < 2)
 		{
-			throw new Api\Exception\AssertionFailed(lang('Refusing to delete dn "%1"!',$this->ldap_base));
+			throw new Api\Exception\AssertionFailed(lang('Refusing to delete dn "%1"!', $this->ldap_base));
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		return lang('LDAP dn="%1" with %2 entries deleted.',
-			$this->ldap_base,$this->rdelete($this->ldap_base));
+			$this->ldap_base, $this->rdelete($this->ldap_base));
 	}
 
 	/**
@@ -913,20 +911,20 @@ 
 	 */
 	private function rdelete($dn)
 	{
-		if (!($sr = ldap_list($this->test_ldap->ds,$dn,'ObjectClass=*',array(''))) ||
+		if (!($sr = ldap_list($this->test_ldap->ds, $dn, 'ObjectClass=*', array(''))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error listing "dn=%1"!',$dn));
+			throw new Api\Exception(lang('Error listing "dn=%1"!', $dn));
 		}
 		$deleted = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 			$deleted += $this->rdelete($entry['dn']);
 		}
-		if (!ldap_delete($this->test_ldap->ds,$dn))
+		if (!ldap_delete($this->test_ldap->ds, $dn))
 		{
-			throw new Api\Exception(lang('Error deleting "dn=%1"!',$dn));
+			throw new Api\Exception(lang('Error deleting "dn=%1"!', $dn));
 		}
 		return ++$deleted;
 	}
@@ -942,32 +940,32 @@ 
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */
-	private function set_mailbox($check_only=false)
+	private function set_mailbox($check_only = false)
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		$object_class = $this->object_class ? $this->object_class : 'qmailUser';
 		$mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';
 		$mail_login_type = $this->mail_login_type ? $this->mail_login_type : 'email';
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-				'objectClass='.$object_class,array('mail','uidNumber','uid',$mbox_attr))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+				'objectClass='.$object_class, array('mail', 'uidNumber', 'uid', $mbox_attr))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error listing "dn=%1"!',$this->ldap_base));
+			throw new Api\Exception(lang('Error listing "dn=%1"!', $this->ldap_base));
 		}
 		$modified = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 
@@ -975,21 +973,20 @@ 
 				'account_id' => $entry['uidnumber'][0],
 				'account_lid' => $entry['uid'][0],
 				'account_email' => $entry['mail'][0],
-			),$this->domain,$mail_login_type);
+			), $this->domain, $mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0]) continue; // nothing to change
 
-			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
+			if (!$check_only && !ldap_modify($this->test_ldap->ds, $entry['dn'], array(
 				$mbox_attr => $mbox,
 			)))
 			{
-				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
+				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!", $entry['dn'], $mbox_attr, $mbox));
 			}
 			++$modified;
 			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
 		}
-		return $check_only ? lang('%1 entries would have been modified.',$modified) :
-			lang('%1 entries modified.',$modified);
+		return $check_only ? lang('%1 entries would have been modified.', $modified) : lang('%1 entries modified.', $modified);
 	}
 
 	/**
@@ -1000,9 +997,9 @@ 
 	static $requiredObjectclasses = array(
 		'o' => 'organization',
 		'ou' => 'organizationalUnit',
-		'cn' => array('organizationalRole','simpleSecurityObject'),
-		'uid' => array('uidObject','organizationalRole','simpleSecurityObject'),
-		'dc' => array('organization','dcObject'),
+		'cn' => array('organizationalRole', 'simpleSecurityObject'),
+		'uid' => array('uidObject', 'organizationalRole', 'simpleSecurityObject'),
+		'dc' => array('organization', 'dcObject'),
 	);
 
 	/**
@@ -1013,37 +1010,37 @@ 
 	 * @return boolean true if the node was create, false if it was already there
 	 * @throws Api\Exception\WrongUserinput
 	 */
-	private function _create_node($dn,$extra=array())
+	private function _create_node($dn, $extra = array())
 	{
 		// check if the node already exists and return if it does
-		if (@ldap_read($this->test_ldap->ds,$dn,'objectClass=*'))
+		if (@ldap_read($this->test_ldap->ds, $dn, 'objectClass=*'))
 		{
 			return false;
 		}
-		list($node,$base) = explode(',',$dn,2);
+		list($node, $base) = explode(',', $dn, 2);
 
-		if (!@ldap_read($this->test_ldap->ds,$base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $base, 'objectClass=*'))
 		{
-			$this->_create_node($base);		// create the base if it's not already there
+			$this->_create_node($base); // create the base if it's not already there
 		}
 		// now we need to create the node itself
-		list($name,$value) = explode('=',$node);
+		list($name, $value) = explode('=', $node);
 
 		if (!isset(self::$requiredObjectclasses[$name]))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).' '.
-				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
+			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!', $dn).' '.
+				lang('Supported node types:').implode(', ', array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc') $extra['o'] = $value; // required by organisation
+		if ($name == 'uid') $extra['cn'] = $value; // required by organizationalRole
 
-		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
+		if (!@ldap_add($this->test_ldap->ds, $dn, $attr = array(
 			$name => $value,
 			'objectClass' => self::$requiredObjectclasses[$name],
-		)+$extra))
+		) + $extra))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).
-				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr,true).')');
+			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!', $dn).
+				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr, true).')');
 		}
 		return true;
 	}
@@ -1074,30 +1071,30 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
-			if ($this->sub_command == 'delete_ldap' && in_array($name,array('ldap_base','ldap_context')))
+			if ($this->sub_command == 'delete_ldap' && in_array($name, array('ldap_base', 'ldap_context')))
 			{
-				continue;	// no default on what to delete!
+				continue; // no default on what to delete!
 			}
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$') !== false)
+			if (strpos($this->$name, '$') !== false)
 			{
 				$this->set_defaults[$name] = $this->$name = str_replace(array(
 					'$domain',
 					'$suffix',
 					'$base',
 					'$admin_pw',
-				),array(
+				), array(
 					$this->domain,
 					$this->ldap_suffix,
 					$this->ldap_base,
 					$this->ldap_admin_pw,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

Braces +124 added lines, -30 removed lines

@@ -203,7 +203,10 @@ 
 		$change_account_id = '';
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry = Api\Ldap::result2array($entry);
 			$accounts[$entry['dn']] = $entry;
@@ -230,7 +233,10 @@ 
 		//print_r($change); die('Stop');
 
 		// change account-ids inside EGroupware
-		if ($check_only) $msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		if ($check_only)
+		{
+			$msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		}
 		//$cmd = new admin_cmd_change_account_id($change);
 		//$msg[] = $cmd->run($time=null, $set_modifier=false, $skip_checks=false, $check_only);
 
@@ -252,7 +258,10 @@ 
 				throw new Api\Exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
 					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
 			}
-			if ($modify) ++$changed;
+			if ($modify)
+			{
+				++$changed;
+			}
 		}
 		$msg[] = "You need to run now on your samba share(s):\nsetup/doc/chown.php -R $change_account_id <share>";
 
@@ -279,7 +288,10 @@ 
 			else
 			{
 				list($to, $from) = explode('=', $attr);
-				if ($from) $attrs[] = $from;
+				if ($from)
+				{
+					$attrs[] = $from;
+				}
 				$rename[strtolower($from)] = $to;
 			}
 		}
@@ -294,7 +306,10 @@ 
 		{
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
-		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
+		if (empty($this->ads_admin_user))
+		{
+			$this->ads_admin_user = 'Administrator';
+		}
 		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
 			'CN='.$this->ads_admin_user.','.$this->ads_context;
 		switch($this->ads_connection)
@@ -338,7 +353,10 @@ 
 		$utc_diff = null;
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry_arr = Api\Ldap::result2array($entry);
 			$uid = $entry_arr['uid'];
@@ -352,7 +370,10 @@ 
 				continue;
 			}
 			$dn = $dest[0]['dn'];
-			if (isset($rename[''])) $entry[''] = '';
+			if (isset($rename['']))
+			{
+				$entry[''] = '';
+			}
 			// special handling for copying shadowExpires to accountExpires
 			if (strtolower($rename['shadowexpire']) === 'accountexpires')
 			{
@@ -363,7 +384,10 @@ 
 				}
 				else
 				{
-					if (is_null($utc_diff)) $utc_diff = date('Z');
+					if (is_null($utc_diff))
+					{
+						$utc_diff = date('Z');
+					}
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
 						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
 				}
@@ -375,20 +399,29 @@ 
 				{
 					$to = isset($rename[$attr]) ? $rename[$attr] : $attr;
 					$prefix = null;
-					if ($to[0] == '{')	// eg. {smtp:}proxyAddresses=forwardTo
+					if ($to[0] == '{')
+					{
+						// eg. {smtp:}proxyAddresses=forwardTo
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
+					}
 					foreach((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
-							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
+							if (!is_array($update[$to]))
+							{
+								$update[$to] = array($update[$to]);
+							}
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
 							foreach($update[$to] as $v)
 							{
-								if (!strcasecmp($v, $prefix.$val)) continue 2;
+								if (!strcasecmp($v, $prefix.$val))
+								{
+									continue 2;
+								}
 							}
 							$update[$to][] = $prefix.$val;
 						}
@@ -415,7 +448,10 @@ 
 				$changed++;
 			}
 		}
-		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
+		if ($check_only)
+		{
+			return lang("%1 accounts to copy found.", count($entries));
+		}
 
 		return "Copied data of $changed accounts from LDAP to AD ".
 			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
@@ -431,7 +467,10 @@ 
 	private function migrate($mode)
 	{
 		// support old boolean mode
-		if (is_bool($mode)) $mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		if (is_bool($mode))
+		{
+			$mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		}
 
 		$passwords2sql = $mode === "passwords_to_sql";
 		list(,$to) = explode('_to_', $mode);
@@ -597,7 +636,10 @@ 
 					{
 						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
 						{
-							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 if (!empty($this->$name))
+							 {
+							 	$GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 }
 						}
 						//error_log(__METHOD__."() setup up egw_info[server]: ldap_host='{$GLOBALS['egw_info']['server']['ldap_host']}', ldap_root_dn='{$GLOBALS['egw_info']['server']['ldap_root_dn']}', ldap_root_pw='{$GLOBALS['egw_info']['server']['ldap_root_pw']}', ldap_context='{$GLOBALS['egw_info']['server']['ldap_context']}', mail_suffix='{$GLOBALS['egw_info']['server']['mail_suffix']}', mail_logig_type='{$GLOBALS['egw_info']['server']['mail_login-type']}'");
 					}
@@ -684,7 +726,10 @@ 
 	 */
 	public static function hash_sql2ldap($hash)
 	{
-		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
+		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type']))
+		{
+			$type = 'md5';
+		}
 
 		$matches = null;
 		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
@@ -718,10 +763,13 @@ 
 	 */
 	public static function hash_ldap2sql($hash)
 	{
-		if ($hash[0] != '{')	// plain has to be explicitly specified for sql, in ldap it's the default
+		if ($hash[0] != '{')
+		{
+			// plain has to be explicitly specified for sql, in ldap it's the default
 		{
 			$hash = '{PLAIN}'.$hash;
 		}
+		}
 		return $hash;
 	}
 
@@ -741,9 +789,12 @@ 
 
 		foreach($accounts as $account_id => &$account)
 		{
-			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
+			if ($account_id != $account['account_id'])
+			{
+				// not all backends have as key the account_id
 			{
 				unset($account);
+			}
 				$account_id = $account['account_id'];
 			}
 			$account += $accounts_obj->read($account_id);
@@ -776,7 +827,11 @@ 
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql')
+		{
+			$this->connect();
+		}
+		// throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -803,14 +858,26 @@ 
 	 */
 	private function connect($dn=null,$pw=null,$host=null)
 	{
-		if (is_null($dn)) $dn = $this->ldap_root_dn;
-		if (is_null($pw)) $pw = $this->ldap_root_pw;
-		if (is_null($host)) $host = $this->ldap_host;
+		if (is_null($dn))
+		{
+			$dn = $this->ldap_root_dn;
+		}
+		if (is_null($pw))
+		{
+			$pw = $this->ldap_root_pw;
+		}
+		if (is_null($host))
+		{
+			$host = $this->ldap_host;
+		}
 
-		if (!$pw)	// Api\Ldap::ldapConnect use the current eGW's pw otherwise
+		if (!$pw)
+		{
+			// Api\Ldap::ldapConnect use the current eGW's pw otherwise
 		{
 			throw new Api\Exception\WrongUserinput(lang('You need to specify a password!'));
 		}
+		}
 
 		try {
 			$this->test_ldap = Api\Ldap::factory(false, $host, $dn, $pw);
@@ -841,8 +908,14 @@ 
 		$num = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time())
+			{
+				continue;
+			}
 			++$num;
 		}
 		return $num;
@@ -921,7 +994,10 @@ 
 		$deleted = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 			$deleted += $this->rdelete($entry['dn']);
 		}
 		if (!ldap_delete($this->test_ldap->ds,$dn))
@@ -969,7 +1045,10 @@ 
 		$modified = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 
 			$mbox = Api\Mail\Smtp\Ldap::mailbox_addr(array(
 				'account_id' => $entry['uidnumber'][0],
@@ -977,7 +1056,11 @@ 
 				'account_email' => $entry['mail'][0],
 			),$this->domain,$mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0])
+			{
+				continue;
+			}
+			// nothing to change
 
 			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
 				$mbox_attr => $mbox,
@@ -986,7 +1069,10 @@ 
 				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
 			}
 			++$modified;
-			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			if ($check_only)
+			{
+				echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			}
 		}
 		return $check_only ? lang('%1 entries would have been modified.',$modified) :
 			lang('%1 entries modified.',$modified);
@@ -1034,8 +1120,16 @@ 
 			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).' '.
 				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc')
+		{
+			$extra['o'] = $value;
+		}
+		// required by organisation
+		if ($name == 'uid')
+		{
+			$extra['cn'] = $value;
+		}
+		// required by organizationalRole
 
 		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
 			$name => $value,