EGroupware / egroupware

resources/inc/class.resources_export_csv.inc.php

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

@@ -177,7 +177,7 @@
 	/**
 	 * Customize automatically generated filter fields
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';

Indentation +2 added lines, -2 removed lines

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

Spacing +27 added lines, -27 removed lines

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

Braces +25 added lines, -7 removed lines

@@ -71,11 +71,20 @@ 
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					{
+						continue;
+					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['col_filter'][] = "$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['col_filter'][] = "$field <= " . (int)$value['to'];
+					}
 					unset($query['col_filter'][$field]);
 				}
 			}
@@ -103,7 +112,10 @@ 
 
 		foreach ($selection as $record)
 		{
-			if(!is_array($record) || !$record['res_id']) continue;
+			if(!is_array($record) || !$record['res_id'])
+			{
+				continue;
+			}
 
 			if($need_custom)
 			{
@@ -121,7 +133,10 @@ 
 				// Implode arrays, so they don't say 'Array'
 				foreach($resource->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $resource->$key = implode(',', $value);
+					if(is_array($value))
+					{
+						$resource->$key = implode(',', $value);
+					}
 				}
  			}
 
@@ -199,7 +214,7 @@ 
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-    {
+	{
 		$this->selects = array();
     }
 
@@ -223,7 +238,10 @@ 
 		);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition)
 	{
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param $definition Specific definition
 	 *
-	 * @return array (
+	 * @return boolean (
 	 * 		name 		=> string,
 	 * 		content		=> array,
 	 * 		sel_options	=> array,

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

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

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

Spacing +13 added lines, -13 removed lines

@@ -28,7 +28,7 @@ 
 		$context['appname'] = 'resources';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->context['template'] = 'resources.show.rows';
 		$this->nm_settings += array(
@@ -52,9 +52,9 @@ 
 	{
 		$ui = new resources_ui();
 
-		$this->context['sel_options']['filter']= array(''=>lang('all categories'))+(array)$ui->bo->acl->get_cats(Acl::READ);
+		$this->context['sel_options']['filter'] = array(''=>lang('all categories')) + (array)$ui->bo->acl->get_cats(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);
 		}
@@ -92,28 +92,28 @@ 
 			if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
 			{
 				$msg = lang('You need to select some entries first!');
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\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);
 
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($content['nm']['selected'] as &$id)
+					Api\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
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+					Api\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);
-					Api\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);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 			}
 		}

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 +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param int $user=null account_id of user to use for Acl, default current user
+	 * @param integer $user
 	 */
 	function __construct($user=null)
 	{
@@ -681,7 +681,7 @@ 
 	/**
 	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
 	 * query infolog for entries matching $pattern
-	 * @param string|array $pattern if it's a string it is the string we will search for as a criteria, if it's an array we
+	 * @param string $pattern if it's a string it is the string we will search for as a criteria, if it's an array we
 	 * 	will seach for 'search' key in this array to get the string criteria. others keys handled are actually used
 	 *	for calendar disponibility.
 	 * @param array $options Array of options for the search
@@ -895,7 +895,7 @@ 
 	 * Cornelius Weiss <egw@von-und-zu-weiss.de>
 	 * @param array $file array with key => value
 	 * @param int $resource_id
-	 * @return mixed string with msg if somthing went wrong; nothing if all right
+	 * @return string|null string with msg if somthing went wrong; nothing if all right
 	 */
 	function save_picture($file,$resource_id)
 	{

Braces +92 added lines, -32 removed lines

@@ -105,9 +105,12 @@ 
 		{
 			Api\Cache::setSession('resources', 'index_nm', $query);
 		}
-		if ($query['store_state'])	// request to store state in session and filter in prefs?
+		if ($query['store_state'])
+		{
+			// request to store state in session and filter in prefs?
 		{
 			Api\Cache::setSession('resources',$query['store_state'],$query);
+		}
 			//echo "<p>".__METHOD__."() query[filter]=$query[filter], prefs[resources][filter]={$GLOBALS['egw_info']['user']['preferences']['resources']['filter']}</p>\n";
 			if ($query['filter'] != $GLOBALS['egw_info']['user']['preferences']['resources']['filter'])
 			{
@@ -115,7 +118,10 @@ 
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
-		if ($this->debug) _debug_array($query);
+		if ($this->debug)
+		{
+			_debug_array($query);
+		}
 		$read_onlys = 'res_id,name,short_description,quantity,useable,bookable,buyable,cat_id,location,storage_info';
 
 		$filter = array();
@@ -172,7 +178,8 @@ 
 			$filter['cat_id'] = array_keys($readcats);
 		}
 		// if there is no catfilter -> this means you have no rights, so set the cat filter to null
-		if (!isset($filter['cat_id']) || empty($filter['cat_id'])) {
+		if (!isset($filter['cat_id']) || empty($filter['cat_id']))
+		{
 			$filter['cat_id'] = NUll;
 		}
 
@@ -183,7 +190,10 @@ 
 		$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
 		$start = (int)$query['start'];
 
-		foreach ($filter as $k => $v) $query['col_filter'][$k] = $v;
+		foreach ($filter as $k => $v)
+		{
+			$query['col_filter'][$k] = $v;
+		}
 		$this->so->get_rows($query, $rows, $readonlys, $join, false, false, $extra_cols);
 		$nr = $this->so->total;
 
@@ -212,8 +222,7 @@ 
 			}
 			if (!$this->acl->is_permitted($resource['cat_id'],Acl::DELETE) ||
 				($resource['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history')
-			)
-			{
+			) {
 				$readonlys["delete[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_delete ';
 			}
@@ -251,7 +260,9 @@ 
 				{
 					$resource['accessories'][] = array('acc_id' => $acc_id, 'name' => $this->link_title($acc_id));
 				}
-			} elseif ($resource['accessory_of'] > 0) {
+			}
+			elseif ($resource['accessory_of'] > 0)
+			{
 				$resource['accessory_of_label'] = $this->link_title($resource['accessory_of']);
 			}
 
@@ -505,13 +516,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'];
 			}
 		}
@@ -560,7 +577,9 @@ 
 				if(count($resources) && !$options['exec'])
 				{
 					$_resources = array_map(
-						function($id) { return 'r'.$id;},
+						function($id)
+						{
+return 'r'.$id;},
 						array_keys($resources)
 					);
 					$list['cat-'.$cat_id] = array(
@@ -571,7 +590,13 @@ 
 				else if ($resources && $options['exec'])
 				{
 					array_map(
-						function($id,$name) use (&$list) { if(!$list[''.$id]) $list[''.$id] = $name;},
+						function($id,$name) use (&$list)
+						{
+if(!$list[''.$id])
+						{
+							$list[''.$id] = $name;
+						}
+						},
 						array_keys($resources), $resources
 					);
 				}
@@ -630,13 +655,18 @@ 
 				'name' => $this->acl->get_cat_name($cat_id),
 				'rights' => $this->acl->get_permissions($cat_id),
 				'resources' => array_map(
-					function($id) { return 'r'.$id;},
+					function($id)
+					{
+return 'r'.$id;},
 					array_keys($this->get_resources_by_category($cat_id))
 				)
 			));
 		}
 
-		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))
@@ -712,7 +742,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['cat_id'] && in_array($options['cat_id'], $filter['cat_id']))
@@ -741,11 +772,14 @@ 
 				}
 				$start = new Api\DateTime($cal_info['start']);
 				$startarr= getdate($start->format('ts'));
-				if (isset($cal_info['whole_day']) && $cal_info['whole_day']) {
+				if (isset($cal_info['whole_day']) && $cal_info['whole_day'])
+				{
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new Api\DateTime($startarr);
 					$end = $start->format('ts') + 86399;
-				} else {
+				}
+				else
+				{
 					$start = $start->format('ts');
 					$end = $start + ($cal_info['duration']);
 				}
@@ -757,7 +791,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'];
 					}
@@ -773,22 +808,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
@@ -802,11 +849,13 @@ 
 				}
 			}
 		}
-		if (isset($res_info_cache)) {
+		if (isset($res_info_cache))
+		{
 			$show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] !== 'resources_without_conflict';
 			// if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar
 			// so we'll loop on this one and not $data
-			foreach($res_info_cache as $id => $resource) {
+			foreach($res_info_cache as $id => $resource)
+			{
 				//maybe this resource is reserved
 				if ( ($resource['useable'] < 1) )
 				{
@@ -821,15 +870,20 @@ 
 							($resource['useable'] > 1 ? " ( {$resource['useable']} / {$resource['quantity']} )" : '');
 				}
 			}
-		} 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']);
 			}
 		}
@@ -848,7 +902,10 @@ 
 	{
 		if (!is_array($resource))
 		{
-			if (!($resource  = $this->read(array('res_id' => $resource)))) return $resource;
+			if (!($resource  = $this->read(array('res_id' => $resource))))
+			{
+				return $resource;
+			}
 		}
 		elseif (!$this->acl->is_permitted($resource['cat_id'],Acl::READ))
 		{
@@ -943,7 +1000,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'])
 		{

Spacing +151 added lines, -151 removed lines

@@ -81,7 +81,7 @@ 
 	 *
 	 * @param int $user=null account_id of user to use for Acl, default current user
 	 */
-	function __construct($user=null)
+	function __construct($user = null)
 	{
 		$this->so = new resources_so();
 		$this->acl = new resources_acl_bo($user);
@@ -89,8 +89,8 @@ 
 
 		$this->cal_right_transform = array(
 			resources_acl_bo::CAL_READ	=> Acl::READ,
-			resources_acl_bo::DIRECT_BOOKING 	=> Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE,
-			resources_acl_bo::CAT_ADMIN 	=> Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE,
+			resources_acl_bo::DIRECT_BOOKING 	=> Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE,
+			resources_acl_bo::CAT_ADMIN 	=> Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE,
 		);
 	}
 
@@ -99,19 +99,19 @@ 
 	 *
 	 * Cornelius Weiss <egw@von-und-zu-weiss.de>
 	 */
-	function get_rows($query,&$rows,&$readonlys)
+	function get_rows($query, &$rows, &$readonlys)
 	{
-		if(!$query['csv_export'])
+		if (!$query['csv_export'])
 		{
 			Api\Cache::setSession('resources', 'index_nm', $query);
 		}
 		if ($query['store_state'])	// request to store state in session and filter in prefs?
 		{
-			Api\Cache::setSession('resources',$query['store_state'],$query);
+			Api\Cache::setSession('resources', $query['store_state'], $query);
 			//echo "<p>".__METHOD__."() query[filter]=$query[filter], prefs[resources][filter]={$GLOBALS['egw_info']['user']['preferences']['resources']['filter']}</p>\n";
 			if ($query['filter'] != $GLOBALS['egw_info']['user']['preferences']['resources']['filter'])
 			{
-				$GLOBALS['egw']->preferences->add('resources','filter',$query['filter'],'user');
+				$GLOBALS['egw']->preferences->add('resources', 'filter', $query['filter'], 'user');
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
@@ -126,7 +126,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
@@ -151,14 +151,14 @@ 
 			default:
 				$filter['accessory_of'] = $query['filter2'];
 		}
-		if($query['filter2'] != self::DELETED)
+		if ($query['filter2'] != self::DELETED)
 		{
 			$filter['deleted'] = null;
 		}
 
 		if ($query['filter'])
 		{
-			if (($children = $this->acl->get_cats(Acl::READ,$query['filter'])))
+			if (($children = $this->acl->get_cats(Acl::READ, $query['filter'])))
 			{
 				$filter['cat_id'] = array_keys($children);
 				$filter['cat_id'][] = $query['filter'];
@@ -181,7 +181,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;
@@ -189,10 +189,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;
 			}
@@ -201,24 +201,24 @@ 
 		}
 
 		$config = Api\Config::read('resources');
-		foreach($rows as $num => &$resource)
+		foreach ($rows as $num => &$resource)
 		{
-			if (!$this->acl->is_permitted($resource['cat_id'],Acl::EDIT))
+			if (!$this->acl->is_permitted($resource['cat_id'], Acl::EDIT))
 			{
 				$readonlys["edit[$resource[res_id]]"] = true;
 			}
-			elseif($resource['deleted'])
+			elseif ($resource['deleted'])
 			{
 				$resource['class'] .= 'deleted ';
 			}
-			if (!$this->acl->is_permitted($resource['cat_id'],Acl::DELETE) ||
+			if (!$this->acl->is_permitted($resource['cat_id'], Acl::DELETE) ||
 				($resource['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history')
 			)
 			{
 				$readonlys["delete[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_delete ';
 			}
-			if ((!$this->acl->is_permitted($resource['cat_id'],Acl::ADD)) ||
+			if ((!$this->acl->is_permitted($resource['cat_id'], Acl::ADD)) ||
 				// Allow new accessory action when viewing accessories of a certain resource
 				$query['filter2'] <= 0 && $resource['accessory_of'] != -1)
 			{
@@ -232,7 +232,7 @@ 
 				$resource['class'] .= 'no_book ';
 				$resource['class'] .= 'no_view_calendar ';
 			}
-			if(!$this->acl->is_permitted($resource['cat_id'],resources_acl_bo::CAL_READ))
+			if (!$this->acl->is_permitted($resource['cat_id'], resources_acl_bo::CAL_READ))
 			{
 				$readonlys["calendar[$resource[res_id]]"] = true;
 				$resource['class'] .= 'no_view_calendar ';
@@ -243,12 +243,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));
 				}
@@ -256,7 +256,7 @@ 
 				$resource['accessory_of_label'] = $this->link_title($resource['accessory_of']);
 			}
 
-			if($resource['deleted'])
+			if ($resource['deleted'])
 			{
 				$rows[$num]['picture_thumb'] = 'deleted';
 			}
@@ -277,7 +277,7 @@ 
 			$rows[$num]['admin'] = $this->acl->get_cat_admin($resource['cat_id']);
 		}
 
-		if(!Api\Storage\Customfields::get('resources'))
+		if (!Api\Storage\Customfields::get('resources'))
 		{
 			$rows['no_customfields'] = true;
 		}
@@ -295,11 +295,11 @@ 
 	{
 		if (!($data = $this->so->read(array('res_id' => $res_id))))
 		{
-			return null;	// not found
+			return null; // not found
 		}
-		if (!$this->acl->is_permitted($data['cat_id'],Acl::READ))
+		if (!$this->acl->is_permitted($data['cat_id'], Acl::READ))
 		{
-			return false;	// permission denied
+			return false; // permission denied
 		}
 		return $data;
 	}
@@ -313,35 +313,35 @@ 
 	 */
 	function save($resource)
 	{
-		if(!$this->acl->is_permitted($resource['cat_id'],Acl::EDIT))
+		if (!$this->acl->is_permitted($resource['cat_id'], Acl::EDIT))
 		{
 			return lang('You are not permitted to edit this resource!');
 		}
 		$old = array();
 		// we need an id to save pictures and make links...
-		if(!$resource['res_id'])
+		if (!$resource['res_id'])
 		{
 			$resource['res_creator'] = $GLOBALS['egw_info']['user']['account_id'];
-			$resource['res_created'] = Api\DateTime::server2user(time(),'ts');
+			$resource['res_created'] = Api\DateTime::server2user(time(), 'ts');
 			$resource['res_id'] = $this->so->save($resource);
 		}
 		else
 		{
 			$resource['res_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-			$resource['res_modified'] = Api\DateTime::server2user(time(),'ts');
+			$resource['res_modified'] = Api\DateTime::server2user(time(), 'ts');
 			$old = $this->read($resource['res_id']);
 		}
 
 		switch ($resource['picture_src'])
 		{
 			case 'own_src':
-				if($resource['own_file']['size'] > 0)
+				if ($resource['own_file']['size'] > 0)
 				{
-					$msg = $this->save_picture($resource['own_file'],$resource['res_id']);
+					$msg = $this->save_picture($resource['own_file'], $resource['res_id']);
 					unset($resource['own_file']);
 					break;
 				}
-				elseif(@Vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
+				elseif (@Vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
 				{
 					break;
 				}
@@ -352,10 +352,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
 				{
@@ -363,40 +363,40 @@ 
 				}
 		}
 		// somthing went wrong on saving own picture
-		if($msg)
+		if ($msg)
 		{
 			return $msg;
 		}
 
 		// Check for restore of deleted, restore held links
-		if($old && $old['deleted'] && !$resource['deleted'])
+		if ($old && $old['deleted'] && !$resource['deleted'])
 		{
 			Link::restore('resources', $resource['res_id']);
 		}
 
 		// delete old pictures
-		if($resource['picture_src'] != 'own_src')
+		if ($resource['picture_src'] != 'own_src')
 		{
 			$this->remove_picture($resource['res_id']);
 		}
 
 		// Update link title
-		Link::notify_update('resources',$resource['res_id'], $resource);
+		Link::notify_update('resources', $resource['res_id'], $resource);
 		// save links
-		if(is_array($resource['link_to']['to_id']))
+		if (is_array($resource['link_to']['to_id']))
 		{
-			Link::link('resources',$resource['res_id'],$resource['link_to']['to_id']);
+			Link::link('resources', $resource['res_id'], $resource['link_to']['to_id']);
 		}
-		if($resource['accessory_of'] != $old['accessory_of'])
+		if ($resource['accessory_of'] != $old['accessory_of'])
 		{
-			Link::unlink(0,'resources',$resource['res_id'],'','resources',$old['accessory_of']);
+			Link::unlink(0, 'resources', $resource['res_id'], '', 'resources', $old['accessory_of']);
 
 			// Check for resource changing to accessory - move its accessories to resource
-			if($old['accessory_of'] == -1 && ($accessories = $this->get_acc_list($resource['res_id'])))
+			if ($old['accessory_of'] == -1 && ($accessories = $this->get_acc_list($resource['res_id'])))
 			{
-				foreach($accessories as $accessory => $name)
+				foreach ($accessories as $accessory => $name)
 				{
-					Link::unlink(0,'resources',$accessory,'','resources',$resource['res_id']);
+					Link::unlink(0, 'resources', $accessory, '', 'resources', $resource['res_id']);
 					if (($acc = $this->read($accessory)))
 					{
 						$acc['accessory_of'] = -1;
@@ -405,15 +405,15 @@ 
 				}
 			}
 		}
-		if($resource['accessory_of'] != -1)
+		if ($resource['accessory_of'] != -1)
 		{
-			Link::link('resources',$resource['res_id'],'resources',$resource['accessory_of']);
+			Link::link('resources', $resource['res_id'], 'resources', $resource['accessory_of']);
 		}
 
-		if(!empty($resource['res_id']) && $this->so->get_value("cat_id",$resource['res_id']) != $resource['cat_id'] && $resource['accessory_of'] == -1)
+		if (!empty($resource['res_id']) && $this->so->get_value("cat_id", $resource['res_id']) != $resource['cat_id'] && $resource['accessory_of'] == -1)
 		{
 			$accessories = $this->get_acc_list($resource['res_id']);
-			foreach($accessories as $accessory => $name)
+			foreach ($accessories as $accessory => $name)
 			{
 				if (($acc = $this->so->read($accessory)))
 				{
@@ -430,9 +430,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');
@@ -447,7 +447,7 @@ 
 	 */
 	function delete($res_id)
 	{
-		if(!$this->acl->is_permitted($this->so->get_value('cat_id',$res_id),Acl::DELETE))
+		if (!$this->acl->is_permitted($this->so->get_value('cat_id', $res_id), Acl::DELETE))
 		{
 			return lang('You are not permitted to delete this resource!');
 		}
@@ -462,16 +462,16 @@ 
 		{
 			$old['deleted'] = time();
 			$this->save($old);
-			Link::unlink(0,'resources',$res_id,'','','',true);
+			Link::unlink(0, 'resources', $res_id, '', '', '', true);
 			$accessories = $this->get_acc_list($res_id);
-			foreach($accessories as $acc_id => $name)
+			foreach ($accessories as $acc_id => $name)
 			{
 				// Don't purge already deleted accessories
 				if (($acc = $this->read($acc_id)) && !$acc['deleted'])
 				{
 					$acc['deleted'] = time();
 					$this->save($acc);
-					Link::unlink(0,'resources',$acc_id,'','','',true);
+					Link::unlink(0, 'resources', $acc_id, '', '', '', true);
 				}
 			}
 			return false;
@@ -479,18 +479,18 @@ 
 		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) && ($acc = $this->read($acc_id)))
+				if ($this->delete($acc_id) && ($acc = $this->read($acc_id)))
 				{
 					$acc['accessory_of'] = -1;
 					$this->save($acc);
 				}
 			};
 			$this->remove_picture($res_id);
-	 		Link::unlink(0,'resources',$res_id);
+	 		Link::unlink(0, 'resources', $res_id);
 	 		// delete the resource from the calendar
-	 		ExecMethod('calendar.calendar_so.deleteaccount','r'.$res_id);
+	 		ExecMethod('calendar.calendar_so.deleteaccount', 'r'.$res_id);
 	 		return false;
 		}
 		return lang('Something went wrong by deleting resource');
@@ -504,15 +504,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'];
 			}
 		}
@@ -541,12 +541,12 @@ 
 
 		// Categories
 		$cats = $bo->acl->get_cats(Acl::READ);
-		foreach($cats as $cat_id => $cat)
+		foreach ($cats as $cat_id => $cat)
 		{
-			if($cat && stripos($cat, $search) !== FALSE)
+			if ($cat && stripos($cat, $search) !== FALSE)
 			{
 				// Get resources for that category
-				if(!$options['exec'])
+				if (!$options['exec'])
 				{
 					$resources = $bo->get_resources_by_category($cat_id);
 				}
@@ -554,14 +554,14 @@ 
 				{
 					$cat_options = $options;
 					$cat_options['cat_id'] = $cat_id;
-					$resources = $bo->link_query('',$cat_options);
+					$resources = $bo->link_query('', $cat_options);
 				}
 
 				// Edit dialog sends exec as an option, don't add categories
-				if(count($resources) && !$options['exec'])
+				if (count($resources) && !$options['exec'])
 				{
 					$_resources = array_map(
-						function($id) { return 'r'.$id;},
+						function($id) { return 'r'.$id; },
 						array_keys($resources)
 					);
 					$list['cat-'.$cat_id] = array(
@@ -572,7 +572,7 @@ 
 				else if ($resources && $options['exec'])
 				{
 					array_map(
-						function($id,$name) use (&$list) { if(!$list[''.$id]) $list[''.$id] = $name;},
+						function($id, $name) use (&$list) { if (!$list[''.$id]) $list[''.$id] = $name; },
 						array_keys($resources), $resources
 					);
 				}
@@ -596,10 +596,10 @@ 
 			'deleted' => null
 		);
 		$only_keys = 'res_id,name';
-		$data = $this->so->search(array(),$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',false,$filter);
-		if(is_array($data) && $data)
+		$data = $this->so->search(array(), $only_keys, $order_by = 'name', $extra_cols = '', $wildcard = '%', $empty, $op = 'OR', false, $filter);
+		if (is_array($data) && $data)
 		{
-			foreach($data as $resource)
+			foreach ($data as $resource)
 			{
 				$resources[$resource['res_id']] = $resource['name'];
 			}
@@ -620,37 +620,37 @@ 
 		//error_log(__METHOD__ . "(".print_r($res_id,true).")");
 
 		// Resource category
-		if(is_string($res_id) && strpos($res_id, 'cat-') === 0)
+		if (is_string($res_id) && strpos($res_id, 'cat-') === 0)
 		{
 			$cat_id = (int)substr($res_id, 4);
-			if(!$this->acl->is_permitted($cat_id, Acl::READ))
+			if (!$this->acl->is_permitted($cat_id, Acl::READ))
 			{
 				return array();
 			}
-			return array( array(
+			return array(array(
 				'name' => $this->acl->get_cat_name($cat_id),
 				'rights' => $this->acl->get_permissions($cat_id),
 				'resources' => array_map(
-					function($id) { return 'r'.$id;},
+					function($id) { return 'r'.$id; },
 					array_keys($this->get_resources_by_category($cat_id))
 				)
 			));
 		}
 
-		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;
 				}
@@ -658,7 +658,7 @@ 
 			$resource['responsible'] = $this->acl->get_cat_admin($resource['cat_id']);
 
 			// preseed the cache
-			Link::set_cache('resources',$resource['res_id'],$t=$this->link_title($resource));
+			Link::set_cache('resources', $resource['res_id'], $t = $this->link_title($resource));
 		}
 		return $data;
 	}
@@ -675,7 +675,7 @@ 
 		{
 			return false;
 		}
-		return $this->acl->is_permitted($data['cat_id'],resources_acl_bo::DIRECT_BOOKING) ? A : U;
+		return $this->acl->is_permitted($data['cat_id'], resources_acl_bo::DIRECT_BOOKING) ? A : U;
 	}
 
 	/**
@@ -687,11 +687,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
@@ -702,7 +702,7 @@ 
 		$only_keys = 'res_id,name,short_description,bookable,useable,quantity';
 
 		// If no read access to any category, just stop
-		if(!$this->acl->get_cats(Acl::READ))
+		if (!$this->acl->get_cats(Acl::READ))
 		{
 			$options['total'] = 0;
 			return array();
@@ -713,35 +713,35 @@ 
 			'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['cat_id'] && in_array($options['cat_id'], $filter['cat_id']))
+		if ($options['cat_id'] && in_array($options['cat_id'], $filter['cat_id']))
 		{
 			$filter['cat_id'] = $options['cat_id'];
 		}
-		if($options['accessory_of'])
+		if ($options['accessory_of'])
 		{
 			$filter['accessory_of'] = $options['accessory_of'];
 		}
 		$list = array();
-		$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);
 		// we need to check availability of the searched resources in the calendar if $pattern ['exec'] contains some extra args
-		$show_conflict=False;
+		$show_conflict = False;
 		if ($data && $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)))
 				{
 					$this->bocal = new calendar_bo();
 				}
 				$start = new Api\DateTime($cal_info['start']);
-				$startarr= getdate($start->format('ts'));
+				$startarr = getdate($start->format('ts'));
 				if (isset($cal_info['whole_day']) && $cal_info['whole_day']) {
 					$startarr['hour'] = $startarr['minute'] = 0;
 					$start = new Api\DateTime($startarr);
@@ -752,39 +752,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;
@@ -794,9 +794,9 @@ 
 								}
 								// now decrement this quantity useable
 								$quantity = 1;
-								$this->bocal->so->split_status($part_detail,$quantity);
+								$this->bocal->so->split_status($part_detail, $quantity);
 
-								$res_info_cache[$resource_id]['useable']-=$quantity;
+								$res_info_cache[$resource_id]['useable'] -= $quantity;
 							}
 						}
 					}
@@ -804,31 +804,31 @@ 
 			}
 		}
 		if (isset($res_info_cache)) {
-			$show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] !== 'resources_without_conflict';
+			$show_conflict = $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] !== 'resources_without_conflict';
 			// if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar
 			// so we'll loop on this one and not $data
-			foreach($res_info_cache as $id => $resource) {
+			foreach ($res_info_cache as $id => $resource) {
 				//maybe this resource is reserved
-				if ( ($resource['useable'] < 1) )
+				if (($resource['useable'] < 1))
 				{
-					if($show_conflict)
+					if ($show_conflict)
 					{
-						$list[$id] = ' ('.lang('conflict').') '.$resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+						$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'].']' : '').
 							($resource['useable'] > 1 ? " ( {$resource['useable']} / {$resource['quantity']} )" : '');
 				}
 			}
 		} 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']);
@@ -845,17 +845,17 @@ 
 	 * @param int|array $resource
 	 * @return string|boolean string with title, null if resource does not exist or false if no perms to view it
 	 */
-	function link_title( $resource )
+	function link_title($resource)
 	{
 		if (!is_array($resource))
 		{
-			if (!($resource  = $this->read(array('res_id' => $resource)))) return $resource;
+			if (!($resource = $this->read(array('res_id' => $resource)))) return $resource;
 		}
-		elseif (!$this->acl->is_permitted($resource['cat_id'],Acl::READ))
+		elseif (!$this->acl->is_permitted($resource['cat_id'], Acl::READ))
 		{
 			return false;
 		}
-		return $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+		return $resource['name'].($resource['short_description'] ? ', ['.$resource['short_description'].']' : '');
 	}
 
 	/**
@@ -875,15 +875,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($resources =& $this->so->search(array('res_id' => $ids),self::TITLE_COLS)))
+		if (($resources = & $this->so->search(array('res_id' => $ids), self::TITLE_COLS)))
 		{
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$titles[$resource['res_id']] = $this->link_title($resource);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to Link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -901,13 +901,13 @@ 
 	 * @param int $resource_id
 	 * @return mixed string with msg if somthing went wrong; nothing if all right
 	 */
-	function save_picture($file,$resource_id)
+	function save_picture($file, $resource_id)
 	{
 		if ($file['type'] == 'application/octet-stream')
 		{
 			$file['type'] = Api\MimeMagic::filename2mime($file['name']);
 		}
-		switch($file['type'])
+		switch ($file['type'])
 		{
 			case 'image/gif':
 				$src_img = imagecreatefromgif($file['tmp_name']);
@@ -924,11 +924,11 @@ 
 				return $file['type'].': '.lang('Picture type is not supported, sorry!');
 		}
 
-		$tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'resources-picture');
-		imagejpeg($src_img,$tmp_name);
+		$tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'resources-picture');
+		imagejpeg($src_img, $tmp_name);
 		imagedestroy($src_img);
 
-		Link::attach_file('resources',$resource_id,array(
+		Link::attach_file('resources', $resource_id, array(
 			'tmp_name' => $tmp_name,
 			'name'     => self::PICTURE_NAME,
 			'type'     => 'image/jpeg',
@@ -942,14 +942,14 @@ 
 	 * @param bool $fullsize false = thumb, true = full pic
 	 * @return string url of picture
 	 */
-	function get_picture($resource,$fullsize=false)
+	function get_picture($resource, $fullsize = false)
 	{
 		if ($resource && !is_array($resource)) $resource = $this->read($resource);
 
-		switch($resource['picture_src'])
+		switch ($resource['picture_src'])
 		{
 			case 'own_src':
-				$picture = Link::vfs_path('resources',$resource['res_id'],self::PICTURE_NAME,true);	// vfs path
+				$picture = Link::vfs_path('resources', $resource['res_id'], self::PICTURE_NAME, true); // vfs path
 				if ($fullsize)
 				{
 					$picture = Egw::link(Vfs::download_url($picture));
@@ -958,23 +958,23 @@ 
 				{
 					$picture = Egw::link('/api/thumbnail.php', array(
 						'path' => $picture
-					),false);
+					), false);
 				}
 				break;
 
 			case 'cat_src':
 				$picture = Api\Categories::id2name($resource['cat_id'], 'data');
-				if($picture['icon'])
+				if ($picture['icon'])
 				{
-					$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$picture['icon']:self::ICON_PATH.'/'.$picture['icon'];
+					$picture = !$fullsize ? $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$picture['icon'] : self::ICON_PATH.'/'.$picture['icon'];
 					break;
 				}
 				// fall through
 			case 'gen_src':
 			default :
 				$src = $resource['picture_src'];
-				$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].$this->resource_icons:$this->resource_icons;
-				$picture .= strpos($src,'.') !== false ? $src : 'generic.png';
+				$picture = !$fullsize ? $GLOBALS['egw_info']['server']['webserver_url'].$this->resource_icons : $this->resource_icons;
+				$picture .= strpos($src, '.') !== false ? $src : 'generic.png';
 		}
 		return $picture;
 	}
@@ -988,9 +988,9 @@ 
 	 */
 	function remove_picture($res_id)
 	{
-		if (($arr = Link::delete_attached('resources',$res_id,self::PICTURE_NAME)) && is_array($arr))
+		if (($arr = Link::delete_attached('resources', $res_id, self::PICTURE_NAME)) && is_array($arr))
 		{
-			return array_shift($arr);	// $arr = array($path => (bool)$ok);
+			return array_shift($arr); // $arr = array($path => (bool)$ok);
 		}
 		return false;
 	}
@@ -1006,11 +1006,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();

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',

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

@@ -52,7 +52,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$file = Array(
+			$file = array(
 				'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 				'Global Categories'  => Egw::link('/index.php',array(
 					'menuaction' => 'admin.admin_categories.index',

Spacing +23 added lines, -23 removed lines

@@ -36,25 +36,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(Acl::ADD))
+			if ($this->acl->get_cats(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.admin_config.index&appname=' . $appname.'&ajax=true'),
-				'Global Categories'  => Egw::link('/index.php',array(
+				'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname='.$appname.'&ajax=true'),
+				'Global Categories'  => Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> true,
@@ -67,11 +67,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);
 			}
 		}
 	}
@@ -94,19 +94,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(
-			'search' => 'resources_bo::calendar_search',// method to use for the selection of resources, otherwise Link system is used
-			'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
+			'search' => 'resources_bo::calendar_search', // method to use for the selection of resources, otherwise Link system is used
+			'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
 			'check_invite' => 'resources_acl_bo::check_calendar_invite' // Check that the current user is allowed to invite the givent resource
 		);
@@ -122,14 +122,14 @@ 
 	{
 		$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)
+		if ($cat['parent'] == 0)
 		{
 			// No parent, try the default cat from setup
 			$categories = new Api\Categories('', 'resources');
 			$default = $categories->name2id('General resources');
-			if($default)
+			if ($default)
 			{
 				$new_cat_id = $default;
 			}
@@ -137,7 +137,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',
@@ -145,7 +145,7 @@ 
 						'parent'	=> 0
 					));
 					$admin = -2;
-					resources_acl_bo::set_rights($new_cat_id, array($admin), array($admin), array($admin), array($admin),array($admin));
+					resources_acl_bo::set_rights($new_cat_id, array($admin), array($admin), array($admin), array($admin), array($admin));
 				}
 			}
 		}
@@ -159,9 +159,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);

addressbook/inc/class.addressbook_so.inc.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  * @depreacated use Api\Contacts
  */
 
-class addressbook_so extends Api\Contacts\Storage {}
+class addressbook_so extends Api\Contacts\Storage
+{
+}

addressbook/inc/class.addressbook_hooks.inc.php

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

@@ -68,7 +68,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'admin.uiconfig.index',
 					'appname'    => $appname,

Braces +12 added lines, -3 removed lines

@@ -498,11 +498,14 @@ 
 			}
 		}
 		$own_account_acl['link_to'] = 'Links';
-		if ($config['account_repository'] != 'ldap')	// no custom-fields in ldap
+		if ($config['account_repository'] != 'ldap')
+		{
+			// no custom-fields in ldap
 		{
 			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$own_account_acl['#'.$name] = $data['label'];
+		}
 			}
 		}
 
@@ -522,11 +525,14 @@ 
 				$copy_fields[$field] = $label;
 			}
 		}
-		if ($config['contact_repository'] != 'ldap')	// no custom-fields in ldap
+		if ($config['contact_repository'] != 'ldap')
+		{
+			// no custom-fields in ldap
 		{
 			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$copy_fields['#'.$name] = $data['label'];
+		}
 			}
 		}
 		// Remove country codes as an option, it will be added by UI constructor
@@ -559,7 +565,10 @@ 
 			)
 		);
 
-		if (empty($config['geolocation_url']))	$ret ['geolocation_url'] = $geoLocation[0]['value'];
+		if (empty($config['geolocation_url']))
+		{
+			$ret ['geolocation_url'] = $geoLocation[0]['value'];
+		}
 		return $ret;
 	}
 }

Spacing +40 added lines, -40 removed lines

@@ -43,38 +43,38 @@ 
 						'link'    => false,
 						'icon'    => false,
 					),
-					'menuOpened'  => true,	// display it open by default
+					'menuOpened'  => true, // display it open by default
 				));
 			}
 			// Magic etemplate2 favorites menu (from nextmatch widget)
 			display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites('addressbook'));
 
 			$file = array(
-				'Addressbook list' => Egw::link('/index.php',array(
+				'Addressbook list' => Egw::link('/index.php', array(
 					'menuaction' => 'addressbook.addressbook_ui.index',
 					'ajax' => 'true')),
 				array(
-					'text' => lang('Add %1',lang(Link::get_registry($appname, 'entry'))),
+					'text' => lang('Add %1', lang(Link::get_registry($appname, 'entry'))),
 					'no_lang' => true,
 					'link' => "javascript:egw.open('','$appname','add')"
 				),
 				'Advanced search' => "javascript:egw_openWindowCentered2('".
-					Egw::link('/index.php',array('menuaction' => 'addressbook.addressbook_ui.search'),false).
+					Egw::link('/index.php', array('menuaction' => 'addressbook.addressbook_ui.search'), false).
 					"','_blank',870,610,'yes')",
-				'Placeholders'    => Egw::link('/index.php','menuaction=api.EGroupware\\Api\\Contacts\\Merge.show_replacements')
+				'Placeholders'    => Egw::link('/index.php', 'menuaction=api.EGroupware\\Api\\Contacts\\Merge.show_replacements')
 			);
-			display_sidebox($appname,lang('Addressbook menu'),$file);
+			display_sidebox($appname, lang('Addressbook menu'), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
 		{
 			$file = Array(
-				'Site configuration' => Egw::link('/index.php',array(
+				'Site configuration' => Egw::link('/index.php', array(
 					'menuaction' => 'admin.uiconfig.index',
 					'appname'    => $appname,
 					'ajax'       => 'true',
 				)),
-				'Global Categories'  => Egw::link('/index.php',array(
+				'Global Categories'  => Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> True,
@@ -84,7 +84,7 @@ 
 			// custom fields are not availible in LDAP
 			if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 			{
-				$file['Custom fields'] = Egw::link('/index.php',array(
+				$file['Custom fields'] = Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_customfields.index',
 					'appname'    => $appname,
 					'use_private'=> 1,
@@ -93,11 +93,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);
 			}
 		}
 	}
@@ -124,7 +124,7 @@ 
 			'label'  => 'Default addressbook for adding contacts',
 			'name'   => 'add_default',
 			'help'   => 'Which addressbook should be selected when adding a contact AND you have no add rights to the current addressbook.',
-			'values' => !$hook_data['setup'] ? ExecMethod('addressbook.addressbook_ui.get_addressbooks',Acl::ADD) : array(),
+			'values' => !$hook_data['setup'] ? ExecMethod('addressbook.addressbook_ui.get_addressbooks', Acl::ADD) : array(),
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
@@ -150,7 +150,7 @@ 
 		);
 		$contacts = new Api\Contacts();
 		$fileas_options = $contacts->fileas_options();
-		foreach(Api\Contacts\Storage::$duplicate_fields as $key => $label)
+		foreach (Api\Contacts\Storage::$duplicate_fields as $key => $label)
 		{
 			$duplicate_options[$key] = lang($label);
 		}
@@ -161,7 +161,7 @@ 
 			'name'   => 'link_title',
 			'values' => array(
 				'n_fileas' => lang('own sorting').' ('.lang('default').': '.lang('Company').': '.lang('lastname').', '.lang('firstname').')',
-			)+$fileas_options,	// plus all fileas types
+			) + $fileas_options, // plus all fileas types
 			'help'   => 'What should links to the addressbook display in other applications. Empty values will be left out. You need to log in anew, if you change this setting!',
 			'xmlrpc' => True,
 			'admin'  => false,
@@ -226,7 +226,7 @@ 
 			'~edit~'    => lang('Edit contact'),
 			'infolog' => lang('Open %1 CRM view', lang('infolog')),
 		);
-		if($GLOBALS['egw_info']['user']['apps']['tracker'])
+		if ($GLOBALS['egw_info']['user']['apps']['tracker'])
 		{
 			$crm_list_options['tracker'] = lang('Open %1 CRM view', lang('tracker'));
 		}
@@ -273,8 +273,8 @@ 
 				'label'  => 'Default document to insert contacts',
 				'name'   => 'default_document',
 				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('addressbook')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','n_fn').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'n_fn').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -284,9 +284,9 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert contacts',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('addressbook')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','n_fn').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('addressbook')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'n_fn').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -370,7 +370,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but required by function signature
+		unset($location); // not used, but required by function signature
 
 		$links = array(
 			'query' => 'api.EGroupware\\Api\\Contacts.link_query',
@@ -396,9 +396,9 @@ 
 			'add_app'    => 'link_app',
 			'add_id'     => 'link_id',
 			'add_popup'  => '870x610',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'file_access'=> 'api.EGroupware\\Api\\Contacts.file_access',
-			'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png','template' => 'addressbook.edit'))),
+			'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png', 'template' => 'addressbook.edit'))),
 			// registers an addtional type 'addressbook-email', returning only contacts with email, title has email appended
 			'additional' => array(
 				'addressbook-email' => array(
@@ -425,7 +425,7 @@ 
 	 */
 	static function getAppExportLimit($location)
 	{
-		unset($location);	// not used, but required by function signature
+		unset($location); // not used, but required by function signature
 
 		return $GLOBALS['egw_info']['server']['contact_export_limit'];
 	}
@@ -438,11 +438,11 @@ 
 	 */
 	static function calendar_resources($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
 		return array(
-			'type' => 'c',// one char type-identifiy for this resources
-			'info' => 'api.EGroupware\\Api\\Contacts.calendar_info',// info method, returns array with id, type & name for a given id
+			'type' => 'c', // one char type-identifiy for this resources
+			'info' => 'api.EGroupware\\Api\\Contacts.calendar_info', // info method, returns array with id, type & name for a given id
 		);
 	}
 
@@ -454,7 +454,7 @@ 
 	 */
 	static function group_acl($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
 		// addressbook uses group-acl, only if contacts-backend is NOT LDAP, as the ACL can not be modified there
 		return $GLOBALS['egw_info']['server']['contact_repository'] != 'ldap';
@@ -468,7 +468,7 @@ 
 	 */
 	static function not_enum_group_acls($data)
 	{
-		unset($data);	// not used, but required by function signature
+		unset($data); // not used, but required by function signature
 
 		return true;
 	}
@@ -481,7 +481,7 @@ 
 	 */
 	public static function acl_rights($params)
 	{
-		unset($params);	// not used, but required by function signature
+		unset($params); // not used, but required by function signature
 
 		return array(
 			Acl::READ    => 'read',
@@ -499,7 +499,7 @@ 
 	 */
 	public static function categories($data)
 	{
-		unset($data);	// not used, but required by function signature
+		unset($data); // not used, but required by function signature
 
 		return true;
 	}
@@ -516,10 +516,10 @@ 
 
 		// get the list of account fields
 		$own_account_acl = array();
-		foreach($bocontacts->contact_fields as $field => $label)
+		foreach ($bocontacts->contact_fields as $field => $label)
 		{
 			// some fields the user should never be allowed to edit or are covert by an other attribute (n_fn for all n_*)
-			if (!in_array($field,array('id','tid','owner','created','creator','modified','modifier','private','n_prefix','n_given','n_middle','n_family','n_suffix')))
+			if (!in_array($field, array('id', 'tid', 'owner', 'created', 'creator', 'modified', 'modifier', 'private', 'n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix')))
 			{
 				$own_account_acl[$field] = $label;
 			}
@@ -527,7 +527,7 @@ 
 		$own_account_acl['link_to'] = 'Links';
 		if ($config['account_repository'] != 'ldap')	// no custom-fields in ldap
 		{
-			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
+			foreach (Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$own_account_acl['#'.$name] = $data['label'];
 			}
@@ -538,26 +538,26 @@ 
 		// Remove country codes as an option, it will be added by BO constructor
 		unset($org_fields['adr_one_countrycode'], $org_fields['adr_two_countrycode']);
 
-		$supported_fields = $bocontacts->get_fields('supported',null,0);	// fields supported by the backend (ldap schemas!)
+		$supported_fields = $bocontacts->get_fields('supported', null, 0); // fields supported by the backend (ldap schemas!)
 		// get the list of account fields
 		$copy_fields = array();
-		foreach($bocontacts->contact_fields as $field => $label)
+		foreach ($bocontacts->contact_fields as $field => $label)
 		{
 			// some fields the user should never be allowed to copy or are coverted by an other attribute (n_fn for all n_*)
-			if (!in_array($field,array('id','tid','created','creator','modified','modifier','account_id','uid','etag','n_fn')))
+			if (!in_array($field, array('id', 'tid', 'created', 'creator', 'modified', 'modifier', 'account_id', 'uid', 'etag', 'n_fn')))
 			{
 				$copy_fields[$field] = $label;
 			}
 		}
 		if ($config['contact_repository'] != 'ldap')	// no custom-fields in ldap
 		{
-			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
+			foreach (Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$copy_fields['#'.$name] = $data['label'];
 			}
 		}
 		// Remove country codes as an option, it will be added by UI constructor
-		if(in_array('adr_one_countrycode', $supported_fields))
+		if (in_array('adr_one_countrycode', $supported_fields))
 		{
 			unset($copy_fields['adr_one_countrycode'], $copy_fields['adr_two_countrycode']);
 		}
@@ -578,7 +578,7 @@ 
 		$ret = array(
 			'sel_options' => array(
 				'own_account_acl' => $own_account_acl,
-				'org_fileds_to_update' => $org_fields,	// typo has to stay, as it was there allways and we would loose existing config :(
+				'org_fileds_to_update' => $org_fields, // typo has to stay, as it was there allways and we would loose existing config :(
 				'copy_fields' => $copy_fields,
 				'fileas' => $bocontacts->fileas_options(),
 				'contact_repository' => $repositories,

addressbook/inc/class.addressbook_merge.inc.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
  *
  * @deprecated use Api\Contacts\Merge
  */
-class addressbook_merge extends Merge {}
\ No newline at end of file
+class addressbook_merge extends Merge
+{
+}
\ No newline at end of file

infolog/inc/class.infolog_widget.inc.php

Braces +12 added lines, -3 removed lines

@@ -82,13 +82,22 @@
 		unset($attrs);	// not used
 
 		// Already done
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value)))
+		{
+			return $value;
+		}
 
 		// Link entry, already in array format
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value))
+		{
+			$value = $value['id'];
+		}
 
 		// Link entry, in string format
-		if (substr($value,0,8) == 'infolog:') $value = substr($value,8);
+		if (substr($value,0,8) == 'infolog:')
+		{
+			$value = substr($value,8);
+		}
 		if($value)
 		{
 			return $this->infolog->read($value);

Spacing +8 added lines, -8 removed lines

@@ -104,17 +104,17 @@ 
 
 	public function get_entry($value, array $attrs)
 	{
-		unset($attrs);	// not used
+		unset($attrs); // not used
 
 		// Already done
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app', $value) && array_key_exists('id', $value))) return $value;
 
 		// Link entry, already in array format
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if (is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
 
 		// Link entry, in string format
-		if (substr($value,0,8) == 'infolog:') $value = substr($value,8);
-		if($value)
+		if (substr($value, 0, 8) == 'infolog:') $value = substr($value, 8);
+		if ($value)
 		{
 			return $this->infolog->read($value);
 		}
@@ -123,7 +123,7 @@ 
 
 	function _get_fields()
 	{
-		static $fields=null;
+		static $fields = null;
 
 		if (!isset($fields))
 		{
@@ -159,7 +159,7 @@ 
 	//			'info_confirm' => lang('Confirm'),
 	//			'info_custom_from' => lang('Custom from'),
 			);
-			foreach(Api\Storage\Customfields::get('infolog') as $name => $data)
+			foreach (Api\Storage\Customfields::get('infolog') as $name => $data)
 			{
 				$fields['#'.$name] = lang($data['label']);
 			}
@@ -169,4 +169,4 @@ 
 }
 
 // register widgets for etemplate2
-Etemplate\Widget::registerWidget('infolog_widget',array('infolog-value', 'infolog-fields'));
+Etemplate\Widget::registerWidget('infolog_widget', array('infolog-value', 'infolog-fields'));

infolog/inc/class.infolog_export_csv.inc.php

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

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

Braces +42 added lines, -11 removed lines

@@ -54,7 +54,8 @@ 
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
+				foreach($options['mapping'] + (array)$_definition->filter as $field => $map)
+				{
 					if($field[0] == '#')
 					{
 						$query['custom_fields'] = true;
@@ -80,11 +81,20 @@ 
 					// Handle ranges
 					foreach($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if(!is_array($value) || (!$value['from'] && !$value['to']))
+						{
+							continue;
+						}
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if($value['from'])
+						{
+							$query['col_filter'][] = "$field >= " . (int)$value['from'];
+						}
+						if($value['to'])
+						{
+							$query['col_filter'][] = "$field <= " . (int)$value['to'];
+						}
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -101,7 +111,10 @@ 
 					{
 						foreach($selection as &$row)
 						{
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+							if($row[$field])
+							{
+								$cf_preload[$app][] = $row[$field];
+							}
 						}
 						if($cf_preload[$app])
 						{
@@ -132,7 +145,10 @@ 
 			$links = Link::get_links_multiple('infolog', $ids, true, '!'.Link::VFS_APPNAME);
 			foreach($links as $id => $link)
 			{
-				if(!is_array($selection[$id])) break;
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['info_link_id'] = $link = array_pop($link);
 				if(!$options['convert'])
 				{
@@ -146,7 +162,10 @@ 
 			$projects = Link::get_links_multiple('infolog', $ids, true, 'projectmanager');
 			foreach($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = Link::title('projectmanager', $selection[$id]['pm_id']);
 				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
@@ -183,7 +202,10 @@ 
 				// Force 0 times to ''
 				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if($record->$field == 0)
+					{
+						$record->$field = '';
+					}
 				}
 			}
 			else
@@ -191,7 +213,10 @@ 
 				// Implode arrays, so they don't say 'Array'
 				foreach($record->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $record->$key = implode(',', $value);
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
 			}
 			$export_object->export_record($record);
@@ -280,10 +305,16 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0)
+			{
+				unset($filters[$field_name]);
+			}
 		}
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -288,10 +288,10 @@
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* This is for something specific to Infolog, in addition to the normal conversions.
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * This is for something specific to Infolog, in addition to the normal conversions.
+	 */
 	public static function convert(infolog_egw_record &$record)
 	{
 		// Stub, for now

Spacing +41 added lines, -41 removed lines

@@ -33,7 +33,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition)
+	public function export($_stream, importexport_definition $_definition)
 	{
 		$options = $_definition->plugin_options;
 
@@ -45,7 +45,7 @@ 
 		$this->export_object->set_mapping($options['mapping']);
 
 		$ids = array();
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'search':
 				$query = array_merge((array)Api\Cache::getSession('infolog', 'session_data'), $query);
@@ -54,37 +54,37 @@ 
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
-					if($field[0] == '#')
+				foreach ($options['mapping'] + (array)$_definition->filter as $field => $map) {
+					if ($field[0] == '#')
 					{
 						$query['custom_fields'] = true;
 						$query['selectcols'] .= ",$field";
 
-						if($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field,1)]['type']])
+						if ($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field, 1)]['type']])
 						{
-							$cf_links[$field] = $this->bo->customfields[substr($field,1)]['type'];
+							$cf_links[$field] = $this->bo->customfields[substr($field, 1)]['type'];
 						}
 					}
 				}
-				if($options['selection'] == 'filter')
+				if ($options['selection'] == 'filter')
 				{
 					$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 					$query['col_filter'] = $_definition->filter;
 
 					// Backend expects a string
-					if($query['col_filter']['info_responsible'])
+					if ($query['col_filter']['info_responsible'])
 					{
-						$query['col_filter']['info_responsible'] = implode(',',$query['col_filter']['info_responsible']);
+						$query['col_filter']['info_responsible'] = implode(',', $query['col_filter']['info_responsible']);
 					}
 
 					// Handle ranges
-					foreach($query['col_filter'] as $field => $value)
+					foreach ($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+						if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -97,13 +97,13 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app)
+					foreach ($cf_links as $field => $app)
 					{
-						foreach($selection as &$row)
+						foreach ($selection as &$row)
 						{
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+							if ($row[$field]) $cf_preload[$app][] = $row[$field];
 						}
-						if($cf_preload[$app])
+						if ($cf_preload[$app])
 						{
 							 $selects[$field] = Link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
@@ -112,12 +112,12 @@ 
 
 					$this->export_records($this->export_object, $options, $selection, $ids);
 					$query['start'] += $query['num_rows'];
-				} while($query['start'] < $query['total']);
+				} while ($query['start'] < $query['total']);
 
 				return $this->export_object;
 
 			default:
-				$ids = $selection = explode(',',$options['selection']);
+				$ids = $selection = explode(',', $options['selection']);
 				$this->export_records($this->export_object, $options, $selection, $ids);
 				break;
 		}
@@ -127,42 +127,42 @@ 
 	protected function export_records(&$export_object, $options, &$selection, $ids = array())
 	{
 		// Pre-load links all at once
-		if($ids && $options['mapping']['info_link_id'])
+		if ($ids && $options['mapping']['info_link_id'])
 		{
 			$links = Link::get_links_multiple('infolog', $ids, true, '!'.Link::VFS_APPNAME);
-			foreach($links as $id => $link)
+			foreach ($links as $id => $link)
 			{
-				if(!is_array($selection[$id])) break;
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['info_link_id'] = $link = array_pop($link);
-				if(!$options['convert'])
+				if (!$options['convert'])
 				{
-					$selection[$id]['info_link_id'] = $link['app'].':'. $link['id'];
+					$selection[$id]['info_link_id'] = $link['app'].':'.$link['id'];
 				}
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
-		if($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
+		if ($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
 		{
 			$projects = Link::get_links_multiple('infolog', $ids, true, 'projectmanager');
-			foreach($projects as $id => $links)
+			foreach ($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = Link::title('projectmanager', $selection[$id]['pm_id']);
-				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
+				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', $selection[$id]['pm_id']);
 			}
 		}
 
 		foreach ($selection as $_identifier)
 		{
-			if(!is_array($_identifier))
+			if (!is_array($_identifier))
 			{
 				$record = new infolog_egw_record($_identifier);
-				if(($link = $links[$record->info_id]))
+				if (($link = $links[$record->info_id]))
 				{
 					$record->info_link_id = $options['convert'] ? Link::title($link['app'], $link['id']) : ($link['app'].':'.$link['id']);
 				}
-				if(($project = $projects[$record->info_id]))
+				if (($project = $projects[$record->info_id]))
 				{
 					$record->pm_id = current($project);
 					$record->project = Link::title('projectmanager', $record->pm_id);
@@ -174,24 +174,24 @@ 
 				$record->set_record($_identifier);
 			}
 			// Some conversion
-			if($options['convert'])
+			if ($options['convert'])
 			{
 				$this->selects['info_status'] = $this->bo->get_status($record->info_type);
 				importexport_export_csv::convert($record, infolog_egw_record::$types, 'infolog', $this->selects);
 				$this->convert($record);
 
 				// Force 0 times to ''
-				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
+				foreach (array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if ($record->$field == 0) $record->$field = '';
 				}
 			}
 			else
 			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value)
+				foreach ($record->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $record->$key = implode(',', $value);
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
 			}
 			$export_object->export_record($record);
@@ -240,7 +240,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
+		if (is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
 		{
 			return $this->export_object->record->get_title();
 		}
@@ -272,18 +272,18 @@ 
 	{
 		$this->selects['info_type'] = $this->bo->enums['type'];
 		$this->selects['info_priority'] = $this->bo->enums['priority'];
-		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',false);
+		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', false);
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if (strpos($field_name, '#') === 0 && strpos($settings['type'], 'date') === 0) unset($filters[$field_name]);
 		}
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition)
 	{
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param $definition Specific definition
 	 *
-	 * @return array (
+	 * @return boolean (
 	 * 		name 		=> string,
 	 * 		content		=> array,
 	 * 		sel_options	=> array,