EGroupware / egroupware

resources/inc/class.resources_favorite_portlet.inc.php

Braces +4 added lines, -1 removed lines

@@ -76,9 +76,12 @@
 
 		// This is just copy+pasted from resources_ui line 816, but we don't want
 		// the etemplate exec to fire again.
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 		$context['appname'] = 'resources';
 		
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$ui = new resources_ui();
 
@@ -48,13 +48,13 @@ 
 		);
 	}
 
-	public function exec($id = null, etemplate_new &$etemplate = null)
+	public function exec($id = null, etemplate_new&$etemplate = null)
 	{
 		$ui = new resources_ui();
 
-		$this->context['sel_options']['filter']= array(''=>lang('all categories'))+(array)$ui->bo->acl->get_cats(EGW_ACL_READ);
+		$this->context['sel_options']['filter'] = array(''=>lang('all categories')) + (array)$ui->bo->acl->get_cats(EGW_ACL_READ);
 		$this->context['sel_options']['filter2'] = resources_bo::$filter_options;
-		if(!$content['nm']['filter2'])
+		if (!$content['nm']['filter2'])
 		{
 			$content['nm']['filter2'] = key(resources_bo::$filter_options);
 		}
@@ -93,28 +93,28 @@ 
 			if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
 			{
 				$msg = lang('You need to select some entries first!');
-				egw_json_response::get()->apply('egw.message',array($msg,'error'));
+				egw_json_response::get()->apply('egw.message', array($msg, 'error'));
 			}
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($ui->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($ui->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 resource(s) %2',$success,$action_msg);
+					$msg .= lang('%1 resource(s) %2', $success, $action_msg);
 
-					egw_json_response::get()->apply('egw.message',array($msg,'success'));
-					foreach($content['nm']['selected'] as &$id)
+					egw_json_response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($content['nm']['selected'] as &$id)
 					{
 						$id = 'resources::'.$id;
 					}
 					// Directly request an update - this will get resources tab too
-					egw_json_response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+					egw_json_response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					egw_json_response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					egw_json_response::get()->apply('egw.message', array($msg, 'error'));
 				}
 			}
 		}

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

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

Doc Comments -2 removed lines

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

resources/inc/class.resources_bo.inc.php

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

Doc Comments +1 added lines, -2 removed lines

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

Indentation +5 added lines, -5 removed lines

@@ -358,10 +358,10 @@ 
 		}
 
 		// Check for restore of deleted, restore held links
-                if($old && $old['deleted'] && !$resource['deleted'])
-                {
-                        egw_link::restore('resources', $resource['res_id']);
-                }
+				if($old && $old['deleted'] && !$resource['deleted'])
+				{
+						egw_link::restore('resources', $resource['res_id']);
+				}
 
 		// delete old pictures
 		if($resource['picture_src'] != 'own_src')
@@ -686,7 +686,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 +136 added lines, -136 removed lines

@@ -71,7 +71,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 = CreateObject('resources.bo_acl', $user);
@@ -79,8 +79,8 @@ 
 
 		$this->cal_right_transform = array(
 			EGW_ACL_CALREAD 	=> EGW_ACL_READ,
-			EGW_ACL_DIRECT_BOOKING 	=> EGW_ACL_READ | EGW_ACL_ADD | EGW_ACL_EDIT | EGW_ACL_DELETE,
-			EGW_ACL_CAT_ADMIN 	=> EGW_ACL_READ | EGW_ACL_ADD | EGW_ACL_EDIT | EGW_ACL_DELETE,
+			EGW_ACL_DIRECT_BOOKING 	=> EGW_ACL_READ|EGW_ACL_ADD|EGW_ACL_EDIT|EGW_ACL_DELETE,
+			EGW_ACL_CAT_ADMIN 	=> EGW_ACL_READ|EGW_ACL_ADD|EGW_ACL_EDIT|EGW_ACL_DELETE,
 		);
 	}
 
@@ -89,19 +89,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'])
 		{
-			$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$query);
+			$GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm', $query);
 		}
 		if ($query['store_state'])	// request to store state in session and filter in prefs?
 		{
-			egw_cache::setSession('resources',$query['store_state'],$query);
+			egw_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();
 			}
 		}
@@ -115,7 +115,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
@@ -140,14 +140,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(EGW_ACL_READ,$query['filter'])))
+			if (($children = $this->acl->get_cats(EGW_ACL_READ, $query['filter'])))
 			{
 				$filter['cat_id'] = array_keys($children);
 				$filter['cat_id'][] = $query['filter'];
@@ -170,7 +170,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;
@@ -178,10 +178,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;
 			}
@@ -190,24 +190,24 @@ 
 		}
 
 		$config = config::read('resources');
-		foreach($rows as $num => &$resource)
+		foreach ($rows as $num => &$resource)
 		{
-			if (!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_EDIT))
+			if (!$this->acl->is_permitted($resource['cat_id'], EGW_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'],EGW_ACL_DELETE) ||
+			if (!$this->acl->is_permitted($resource['cat_id'], EGW_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'],EGW_ACL_ADD)) ||
+			if ((!$this->acl->is_permitted($resource['cat_id'], EGW_ACL_ADD)) ||
 				// Allow new accessory action when viewing accessories of a certain resource
 				$query['filter2'] <= 0 && $resource['accessory_of'] != -1)
 			{
@@ -221,7 +221,7 @@ 
 				$resource['class'] .= 'no_book ';
 				$resource['class'] .= 'no_view_calendar ';
 			}
-			if(!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_CALREAD))
+			if (!$this->acl->is_permitted($resource['cat_id'], EGW_ACL_CALREAD))
 			{
 				$readonlys["calendar[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_view_calendar ';
@@ -232,12 +232,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));
 				}
@@ -245,7 +245,7 @@ 
 				$resource['accessory_of_label'] = $this->link_title($resource['accessory_of']);
 			}
 
-			if($resource['deleted'])
+			if ($resource['deleted'])
 			{
 				$rows[$num]['picture_thumb'] = 'deleted';
 			}
@@ -266,7 +266,7 @@ 
 			$rows[$num]['admin'] = $this->acl->get_cat_admin($resource['cat_id']);
 		}
 
-		if(!config::get_customfields('resources'))
+		if (!config::get_customfields('resources'))
 		{
 			$rows['no_customfields'] = true;
 		}
@@ -284,11 +284,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'],EGW_ACL_READ))
+		if (!$this->acl->is_permitted($data['cat_id'], EGW_ACL_READ))
 		{
-			return false;	// permission denied
+			return false; // permission denied
 		}
 		return $data;
 	}
@@ -302,35 +302,35 @@ 
 	 */
 	function save($resource)
 	{
-		if(!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_EDIT))
+		if (!$this->acl->is_permitted($resource['cat_id'], EGW_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'] = egw_time::server2user(time(),'ts');
+			$resource['res_created'] = egw_time::server2user(time(), 'ts');
 			$resource['res_id'] = $this->so->save($resource);
 		}
 		else
 		{
 			$resource['res_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-			$resource['res_modified'] = egw_time::server2user(time(),'ts');
+			$resource['res_modified'] = egw_time::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;
 				}
@@ -341,10 +341,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
 				{
@@ -352,55 +352,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'])
                 {
                         egw_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
-		egw_link::notify_update('resources',$resource['res_id'], $resource);
+		egw_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']))
 		{
-			egw_link::link('resources',$resource['res_id'],$resource['link_to']['to_id']);
+			egw_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'])
 		{
-			egw_link::unlink(0,'resources',$resource['res_id'],'','resources',$old['accessory_of']);
+			egw_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)
 				{
-					egw_link::unlink(0,'resources',$accessory,'','resources',$resource['res_id']);
+					egw_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)
 		{
-			egw_link::link('resources',$resource['res_id'],'resources',$resource['accessory_of']);
+			egw_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'];
@@ -416,9 +416,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');
@@ -432,7 +432,7 @@ 
 	 */
 	function delete($res_id)
 	{
-		if(!$this->acl->is_permitted($this->so->get_value('cat_id',$res_id),EGW_ACL_DELETE))
+		if (!$this->acl->is_permitted($this->so->get_value('cat_id', $res_id), EGW_ACL_DELETE))
 		{
 			return lang('You are not permitted to delete this resource!');
 		}
@@ -444,17 +444,17 @@ 
 		{
 			$old['deleted'] = time();
 			$this->save($old);
-			egw_link::unlink(0,'resources',$res_id,'','','',true);
+			egw_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);
-					egw_link::unlink(0,'resources',$acc_id,'','','',true);
+					egw_link::unlink(0, 'resources', $acc_id, '', '', '', true);
 				}
 			}
 			return false;
@@ -462,9 +462,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;
@@ -472,9 +472,9 @@ 
 				}
 			};
 			$this->remove_picture($res_id);
-	 		egw_link::unlink(0,'resources',$res_id);
+	 		egw_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');
@@ -488,15 +488,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'];
 			}
 		}
@@ -512,20 +512,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;
 				}
@@ -533,7 +533,7 @@ 
 			$resource['responsible'] = $this->acl->get_cat_admin($resource['cat_id']);
 
 			// preseed the cache
-			egw_link::set_cache('resources',$resource['res_id'],$t=$this->link_title($resource));
+			egw_link::set_cache('resources', $resource['res_id'], $t = $this->link_title($resource));
 		}
 		return $data;
 	}
@@ -550,7 +550,7 @@ 
 		{
 			return false;
 		}
-		return $this->acl->is_permitted($data['cat_id'],EGW_ACL_DIRECT_BOOKING) ? A : U;
+		return $this->acl->is_permitted($data['cat_id'], EGW_ACL_DIRECT_BOOKING) ? A : U;
 	}
 
 	/**
@@ -562,11 +562,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
@@ -577,7 +577,7 @@ 
 		$only_keys = 'res_id,name,short_description,bookable,useable';
 
 		// If no read access to any category, just stop
-		if(!$this->acl->get_cats(EGW_ACL_READ))
+		if (!$this->acl->get_cats(EGW_ACL_READ))
 		{
 			$options['total'] = 0;
 			return array();
@@ -588,31 +588,31 @@ 
 			'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'])
 		{
 			// 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)))
 				{
 					require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.calendar_bo.inc.php');
-					$this->bocal =& CreateObject('calendar.calendar_bo');
+					$this->bocal = & CreateObject('calendar.calendar_bo');
 				}
 				$start = new egw_time($cal_info['start']);
-				$startarr= getdate($start->format('ts'));
+				$startarr = getdate($start->format('ts'));
 				if (isset($cal_info['whole_day'])) {
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new egw_time($startarr);
@@ -623,39 +623,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;
@@ -675,27 +675,27 @@ 
 			}
 		}
 		if (isset($res_info_cache)) {
-			$show_conflict= (isset($options['exec']['show_conflict'])&& ($options['exec']['show_conflict']=='0'))? False:True;
+			$show_conflict = (isset($options['exec']['show_conflict']) && ($options['exec']['show_conflict'] == '0')) ? False : True;
 			// 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']);
@@ -712,17 +712,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'],EGW_ACL_READ))
+		elseif (!$this->acl->is_permitted($resource['cat_id'], EGW_ACL_READ))
 		{
 			return false;
 		}
-		return $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+		return $resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 	}
 
 	/**
@@ -742,15 +742,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 egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -768,9 +768,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']);
@@ -787,11 +787,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);
 
-		egw_link::attach_file('resources',$resouce_id,array(
+		egw_link::attach_file('resources', $resouce_id, array(
 			'tmp_name' => $tmp_name,
 			'name'     => self::PICTURE_NAME,
 			'type'     => 'image/jpeg',
@@ -805,14 +805,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 = egw_link::vfs_path('resources',$resource['res_id'],self::PICTURE_NAME,true);	// vfs path
+				$picture = egw_link::vfs_path('resources', $resource['res_id'], self::PICTURE_NAME, true); // vfs path
 				if ($fullsize)
 				{
 					$picture = egw::link(egw_vfs::download_url($picture));
@@ -828,17 +828,17 @@ 
 			case 'cat_src':
 				list($picture) = $this->cats->return_single($resource['cat_id']);
 				$picture = unserialize($picture['data']);
-				if($picture['icon'])
+				if ($picture['icon'])
 				{
-					$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$picture['icon']:'/phpgwapi/images/'.$picture['icon'];
+					$picture = !$fullsize ? $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$picture['icon'] : '/phpgwapi/images/'.$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;
 	}
@@ -852,9 +852,9 @@ 
 	 */
 	function remove_picture($res_id)
 	{
-		if (($arr = egw_link::delete_attached('resources',$res_id,self::PICTURE_NAME)) && is_array($arr))
+		if (($arr = egw_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;
 	}
@@ -870,11 +870,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

@@ -95,9 +95,12 @@ 
 		{
 			$GLOBALS['egw']->session->appsession('session_data','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?
 		{
 			egw_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'])
 			{
@@ -105,7 +108,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();
@@ -162,7 +168,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;
 		}
 
@@ -173,7 +180,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;
 
@@ -202,8 +212,7 @@ 
 			}
 			if (!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_DELETE) ||
 				($resource['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history')
-			)
-			{
+			) {
 				$readonlys["delete[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_delete ';
 			}
@@ -241,7 +250,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']);
 			}
 
@@ -490,13 +501,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'];
 			}
 		}
@@ -512,7 +529,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))
@@ -588,7 +608,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'])
@@ -613,11 +634,14 @@ 
 				}
 				$start = new egw_time($cal_info['start']);
 				$startarr= getdate($start->format('ts'));
-				if (isset($cal_info['whole_day'])) {
+				if (isset($cal_info['whole_day']))
+				{
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new egw_time($startarr);
 					$end = $start->format('ts') + 86399;
-				} else {
+				}
+				else
+				{
 					$start = $start->format('ts');
 					$end = $start + ($cal_info['duration']);
 				}
@@ -629,7 +653,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'];
 					}
@@ -645,22 +670,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
@@ -674,30 +711,40 @@ 
 				}
 			}
 		}
-		if (isset($res_info_cache)) {
+		if (isset($res_info_cache))
+		{
 			$show_conflict= (isset($options['exec']['show_conflict'])&& ($options['exec']['show_conflict']=='0'))? False:True;
 			// 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']);
 			}
 		}
@@ -716,7 +763,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'],EGW_ACL_READ))
 		{
@@ -807,7 +857,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'])
 		{

resources/inc/class.resources_hooks.inc.php

Braces +7 added lines, -2 removed lines

@@ -119,7 +119,11 @@ 
 	{
 		$cat = Api\Categories::read($args['cat_id']);
 
-		if(!$cat) return; // Can't find current cat?
+		if(!$cat)
+		{
+			return;
+		}
+		// Can't find current cat?
 
 		if($cat['parent'] == 0)
 		{
@@ -134,7 +138,8 @@ 
 			{
 				// Default missing, look for 'No category'
 				$new_cat_id = $categories->name2id('No category');
-				if($new_cat_id == 0) {
+				if($new_cat_id == 0)
+				{
 					// No category not there, add it
 					$new_cat_id = $categories->add(array(
 						'name'		=> 'No category',

Spacing +24 added lines, -24 removed lines

@@ -19,7 +19,7 @@ 
 {
 	function admin_prefs_sidebox($args)
 	{
-		$this->acl =& CreateObject('resources.bo_acl');
+		$this->acl = & CreateObject('resources.bo_acl');
 
 		$appname = 'resources';
 		$location = is_array($args) ? $args['location'] : $args;
@@ -31,25 +31,25 @@ 
 
 			$title = $GLOBALS['egw_info']['apps']['resources']['title'].' '.lang('Menu');
 			$file = array(
-				'Resources list' => egw::link('/index.php',array(
+				'Resources list' => egw::link('/index.php', array(
 				'menuaction' => 'resources.resources_ui.index',
 				'ajax' => 'true')),
 			);
-			if($this->acl->get_cats(EGW_ACL_ADD))
+			if ($this->acl->get_cats(EGW_ACL_ADD))
 			{
-				$file['Add resource'] = "javascript:egw_openWindowCentered2('".egw::link('/index.php',array(
+				$file['Add resource'] = "javascript:egw_openWindowCentered2('".egw::link('/index.php', array(
 						'menuaction' => 'resources.resources_ui.edit',
 						'accessory_of' => -1
-					),false)."','_blank',800,600,'yes')";
+					), false)."','_blank',800,600,'yes')";
 			}
-			display_sidebox($appname,$title,$file);
+			display_sidebox($appname, $title, $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-				'Global Categories'  => egw::link('/index.php',array(
+				'Site Configuration' => egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname),
+				'Global Categories'  => egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> true)),
@@ -60,11 +60,11 @@ 
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -87,19 +87,19 @@ 
 			'add_app'    => 'link_app',
 			'add_id'     => 'link_id',
 			'add_popup'  => '800x600',
-			'find_extra' => array('name_preg' => '/^(?(?=^.picture.jpg$)|.+)$/'),	// remove pictures from regular attachment list
+			'find_extra' => array('name_preg' => '/^(?(?=^.picture.jpg$)|.+)$/'), // remove pictures from regular attachment list
 		);
 	}
 
 	function calendar_resources($args)
 	{
 		return array(
-			'widget' => 'resources_select',// widget to use for the selection of resources
-			'info' => 'resources.resources_bo.get_calendar_info',// info method, returns array with id, type & name for a given id
-			'max_quantity' => 'useable',// if set, key for max. quantity in array returned by info method
-			'new_status' => 'resources.resources_bo.get_calendar_new_status',// method returning the status for new items, else 'U' is used
-			'type' => 'r',// one char type-identifiy for this resources
-			'icon' => 'calicon',//icon
+			'widget' => 'resources_select', // widget to use for the selection of resources
+			'info' => 'resources.resources_bo.get_calendar_info', // info method, returns array with id, type & name for a given id
+			'max_quantity' => 'useable', // if set, key for max. quantity in array returned by info method
+			'new_status' => 'resources.resources_bo.get_calendar_new_status', // method returning the status for new items, else 'U' is used
+			'type' => 'r', // one char type-identifiy for this resources
+			'icon' => 'calicon', //icon
 			'participants_header' => lang('resources'), // header of participants from this type
 			'cal_sidebox' => array(
 				'menu_title' => lang('Select resources'),
@@ -118,14 +118,14 @@ 
 	{
 		$cat = categories::read($args['cat_id']);
 
-		if(!$cat) return; // Can't find current cat?
+		if (!$cat) return; // Can't find current cat?
 
-		if($cat['parent'] == 0)
+		if ($cat['parent'] == 0)
 		{
 			// No parent, try the default cat from setup
 			$categories = new categories('', 'resources');
 			$default = $categories->name2id('General resources');
-			if($default)
+			if ($default)
 			{
 				$new_cat_id = $default;
 			}
@@ -133,7 +133,7 @@ 
 			{
 				// Default missing, look for 'No category'
 				$new_cat_id = $categories->name2id('No category');
-				if($new_cat_id == 0) {
+				if ($new_cat_id == 0) {
 					// No category not there, add it
 					$new_cat_id = $categories->add(array(
 						'name'		=> 'No category',
@@ -141,7 +141,7 @@ 
 						'parent'	=> 0
 					));
 					$admin = -2;
-					ExecMethod2('resources.bo_acl.set_rights', $new_cat_id, array($admin), array($admin), array($admin), array($admin),array($admin));
+					ExecMethod2('resources.bo_acl.set_rights', $new_cat_id, array($admin), array($admin), array($admin), array($admin), array($admin));
 				}
 			}
 		}
@@ -155,9 +155,9 @@ 
 		$bo = new resources_bo();
 		$bo->get_rows($query, $resources, $readonly);
 		
-		foreach($resources as $resource)
+		foreach ($resources as $resource)
 		{
-			if(is_array($resource))
+			if (is_array($resource))
 			{
 				$resource['cat_id'] = $new_cat_id;
 				$bo->save($resource);

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

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

addressbook/inc/class.addressbook_wizard_export_vcard.inc.php

Braces +8 added lines, -3 removed lines

@@ -37,9 +37,13 @@ 
          */
         function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
         {
-                if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+                if($this->debug)
+                {
+                	error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+                }
                 // return from step40
-                if ($content['step'] == 'wizard_step40') {
+                if ($content['step'] == 'wizard_step40')
+                {
                         switch (array_search('pressed', $content['button']))
                         {
                                 case 'next':
@@ -57,7 +61,8 @@ 
                 {
                         $content['msg'] = $this->steps['wizard_step40'];
                         $content['step'] = 'wizard_step40';
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
                                 $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
                         }
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+

Indentation +43 added lines, -43 removed lines

@@ -26,54 +26,54 @@
 	}
 
 	/**
-         * choose charset
-         *
-         * @param array $content
-         * @param array $sel_options
-         * @param array $readonlys
-         * @param array $preserv
-         * @return string template name
-         */
-        function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
-        {
-                if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
-                // return from step40
-                if ($content['step'] == 'wizard_step40') {
-                        switch (array_search('pressed', $content['button']))
-                        {
-                                case 'next':
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
-                                case 'previous' :
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
-                                case 'finish':
-                                        return 'wizard_finish';
-                                default :
-                                        return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
-                        }
-                }
-                // init step40
-                else
-                {
-                        $content['msg'] = $this->steps['wizard_step40'];
-                        $content['step'] = 'wizard_step40';
+	 * choose charset
+	 *
+	 * @param array $content
+	 * @param array $sel_options
+	 * @param array $readonlys
+	 * @param array $preserv
+	 * @return string template name
+	 */
+		function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
+		{
+				if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+				// return from step40
+				if ($content['step'] == 'wizard_step40') {
+						switch (array_search('pressed', $content['button']))
+						{
+								case 'next':
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+								case 'previous' :
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+								case 'finish':
+										return 'wizard_finish';
+								default :
+										return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+						}
+				}
+				// init step40
+				else
+				{
+						$content['msg'] = $this->steps['wizard_step40'];
+						$content['step'] = 'wizard_step40';
 			if(!$content['charset'] && $content['plugin_options']['charset']) {
-                                $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
-                        }
+								$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
+						}
 			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
-                        array(
-                                'user'  => lang('User preference'),
-                        );
+						array(
+								'user'  => lang('User preference'),
+						);
 			$preserv = $content;
 
-                        // Add in extra allowed charsets
-                        $config = config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
-                        {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
-                        }
+						// Add in extra allowed charsets
+						$config = config::read('importexport');
+						$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
+						if($extra_charsets)
+						{
+								$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+						}
 			unset ($preserv['button']);
-                        return $this->step_templates[$content['step']];
+						return $this->step_templates[$content['step']];
 		}
 	}
 

Spacing +9 added lines, -9 removed lines

@@ -36,19 +36,19 @@ 
          */
         function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
         {
-                if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+                if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
                 // return from step40
                 if ($content['step'] == 'wizard_step40') {
                         switch (array_search('pressed', $content['button']))
                         {
                                 case 'next':
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
                                 case 'previous' :
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
                                 case 'finish':
                                         return 'wizard_finish';
                                 default :
-                                        return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+                                        return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
                         }
                 }
                 // init step40
@@ -56,10 +56,10 @@ 
                 {
                         $content['msg'] = $this->steps['wizard_step40'];
                         $content['step'] = 'wizard_step40';
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
                                 $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
                         }
-			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
+			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets() +
                         array(
                                 'user'  => lang('User preference'),
                         );
@@ -67,10 +67,10 @@ 
 
                         // Add in extra allowed charsets
                         $config = config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
+                        $extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+                        if ($extra_charsets)
                         {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
                         }
 			unset ($preserv['button']);
                         return $this->step_templates[$content['step']];

addressbook/inc/class.addressbook_egw_record.inc.php

Braces +28 added lines, -14 removed lines

@@ -45,10 +45,12 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
 		$this->bocontacts = new Api\Contacts();
-		if($_identifier) {
+		if($_identifier)
+		{
 			$this->contact = $this->bocontacts->read($this->identifier);
 		}
 	}
@@ -58,7 +60,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->contact[$_attribute_name];
 	}
 
@@ -68,7 +71,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->contact[$_attribute_name] = $data;
 	}
 
@@ -80,7 +84,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->contact;
 	}
 
@@ -89,7 +94,8 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return $this->bocontacts->link_title(empty($this->contact) ? $this->identifier : $this->contact);
 	}
 
@@ -99,7 +105,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->contact = $_record;
 	}
 
@@ -108,7 +115,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier ? $this->identifier : $this->id;
 	}
 
@@ -118,7 +126,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		$ui = new addressbook_ui();
 
 		// Type as default
@@ -133,7 +142,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -144,7 +154,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but required by function signature
 	}
 
@@ -155,7 +166,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but required by function signature
 	}
 
@@ -163,7 +175,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -171,7 +184,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->bocontacts);
 	}
 }

Spacing +12 added lines, -12 removed lines

@@ -28,8 +28,8 @@ 
 
 	// Used in conversions
 	static $types = array(
-		'select-account' => array('owner','creator','modifier'),
-		'date-time' => array('modified','created','last_event','next_event'),
+		'select-account' => array('owner', 'creator', 'modifier'),
+		'date-time' => array('modified', 'created', 'last_event', 'next_event'),
 		'date' => array('bday'),
 		'select-cat' => array('cat_id'),
 		'select' => array('tid')
@@ -42,10 +42,10 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
 		$this->bocontacts = new addressbook_bo();
-		if($_identifier) {
+		if ($_identifier) {
 			$this->contact = $this->bocontacts->read($this->identifier);
 		}
 	}
@@ -96,7 +96,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->contact = $_record;
 	}
 
@@ -123,14 +123,14 @@ 
 		$ui->type_icon($this->owner, $this->private, $this->tid, $icon, $label);
 
 		// Specific photo
-		return $this->jpegphoto ? egw_framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):$icon;
+		return $this->jpegphoto ? egw_framework::link('/index.php', $ui->photo_src($this->identifier, $this->jpegphoto)) : $icon;
 	}
 	/**
 	 * saves record into backend
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -141,8 +141,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but required by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but required by function signature
 	}
 
 	/**
@@ -152,15 +152,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but required by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but required by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php

Braces +18 added lines, -8 removed lines

@@ -46,11 +46,13 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if(count($cat_list) > 0)
+		{
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach($bocontacts->customfields as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
@@ -75,7 +77,8 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if($content['field_mapping'][0] == lang('Categories'))
+		{
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
@@ -86,7 +89,10 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -108,19 +114,23 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options'])
+			{
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
 			$bocontacts = new Api\Contacts();
 			$sel_options['contact_owner'] = array('personal' => lang("Importer's personal")) + $bocontacts->get_addressbooks(Acl::ADD);
-			if(!in_array('owner', $content['field_mapping'])) {
+			if(!in_array('owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}
 

Spacing +16 added lines, -16 removed lines

@@ -28,11 +28,11 @@ 
 		$bocontacts = new addressbook_bo();
 		$this->mapping_fields = $bocontacts->contact_fields;
 
-		$categories = new categories('','addressbook');
+		$categories = new categories('', 'addressbook');
 		$cat_list = array();
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true,0,true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true, 0, true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if (categories::is_global($cat))
 			{
@@ -43,14 +43,14 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if (count($cat_list) > 0) {
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach ($bocontacts->customfields as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
-		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
+		unset($this->mapping_fields['jpegphoto']); // can't cvs import that
 		
 		// Add in special handled fields
 		$this->mapping_fields[lang('Special')] = addressbook_import_contacts_csv::$special_fields;
@@ -72,18 +72,18 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if ($content['field_mapping'][0] == lang('Categories')) {
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" . lang('Contact ID cannot be changed by import');
+		$content['msg'] .= "\n*".lang('Contact ID cannot be changed by import');
 		
 		return $result;
 	}
 	
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if ($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -91,13 +91,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -105,19 +105,19 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if (!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
 			$bocontacts = new addressbook_bo();
 			$sel_options['contact_owner'] = array('personal' => lang("Importer's personal")) + $bocontacts->get_addressbooks(EGW_ACL_ADD);
-			if(!in_array('owner', $content['field_mapping'])) {
+			if (!in_array('owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}
 

infolog/inc/class.infolog_customfields.inc.php

Braces +24 added lines, -6 removed lines

@@ -109,25 +109,34 @@ 
 				unset($this->fields[$old_name]);
 				continue;
 			}
-			if (isset($field['name']) && empty($name) && ($create || !empty($old_name)))	// empty name not allowed
+			if (isset($field['name']) && empty($name) && ($create || !empty($old_name)))
+			{
+				// empty name not allowed
 			{
 				$content['error_msg'] = lang('Name must not be empty !!!');
 			}
+			}
 			if (isset($field['old_name']))
 			{
-				if (!empty($name) && $old_name != $name)	// renamed
+				if (!empty($name) && $old_name != $name)
+				{
+					// renamed
 				{
 					unset($this->fields[$old_name]);
 				}
+				}
 				elseif (empty($name))
 				{
 					$name = $old_name;
 				}
 			}
-			elseif (empty($name))		// new item and empty ==> ignore it
+			elseif (empty($name))
+			{
+				// new item and empty ==> ignore it
 			{
 				continue;
 			}
+			}
 			$values = array();
 			if (!empty($field['values']))
 			{
@@ -193,15 +202,21 @@ 
 				unset($this->status[$typ][$old_name]);
 				continue;
 			}
-			if (isset($stat['name']) && empty($name) && ($create || !empty($old_name)))	// empty name not allowed
+			if (isset($stat['name']) && empty($name) && ($create || !empty($old_name)))
+			{
+				// empty name not allowed
 			{
 				$content['error_msg'] = lang('Name must not be empty !!!');
 			}
+			}
 			if (isset($stat['old_name']))
 			{
-				if (!empty($name) && $old_name != $name)	// renamed
+				if (!empty($name) && $old_name != $name)
+				{
+					// renamed
 				{
 					unset($this->status[$typ][$old_name]);
+				}
 
 					if ($default == $old_name)
 					{
@@ -213,10 +228,13 @@ 
 					$name = $old_name;
 				}
 			}
-			elseif (empty($name))		// new item and empty ==> ignore it
+			elseif (empty($name))
+			{
+				// new item and empty ==> ignore it
 			{
 				continue;
 			}
+			}
 			$this->status[$typ][$name] = empty($stat['label']) ? $name : $stat['label'];
 		}
 		$this->status['defaults'][$typ] = empty($default) ? $name : $default;

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  * @version $Id$
  */
 
-require_once(EGW_INCLUDE_ROOT . '/admin/inc/class.customfields.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/admin/inc/class.customfields.inc.php');
 /**
  * Administration of custom fields, type and status
  */
@@ -46,7 +46,7 @@ 
 		$this->status = &$this->bo->status;
 		$this->config_data = config::read('infolog');
 		$this->fields = &$this->bo->customfields;
-		$this->group_owners =& $this->bo->group_owners;
+		$this->group_owners = & $this->bo->group_owners;
 	}
 
 
@@ -56,7 +56,7 @@ 
 	protected function app_index(&$content, &$sel_options, &$readonlys, &$preserve)
 	{
 		$n = 0;
-		foreach($this->status[$this->content_type] as $name => $label)
+		foreach ($this->status[$this->content_type] as $name => $label)
 		{
 			$content['content_type_options']['status'][++$n] = array(
 				'name'     => $name,
@@ -95,7 +95,7 @@ 
 			unset($fields['delete']);
 		}
 
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			$name = trim($field['name']);
 			$old_name = $field['old_name'];
@@ -127,9 +127,9 @@ 
 			$values = array();
 			if (!empty($field['values']))
 			{
-				foreach(explode("\n",$field['values']) as $line)
+				foreach (explode("\n", $field['values']) as $line)
 				{
-					list($var,$value) = explode('=',trim($line),2);
+					list($var, $value) = explode('=', trim($line), 2);
 					$var = trim($var);
 					$values[$var] = empty($value) ? $var : $value;
 				}
@@ -148,15 +148,15 @@ 
 		}
 		if (!function_exists('sort_by_order'))
 		{
-			function sort_by_order($arr1,$arr2)
+			function sort_by_order($arr1, $arr2)
 			{
 				return $arr1['order'] - $arr2['order'];
 			}
 		}
-		uasort($this->fields,sort_by_order);
+		uasort($this->fields, sort_by_order);
 
 		$n = 0;
-		foreach($this->fields as $name => $data)
+		foreach ($this->fields as $name => $data)
 		{
 			$this->fields[$name]['order'] = ($n += 10);
 		}
@@ -179,7 +179,7 @@ 
 			unset($status['delete']);
 		}
 
-		foreach($status as $stat)
+		foreach ($status as $stat)
 		{
 			$name = trim($stat['name']);
 			$old_name = $stat['old_name'];
@@ -260,16 +260,16 @@ 
 		$new_name = trim($content['content_types']['name']);
 		if (empty($new_name))
 		{
-			$this->tmpl->set_validation_error('content_types[name]','You have to enter a name, to create a new type!!!');
+			$this->tmpl->set_validation_error('content_types[name]', 'You have to enter a name, to create a new type!!!');
 			return false;
 		}
 		else
 		{
-			foreach($this->content_types as $letter => $name)
+			foreach ($this->content_types as $letter => $name)
 			{
-				if($name == $new_name)
+				if ($name == $new_name)
 				{
-					$this->tmpl->set_validation_error('content_types[name]',lang("type '%1' already exists !!!",$new_name));
+					$this->tmpl->set_validation_error('content_types[name]', lang("type '%1' already exists !!!", $new_name));
 					return false;
 				}
 			}
@@ -289,11 +289,11 @@ 
 	function save_repository()
 	{
 		// save changes to repository
-		config::save_value('types',$this->content_types,'infolog');
+		config::save_value('types', $this->content_types, 'infolog');
 		//echo '<p>'.__METHOD__.'() \$this->status=<pre style="text-aling: left;">'; print_r($this->status); echo "</pre>\n";
-		config::save_value('status',$this->status,'infolog');
+		config::save_value('status', $this->status, 'infolog');
 		//echo '<p>'.__METHOD__.'() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		egw_customfields::save('infolog', $this->fields);
-		config::save_value('group_owners',$this->group_owners,'infolog');
+		config::save_value('group_owners', $this->group_owners, 'infolog');
 	}
 }

infolog/inc/class.infolog_merge.inc.php

Braces +50 added lines, -12 removed lines

@@ -76,7 +76,10 @@ 
 			{
 				$replacements += $this->contact_replacements($replacements['$$info_link$$']['id'],'info_contact');
 			}
-			if(is_array($replacements['$$info_link$$'])) unset($replacements['$$info_link$$']);
+			if(is_array($replacements['$$info_link$$']))
+			{
+				unset($replacements['$$info_link$$']);
+			}
 		}
 		return $replacements;
 	}
@@ -99,7 +102,10 @@ 
 		foreach($_selects as $name => $value)
 		{
 			$selects['info_'.$name] = $value;
-			if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
+			if(!in_array('info_'.$name, $types['select']))
+			{
+				$types['select'][] = 'info_'.$name;
+			}
 		}
 
 		if($content && strpos($content, '$$#') !== FALSE)
@@ -152,7 +158,10 @@ 
 		// Add markers
 		foreach($array as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 
@@ -183,16 +192,29 @@ 
 		Api\Translation::add_app('projectmanager');
 		foreach($fields as $name => $label)
 		{
-			if (in_array($name,array('custom'))) continue;	// dont show them
+			if (in_array($name,array('custom')))
+			{
+				continue;
+			}
+			// dont show them
 
-			if (in_array($name,array('info_subject', 'info_des')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('info_subject', 'info_des')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -201,7 +223,10 @@ 
 		foreach($this->bo->customfields as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*':'')."</td></tr>\n";
-			if($field['type'] == 'select-account') $contact_custom = true;
+			if($field['type'] == 'select-account')
+			{
+				$contact_custom = true;
+			}
 		}
 		if($contact_custom)
 		{
@@ -215,16 +240,29 @@ 
 		$i = 0;
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;       // dont show them, as they are not used in the UI atm.
+			if (in_array($name,array('tid','label','geo')))
+			{
+				continue;
+			}
+			// dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)         // main values, which should be in the first column
+			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 					echo "</tr>\n";
+			}
 					$i++;
 			}
-			if (!($i&1)) echo '<tr>';
+			if (!($i&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{info_contact/'.$name.'}}</td><td>'.$label.'</td>';
-			if ($i&1) echo "</tr>\n";
+			if ($i&1)
+			{
+				echo "</tr>\n";
+			}
 			$i++;
 		}
 

Spacing +35 added lines, -35 removed lines

@@ -60,20 +60,20 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->infolog_replacements($id, '', $content)))
 		{
 			return false;
 		}
-		if (!(strpos($content,'$$info_contact/') === false))
+		if (!(strpos($content, '$$info_contact/') === false))
 		{
 			// Check to see if it's actually a contact, then load
-			if(is_array($replacements['$$info_link$$']) && $replacements['$$info_link$$']['app'] == 'addressbook')
+			if (is_array($replacements['$$info_link$$']) && $replacements['$$info_link$$']['app'] == 'addressbook')
 			{
-				$replacements += $this->contact_replacements($replacements['$$info_link$$']['id'],'info_contact');
+				$replacements += $this->contact_replacements($replacements['$$info_link$$']['id'], 'info_contact');
 			}
-			if(is_array($replacements['$$info_link$$'])) unset($replacements['$$info_link$$']);
+			if (is_array($replacements['$$info_link$$'])) unset($replacements['$$info_link$$']);
 		}
 		return $replacements;
 	}
@@ -85,7 +85,7 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function infolog_replacements($id,$prefix='', &$content = '')
+	public function infolog_replacements($id, $prefix = '', &$content = '')
 	{
 		$record = new infolog_egw_record($id);
 		$info = array();
@@ -93,33 +93,33 @@ 
 		// Convert to human friendly values
 		$types = infolog_egw_record::$types;
 		$_selects = $this->bo->enums + array('status' => $this->bo->status[$record->info_type]);
-		foreach($_selects as $name => $value)
+		foreach ($_selects as $name => $value)
 		{
 			$selects['info_'.$name] = $value;
-			if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
+			if (!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($record->get_record_array(), $content, $info);
 		}
 
 		importexport_export_csv::convert($record, $types, 'infolog', $selects);
-		if($record->info_contact)
+		if ($record->info_contact)
 		{
 			$array['info_contact'] = $array['info_link']['title'];
 		}
 
 		// Set any missing custom fields, or the marker will stay
 		$array = $record->get_record_array();
-		foreach($this->bo->customfields as $name => $field)
+		foreach ($this->bo->customfields as $name => $field)
 		{
-			if(!$array['#'.$name])
+			if (!$array['#'.$name])
 			{
 				$array['#'.$name] = '';
 			}
 			// Format date cfs per user preferences
-			if($field['type'] == 'date' || $field['type'] == 'date-time')
+			if ($field['type'] == 'date' || $field['type'] == 'date-time')
 			{
 				$this->date_fields[] = '#'.$name;
 				$array['#'.$name] = egw_time::to($array['#'.$name], $field['type'] == 'date' ? true : '');
@@ -130,16 +130,16 @@ 
 		$array += $this->get_all_links('infolog', $id, $prefix, $content);
 
 		// Timesheet time
-		if(strpos($content, 'info_sum_timesheets'))
+		if (strpos($content, 'info_sum_timesheets'))
 		{
-			$links = egw_link::get_links('infolog',$id,'timesheet');
-			$sum = ExecMethod('timesheet.timesheet_bo.sum',$links);
+			$links = egw_link::get_links('infolog', $id, 'timesheet');
+			$sum = ExecMethod('timesheet.timesheet_bo.sum', $links);
 			$info['$$info_sum_timesheets$$'] = $sum['duration'];
 		}
 
 		// Check for linked project ID
 		$links = egw_link::get_links('infolog', $id, 'projectmanager');
-		foreach($links as $app_id)
+		foreach ($links as $app_id)
 		{
 			$array['pm_id'] = $app_id;
 			$array['project'] = egw_link::title('projectmanager', $app_id);
@@ -147,14 +147,14 @@ 
 		}
 
 		// Add markers
-		foreach($array as $key => &$value)
+		foreach ($array as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 
 		// Add parent
-		if($record->info_id_parent)
+		if ($record->info_id_parent)
 		{
 			$info += $this->infolog_replacements($record->info_id_parent, 'info_id_parent', $content);
 		}
@@ -178,11 +178,11 @@ 
 		$tracking = new infolog_tracking($this->bo);
 		$fields = array('info_id' => lang('Infolog ID'), 'pm_id' => lang('Project ID'), 'project' => lang('Project name')) + $tracking->field2label + array('info_sum_timesheets' => lang('Used time'));
 		translation::add_app('projectmanager');
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
-			if (in_array($name,array('custom'))) continue;	// dont show them
+			if (in_array($name, array('custom'))) continue; // dont show them
 
-			if (in_array($name,array('info_subject', 'info_des')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('info_subject', 'info_des')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -195,26 +195,26 @@ 
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
 		$contact_custom = false;
-		foreach($this->bo->customfields as $name => $field)
+		foreach ($this->bo->customfields as $name => $field)
 		{
-			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*':'')."</td></tr>\n";
-			if($field['type'] == 'select-account') $contact_custom = true;
+			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*' : '')."</td></tr>\n";
+			if ($field['type'] == 'select-account') $contact_custom = true;
 		}
-		if($contact_custom)
+		if ($contact_custom)
 		{
-			echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available'). '</td></tr>';
+			echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available').'</td></tr>';
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Parent').":</h3></td></tr>";
-		echo '<tr><td>{{info_id_parent/info_subject}}</td><td colspan="3">'.lang('All other %1 fields are valid',lang('infolog'))."</td></tr>\n";
+		echo '<tr><td>{{info_id_parent/info_subject}}</td><td colspan="3">'.lang('All other %1 fields are valid', lang('infolog'))."</td></tr>\n";
 
 		echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>';
 		$i = 0;
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;       // dont show them, as they are not used in the UI atm.
+			if (in_array($name, array('tid', 'label', 'geo'))) continue; // dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)         // main values, which should be in the first column
+			if (in_array($name, array('email', 'org_name', 'tel_work', 'url')) && $n&1)         // main values, which should be in the first column
 			{
 					echo "</tr>\n";
 					$i++;
@@ -226,13 +226,13 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->contacts->customfields as $name => $field)
+		foreach ($this->contacts->customfields as $name => $field)
 		{
 				echo '<tr><td>{{info_contact/#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),

infolog/inc/class.infolog_bo.inc.php

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

@@ -1272,7 +1272,7 @@
 	 * @param array $options Array of options for the search
 	 * @return array with info_id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$query = array(
 			'search' => $pattern,

Doc Comments +1 added lines, -4 removed lines

@@ -1240,7 +1240,7 @@ 
 	 * Is called as hook to participate in the linking
 	 *
 	 * @param int|array $info int info_id or array with infolog entry
-	 * @return string|boolean string with the title, null if $info not found, false if no perms to view
+	 * @return string string with the title, null if $info not found, false if no perms to view
 	 */
 	function link_title($info)
 	{
@@ -1338,9 +1338,6 @@ 
 	/**
 	 * hook called be calendar to include events or todos in the cal-dayview
 	 *
-	 * @param int $args[year], $args[month], $args[day] date of the events
-	 * @param int $args[owner] owner of the events
-	 * @param string $args[location] calendar_include_{events|todos}
 	 * @return array of events (array with keys starttime, endtime, title, view, icon, content)
 	 */
 	function cal_to_include($args)

Indentation +15 added lines, -15 removed lines

@@ -700,20 +700,20 @@ 
 	}
 
 	/**
-	* writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0
-	*
-	* checks and asures ACL
-	*
-	* @param array &$values values to write
-	* @param boolean $check_defaults = true check and set certain defaults
-	* @param boolean|int $touch_modified = true touch the modification date and sets the modifier's user-id, 2: only modifier
-	* @param boolean $user2server = true conversion between user- and server-time necessary
-	* @param boolean $skip_notification = false true = do NOT send notification, false (default) = send notifications
-	* @param boolean $throw_exception = false Throw an exception (if required fields are not set)
-	* @param string $purge_cfs = null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
-	*
-	* @return int|boolean info_id on a successfull write or false
-	*/
+	 * writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0
+	 *
+	 * checks and asures ACL
+	 *
+	 * @param array &$values values to write
+	 * @param boolean $check_defaults = true check and set certain defaults
+	 * @param boolean|int $touch_modified = true touch the modification date and sets the modifier's user-id, 2: only modifier
+	 * @param boolean $user2server = true conversion between user- and server-time necessary
+	 * @param boolean $skip_notification = false true = do NOT send notification, false (default) = send notifications
+	 * @param boolean $throw_exception = false Throw an exception (if required fields are not set)
+	 * @param string $purge_cfs = null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
+	 *
+	 * @return int|boolean info_id on a successfull write or false
+	 */
 	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
 		$skip_notification=false, $throw_exception=false, $purge_cfs=null)
 	{
@@ -750,7 +750,7 @@ 
 			}
 		}
 		if ($values['info_id'] && !$this->check_access($values['info_id'],EGW_ACL_EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],EGW_ACL_ADD))
+			!$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],EGW_ACL_ADD))
 		{
 			return false;
 		}

Spacing +243 added lines, -244 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-define('EGW_ACL_UNDELETE',EGW_ACL_CUSTOM_1);	// undelete right
+define('EGW_ACL_UNDELETE', EGW_ACL_CUSTOM_1); // undelete right
 
 /**
  * This class is the BO-layer of InfoLog
@@ -32,7 +32,7 @@ 
 	 */
 	var $total;
 	var $vfs;
-	var $vfs_basedir='/infolog';
+	var $vfs_basedir = '/infolog';
 	/**
 	 * Set Logging
 	 *
@@ -57,13 +57,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $timestamps = array('info_startdate','info_enddate','info_datemodified','info_datecompleted','info_created');
+	var $timestamps = array('info_startdate', 'info_enddate', 'info_datemodified', 'info_datecompleted', 'info_created');
 	/**
 	 * fields the responsible user can change
 	 *
 	 * @var array
 	 */
-	var $responsible_edit=array('info_status','info_percent','info_datecompleted');
+	var $responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 	/**
 	 * Fields to exclude from copy, if an entry is copied, the ones below are excluded by default.
 	 *
@@ -87,19 +87,19 @@ 
 	 *
 	 * @var string
 	 */
-	var $implicit_rights='read';
+	var $implicit_rights = 'read';
 	/**
 	 * Custom fields read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Group owners for certain types read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $group_owners=array();
+	var $group_owners = array();
 	/**
 	 * Current user
 	 *
@@ -166,55 +166,55 @@ 
 	function __construct($info_id = 0)
 	{
 		$this->enums = $this->stock_enums = array(
-			'priority' => array (
+			'priority' => array(
 				3 => 'urgent',
 				2 => 'high',
 				1 => 'normal',
 				0 => 'low'
 			),
 			'confirm'   => array(
-				'not' => 'not','accept' => 'accept','finish' => 'finish',
+				'not' => 'not', 'accept' => 'accept', 'finish' => 'finish',
 				'both' => 'both' ),
 			'type'      => array(
-				'task' => 'task','phone' => 'phone','note' => 'note','email' => 'email'
+				'task' => 'task', 'phone' => 'phone', 'note' => 'note', 'email' => 'email'
 			/*	,'confirm' => 'confirm','reject' => 'reject','fax' => 'fax' not implemented so far */ )
 		);
 		$this->status = $this->stock_status = array(
 			'defaults' => array(
-				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done','email' => 'done'),
+				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done', 'email' => 'done'),
 			'task' => array(
-				'offer' => 'offer',				// -->  NEEDS-ACTION
-				'not-started' => 'not-started',	// iCal NEEDS-ACTION
-				'ongoing' => 'ongoing',			// iCal IN-PROCESS
-				'done' => 'done',				// iCal COMPLETED
-				'cancelled' => 'cancelled',		// iCal CANCELLED
-				'billed' => 'billed',			// -->  DONE
-				'template' => 'template',		// -->  cancelled
-				'nonactive' => 'nonactive',		// -->  cancelled
-				'archive' => 'archive' ), 		// -->  cancelled
+				'offer' => 'offer', // -->  NEEDS-ACTION
+				'not-started' => 'not-started', // iCal NEEDS-ACTION
+				'ongoing' => 'ongoing', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'cancelled' => 'cancelled', // iCal CANCELLED
+				'billed' => 'billed', // -->  DONE
+				'template' => 'template', // -->  cancelled
+				'nonactive' => 'nonactive', // -->  cancelled
+				'archive' => 'archive' ), // -->  cancelled
 			'phone' => array(
-				'not-started' => 'call',		// iCal NEEDS-ACTION
-				'ongoing' => 'will-call',		// iCal IN-PROCESS
-				'done' => 'done', 				// iCal COMPLETED
-				'billed' => 'billed' ),			// -->  DONE
+				'not-started' => 'call', // iCal NEEDS-ACTION
+				'ongoing' => 'will-call', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'billed' => 'billed' ), // -->  DONE
 			'note' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 			'email' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 		);
 		if (($config_data = config::read('infolog')))
 		{
 			if (isset($config_data['status']) && is_array($config_data['status']))
 			{
-				foreach(array_keys($config_data['status']) as $key)
+				foreach (array_keys($config_data['status']) as $key)
 				{
 					if (!is_array($this->status[$key]))
 					{
 						$this->status[$key] = array();
 					}
-					$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
+					$this->status[$key] = array_merge($this->status[$key], (array)$config_data['status'][$key]);
 				}
 			}
 			if (isset($config_data['types']) && is_array($config_data['types']))
@@ -229,10 +229,10 @@ 
 			$this->customfields = egw_customfields::get('infolog');
 			if ($this->customfields)
 			{
-				foreach($this->customfields as $name => $field)
+				foreach ($this->customfields as $name => $field)
 				{
 					// old infolog customefield record
-					if(empty($field['type']))
+					if (empty($field['type']))
 					{
 						if (count($field['values'])) $field['type'] = 'select'; // selectbox
 						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
@@ -244,23 +244,23 @@ 
 						$save_config = true;
 					}
 				}
-				if ($save_config) config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config) config::save_value('customfields', $this->customfields, 'infolog');
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
-				$this->responsible_edit = array_merge($this->responsible_edit,$config_data['responsible_edit']);
+				$this->responsible_edit = array_merge($this->responsible_edit, $config_data['responsible_edit']);
 			}
 			if (is_array($config_data['copy_excludefields']))
 			{
-				$this->copy_excludefields = array_merge($this->copy_excludefields,$config_data['copy_excludefields']);
+				$this->copy_excludefields = array_merge($this->copy_excludefields, $config_data['copy_excludefields']);
 			}
 			if (is_array($config_data['sub_excludefields']) && $config_data['sub_excludefields'])
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$config_data['sub_excludefields']);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $config_data['sub_excludefields']);
 			}
 			else
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$this->default_sub_excludefields);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $this->default_sub_excludefields);
 			}
 			if ($config_data['implicit_rights'] == 'edit')
 			{
@@ -269,7 +269,7 @@ 
 			$this->history = $config_data['history'];
 		}
 		// sort types by there translation
-		foreach($this->enums['type'] as $key => $val)
+		foreach ($this->enums['type'] as $key => $val)
 		{
 			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
 		}
@@ -278,14 +278,14 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->now = time();
-		$this->user_time_now = egw_time::server2user($this->now,'ts');
+		$this->user_time_now = egw_time::server2user($this->now, 'ts');
 
-		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
+		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
 		$this->so = new infolog_so($this->grants);
 
 		if ($info_id)
 		{
-			$this->read( $info_id );
+			$this->read($info_id);
 		}
 		else
 		{
@@ -300,14 +300,14 @@ 
 	 * @param boolean $links = false if true check only customfields containing links, default false = all custom fields
 	 * @return boolean True if there are customfields for $typ, else False
 	 */
-	function has_customfields($type,$links=false)
+	function has_customfields($type, $links = false)
 	{
 		if ($links) $link_types = customfields_widget::get_customfield_link_types();
 
-		foreach($this->customfields as $field)
+		foreach ($this->customfields as $field)
 		{
-			if ((!$type || empty($field['type2']) || in_array($type,is_array($field['type2']) ? $field['type2'] : explode(',',$field['type2']))) &&
-				(!$links || in_array($field['type'],$link_types)))
+			if ((!$type || empty($field['type2']) || in_array($type, is_array($field['type2']) ? $field['type2'] : explode(',', $field['type2']))) &&
+				(!$links || in_array($field['type'], $link_types)))
 			{
 				return True;
 			}
@@ -324,7 +324,7 @@ 
 	 * @param int $user = null user whos rights to check, default current user
 	 * @return boolean
 	 */
-	function check_access($info,$required_rights,$other=0,$user=null)
+	function check_access($info, $required_rights, $other = 0, $user = null)
 	{
 		static $cache = array();
 
@@ -334,17 +334,17 @@ 
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id) $access = & $cache[$info_id][$required_rights]; // we only cache the current user!
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true, $user);
 		}
 		if (!$info)
 		{
 			$owner = $other ? $other : $user;
 			$grant = $grants[$owner];
-			return $grant & $required_rights;
+			return $grant&$required_rights;
 		}
 
 
@@ -356,10 +356,10 @@ 
 				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
 
 				if ($info['info_status'] == 'deleted' &&
-					($required_rights == EGW_ACL_EDIT ||		// no edit rights for deleted entries
-					 $required_rights == EGW_ACL_ADD  ||		// no add rights for deleted entries
+					($required_rights == EGW_ACL_EDIT || // no edit rights for deleted entries
+					 $required_rights == EGW_ACL_ADD || // no add rights for deleted entries
 					 $required_rights == EGW_ACL_DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user != $this->user))))	// delete only for admins
 				{
 					$access = false;
 				}
@@ -367,12 +367,12 @@ 
 				{
 					if ($info['info_status'] != 'deleted')
 					{
-						$access = false;	// can only undelete deleted items
+						$access = false; // can only undelete deleted items
 					}
 					else
 					{
 						// undelete requires edit rights
-						$access = $this->so->check_access( $info,EGW_ACL_EDIT,$this->implicit_rights == 'edit',$grants,$user );
+						$access = $this->so->check_access($info, EGW_ACL_EDIT, $this->implicit_rights == 'edit', $grants, $user);
 					}
 				}
 			}
@@ -382,7 +382,7 @@ 
 			}
 			if (!isset($access))
 			{
-				$access = $this->so->check_access( $info,$required_rights,$this->implicit_rights == 'edit',$grants,$user );
+				$access = $this->so->check_access($info, $required_rights, $this->implicit_rights == 'edit', $grants, $user);
 			}
 		}
 		// else $cached = ' (from cache)';
@@ -417,12 +417,12 @@ 
 	 * @param string $not_id = '' id to exclude
 	 * @return boolean True if we have a linked item, False otherwise
 	 */
-	function link_id2from(&$info,$not_app='',$not_id='')
+	function link_id2from(&$info, $not_app = '', $not_id = '')
 	{
 		//echo "<p>boinfolog::link_id2from(subject='$info[info_subject]', link_id='$info[info_link_id]', from='$info[info_from]', not_app='$not_app', not_id='$not_id')";
 
 		if ($info['info_link_id'] > 0 &&
-			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
+			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) || // use supplied links info
 			 ($link = egw_link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
@@ -436,11 +436,11 @@ 
 				$app = $link['link_app'.$nr];
 				$id  = $link['link_id'.$nr];
 			}
-			$title = egw_link::title($app,$id);
+			$title = egw_link::title($app, $id);
 
 			if ((string)$info['info_custom_from'] === '')	// old entry
 			{
-				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
+				$info['info_custom_from'] = (int)($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
 			if (!$info['info_custom_from'])
 			{
@@ -462,7 +462,7 @@ 
 			return $info['blur_title'] = $title;
 		}
 		$info['info_link'] = array('title' => $info['info_from']);
-		$info['info_link_id'] = 0;	// link might have been deleted
+		$info['info_link_id'] = 0; // link might have been deleted
 		$info['info_custom_from'] = (int)!!$info['info_from'];
 
 		return False;
@@ -473,7 +473,7 @@ 
 	 */
 	static function subject_from_des($des)
 	{
-		return substr($des,0,60).' ...';
+		return substr($des, 0, 60).' ...';
 	}
 
 	/**
@@ -488,7 +488,7 @@ 
 	 * 			or NULL for timestamps in user-time
 	 * 			or false for timestamps in server-time
 	 */
-	 function time2time(&$values, $fromTZId=false, $toTZId=null)
+	 function time2time(&$values, $fromTZId = false, $toTZId = null)
 	 {
 
 		if ($fromTZId === $toTZId) return;
@@ -529,7 +529,7 @@ 
 			$toTZ = egw_time::$server_timezone;
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.egw_time::$user_timezone->getName());
-	 	foreach($this->timestamps as $key)
+	 	foreach ($this->timestamps as $key)
 		{
 		 	if ($values[$key])
 		 	{
@@ -538,14 +538,14 @@ 
 			 	if ($time->format('Hi') == '0000')
 			 	{
 				 	// we keep dates the same in new timezone
-				 	$arr = egw_time::to($time,'array');
+				 	$arr = egw_time::to($time, 'array');
 				 	$time = new egw_time($arr, $toTZ);
 			 	}
 			 	else
 			 	{
 				 	$time->setTimezone($toTZ);
 			 	}
-			 	$values[$key] = egw_time::to($time,'ts');
+			 	$values[$key] = egw_time::to($time, 'ts');
 		 	}
 		}
 		//error_log(__METHOD__.'() --> values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']));
@@ -558,11 +558,11 @@ 
 	 * @param string $date_format = 'ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return egw_time::server2user($ts,$date_format);
+		return egw_time::server2user($ts, $date_format);
 	}
 
 	/**
@@ -577,10 +577,10 @@ 
 	 *
 	 * @return array|boolean infolog entry, null if not found or false if no permission to read it
 	 */
-	function &read($info_id,$run_link_id2from=true,$date_format='ts',$ignore_acl=false)
+	function &read($info_id, $run_link_id2from = true, $date_format = 'ts', $ignore_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($info_id).', '.array2string($run_link_id2from).", '$date_format') ".function_backtrace());
-		if (is_scalar($info_id) || isset($info_id[count($info_id)-1]))
+		if (is_scalar($info_id) || isset($info_id[count($info_id) - 1]))
 		{
 			if (is_scalar($info_id) && !is_numeric($info_id))
 			{
@@ -596,9 +596,9 @@ 
 		{
 			return null;
 		}
-		$info_id = $data['info_id'];	// in case the uid was specified
+		$info_id = $data['info_id']; // in case the uid was specified
 
-		if (!$ignore_acl && !$this->check_access($data,EGW_ACL_READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data, EGW_ACL_READ))	// check behind read, to prevent a double read
 		{
 			return False;
 		}
@@ -630,7 +630,7 @@ 
 	 * @param boolean $skip_notification Do not send notification of delete
 	 * @return boolean True if delete was successful, False otherwise ($info_id does not exist or no rights)
 	 */
-	function delete($info_id,$delete_children=False,$new_parent=False, $skip_notification=False)
+	function delete($info_id, $delete_children = False, $new_parent = False, $skip_notification = False)
 	{
 		if (is_array($info_id))
 		{
@@ -640,18 +640,18 @@ 
 		{
 			return False;
 		}
-		if (!$this->check_access($info,EGW_ACL_DELETE))
+		if (!$this->check_access($info, EGW_ACL_DELETE))
 		{
 			return False;
 		}
 		// check if we have children and delete or re-parent them
 		if (($children = $this->so->get_children($info_id)))
 		{
-			foreach($children as $id => $owner)
+			foreach ($children as $id => $owner)
 			{
-				if ($delete_children && $this->so->grants[$owner] & EGW_ACL_DELETE)
+				if ($delete_children && $this->so->grants[$owner]&EGW_ACL_DELETE)
 				{
-					$this->delete($id,$delete_children,$new_parent,$skip_notification);	// call ourself recursive to delete the child
+					$this->delete($id, $delete_children, $new_parent, $skip_notification); // call ourself recursive to delete the child
 				}
 				else	// dont delete or no rights to delete the child --> re-parent it
 				{
@@ -670,30 +670,30 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted') return false; // entry already deleted
 
 			$this->so->write($deleted);
 
-			egw_link::unlink(0,'infolog',$info_id,'','!file','',true);	// keep the file attachments, hide the rest
+			egw_link::unlink(0, 'infolog', $info_id, '', '!file', '', true); // keep the file attachments, hide the rest
 		}
 		else
 		{
-			$this->so->delete($info_id,false);	// we delete the children via bo to get all notifications!
+			$this->so->delete($info_id, false); // we delete the children via bo to get all notifications!
 
-			egw_link::unlink(0,'infolog',$info_id);
+			egw_link::unlink(0, 'infolog', $info_id);
 		}
 		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
 		{
 			$GLOBALS['egw']->contenthistory->updateTimeStamp('infolog_'.$info['info_type'], $info_id, 'delete', time());
 
 			// send email notifications and do the history logging
-			if(!$skip_notification)
+			if (!$skip_notification)
 			{
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
 				}
-				$this->tracking->track($deleted,$info,$this->user,true);
+				$this->tracking->track($deleted, $info, $this->user, true);
 			}
 		}
 		return True;
@@ -714,13 +714,13 @@ 
 	*
 	* @return int|boolean info_id on a successfull write or false
 	*/
-	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
-		$skip_notification=false, $throw_exception=false, $purge_cfs=null)
+	function write(&$values_in, $check_defaults = true, $touch_modified = true, $user2server = true,
+		$skip_notification = false, $throw_exception = false, $purge_cfs = null)
 	{
 		$values = $values_in;
 		//echo "boinfolog::write()values="; _debug_array($values);
-		if (!$values['info_id'] && !$this->check_access(0,EGW_ACL_EDIT,$values['info_owner']) &&
-			!$this->check_access(0,EGW_ACL_ADD,$values['info_owner']))
+		if (!$values['info_id'] && !$this->check_access(0, EGW_ACL_EDIT, $values['info_owner']) &&
+			!$this->check_access(0, EGW_ACL_ADD, $values['info_owner']))
 		{
 			return false;
 		}
@@ -730,7 +730,7 @@ 
 			$old = $this->read($values['info_id'], false, 'server');
 		}
 
-		if (($status_only = $values['info_id'] && !$this->check_access($values,EGW_ACL_EDIT)))
+		if (($status_only = $values['info_id'] && !$this->check_access($values, EGW_ACL_EDIT)))
 		{
 			if (!isset($values['info_responsible']))
 			{
@@ -742,31 +742,31 @@ 
 			}
 			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
 			{
-				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
+				$status_only = !!array_intersect((array)$responsible, array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
-				$status_only = $undelete = $this->check_access($values['info_id'],EGW_ACL_UNDELETE);
+				$status_only = $undelete = $this->check_access($values['info_id'], EGW_ACL_UNDELETE);
 			}
 		}
-		if ($values['info_id'] && !$this->check_access($values['info_id'],EGW_ACL_EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],EGW_ACL_ADD))
+		if ($values['info_id'] && !$this->check_access($values['info_id'], EGW_ACL_EDIT) && !$status_only ||
+		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'], EGW_ACL_ADD))
 		{
 			return false;
 		}
 		
 		// Make sure status is still valid if the type changes
-		if($old['info_type'] != $values['info_type'] && $values['info_status'])
+		if ($old['info_type'] != $values['info_type'] && $values['info_status'])
 		{
-			if(!in_array($values['info_status'], array_keys($this->status[$values['info_type']])))
+			if (!in_array($values['info_status'], array_keys($this->status[$values['info_type']])))
 			{
 				$values['info_status'] = $this->status['defaults'][$values['info_type']];
 			}
 		}
 		if ($status_only && !$undelete)	// make sure only status gets writen
 		{
-			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
-				in_array($values['info_status'],array('done','billed','cancelled'));
+			$set_completed = !$values['info_datecompleted'] && // set date completed of finished job, only if its not already set
+				in_array($values['info_status'], array('done', 'billed', 'cancelled'));
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
@@ -781,7 +781,7 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) {
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
 					if (isset($this->status[$values['info_type']]['done'])) {
@@ -795,19 +795,19 @@ 
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) $values['info_status'] = $status;
 			}
 			$check_defaults = false;
 		}
 		if ($check_defaults)
 		{
 			if (!$values['info_datecompleted'] &&
-				(in_array($values['info_status'],array('done','billed'))))
+				(in_array($values['info_status'], array('done', 'billed'))))
 			{
-				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now;	// set date completed to today if status == done
+				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now; // set date completed to today if status == done
 			}
 			// Check for valid status / percent combinations
-			if (in_array($values['info_status'],array('done','billed')))
+			if (in_array($values['info_status'], array('done', 'billed')))
 			{
 				$values['info_percent'] = 100;
 			}
@@ -822,7 +822,7 @@ 
 				// We change percent to match status, not status to match percent
 				$values['info_percent'] = 10;
 			}
-			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled','archive')))
+			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'], array('done', 'billed', 'cancelled', 'archive')))
 			{
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
@@ -843,7 +843,7 @@ 
 			}
 			if ($values['info_responsible'] && $values['info_status'] == 'offer')
 			{
-				$values['info_status'] = 'not-started';   // have to match if not finished
+				$values['info_status'] = 'not-started'; // have to match if not finished
 			}
 			if (isset($values['info_subject']) && empty($values['info_subject']))
 			{
@@ -851,18 +851,18 @@ 
 			}
 
 			// Check required custom fields
-			if($throw_exception)
+			if ($throw_exception)
 			{
 				$custom = egw_customfields::get('infolog');
-				foreach($custom as $c_name => $c_field)
+				foreach ($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
-					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
+					if ($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',', $c_field['type2']);
+					if ($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'], $type2)))
 					{
 						// Required custom field
-						if(!$values['#'.$c_name])
+						if (!$values['#'.$c_name])
 						{
-							throw new egw_exception_wrong_userinput(lang('For infolog type %1, %2 is required',lang($values['info_type']),$c_field['label']));
+							throw new egw_exception_wrong_userinput(lang('For infolog type %1, %2 is required', lang($values['info_type']), $c_field['label']));
 						}
 					}
 				}
@@ -871,16 +871,16 @@ 
 		if (isset($this->group_owners[$values['info_type']]))
 		{
 			$values['info_owner'] = $this->group_owners[$values['info_type']];
-			if (!($this->grants[$this->group_owners[$values['info_type']]] & EGW_ACL_EDIT))
+			if (!($this->grants[$this->group_owners[$values['info_type']]]&EGW_ACL_EDIT))
 			{
-				if (!$this->check_access($values['info_id'],EGW_ACL_EDIT) ||
-					!$values['info_id'] && !$this->check_access($values,EGW_ACL_ADD)
+				if (!$this->check_access($values['info_id'], EGW_ACL_EDIT) ||
+					!$values['info_id'] && !$this->check_access($values, EGW_ACL_ADD)
 				)
 				{
-					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
+					return false; // no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
-			$values['info_access'] = 'public';	// group-owners are allways public
+			$values['info_access'] = 'public'; // group-owners are allways public
 		}
 		elseif (!$values['info_id'] && !$values['info_owner'] || $GLOBALS['egw']->accounts->get_type($values['info_owner']) == 'g')
 		{
@@ -955,23 +955,23 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
+			if (!array_key_exists('info_responsible', $values)) $values['info_responsible'] = $old['info_responsible'];
 			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
 			{
-				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+				$values['info_responsible'] = $values['info_responsible'] ? explode(',', $values['info_responsible']) : array();
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 			// create (and remove) links in custom fields
-			customfields_widget::update_customfield_links('infolog',$values,$old,'info_id');
+			customfields_widget::update_customfield_links('infolog', $values, $old, 'info_id');
 
 			// Check for restore of deleted entry, restore held links
-			if($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
+			if ($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
 			{
 				egw_link::restore('infolog', $info_id);
 			}
 
 			// notify the link-class about the update, as other apps may be subscribt to it
-			egw_link::notify_update('infolog',$info_id,$values);
+			egw_link::notify_update('infolog', $info_id, $values);
 
 			// pre-cache the new values
 			self::set_link_cache($values);
@@ -982,42 +982,42 @@ 
 				$this->tracking = new infolog_tracking($this);
 			}
 
-			if ($old && ($missing_fields = array_diff_key($old,$values)))
+			if ($old && ($missing_fields = array_diff_key($old, $values)))
 			{
 				// Some custom fields (multiselect with nothing selected) will be missing,
 				// and that's OK.  Don't put them back.
-				foreach(array_keys($missing_fields) as $field)
+				foreach (array_keys($missing_fields) as $field)
 				{
-					if(array_key_exists($field, $values_in))
+					if (array_key_exists($field, $values_in))
 					{
 						unset($missing_fields[$field]);
 					}
 				}
-				$values = array_merge($values,$missing_fields);
+				$values = array_merge($values, $missing_fields);
 			}
 			// Add keys missing in the $to_write array
-			if (($missing_fields = array_diff_key($values,$to_write)))
+			if (($missing_fields = array_diff_key($values, $to_write)))
 			{
-				$to_write = array_merge($to_write,$missing_fields);
+				$to_write = array_merge($to_write, $missing_fields);
 			}
-			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
-				null,$skip_notification);
+			$this->tracking->track($to_write, $old, $this->user, $values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
+				null, $skip_notification);
 
 			if ($info_from_set) $values['info_from'] = '';
 
 			// Change new values back to user time before sending them back
-			if($user2server)
+			if ($user2server)
 			{
 				$this->time2time($values);
 			}
 			// merge changes (keeping extra values from the UI)
-			$values_in = array_merge($values_in,$values);
+			$values_in = array_merge($values_in, $values);
 
 			// Update modified timestamp of parent
-			if($values['info_id_parent'])
+			if ($values['info_id_parent'])
 			{
-				$parent = $this->read($values['info_id_parent'], false, 'server',true);
-				$this->write($parent,false, true, false, true);
+				$parent = $this->read($values['info_id_parent'], false, 'server', true);
+				$this->write($parent, false, true, false, true);
 			}
 		}
 		return $info_id;
@@ -1029,9 +1029,9 @@ 
 	 * @param int|array $info_id id
 	 * @return int|array number of subs
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
-		return $this->so->anzSubs( $info_id );
+		return $this->so->anzSubs($info_id);
 	}
 
 	/**
@@ -1051,19 +1051,19 @@ 
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 
-		if($query['filter'] == 'bydate')
+		if ($query['filter'] == 'bydate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'private')
 		{
-			$query['col_filter'][] = 'info_access = ' . $GLOBALS['egw']->db->quote('private');
+			$query['col_filter'][] = 'info_access = '.$GLOBALS['egw']->db->quote('private');
 		}
 		if (!isset($query['date_format']) || $query['date_format'] != 'server')
 		{
@@ -1073,7 +1073,7 @@ 
 				{
 					if (!empty($query['col_filter'][$key]))
 					{
-						$query['col_filter'][$key] = egw_time::user2server($query['col_filter'][$key],'ts');
+						$query['col_filter'][$key] = egw_time::user2server($query['col_filter'][$key], 'ts');
 					}
 				}
 			}
@@ -1086,7 +1086,7 @@ 
 		{
 			foreach ($ret as $id => &$data)
 			{
-				if (!$this->check_access($data,EGW_ACL_READ))
+				if (!$this->check_access($data, EGW_ACL_READ))
 				{
 					unset($ret[$id]);
 					continue;
@@ -1102,7 +1102,7 @@ 
 							if ($time->format('Hi') == '0000')
 							{
 								// we keep dates the same in user-time
-								$arr = egw_time::to($time,'array');
+								$arr = egw_time::to($time, 'array');
 								$time = new egw_time($arr, egw_time::$user_timezone);
 							}
 							else
@@ -1110,7 +1110,7 @@ 
 								$time->setTimezone(egw_time::$user_timezone);
 							}
 						}
-						$data[$key] = egw_time::to($time,'ts');
+						$data[$key] = egw_time::to($time, 'ts');
 					}
 				}
 				// pre-cache title and file access
@@ -1127,7 +1127,7 @@ 
 	 * @param array $filter = array('filter'=>'own','info_type'=>'task')
 	 * @return string
 	 */
-	public function getctag(array $filter=array('filter'=>'own','info_type'=>'task'))
+	public function getctag(array $filter = array('filter'=>'own', 'info_type'=>'task'))
 	{
 		$filter += array(
 			'order'			=> 'info_datemodified',
@@ -1139,7 +1139,7 @@ 
 		// we need to query deleted entries too for a ctag!
 		$filter['filter'] .= '+deleted';
 
-		$result =& $this->search($filter);
+		$result = & $this->search($filter);
 
 		if (empty($result)) return 'EGw-empty-wGE';
 
@@ -1161,12 +1161,12 @@ 
 	 * @param string $_date
 	 * @return array $content array for uiinfolog
 	 */
-	function import_mail($_addresses,$_subject,$_message,$_attachments,$_date)
+	function import_mail($_addresses, $_subject, $_message, $_attachments, $_date)
 	{
-		foreach($_addresses as $address)
+		foreach ($_addresses as $address)
 		{
 			$names[] = $address['name'];
-			$emails[] =$address['email'];
+			$emails[] = $address['email'];
 		}
 		
 		$type = isset($this->enums['type']['email']) ? 'email' : 'note';
@@ -1174,8 +1174,8 @@ 
 		$info = array(
 			'info_id' => 0,
 			'info_type' => $type,
-			'info_from' => implode(', ',$names),
-			'info_addr' => implode(', ',$emails),
+			'info_from' => implode(', ', $names),
+			'info_addr' => implode(', ', $emails),
 			'info_subject' => $_subject,
 			'info_des' => $_message,
 			'info_startdate' => egw_time::server2user($_date),
@@ -1194,16 +1194,16 @@ 
 		$contacts = array();
 		foreach ($emails as $mailadr)
 		{
-			$contacts = array_merge($contacts,(array)$addressbook->search(
+			$contacts = array_merge($contacts, (array)$addressbook->search(
 				array(
 					'email' => $mailadr,
 					'email_home' => $mailadr
-				),True,'','','',false,'OR',false,null,'',false));
+				), True, '', '', '', false, 'OR', false, null, '', false));
 		}
 		if (!$contacts || !is_array($contacts) || !is_array($contacts[0]))
 		{
-			$info['msg'] = lang('Attention: No Contact with address %1 found.',$info['info_addr']);
-			$info['info_custom_from'] = true;	// show the info_from line and NOT only the link
+			$info['msg'] = lang('Attention: No Contact with address %1 found.', $info['info_addr']);
+			$info['info_custom_from'] = true; // show the info_from line and NOT only the link
 		}
 		else
 		{
@@ -1213,21 +1213,21 @@ 
 			// create the rest a "ordinary" links
 			foreach ($contacts as $contact)
 			{
-				egw_link::link('infolog',$info['link_to']['to_id'],'addressbook',$contact['id']);
+				egw_link::link('infolog', $info['link_to']['to_id'], 'addressbook', $contact['id']);
 			}
 		}
 		if (is_array($_attachments))
 		{
 			foreach ($_attachments as $attachment)
 			{
-				if($attachment['egw_data'])
+				if ($attachment['egw_data'])
 				{
-					egw_link::link('infolog',$info['link_to']['to_id'],egw_link::DATA_APPNAME,  $attachment);
+					egw_link::link('infolog', $info['link_to']['to_id'], egw_link::DATA_APPNAME, $attachment);
 				}
-				else if(is_readable($attachment['tmp_name']) ||
+				else if (is_readable($attachment['tmp_name']) ||
 					(egw_vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 				{
-					egw_link::link('infolog',$info['link_to']['to_id'],'file',  $attachment);
+					egw_link::link('infolog', $info['link_to']['to_id'], 'file', $attachment);
 				}
 			}
 		}
@@ -1246,14 +1246,14 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->read( $info,false );
+			$info = $this->read($info, false);
 		}
 		if (!$info)
 		{
 			return $info;
 		}
-		$title = !empty($info['info_subject']) ? $info['info_subject'] :self::subject_from_des($info['info_descr']);
-		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id']?' (#'.$info['info_id'].')':'');
+		$title = !empty($info['info_subject']) ? $info['info_subject'] : self::subject_from_des($info['info_descr']);
+		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id'] ? ' (#'.$info['info_id'].')' : '');
 	}
 
 	/**
@@ -1264,15 +1264,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		foreach ($this->search($params=array(
+		foreach ($this->search($params = array(
 			'col_filter' => array('info_id' => $ids),
 		)) as $info)
 		{
 			$titles[$info['info_id']] = $this->link_title($info);
 		}
-		foreach (array_diff($ids,array_keys($titles)) as $id)
+		foreach (array_diff($ids, array_keys($titles)) as $id)
 		{
-			$titles[$id] = false;	// we assume every not returned entry to be not readable, as we notify the link class about all deletes
+			$titles[$id] = false; // we assume every not returned entry to be not readable, as we notify the link class about all deletes
 		}
 		return $titles;
 	}
@@ -1299,7 +1299,7 @@ 
 		$content = array();
 		if (is_array($ids))
 		{
-			foreach(array_keys($ids) as $id)
+			foreach (array_keys($ids) as $id)
 			{
 				$content[$id] = $this->link_title($id);
 			}
@@ -1316,10 +1316,10 @@ 
 	 * @param int $user = null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used
-		return $this->check_access($id,$check,0,$user);
+		unset($rel_path); // not used
+		return $this->check_access($id, $check, 0, $user);
 	}
 
 	/**
@@ -1329,10 +1329,9 @@ 
 	 */
 	function set_link_cache(array $info)
 	{
-		egw_link::set_cache('infolog',$info['info_id'],
+		egw_link::set_cache('infolog', $info['info_id'],
 			$this->link_title($info),
-			$this->file_access($info,EGW_ACL_EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT :
-			($this->file_access($info,EGW_ACL_READ) ? EGW_ACL_READ : 0));
+			$this->file_access($info, EGW_ACL_EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT : ($this->file_access($info, EGW_ACL_READ) ? EGW_ACL_READ : 0));
 	}
 
 	/**
@@ -1346,8 +1345,8 @@ 
 	function cal_to_include($args)
 	{
 		//echo "<p>cal_to_include("; print_r($args); echo ")</p>\n";
-		$user = (int) $args['owner'];
-		if ($user <= 0 && !checkdate($args['month'],$args['day'],$args['year']))
+		$user = (int)$args['owner'];
+		if ($user <= 0 && !checkdate($args['month'], $args['day'], $args['year']))
 		{
 			return False;
 		}
@@ -1355,7 +1354,7 @@ 
 
 		$do_events = $args['location'] == 'calendar_include_events';
 		$to_include = array();
-		$date_wanted = sprintf('%04d/%02d/%02d',$args['year'],$args['month'],$args['day']);
+		$date_wanted = sprintf('%04d/%02d/%02d', $args['year'], $args['month'], $args['day']);
 		$query = array(
 			'order' => 'info_startdate',
 			'sort'  => $do_events ? 'ASC' : 'DESC',
@@ -1364,32 +1363,32 @@ 
 		);
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] || $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] === '0')
 		{
-			$query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
+			$query['col_filter']['info_type'] = explode(',', $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
 		}
 		elseif ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom'])
 		{
-			$query['col_filter']['info_type'] = array('task','phone','note','email');
+			$query['col_filter']['info_type'] = array('task', 'phone', 'note', 'email');
 		}
 		while ($infos = $this->search($query))
 		{
 			foreach ($infos as $info)
 			{
-				$start = new egw_time($info['info_startdate'],egw_time::$user_timezone);
-				$title = ($do_events?common::formattime($start->format('H'),$start->format('i')).' ':'').
+				$start = new egw_time($info['info_startdate'], egw_time::$user_timezone);
+				$title = ($do_events ? common::formattime($start->format('H'), $start->format('i')).' ' : '').
 					$info['info_subject'];
-				$view = egw_link::view('infolog',$info['info_id']);
+				$view = egw_link::view('infolog', $info['info_id']);
 				$size = null;
-				$edit = egw_link::edit('infolog',$info['info_id'], $size);
+				$edit = egw_link::edit('infolog', $info['info_id'], $size);
 				$edit['size'] = $size;
-				$content=array();
+				$content = array();
 				foreach ($icons = array(
 					$info['info_type']   => 'infolog',
 					$this->status[$info['info_type']][$info['info_status']] => 'infolog',
 				) as $name => $app)
 				{
-					$content[] = html::image($app,$name,lang($name),'border="0" width="15" height="15"').' ';
+					$content[] = html::image($app, $name, lang($name), 'border="0" width="15" height="15"').' ';
 				}
-				$content[] = html::a_href($title,$view);
+				$content[] = html::a_href($title, $view);
 				$html = html::table(array(1 => $content));
 
 				$to_include[] = array(
@@ -1402,9 +1401,9 @@ 
 					'content'   => $html,
 				);
 			}
-			if ($query['total'] <= ($query['start']+=count($infos)))
+			if ($query['total'] <= ($query['start'] += count($infos)))
 			{
-				break;	// no more availible
+				break; // no more availible
 			}
 		}
 		//echo "boinfolog::cal_to_include("; print_r($args); echo ")<pre>"; print_r($to_include); echo "</pre>\n";
@@ -1427,7 +1426,7 @@ 
 				'cols' => 'info_id,info_type,info_status,info_percent,info_id_parent',
 			);
 			$infos = array();
-			foreach($this->search($query) as $row)
+			foreach ($this->search($query) as $row)
 			{
 				$infos[$row['info_id']] = array(
 					'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
@@ -1436,13 +1435,13 @@ 
 						'ongoing' : 'infolog/'.$row['info_status'],
 					'class'  => $row['info_id_parent'] ? 'infolog_rowHasParent' : null,
 				);
-				if (common::image('infolog', $icon=$row['info_type'].'_element') ||
-					common::image('infolog', $icon=$row['info_type']))
+				if (common::image('infolog', $icon = $row['info_type'].'_element') ||
+					common::image('infolog', $icon = $row['info_type']))
 				{
 					$infos[$row['info_id']]['icon'] = 'infolog/'.$icon;
 				}
 			}
-			foreach($this->anzSubs(array_keys($infos)) as $info_id => $subs)
+			foreach ($this->anzSubs(array_keys($infos)) as $info_id => $subs)
 			{
 				if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
 			}
@@ -1461,18 +1460,18 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $info_id=-1)
+	function find_or_add_categories($catname_list, $info_id = -1)
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new categories($this->user,'infolog');
+			$this->categories = new categories($this->user, 'infolog');
 		}
 		$old_cats_preserve = array();
 		if ($info_id && $info_id > 0)
 		{
 			// preserve categories without users read access
 			$old_infolog = $this->read($info_id);
-			$old_categories = explode(',',$old_infolog['info_cat']);
+			$old_categories = explode(',', $old_infolog['info_cat']);
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
 				foreach ($old_categories as $cat_id)
@@ -1533,15 +1532,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new categories($this->user,'infolog');
+			$this->categories = new categories($this->user, 'infolog');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(EGW_ACL_READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -1568,20 +1567,20 @@ 
 
 		$save_account_id = $GLOBALS['egw_info']['user']['account_id'];
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
-		foreach($users as $user)
+		foreach ($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user, 'account_email'))) continue;
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->preferences($user);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 			$GLOBALS['egw']->acl->acl($user);
 			$GLOBALS['egw']->acl->read_repository();
-			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-			$this->so = new infolog_so($this->grants);	// so caches it's filters
+			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
+			$this->so = new infolog_so($this->grants); // so caches it's filters
 
 			$notified_info_ids = array();
-			foreach(array(
+			foreach (array(
 				'notify_due_responsible'   => 'open-responsible-enddate',
 				'notify_due_delegated'     => 'open-delegated-enddate',
 				'notify_start_responsible' => 'open-responsible-date',
@@ -1590,44 +1589,44 @@ 
 			{
 				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
 
-				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
+				$filter .= date('Y-m-d', time() + 24 * 60 * 60 * (int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
 
 				$params = array('filter' => $filter, 'custom_fields' => true, 'subs' => true);
-				foreach($this->so->search($params) as $info)
+				foreach ($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'], $notified_info_ids)) continue;
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
 						$this->tracking = new infolog_tracking($this);
 					}
-					switch($pref)
+					switch ($pref)
 					{
 						case 'notify_due_responsible':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_due_delegated':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_start_responsible':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 						case 'notify_start_delegated':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 					}
 					//error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
-					$this->tracking->send_notification($info,null,$email,$user,$pref);
+					$this->tracking->send_notification($info, null, $email, $user, $pref);
 
 					$notified_info_ids[] = $info['info_id'];
 				}
@@ -1690,7 +1689,7 @@ 
 	 * @param string $x_infolog_status preserved original infolog status
 	 * @return string
 	 */
-	function vtodo2status($vtodo_status,$x_infolog_status=null)
+	function vtodo2status($vtodo_status, $x_infolog_status = null)
 	{
 		$vtodo_status = strtoupper($vtodo_status);
 
@@ -1714,7 +1713,7 @@ 
 	 * @param array &$icons = null on return name of icons
 	 * @return array value => (commaseparated) translations
 	 */
-	function get_status($type=null, array &$icons=null)
+	function get_status($type = null, array &$icons = null)
 	{
 		// if filtered by type, show only the stati of the filtered type
 		if ($type && isset($this->status[$type]))
@@ -1724,16 +1723,16 @@ 
 		else	// show all stati
 		{
 			$statis = $icons = array();
-			foreach($this->status as $t => $stati)
+			foreach ($this->status as $t => $stati)
 			{
 				if ($t === 'defaults') continue;
-				foreach($stati as $val => $label)
+				foreach ($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
 					if (!isset($icons[$val])) $icons[$val] = $label;
 				}
 			}
-			foreach($statis as $val => &$labels)
+			foreach ($statis as $val => &$labels)
 			{
 				$labels = implode(', ', $labels);
 			}
@@ -1749,7 +1748,7 @@ 
 	 */
 	function activate($info)
 	{
-		switch((int)$info['info_percent'])
+		switch ((int)$info['info_percent'])
 		{
 			case 0:		return 'not-started';
 			case 100:	return 'done';
@@ -1768,8 +1767,8 @@ 
 		#Horde::logMessage("getParentID($_guid)",  __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		$parentID = False;
-		$myfilter = array('col_filter' => array('info_uid'=>$_guid)) ;
-		if ($_guid && ($found=$this->search($myfilter)) && ($uidmatch = array_shift($found)))
+		$myfilter = array('col_filter' => array('info_uid'=>$_guid));
+		if ($_guid && ($found = $this->search($myfilter)) && ($uidmatch = array_shift($found)))
 		{
 			$parentID = $uidmatch['info_id'];
 		}
@@ -1786,7 +1785,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function findInfo($infoData, $relax=false, $tzid=null)
+	function findInfo($infoData, $relax = false, $tzid = null)
 	{
 		$foundInfoLogs = array();
 		$filter = array();
@@ -1794,7 +1793,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX, ': 'EXACT, ') . $tzid . ')[InfoData]:'
+				. '('.($relax ? 'RELAX, ' : 'EXACT, ').$tzid.')[InfoData]:'
 				. array2string($infoData));
 		}
 
@@ -1813,9 +1812,9 @@ 
 		if (!$relax && !empty($infoData['info_uid']))
 		{
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
-			foreach($this->so->search($filter) as $egwData)
+			foreach ($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+				if (!$this->check_access($egwData, EGW_ACL_READ)) continue;
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -1843,7 +1842,7 @@ 
 				$text = '';
 				foreach ($matches as $chunk)
 				{
-					if (strlen($text) <  strlen($chunk[0]))
+					if (strlen($text) < strlen($chunk[0]))
 					{
 						$text = $chunk[0];
 					}
@@ -1867,7 +1866,7 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+			if (!$this->check_access($egwData, EGW_ACL_READ)) continue;
 
 			switch ($infoData['info_type'])
 			{
@@ -1884,7 +1883,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[location mismatch]: '
-								. $infoData['info_location'] . ' <> ' . $egwData['info_location']);
+								. $infoData['info_location'].' <> '.$egwData['info_location']);
 						}
 						continue;
 					}
@@ -1901,7 +1900,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[description mismatch]: '
-								. $infoData['info_des'] . ' <> ' . $egwData['info_des']);
+								. $infoData['info_des'].' <> '.$egwData['info_des']);
 						}
 						continue;
 					}
@@ -1915,7 +1914,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[FOUND]:' . array2string($foundInfoLogs));
+					. '()[FOUND]:'.array2string($foundInfoLogs));
 			}
 			return $foundInfoLogs;
 		}
@@ -1940,7 +1939,7 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+			if (!$this->check_access($egwData, EGW_ACL_READ)) continue;
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1952,7 +1951,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[category mismatch]: '
-						. $infoData['info_cat'] . ' <> ' . $egwData['info_cat']);
+						. $infoData['info_cat'].' <> '.$egwData['info_cat']);
 				}
 				continue;
 			}
@@ -1962,15 +1961,15 @@ 
 				if (isset($egwData['info_startdate']) && $egwData['info_startdate'])
 				{
 					// We compare the date only
-					$taskTime = new egw_time($infoData['info_startdate'],egw_time::$server_timezone);
-					$egwTime = new egw_time($egwData['info_startdate'],egw_time::$server_timezone);
+					$taskTime = new egw_time($infoData['info_startdate'], egw_time::$server_timezone);
+					$egwTime = new egw_time($egwData['info_startdate'], egw_time::$server_timezone);
 					if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 					{
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[start mismatch]: '
-								. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+								. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 						}
 						continue;
 					}
@@ -1997,7 +1996,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 							. '()[status mismatch]: '
-							. $infoData['info_status'] . ' <> ' . $egwData['info_status']);
+							. $infoData['info_status'].' <> '.$egwData['info_status']);
 					}
 					continue;
 				}
@@ -2007,15 +2006,15 @@ 
 					if (isset($egwData['info_enddate']) && $egwData['info_enddate'])
 					{
 						// We compare the date only
-						$taskTime = new egw_time($infoData['info_enddate'],egw_time::$server_timezone);
-						$egwTime = new egw_time($egwData['info_enddate'],egw_time::$server_timezone);
+						$taskTime = new egw_time($infoData['info_enddate'], egw_time::$server_timezone);
+						$egwTime = new egw_time($egwData['info_enddate'], egw_time::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[DUE mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2036,15 +2035,15 @@ 
 					if (isset($egwData['info_datecompleted']) && $egwData['info_datecompleted'])
 					{
 						// We compare the date only
-						$taskTime = new egw_time($infoData['info_datecompleted'],egw_time::$server_timezone);
-						$egwTime = new egw_time($egwData['info_datecompleted'],egw_time::$server_timezone);
+						$taskTime = new egw_time($infoData['info_datecompleted'], egw_time::$server_timezone);
+						$egwTime = new egw_time($egwData['info_datecompleted'], egw_time::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[completed mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2074,7 +2073,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]:' . array2string($foundInfoLogs));
+				. '()[FOUND]:'.array2string($foundInfoLogs));
 		}
 		return $foundInfoLogs;
 	}

Braces +207 added lines, -57 removed lines

@@ -224,7 +224,10 @@ 
 				$this->enums['type'] += $config_data['types'];
 				//echo "types:<pre>"; print_r($this->enums['type']); echo "</pre>\n";
 			}
-			if ($config_data['group_owners']) $this->group_owners = $config_data['group_owners'];
+			if ($config_data['group_owners'])
+			{
+				$this->group_owners = $config_data['group_owners'];
+			}
 
 			$this->customfields = egw_customfields::get('infolog');
 			if ($this->customfields)
@@ -234,17 +237,35 @@ 
 					// old infolog customefield record
 					if(empty($field['type']))
 					{
-						if (count($field['values'])) $field['type'] = 'select'; // selectbox
-						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
-						elseif (intval($field['len']) > 0) $field['type'] = 'text'; // regular input field
-						else $field['type'] = 'label'; // header-row
+						if (count($field['values']))
+						{
+							$field['type'] = 'select';
+						}
+						// selectbox
+						elseif ($field['rows'] > 1)
+						{
+							$field['type'] = 'textarea';
+						}
+						// textarea
+						elseif (intval($field['len']) > 0)
+						{
+							$field['type'] = 'text';
+						}
+						// regular input field
+						else {
+							$field['type'] = 'label';
+						}
+						// header-row
 						$field['type2'] = $field['typ'];
 						unset($field['typ']);
 						$this->customfields[$name] = $field;
 						$save_config = true;
 					}
 				}
-				if ($save_config) config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config)
+				{
+					config::save_value('customfields',$this->customfields,'infolog');
+				}
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
@@ -271,7 +292,10 @@ 
 		// sort types by there translation
 		foreach($this->enums['type'] as $key => $val)
 		{
-			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
+			if (($val = lang($key)) != $key.'*')
+			{
+				$this->enums['type'][$key] = lang($key);
+			}
 		}
 		natcasesort($this->enums['type']);
 
@@ -302,7 +326,10 @@ 
 	 */
 	function has_customfields($type,$links=false)
 	{
-		if ($links) $link_types = customfields_widget::get_customfield_link_types();
+		if ($links)
+		{
+			$link_types = customfields_widget::get_customfield_link_types();
+		}
 
 		foreach($this->customfields as $field)
 		{
@@ -330,11 +357,18 @@ 
 
 		$info_id = is_array($info) ? $info['info_id'] : $info;
 
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id)
+			{
+				$access =& $cache[$info_id][$required_rights];
+			}
+			// we only cache the current user!
 		}
 		else
 		{
@@ -353,16 +387,22 @@ 
 			// handle delete for the various history modes
 			if ($this->history)
 			{
-				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
+				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id))))
+				{
+					return false;
+				}
 
 				if ($info['info_status'] == 'deleted' &&
 					($required_rights == EGW_ACL_EDIT ||		// no edit rights for deleted entries
 					 $required_rights == EGW_ACL_ADD  ||		// no add rights for deleted entries
 					 $required_rights == EGW_ACL_DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))
+				{
+					// delete only for admins
 				{
 					$access = false;
 				}
+				}
 				elseif ($required_rights == EGW_ACL_UNDELETE)
 				{
 					if ($info['info_status'] != 'deleted')
@@ -423,11 +463,14 @@ 
 
 		if ($info['info_link_id'] > 0 &&
 			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
-			 ($link = egw_link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
+			 ($link = egw_link::get_link($info['info_link_id'])) !== False))
+		{
+			// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
 			{
 				$app = $link['app'];
+		}
 				$id  = $link['id'];
 			}
 			else
@@ -438,10 +481,13 @@ 
 			}
 			$title = egw_link::title($app,$id);
 
-			if ((string)$info['info_custom_from'] === '')	// old entry
+			if ((string)$info['info_custom_from'] === '')
+			{
+				// old entry
 			{
 				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
+			}
 			if (!$info['info_custom_from'])
 			{
 				$info['info_from'] = '';
@@ -491,12 +537,15 @@ 
 	 function time2time(&$values, $fromTZId=false, $toTZId=null)
 	 {
 
-		if ($fromTZId === $toTZId) return;
+		if ($fromTZId === $toTZId)
+		{
+			return;
+		}
 
 		$tz = egw_time::$server_timezone;
 
 	 	if ($fromTZId)
-		{
+	 	{
 			if (!isset(self::$tz_cache[$fromTZId]))
 			{
 				self::$tz_cache[$fromTZId] = calendar_timezones::DateTimeZone($fromTZId);
@@ -530,7 +579,7 @@ 
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.egw_time::$user_timezone->getName());
 	 	foreach($this->timestamps as $key)
-		{
+	 	{
 		 	if ($values[$key])
 		 	{
 			 	$time = new egw_time($values[$key], $tz);
@@ -560,7 +609,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return egw_time::server2user($ts,$date_format);
 	}
@@ -598,16 +650,22 @@ 
 		}
 		$info_id = $data['info_id'];	// in case the uid was specified
 
-		if (!$ignore_acl && !$this->check_access($data,EGW_ACL_READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data,EGW_ACL_READ))
+		{
+			// check behind read, to prevent a double read
 		{
 			return False;
 		}
+		}
 
 		if ($data['info_subject'] == $this->subject_from_des($data['info_des']))
 		{
 			$data['info_subject'] = '';
 		}
-		if ($run_link_id2from) $this->link_id2from($data);
+		if ($run_link_id2from)
+		{
+			$this->link_id2from($data);
+		}
 
 		// convert server- to user-time
 		if ($date_format == 'ts')
@@ -670,7 +728,11 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted')
+			{
+				return false;
+			}
+			// entry already deleted
 
 			$this->so->write($deleted);
 
@@ -682,9 +744,12 @@ 
 
 			egw_link::unlink(0,'infolog',$info_id);
 		}
-		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
+		if ($info['info_status'] != 'deleted')
+		{
+			// dont notify of final purge of already deleted items
 		{
 			$GLOBALS['egw']->contenthistory->updateTimeStamp('infolog_'.$info['info_type'], $info_id, 'delete', time());
+		}
 
 			// send email notifications and do the history logging
 			if(!$skip_notification)
@@ -740,10 +805,13 @@ 
 			{
 				$responsible = $values['info_responsible'];
 			}
-			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
+			if (!($status_only = in_array($this->user, (array)$responsible)))
+			{
+				// responsible has implicit right to change status
 			{
 				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
+			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
 				$status_only = $undelete = $this->check_access($values['info_id'],EGW_ACL_UNDELETE);
@@ -763,17 +831,23 @@ 
 				$values['info_status'] = $this->status['defaults'][$values['info_type']];
 			}
 		}
-		if ($status_only && !$undelete)	// make sure only status gets writen
+		if ($status_only && !$undelete)
+		{
+			// make sure only status gets writen
 		{
 			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
 				in_array($values['info_status'],array('done','billed','cancelled'));
+		}
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
 			$values['info_datemodified'] = $values_in['info_datemodified'];
 			foreach ($this->responsible_edit as $name)
 			{
-				if (isset($values_in[$name])) $values[$name] = $values_in[$name];
+				if (isset($values_in[$name]))
+				{
+					$values[$name] = $values_in[$name];
+				}
 			}
 			if ($set_completed)
 			{
@@ -781,21 +855,30 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
-					if (isset($this->status[$values['info_type']]['done'])) {
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$forcestatus = true;
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$forcestatus = true;
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$forcestatus = true;
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
+					$values['info_status'] = $status;
+				}
 			}
 			$check_defaults = false;
 		}
@@ -827,14 +910,22 @@ 
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
 				$status = 'done';
-				if (isset($values['info_type'])) {
-					if (isset($this->status[$values['info_type']]['done'])) {
+				if (isset($values['info_type']))
+				{
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$status = 'cancelled';
-					} else {
+					}
+					else
+					{
 						// since the comlete stati above do not exist for that type, dont change it
 						$status = $values['info_status'];
 					}
@@ -856,7 +947,10 @@ 
 				$custom = egw_customfields::get('infolog');
 				foreach($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					if($c_field['type2'])
+					{
+						$type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					}
 					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
 					{
 						// Required custom field
@@ -875,8 +969,7 @@ 
 			{
 				if (!$this->check_access($values['info_id'],EGW_ACL_EDIT) ||
 					!$values['info_id'] && !$this->check_access($values,EGW_ACL_ADD)
-				)
-				{
+				) {
 					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
@@ -955,10 +1048,16 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
-			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
+			if (!array_key_exists('info_responsible',$values))
+			{
+				$values['info_responsible'] = $old['info_responsible'];
+			}
+			if (!is_array($values['info_responsible']))
+			{
+				// this should not happen, bug it does ;-)
 			{
 				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+			}
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 			// create (and remove) links in custom fields
@@ -1003,7 +1102,10 @@ 
 			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
 				null,$skip_notification);
 
-			if ($info_from_set) $values['info_from'] = '';
+			if ($info_from_set)
+			{
+				$values['info_from'] = '';
+			}
 
 			// Change new values back to user time before sending them back
 			if($user2server)
@@ -1053,13 +1155,25 @@ 
 
 		if($query['filter'] == 'bydate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'private')
 		{
@@ -1141,7 +1255,10 @@ 
 
 		$result =& $this->search($filter);
 
-		if (empty($result)) return 'EGw-empty-wGE';
+		if (empty($result))
+		{
+			return 'EGw-empty-wGE';
+		}
 
 		$entry = array_shift($result);
 
@@ -1188,7 +1305,10 @@ 
 				'to_id' => 0,
 			),
 		);
-		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default']) $info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'])
+		{
+			$info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		}
 		// find the addressbookentry to link with
 		$addressbook = new addressbook_bo();
 		$contacts = array();
@@ -1444,7 +1564,10 @@ 
 			}
 			foreach($this->anzSubs(array_keys($infos)) as $info_id => $subs)
 			{
-				if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+				if ($subs)
+				{
+					$infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+				}
 			}
 		}
 		return $infos;
@@ -1570,7 +1693,10 @@ 
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
 		foreach($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email')))
+			{
+				continue;
+			}
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->preferences($user);
@@ -1588,7 +1714,10 @@ 
 				'notify_start_delegated'   => 'open-delegated-date',
 			) as $pref => $filter)
 			{
-				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
+				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref]))
+				{
+					continue;
+				}
 
 				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
@@ -1597,7 +1726,10 @@ 
 				foreach($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'],$notified_info_ids))
+					{
+						continue;
+					}
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
@@ -1726,11 +1858,17 @@ 
 			$statis = $icons = array();
 			foreach($this->status as $t => $stati)
 			{
-				if ($t === 'defaults') continue;
+				if ($t === 'defaults')
+				{
+					continue;
+				}
 				foreach($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
-					if (!isset($icons[$val])) $icons[$val] = $label;
+					if (!isset($icons[$val]))
+					{
+						$icons[$val] = $label;
+					}
 				}
 			}
 			foreach($statis as $val => &$labels)
@@ -1806,7 +1944,10 @@ 
 			{
 				return array($egwData['info_id']);
 			}
-			if (!$relax) return array();
+			if (!$relax)
+			{
+				return array();
+			}
 		}
 		unset($infoData['info_id']);
 
@@ -1815,7 +1956,10 @@ 
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
 			foreach($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+				if (!$this->check_access($egwData,EGW_ACL_READ))
+				{
+					continue;
+				}
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -1867,7 +2011,10 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+			if (!$this->check_access($egwData,EGW_ACL_READ))
+			{
+				continue;
+			}
 
 			switch ($infoData['info_type'])
 			{
@@ -1940,7 +2087,10 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,EGW_ACL_READ)) continue;
+			if (!$this->check_access($egwData,EGW_ACL_READ))
+			{
+				continue;
+			}
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);