EGroupware / egroupware

infolog/inc/class.infolog_egw_record.inc.php

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@
 	// Used in conversions
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
-                'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+				'select-cat' => array('info_cat'),
+				'select-account' => array('info_owner','info_responsible','info_modifier'),
+				'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
 		'links' => array('info_link_id'),
-        );
+		);
 
 	/**
 	 * constructor

Spacing +10 added lines, -10 removed lines

@@ -26,8 +26,8 @@ 
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
                 'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+                'select-account' => array('info_owner', 'info_responsible', 'info_modifier'),
+                'date-time' => array('info_startdate', 'info_enddate', 'info_datecompleted', 'info_datemodified', 'info_created'),
 		'links' => array('info_link_id'),
         );
 
@@ -37,10 +37,10 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if (self::$bo == null) self::$bo = new infolog_bo();
+		if ($_identifier) {
 			$rec = self::$bo->read($this->identifier);
 			if (is_array($rec)) $this->set_record($rec);
 		}
@@ -95,7 +95,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 
 	}
 
@@ -162,7 +162,7 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +38 added lines, -17 removed lines

@@ -37,12 +37,20 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if(self::$bo == null)
+		{
+			self::$bo = new infolog_bo();
+		}
+		if($_identifier)
+		{
 			$rec = self::$bo->read($this->identifier);
-			if (is_array($rec)) $this->set_record($rec);
+			if (is_array($rec))
+			{
+				$this->set_record($rec);
+			}
 		}
 	}
 
@@ -51,7 +59,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -61,7 +70,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
@@ -73,7 +83,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -82,8 +93,10 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
-		if (empty($this->record)) {
+	public function get_title()
+	{
+		if (empty($this->record))
+		{
 			$this->get_record();
 		}
 		return self::$bo->link_title($this->record);
@@ -95,7 +108,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -104,7 +118,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -114,7 +129,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		$icon = 'infolog/navbar';
 		$ui = new infolog_ui();
 		if (!($icon = $ui->icons['type'][$this->info_type]))
@@ -133,7 +149,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 
 	}
 
@@ -143,7 +160,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 
 	}
 
@@ -154,7 +172,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 
 	}
 
@@ -162,7 +181,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -170,7 +190,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 	}
 
 } // end of egw_addressbook_record

infolog/inc/class.infolog_favorite_portlet.inc.php

Spacing +22 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 		$context['appname'] = 'infolog';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$ui = new infolog_ui();
 
@@ -73,7 +73,7 @@ 
 			if ($tpl->read('infolog.index.rows.'.$query['col_filter']['info_type']))
 			{
 				$query['template'] = $tpl->name;
-				$query['custom_fields'] = true;	// read the custom fields too
+				$query['custom_fields'] = true; // read the custom fields too
 			}
 		}
 		$ui = new infolog_ui();
@@ -105,27 +105,27 @@ 
 				// Some processing to add values in for links and cats
 				$multi_action = $values['nm']['multi_action'];
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
-				if(in_array($multi_action, array('link', 'responsible')))
+				if (in_array($multi_action, array('link', 'responsible')))
 				{
 					// eTemplate ignores the _popup namespace, but et2 doesn't
-					if($values[$multi_action.'_popup'])
+					if ($values[$multi_action.'_popup'])
 					{
-						$popup =& $values[$multi_action.'_popup'];
+						$popup = & $values[$multi_action.'_popup'];
 					}
 					else
 					{
-						$popup =& $values;
+						$popup = & $values;
 					}
-					$values['nm']['multi_action'] .= '_' . key($popup[$multi_action . '_action']);
-					if($multi_action == 'link')
+					$values['nm']['multi_action'] .= '_'.key($popup[$multi_action.'_action']);
+					if ($multi_action == 'link')
 					{
-						$popup[$multi_action] = $popup['link']['app'] . ':'.$popup['link']['id'];
+						$popup[$multi_action] = $popup['link']['app'].':'.$popup['link']['id'];
 					}
-					else if(is_array($popup[$multi_action]))
+					else if (is_array($popup[$multi_action]))
 					{
-						$popup[$multi_action] = implode(',',$popup[$multi_action]);
+						$popup[$multi_action] = implode(',', $popup[$multi_action]);
 					}
-					$values['nm']['multi_action'] .= '_' . $popup[$multi_action];
+					$values['nm']['multi_action'] .= '_'.$popup[$multi_action];
 					unset($values[$multi_action.'_popup']);
 					unset($values[$multi_action]);
 				}
@@ -133,24 +133,24 @@ 
 				if ($ui->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'],
 					$success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))
 				{
-					$msg .= lang('%1 entries %2',$success,$action_msg);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($values['nm']['selected'] as &$id)
+					$msg .= lang('%1 entries %2', $success, $action_msg);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($values['nm']['selected'] as &$id)
 					{
 						$id = 'infolog::'.$id;
 					}
 					// Directly request an update - this will get infolog tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($values['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($values['nm']['selected']));
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 				unset($values['nm']['multi_action']);
 				unset($values['nm']['select_all']);

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

infolog/inc/class.infolog_export_csv.inc.php

Indentation +4 added lines, -4 removed lines

@@ -259,10 +259,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

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -42,7 +42,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);
@@ -51,36 +51,36 @@ 
 			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]);
 					}
 				}
@@ -92,11 +92,11 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach ($cf_links as $field => $app) {
+						foreach ($selection as &$row) {
+							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]));
 						}
@@ -104,12 +104,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;
 		}
@@ -119,33 +119,33 @@ 
 	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) {
-				if(!is_array($selection[$id])) break;
+			foreach ($links as $id => $link) {
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = Link::title($link['app'], $link['id']);
+				if ($options['convert']) $selection[$id]['info_link_id'] = Link::title($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])) $record->info_link_id = $options['convert'] ? Link::title($link['app'], $link['id']) : $link;
-				if(($project = $projects[$record->info_id]))
+				if (($link = $links[$record->info_id])) $record->info_link_id = $options['convert'] ? Link::title($link['app'], $link['id']) : $link;
+				if (($project = $projects[$record->info_id]))
 				{
 					$record->pm_id = current($project);
 					$record->project = Link::title('projectmanager', $record->pm_id);
@@ -155,20 +155,20 @@ 
 				$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) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
 			}
 			$export_object->export_record($record);
@@ -213,7 +213,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();
 		}
@@ -243,18 +243,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]);
 		}
 	}
 
@@ -263,7 +263,7 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record&$record) {
 		// Stub, for now
 	}
 

Doc Comments +1 added lines, -1 removed lines

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

Braces +94 added lines, -34 removed lines

@@ -17,10 +17,12 @@ 
 /**
  * export plugin of infolog
  */
-class infolog_export_csv implements importexport_iface_export_plugin {
+class infolog_export_csv implements importexport_iface_export_plugin
+{
 
 
-	public function __construct() {
+	public function __construct()
+	{
 		Api\Translation::add_app('infolog');
 		$this->bo = new infolog_bo();
 		$this->get_selects();
@@ -31,7 +33,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -51,8 +54,10 @@ 
 			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";
 
@@ -76,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]);
 					}
 				}
@@ -92,11 +106,17 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach($cf_links as $field => $app)
+					{
+						foreach($selection as &$row)
+						{
+							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]));
 						}
@@ -122,10 +142,17 @@ 
 		if($ids && $options['mapping']['info_link_id'])
 		{
 			$links = Link::get_links_multiple('infolog', $ids, true, '!'.Link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach($links as $id => $link)
+			{
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = Link::title($link['app'], $link['id']);
+				if($options['convert'])
+				{
+					$selection[$id]['info_link_id'] = Link::title($link['app'], $link['id']);
+				}
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
@@ -134,28 +161,39 @@ 
 			$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']);
 			}
 		}
 
-		foreach ($selection as $_identifier) {
-			if(!is_array($_identifier)) {
+		foreach ($selection as $_identifier)
+		{
+			if(!is_array($_identifier))
+			{
 				$record = new infolog_egw_record($_identifier);
-				if(($link = $links[$record->info_id])) $record->info_link_id = $options['convert'] ? Link::title($link['app'], $link['id']) : $link;
+				if(($link = $links[$record->info_id]))
+				{
+					$record->info_link_id = $options['convert'] ? Link::title($link['app'], $link['id']) : $link;
+				}
 				if(($project = $projects[$record->info_id]))
 				{
 					$record->pm_id = current($project);
 					$record->project = Link::title('projectmanager', $record->pm_id);
 				}
-			} else {
+			}
+			else
+			{
 				$record = new infolog_egw_record();
 				$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);
@@ -163,12 +201,21 @@ 
 				// 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 {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
 			}
 			$export_object->export_record($record);
@@ -181,7 +228,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV export');
 	}
 
@@ -190,7 +238,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports Infolog entries into a CSV File.");
 	}
 
@@ -199,11 +248,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -226,14 +277,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'infolog.export_csv_selectors',
 		);
@@ -251,10 +304,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]);
+			}
 		}
 	}
 
@@ -263,7 +322,8 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record &$record)
+	{
 		// Stub, for now
 	}
 

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

infolog/inc/class.infolog_customfields.inc.php

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 use EGroupware\Api;
 use EGroupware\Api\Etemplate;
 
-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
  */
@@ -49,7 +49,7 @@ 
 		$this->status = &$this->bo->status;
 		$this->config_data = Api\Config::read('infolog');
 		$this->fields = &$this->bo->customfields;
-		$this->group_owners =& $this->bo->group_owners;
+		$this->group_owners = & $this->bo->group_owners;
 	}
 
 
@@ -58,10 +58,10 @@ 
 	 */
 	protected function app_index(&$content, &$sel_options, &$readonlys, &$preserve)
 	{
-		unset($sel_options);	// not used, but required by function signature
+		unset($sel_options); // not used, but required by function signature
 
 		$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,
@@ -99,7 +99,7 @@ 
 			unset($fields['delete']);
 		}
 
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			$name = trim($field['name']);
 			$old_name = $field['old_name'];
@@ -131,9 +131,9 @@ 
 			$values = array();
 			if (!empty($field['values']))
 			{
-				foreach(explode("\n",$field['values']) as $line)
+				foreach (explode("\n", $field['values']) as $line)
 				{
-					list($var2,$value) = explode('=',trim($line),2);
+					list($var2, $value) = explode('=', trim($line), 2);
 					$var = trim($var2);
 					$values[$var] = empty($value) ? $var : $value;
 				}
@@ -152,15 +152,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(array_keys($this->fields) as $name)
+		foreach (array_keys($this->fields) as $name)
 		{
 			$this->fields[$name]['order'] = ($n += 10);
 		}
@@ -183,7 +183,7 @@ 
 			unset($status['delete']);
 		}
 
-		foreach($status as $stat)
+		foreach ($status as $stat)
 		{
 			$name = trim($stat['name']);
 			$old_name = $stat['old_name'];
@@ -264,16 +264,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 $name)
+			foreach ($this->content_types as $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;
 				}
 			}
@@ -293,11 +293,11 @@ 
 	function save_repository()
 	{
 		// save changes to repository
-		Api\Config::save_value('types',$this->content_types,'infolog');
+		Api\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";
-		Api\Config::save_value('status',$this->status,'infolog');
+		Api\Config::save_value('status', $this->status, 'infolog');
 		//echo '<p>'.__METHOD__.'() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		Api\Storage\Customfields::save('infolog', $this->fields);
-		Api\Config::save_value('group_owners',$this->group_owners,'infolog');
+		Api\Config::save_value('group_owners', $this->group_owners, 'infolog');
 	}
 }

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;

infolog/inc/class.infolog_wizard_export_csv.inc.php

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
 		$bo = new infolog_tracking(new infolog_bo());
 		$this->export_fields = array('info_id' => 'Infolog ID', 'pm_id' => 'Project ID', 'project' => 'Project Name') + $bo->field2label;
 		// Add in created date, in the appropriate place
-		$first = array_splice($this->export_fields, 0, array_search('info_datemodified',array_keys($this->export_fields)));
+		$first = array_splice($this->export_fields, 0, array_search('info_datemodified', array_keys($this->export_fields)));
 		$this->export_fields = array_merge($first, array('info_created'=>'creation'), $this->export_fields);
 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

infolog/inc/class.infolog_merge.inc.php

Spacing +35 added lines, -35 removed lines

@@ -63,20 +63,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;
 	}
@@ -88,7 +88,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();
@@ -96,33 +96,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 Api\Preferences
-			if($field['type'] == 'date' || $field['type'] == 'date-time')
+			if ($field['type'] == 'date' || $field['type'] == 'date-time')
 			{
 				$this->date_fields[] = '#'.$name;
 				$array['#'.$name] = Api\DateTime::to($array['#'.$name], $field['type'] == 'date' ? true : '');
@@ -133,16 +133,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 = Link::get_links('infolog',$id,'timesheet');
-			$sum = ExecMethod('timesheet.timesheet_bo.sum',$links);
+			$links = 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 = Link::get_links('infolog', $id, 'projectmanager');
-		foreach($links as $app_id)
+		foreach ($links as $app_id)
 		{
 			$array['pm_id'] = $app_id;
 			$array['project'] = Link::title('projectmanager', $app_id);
@@ -150,14 +150,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);
 		}
@@ -181,11 +181,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'));
 		Api\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++;
@@ -198,26 +198,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++;
@@ -229,13 +229,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'),

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

infolog/inc/class.infolog_export_ical.inc.php

Indentation +3 added lines, -3 removed lines

@@ -109,8 +109,8 @@
 	 */
 	public function get_selectors_etpl() {
 		return array(
-                        'name'  => 'infolog.export_csv_selectors',
-                        'content'       => 'search'
-                );
+						'name'  => 'infolog.export_csv_selectors',
+						'content'       => 'search'
+				);
 	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 		$this->bo = new infolog_bo();
 
@@ -32,7 +32,7 @@ 
 
 		$ids = array();
 		$query = array();
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'search':
 				$query = array_merge(Api\Cache::getSession('infolog', 'session_data'), $query);
@@ -44,7 +44,7 @@ 
 
 				break;
 			default:
-				$ids = $this->selection = explode(',',$options['selection']);
+				$ids = $this->selection = explode(',', $options['selection']);
 				break;
 		}
 
@@ -89,7 +89,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_array($this->selection) && count($this->selection) == 1)
+		if (is_array($this->selection) && count($this->selection) == 1)
 		{
 			return $this->bo->link_title(current($this->selection));
 		}

Doc Comments +1 added lines, -1 removed lines

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

Braces +20 added lines, -9 removed lines

@@ -16,19 +16,24 @@ 
 /**
  * export iCal plugin of infolog
  */
-class infolog_export_ical extends infolog_export_csv {
+class infolog_export_ical extends infolog_export_csv
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 		$this->bo = new infolog_bo();
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('infolog');
+		if (!$limit_exception)
+		{
+			$export_limit = Api\Storage\Merge::getExportLimit('infolog');
+		}
 
 		$ids = array();
 		$query = array();
@@ -57,7 +62,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog iCal export');
 	}
 
@@ -66,7 +72,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports in iCal format.");
 	}
 
@@ -75,11 +82,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/infolog';
 	}
 
@@ -100,14 +109,16 @@ 
 	 * return html for options.
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors of this plugin
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
                         'name'  => 'infolog.export_csv_selectors',
                         'content'       => 'search'

infolog/inc/class.infolog_wizard_import_infologs_csv.inc.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['custom']);
 		$custom = Api\Storage\Customfields::get('infolog');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -62,20 +62,20 @@ 
 	# Skipped for now (or forever)
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 		// Check that record owner has access
 		$access = true;
-		if($content['record_owner'])
+		if ($content['record_owner'])
 		{
 			$bo = new infolog_bo();
-			$access = $bo->check_access(0,Acl::EDIT, $content['record_owner']);
+			$access = $bo->check_access(0, Acl::EDIT, $content['record_owner']);
 		}
 
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
 		{
-			if(!$access) {
+			if (!$access) {
 				$step = $content['step'];
 				unset($content['step']);
 				return $step;
@@ -83,34 +83,34 @@ 
 			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
 		else
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
-			if(!$access) {
-				$content['msg'] .= "\n* " . lang('Owner does not have edit rights');
+			if (!$access) {
+				$content['msg'] .= "\n* ".lang('Owner does not have edit rights');
 			}
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['record_owner']) && $content['plugin_options']) {
 				$content['record_owner'] = $content['plugin_options']['record_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'];
 			}
 
-			if(!in_array('info_owner', $content['field_mapping'])) {
+			if (!in_array('info_owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}
 

Braces +18 added lines, -8 removed lines

@@ -34,7 +34,8 @@ 
 		// List each custom field
 		unset($this->mapping_fields['custom']);
 		$custom = Api\Storage\Customfields::get('infolog');
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -62,7 +63,10 @@ 
 	# Skipped for now (or forever)
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.'->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 		// Check that record owner has access
 		$access = true;
@@ -75,7 +79,8 @@ 
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
 		{
-			if(!$access) {
+			if(!$access)
+			{
 				$step = $content['step'];
 				unset($content['step']);
 				return $step;
@@ -96,21 +101,26 @@ 
 		else
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
-			if(!$access) {
+			if(!$access)
+			{
 				$content['msg'] .= "\n* " . lang('Owner does not have edit rights');
 			}
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['record_owner']) && $content['plugin_options'])
+			{
 				$content['record_owner'] = $content['plugin_options']['record_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'];
 			}
 
-			if(!in_array('info_owner', $content['field_mapping'])) {
+			if(!in_array('info_owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}
 

infolog/inc/class.infolog_hooks.inc.php

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	static function not_enum_group_acls($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		$config = Api\Config::read('infolog');
 
 		return $config['group_owners'];
@@ -43,7 +43,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 
 		return array(
 			'query'      => 'infolog.infolog_bo.link_query',
@@ -66,7 +66,7 @@ 
 			'add_id'     => 'action_id',
 			'add_popup'  => '760x570',
 			'file_access'=> 'infolog.infolog_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'edit'       => array(
 				'menuaction' => 'infolog.infolog_ui.edit',
 			),
@@ -93,38 +93,38 @@ 
 			display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites($appname));
 
 			$file = array(
-				'infolog list' => Egw::link('/index.php',array(
+				'infolog list' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_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:app.infolog.add_link_sidemenu();"
 				),
-				'Placeholders' => Egw::link('/index.php','menuaction=infolog.infolog_merge.show_replacements')
+				'Placeholders' => Egw::link('/index.php', 'menuaction=infolog.infolog_merge.show_replacements')
 			);
-			display_sidebox($appname,$GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'),$file);
+			display_sidebox($appname, $GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
 			$file = Array(
-				'Site configuration' => Egw::link('/index.php',array(
+				'Site configuration' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
-				'Global Categories'  => Egw::link('/index.php',array(
+				'Global Categories'  => Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> True)),
-				'Custom fields, typ and status' => Egw::link('/index.php',array(
+				'Custom fields, typ and status' => Egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_customfields.index')),
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -137,19 +137,19 @@ 
 	static function settings()
 	{
 		/* Setup some values to fill the array of this app's settings below */
-		$info = new infolog_bo();	// need some labels from
+		$info = new infolog_bo(); // need some labels from
 		$filters = $show_home = array();
 		$show_home[] = lang("DON'T show InfoLog");
 		$filters['none'] = $info->filters[''];
-		foreach($info->filters as $key => $label)
+		foreach ($info->filters as $key => $label)
 		{
 			$show_home[$key] = $filters[$key] = lang($label);
 		}
 
 		// migrage old filter-pref 1,2 to the filter one 'own-open-today'
-		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'],array('1','2')))
+		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'], array('1', '2')))
 		{
-			$GLOBALS['egw']->preferences->add('infolog','homeShowEvents','own-open-today',$GLOBALS['type']);
+			$GLOBALS['egw']->preferences->add('infolog', 'homeShowEvents', 'own-open-today', $GLOBALS['type']);
 			$GLOBALS['egw']->preferences->save_repository();
 		}
 		$show_links = array(
@@ -226,7 +226,7 @@ 
 				'help'   => 'Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '1',	// Yes
+				'default'=> '1', // Yes
 			),
 			'listNoSubs' => array(
 				'type'   => 'select',
@@ -240,7 +240,7 @@ 
 				'help'   => 'Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the Subs via there parent.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '0',	// Allways show them
+				'default'=> '0', // Allways show them
 			),
 			'show_links' => array(
 				'type'   => 'select',
@@ -260,7 +260,7 @@ 
 				'help'   => 'Should the Infolog list show the percent done only for status ongoing or two separate icons.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> 1,	// Yes
+				'default'=> 1, // Yes
 			),
 			'limit_des_lines' => array(
 				'type'   => 'input',
@@ -289,7 +289,7 @@ 
 			'help'   => 'Do you want a notification, if items you created get updated?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 		$settings['notify_assigned'] = array(
 			'type'   => 'select',
@@ -303,7 +303,7 @@ 
 			),
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 
 		// to add options for more then 3 days back or in advance, you need to update soinfolog::users_with_open_entries()!
@@ -312,8 +312,8 @@ 
 			'-1d' => lang('one day after'),
 			'0d'  => lang('same day'),
 			'1d'  => lang('one day in advance'),
-			'2d'  => lang('%1 days in advance',2),
-			'3d'  => lang('%1 days in advance',3),
+			'2d'  => lang('%1 days in advance', 2),
+			'3d'  => lang('%1 days in advance', 3),
 		);
 		$settings['notify_due_delegated'] = array(
 			'type'   => 'select',
@@ -323,7 +323,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_due_responsible'] = array(
 			'type'   => 'select',
@@ -333,7 +333,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 		$settings['notify_start_delegated'] = array(
 			'type'   => 'select',
@@ -343,7 +343,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_start_responsible'] = array(
 			'type'   => 'select',
@@ -353,7 +353,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 
 		// receive notification for items owned by groups you are part of
@@ -364,7 +364,7 @@ 
 			'help'   => 'Do you want a notification if items owned by groups you are part of get updated ?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 
 		$settings[] = array(
@@ -383,8 +383,8 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'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('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'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('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -395,8 +395,8 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'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('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'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('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -485,12 +485,12 @@ 
 	 */
 	private static function all_cats()
 	{
-		$categories = new Api\Categories('','infolog');
+		$categories = new Api\Categories('', 'infolog');
 		$accountId = $GLOBALS['egw_info']['user']['account_id'];
 
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 			{
@@ -498,13 +498,13 @@ 
 			}
 			elseif ($cat['owner'] != $accountId)
 			{
-				$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
+				$s .= '<'.$GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname').'>';
 			}
 			elseif ($cat['access'] == 'private')
 			{
 				$s .= ' ♥';
 			}
-			$sel_options[$cat['id']] = $s;	// 0.9.14 only
+			$sel_options[$cat['id']] = $s; // 0.9.14 only
 		}
 		return $sel_options;
 	}
@@ -525,7 +525,7 @@ 
 
 			if (!$async->read('infolog-async-notification'))
 			{
-				$async->set_timer(array('hour' => 2),'infolog-async-notification','infolog.infolog_bo.async_notification',null);
+				$async->set_timer(array('hour' => 2), 'infolog-async-notification', 'infolog.infolog_bo.async_notification', null);
 			}
 		}
 	}
@@ -538,7 +538,7 @@ 
 	 */
 	public static function acl_rights($params)
 	{
-		unset($params);	// not used, but default function signature for hooks
+		unset($params); // not used, but default function signature for hooks
 		return array(
 			Acl::READ    => 'read',
 			Acl::ADD     => 'add',
@@ -556,7 +556,7 @@ 
 	 */
 	public static function categories($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		return true;
 	}
 
@@ -567,9 +567,9 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
-		return array (
+		return array(
 			'menuaction' => 'infolog.infolog_ui.mail_import',
 			'popup' => Link::get_registry('infolog', 'edit_popup')
 		);

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(