EGroupware / egroupware

importexport/inc/class.importexport_import_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 		 *
 		 * @param importexport_iface_import_plugin $plugin Instance of plugin to be used
 		 * @param resource $stream
-		 * @param importexport_definition $definition
+		 * @param importexport_definition $definition_obj
 		 * @return String HTML fragment illustrating how the data will be understood by Egw
 		 */
 		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)

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

@@ -226,7 +226,7 @@
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(array $data) {
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),

Indentation +4 added lines, -4 removed lines

@@ -40,8 +40,8 @@ 
 		}
 
 		/**
-		*  Step user through importing their file
-		*/
+		 *  Step user through importing their file
+		 */
 		public function import_dialog($content = array()) {
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
@@ -223,8 +223,8 @@ 
 		}
 
 		/**
-		* Get options for select boxes
-		*/
+		 * Get options for select boxes
+		 */
 		public static function get_select_options(Array $data) {
 			$options = array(
 				'delimiter' => array(

Spacing +77 added lines, -77 removed lines

@@ -36,7 +36,7 @@ 
 		private $plugins;
 
 		public function __construct() {
-			$this->plugins = importexport_helper_functions::get_plugins('all','import');
+			$this->plugins = importexport_helper_functions::get_plugins('all', 'import');
 		}
 
 		/**
@@ -52,20 +52,20 @@ 
 			$template = new Etemplate('importexport.import_dialog');
 
 			// Load application's translations
-			if($appname)
+			if ($appname)
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if ($content['import'] && $definition) {
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if ($content['dry-run']) {
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
-					$options =& $definition_obj->plugin_options;
+					$options = & $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if ($content['delimiter']) {
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -74,8 +74,8 @@ 
 					$plugin = new $definition_obj->plugin;
 
 					// Check file encoding matches import
-					$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024);
-					if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
+					$sample = file_get_contents($content['file']['tmp_name'], false, null, 0, 1024);
+					if ($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
 					{
 						$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 					}
@@ -85,7 +85,7 @@ 
 					}
 					$required = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 					$encoding = Api\Translation::detect_encoding($sample, $required);
-					if($encoding && strtoupper($required) != strtoupper($encoding))
+					if ($encoding && strtoupper($required) != strtoupper($encoding))
 					{
 						$this->message = lang("Encoding mismatch.  Expected %1 file, you uploaded %2.<br />\n",
 							$required,
@@ -100,37 +100,37 @@ 
 					$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 
 					// Destination if we need to hold the file
-					if($file)
+					if ($file)
 					{
 						$cachefile = new egw_cache_files(array());
 						$dst_file = $cachefile->filename(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport',
-							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true);
+							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true), true);
 						// Keep file
-						if($dst_file)
+						if ($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if ($content['file']['name'] && copy($content['file']['tmp_name'], $dst_file)) {
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
 
 						// Check on matching columns
 						$check_message = array();
-						if(!self::check_file($file, $definition_obj, $check_message, $dst_file))
+						if (!self::check_file($file, $definition_obj, $check_message, $dst_file))
 						{
 							// Set this so plugin doesn't do any data changes
 							$content['dry-run'] = true;
 							importexport_helper_functions::$dry_run = true;
-							$this->message .= '<b>' . lang('Import aborted').":</b><br />\n";
+							$this->message .= '<b>'.lang('Import aborted').":</b><br />\n";
 							$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 						}
-						if(count($check_message))
+						if (count($check_message))
 						{
-							$this->message .= implode($check_message, "<br />\n") . "<br />\n";
+							$this->message .= implode($check_message, "<br />\n")."<br />\n";
 						}
-						if($content['dry-run'])
+						if ($content['dry-run'])
 						{
 							$preview = $this->preview($plugin, $file, $definition_obj);
-							if(trim($this->message) == '')
+							if (trim($this->message) == '')
 							{
 								// Clear first, to prevent request from being collected if the result is the same
 								$template->setElementAttribute('preview', 'value', '');
@@ -149,34 +149,34 @@ 
 						$this->message .= lang('please select file to import'."<br />\n");
 					}
 
-					if($content['dry-run'])
+					if ($content['dry-run'])
 					{
-						$this->message .= '<b>' . lang('test only').":</b><br />\n";
+						$this->message .= '<b>'.lang('test only').":</b><br />\n";
 					}
 					$this->message .= lang('%1 records processed', $count);
 
 					// Refresh opening window
-					if(!$content['dry-run'])
+					if (!$content['dry-run'])
 					{
-						Framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
+						Framework::refresh_opener(lang('%1 records processed', $count), $appname, null, null, $appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
-						$this->message .= "<br />\n" . lang($action) . ": $a_count";
+					foreach ($plugin->get_results() as $action => $a_count) {
+						$this->message .= "<br />\n".lang($action).": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if (count($plugin->get_warnings())) {
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach ($plugin->get_warnings() as $record => $message) {
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if (count($plugin->get_errors())) {
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach ($plugin->get_errors() as $record => $message) {
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 					}
 					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
 						// Remove file
@@ -189,7 +189,7 @@ 
 					$this->message .= $e->getMessage();
 				}
 			}
-			elseif($content['cancel'])
+			elseif ($content['cancel'])
 			{
 				egw_framework::set_onload('window.close();');
 			}
@@ -202,7 +202,7 @@ 
 				);
 			}
 
-			if(!array_key_exists('dry-run',$content))
+			if (!array_key_exists('dry-run', $content))
 			{
 				$data['dry-run'] = true;
 			}
@@ -210,14 +210,14 @@ 
 			$data['appname'] = $preserve['appname'] = $appname ? $appname : ($definition_obj ? $definition_obj->application : '');
 			$data['definition'] = $definition;
 			$data['delimiter'] = $definition_obj->plugin_options['delimiter'];
-			$data['no_notifications'] = true;	// switch notifications off by default
+			$data['no_notifications'] = true; // switch notifications off by default
 
 			$sel_options = self::get_select_options($data);
 
 			$data['message'] = $this->message;
-			Framework::includeJS('.','importexport','importexport');
+			Framework::includeJS('.', 'importexport', 'importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if ($_GET['appname']) $readonlys['appname'] = true;
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -239,12 +239,12 @@ 
 			);
 
 			(array)$apps = importexport_helper_functions::get_apps('import');
-			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
+			$options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
 
-			if($data['appname']) {
+			if ($data['appname']) {
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if ($data['file'] && !is_array($data['file'])) {
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
@@ -282,28 +282,28 @@ 
 		 * @param importexport_definition $definition
 		 * @return String HTML fragment illustrating how the data will be understood by Egw
 		 */
-		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)
+		protected function preview(importexport_iface_import_plugin&$plugin, &$stream, importexport_definition&$definition_obj)
 		{
-			if(method_exists($plugin, 'preview'))
+			if (method_exists($plugin, 'preview'))
 			{
 				$preview = $plugin->preview($stream, $definition_obj);
 			}
-			elseif($definition_obj->plugin_options['csv_fields'])
+			elseif ($definition_obj->plugin_options['csv_fields'])
 			{
-				$import_csv = new importexport_import_csv( $stream, array(
+				$import_csv = new importexport_import_csv($stream, array(
 					'fieldsep' => $definition_obj->plugin_options['fieldsep'],
 					'charset' => $definition_obj->plugin_options['charset'],
 				));
 				// set FieldMapping.
 				$import_csv->mapping = $definition_obj->plugin_options['field_mapping'];
 
-				$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
-				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
+				$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
+				for ($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if ($row_data === false) break;
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if ($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
 				}
 				$preview = Api\Html::table($rows);
 				rewind($stream);
@@ -312,22 +312,22 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if (count($plugin->get_warnings())) {
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach ($plugin->get_warnings() as $record => $message) {
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if (count($plugin->get_errors())) {
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach ($plugin->get_errors() as $record => $message) {
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 				$this->message .= "<br />\n";
 			}
-			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
+			return '<div class="header">'.lang('Preview').' - '.$plugin->get_name().'</div>'.$preview;
 		}
 
 		/**
@@ -345,24 +345,24 @@ 
 		 */
 		public static function check_file(&$file, &$definition, &$message = array(), $dst_file = false)
 		{
-			$options =& $definition->plugin_options;
+			$options = & $definition->plugin_options;
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if (!$options['csv_fields']) return true;
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if ($options['num_header_lines'] == 0) return true;
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 
 			$data = fgetcsv($file, 8000, $options['fieldsep']);
 			rewind($file);
-			$data = Api\Translation::convert($data,$charset);
+			$data = Api\Translation::convert($data, $charset);
 
 			$ok = true;
-			if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
+			if (count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
 			{
 				$message[] = lang("Column mismatch.  Expected %1 columns, your file has %2.",
 					count($options['field_mapping']),
@@ -370,9 +370,9 @@ 
 				);
 				$ok = false;
 			}
-			foreach($data as $index => $header)
+			foreach ($data as $index => $header)
 			{
-				if($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
+				if ($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
 				{
 					// Skipped column in definition
 					continue;
@@ -384,16 +384,16 @@ 
 				}
 
 				// Check for matching headers
-				if($options['csv_fields'][$index] == $header)
+				if ($options['csv_fields'][$index] == $header)
 				{
 					// Simple match
 					continue;
 				}
 				// Check column headers, taking into account different translations - make sure no *
-				$lang_defn = mb_strtoupper(Api\Translation::translate($options['csv_fields'][$index],false,''));
-				$lang_file = mb_strtoupper(Api\Translation::translate($header,false,''));
+				$lang_defn = mb_strtoupper(Api\Translation::translate($options['csv_fields'][$index], false, ''));
+				$lang_file = mb_strtoupper(Api\Translation::translate($header, false, ''));
 
-				if($lang_defn == $lang_file ||
+				if ($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
 				)
@@ -405,7 +405,7 @@ 
 				$file_message_id = Api\Translation::get_message_id($header, $definition->application);
 				$defn_message_id = Api\Translation::get_message_id($options['csv_fields'][$index], $definition->application);
 
-				if($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
+				if ($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
 				{
 					continue;
 				}
@@ -413,19 +413,19 @@ 
 
 				// Problem
 				$message[] = lang("Column mismatch: %1 should be %2, not %3",
-					$index,$options['csv_fields'][$index], $header);
+					$index, $options['csv_fields'][$index], $header);
 				// But can still continue
 				// $ok = false;
 			}
-			if(!$ok || count($message) != $message_count)
+			if (!$ok || count($message) != $message_count)
 			{
 				// Add links for new / edit definition
 				$config = Api\Config::read('importexport');
-				if($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
+				if ($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
 				{
 					$actions = '';
 					// New definition
-					$add_link = Egw::link('/index.php',array(
+					$add_link = Egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_definitions_ui.edit',
 						'application' => $definition->application,
 						'plugin' => $definition->plugin,
@@ -437,13 +437,13 @@ 
 							'menuaction' => 'importexport.importexport_import_ui.import_dialog',
 							// Don't set appname, or user won't be able to select & see their new definition
 							//'appname' => $definition->application,
-						)) . "';
+						))."';
 						egw_openWindowCentered2('$add_link','_blank',500,500,'yes');
 					";
 					$actions[] = lang('Create a <a href="%1">new definition</a> for this file', $add_link);
 
 					// Edit selected definition, if allowed
-					if($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
+					if ($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
 						!$definition->owner && $GLOBALS['egw_info']['user']['apps']['admin'])
 					{
 						$edit_link = array(
@@ -452,20 +452,20 @@ 
 							// Jump to file step
 							'step' => 'wizard_step21'
 						);
-						if($dst_file)
+						if ($dst_file)
 						{
 							// Still have uploaded file, jump there
-							Api\Cache::setSession($definition->application,'csvfile',$dst_file);
+							Api\Cache::setSession($definition->application, 'csvfile', $dst_file);
 							$edit_link['step'] = 'wizard_step30';
 						}
-						$edit_link = Egw::link('/index.php',$edit_link);
+						$edit_link = Egw::link('/index.php', $edit_link);
 						$edit_link = "javascript:egw_openWindowCentered2('$edit_link','_blank',500,500,'yes')";
 						$actions[] = lang('Edit definition <a href="%1">%2</a> to match your file',
-							$edit_link, $definition->name );
+							$edit_link, $definition->name);
 					}
-					$actions[] = lang('Edit your file to match the definition:') . ' '
-					. implode(array_map('lang',array_intersect_key($options['csv_fields'],$options['field_mapping'])),', ');
-					$message[] = "\n<li>".implode($actions,"\n<li>");
+					$actions[] = lang('Edit your file to match the definition:').' '
+					. implode(array_map('lang', array_intersect_key($options['csv_fields'], $options['field_mapping'])), ', ');
+					$message[] = "\n<li>".implode($actions, "\n<li>");
 				}
 			}
 			return $ok;

Braces +75 added lines, -32 removed lines

@@ -20,7 +20,8 @@ 
  *
 */
 
-	class importexport_import_ui {
+	class importexport_import_ui
+	{
 
 		const _appname = 'importexport';
 
@@ -35,14 +36,16 @@ 
 		 */
 		private $plugins;
 
-		public function __construct() {
+		public function __construct()
+		{
 			$this->plugins = importexport_helper_functions::get_plugins('all','import');
 		}
 
 		/**
 		*  Step user through importing their file
 		*/
-		public function import_dialog($content = array()) {
+		public function import_dialog($content = array())
+		{
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
 
@@ -56,16 +59,19 @@ 
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if($content['import'] && $definition)
+			{
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if($content['dry-run'])
+					{
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
 					$options =& $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if($content['delimiter'])
+					{
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -108,7 +114,8 @@ 
 						// Keep file
 						if($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file))
+							{
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
@@ -161,31 +168,41 @@ 
 						Framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
+					foreach($plugin->get_results() as $action => $a_count)
+					{
 						$this->message .= "<br />\n" . lang($action) . ": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if(count($plugin->get_warnings()))
+					{
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach($plugin->get_warnings() as $record => $message)
+						{
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if(count($plugin->get_errors()))
+					{
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach($plugin->get_errors() as $record => $message)
+						{
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if($count != $total_processed)
+						{
+							$this->message .= "<br />\n".lang('Some records may not have been imported');
+						}
 					}
-					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
+					if ($dst_file && $content['file']['tmp_name'] == $dst_file)
+					{
 						// Remove file
 						$cachefile->delete(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport',
 							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id'])));
 						unset($dst_file);
 					}
 
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->message .= $e->getMessage();
 				}
 			}
@@ -217,7 +234,10 @@ 
 			$data['message'] = $this->message;
 			Framework::includeJS('.','importexport','importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if($_GET['appname'])
+			{
+				$readonlys['appname'] = true;
+			}
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -225,7 +245,8 @@ 
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(Array $data)
+		{
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),
@@ -241,17 +262,20 @@ 
 			(array)$apps = importexport_helper_functions::get_apps('import');
 			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
 
-			if($data['appname']) {
+			if($data['appname'])
+			{
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if($data['file'] && !is_array($data['file']))
+				{
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
 					'type' => 'import',
 					'application' => $data['appname']
 				));
-				foreach ((array)$definitions->get_definitions() as $identifier) {
+				foreach ((array)$definitions->get_definitions() as $identifier)
+				{
 					try
 					{
 						$definition = new importexport_definition($identifier);
@@ -261,7 +285,8 @@ 
 						// Permission error
 						continue;
 					}
-					if ($title = $definition->get_title()) {
+					if ($title = $definition->get_title())
+					{
 						$options['definition'][$title] = $title;
 					}
 					unset($definition);
@@ -301,9 +326,15 @@ 
 				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if($row_data === false)
+					{
+						break;
+					}
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'])
+					{
+						$row--;
+					}
 				}
 				$preview = Api\Html::table($rows);
 				rewind($stream);
@@ -312,19 +343,26 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if(count($plugin->get_warnings()))
+			{
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach($plugin->get_warnings() as $record => $message)
+				{
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if(count($plugin->get_errors()))
+			{
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach($plugin->get_errors() as $record => $message)
+				{
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if($count != $total_processed)
+				{
+					$this->message .= "<br />\n".lang('Some records may not have been imported');
+				}
 				$this->message .= "<br />\n";
 			}
 			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
@@ -349,10 +387,16 @@ 
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if(!$options['csv_fields'])
+			{
+				return true;
+			}
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if($options['num_header_lines'] == 0)
+			{
+				return true;
+			}
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
@@ -396,8 +440,7 @@ 
 				if($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
-				)
-				{
+				) {
 					continue;
 				}
 

infolog/inc/class.infolog_bo.inc.php

Doc Comments +2 added lines, -5 removed lines

@@ -1226,7 +1226,7 @@ 
 	 * Is called as hook to participate in the linking
 	 *
 	 * @param int|array $info int info_id or array with infolog entry
-	 * @return string|boolean string with the title, null if $info not found, false if no perms to view
+	 * @return string string with the title, null if $info not found, false if no perms to view
 	 */
 	function link_title($info)
 	{
@@ -1324,9 +1324,6 @@ 
 	/**
 	 * hook called be calendar to include events or todos in the cal-dayview
 	 *
-	 * @param int $args[year], $args[month], $args[day] date of the events
-	 * @param int $args[owner] owner of the events
-	 * @param string $args[location] calendar_include_{events|todos}
 	 * @return array of events (array with keys starttime, endtime, title, view, icon, content)
 	 */
 	function cal_to_include($args)
@@ -1515,7 +1512,7 @@ 
 	 * Get names for categories specified by their id's
 	 *
 	 * @param array|string $cat_id_list array or comma-sparated list of id's
-	 * @return array with names
+	 * @return string|boolean with names
 	 */
 	function get_categories($cat_id_list)
 	{

Braces +203 added lines, -56 removed lines

@@ -232,7 +232,10 @@ 
 				$this->enums['type'] += $config_data['types'];
 				//echo "types:<pre>"; print_r($this->enums['type']); echo "</pre>\n";
 			}
-			if ($config_data['group_owners']) $this->group_owners = $config_data['group_owners'];
+			if ($config_data['group_owners'])
+			{
+				$this->group_owners = $config_data['group_owners'];
+			}
 
 			$this->customfields = Api\Storage\Customfields::get('infolog');
 			if ($this->customfields)
@@ -242,17 +245,35 @@ 
 					// old infolog customefield record
 					if(empty($field['type']))
 					{
-						if (count($field['values'])) $field['type'] = 'select'; // selectbox
-						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
-						elseif (intval($field['len']) > 0) $field['type'] = 'text'; // regular input field
-						else $field['type'] = 'label'; // header-row
+						if (count($field['values']))
+						{
+							$field['type'] = 'select';
+						}
+						// selectbox
+						elseif ($field['rows'] > 1)
+						{
+							$field['type'] = 'textarea';
+						}
+						// textarea
+						elseif (intval($field['len']) > 0)
+						{
+							$field['type'] = 'text';
+						}
+						// regular input field
+						else {
+							$field['type'] = 'label';
+						}
+						// header-row
 						$field['type2'] = $field['typ'];
 						unset($field['typ']);
 						$this->customfields[$name] = $field;
 						$save_config = true;
 					}
 				}
-				if ($save_config) Api\Config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config)
+				{
+					Api\Config::save_value('customfields',$this->customfields,'infolog');
+				}
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
@@ -279,7 +300,10 @@ 
 		// sort types by there translation
 		foreach($this->enums['type'] as $key => $val)
 		{
-			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
+			if (($val = lang($key)) != $key.'*')
+			{
+				$this->enums['type'][$key] = lang($key);
+			}
 		}
 		natcasesort($this->enums['type']);
 
@@ -334,11 +358,18 @@ 
 
 		$info_id = is_array($info) ? $info['info_id'] : $info;
 
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id)
+			{
+				$access =& $cache[$info_id][$required_rights];
+			}
+			// we only cache the current user!
 		}
 		else
 		{
@@ -357,16 +388,22 @@ 
 			// handle delete for the various history modes
 			if ($this->history)
 			{
-				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
+				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id))))
+				{
+					return false;
+				}
 
 				if ($info['info_status'] == 'deleted' &&
 					($required_rights == Acl::EDIT ||		// no edit rights for deleted entries
 					 $required_rights == Acl::ADD  ||		// no add rights for deleted entries
 					 $required_rights == Acl::DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))
+				{
+					// delete only for admins
 				{
 					$access = false;
 				}
+				}
 				elseif ($required_rights == self::ACL_UNDELETE)
 				{
 					if ($info['info_status'] != 'deleted')
@@ -427,11 +464,14 @@ 
 
 		if ($info['info_link_id'] > 0 &&
 			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
-			 ($link = Link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
+			 ($link = Link::get_link($info['info_link_id'])) !== False))
+		{
+			// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
 			{
 				$app = $link['app'];
+		}
 				$id  = $link['id'];
 			}
 			else
@@ -442,10 +482,13 @@ 
 			}
 			$title = Link::title($app,$id);
 
-			if ((string)$info['info_custom_from'] === '')	// old entry
+			if ((string)$info['info_custom_from'] === '')
+			{
+				// old entry
 			{
 				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
+			}
 			if (!$info['info_custom_from'])
 			{
 				$info['info_from'] = '';
@@ -495,12 +538,15 @@ 
 	 function time2time(&$values, $fromTZId=false, $toTZId=null)
 	 {
 
-		if ($fromTZId === $toTZId) return;
+		if ($fromTZId === $toTZId)
+		{
+			return;
+		}
 
 		$tz = Api\DateTime::$server_timezone;
 
 	 	if ($fromTZId)
-		{
+	 	{
 			if (!isset(self::$tz_cache[$fromTZId]))
 			{
 				self::$tz_cache[$fromTZId] = calendar_timezones::DateTimeZone($fromTZId);
@@ -534,7 +580,7 @@ 
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.Api\DateTime::$user_timezone->getName());
 	 	foreach($this->timestamps as $key)
-		{
+	 	{
 		 	if ($values[$key])
 		 	{
 			 	$time = new Api\DateTime($values[$key], $tz);
@@ -564,7 +610,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return Api\DateTime::server2user($ts,$date_format);
 	}
@@ -601,16 +650,22 @@ 
 			return null;
 		}
 
-		if (!$ignore_acl && !$this->check_access($data,Acl::READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data,Acl::READ))
+		{
+			// check behind read, to prevent a double read
 		{
 			return False;
 		}
+		}
 
 		if ($data['info_subject'] == $this->subject_from_des($data['info_des']))
 		{
 			$data['info_subject'] = '';
 		}
-		if ($run_link_id2from) $this->link_id2from($data);
+		if ($run_link_id2from)
+		{
+			$this->link_id2from($data);
+		}
 
 		// convert server- to user-time
 		if ($date_format == 'ts')
@@ -673,7 +728,11 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted')
+			{
+				return false;
+			}
+			// entry already deleted
 
 			$this->so->write($deleted);
 
@@ -685,7 +744,9 @@ 
 
 			Link::unlink(0,'infolog',$info_id);
 		}
-		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
+		if ($info['info_status'] != 'deleted')
+		{
+			// dont notify of final purge of already deleted items
 		{
 			// send email notifications and do the history logging
 			if(!$skip_notification)
@@ -693,6 +754,7 @@ 
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
+		}
 				}
 				$this->tracking->track($deleted,$info,$this->user,true);
 			}
@@ -741,10 +803,13 @@ 
 			{
 				$responsible = $values['info_responsible'];
 			}
-			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
+			if (!($status_only = in_array($this->user, (array)$responsible)))
+			{
+				// responsible has implicit right to change status
 			{
 				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
+			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
 				$status_only = $undelete = $this->check_access($values['info_id'],self::ACL_UNDELETE);
@@ -764,17 +829,23 @@ 
 				$values['info_status'] = $this->status['defaults'][$values['info_type']];
 			}
 		}
-		if ($status_only && !$undelete)	// make sure only status gets writen
+		if ($status_only && !$undelete)
+		{
+			// make sure only status gets writen
 		{
 			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
 				in_array($values['info_status'],array('done','billed','cancelled'));
+		}
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
 			$values['info_datemodified'] = $values_in['info_datemodified'];
 			foreach ($this->responsible_edit as $name)
 			{
-				if (isset($values_in[$name])) $values[$name] = $values_in[$name];
+				if (isset($values_in[$name]))
+				{
+					$values[$name] = $values_in[$name];
+				}
 			}
 			if ($set_completed)
 			{
@@ -782,21 +853,30 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
-					if (isset($this->status[$values['info_type']]['done'])) {
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$forcestatus = true;
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$forcestatus = true;
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$forcestatus = true;
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
+					$values['info_status'] = $status;
+				}
 			}
 			$check_defaults = false;
 		}
@@ -828,14 +908,22 @@ 
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
 				$status = 'done';
-				if (isset($values['info_type'])) {
-					if (isset($this->status[$values['info_type']]['done'])) {
+				if (isset($values['info_type']))
+				{
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$status = 'cancelled';
-					} else {
+					}
+					else
+					{
 						// since the comlete stati above do not exist for that type, dont change it
 						$status = $values['info_status'];
 					}
@@ -857,7 +945,10 @@ 
 				$custom = Api\Storage\Customfields::get('infolog');
 				foreach($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					if($c_field['type2'])
+					{
+						$type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					}
 					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
 					{
 						// Required custom field
@@ -876,8 +967,7 @@ 
 			{
 				if (!$this->check_access($values['info_id'],Acl::EDIT) ||
 					!$values['info_id'] && !$this->check_access($values,Acl::ADD)
-				)
-				{
+				) {
 					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
@@ -941,10 +1031,16 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
-			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
+			if (!array_key_exists('info_responsible',$values))
+			{
+				$values['info_responsible'] = $old['info_responsible'];
+			}
+			if (!is_array($values['info_responsible']))
+			{
+				// this should not happen, bug it does ;-)
 			{
 				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+			}
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 			// create (and remove) links in custom fields
@@ -989,7 +1085,10 @@ 
 			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
 				null,$skip_notification);
 
-			if ($info_from_set) $values['info_from'] = '';
+			if ($info_from_set)
+			{
+				$values['info_from'] = '';
+			}
 
 			// Change new values back to user time before sending them back
 			if($user2server)
@@ -1039,13 +1138,25 @@ 
 
 		if($query['filter'] == 'bydate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'private')
 		{
@@ -1127,7 +1238,10 @@ 
 
 		$result =& $this->search($filter);
 
-		if (empty($result)) return 'EGw-empty-wGE';
+		if (empty($result))
+		{
+			return 'EGw-empty-wGE';
+		}
 
 		$entry = array_shift($result);
 
@@ -1174,7 +1288,10 @@ 
 				'to_id' => 0,
 			),
 		);
-		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default']) $info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'])
+		{
+			$info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		}
 		// find the addressbookentry to link with
 		$addressbook = new Api\Contacts();
 		$contacts = array();
@@ -1432,7 +1549,10 @@ 
 			}
 			foreach($this->anzSubs(array_keys($infos)) as $info_id => $subs)
 			{
-				if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+				if ($subs)
+				{
+					$infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+				}
 			}
 		}
 		return $infos;
@@ -1558,7 +1678,10 @@ 
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
 		foreach($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email')))
+			{
+				continue;
+			}
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->__construct($user);
@@ -1576,7 +1699,10 @@ 
 				'notify_start_delegated'   => 'open-delegated-date',
 			) as $pref => $filter)
 			{
-				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
+				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref]))
+				{
+					continue;
+				}
 
 				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
@@ -1585,7 +1711,10 @@ 
 				foreach($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'],$notified_info_ids))
+					{
+						continue;
+					}
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
@@ -1714,11 +1843,17 @@ 
 			$statis = $icons = array();
 			foreach($this->status as $t => $stati)
 			{
-				if ($t === 'defaults') continue;
+				if ($t === 'defaults')
+				{
+					continue;
+				}
 				foreach($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
-					if (!isset($icons[$val])) $icons[$val] = $label;
+					if (!isset($icons[$val]))
+					{
+						$icons[$val] = $label;
+					}
 				}
 			}
 			foreach($statis as $val => &$labels)
@@ -1794,7 +1929,10 @@ 
 			{
 				return array($egwData['info_id']);
 			}
-			if (!$relax) return array();
+			if (!$relax)
+			{
+				return array();
+			}
 		}
 		unset($infoData['info_id']);
 
@@ -1803,7 +1941,10 @@ 
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
 			foreach($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,Acl::READ)) continue;
+				if (!$this->check_access($egwData,Acl::READ))
+				{
+					continue;
+				}
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -1855,7 +1996,10 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData,Acl::READ))
+			{
+				continue;
+			}
 
 			switch ($infoData['info_type'])
 			{
@@ -1928,7 +2072,10 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData,Acl::READ))
+			{
+				continue;
+			}
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);

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

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

Indentation +16 added lines, -16 removed lines

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

Spacing +237 added lines, -238 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	var $total;
 	var $vfs;
-	var $vfs_basedir='/infolog';
+	var $vfs_basedir = '/infolog';
 	/**
 	 * Set Logging
 	 *
@@ -65,13 +65,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $timestamps = array('info_startdate','info_enddate','info_datemodified','info_datecompleted','info_created');
+	var $timestamps = array('info_startdate', 'info_enddate', 'info_datemodified', 'info_datecompleted', 'info_created');
 	/**
 	 * fields the responsible user can change
 	 *
 	 * @var array
 	 */
-	var $responsible_edit=array('info_status','info_percent','info_datecompleted');
+	var $responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 	/**
 	 * Fields to exclude from copy, if an entry is copied, the ones below are excluded by default.
 	 *
@@ -95,19 +95,19 @@ 
 	 *
 	 * @var string
 	 */
-	var $implicit_rights='read';
+	var $implicit_rights = 'read';
 	/**
 	 * Custom fields read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Group owners for certain types read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $group_owners=array();
+	var $group_owners = array();
 	/**
 	 * Current user
 	 *
@@ -174,55 +174,55 @@ 
 	function __construct($info_id = 0)
 	{
 		$this->enums = $this->stock_enums = array(
-			'priority' => array (
+			'priority' => array(
 				3 => 'urgent',
 				2 => 'high',
 				1 => 'normal',
 				0 => 'low'
 			),
 			'confirm'   => array(
-				'not' => 'not','accept' => 'accept','finish' => 'finish',
+				'not' => 'not', 'accept' => 'accept', 'finish' => 'finish',
 				'both' => 'both' ),
 			'type'      => array(
-				'task' => 'task','phone' => 'phone','note' => 'note','email' => 'email'
+				'task' => 'task', 'phone' => 'phone', 'note' => 'note', 'email' => 'email'
 			/*	,'confirm' => 'confirm','reject' => 'reject','fax' => 'fax' not implemented so far */ )
 		);
 		$this->status = $this->stock_status = array(
 			'defaults' => array(
-				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done','email' => 'done'),
+				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done', 'email' => 'done'),
 			'task' => array(
-				'offer' => 'offer',				// -->  NEEDS-ACTION
-				'not-started' => 'not-started',	// iCal NEEDS-ACTION
-				'ongoing' => 'ongoing',			// iCal IN-PROCESS
-				'done' => 'done',				// iCal COMPLETED
-				'cancelled' => 'cancelled',		// iCal CANCELLED
-				'billed' => 'billed',			// -->  DONE
-				'template' => 'template',		// -->  cancelled
-				'nonactive' => 'nonactive',		// -->  cancelled
-				'archive' => 'archive' ), 		// -->  cancelled
+				'offer' => 'offer', // -->  NEEDS-ACTION
+				'not-started' => 'not-started', // iCal NEEDS-ACTION
+				'ongoing' => 'ongoing', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'cancelled' => 'cancelled', // iCal CANCELLED
+				'billed' => 'billed', // -->  DONE
+				'template' => 'template', // -->  cancelled
+				'nonactive' => 'nonactive', // -->  cancelled
+				'archive' => 'archive' ), // -->  cancelled
 			'phone' => array(
-				'not-started' => 'call',		// iCal NEEDS-ACTION
-				'ongoing' => 'will-call',		// iCal IN-PROCESS
-				'done' => 'done', 				// iCal COMPLETED
-				'billed' => 'billed' ),			// -->  DONE
+				'not-started' => 'call', // iCal NEEDS-ACTION
+				'ongoing' => 'will-call', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'billed' => 'billed' ), // -->  DONE
 			'note' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 			'email' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 		);
 		if (($config_data = Api\Config::read('infolog')))
 		{
 			if (isset($config_data['status']) && is_array($config_data['status']))
 			{
-				foreach(array_keys($config_data['status']) as $key)
+				foreach (array_keys($config_data['status']) as $key)
 				{
 					if (!is_array($this->status[$key]))
 					{
 						$this->status[$key] = array();
 					}
-					$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
+					$this->status[$key] = array_merge($this->status[$key], (array)$config_data['status'][$key]);
 				}
 			}
 			if (isset($config_data['types']) && is_array($config_data['types']))
@@ -237,10 +237,10 @@ 
 			$this->customfields = Api\Storage\Customfields::get('infolog');
 			if ($this->customfields)
 			{
-				foreach($this->customfields as $name => $field)
+				foreach ($this->customfields as $name => $field)
 				{
 					// old infolog customefield record
-					if(empty($field['type']))
+					if (empty($field['type']))
 					{
 						if (count($field['values'])) $field['type'] = 'select'; // selectbox
 						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
@@ -252,23 +252,23 @@ 
 						$save_config = true;
 					}
 				}
-				if ($save_config) Api\Config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config) Api\Config::save_value('customfields', $this->customfields, 'infolog');
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
-				$this->responsible_edit = array_merge($this->responsible_edit,$config_data['responsible_edit']);
+				$this->responsible_edit = array_merge($this->responsible_edit, $config_data['responsible_edit']);
 			}
 			if (is_array($config_data['copy_excludefields']))
 			{
-				$this->copy_excludefields = array_merge($this->copy_excludefields,$config_data['copy_excludefields']);
+				$this->copy_excludefields = array_merge($this->copy_excludefields, $config_data['copy_excludefields']);
 			}
 			if (is_array($config_data['sub_excludefields']) && $config_data['sub_excludefields'])
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$config_data['sub_excludefields']);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $config_data['sub_excludefields']);
 			}
 			else
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$this->default_sub_excludefields);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $this->default_sub_excludefields);
 			}
 			if ($config_data['implicit_rights'] == 'edit')
 			{
@@ -277,7 +277,7 @@ 
 			$this->history = $config_data['history'];
 		}
 		// sort types by there translation
-		foreach($this->enums['type'] as $key => $val)
+		foreach ($this->enums['type'] as $key => $val)
 		{
 			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
 		}
@@ -286,14 +286,14 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->now = time();
-		$this->user_time_now = Api\DateTime::server2user($this->now,'ts');
+		$this->user_time_now = Api\DateTime::server2user($this->now, 'ts');
 
-		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
+		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
 		$this->so = new infolog_so($this->grants);
 
 		if ($info_id)
 		{
-			$this->read( $info_id );
+			$this->read($info_id);
 		}
 		else
 		{
@@ -309,9 +309,9 @@ 
 	 */
 	function has_customfields($type)
 	{
-		foreach($this->customfields as $field)
+		foreach ($this->customfields as $field)
 		{
-			if ((!$type || empty($field['type2']) || in_array($type,is_array($field['type2']) ? $field['type2'] : explode(',',$field['type2']))))
+			if ((!$type || empty($field['type2']) || in_array($type, is_array($field['type2']) ? $field['type2'] : explode(',', $field['type2']))))
 			{
 				return True;
 			}
@@ -328,7 +328,7 @@ 
 	 * @param int $user = null user whos rights to check, default current user
 	 * @return boolean
 	 */
-	function check_access($info,$required_rights,$other=0,$user=null)
+	function check_access($info, $required_rights, $other = 0, $user = null)
 	{
 		static $cache = array();
 
@@ -338,17 +338,17 @@ 
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id) $access = & $cache[$info_id][$required_rights]; // we only cache the current user!
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true, $user);
 		}
 		if (!$info)
 		{
 			$owner = $other ? $other : $user;
 			$grant = $grants[$owner];
-			return $grant & $required_rights;
+			return $grant&$required_rights;
 		}
 
 
@@ -360,10 +360,10 @@ 
 				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
 
 				if ($info['info_status'] == 'deleted' &&
-					($required_rights == Acl::EDIT ||		// no edit rights for deleted entries
-					 $required_rights == Acl::ADD  ||		// no add rights for deleted entries
+					($required_rights == Acl::EDIT || // no edit rights for deleted entries
+					 $required_rights == Acl::ADD || // no add rights for deleted entries
 					 $required_rights == Acl::DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user != $this->user))))	// delete only for admins
 				{
 					$access = false;
 				}
@@ -371,12 +371,12 @@ 
 				{
 					if ($info['info_status'] != 'deleted')
 					{
-						$access = false;	// can only undelete deleted items
+						$access = false; // can only undelete deleted items
 					}
 					else
 					{
 						// undelete requires edit rights
-						$access = $this->so->check_access( $info,Acl::EDIT,$this->implicit_rights == 'edit',$grants,$user );
+						$access = $this->so->check_access($info, Acl::EDIT, $this->implicit_rights == 'edit', $grants, $user);
 					}
 				}
 			}
@@ -386,7 +386,7 @@ 
 			}
 			if (!isset($access))
 			{
-				$access = $this->so->check_access( $info,$required_rights,$this->implicit_rights == 'edit',$grants,$user );
+				$access = $this->so->check_access($info, $required_rights, $this->implicit_rights == 'edit', $grants, $user);
 			}
 		}
 		// else $cached = ' (from cache)';
@@ -421,12 +421,12 @@ 
 	 * @param string $not_id = '' id to exclude
 	 * @return boolean True if we have a linked item, False otherwise
 	 */
-	function link_id2from(&$info,$not_app='',$not_id='')
+	function link_id2from(&$info, $not_app = '', $not_id = '')
 	{
 		//echo "<p>boinfolog::link_id2from(subject='$info[info_subject]', link_id='$info[info_link_id]', from='$info[info_from]', not_app='$not_app', not_id='$not_id')";
 
 		if ($info['info_link_id'] > 0 &&
-			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
+			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) || // use supplied links info
 			 ($link = Link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
@@ -440,11 +440,11 @@ 
 				$app = $link['link_app'.$nr];
 				$id  = $link['link_id'.$nr];
 			}
-			$title = Link::title($app,$id);
+			$title = Link::title($app, $id);
 
 			if ((string)$info['info_custom_from'] === '')	// old entry
 			{
-				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
+				$info['info_custom_from'] = (int)($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
 			if (!$info['info_custom_from'])
 			{
@@ -466,7 +466,7 @@ 
 			return $info['blur_title'] = $title;
 		}
 		$info['info_link'] = array('title' => $info['info_from']);
-		$info['info_link_id'] = 0;	// link might have been deleted
+		$info['info_link_id'] = 0; // link might have been deleted
 		$info['info_custom_from'] = (int)!!$info['info_from'];
 
 		return False;
@@ -477,7 +477,7 @@ 
 	 */
 	static function subject_from_des($des)
 	{
-		return substr($des,0,60).' ...';
+		return substr($des, 0, 60).' ...';
 	}
 
 	/**
@@ -492,7 +492,7 @@ 
 	 * 			or NULL for timestamps in user-time
 	 * 			or false for timestamps in server-time
 	 */
-	 function time2time(&$values, $fromTZId=false, $toTZId=null)
+	 function time2time(&$values, $fromTZId = false, $toTZId = null)
 	 {
 
 		if ($fromTZId === $toTZId) return;
@@ -533,7 +533,7 @@ 
 			$toTZ = Api\DateTime::$server_timezone;
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.Api\DateTime::$user_timezone->getName());
-	 	foreach($this->timestamps as $key)
+	 	foreach ($this->timestamps as $key)
 		{
 		 	if ($values[$key])
 		 	{
@@ -542,14 +542,14 @@ 
 			 	if ($time->format('Hi') == '0000')
 			 	{
 				 	// we keep dates the same in new timezone
-				 	$arr = Api\DateTime::to($time,'array');
+				 	$arr = Api\DateTime::to($time, 'array');
 				 	$time = new Api\DateTime($arr, $toTZ);
 			 	}
 			 	else
 			 	{
 				 	$time->setTimezone($toTZ);
 			 	}
-			 	$values[$key] = Api\DateTime::to($time,'ts');
+			 	$values[$key] = Api\DateTime::to($time, 'ts');
 		 	}
 		}
 		//error_log(__METHOD__.'() --> values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']));
@@ -562,11 +562,11 @@ 
 	 * @param string $date_format = 'ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -581,10 +581,10 @@ 
 	 *
 	 * @return array|boolean infolog entry, null if not found or false if no permission to read it
 	 */
-	function &read($info_id,$run_link_id2from=true,$date_format='ts',$ignore_acl=false)
+	function &read($info_id, $run_link_id2from = true, $date_format = 'ts', $ignore_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($info_id).', '.array2string($run_link_id2from).", '$date_format') ".function_backtrace());
-		if (is_scalar($info_id) || isset($info_id[count($info_id)-1]))
+		if (is_scalar($info_id) || isset($info_id[count($info_id) - 1]))
 		{
 			if (is_scalar($info_id) && !is_numeric($info_id))
 			{
@@ -601,7 +601,7 @@ 
 			return null;
 		}
 
-		if (!$ignore_acl && !$this->check_access($data,Acl::READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data, Acl::READ))	// check behind read, to prevent a double read
 		{
 			return False;
 		}
@@ -633,7 +633,7 @@ 
 	 * @param boolean $skip_notification Do not send notification of delete
 	 * @return boolean True if delete was successful, False otherwise ($info_id does not exist or no rights)
 	 */
-	function delete($info_id,$delete_children=False,$new_parent=False, $skip_notification=False)
+	function delete($info_id, $delete_children = False, $new_parent = False, $skip_notification = False)
 	{
 		if (is_array($info_id))
 		{
@@ -643,18 +643,18 @@ 
 		{
 			return False;
 		}
-		if (!$this->check_access($info,Acl::DELETE))
+		if (!$this->check_access($info, Acl::DELETE))
 		{
 			return False;
 		}
 		// check if we have children and delete or re-parent them
 		if (($children = $this->so->get_children($info_id)))
 		{
-			foreach($children as $id => $owner)
+			foreach ($children as $id => $owner)
 			{
-				if ($delete_children && $this->so->grants[$owner] & Acl::DELETE)
+				if ($delete_children && $this->so->grants[$owner]&Acl::DELETE)
 				{
-					$this->delete($id,$delete_children,$new_parent,$skip_notification);	// call ourself recursive to delete the child
+					$this->delete($id, $delete_children, $new_parent, $skip_notification); // call ourself recursive to delete the child
 				}
 				else	// dont delete or no rights to delete the child --> re-parent it
 				{
@@ -673,28 +673,28 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted') return false; // entry already deleted
 
 			$this->so->write($deleted);
 
-			Link::unlink(0,'infolog',$info_id,'','!file','',true);	// keep the file attachments, hide the rest
+			Link::unlink(0, 'infolog', $info_id, '', '!file', '', true); // keep the file attachments, hide the rest
 		}
 		else
 		{
-			$this->so->delete($info_id,false);	// we delete the children via bo to get all notifications!
+			$this->so->delete($info_id, false); // we delete the children via bo to get all notifications!
 
-			Link::unlink(0,'infolog',$info_id);
+			Link::unlink(0, 'infolog', $info_id);
 		}
 		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
 		{
 			// send email notifications and do the history logging
-			if(!$skip_notification)
+			if (!$skip_notification)
 			{
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
 				}
-				$this->tracking->track($deleted,$info,$this->user,true);
+				$this->tracking->track($deleted, $info, $this->user, true);
 			}
 		}
 		return True;
@@ -716,13 +716,13 @@ 
 	*
 	* @return int|boolean info_id on a successfull write or false
 	*/
-	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
-		$skip_notification=false, $throw_exception=false, $purge_cfs=null, $ignore_acl=false)
+	function write(&$values_in, $check_defaults = true, $touch_modified = true, $user2server = true,
+		$skip_notification = false, $throw_exception = false, $purge_cfs = null, $ignore_acl = false)
 	{
 		$values = $values_in;
 		//echo "boinfolog::write()values="; _debug_array($values);
-		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0,Acl::EDIT,$values['info_owner']) &&
-			!$this->check_access(0,Acl::ADD,$values['info_owner'])))
+		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0, Acl::EDIT, $values['info_owner']) &&
+			!$this->check_access(0, Acl::ADD, $values['info_owner'])))
 		{
 			return false;
 		}
@@ -732,7 +732,7 @@ 
 			$old = $this->read($values['info_id'], false, 'server', $ignore_acl);
 		}
 
-		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values,Acl::EDIT)))
+		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values, Acl::EDIT)))
 		{
 			if (!isset($values['info_responsible']))
 			{
@@ -744,21 +744,21 @@ 
 			}
 			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
 			{
-				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
+				$status_only = !!array_intersect((array)$responsible, array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
-				$status_only = $undelete = $this->check_access($values['info_id'],self::ACL_UNDELETE);
+				$status_only = $undelete = $this->check_access($values['info_id'], self::ACL_UNDELETE);
 			}
 		}
-		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'],Acl::EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],Acl::ADD)))
+		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'], Acl::EDIT) && !$status_only ||
+		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'], Acl::ADD)))
 		{
 			return false;
 		}
 
 		// Make sure status is still valid if the type changes
-		if($old['info_type'] != $values['info_type'] && $values['info_status'])
+		if ($old['info_type'] != $values['info_type'] && $values['info_status'])
 		{
 			if (isset($this->status[$values['info_type']]) &&
 				!in_array($values['info_status'], array_keys($this->status[$values['info_type']])))
@@ -768,8 +768,8 @@ 
 		}
 		if ($status_only && !$undelete)	// make sure only status gets writen
 		{
-			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
-				in_array($values['info_status'],array('done','billed','cancelled'));
+			$set_completed = !$values['info_datecompleted'] && // set date completed of finished job, only if its not already set
+				in_array($values['info_status'], array('done', 'billed', 'cancelled'));
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
@@ -784,7 +784,7 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) {
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
 					if (isset($this->status[$values['info_type']]['done'])) {
@@ -798,19 +798,19 @@ 
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) $values['info_status'] = $status;
 			}
 			$check_defaults = false;
 		}
 		if ($check_defaults)
 		{
 			if (!$values['info_datecompleted'] &&
-				(in_array($values['info_status'],array('done','billed'))))
+				(in_array($values['info_status'], array('done', 'billed'))))
 			{
-				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now;	// set date completed to today if status == done
+				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now; // set date completed to today if status == done
 			}
 			// Check for valid status / percent combinations
-			if (in_array($values['info_status'],array('done','billed')))
+			if (in_array($values['info_status'], array('done', 'billed')))
 			{
 				$values['info_percent'] = 100;
 			}
@@ -825,7 +825,7 @@ 
 				// We change percent to match status, not status to match percent
 				$values['info_percent'] = 10;
 			}
-			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled','archive')))
+			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'], array('done', 'billed', 'cancelled', 'archive')))
 			{
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
@@ -846,7 +846,7 @@ 
 			}
 			if ($values['info_responsible'] && $values['info_status'] == 'offer')
 			{
-				$values['info_status'] = 'not-started';   // have to match if not finished
+				$values['info_status'] = 'not-started'; // have to match if not finished
 			}
 			if (isset($values['info_subject']) && empty($values['info_subject']))
 			{
@@ -854,18 +854,18 @@ 
 			}
 
 			// Check required custom fields
-			if($throw_exception)
+			if ($throw_exception)
 			{
 				$custom = Api\Storage\Customfields::get('infolog');
-				foreach($custom as $c_name => $c_field)
+				foreach ($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
-					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
+					if ($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',', $c_field['type2']);
+					if ($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'], $type2)))
 					{
 						// Required custom field
-						if(!$values['#'.$c_name])
+						if (!$values['#'.$c_name])
 						{
-							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required',lang($values['info_type']),$c_field['label']));
+							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required', lang($values['info_type']), $c_field['label']));
 						}
 					}
 				}
@@ -874,16 +874,16 @@ 
 		if (isset($this->group_owners[$values['info_type']]))
 		{
 			$values['info_owner'] = $this->group_owners[$values['info_type']];
-			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]] & Acl::EDIT))
+			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]]&Acl::EDIT))
 			{
-				if (!$this->check_access($values['info_id'],Acl::EDIT) ||
-					!$values['info_id'] && !$this->check_access($values,Acl::ADD)
+				if (!$this->check_access($values['info_id'], Acl::EDIT) ||
+					!$values['info_id'] && !$this->check_access($values, Acl::ADD)
 				)
 				{
-					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
+					return false; // no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
-			$values['info_access'] = 'public';	// group-owners are allways public
+			$values['info_access'] = 'public'; // group-owners are allways public
 		}
 		elseif (!$values['info_id'] && !$values['info_owner'] || $GLOBALS['egw']->accounts->get_type($values['info_owner']) == 'g')
 		{
@@ -943,23 +943,23 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
+			if (!array_key_exists('info_responsible', $values)) $values['info_responsible'] = $old['info_responsible'];
 			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
 			{
-				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+				$values['info_responsible'] = $values['info_responsible'] ? explode(',', $values['info_responsible']) : array();
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 			// create (and remove) links in custom fields
-			Api\Storage\Customfields::update_links('infolog',$values,$old,'info_id');
+			Api\Storage\Customfields::update_links('infolog', $values, $old, 'info_id');
 
 			// Check for restore of deleted entry, restore held links
-			if($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
+			if ($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
 			{
 				Link::restore('infolog', $info_id);
 			}
 
 			// notify the link-class about the update, as other apps may be subscribt to it
-			Link::notify_update('infolog',$info_id,$values);
+			Link::notify_update('infolog', $info_id, $values);
 
 			// pre-cache the new values
 			self::set_link_cache($values);
@@ -970,39 +970,39 @@ 
 				$this->tracking = new infolog_tracking($this);
 			}
 
-			if ($old && ($missing_fields = array_diff_key($old,$values)))
+			if ($old && ($missing_fields = array_diff_key($old, $values)))
 			{
 				// Some custom fields (multiselect with nothing selected) will be missing,
 				// and that's OK.  Don't put them back.
-				foreach(array_keys($missing_fields) as $field)
+				foreach (array_keys($missing_fields) as $field)
 				{
-					if(array_key_exists($field, $values_in))
+					if (array_key_exists($field, $values_in))
 					{
 						unset($missing_fields[$field]);
 					}
 				}
-				$values = array_merge($values,$missing_fields);
+				$values = array_merge($values, $missing_fields);
 			}
 			// Add keys missing in the $to_write array
-			if (($missing_fields = array_diff_key($values,$to_write)))
+			if (($missing_fields = array_diff_key($values, $to_write)))
 			{
-				$to_write = array_merge($to_write,$missing_fields);
+				$to_write = array_merge($to_write, $missing_fields);
 			}
-			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
-				null,$skip_notification);
+			$this->tracking->track($to_write, $old, $this->user, $values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
+				null, $skip_notification);
 
 			if ($info_from_set) $values['info_from'] = '';
 
 			// Change new values back to user time before sending them back
-			if($user2server)
+			if ($user2server)
 			{
 				$this->time2time($values);
 			}
 			// merge changes (keeping extra values from the UI)
-			$values_in = array_merge($values_in,$values);
+			$values_in = array_merge($values_in, $values);
 
 			// Update modified timestamp of parent
-			if($values['info_id_parent'] && $touch_modified)
+			if ($values['info_id_parent'] && $touch_modified)
 			{
 				$parent = $this->read($values['info_id_parent'], false, 'server', true);
 				$this->write($parent, false, true, false, true, false, null, $ignore_acl);
@@ -1017,9 +1017,9 @@ 
 	 * @param int|array $info_id id
 	 * @return int|array number of subs
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
-		return $this->so->anzSubs( $info_id );
+		return $this->so->anzSubs($info_id);
 	}
 
 	/**
@@ -1036,23 +1036,23 @@ 
 	 * @param boolean $no_acl =false true: ignore all acl
 	 * @return array with id's as key of the matching log-entries
 	 */
-	function &search(&$query, $no_acl=false)
+	function &search(&$query, $no_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 
-		if($query['filter'] == 'bydate')
+		if ($query['filter'] == 'bydate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'private')
 		{
-			$query['col_filter'][] = 'info_access = ' . $GLOBALS['egw']->db->quote('private');
+			$query['col_filter'][] = 'info_access = '.$GLOBALS['egw']->db->quote('private');
 		}
 		if (!isset($query['date_format']) || $query['date_format'] != 'server')
 		{
@@ -1062,7 +1062,7 @@ 
 				{
 					if (!empty($query['col_filter'][$key]))
 					{
-						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key],'ts');
+						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key], 'ts');
 					}
 				}
 			}
@@ -1075,7 +1075,7 @@ 
 		{
 			foreach ($ret as $id => &$data)
 			{
-				if (!$no_acl && !$this->check_access($data,Acl::READ))
+				if (!$no_acl && !$this->check_access($data, Acl::READ))
 				{
 					unset($ret[$id]);
 					continue;
@@ -1091,7 +1091,7 @@ 
 							if ($time->format('Hi') == '0000')
 							{
 								// we keep dates the same in user-time
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$time = new Api\DateTime($arr, Api\DateTime::$user_timezone);
 							}
 							else
@@ -1099,7 +1099,7 @@ 
 								$time->setTimezone(Api\DateTime::$user_timezone);
 							}
 						}
-						$data[$key] = Api\DateTime::to($time,'ts');
+						$data[$key] = Api\DateTime::to($time, 'ts');
 					}
 				}
 				// pre-cache title and file access
@@ -1116,7 +1116,7 @@ 
 	 * @param array $filter = array('filter'=>'own','info_type'=>'task')
 	 * @return string
 	 */
-	public function getctag(array $filter=array('filter'=>'own','info_type'=>'task'))
+	public function getctag(array $filter = array('filter'=>'own', 'info_type'=>'task'))
 	{
 		$filter += array(
 			'order'			=> 'info_datemodified',
@@ -1128,7 +1128,7 @@ 
 		// we need to query deleted entries too for a ctag!
 		$filter['filter'] .= '+deleted';
 
-		$result =& $this->search($filter);
+		$result = & $this->search($filter);
 
 		if (empty($result)) return 'EGw-empty-wGE';
 
@@ -1150,12 +1150,12 @@ 
 	 * @param string $_date
 	 * @return array $content array for uiinfolog
 	 */
-	function import_mail($_addresses,$_subject,$_message,$_attachments,$_date)
+	function import_mail($_addresses, $_subject, $_message, $_attachments, $_date)
 	{
-		foreach($_addresses as $address)
+		foreach ($_addresses as $address)
 		{
 			$names[] = $address['name'];
-			$emails[] =$address['email'];
+			$emails[] = $address['email'];
 		}
 
 		$type = isset($this->enums['type']['email']) ? 'email' : 'note';
@@ -1163,8 +1163,8 @@ 
 		$info = array(
 			'info_id' => 0,
 			'info_type' => $type,
-			'info_from' => implode(', ',$names),
-			'info_addr' => implode(', ',$emails),
+			'info_from' => implode(', ', $names),
+			'info_addr' => implode(', ', $emails),
 			'info_subject' => $_subject,
 			'info_des' => $_message,
 			'info_startdate' => Api\DateTime::server2user($_date),
@@ -1183,16 +1183,16 @@ 
 		$contacts = array();
 		foreach ($emails as $mailadr)
 		{
-			$contacts = array_merge($contacts,(array)$addressbook->search(
+			$contacts = array_merge($contacts, (array)$addressbook->search(
 				array(
 					'email' => $mailadr,
 					'email_home' => $mailadr
-				),True,'','','',false,'OR',false,null,'',false));
+				), True, '', '', '', false, 'OR', false, null, '', false));
 		}
 		if (!$contacts || !is_array($contacts) || !is_array($contacts[0]))
 		{
-			$info['msg'] = lang('Attention: No Contact with address %1 found.',$info['info_addr']);
-			$info['info_custom_from'] = true;	// show the info_from line and NOT only the link
+			$info['msg'] = lang('Attention: No Contact with address %1 found.', $info['info_addr']);
+			$info['info_custom_from'] = true; // show the info_from line and NOT only the link
 		}
 		else
 		{
@@ -1202,21 +1202,21 @@ 
 			// create the rest a "ordinary" links
 			foreach ($contacts as $contact)
 			{
-				Link::link('infolog',$info['link_to']['to_id'],'addressbook',$contact['id']);
+				Link::link('infolog', $info['link_to']['to_id'], 'addressbook', $contact['id']);
 			}
 		}
 		if (is_array($_attachments))
 		{
 			foreach ($_attachments as $attachment)
 			{
-				if($attachment['egw_data'])
+				if ($attachment['egw_data'])
 				{
-					Link::link('infolog',$info['link_to']['to_id'],Link::DATA_APPNAME,  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], Link::DATA_APPNAME, $attachment);
 				}
-				else if(is_readable($attachment['tmp_name']) ||
+				else if (is_readable($attachment['tmp_name']) ||
 					(Vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 				{
-					Link::link('infolog',$info['link_to']['to_id'],'file',  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], 'file', $attachment);
 				}
 			}
 		}
@@ -1235,14 +1235,14 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->read( $info,false );
+			$info = $this->read($info, false);
 		}
 		if (!$info)
 		{
 			return $info;
 		}
-		$title = !empty($info['info_subject']) ? $info['info_subject'] :self::subject_from_des($info['info_descr']);
-		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id']?' (#'.$info['info_id'].')':'');
+		$title = !empty($info['info_subject']) ? $info['info_subject'] : self::subject_from_des($info['info_descr']);
+		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id'] ? ' (#'.$info['info_id'].')' : '');
 	}
 
 	/**
@@ -1253,15 +1253,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		foreach ($this->search($params=array(
+		foreach ($this->search($params = array(
 			'col_filter' => array('info_id' => $ids),
 		)) as $info)
 		{
 			$titles[$info['info_id']] = $this->link_title($info);
 		}
-		foreach (array_diff($ids,array_keys($titles)) as $id)
+		foreach (array_diff($ids, array_keys($titles)) as $id)
 		{
-			$titles[$id] = false;	// we assume every not returned entry to be not readable, as we notify the link class about all deletes
+			$titles[$id] = false; // we assume every not returned entry to be not readable, as we notify the link class about all deletes
 		}
 		return $titles;
 	}
@@ -1288,7 +1288,7 @@ 
 		$content = array();
 		if (is_array($ids))
 		{
-			foreach(array_keys($ids) as $id)
+			foreach (array_keys($ids) as $id)
 			{
 				$content[$id] = $this->link_title($id);
 			}
@@ -1305,10 +1305,10 @@ 
 	 * @param int $user = null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used
-		return $this->check_access($id,$check,0,$user);
+		unset($rel_path); // not used
+		return $this->check_access($id, $check, 0, $user);
 	}
 
 	/**
@@ -1318,10 +1318,9 @@ 
 	 */
 	function set_link_cache(array $info)
 	{
-		Link::set_cache('infolog',$info['info_id'],
+		Link::set_cache('infolog', $info['info_id'],
 			$this->link_title($info),
-			$this->file_access($info,Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT :
-			($this->file_access($info,Acl::READ) ? Acl::READ : 0));
+			$this->file_access($info, Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT : ($this->file_access($info, Acl::READ) ? Acl::READ : 0));
 	}
 
 	/**
@@ -1335,8 +1334,8 @@ 
 	function cal_to_include($args)
 	{
 		//echo "<p>cal_to_include("; print_r($args); echo ")</p>\n";
-		$user = (int) $args['owner'];
-		if ($user <= 0 && !checkdate($args['month'],$args['day'],$args['year']))
+		$user = (int)$args['owner'];
+		if ($user <= 0 && !checkdate($args['month'], $args['day'], $args['year']))
 		{
 			return False;
 		}
@@ -1344,7 +1343,7 @@ 
 
 		$do_events = $args['location'] == 'calendar_include_events';
 		$to_include = array();
-		$date_wanted = sprintf('%04d/%02d/%02d',$args['year'],$args['month'],$args['day']);
+		$date_wanted = sprintf('%04d/%02d/%02d', $args['year'], $args['month'], $args['day']);
 		$query = array(
 			'order' => 'info_startdate',
 			'sort'  => $do_events ? 'ASC' : 'DESC',
@@ -1353,34 +1352,34 @@ 
 		);
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] || $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] === '0')
 		{
-			$query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
+			$query['col_filter']['info_type'] = explode(',', $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
 		}
 		elseif ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom'])
 		{
-			$query['col_filter']['info_type'] = array('task','phone','note','email');
+			$query['col_filter']['info_type'] = array('task', 'phone', 'note', 'email');
 		}
 		while ($infos = $this->search($query))
 		{
 			foreach ($infos as $info)
 			{
-				$start = new Api\DateTime($info['info_startdate'],Api\DateTime::$user_timezone);
+				$start = new Api\DateTime($info['info_startdate'], Api\DateTime::$user_timezone);
 				$title = ($do_events ? $start->format(false).' ' : '').
 					$info['info_subject'];
-				$view = Link::view('infolog',$info['info_id']);
+				$view = Link::view('infolog', $info['info_id']);
 				$size = null;
-				$edit = Link::edit('infolog',$info['info_id'], $size);
+				$edit = Link::edit('infolog', $info['info_id'], $size);
 				$edit['size'] = $size;
-				$content=array();
+				$content = array();
 				$status = $this->status[$info['info_type']][$info['info_status']];
 				$icons = array();
-				foreach(array(
+				foreach (array(
 					$info['info_type'] => 'navbar',
 					$status => 'status'
 				) as $icon => $default)
 				{
-					$icons[Api\Image::find('infolog',$icon) ? $icon : $default] = $icon;
+					$icons[Api\Image::find('infolog', $icon) ? $icon : $default] = $icon;
 				}
-				$content[] = Api\Html::a_href($title,$view);
+				$content[] = Api\Html::a_href($title, $view);
 				$html = Api\Html::table(array(1 => $content));
 
 				$to_include[] = array(
@@ -1393,9 +1392,9 @@ 
 					'content'   => $html,
 				);
 			}
-			if ($query['total'] <= ($query['start']+=count($infos)))
+			if ($query['total'] <= ($query['start'] += count($infos)))
 			{
-				break;	// no more availible
+				break; // no more availible
 			}
 		}
 		//echo "boinfolog::cal_to_include("; print_r($args); echo ")<pre>"; print_r($to_include); echo "</pre>\n";
@@ -1418,7 +1417,7 @@ 
 				'cols' => 'info_id,info_type,info_status,info_percent,info_id_parent',
 			);
 			$infos = array();
-			foreach($this->search($query) as $row)
+			foreach ($this->search($query) as $row)
 			{
 				$infos[$row['info_id']] = array(
 					'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
@@ -1427,13 +1426,13 @@ 
 						'ongoing' : 'infolog/'.$row['info_status'],
 					'class'  => $row['info_id_parent'] ? 'infolog_rowHasParent' : null,
 				);
-				if (Api\Image::find('infolog', $icon=$row['info_type'].'_element') ||
-					Api\Image::find('infolog', $icon=$row['info_type']))
+				if (Api\Image::find('infolog', $icon = $row['info_type'].'_element') ||
+					Api\Image::find('infolog', $icon = $row['info_type']))
 				{
 					$infos[$row['info_id']]['icon'] = 'infolog/'.$icon;
 				}
 			}
-			foreach($this->anzSubs(array_keys($infos)) as $info_id => $subs)
+			foreach ($this->anzSubs(array_keys($infos)) as $info_id => $subs)
 			{
 				if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
 			}
@@ -1452,18 +1451,18 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $info_id=-1)
+	function find_or_add_categories($catname_list, $info_id = -1)
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 		$old_cats_preserve = array();
 		if ($info_id && $info_id > 0)
 		{
 			// preserve Api\Categories without users read access
 			$old_infolog = $this->read($info_id);
-			$old_categories = explode(',',$old_infolog['info_cat']);
+			$old_categories = explode(',', $old_infolog['info_cat']);
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
 				foreach ($old_categories as $cat_id)
@@ -1524,15 +1523,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -1559,20 +1558,20 @@ 
 
 		$save_account_id = $GLOBALS['egw_info']['user']['account_id'];
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
-		foreach($users as $user)
+		foreach ($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user, 'account_email'))) continue;
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->__construct($user);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 			$GLOBALS['egw']->acl->__construct($user);
 			$GLOBALS['egw']->acl->read_repository();
-			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-			$this->so = new infolog_so($this->grants);	// so caches it's filters
+			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
+			$this->so = new infolog_so($this->grants); // so caches it's filters
 
 			$notified_info_ids = array();
-			foreach(array(
+			foreach (array(
 				'notify_due_responsible'   => 'open-responsible-enddate',
 				'notify_due_delegated'     => 'open-delegated-enddate',
 				'notify_start_responsible' => 'open-responsible-date',
@@ -1581,44 +1580,44 @@ 
 			{
 				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
 
-				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
+				$filter .= date('Y-m-d', time() + 24 * 60 * 60 * (int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
 
 				$params = array('filter' => $filter, 'custom_fields' => true, 'subs' => true);
-				foreach($this->so->search($params) as $info)
+				foreach ($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'], $notified_info_ids)) continue;
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
 						$this->tracking = new infolog_tracking($this);
 					}
-					switch($pref)
+					switch ($pref)
 					{
 						case 'notify_due_responsible':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_due_delegated':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_start_responsible':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 						case 'notify_start_delegated':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 					}
 					//error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
-					$this->tracking->send_notification($info,null,$email,$user,$pref);
+					$this->tracking->send_notification($info, null, $email, $user, $pref);
 
 					$notified_info_ids[] = $info['info_id'];
 				}
@@ -1681,7 +1680,7 @@ 
 	 * @param string $x_infolog_status preserved original infolog status
 	 * @return string
 	 */
-	function vtodo2status($_vtodo_status,$x_infolog_status=null)
+	function vtodo2status($_vtodo_status, $x_infolog_status = null)
 	{
 		$vtodo_status = strtoupper($_vtodo_status);
 
@@ -1705,7 +1704,7 @@ 
 	 * @param array &$icons = null on return name of icons
 	 * @return array value => (commaseparated) translations
 	 */
-	function get_status($type=null, array &$icons=null)
+	function get_status($type = null, array &$icons = null)
 	{
 		// if filtered by type, show only the stati of the filtered type
 		if ($type && isset($this->status[$type]))
@@ -1715,16 +1714,16 @@ 
 		else	// show all stati
 		{
 			$statis = $icons = array();
-			foreach($this->status as $t => $stati)
+			foreach ($this->status as $t => $stati)
 			{
 				if ($t === 'defaults') continue;
-				foreach($stati as $val => $label)
+				foreach ($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
 					if (!isset($icons[$val])) $icons[$val] = $label;
 				}
 			}
-			foreach($statis as $val => &$labels)
+			foreach ($statis as $val => &$labels)
 			{
 				$labels = implode(', ', $labels);
 			}
@@ -1740,7 +1739,7 @@ 
 	 */
 	function activate($info)
 	{
-		switch((int)$info['info_percent'])
+		switch ((int)$info['info_percent'])
 		{
 			case 0:		return 'not-started';
 			case 100:	return 'done';
@@ -1759,8 +1758,8 @@ 
 		#Horde::logMessage("getParentID($_guid)",  __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		$parentID = False;
-		$myfilter = array('col_filter' => array('info_uid'=>$_guid)) ;
-		if ($_guid && ($found=$this->search($myfilter)) && ($uidmatch = array_shift($found)))
+		$myfilter = array('col_filter' => array('info_uid'=>$_guid));
+		if ($_guid && ($found = $this->search($myfilter)) && ($uidmatch = array_shift($found)))
 		{
 			$parentID = $uidmatch['info_id'];
 		}
@@ -1777,7 +1776,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function findInfo($infoData, $relax=false, $tzid=null)
+	function findInfo($infoData, $relax = false, $tzid = null)
 	{
 		$foundInfoLogs = array();
 		$filter = array();
@@ -1785,7 +1784,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX, ': 'EXACT, ') . $tzid . ')[InfoData]:'
+				. '('.($relax ? 'RELAX, ' : 'EXACT, ').$tzid.')[InfoData]:'
 				. array2string($infoData));
 		}
 
@@ -1804,9 +1803,9 @@ 
 		if (!$relax && !empty($infoData['info_uid']))
 		{
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
-			foreach($this->so->search($filter) as $egwData)
+			foreach ($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,Acl::READ)) continue;
+				if (!$this->check_access($egwData, Acl::READ)) continue;
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -1834,7 +1833,7 @@ 
 				$text = '';
 				foreach ($matches as $chunk)
 				{
-					if (strlen($text) <  strlen($chunk[0]))
+					if (strlen($text) < strlen($chunk[0]))
 					{
 						$text = $chunk[0];
 					}
@@ -1858,7 +1857,7 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 
 			switch ($infoData['info_type'])
 			{
@@ -1875,7 +1874,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[location mismatch]: '
-								. $infoData['info_location'] . ' <> ' . $egwData['info_location']);
+								. $infoData['info_location'].' <> '.$egwData['info_location']);
 						}
 						continue;
 					}
@@ -1892,7 +1891,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[description mismatch]: '
-								. $infoData['info_des'] . ' <> ' . $egwData['info_des']);
+								. $infoData['info_des'].' <> '.$egwData['info_des']);
 						}
 						continue;
 					}
@@ -1906,7 +1905,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[FOUND]:' . array2string($foundInfoLogs));
+					. '()[FOUND]:'.array2string($foundInfoLogs));
 			}
 			return $foundInfoLogs;
 		}
@@ -1931,7 +1930,7 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1943,7 +1942,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[category mismatch]: '
-						. $infoData['info_cat'] . ' <> ' . $egwData['info_cat']);
+						. $infoData['info_cat'].' <> '.$egwData['info_cat']);
 				}
 				continue;
 			}
@@ -1953,15 +1952,15 @@ 
 				if (isset($egwData['info_startdate']) && $egwData['info_startdate'])
 				{
 					// We compare the date only
-					$taskTime = new Api\DateTime($infoData['info_startdate'],Api\DateTime::$server_timezone);
-					$egwTime = new Api\DateTime($egwData['info_startdate'],Api\DateTime::$server_timezone);
+					$taskTime = new Api\DateTime($infoData['info_startdate'], Api\DateTime::$server_timezone);
+					$egwTime = new Api\DateTime($egwData['info_startdate'], Api\DateTime::$server_timezone);
 					if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 					{
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[start mismatch]: '
-								. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+								. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 						}
 						continue;
 					}
@@ -1988,7 +1987,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 							. '()[status mismatch]: '
-							. $infoData['info_status'] . ' <> ' . $egwData['info_status']);
+							. $infoData['info_status'].' <> '.$egwData['info_status']);
 					}
 					continue;
 				}
@@ -1998,15 +1997,15 @@ 
 					if (isset($egwData['info_enddate']) && $egwData['info_enddate'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_enddate'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_enddate'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_enddate'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_enddate'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[DUE mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2027,15 +2026,15 @@ 
 					if (isset($egwData['info_datecompleted']) && $egwData['info_datecompleted'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_datecompleted'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_datecompleted'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_datecompleted'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_datecompleted'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[completed mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2065,7 +2064,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]:' . array2string($foundInfoLogs));
+				. '()[FOUND]:'.array2string($foundInfoLogs));
 		}
 		return $foundInfoLogs;
 	}

infolog/inc/class.infolog_groupdav.inc.php

Doc Comments +6 added lines, -6 removed lines

@@ -141,7 +141,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -221,7 +221,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @param integer[] $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
@@ -521,7 +521,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -546,7 +546,7 @@ 
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -682,7 +682,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function delete(&$options,$id)
 	{
@@ -757,7 +757,7 @@ 
 	 * etag currently uses the modifcation time (info_datemodified), 1.9.002 adds etag column, but it's not yet used!
 	 *
 	 * @param array|int $info array with infolog entry or info_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($info)
 	{

Spacing +71 added lines, -71 removed lines

@@ -112,7 +112,7 @@ 
 		}
 		if ($path == '/infolog/')
 		{
-			$task_filter= 'own';
+			$task_filter = 'own';
 		}
 		else
 		{
@@ -122,7 +122,7 @@ 
 			}
 			else
 			{
-				$task_filter = 'user' . $user;
+				$task_filter = 'user'.$user;
 			}
 		}
 
@@ -143,7 +143,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		// todo add a filter to limit how far back entries from the past get synced
 		$filter = $this->get_infolog_filter($path, $user);
@@ -159,7 +159,7 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -171,7 +171,7 @@ 
 		if (!($filter['calendar_data'] = $options['props'] == 'all' &&
 			$options['root']['ns'] == Api\CalDAV::CALDAV) && is_array($options['props']))
 		{
-			foreach($options['props'] as $prop)
+			foreach ($options['props'] as $prop)
 			{
 				if ($prop['name'] == 'calendar-data')
 				{
@@ -191,7 +191,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'info_datemodified ASC';	// return oldest modifications first
+			$filter['order'] = 'info_datemodified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 		}
 
@@ -205,13 +205,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
+			$files['files'] = new Api\CalDAV\PropfindIterator($this, $path, $filter, $files['files']);
 		}
 		return true;
 	}
@@ -224,7 +224,7 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array $filter,$start=false)
+	function &propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
@@ -251,7 +251,7 @@ 
 			'filter'    	=> $task_filter,
 			'date_format'	=> 'server',
 			'col_filter'	=> $filter,
-			'custom_fields' => true,	// otherwise custom fields get NOT loaded!
+			'custom_fields' => true, // otherwise custom fields get NOT loaded!
 		);
 
 		if (!$calendar_data)
@@ -273,10 +273,10 @@ 
 
 		$files = array();
 		// ToDo: add parameter to only return id & etag
-		$tasks =& $this->bo->search($query);
+		$tasks = & $this->bo->search($query);
 		if ($tasks && $offset == $query['start'])
 		{
-			foreach($tasks as $task)
+			foreach ($tasks as $task)
 			{
 				// remove task from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($task[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -290,15 +290,15 @@ 
 					continue;
 				}
 				$props = array(
-					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar',	// Konqueror (3.5) dont understand it otherwise
+					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise
 					'getlastmodified' => $task['info_datemodified'],
 					'displayname' => $task['info_subject'],
 				);
 				if ($calendar_data)
 				{
-					$content = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+					$content = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 					$props['getcontentlength'] = bytes($content);
-					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data',$content);
+					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', $content);
 				}
 				$files[] = $this->add_resource($path, $task, $props);
 			}
@@ -306,13 +306,13 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
 		}
 		// sync-collection report --> return modified of last contact as sync-token
-		$sync_collection_report =  $filter['sync-collection'];
+		$sync_collection_report = $filter['sync-collection'];
 		if ($sync_collection_report)
 		{
 			$this->sync_collection_token = $task['date_modified'];
@@ -338,18 +338,18 @@ 
 	 * @param int &$nresult on return limit for number or results or unchanged/null
 	 * @return boolean true if filter could be processed
 	 */
-	function _report_filters($options,&$cal_filters,$id, &$nresults)
+	function _report_filters($options, &$cal_filters, $id, &$nresults)
 	{
 		if ($options['filters'])
 		{
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
 							case 'VCALENDAR':
@@ -392,9 +392,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -403,7 +403,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -411,7 +411,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters[] = 'info_datemodified>'.(int)$sync_token;
-						$cal_filters['filter'] .= '+deleted';	// to return deleted entries too
+						$cal_filters['filter'] .= '+deleted'; // to return deleted entries too
 					}
 					break;
 				case 'sync-level':
@@ -433,24 +433,24 @@ 
 			if ($id)
 			{
 				$cal_filters[self::$path_attr] = self::$path_extension ?
-					basename($id,self::$path_extension) : $id;
+					basename($id, self::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = basename(urldecode(array_pop($parts)))))
 						{
 							$cal_filters[self::$path_attr][] = self::$path_extension ?
-								basename($id,self::$path_extension) : $id;
+								basename($id, self::$path_extension) : $id;
 						}
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1) error_log(__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids));
 		}
 		return true;
 	}
@@ -478,7 +478,7 @@ 
 		elseif (empty($attrs['start']))
 		{
 			$this->caldav->log(__METHOD__.'('.array2string($attrs).') minimum one of start or end is required!');
-			return '1';	// to not give sql error, but simply not filter out anything
+			return '1'; // to not give sql error, but simply not filter out anything
 		}
 		// we dont need to care for DURATION line in rfc4791#section-9.9, as we always put that in DUE/info_enddate
 
@@ -508,10 +508,10 @@ 
 			"info_datecompleted > 0".(isset($start) ? " AND ($start <= info_datecompleted OR $start <= info_created)" : '').
 				(isset($end) ? " AND (info_datecompleted <= $end OR info_created <= $end)" : '').' OR '.
 			// we have no completed date, but always a created date
- 			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
+ 			"NOT info_datecompleted > 0".(isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		if ($this->debug > 1) error_log(__FILE__.__METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
 		return $sql;
 	}
 
@@ -523,16 +523,16 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($user);	// not used, but required by function signature
+		unset($user); // not used, but required by function signature
 
-		if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $task;
 		}
 		$handler = $this->_get_handler();
-		$options['data'] = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+		$options['data'] = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 		$options['mimetype'] = 'text/calendar; charset=utf-8';
 		header('Content-Encoding: identity');
 		header('ETag: "'.$this->get_etag($task).'"');
@@ -548,13 +548,13 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		unset($prefix);	// not used, but required by function signature
+		unset($prefix); // not used, but required by function signature
 
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
+		$oldTask = $this->_common_get_put_delete('PUT', $options, $id);
 		if (!is_null($oldTask) && !is_array($oldTask))
 		{
 			return $oldTask;
@@ -619,7 +619,7 @@ 
 	 * @param array $oldTask =null
 	 * @return array modified task data
 	 */
-	public function cat_action(array $task, $oldTask=null)
+	public function cat_action(array $task, $oldTask = null)
 	{
 		$action = $GLOBALS['egw_info']['user']['preferences']['groupdav']['infolog-cat-action'];
 
@@ -650,13 +650,13 @@ 
 			{
 				unset($task['info_responsible'][$key]);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'set':
 					$task['info_responsible'] = array();
 					// fall through
 				case 'set-user':
-					foreach($task['info_responsible'] as $key => $account_id)
+					foreach ($task['info_responsible'] as $key => $account_id)
 					{
 						if ($GLOBALS['egw']->accounts->get_type($account_id) == 'u')
 						{
@@ -684,9 +684,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('DELETE', $options, $id)))
 		{
 			return $task;
 		}
@@ -704,7 +704,7 @@ 
 	 */
 	function read($id)
 	{
-		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"),false,'server');
+		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"), false, 'server');
 	}
 
 	/**
@@ -727,15 +727,15 @@ 
 	 * @param array|int $task task-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$task)
+	function check_access($acl, $task)
 	{
 		if (is_null($task)) return true;
 
-		$access = $this->bo->check_access($task,$acl);
+		$access = $this->bo->check_access($task, $acl);
 
 		if (!$access && $acl == Acl::EDIT && $this->bo->is_responsible($task))
 		{
-			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
+			$access = true; // access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
 		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
 		return $access;
@@ -746,7 +746,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
 		return $this->bo->getctag($this->get_infolog_filter($path, $user));
 	}
@@ -763,7 +763,7 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->bo->read($info,true,'server');
+			$info = $this->bo->read($info, true, 'server');
 		}
 		if (!is_array($info) || !isset($info['info_id']) || !isset($info['info_datemodified']))
 		{
@@ -781,39 +781,39 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null,$user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($base_uri);	// not used, but required by function signature
+		unset($base_uri); // not used, but required by function signature
 
 		// calendar description
-		$displayname = Api\Translation::convert(lang('Tasks of'),Api\Translation::charset(),'utf-8').' '.$displayname;
-		$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-description',$displayname);
+		$displayname = Api\Translation::convert(lang('Tasks of'), Api\Translation::charset(), 'utf-8').' '.$displayname;
+		$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-description', $displayname);
 		// supported components, currently only VEVENT
-		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'supported-calendar-component-set',array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VCALENDAR')),
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VTODO')),
+		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'supported-calendar-component-set', array(
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VCALENDAR')),
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VTODO')),
 		));
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-multiget',''))))),
+			'calendar-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-multiget', ''))))),
 		);
 		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		$config = Api\Config::read('infolog');
 		if ($config['history'])
 		{
-			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop('sync-collection', '')))));
 		}
 		// get timezone of calendar
 		if ($this->caldav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -827,8 +827,8 @@ 
 	private function _get_handler()
 	{
 		$handler = new infolog_ical();
-		$handler->tzid = false;	//	as we read server-time timestamps (!= null=user-time), exports UTC times
-		$handler->setSupportedFields('GroupDAV',$this->agent);
+		$handler->tzid = false; //	as we read server-time timestamps (!= null=user-time), exports UTC times
+		$handler->setSupportedFields('GroupDAV', $this->agent);
 
 		return $handler;
 	}

Braces +76 added lines, -19 removed lines

@@ -91,7 +91,10 @@ 
 		}
 		else
 		{
-			if (!is_array($info)) $info = $this->bo->read($info);
+			if (!is_array($info))
+			{
+				$info = $this->bo->read($info);
+			}
 			$name = $info[self::$path_attr];
 		}
 		return $name.self::$path_extension;
@@ -159,7 +162,11 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -226,7 +233,10 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		if (($calendar_data = $filter['calendar_data']))
 		{
@@ -242,7 +252,10 @@ 
 		if (preg_match('/^([a-z0-9_]+)( DESC| ASC)?$/i', $filter['order'], $matches))
 		{
 			$order = $matches[1];
-			if ($matches[2]) $sort = $matches[2];
+			if ($matches[2])
+			{
+				$sort = $matches[2];
+			}
 			unset($filter['order']);
 		}
 		$query = array(
@@ -325,7 +338,10 @@ 
 				--$this->sync_collection_token;
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -347,7 +363,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -359,14 +378,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2infolog[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -375,13 +403,19 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
 						$cal_filters[] = $this->_time_range_filter($filter['attrs']);
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
@@ -450,7 +484,10 @@ 
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			}
 		}
 		return true;
 	}
@@ -511,7 +548,10 @@ 
  			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql");
+		}
 		return $sql;
 	}
 
@@ -552,7 +592,10 @@ 
 	{
 		unset($prefix);	// not used, but required by function signature
 
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldTask) && !is_array($oldTask))
@@ -580,7 +623,10 @@ 
 		}
 		if (!($infoId = $handler->importVTODO($vTodo, $taskId, false, $user, null, $id, $callback_data)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			}
 			return '403 Forbidden';
 		}
 
@@ -592,11 +638,13 @@ 
 		// send evtl. necessary respose headers: Location, etag, ...
 		// but only for new entries, as X-INFOLOG-STATUS get's not updated on client, if we confirm with an etag
 		if ($retval !== true)
-			// POST with add-member query parameter
+		{
+					// POST with add-member query parameter
 			//$_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member'])))
 		{
 			$this->put_response_headers($infoId, $options['path'], $retval, self::$path_attr == 'caldav_name');
 		}
+		}
 		return $retval;
 	}
 
@@ -607,7 +655,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->write($entry, true);
 	}
@@ -729,7 +780,10 @@ 
 	 */
 	function check_access($acl,$task)
 	{
-		if (is_null($task)) return true;
+		if (is_null($task))
+		{
+			return true;
+		}
 
 		$access = $this->bo->check_access($task,$acl);
 
@@ -737,7 +791,10 @@ 
 		{
 			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
-		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		}
 		return $access;
 	}
 

infolog/inc/class.infolog_ical.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -1042,8 +1042,7 @@
 	 * Search a matching infolog entry for the VNOTE data
 	 *
 	 * @param string $_vcalData		VNOTE
-	 * @param int $contentID=null 	infolog_id (or null, if unkown)
-	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
+	 * @param int $contentID 	infolog_id (or null, if unkown)
 	 * @param string $charset  The encoding charset for $text. Defaults to
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 *

Indentation +16 added lines, -16 removed lines

@@ -67,10 +67,10 @@ 
 	var $productName = '';
 
 	/**
-	* Shall we use the UID extensions of the description field?
-	*
-	* @var boolean
-	*/
+	 * Shall we use the UID extensions of the description field?
+	 *
+	 * @var boolean
+	 */
 	var $uidExtension = false;
 
 	/**
@@ -509,10 +509,10 @@ 
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
 	 * @param int $user =null delegate new task to this account_id, default null
 	 * @param string $charset =null The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     * @param string $caldav_name =null CalDAV URL name-part for new entries
-     * @param array $callback_data =null array with callback and further parameters, first param is task to save
-     * 	signature array callback($task, $param1, ...)
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 * @param string $caldav_name =null CalDAV URL name-part for new entries
+	 * @param array $callback_data =null array with callback and further parameters, first param is task to save
+	 * 	signature array callback($task, $param1, ...)
 	 * @return int|boolean integer info_id or false on error
 	 */
 	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false, $user=null, $charset=null, $caldav_name=null,
@@ -597,7 +597,7 @@ 
 	 * @param int $contentID =null 	infolog_id (or null, if unkown)
 	 * @param boolean $relax =false 	if true, a weaker match algorithm is used
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
@@ -642,8 +642,8 @@ 
 	 * @param string $_vcalData 	VTODO data
 	 * @param int $_taskID =-1		infolog_id of the entry
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return array infolog entry or false on error
 	 */
 	function vtodotoegw($_vcalData, $_taskID=-1, $charset=null)
@@ -1010,8 +1010,8 @@ 
 	 * @param int $_noteID =-1 info_id, default -1 = new entry
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return int|boolean integer info_id or false on error
 	 */
 	function importVNOTE(&$_vcalData, $_type, $_noteID=-1, $merge=false, $charset=null)
@@ -1045,7 +1045,7 @@ 
 	 * @param int $contentID=null 	infolog_id (or null, if unkown)
 	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 *
 	 * @return infolog_id of a matching entry or false, if nothing was found
 	 */
@@ -1067,8 +1067,8 @@ 
 	 * @param string $_type		content type (eg.g text/plain)
 	 * @param int $_noteID =-1	infolog_id of the entry
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return array infolog entry or false on error
 	 */
 	function vnotetoegw($_data, $_type, $_noteID=-1, $charset=null)

Spacing +125 added lines, -126 removed lines

@@ -23,39 +23,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 9,		// low
-		1 => 5,		// normal
-		2 => 3,		// high
-		3 => 1,		// urgent
+		0 => 9, // low
+		1 => 5, // normal
+		2 => 3, // high
+		3 => 1, // urgent
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		9 => 0,	8 => 0, 7 => 0,	// low
-		6 => 1, 5 => 1, 4 => 1, 0 => 1,	// normal
-		3 => 2,	2 => 2,	// high
-		1 => 3,			// urgent
+		9 => 0, 8 => 0, 7 => 0, // low
+		6 => 1, 5 => 1, 4 => 1, 0 => 1, // normal
+		3 => 2, 2 => 2, // high
+		1 => 3, // urgent
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 0,		// low
-		1 => 1,		// normal
-		2 => 2,		// high
-		3 => 2,		// urgent
+		0 => 0, // low
+		1 => 1, // normal
+		2 => 2, // high
+		3 => 2, // urgent
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 0,		// low
-		1 => 1,		// normal
-		2 => 3,		// high
+		0 => 0, // low
+		1 => 1, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -93,7 +93,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-infolog-vcal";
+	var $logfile = "/tmp/log-infolog-vcal";
 
 
 	/**
@@ -117,11 +117,11 @@ 
 	 * @param string $charset ='UTF-8'
 	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
 	 */
-	function exportVCalendar(array $tasks, $_version='2.0', $_method=null, $charset='UTF-8')
+	function exportVCalendar(array $tasks, $_version = '2.0', $_method = null, $charset = 'UTF-8')
 	{
 		$vcal = new Horde_Icalendar;
 
-		foreach($tasks as $task)
+		foreach ($tasks as $task)
 		{
 			if (!$this->exportVTODO($task, $_version, $_method, $charset, $vcal))
 			{
@@ -142,7 +142,7 @@ 
 	 *
 	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
 	 */
-	function exportVTODO($task, $_version='2.0',$_method='PUBLISH', $charset='UTF-8',Horde_Icalendar $vcal=null)
+	function exportVTODO($task, $_version = '2.0', $_method = 'PUBLISH', $charset = 'UTF-8', Horde_Icalendar $vcal = null)
 	{
 		if (is_array($task))
 		{
@@ -167,10 +167,10 @@ 
 		{
 			if (!preg_match('/\[UID:.+\]/m', $taskData['info_des']))
 			{
-				$taskData['info_des'] .= "\n[UID:" . $taskData['info_uid'] . "]";
+				$taskData['info_des'] .= "\n[UID:".$taskData['info_uid']."]";
 				if ($taskData['info_id_parent'] != '')
 				{
-					$taskData['info_des'] .= "\n[PARENT_UID:" . $taskData['info_id_parent'] . "]";
+					$taskData['info_des'] .= "\n[PARENT_UID:".$taskData['info_id_parent']."]";
 				}
 			}
 		}
@@ -186,15 +186,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($taskData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($taskData)."\n", 3, $this->logfile);
 		}
 
 		if (!isset($vcal)) $vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
-			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']),array(),false);
-		$vcal->setAttribute('VERSION',$_version,array(),false);
-		if ($_method) $vcal->setAttribute('METHOD',$_method,array(),false);
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
+			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']), array(), false);
+		$vcal->setAttribute('VERSION', $_version, array(), false);
+		if ($_method) $vcal->setAttribute('METHOD', $_method, array(), false);
 
 		$tzid = $this->tzid;
 		if ($tzid && $tzid != 'UTC')
@@ -212,7 +212,7 @@ 
 			}
 		}
 
-		$vevent = Horde_Icalendar::newComponent('VTODO',$vcal);
+		$vevent = Horde_Icalendar::newComponent('VTODO', $vcal);
 
 		if (!isset($this->clientProperties['SUMMARY']['Size']))
 		{
@@ -236,9 +236,9 @@ 
 				$noTruncate = $this->clientProperties[$field]['NoTruncate'];
 				if ($this->log && $size > 0)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-						"() $field Size: $size, NoTruncate: " .
-						($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+						"() $field Size: $size, NoTruncate: ".
+						($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 				}
 				//Horde::logMessage("VTODO $field Size: $size, NoTruncate: " .
 				//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -255,19 +255,19 @@ 
 				{
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-							"() $field omitted due to maximum size $size\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+							"() $field omitted due to maximum size $size\n", 3, $this->logfile);
 					}
 					//Horde::logMessage("VTODO $field omitted due to maximum size $size",
 					//	__FILE__, __LINE__, PEAR_LOG_WARNING);
 					continue; // skip field
 				}
 				// truncate the value to size
-				$value = substr($value, 0, $size -1);
+				$value = substr($value, 0, $size - 1);
 				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-						"() $field truncated to maximum size $size\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+						"() $field truncated to maximum size $size\n", 3, $this->logfile);
 				}
 				//Horde::logMessage("VTODO $field truncated to maximum size $size",
 				//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -286,7 +286,7 @@ 
 
 			if ($_version == '1.0' && preg_match('/[^\x20-\x7F]/', $value))
 			{
-				$options['CHARSET']	= $charset;
+				$options['CHARSET'] = $charset;
 				switch ($this->productManufacturer)
 				{
 					case 'groupdav':
@@ -328,23 +328,23 @@ 
 			self::setDateOrTime($vevent, 'COMPLETED', $taskData['info_datecompleted'], $tzid);
 		}
 
-		$vevent->setAttribute('DTSTAMP',time());
+		$vevent->setAttribute('DTSTAMP', time());
 		$vevent->setAttribute('CREATED', $taskData['info_created']);
 		$vevent->setAttribute('LAST-MODIFIED', $taskData['info_datemodified']);
-		$vevent->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
-		$vevent->setAttribute('STATUS',$this->status2vtodo($taskData['info_status']));
+		$vevent->setAttribute('CLASS', $taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
+		$vevent->setAttribute('STATUS', $this->status2vtodo($taskData['info_status']));
 		// we try to preserv the original infolog status as X-INFOLOG-STATUS, so we can restore it, if the user does not modify STATUS
-		$vevent->setAttribute('X-INFOLOG-STATUS',$taskData['info_status']);
-		$vevent->setAttribute('PERCENT-COMPLETE',$taskData['info_percent']);
+		$vevent->setAttribute('X-INFOLOG-STATUS', $taskData['info_status']);
+		$vevent->setAttribute('PERCENT-COMPLETE', $taskData['info_percent']);
 		if ($this->productManufacturer == 'funambol' &&
 			(strpos($this->productName, 'outlook') !== false
 				|| strpos($this->productName, 'pocket pc') !== false))
 		{
-			$priority = (int) $this->priority_egw2funambol[$taskData['info_priority']];
+			$priority = (int)$this->priority_egw2funambol[$taskData['info_priority']];
 		}
 		else
 		{
-			$priority = (int) $this->priority_egw2ical[$taskData['info_priority']];
+			$priority = (int)$this->priority_egw2ical[$taskData['info_priority']];
 		}
 		$vevent->setAttribute('PRIORITY', $priority);
 
@@ -353,7 +353,7 @@ 
 			(count($taskData['info_responsible']) > 1 ||
 				$taskData['info_responsible'][0] != $taskData['info_onwer']))
 		{
-			if (($url = $GLOBALS['egw']->accounts->id2name($taskData['info_owner'],'account_email')))
+			if (($url = $GLOBALS['egw']->accounts->id2name($taskData['info_owner'], 'account_email')))
 			{
 				$url = 'MAILTO:'.$url;
 			}
@@ -361,13 +361,13 @@ 
 			{
 				$url = 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $taskData['info_owner']);
 			}
-			$vevent->setAttribute('ORGANIZER',$url,array(
-				'CN'		=>	$GLOBALS['egw']->accounts->id2name($taskData['info_owner'],'account_fullname'),
+			$vevent->setAttribute('ORGANIZER', $url, array(
+				'CN'		=>	$GLOBALS['egw']->accounts->id2name($taskData['info_owner'], 'account_fullname'),
 				'X-EGROUPWARE-UID'	=> $taskData['info_owner'],
 			), true);
-			foreach($taskData['info_responsible'] as $responsible)
+			foreach ($taskData['info_responsible'] as $responsible)
 			{
-				if (($url = $GLOBALS['egw']->accounts->id2name($responsible,'account_email')))
+				if (($url = $GLOBALS['egw']->accounts->id2name($responsible, 'account_email')))
 				{
 					$url = 'MAILTO:'.$url;
 				}
@@ -377,15 +377,15 @@ 
 				}
 				if ($responsible > 0)
 				{
-					$vevent->setAttribute('ATTENDEE',$url,array(
-						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible,'account_fullname'),
+					$vevent->setAttribute('ATTENDEE', $url, array(
+						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible, 'account_fullname'),
 						'CUTYPE'	=> 'INDIVIDUAL',
 						'X-EGROUPWARE-UID'	=> $responsible,
 					), true);
 				}
 				elseif ($responsible < 0)
 				{
-					$vevent->setAttribute('ATTENDEE',$url,array(
+					$vevent->setAttribute('ATTENDEE', $url, array(
 						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible),
 						'CUTYPE'	=> 'GROUP',
 						'X-EGROUPWARE-UID'	=> $responsible,
@@ -396,17 +396,17 @@ 
 		// for CalDAV add all X-Properties previously parsed
 		if ($this->productManufacturer == 'groupdav')
 		{
-			foreach($taskData as $name => $value)
+			foreach ($taskData as $name => $value)
 			{
 				if (substr($name, 0, 2) == '##')
 				{
 					if ($name[2] == ':')
 					{
 						if (($v = json_php_unserialize($value)) && is_array($v)) $value = $v;
-						foreach((array)$value as $compvData)
+						foreach ((array)$value as $compvData)
 						{
-							$comp = Horde_Icalendar::newComponent(substr($name,3), $vevent);
-							$comp->parsevCalendar($compvData,substr($name,3));
+							$comp = Horde_Icalendar::newComponent(substr($name, 3), $vevent);
+							$comp->parsevCalendar($compvData, substr($name, 3));
 							$vevent->addComponent($comp);
 						}
 					}
@@ -426,8 +426,8 @@ 
 		$retval = $vcal->exportvCalendar();
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($retval)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($retval)."\n", 3, $this->logfile);
 		}
 		// Horde::logMessage("exportVTODO:\n" . print_r($retval, true),
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -456,7 +456,7 @@ 
 			}
 			$tz = self::$tz_cache[$tzid];
 		}
-		elseif(is_null($tzid))
+		elseif (is_null($tzid))
 		{
 			$tz = Api\DateTime::$user_timezone;
 		}
@@ -464,9 +464,9 @@ 
 		{
 			$tz = Api\DateTime::$server_timezone;
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new Api\DateTime($time,Api\DateTime::$server_timezone);
+			$time = new Api\DateTime($time, Api\DateTime::$server_timezone);
 		}
 		$time->setTimezone($tz);
 
@@ -515,16 +515,16 @@ 
      * 	signature array callback($task, $param1, ...)
 	 * @return int|boolean integer info_id or false on error
 	 */
-	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false, $user=null, $charset=null, $caldav_name=null,
-		array $callback_data=null)
+	function importVTODO(&$_vcalData, $_taskID = -1, $merge = false, $user = null, $charset = null, $caldav_name = null,
+		array $callback_data = null)
 	{
-		unset($merge);	// no longer used, but required by function signature
+		unset($merge); // no longer used, but required by function signature
 
 		if ($this->tzid)
 		{
 			date_default_timezone_set($this->tzid);
 		}
-		$taskData = $this->vtodotoegw($_vcalData,$_taskID, $charset);
+		$taskData = $this->vtodotoegw($_vcalData, $_taskID, $charset);
 		if ($this->tzid)
 		{
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -555,8 +555,8 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($taskData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($taskData)."\n", 3, $this->logfile);
 		}
 
 		if ($caldav_name)
@@ -565,18 +565,18 @@ 
 		}
 
 		// make sure not to empty fields not supported by iCal or not allowed to change by CalDAV
-		if ($_taskID > 0 && ($old = $this->read($_taskID,true,'server')))
+		if ($_taskID > 0 && ($old = $this->read($_taskID, true, 'server')))
 		{
 			// remove all values supported by iCal standard
 			$old = array_diff_key($old, array_flip(array(
-				'info_subject','info_des','info_location','info_cat','info_responsible',
-				'info_startdate','info_enddate','info_priority','info_location',
-				'info_access','info_status','info_percent','info_datecompleted',
+				'info_subject', 'info_des', 'info_location', 'info_cat', 'info_responsible',
+				'info_startdate', 'info_enddate', 'info_priority', 'info_location',
+				'info_access', 'info_status', 'info_percent', 'info_datecompleted',
 			)));
 			// remove all iCal fields not supported by EGroupware (stored like custom fields)
-			foreach(array_keys($old) as $name)
+			foreach (array_keys($old) as $name)
 			{
-				if (substr($name,0,2) == '##') unset($old[$name]);
+				if (substr($name, 0, 2) == '##') unset($old[$name]);
 			}
 			// merge in again all infolog fields not supported by iCal or not allowed to change
 			$taskData = array_merge($taskData, $old);
@@ -601,7 +601,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function searchVTODO($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function searchVTODO($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		$result = array();
 
@@ -646,12 +646,12 @@ 
      *
 	 * @return array infolog entry or false on error
 	 */
-	function vtodotoegw($_vcalData, $_taskID=-1, $charset=null)
+	function vtodotoegw($_vcalData, $_taskID = -1, $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		$vcal = new Horde_Icalendar;
@@ -664,7 +664,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -687,7 +687,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): Not a vTODO container, skipping...\n",3,$this->logfile);
+						"(): Not a vTODO container, skipping...\n", 3, $this->logfile);
 				}
 				continue;
 			}
@@ -714,24 +714,23 @@ 
 					($this->_status2vtodo[$x_infolog_status] === 'COMPLETED') != is_scalar($completed))
 				{
 					$percent_completed = $component->getAttributeDefault('PERCENT-COMPLETE', null);
-					$status = $completed && is_scalar($completed) ? 'COMPLETED' :
-						($percent_completed && is_scalar($percent_completed) && $percent_completed > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
+					$status = $completed && is_scalar($completed) ? 'COMPLETED' : ($percent_completed && is_scalar($percent_completed) && $percent_completed > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
 					$component->setAttribute('STATUS', $status);
 					if (!is_scalar($percent_completed))
 					{
 						$component->setAttribute('PERCENT-COMPLETE', $percent_completed = $status == 'COMPLETED' ?
 							100 : ($status == 'NEEDS-ACTION' ? 0 : 10));
 					}
-					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n", 3, $this->logfile);
 				}
 				// new task without status --> set a default status of NEEDS-ACTION, as otherwise task is marked closed
-				elseif($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
+				elseif ($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
 				{
 					$component->setAttribute('STATUS', 'NEEDS-ACTION');
 				}
 				else
 				{
-					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed) ? '='.$completed : ' not set')." --> leaving status and percent unchanged", 3, $this->logfile);
 				}
 			}
 			foreach ($component->getAllAttributes() as $attribute)
@@ -775,7 +774,7 @@ 
 					case 'DURATION':
 						if (!isset($taskData['info_startdate']))
 						{
-							$taskData['info_startdate']	= $component->getAttributeDefault('DTSTART', null);
+							$taskData['info_startdate'] = $component->getAttributeDefault('DTSTART', null);
 						}
 						$attribute['value'] += $taskData['info_startdate'];
 						$taskData['##DURATION'] = $attribute['value'];
@@ -787,11 +786,11 @@ 
 						break;
 
 					case 'COMPLETED':
-						$taskData['info_datecompleted']	= self::date2ts($attribute['value']);
+						$taskData['info_datecompleted'] = self::date2ts($attribute['value']);
 						break;
 
 					case 'DTSTART':
-						$taskData['info_startdate']	= self::date2ts($attribute['value']);
+						$taskData['info_startdate'] = self::date2ts($attribute['value']);
 						break;
 
 					case 'PRIORITY':
@@ -801,16 +800,16 @@ 
 								(strpos($this->productName, 'outlook') !== false
 									|| strpos($this->productName, 'pocket pc') !== false))
 							{
-								$taskData['info_priority'] = (int) $this->priority_funambol2egw[$attribute['value']];
+								$taskData['info_priority'] = (int)$this->priority_funambol2egw[$attribute['value']];
 							}
 							else
 							{
-								$taskData['info_priority'] = (int) $this->priority_ical2egw[$attribute['value']];
+								$taskData['info_priority'] = (int)$this->priority_ical2egw[$attribute['value']];
 							}
 						}
 						else
 						{
-							$taskData['info_priority'] = 1;	// default = normal
+							$taskData['info_priority'] = 1; // default = normal
 						}
 						break;
 
@@ -833,7 +832,7 @@ 
 					case 'CATEGORIES':
 						if (!empty($attribute['value']))
 						{
-							$cats = $this->find_or_add_categories(explode(',',$attribute['value']), $_taskID);
+							$cats = $this->find_or_add_categories(explode(',', $attribute['value']), $_taskID);
 							$taskData['info_cat'] = $cats[0];
 						}
 						break;
@@ -846,7 +845,7 @@ 
 						break;
 
 					case 'PERCENT-COMPLETE':
-						$taskData['info_percent'] = (int) $attribute['value'];
+						$taskData['info_percent'] = (int)$attribute['value'];
 						break;
 
 					case 'ATTENDEE':
@@ -888,10 +887,10 @@ 
 			break;
 		}
 		// store included, but unsupported components like valarm as x-properties
-		foreach($component->getComponents() as $comp)
+		foreach ($component->getComponents() as $comp)
 		{
 			$name = '##:'.strtoupper($comp->getType());
-			$compvData = $comp->exportvCalendar($comp,'utf-8');
+			$compvData = $comp->exportvCalendar($comp, 'utf-8');
 			if (isset($taskData[$name]))
 			{
 				$taskData[$name] = array($taskData[$name]);
@@ -904,8 +903,8 @@ 
 		}
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n" .
-				($taskData ? array2string($taskData) : 'FALSE') . "\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n".
+				($taskData ? array2string($taskData) : 'FALSE')."\n", 3, $this->logfile);
 		}
 		return $taskData;
 	}
@@ -919,14 +918,14 @@ 
 	 *
 	 * @return string|boolean VNOTE representation of the infolog entry or false on error
 	 */
-	function exportVNOTE($_noteID, $_type, $charset='UTF-8')
+	function exportVNOTE($_noteID, $_type, $charset = 'UTF-8')
 	{
-		if(!($note = $this->read($_noteID, true, 'server'))) return false;
+		if (!($note = $this->read($_noteID, true, 'server'))) return false;
 
 		$note = Api\Translation::convert($note,
 			Api\Translation::charset(), $charset);
 
-		switch	($_type)
+		switch ($_type)
 		{
 			case 'text/plain':
 				$txt = $note['info_subject']."\n\n".$note['info_des'];
@@ -940,10 +939,10 @@ 
 						Api\Translation::charset(), $charset);
 				}
 				$vnote = new Horde_Icalendar_Vnote();
-				$vnote->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
+				$vnote->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
 					strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 				$vnote->setAttribute('VERSION', '1.1');
-				foreach (array(	'SUMMARY'		=> $note['info_subject'],
+				foreach (array('SUMMARY'		=> $note['info_subject'],
 								'BODY'			=> $note['info_des'],
 								'CATEGORIES'	=> $note['info_cat'],
 							) as $field => $value)
@@ -951,7 +950,7 @@ 
 					$options = array();
 					if (preg_match('/[^\x20-\x7F]/', $value))
 					{
-						$options['CHARSET']	= $charset;
+						$options['CHARSET'] = $charset;
 						switch ($this->productManufacturer)
 						{
 							case 'groupdav':
@@ -981,21 +980,21 @@ 
 				}
 				if ($note['info_startdate'])
 				{
-					$vnote->setAttribute('CREATED',$note['info_startdate']);
+					$vnote->setAttribute('CREATED', $note['info_startdate']);
 				}
 				else
 				{
-					$vnote->setAttribute('CREATED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'add'));
+					$vnote->setAttribute('CREATED', $GLOBALS['egw']->contenthistory->getTSforAction('infolog_note', $_noteID, 'add'));
 				}
-				$vnote->setAttribute('LAST-MODIFIED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'modify'));
+				$vnote->setAttribute('LAST-MODIFIED', $GLOBALS['egw']->contenthistory->getTSforAction('infolog_note', $_noteID, 'modify'));
 
 				#$vnote->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
 
 				$retval = $vnote->exportvCalendar();
 				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-						array2string($retval)."\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+						array2string($retval)."\n", 3, $this->logfile);
 				}
 				return $retval;
 		}
@@ -1014,25 +1013,25 @@ 
      *
 	 * @return int|boolean integer info_id or false on error
 	 */
-	function importVNOTE(&$_vcalData, $_type, $_noteID=-1, $merge=false, $charset=null)
+	function importVNOTE(&$_vcalData, $_type, $_noteID = -1, $merge = false, $charset = null)
 	{
-		unset($merge);	// no longer used, but required by function signature
+		unset($merge); // no longer used, but required by function signature
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset))) return false;
 
-		if($_noteID > 0) $note['info_id'] = $_noteID;
+		if ($_noteID > 0) $note['info_id'] = $_noteID;
 
 		if (empty($note['info_status'])) $note['info_status'] = 'done';
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($note)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($note)."\n", 3, $this->logfile);
 		}
 
 		return $this->write($note, true, true, false);
@@ -1049,7 +1048,7 @@ 
 	 *
 	 * @return infolog_id of a matching entry or false, if nothing was found
 	 */
-	function searchVNOTE($_vcalData, $_type, $contentID=null, $relax=false, $charset=null)
+	function searchVNOTE($_vcalData, $_type, $contentID = null, $relax = false, $charset = null)
 	{
 		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset))) return array();
 
@@ -1071,12 +1070,12 @@ 
      *
 	 * @return array infolog entry or false on error
 	 */
-	function vnotetoegw($_data, $_type, $_noteID=-1, $charset=null)
+	function vnotetoegw($_data, $_type, $_noteID = -1, $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n" .
-				array2string($_data)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n".
+				array2string($_data)."\n", 3, $this->logfile);
 		}
 		$note = false;
 
@@ -1130,7 +1129,7 @@ 
 								case 'CATEGORIES':
 									if ($attribute['value'])
 									{
-										$cats = $this->find_or_add_categories(explode(',',$attribute['value']), $_noteID);
+										$cats = $this->find_or_add_categories(explode(',', $attribute['value']), $_noteID);
 										$note['info_cat'] = $cats[0];
 									}
 									break;
@@ -1141,8 +1140,8 @@ 
 		}
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n" .
-				($note ? array2string($note) : 'FALSE') ."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n".
+				($note ? array2string($note) : 'FALSE')."\n", 3, $this->logfile);
 		}
 		return $note;
 	}
@@ -1155,7 +1154,7 @@ 
 	 * @param string $_productManufacturer
 	 * @param string $_productName
 	 */
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
 		$state = &$_SESSION['SyncML.state'];
 		if (isset($state))
@@ -1207,10 +1206,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()) .
-				")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()).
+				")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '

Braces +72 added lines, -18 removed lines

@@ -104,7 +104,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-infolog-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-infolog-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 	}
 
@@ -150,7 +153,10 @@ 
 		}
 		else
 		{
-			if (!($taskData = $this->read($task, true, 'server'))) return false;
+			if (!($taskData = $this->read($task, true, 'server')))
+			{
+				return false;
+			}
 		}
 
 		if ($taskData['info_id_parent'])
@@ -190,11 +196,17 @@ 
 				array2string($taskData)."\n",3,$this->logfile);
 		}
 
-		if (!isset($vcal)) $vcal = new Horde_Icalendar;
+		if (!isset($vcal))
+		{
+			$vcal = new Horde_Icalendar;
+		}
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']),array(),false);
 		$vcal->setAttribute('VERSION',$_version,array(),false);
-		if ($_method) $vcal->setAttribute('METHOD',$_method,array(),false);
+		if ($_method)
+		{
+			$vcal->setAttribute('METHOD',$_method,array(),false);
+		}
 
 		$tzid = $this->tzid;
 		if ($tzid && $tzid != 'UTC')
@@ -273,7 +285,10 @@ 
 				//	__FILE__, __LINE__, PEAR_LOG_INFO);
 			}
 
-			if (empty($value) && ($size < 0 || $noTruncate)) continue;
+			if (empty($value) && ($size < 0 || $noTruncate))
+			{
+				continue;
+			}
 
 			if ($field == 'RELATED-TO')
 			{
@@ -402,7 +417,10 @@ 
 				{
 					if ($name[2] == ':')
 					{
-						if (($v = json_php_unserialize($value)) && is_array($v)) $value = $v;
+						if (($v = json_php_unserialize($value)) && is_array($v))
+						{
+							$value = $v;
+						}
 						foreach((array)$value as $compvData)
 						{
 							$comp = Horde_Icalendar::newComponent(substr($name,3), $vevent);
@@ -530,7 +548,10 @@ 
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 		}
 
-		if (!$taskData) return false;
+		if (!$taskData)
+		{
+			return false;
+		}
 
 		// keep the dates
 		$this->time2time($taskData, $this->tzid, false);
@@ -576,7 +597,10 @@ 
 			// remove all iCal fields not supported by EGroupware (stored like custom fields)
 			foreach(array_keys($old) as $name)
 			{
-				if (substr($name,0,2) == '##') unset($old[$name]);
+				if (substr($name,0,2) == '##')
+				{
+					unset($old[$name]);
+				}
 			}
 			// merge in again all infolog fields not supported by iCal or not allowed to change
 			$taskData = array_merge($taskData, $old);
@@ -722,7 +746,10 @@ 
 						$component->setAttribute('PERCENT-COMPLETE', $percent_completed = $status == 'COMPLETED' ?
 							100 : ($status == 'NEEDS-ACTION' ? 0 : 10));
 					}
-					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					if ($this->log)
+					{
+						error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					}
 				}
 				// new task without status --> set a default status of NEEDS-ACTION, as otherwise task is marked closed
 				elseif($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
@@ -731,12 +758,18 @@ 
 				}
 				else
 				{
-					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					if ($this->log)
+					{
+						error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					}
 				}
 			}
 			foreach ($component->getAllAttributes() as $attribute)
 			{
-				if (!$attribute['value'] && $attribute['value'] !== '0') continue;
+				if (!$attribute['value'] && $attribute['value'] !== '0')
+				{
+					continue;
+				}
 
 				switch ($attribute['name'])
 				{
@@ -921,7 +954,10 @@ 
 	 */
 	function exportVNOTE($_noteID, $_type, $charset='UTF-8')
 	{
-		if(!($note = $this->read($_noteID, true, 'server'))) return false;
+		if(!($note = $this->read($_noteID, true, 'server')))
+		{
+			return false;
+		}
 
 		$note = Api\Translation::convert($note,
 			Api\Translation::charset(), $charset);
@@ -1023,11 +1059,20 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset))) return false;
+		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset)))
+		{
+			return false;
+		}
 
-		if($_noteID > 0) $note['info_id'] = $_noteID;
+		if($_noteID > 0)
+		{
+			$note['info_id'] = $_noteID;
+		}
 
-		if (empty($note['info_status'])) $note['info_status'] = 'done';
+		if (empty($note['info_status']))
+		{
+			$note['info_status'] = 'done';
+		}
 
 		if ($this->log)
 		{
@@ -1051,9 +1096,15 @@ 
 	 */
 	function searchVNOTE($_vcalData, $_type, $contentID=null, $relax=false, $charset=null)
 	{
-		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset))) return array();
+		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset)))
+		{
+			return array();
+		}
 
-		if ($contentID)	$note['info_id'] = $contentID;
+		if ($contentID)
+		{
+			$note['info_id'] = $contentID;
+		}
 
 		unset($note['info_startdate']);
 
@@ -1105,7 +1156,10 @@ 
 				{
 					$_data = Api\Translation::convert($_data, $charset, 'utf-8');
 				}
-				if (!$vnote->parsevCalendar($_data, 'VCALENDAR'))	return false;
+				if (!$vnote->parsevCalendar($_data, 'VCALENDAR'))
+				{
+					return false;
+				}
 
 				$components = $vnote->getComponent();
 				foreach ($components as $component)

infolog/inc/class.infolog_import_infologs_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -108,8 +108,7 @@ 
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(
@@ -527,6 +526,7 @@ 
 	 *
 	 * This is a copy of what's in importexport_basic_import_csv, and can go
 	 * away if this is changed to extend it
+	 * @param integer $record_num
 	 */
 	protected function link_by_cf($record_num, $app, $fieldname, $_value)
 	{

Indentation +26 added lines, -26 removed lines

@@ -74,10 +74,10 @@ 
 	private $boinfolog;
 
 	/**
-	* For figuring out if a record has changed
-	*
-	* @var infolog_tracking::
-	*/
+	 * For figuring out if a record has changed
+	 *
+	 * @var infolog_tracking::
+	 */
 	protected $tracking;
 
 	/**
@@ -101,7 +101,7 @@ 
 	protected $errors = array();
 
 	/**
- 	* List of actions, and how many times that action was taken
+	 * List of actions, and how many times that action was taken
 	 */
 	protected $results = array();
 
@@ -466,37 +466,37 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 		return $this->results;
 	}

Spacing +78 added lines, -78 removed lines

@@ -16,19 +16,19 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'contact_owner', 	// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'contact_owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -54,14 +54,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -111,8 +111,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -122,7 +122,7 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the infolog bo
 		$this->boinfolog = new infolog_bo();
@@ -143,9 +143,9 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -170,18 +170,18 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			$lookups = $_lookups;
 
 			// Early detection of type, to load appropriate statuses
-			foreach(array($lookups['info_type'], array_map('strtolower',array_map('lang',$lookups['info_type']))) as $types)
+			foreach (array($lookups['info_type'], array_map('strtolower', array_map('lang', $lookups['info_type']))) as $types)
 			{
-				if($record['info_type'] && $key = array_search(strtolower($record['info_type']),$types))
+				if ($record['info_type'] && $key = array_search(strtolower($record['info_type']), $types))
 				{
 					$lookups['info_status'] = $this->boinfolog->status[$key];
 					break;
@@ -189,34 +189,34 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if ($result) $this->warnings[$import_csv->get_current_position()] = $result;
 
 			// Make sure type is valid
-			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
+			if (!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
 			{
 				// Check for translated type
-				$un_trans = Api\Translation::get_message_id($record['info_type'],'infolog');
-				if($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
+				$un_trans = Api\Translation::get_message_id($record['info_type'], 'infolog');
+				if ($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
 				{
 					$record['info_type'] = $un_trans;
 				}
 				else
 				{
-					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n":'').
+					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n" : '').
 						lang('Unknown type: %1', $record['info_type']);
 				}
 			}
 
 			// Set default status for type, if not specified
-			if(!$record['info_status'] && $record['info_type'])
+			if (!$record['info_status'] && $record['info_type'])
 			{
 				$record['info_status'] = $this->boinfolog->status['defaults'][$record['info_type']];
 			}
 
 			// Set owner, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'])
+			if ($_definition->plugin_options['owner_from_csv'])
 			{
-				if(!is_numeric($record['info_owner']))
+				if (!is_numeric($record['info_owner']))
 				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
@@ -233,51 +233,51 @@ 
 			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 			// Responsible has to be an array
-			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
+			$record['info_responsible'] = $record['info_responsible'] ? explode(',', $record['info_responsible']) : 0;
 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname, $firstname, $org_name);
 			}
 			if ($record['projectmanager'] && !is_numeric($record['projectmanager']))
 			{
 				$record['projectmanager'] = self::project_id($record['projectmanager']);
 			}
 
-			if ( $_definition->plugin_options['conditions'] )
+			if ($_definition->plugin_options['conditions'])
 			{
-				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				foreach ($_definition->plugin_options['conditions'] as $condition)
 				{
 					$results = array();
-					switch ( $condition['type'] )
+					switch ($condition['type'])
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
-								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
+							if ($record[$condition['string']]) {
+								$query['col_filter'] = array($condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if ($condition['string'][0] == '#') $query['custom_fields'] = true;
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if (is_array($results) && count(array_keys($results)) >= 1) {
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ((array)$results as $contact) {
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
+									if ($_definition->plugin_options['update_cats'] == 'add') {
+										if (!is_array($contact['cat_id'])) $contact['cat_id'] = explode(',', $contact['cat_id']);
+										if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+										$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $contact['cat_id'])));
 									}
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -292,14 +292,14 @@ 
 			else
 			{
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
-				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($success) $count++;
+			if ($this->warnings[$import_csv->get_current_position()]) {
+				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
-				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($this->errors[$import_csv->get_current_position()]) {
+				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
 		}
 		return $count;
@@ -312,7 +312,7 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		$result = true;
 		switch ($_action) {
 			case 'none' :
@@ -321,7 +321,7 @@ 
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -329,19 +329,19 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if (count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 
 					// Check for link during dry run
-					if($_data['link_custom'])
+					if ($_data['link_custom'])
 					{
-						list($app, $app_id2) = explode(':', $_data['link_custom'],2);
+						list($app, $app_id2) = explode(':', $_data['link_custom'], 2);
 						$app_id = $this->link_by_cf($record_num, $app, $field, $app_id2);
 					}
 
@@ -349,12 +349,12 @@ 
 					break;
 				} else {
 					$result = $this->boinfolog->write(
-						$_data, true, 2,true, 	// 2 = dont touch modification date
+						$_data, true, 2, true, // 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
 					);
-					if(!$result)
+					if (!$result)
 					{
-						if($result === false)
+						if ($result === false)
 						{
 							$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 								$GLOBALS['egw']->accounts->id2name($_data['info_owner']),
@@ -377,17 +377,17 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(array_keys(self::$special_fields) as $field) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $_data[$field],2);
+		foreach (array_keys(self::$special_fields) as $field) {
+			if (!$_data[$field]) continue;
+			if (strpos($field, 'link') === 0) {
+				list($app, $app_id) = explode(':', $_data[$field], 2);
 
 				// Linking to another entry based on matching custom fields
-				if($field == 'link_custom')
+				if ($field == 'link_custom')
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
@@ -398,14 +398,14 @@ 
 			if ($app && $app_id) {
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
-				$link_id = Link::link('infolog',$id,$app,$app_id);
+				$link_id = Link::link('infolog', $id, $app, $app_id);
 				if ($link_id && !$info_link_id)
 				{
 					$to_write = array(
 						'info_id'      => $id,
 						'info_link_id' => $link_id,
 					);
-					$this->boinfolog->write($to_write,False,false,true,true);	// last true = no notifications, as no real change
+					$this->boinfolog->write($to_write, False, false, true, true); // last true = no notifications, as no real change
 					$info_link_id = $link_id;
 				}
 			}
@@ -505,7 +505,7 @@ 
 	// Extra conversion functions - must be static
 	public static function project_id($num_or_title)
 	{
-		static $boprojects=null;
+		static $boprojects = null;
 
 		if (!$num_or_title) return false;
 
@@ -532,18 +532,18 @@ 
 	{
 		$app_id = false;
 
-		list($custom_field, $value) = explode(':',$_value);
+		list($custom_field, $value) = explode(':', $_value);
 		// Find matching entry
-		if($app && $custom_field && $value)
+		if ($app && $custom_field && $value)
 		{
 			$cfs = Api\Storage\Customfields::get($app);
 			// Error if no custom fields, probably something wrong in definition
-			if(!$cfs[$custom_field])
+			if (!$cfs[$custom_field])
 			{
 				// Check for users specifing label instead of name
-				foreach($cfs as $name => $settings)
+				foreach ($cfs as $name => $settings)
 				{
-					if(strtolower($settings['label']) == strtolower($custom_field))
+					if (strtolower($settings['label']) == strtolower($custom_field))
 					{
 						$custom_field = $name;
 						break;
@@ -552,23 +552,23 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if (!$cfs[$custom_field] && !$cfs[substr($custom_field, 1)]) {
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if ($custom_field[0] != '#') $custom_field = '#'.$custom_field;
 
 			// Search
-			if(Link::get_registry($app, 'query'))
+			if (Link::get_registry($app, 'query'))
 			{
-				$options = array('filter' => array("$custom_field = " . $GLOBALS['egw']->db->quote($value)));
+				$options = array('filter' => array("$custom_field = ".$GLOBALS['egw']->db->quote($value)));
 				$result = Link::query($app, '', $options);
 
 				// Only one allowed
-				if(count($result) != 1)
+				if (count($result) != 1)
 				{
-					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '') .
+					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '').
 						lang('Unable to link to %3 by custom field "%1": "%4".  %2 matches.',
 						$custom_field, count($result), lang($app), $options['filter'][0]
 					);

Braces +112 added lines, -43 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -111,7 +112,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -143,9 +145,12 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -170,11 +175,15 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			$lookups = $_lookups;
 
@@ -189,7 +198,10 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if($result)
+			{
+				$this->warnings[$import_csv->get_current_position()] = $result;
+			}
 
 			// Make sure type is valid
 			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
@@ -230,7 +242,10 @@ 
 			{
 				$record['info_owner'] = $_definition->plugin_options['record_owner'];
 			}
-			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($record['info_owner']))
+			{
+				$record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
 			// Responsible has to be an array
 			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
@@ -255,27 +270,42 @@ 
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if($record[$condition['string']])
+							{
 								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if($condition['string'][0] == '#')
+								{
+									$query['custom_fields'] = true;
+								}
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+							{
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ( (array)$results as $contact )
+								{
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+									if ( $_definition->plugin_options['update_cats'] == 'add' )
+									{
+										if ( !is_array( $contact['cat_id'] ) )
+										{
+											$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+										}
+										if ( !is_array( $record['cat_id'] ) )
+										{
+											$record['cat_id'] = explode( ',', $record['cat_id'] );
+										}
 										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
 									}
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -286,7 +316,10 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
 			}
 			else
@@ -294,11 +327,16 @@ 
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
+			if($success)
+			{
+				$count++;
+			}
+			if($this->warnings[$import_csv->get_current_position()])
+			{
 				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
+			if($this->errors[$import_csv->get_current_position()])
+			{
 				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
 		}
@@ -312,16 +350,19 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
 		$result = true;
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -329,13 +370,15 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
+				{
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 
 					// Check for link during dry run
@@ -347,7 +390,9 @@ 
 
 					$this->results[$_action]++;
 					break;
-				} else {
+				}
+				else
+				{
 					$result = $this->boinfolog->write(
 						$_data, true, 2,true, 	// 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
@@ -377,13 +422,19 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(array_keys(self::$special_fields) as $field) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(array_keys(self::$special_fields) as $field)
+		{
+			if(!$_data[$field])
+			{
+				continue;
+			}
+			if(strpos($field, 'link') === 0)
+			{
 				list($app, $app_id) = explode(':', $_data[$field],2);
 
 				// Linking to another entry based on matching custom fields
@@ -391,11 +442,14 @@ 
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
-			} else {
+			}
+			else
+			{
 				$app = $field;
 				$app_id = $_data[$field];
 			}
-			if ($app && $app_id) {
+			if ($app && $app_id)
+			{
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
 				$link_id = Link::link('infolog',$id,$app,$app_id);
@@ -418,7 +472,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV import');
 	}
 
@@ -427,7 +482,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports entries into the infolog from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -436,7 +492,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -452,7 +509,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -461,7 +519,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -473,7 +532,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -485,7 +545,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -497,7 +558,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 	// end of iface_export_plugin
@@ -507,7 +569,10 @@ 
 	{
 		static $boprojects=null;
 
-		if (!$num_or_title) return false;
+		if (!$num_or_title)
+		{
+			return false;
+		}
 
 		if (!is_object($boprojects))
 		{
@@ -552,12 +617,16 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)])
+			{
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if($custom_field[0] != '#')
+			{
+				$custom_field = '#' . $custom_field;
+			}
 
 			// Search
 			if(Link::get_registry($app, 'query'))

infolog/inc/class.infolog_so.inc.php

Doc Comments +1 added lines, -14 removed lines

@@ -85,6 +85,7 @@ 
 	 * Check if user is responsible for an entry: he or one of his memberships is in responsible
 	 *
 	 * @param array $info infolog entry as array
+	 * @param integer $user
 	 * @return boolean
 	 */
 	function is_responsible($info,$user=null)
@@ -476,8 +477,6 @@ 
 	 * changes or deletes entries with a spezified owner (for hook_delete_account)
 	 *
 	 * @param array $args hook arguments
-	 * @param int $args['account_id'] account to delete
-	 * @param int $args['new_owner']=0 new owner
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
@@ -659,19 +658,7 @@ 
 	/**
 	 * searches InfoLog for a certain pattern in $query
 	 *
-	 * @param string $query[order] column-name to sort after
-	 * @param string $query[sort] sort-order DESC or ASC
-	 * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
-	 * @param int $query[cat_id] category to use or 0 or unset
-	 * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des
-	 * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
 	 * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
-	 * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
-	 * @param boolean $query[subs] return subs or not, if unset the user preference is used
-	 * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
-	 * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
-	 * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
-	 * @param boolean $query['custom_fields']=false query custom-fields too, default not
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
 	function search(&$query)

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
 					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+								 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{

Braces +118 added lines, -29 removed lines

@@ -89,10 +89,16 @@ 
 	 */
 	function is_responsible($info,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user)
+		{
+			$user_and_memberships =& $um_cache[$user];
+		}
 		if (!isset($user_and_memberships))
 		{
 			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
@@ -113,20 +119,32 @@ 
 	 */
 	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
 	{
-		if (is_null($grants)) $grants = $this->grants;
-		if (!$user) $user = $this->user;
+		if (is_null($grants))
+		{
+			$grants = $this->grants;
+		}
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		// if info-array, but no owner given, force reading of info from db
-		if (is_array($info) && !$info['info_owner']) $info = $info['info_id'];
+		if (is_array($info) && !$info['info_owner'])
+		{
+			$info = $info['info_id'];
+		}
 
 		if (is_array($info))
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int) $info != $this->data['info_id'])
+		{
+			// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
+		}
 			$info = $this->read(array('info_id'=>$info));
 			$this->data = $backup_data;
 		}
@@ -160,7 +178,10 @@ 
 	 */
 	function responsible_filter($users)
 	{
-		if (!$users) return '0';
+		if (!$users)
+		{
+			return '0';
+		}
 
 		$responsible = array();
 		foreach((array)$users as $user)
@@ -250,11 +271,14 @@ 
 						" OR info_status = 'offer' AND $public_access" : '').")".
 				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
-			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
+			elseif ($filter != 'my' && $filter != 'responsible')
+			{
+				// none --> all entrys user has rights to see
 			{
 				if ($has_private_access)
 				{
 					$filtermethod .= " OR $has_private_access";
+			}
 				}
 				if (count($public_user_list))
 				{
@@ -498,7 +522,10 @@ 
 		{
 			$new_responsible = explode(',',$row['info_responsible']);
 			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
-			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
+			if ((int)$args['new_owner'])
+			{
+				$new_responsible[] = (int)$args['new_owner'];
+			}
 			$this->db->update($this->info_table,array(
 				'info_responsible' => implode(',',$new_responsible),
 			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
@@ -527,10 +554,13 @@ 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
 		$info_id = (int) $values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible',$values))
+		{
+			// isset($values['info_responsible']) returns false for NULL!
 		{
 			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
 		}
+		}
 		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
 		$to_write = array();
 		foreach($values as $key => $val)
@@ -541,12 +571,18 @@ 
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
-		if ($to_write['info_price'] === '') $to_write['info_price'] = NULL;
+		if ($to_write['info_price'] === '')
+		{
+			$to_write['info_price'] = NULL;
+		}
 
 		if (($this->data['info_id'] = $info_id))
 		{
 			$where = array('info_id' => $info_id);
-			if ($check_modified) $where['info_datemodified'] = $check_modified;
+			if ($check_modified)
+			{
+				$where['info_datemodified'] = $check_modified;
+			}
 			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
@@ -560,7 +596,11 @@ 
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent']))
+			{
+				$to_write['info_id_parent'] = 0;
+			}
+			// must not be null
 
 			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
 			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
@@ -589,7 +629,10 @@ 
 		if ($purge_cfs)
 		{
 			$where = array('info_id' => $info_id);
-			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
+			if ($purge_cfs == 'ical')
+			{
+				$where[] = "info_extra_name LIKE '#%'";
+			}
 			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
 		}
 		$to_delete = array();
@@ -641,7 +684,10 @@ 
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
-			if ((int)$info_id <= 0) return 0;
+			if ((int)$info_id <= 0)
+			{
+				return 0;
+			}
 		}
 		$counts = array();
 		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
@@ -714,11 +760,20 @@ 
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def))
+					{
+						$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+					}
+					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val]))
+					{
+						$val = 'info_'.$val;
+					}
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
-						if (!$this->db->capabilities['order_on_text']) continue;
+						if (!$this->db->capabilities['order_on_text'])
+						{
+							continue;
+						}
 
 						$val = sprintf($this->db->capabilities['order_on_text'],$val);
 					}
@@ -732,7 +787,10 @@ 
 			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
 		}
 		$filtermethod = $this->aclFilter($query['filter']);
-		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
+		if (!$query['col_filter']['info_status'])
+		{
+			$filtermethod .= $this->statusFilter($query['filter']);
+		}
 		$filtermethod .= $this->dateFilter($query['filter']);
 		$cfcolfilter=0;
 		if (is_array($query['col_filter']))
@@ -744,14 +802,20 @@ 
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col]))
+				{
+					$col = 'info_'.$col;
+				}
 				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
 							$data = (int) $data;
-							if (!$data) continue;
+							if (!$data)
+							{
+								continue;
+							}
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
 								$this->db->expression($this->info_table,array(
 									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
@@ -800,12 +864,22 @@ 
 			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
-		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
+		if ($query['query'])
+		{
+			$query['search'] = $query['query'];
+		}
+		// allow both names
+		if ($query['search'])
+		{
+			// we search in _from, _subject, _des and _extra_value for $query
 		{
 			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+		}
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
-			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
+			if ($this->db->capabilities['like_on_text'])
+			{
+				$columns[] = 'info_des';
+			}
 
 			$wildcard = $op = null;
 			$so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db);
@@ -844,7 +918,10 @@ 
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
-				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
+				if (!isset($custom_fields))
+				{
+					$custom_fields = Api\Storage\Customfields::get('infolog');
+				}
 				switch($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
@@ -864,7 +941,10 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
+				if (is_array($cols))
+				{
+					$cols = implode(',',$cols);
+				}
 				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
 					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
@@ -892,7 +972,10 @@ 
 			{
 				$config_data = Api\Config::read('infolog');
 				$index_load_cfs = $config_data['index_load_cfs'];
-				if (!is_array($index_load_cfs)) $index_load_cfs = explode(',', $index_load_cfs);
+				if (!is_array($index_load_cfs))
+				{
+					$index_load_cfs = explode(',', $index_load_cfs);
+				}
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
@@ -905,7 +988,10 @@ 
 					$where['info_extra_name'] = array();
 					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#')
+						{
+							$where['info_extra_name'][] = substr($col,1);
+						}
 					}
 				}
 				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
@@ -953,7 +1039,10 @@ 
 				{
 					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user,$users))
+						{
+							$users[] = $user;
+						}
 					}
 				}
 			}

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

@@ -828,7 +828,7 @@ 
 		$ids = array( );
 		if ($action == '' || $action == 'sp' || count($links))
 		{
-			$sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
+			$sql_query = "from $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
 			#error_log("infolog.so.search:\n" . print_r($sql_query, true));
 
 			if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
@@ -838,7 +838,7 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql="select $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')

Spacing +160 added lines, -161 removed lines

@@ -71,7 +71,7 @@ 
 	 * @param array $grants =array()
 	 * @return soinfolog
 	 */
-	function __construct( $grants=array() )
+	function __construct($grants = array())
 	{
 		$this->db     = clone($GLOBALS['egw']->db);
 		$this->db->set_app('infolog');
@@ -87,18 +87,18 @@ 
 	 * @param array $info infolog entry as array
 	 * @return boolean
 	 */
-	function is_responsible($info,$user=null)
+	function is_responsible($info, $user = null)
 	{
 		if (!$user) $user = $this->user;
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user) $user_and_memberships = & $um_cache[$user];
 		if (!isset($user_and_memberships))
 		{
-			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$user_and_memberships[] = $user;
 		}
-		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'],$user_and_memberships);
+		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'], $user_and_memberships);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param int $user =null user to check, default (null) $this->user
 	 * @return boolean True if access is granted else False
 	 */
-	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
+	function check_access($info, $required_rights, $implicit_edit = false, array $grants = null, $user = null)
 	{
 		if (is_null($grants)) $grants = $this->grants;
 		if (!$user) $user = $this->user;
@@ -123,7 +123,7 @@ 
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int)$info != $this->data['info_id'])      	// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
@@ -139,12 +139,12 @@ 
 			return False;
 		}
 		$owner = $info['info_owner'];
-		$access_ok = $owner == $user ||	// user has all rights
+		$access_ok = $owner == $user || // user has all rights
 			// ACL only on public entrys || $owner granted _PRIVATE
-			(!!($grants[$owner] & $required_rights) ||
-				$this->is_responsible($info,$user) &&	// implicite rights for responsible user(s) and his memberships
+			(!!($grants[$owner]&$required_rights) ||
+				$this->is_responsible($info, $user) && // implicite rights for responsible user(s) and his memberships
 				($required_rights == Acl::READ || $required_rights == Acl::ADD || $implicit_edit && $required_rights == Acl::EDIT)) &&
-			($info['info_access'] == 'public' || !!($this->grants[$user] & Acl::PRIVAT));
+			($info['info_access'] == 'public' || !!($this->grants[$user]&Acl::PRIVAT));
 
 		// error_log(__METHOD__."($info[info_id],$required_rights,$implicit_edit,".array2string($grants).",$user) returning ".array2string($access_ok));
 		return $access_ok;
@@ -163,23 +163,22 @@ 
 		if (!$users) return '0';
 
 		$responsible = array();
-		foreach((array)$users as $user)
+		foreach ((array)$users as $user)
 		{
-			$responsible = array_merge($responsible,(array)
-				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user,true) :
-					$GLOBALS['egw']->accounts->members($user,true)));
+			$responsible = array_merge($responsible, (array)
+				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user, true) : $GLOBALS['egw']->accounts->members($user, true)));
 			$responsible[] = $user;
 		}
 		if (is_array($users))
 		{
 			$responsible = array_unique($responsible);
 		}
-		foreach($responsible as $key => $uid)
+		foreach ($responsible as $key => $uid)
 		{
-			$responsible[$key] = $this->db->concat("','",'info_responsible',"','")." LIKE '%,$uid,%'";
+			$responsible[$key] = $this->db->concat("','", 'info_responsible', "','")." LIKE '%,$uid,%'";
 		}
 		//echo "<p align=right>responsible_filter($user) = ".'('.implode(' OR ',$responsible).')'."</p>\n";
-		return '('.implode(' OR ',$responsible).')';
+		return '('.implode(' OR ', $responsible).')';
 	}
 
 	/**
@@ -194,17 +193,17 @@ 
 	function aclFilter($_filter = False)
 	{
 		$vars = null;
-		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/',$_filter,$vars);
+		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/', $_filter, $vars);
 		$filter = $vars[1];
 		$f_user = $vars[2];
 
 		if (isset($this->acl_filter[$filter.$f_user]))
 		{
-			return $this->acl_filter[$filter.$f_user];  // used cached filter if found
+			return $this->acl_filter[$filter.$f_user]; // used cached filter if found
 		}
-		if ($f_user && strpos($f_user,',') !== false)
+		if ($f_user && strpos($f_user, ',') !== false)
 		{
-			$f_user = explode(',',$f_user);
+			$f_user = explode(',', $f_user);
 		}
 
 		$filtermethod = " (info_owner=$this->user"; // user has all rights
@@ -221,24 +220,24 @@ 
 		{
 			if (is_array($this->grants))
 			{
-				foreach($this->grants as $user => $grant)
+				foreach ($this->grants as $user => $grant)
 				{
 					// echo "<p>grants: user=$user, grant=$grant</p>";
-					if ($grant & (EGW_ACL_READ|EGW_ACL_EDIT))
+					if ($grant&(EGW_ACL_READ|EGW_ACL_EDIT))
 					{
 						$public_user_list[] = $user;
 					}
-					if ($grant & Acl::PRIVAT)
+					if ($grant&Acl::PRIVAT)
 					{
 						$private_user_list[] = $user;
 					}
 				}
 				if (count($private_user_list))
 				{
-					$has_private_access = $this->db->expression($this->info_table,array('info_owner' => $private_user_list));
+					$has_private_access = $this->db->expression($this->info_table, array('info_owner' => $private_user_list));
 				}
 			}
-			$public_access = $this->db->expression($this->info_table,array('info_owner' => $public_user_list));
+			$public_access = $this->db->expression($this->info_table, array('info_owner' => $public_user_list));
 			// implicit read-rights for responsible user
 			$filtermethod .= " OR (".$this->responsible_filter($this->user).')';
 
@@ -246,9 +245,9 @@ 
 			if ($filter == 'private' || $filter == 'privat' || $filter == 'own')
 			{
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
-					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
+					($filter == 'own' && count($public_user_list) ? // offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+				                 " AND (info_access='public'".($has_private_access ? " OR $has_private_access" : '').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{
@@ -265,13 +264,13 @@ 
 
 			if ($filter == 'user' && $f_user)
 			{
-				$filtermethod .= $this->db->expression($this->info_table,' AND (',array(
+				$filtermethod .= $this->db->expression($this->info_table, ' AND (', array(
 					'info_owner' => $f_user,
-				)," AND info_responsible='0' OR ",$this->responsible_filter($f_user),')');
+				), " AND info_responsible='0' OR ", $this->responsible_filter($f_user), ')');
 			}
 		}
 		//echo "<p>aclFilter(filter='$_filter',user='$f_user') = '$filtermethod', privat_user_list=".print_r($privat_user_list,True).", public_user_list=".print_r($public_user_list,True)."</p>\n";
-		return $this->acl_filter[$filter.$f_user] = $filtermethod;  // cache the filter
+		return $this->acl_filter[$filter.$f_user] = $filtermethod; // cache the filter
 	}
 
 	/**
@@ -281,18 +280,18 @@ 
 	 * @param boolean $prefix_and =true if true prefix the fileter with ' AND '
 	 * @return string the necesary sql
 	 */
-	function statusFilter($_filter = '',$prefix_and=true)
+	function statusFilter($_filter = '', $prefix_and = true)
 	{
 		$vars = null;
-		preg_match('/(done|open|offer|deleted|\+deleted)/',$_filter,$vars);
+		preg_match('/(done|open|offer|deleted|\+deleted)/', $_filter, $vars);
 		$filter = $vars[1];
 
 		switch ($filter)
 		{
 			case 'done':	$filter = "info_status IN ('done','billed','cancelled')"; break;
 			case 'open':	$filter = "NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive'))"; break;
-			case 'offer':	$filter = "info_status = 'offer'";    break;
-			case 'deleted': $filter = "info_status = 'deleted'";  break;
+			case 'offer':	$filter = "info_status = 'offer'"; break;
+			case 'deleted': $filter = "info_status = 'deleted'"; break;
 			case '+deleted':$filter = "NOT (info_status IN ('template','nonactive','archive'))"; break;
 			default:        $filter = "NOT (info_status IN ('deleted','template','nonactive','archive'))"; break;
 		}
@@ -313,18 +312,18 @@ 
 	function dateFilter($_filter = '')
 	{
 		$vars = null;
-		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$_filter,$vars);
+		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/', $_filter, $vars);
 		$filter = $vars[1];
 
-		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
+		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/', $vars[2])))
 		{
-			$today = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2]),intval($date[0]));
-			$tomorrow = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2])+1,intval($date[0]));
+			$today = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]), intval($date[0]));
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]) + 1, intval($date[0]));
 		}
 		else
 		{
-			$now = getdate(time()-60*60*$this->tz_offset);
-			$tomorrow = mktime(-$this->tz_offset,0,0,$now['mon'],$now['mday']+1,$now['year']);
+			$now = getdate(time() - 60 * 60 * $this->tz_offset);
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, $now['mon'], $now['mday'] + 1, $now['year']);
 		}
 		switch ($filter)
 		{
@@ -388,7 +387,7 @@ 
 			$minimum_uid_length = 8;
 		}
 
-		if (!$where || !($this->data = $this->db->select($this->info_table,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (!$where || !($this->data = $this->db->select($this->info_table, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
 			$this->init( );
 			//error_log(__METHOD__.'('.array2string($where).') returning FALSE');
@@ -400,15 +399,15 @@ 
 			$this->data['info_uid'] = Api\CalDAV::generate_uid('infolog', $this->data['info_id']);
 			$this->db->update($this->info_table,
 				array('info_uid' => $this->data['info_uid']),
-				array('info_id' => $this->data['info_id']), __LINE__,__FILE__);
+				array('info_id' => $this->data['info_id']), __LINE__, __FILE__);
 		}
 		if (!is_array($this->data['info_responsible']))
 		{
-			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
+			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',', $this->data['info_responsible']) : array();
 		}
 		// Cast back to integer
 		$this->data['info_id_parent'] = (int)$this->data['info_id_parent'];
-		foreach($this->db->select($this->extra_table,'info_extra_name,info_extra_value',array('info_id'=>$this->data['info_id']),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->extra_table, 'info_extra_name,info_extra_value', array('info_id'=>$this->data['info_id']), __LINE__, __FILE__) as $row)
 		{
 			$this->data['#'.$row['info_extra_name']] = $row['info_extra_value'];
 		}
@@ -423,16 +422,16 @@ 
 	 * @param boolean $delete_children delete the children, if not set there parent-id to $new_parent
 	 * @param int $new_parent new parent-id to set for subs
 	 */
-	function delete($info_id,$delete_children=True,$new_parent=0)  // did _not_ ensure ACL
+	function delete($info_id, $delete_children = True, $new_parent = 0)  // did _not_ ensure ACL
 	{
 		//echo "<p>soinfolog::delete($info_id,'$delete_children',$new_parent)</p>\n";
-		if ((int) $info_id <= 0)
+		if ((int)$info_id <= 0)
 		{
 			return;
 		}
-		$this->db->delete($this->info_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		$this->db->delete($this->extra_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		Link::unlink(0,'infolog',$info_id);
+		$this->db->delete($this->info_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		$this->db->delete($this->extra_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		Link::unlink(0, 'infolog', $info_id);
 
 		if ($this->data['info_id'] == $info_id)
 		{
@@ -441,17 +440,17 @@ 
 		// delete children, if they are owned by the user
 		if ($delete_children)
 		{
-			$db2 = clone($this->db);	// we need an extra result-set
-			foreach($db2->select($this->info_table,'info_id',array(
+			$db2 = clone($this->db); // we need an extra result-set
+			foreach ($db2->select($this->info_table, 'info_id', array(
 					'info_id_parent'	=> $info_id,
 					'info_owner'		=> $this->user,
-				),__LINE__,__FILE__) as $row)
+				), __LINE__, __FILE__) as $row)
 			{
 				$this->delete($row['info_id'], $delete_children);
 			}
 		}
 		// set parent_id to $new_parent or 0 for all not deleted children
-		$this->db->update($this->info_table,array('info_id_parent'=>$new_parent),array('info_id_parent'=>$info_id),__LINE__,__FILE__);
+		$this->db->update($this->info_table, array('info_id_parent'=>$new_parent), array('info_id_parent'=>$info_id), __LINE__, __FILE__);
 	}
 
 	/**
@@ -463,9 +462,9 @@ 
 	function get_children($info_id)
 	{
 		$children = array();
-		foreach($this->db->select($this->info_table, 'info_id,info_owner', array(
+		foreach ($this->db->select($this->info_table, 'info_id,info_owner', array(
 			'info_id_parent'	=> $info_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$children[$row['info_id']] = $row['info_owner'];
 		}
@@ -481,27 +480,27 @@ 
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
-		if (!(int) $args['new_owner'])
+		if (!(int)$args['new_owner'])
 		{
-			foreach($this->db->select($this->info_table,'info_id',array('info_owner'=>$args['account_id']),__LINE__,__FILE__,false,'','infolog') as $row)
+			foreach ($this->db->select($this->info_table, 'info_id', array('info_owner'=>$args['account_id']), __LINE__, __FILE__, false, '', 'infolog') as $row)
 			{
-				$this->delete($row['info_id'],False);
+				$this->delete($row['info_id'], False);
 			}
 		}
 		else
 		{
-			$this->db->update($this->info_table,array('info_owner'=>$args['new_owner']),array('info_owner'=>$args['account_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array('info_owner'=>$args['new_owner']), array('info_owner'=>$args['account_id']), __LINE__, __FILE__, 'infolog');
 		}
-		foreach($this->db->select($this->info_table,'info_id,info_responsible',
-			$this->db->concat("','",'info_responsible',"','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
-			__LINE__,__FILE__,false,'','infolog') as $row)
+		foreach ($this->db->select($this->info_table, 'info_id,info_responsible',
+			$this->db->concat("','", 'info_responsible', "','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
+			__LINE__, __FILE__, false, '', 'infolog') as $row)
 		{
-			$new_responsible = explode(',',$row['info_responsible']);
-			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
+			$new_responsible = explode(',', $row['info_responsible']);
+			unset($new_responsible[array_search($args['account_id'], $new_responsible)]);
 			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
-			$this->db->update($this->info_table,array(
-				'info_responsible' => implode(',',$new_responsible),
-			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array(
+				'info_responsible' => implode(',', $new_responsible),
+			), array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 		}
 	}
 
@@ -514,7 +513,7 @@ 
 	 * @param boolean $force_insert =false force using insert, even if an id is given eg. for import
 	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
-	function write($values, $check_modified=0, $purge_cfs=null, $force_insert=false)  // did _not_ ensure ACL
+	function write($values, $check_modified = 0, $purge_cfs = null, $force_insert = false)  // did _not_ ensure ACL
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -526,19 +525,19 @@ 
 		}
 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
-		$info_id = (int) $values['info_id'];
+		$info_id = (int)$values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible', $values))	// isset($values['info_responsible']) returns false for NULL!
 		{
-			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
+			$values['info_responsible'] = $values['info_responsible'] ? implode(',', $values['info_responsible']) : '0';
 		}
-		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+		$table_def = $this->db->get_table_definitions('infolog', $this->info_table);
 		$to_write = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if (($key != 'info_id' || $force_insert) && isset($table_def['fd'][$key]))
 			{
-				$to_write[$key] = $this->data[$key] = $val;   // update internal data
+				$to_write[$key] = $this->data[$key] = $val; // update internal data
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
@@ -548,23 +547,23 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($check_modified) $where['info_datemodified'] = $check_modified;
-			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
+			if (!$this->db->update($this->info_table, $to_write, $where, __LINE__, __FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
-				return false;	// Error
+				return false; // Error
 			}
 			if ($check_modified && $this->db->affected_rows() < 1)
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning 0 (nothing updated, eg. condition not met)");
-				return 0;	// someone else updated the modtime or deleted the entry
+				return 0; // someone else updated the modtime or deleted the entry
 			}
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0; // must not be null
 
-			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
-			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
+			$this->db->insert($this->info_table, $to_write, false, __LINE__, __FILE__);
+			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table, 'info_id');
 		}
 
 		$update = array();
@@ -580,8 +579,8 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->info_table,$update,
-				array('info_id' => $info_id), __LINE__,__FILE__);
+			$this->db->update($this->info_table, $update,
+				array('info_id' => $info_id), __LINE__, __FILE__);
 		}
 
 		//echo "<p>soinfolog.write values= "; _debug_array($values);
@@ -591,38 +590,38 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
-			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, $where, __LINE__, __FILE__);
 		}
 		$to_delete = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key[0] != '#')
 			{
-				continue;	// no customfield
+				continue; // no customfield
 			}
-			$this->data[$key] = $val;	// update internal data
+			$this->data[$key] = $val; // update internal data
 
 			if ($val)
 			{
-				$this->db->insert($this->extra_table,array(
+				$this->db->insert($this->extra_table, array(
 						// store multivalued CalDAV properties as serialized array, everything else get comma-separated
-						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',',$val)) : $val,
-					),array(
+						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',', $val)) : $val,
+					), array(
 						'info_id'			=> $info_id,
-						'info_extra_name'	=> substr($key,1),
-					),__LINE__,__FILE__);
+						'info_extra_name'	=> substr($key, 1),
+					), __LINE__, __FILE__);
 			}
 			else
 			{
-				$to_delete[] = substr($key,1);
+				$to_delete[] = substr($key, 1);
 			}
 		}
 		if ($to_delete && !$purge_cfs)
 		{
-			$this->db->delete($this->extra_table,array(
+			$this->db->delete($this->extra_table, array(
 					'info_id'			=> $info_id,
 					'info_extra_name'	=> $to_delete,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 		}
 		// echo "<p>soinfolog.write this->data= "; _debug_array($this->data);
 		//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning id=".$this->data['info_id']);
@@ -638,18 +637,18 @@ 
 	 * @param int|array $info_id id(s) of log-entry
 	 * @return int|array the number of sub-entries or indexed by info_id, if array as param given
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
 			if ((int)$info_id <= 0) return 0;
 		}
 		$counts = array();
-		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
+		foreach ($this->db->select($this->info_table, 'info_id_parent,COUNT(*) AS info_anz_subs', array(
 			'info_id_parent' => $info_id,
-			"info_status != 'deleted'",	// dont count deleted subs as subs, as they are not shown by default
-		),__LINE__,__FILE__,
-			false,'GROUP BY info_id_parent','infolog') as $row)
+			"info_status != 'deleted'", // dont count deleted subs as subs, as they are not shown by default
+		), __LINE__, __FILE__,
+			false, 'GROUP BY info_id_parent', 'infolog') as $row)
 		{
 			$counts[$row['info_id_parent']] = (int)$row['info_anz_subs'];
 		}
@@ -676,7 +675,7 @@ 
 	 * @param boolean $no_acl =false true: ignore all acl
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
-	function search(&$query, $no_acl=false)
+	function search(&$query, $no_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 		$action2app = array(
@@ -690,102 +689,102 @@ 
 			$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
 			if ($action)
 			{
-				$links = Link\Storage::get_links($action=='sp'?'infolog':$action,
-					is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog','',$query['col_filter']['info_status'] =='deleted');
+				$links = Link\Storage::get_links($action == 'sp' ? 'infolog' : $action,
+					is_array($query['action_id']) ? $query['action_id'] : explode(',', $query['action_id']), 'infolog', '', $query['col_filter']['info_status'] == 'deleted');
 
 				if (count($links))
 				{
-					$links = call_user_func_array('array_merge',$links);	// flatten the array
-					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')';
+					$links = call_user_func_array('array_merge', $links); // flatten the array
+					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',', $links).')';
 				}
 			}
 		}
-		$sortbycf='';
-		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i',$query['order']) || stripos($query['order'],'#')!==FALSE ) &&
-			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i',$query['sort'])))
+		$sortbycf = '';
+		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i', $query['order']) || stripos($query['order'], '#') !== FALSE) &&
+			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i', $query['sort'])))
 		{
 			$order = array();
-			foreach(explode(',',$query['order']) as $val)
+			foreach (explode(',', $query['order']) as $val)
 			{
 				$val = trim($val);
 				if ($val[0] == '#')
 				{
-					$sortbycf = substr($val,1);
+					$sortbycf = substr($val, 1);
 					$val = "cfsortcrit IS NULL,cfsortcrit";
 				}
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog', $this->info_table);
+					if (substr($val, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
 						if (!$this->db->capabilities['order_on_text']) continue;
 
-						$val = sprintf($this->db->capabilities['order_on_text'],$val);
+						$val = sprintf($this->db->capabilities['order_on_text'], $val);
 					}
 				}
 				$order[] = $val;
 			}
-			$ordermethod = 'ORDER BY ' . implode(',',$order) . ' ' . $query['sort'];
+			$ordermethod = 'ORDER BY '.implode(',', $order).' '.$query['sort'];
 		}
 		else
 		{
-			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
+			$ordermethod = 'ORDER BY info_datemodified DESC'; // newest first
 		}
 		$filtermethod = $no_acl ? '1=1' : $this->aclFilter($query['filter']);
 		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
 		$filtermethod .= $this->dateFilter($query['filter']);
-		$cfcolfilter=0;
+		$cfcolfilter = 0;
 		if (is_array($query['col_filter']))
 		{
-			foreach($query['col_filter'] as $col => $data)
+			foreach ($query['col_filter'] as $col => $data)
 			{
 				if (is_int($col))
 				{
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
-				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
+				if ($col[0] != '#' && substr($col, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i', $col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
-							$data = (int) $data;
+							$data = (int)$data;
 							if (!$data) continue;
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
-								$this->db->expression($this->info_table,array(
-									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
+								$this->db->expression($this->info_table, array(
+									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data, true)
 								)).')';
 							break;
 
 						case 'info_id':	// info_id itself is ambigous
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, 'main.', array('info_id' => $data));
 							break;
 
 						default:
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, array($col => $data));
 							break;
 					}
 				}
-				if ($col[0] == '#' &&  $query['custom_fields'] && $data)
+				if ($col[0] == '#' && $query['custom_fields'] && $data)
 				{
 					$filtermethod .= " AND main.info_id IN (SELECT DISTINCT info_id FROM $this->extra_table WHERE ";
 					$custom_fields = Api\Storage\Customfields::get('infolog');
 
-					if($custom_fields[substr($col,1)]['type'] == 'select' && $custom_fields[substr($col,1)]['rows'] > 1)
+					if ($custom_fields[substr($col, 1)]['type'] == 'select' && $custom_fields[substr($col, 1)]['rows'] > 1)
 					{
 						// Multi-select - any entry with the filter value selected matches
 						$filtermethod .= $this->db->expression($this->extra_table, array(
-							'info_extra_name' => substr($col,1),
-							$this->db->concat("','",'info_extra_value',"','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
+							'info_extra_name' => substr($col, 1),
+							$this->db->concat("','", 'info_extra_value', "','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
 						)).')';
 					}
 					else
 					{
-						$filtermethod .= $this->db->expression($this->extra_table,array(
-							'info_extra_name'  => substr($col,1),
+						$filtermethod .= $this->db->expression($this->extra_table, array(
+							'info_extra_name'  => substr($col, 1),
 							'info_extra_value' => $data,
 						)).')';
 					}
@@ -797,15 +796,15 @@ 
 
 		if ((int)$query['cat_id'])
 		{
-			$categories = new Api\Categories('','infolog');
+			$categories = new Api\Categories('', 'infolog');
 			$cats = $categories->return_all_children((int)$query['cat_id']);
-			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
+			$filtermethod .= ' AND info_cat'.(count($cats) > 1 ? ' IN ('.implode(',', $cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
+		if ($query['query']) $query['search'] = $query['query']; // allow both names
 		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
 		{
-			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+			$columns = array('info_from', 'info_addr', 'info_location', 'info_subject', 'info_extra_value');
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
 			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
 
@@ -813,13 +812,13 @@ 
 			$so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db);
 			$search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns);
 			$sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : '').
-				implode($op, $search) .')';
+				implode($op, $search).')';
 
-			$join = ($cfcolfilter>0 ? '':'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
+			$join = ($cfcolfilter > 0 ? '' : 'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
 			// mssql and others cant use DISTICT if text columns (info_des) are involved
 			$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
 		}
-		$pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0)));
+		$pid = 'AND '.$this->db->expression($this->info_table, array('info_id_parent' => ($action == 'sp' ? $query['action_id'] : 0)));
 
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' ||
 			(string)$query['col_filter']['info_id_parent'] !== '' ||
@@ -840,14 +839,14 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql = "SELECT $distinct main.info_id ".$sql_query, __LINE__, __FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
 				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
-				switch($custom_fields[$sortbycf]['type'])
+				switch ($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
 						$sort_col = $this->db->to_int($sort_col);
@@ -866,9 +865,9 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
-				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
-					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
+				if (is_array($cols)) $cols = implode(',', $cols);
+				$rs = $this->db->query($sql = 'SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod, __LINE__, __FILE__,
+					(int)$query['start'], isset($query['start']) ? (int)$query['num_rows'] : -1, false, Api\Db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
 
 				if ($mysql_calc_rows)
@@ -883,9 +882,9 @@ 
 			{
 				return $rs;
 			}
-			foreach($rs as $info)
+			foreach ($rs as $info)
 			{
-				$info['info_responsible'] = $info['info_responsible'] ? explode(',',$info['info_responsible']) : array();
+				$info['info_responsible'] = $info['info_responsible'] ? explode(',', $info['info_responsible']) : array();
 
 				$ids[$info['info_id']] = $info;
 			}
@@ -898,19 +897,19 @@ 
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
-				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 			{
 				$where = array('info_id' => array_keys($ids));
-				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',',$query['selectcols']):$query['selectcols'],'#') === false ||
-					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',', $query['selectcols']) : $query['selectcols'], '#') === false ||
+					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 				{
 					$where['info_extra_name'] = array();
-					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
+					foreach (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#') $where['info_extra_name'][] = substr($col, 1);
 					}
 				}
-				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where, __LINE__, __FILE__) as $row)
 				{
 					$ids[$row['info_id']]['#'.$row['info_extra_name']] = $row['info_extra_value'];
 				}
@@ -935,27 +934,27 @@ 
 	{
 		$users = array();
 
-		foreach($this->db->select($this->info_table,'DISTINCT info_owner',array(
-			str_replace(' AND ','',$this->statusFilter('open')),
-			'(ABS(info_startdate-'.time().')<'.(4*24*60*60).' OR '.	// start_day within 4 days
-			'ABS(info_enddate-'.time().')<'.(4*24*60*60).')',		// end_day within 4 days
-		),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_owner', array(
+			str_replace(' AND ', '', $this->statusFilter('open')),
+			'(ABS(info_startdate-'.time().')<'.(4 * 24 * 60 * 60).' OR '.// start_day within 4 days
+			'ABS(info_enddate-'.time().')<'.(4 * 24 * 60 * 60).')', // end_day within 4 days
+		), __LINE__, __FILE__) as $row)
 		{
 			$users[] = $row['info_responsible'];
 		}
-		foreach($this->db->select($this->info_table,'DISTINCT info_responsible',$this->statusFilter('open',false),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_responsible', $this->statusFilter('open', false), __LINE__, __FILE__) as $row)
 		{
-			foreach(explode(',', $row['info_responsible']) as $responsible)
+			foreach (explode(',', $row['info_responsible']) as $responsible)
 			{
 				if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g')
 				{
-					$responsible = $GLOBALS['egw']->accounts->members($responsible,true);
+					$responsible = $GLOBALS['egw']->accounts->members($responsible, true);
 				}
 				if ($responsible)
 				{
-					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
+					foreach (is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user, $users)) $users[] = $user;
 					}
 				}
 			}

infolog/inc/class.infolog_tracking.inc.php

Doc Comments -1 removed lines

@@ -125,7 +125,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param botracker $botracker
 	 * @return tracker_tracking
 	 */
 	function __construct(&$infolog_bo)

Spacing +39 added lines, -39 removed lines

@@ -130,9 +130,9 @@ 
 	 */
 	function __construct(&$infolog_bo)
 	{
-		parent::__construct('infolog');	// add custom fields from infolog
+		parent::__construct('infolog'); // add custom fields from infolog
 
-		$this->infolog =& $infolog_bo;
+		$this->infolog = & $infolog_bo;
 	}
 
 	/**
@@ -144,23 +144,23 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_subject($data,$old)
+	function get_subject($data, $old)
 	{
 		if ($data['prefix'])
 		{
-			$prefix = $data['prefix'];	// async notification
+			$prefix = $data['prefix']; // async notification
 		}
 		elseif (!$old || $old['info_status'] == 'deleted')
 		{
-			$prefix = lang('New %1',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('New %1', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			$prefix = lang('%1 deleted',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 deleted', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		else
 		{
-			$prefix = lang('%1 modified',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 modified', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		return $prefix.': '.$data['info_subject'];
 	}
@@ -172,22 +172,22 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_message($data,$old)
+	function get_message($data, $old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message']) return $data['message']; // async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
-			return lang('New %1 created by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
-				Api\Accounts::username($this->infolog->user),$this->datetime('now'));
+			return lang('New %1 created by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
+				Api\Accounts::username($this->infolog->user), $this->datetime('now'));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			return lang('%1 deleted by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+			return lang('%1 deleted by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 				Api\Accounts::username($data['info_modifier']),
 				$this->datetime($data['info_datemodified']));
 		}
-		return lang('%1 modified by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+		return lang('%1 modified by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 			Api\Accounts::username($data['info_modifier']),
 			$this->datetime($data['info_datemodified']));
 	}
@@ -199,14 +199,14 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required function signature
+		unset($receiver); // not used, but required function signature
 		//error_log(__METHOD__.__LINE__.' Data:'.array2string($data));
 		$responsible = array();
 		if ($data['info_responsible'])
 		{
-			foreach($data['info_responsible'] as $uid)
+			foreach ($data['info_responsible'] as $uid)
 			{
 				$responsible[] = Api\Accounts::username($uid);
 			}
@@ -215,31 +215,31 @@ 
 		{
 			$id = ' #'.$data['info_id'];
 		}
-		foreach(array(
+		foreach (array(
 			'info_type'      => lang($this->infolog->enums['type'][$data['info_type']]).$id,
 			'info_from'      => $data['info_from'],
 			'info_addr'      => $data['info_addr'],
 			'info_cat'       => $data['info_cat'] ? $GLOBALS['egw']->categories->id2name($data['info_cat']) : '',
 			'info_priority'  => lang($this->infolog->enums['priority'][$data['info_priority']]),
 			'info_owner'     => Api\Accounts::username($data['info_owner']),
-			'info_status'    => lang($data['info_status']=='deleted'?'deleted':$this->infolog->status[$data['info_type']][$data['info_status']]),
+			'info_status'    => lang($data['info_status'] == 'deleted' ? 'deleted' : $this->infolog->status[$data['info_type']][$data['info_status']]),
 			'info_percent'   => (int)$data['info_percent'].'%',
 			'info_datecompleted' => $data['info_datecompleted'] ? $this->datetime($data['info_datecompleted']) : '',
 			'info_location'  => $data['info_location'],
-			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'],null) : '',
-			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'],null) : '',
-			'info_responsible' => implode(', ',$responsible),
+			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'], null) : '',
+			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'], null) : '',
+			'info_responsible' => implode(', ', $responsible),
 			'info_subject'   => $data['info_subject'],
 		) as $name => $value)
 		{
 			//error_log(__METHOD__.__LINE__.' Key:'.$name.' val:'.array2string($value));
-			if ($name=='info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			if ($name == 'info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
 			{
 				$lkeys = array_keys($data['link_to']['to_id']);
-				if (in_array($data['info_contact'],$lkeys))
+				if (in_array($data['info_contact'], $lkeys))
 				{
-					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = Link::title($app,$id);
+					list($app, $id) = explode(':', $data['info_contact']);
+					if (!empty($app) && !empty($id)) $value = Link::title($app, $id);
 				}
 			}
 			$details[$name] = array(
@@ -271,7 +271,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__.__LINE__.' notify?'.($skip_notification?'no':'yes').function_backtrace());
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -280,23 +280,23 @@ 
 
 		if ($old && $this->field2history)
 		{
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 		}
 
 		// Don't notify if the only change was to the modified date
-		if(is_null($changed_fields))
+		if (is_null($changed_fields))
 		{
 			$changed_fields = $this->changed_fields($data, $old);
 			$changes = count($changed_fields); // we need that since TRUE evaluates to 1
 		}
 		//error_log(__METHOD__.__LINE__.array2string($changed_fields));
-		if(is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
+		if (is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
 		{
 			return count($changes);
 		}
 
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -314,16 +314,16 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required function signature
-		switch($name)
+		unset($old); // not used, but required function signature
+		switch ($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private') return array(); // no copies for private entries
 				if ($data['info_cc'])
 				{
-					$config = preg_split('/, ?/',$data['info_cc']);
+					$config = preg_split('/, ?/', $data['info_cc']);
 				}
 				else
 				{
@@ -332,7 +332,7 @@ 
 				break;
 			case self::CUSTOM_NOTIFICATION:
 				$info_config = Api\Config::read('infolog');
-				if(!$info_config[self::CUSTOM_NOTIFICATION])
+				if (!$info_config[self::CUSTOM_NOTIFICATION])
 				{
 					return '';
 				}
@@ -341,7 +341,7 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if (!$type_config['use_custom'] && !$global['use_custom']) return '';
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

Braces +22 added lines, -5 removed lines

@@ -174,7 +174,11 @@ 
 	 */
 	function get_message($data,$old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message'])
+		{
+			return $data['message'];
+		}
+		// async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
@@ -239,14 +243,20 @@ 
 				if (in_array($data['info_contact'],$lkeys))
 				{
 					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = Link::title($app,$id);
+					if (!empty($app)&&!empty($id))
+					{
+						$value = Link::title($app,$id);
+					}
 				}
 			}
 			$details[$name] = array(
 				'label' => lang($this->field2label[$name]),
 				'value' => $value,
 			);
-			if ($name == 'info_subject') $details[$name]['type'] = 'summary';
+			if ($name == 'info_subject')
+			{
+				$details[$name]['type'] = 'summary';
+			}
 		}
 		$details['info_des'] = array(
 			'value' => $data['info_des'],
@@ -320,7 +330,11 @@ 
 		switch($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private')
+				{
+					return array();
+				}
+				// no copies for private entries
 				if ($data['info_cc'])
 				{
 					$config = preg_split('/, ?/',$data['info_cc']);
@@ -341,7 +355,10 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if(!$type_config['use_custom'] && !$global['use_custom'])
+				{
+					return '';
+				}
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

infolog/inc/class.infolog_ui.inc.php

Doc Comments +9 added lines, -9 removed lines

@@ -295,6 +295,8 @@ 
 	 * @param array &$query
 	 * @param array &$rows
 	 * @param array &$readonlys
+	 * @param type|null $rows
+	 * @param type|null $readonlys
 	 * @return int
 	 */
 	function get_rows(&$query,&$rows,&$readonlys)
@@ -574,7 +576,6 @@ 
 	 * Hook for timesheet to set some extra data and links
 	 *
 	 * @param array $data
-	 * @param int $data[id] info_id
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
 	 */
 	function timesheet_set($data)
@@ -600,7 +601,6 @@ 
 	 * Hook for calendar to set some extra data and links
 	 *
 	 * @param array $data event-array preset by calendar plus
-	 * @param int $data[entry_id] info_id
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
 	 */
 	function calendar_set($data)
@@ -688,11 +688,11 @@ 
 	/**
 	 * Shows the infolog list
 	 *
-	 * @param array/string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
+	 * @param integer $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
 	 * @param string $action if set only entries liked to that $action:$action_id are shown
 	 * @param string $action_id if set only entries liked to that $action:$action_id are shown
-	 * @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
-	 * @param boolean $e$extra_app_header * @param boolean $return_html=false
+	 * @param integer $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
+	 * @param boolean $extra_app_header * @param boolean $return_html
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
@@ -1288,7 +1288,7 @@ 
 	 * @param array $query get_rows parameter
 	 * @param string &$msg on return user feedback
 	 * @param boolean $skip_notifications true to NOT notify users about changes
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @return boolean|null true if all actions succeded, false otherwise
 	 */
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg,
 		array $query, &$msg, $skip_notifications = false)
@@ -1526,9 +1526,9 @@ 
 	/**
 	 * Closes an infolog
 	 *
-	 * @param int|array $values=0 info_id (default _GET[info_id])
+	 * @param int|array $values info_id (default _GET[info_id])
 	 * @param string $_referer=''
-	 * @param boolean $closesingle=false
+	 * @param boolean $closesingle
 	 */
 	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
 	{
@@ -1576,7 +1576,7 @@ 
 	/**
 	 * Deletes an InfoLog entry
 	 *
-	 * @param array|int $values info_id (default _GET[info_id])
+	 * @param integer $values info_id (default _GET[info_id])
 	 * @param string $_referer
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion

Indentation +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
-				    ($link['app'] != $action || $link['id'] != $action_id) &&
+					($link['app'] != $action || $link['id'] != $action_id) &&
 					($show_links == 'all' || ($show_links == 'links') === ($link['app'] != Link::VFS_APPNAME)))
 				{
 					$info['filelinks'][] = $link;

Braces +284 added lines, -71 removed lines

@@ -97,7 +97,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') Api\Translation::add_app('infolog');
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog')
+		{
+			Api\Translation::add_app('infolog');
+		}
 
 		// Make sure Global category is infolog - on first load, it may not be
 		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
@@ -165,13 +168,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100)
+		{
+			$done = true ;
+		}
 		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
-		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
+		if (!isset($info['info_anz_subs']))
+		{
+			$info['info_anz_subs'] = $this->bo->anzSubs($id);
+		}
 		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
 		$info['info_percent'] = (int) $info['info_percent'].'%';
 		$editrights = $this->bo->check_access($info,Acl::EDIT);
@@ -204,12 +213,21 @@ 
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
-		if ($info['info_id_parent']) $info['class'] .= 'infolog_rowHasParent ';
-		if ($info['info_anz_subs'] > 0) $info['class'] .= 'infolog_rowHasSubs ';
+		if ($info['info_id_parent'])
+		{
+			$info['class'] .= 'infolog_rowHasParent ';
+		}
+		if ($info['info_anz_subs'] > 0)
+		{
+			$info['class'] .= 'infolog_rowHasSubs ';
+		}
 
 		$info['row_mod'] = $info['info_datemodified'];
 
-		if (!$show_links) $show_links = $this->prefs['show_links'];
+		if (!$show_links)
+		{
+			$show_links = $this->prefs['show_links'];
+		}
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
 			(isset($info['links']) || ($info['links'] = Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
@@ -219,9 +237,16 @@ 
 			{
 				// incl. link modification time into row_mod (link's lastmod is always in server-time!)
 				$link_mod = Api\DateTime::server2user($link['lastmod']);
-				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
+				if ($info['row_mod'] < $link_mod)
+				{
+					$info['row_mod'] = $link_mod;
+				}
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted'])
+				{
+					continue;
+				}
+				// skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -234,14 +259,20 @@ 
 				{
 					$info['pm_id'] = $link['id'];
 				}
-				if ($link['app'] == 'timesheet') $timesheets[] = $link['id'];
+				if ($link['app'] == 'timesheet')
+				{
+					$timesheets[] = $link['id'];
+				}
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
 				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
-				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
+				if ($info['row_mod'] < $sum['max_modified'])
+				{
+					$info['row_mod'] = $sum['max_modified'];
+				}
 			}
 		}
 		$info['info_type_label'] = $this->bo->enums['type'][$info['info_type']];
@@ -256,10 +287,13 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif($readonlys["edit_percent[$id]"])
+		{
+			// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
+		}
 		if ($this->prefs['show_id'] == 1 || $this->prefs['show_id'] == 2 && $details)
 		{
 			$info['info_number'] = $info['info_id'];
@@ -332,10 +366,16 @@ 
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
 		}
 		$orginal_colfilter = $query['col_filter'];
-		if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (string)$parent_id;
+		if (isset($parent_id))
+		{
+			$query['col_filter']['info_id_parent'] = (string)$parent_id;
+		}
 
 		//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
-		if (!isset($query['start'])) $query['start'] = 0;
+		if (!isset($query['start']))
+		{
+			$query['start'] = 0;
+		}
 
 		// handle action and linked filter (show only entries linked to a certain other entry)
 		$link_filters = array();
@@ -364,7 +404,10 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
+			if(!is_array($id))
+			{
+				$id = explode(',',$id);
+			}
 			if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
 			{
 				$rows = array();	// no infologs linked to selected link --> no rows to return
@@ -413,7 +456,10 @@ 
 			}
 		}
 		// Framework\Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if($old_template && $old_template != $query['template'])
+		{
+			return 0;
+		}
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -474,12 +520,18 @@ 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id']))
+		{
+			$query['total']++;
+		}
 
 		// Check to see if we need to remove description
 		foreach($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false)
+			{
+				$info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			}
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
 				$info['links'] =& $links[$id];
@@ -503,7 +555,10 @@ 
 						{
 							foreach(array_keys($main) as $n)
 							{
-								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
+								if ($n[0] == '#' && !in_array($n, $columselection))
+								{
+									unset($main[$n]);
+								}
 							}
 							break;
 						}
@@ -520,8 +575,14 @@ 
 		}
 		unset($links);
 
-		if ($query['cat_id']) $rows['no_cat_id'] = true;
-		if ($query['no_actions']) $rows['no_actions'] = true;
+		if ($query['cat_id'])
+		{
+			$rows['no_cat_id'] = true;
+		}
+		if ($query['no_actions'])
+		{
+			$rows['no_actions'] = true;
+		}
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
 		if($clear_status_filter)
 		{
@@ -565,7 +626,11 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $headers);
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked))
+		{
+			$query['col_filter']['linked'] = $linked;
+		}
+		// add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -582,7 +647,10 @@ 
 		$set = array();
 		if ((int)$data['id'] && ($info = $this->bo->read($data['id'])))
 		{
-			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
+			if ($info['info_cat'])
+			{
+				$set['cat_id'] = $info['info_cat'];
+			}
 
 			foreach(Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
 			{
@@ -620,7 +688,10 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end'])
+		{
+			$event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		}
 
 		// Match Api\Categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(Api\Categories::id2name($infolog['info_cat']));
@@ -679,7 +750,10 @@ 
 		// Copy same custom fields
 		foreach(array_keys(Api\Storage\Customfields::get('calendar')) as $name)
 		{
-			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
+			if ($this->bo->customfields[$name])
+			{
+				$event['#'.$name] = $infolog['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') infolog='.array2string($infolog).' returning '.array2string($event));
 		return $event;
@@ -829,13 +903,19 @@ 
 				$values['nm']['sort'] = 'DESC';
 			}
 
-			if (!$values['nm']['session_for'] && $this->called_by) $values['nm']['session_for'] = $this->called_by;
+			if (!$values['nm']['session_for'] && $this->called_by)
+			{
+				$values['nm']['session_for'] = $this->called_by;
+			}
 
 			$action_id = $values['action_id'] = $action ? $action_id : $nm['action_id'];
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if($_GET['search'])
+		{
+			$values['nm']['search'] = $_GET['search'];
+		}
 
 		if ($values['nm']['add'])
 		{
@@ -885,7 +965,10 @@ 
 		switch ($action)
 		{
 			case 'sp':
-				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0) $action_id = (int)substr($action_id, 8);
+				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0)
+				{
+					$action_id = (int)substr($action_id, 8);
+				}
 				if ((is_array($action_id) && !$this->bo->read(current($action_id))) || !$this->bo->read($action_id))
 				{
 					$action = '';
@@ -932,7 +1015,10 @@ 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if(!isset($values['nm']['filter2']))
+		{
+			$values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		}
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
@@ -957,7 +1043,10 @@ 
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
-				if (is_int($colfk)) unset($values['nm']['col_filter']);
+				if (is_int($colfk))
+				{
+					unset($values['nm']['col_filter']);
+				}
 			}
 		}
 		$values['action'] = $persist['action'] = $values['nm']['action'] = $action;
@@ -1000,7 +1089,10 @@ 
 		// does not take implicit rights as delegated into account, so they will not be available as filters
 		foreach($this->bo->group_owners as $type => $group)
 		{
-			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
+			if (!isset($this->bo->grants[$group]))
+			{
+				unset($sel_options['info_type'][$type]);
+			}
 		}
 
 
@@ -1356,7 +1448,10 @@ 
 				return $failed == 0;
 
 			case 'document':
-				if (!$settings) $settings = $this->prefs['default_document'];
+				if (!$settings)
+				{
+					$settings = $this->prefs['default_document'];
+				}
 				$document_merge = new infolog_merge();
 				$msg = $document_merge->download($settings, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1542,11 +1637,16 @@ 
 			#_debug_array($info);
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
-			if (isset($this->bo->status[$info['info_type']]['done'])) {
+			if (isset($this->bo->status[$info['info_type']]['done']))
+			{
 				$status ='done';
-			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['billed']))
+			{
 				$status ='billed';
-			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['cancelled']))
+			{
 				$status ='cancelled';
 			}
 			#_debug_array($status);
@@ -1560,17 +1660,25 @@ 
 			$this->bo->write($values, true,true,true,$skip_notification);
 
 			$query = array('action'=>'sp','action_id'=>$info_id);
-			if (!$closesingle) {
+			if (!$closesingle)
+			{
 				foreach((array)$this->bo->search($query) as $info)
 				{
-					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
+					if ($info['info_id_parent'] == $info_id)
+					{
+						// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);
+					}
+					// we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
 		}
-		if ($referer) $this->tmpl->location($referer);
+		if ($referer)
+		{
+			$this->tmpl->location($referer);
+		}
 	}
 
 	/**
@@ -1586,10 +1694,13 @@ 
 		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
-		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
+		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))
+		{
+			// entries without subs get confirmed by javascript
 		{
 			$values = array('delete' => true);
 		}
+		}
 		//echo "<p>infolog_ui::delete(".print_r($values,true).",'$referer','$called_by') info_id=$info_id</p>\n";
 
 		if (is_array($values) || $info_id <= 0)
@@ -1598,11 +1709,16 @@ 
 			{
 				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
 			}
-			if ($called_by)		// direct call from the same request
+			if ($called_by)
+			{
+				// direct call from the same request
 			{
 				return $deleted ? lang('InfoLog entry deleted') : '';
 			}
-			if ($values['called_by'] == 'edit')	// we run in the edit popup => give control back to edit
+			}
+			if ($values['called_by'] == 'edit')
+			{
+				// we run in the edit popup => give control back to edit
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
@@ -1611,6 +1727,7 @@ 
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
 			}
+			}
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
@@ -1659,10 +1776,17 @@ 
 			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action)
+			{
+				$button = $action;
+			}
+			// action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
-			if (empty($content['info_cc'])) $content['info_cc'] = "";
+			if (empty($content['info_cc']))
+			{
+				$content['info_cc'] = "";
+			}
 			if (is_array($content['info_cc']))
 			{
 				foreach($content['info_cc'] as $i => $value)
@@ -1672,7 +1796,10 @@ 
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
 					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc']))
+				{
+					$content['info_cc'] = implode(',',$content['info_cc']);
+				}
 			}
 			unset($content['button']);
 			if ($button)
@@ -1811,9 +1938,12 @@ 
 						Link::link('infolog',$info_id,$content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id,':') !== false)
+					{
+						// updating info_link_id if necessary
 					{
 						list($app,$id) = explode(':',$info_link_id);
+					}
 						$link = Link::get_link('infolog',$info_id,$app,$id);
 						if ((int) $content['info_link_id'] != (int) $link['link_id'])
 						{
@@ -1835,12 +1965,19 @@ 
 				}
 				elseif ($button == 'delete' && $info_id > 0)
 				{
-					if (!$referer && $action) $referer = array(
+					if (!$referer && $action)
+					{
+						$referer = array(
 						'menuaction' => 'infolog.infolog_ui.index',
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					}
+					if (!($content['msg'] = $this->delete($info_id,$referer,'edit')))
+					{
+						return;
+					}
+					// checks ACL first
 
 					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
 				}
@@ -1890,13 +2027,20 @@ 
 			$type      = $type      ? $type      : $_REQUEST['type'];
 			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
 				Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			if (strpos($referer, 'msg=') !== false)
+			{
+				$referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);
+			}
+			// remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
 			$print = (int) $_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
 			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false)
+			{
+				$content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			}
 			foreach(array('info_subject', 'info_des') as $key)
 			{
 				if(!isset($content[$key]) || strlen($content[$key]) < 75)
@@ -1920,10 +2064,16 @@ 
 						if (strlen($word)>75)
 						{
 							$buff = Api\Html::activate_links($word);
-							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
+							if (strlen($buff) == strlen($word))
+							{
+								// no links -> try to break overlong words
 							{
 								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+							}
+								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false)
+								{
+									$word = str_replace('.','. ',$word);
+								}
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
@@ -1944,7 +2094,11 @@ 
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
 			switch($this->prefs['set_start'])
 			{
@@ -1955,13 +2109,19 @@ 
 			if ((int)$content['info_link_id'] > 0 && !Link::get_link($content['info_link_id']))
 			{
 				$content['info_link_id'] = 0;	// link has been deleted
-				if (!$content['info_custom_link']) $content['info_from'] = '';
+				if (!$content['info_custom_link'])
+				{
+					$content['info_from'] = '';
+				}
 			}
-			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
+			if (!$info_id && $action_id && $action == 'sp')
+			{
+				// new SubProject
 			{
 				if (!$this->bo->check_access($action_id,Acl::ADD))
 				{
 					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+			}
 				}
 			}
 			else
@@ -1995,10 +2155,16 @@ 
 				case 'copy':
 					$info_id = 0;
 					$this->create_copy($content, $action == 'sp');
-					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
+					if ($action == 'sp')
+					{
+						// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+					}
+						if (is_numeric($_REQUEST['cat_id']))
+						{
+							$content['info_cat'] = (int) $_REQUEST['cat_id'];
+						}
 					}
 					unset($action);	// it get stored in $content and will cause an other copy after [apply]
 					break;
@@ -2027,7 +2193,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2046,8 +2215,15 @@ 
 						break;	// normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
-					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
+					if (empty($content['info_startdate']))
+					{
+						$content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					}
+					if (empty($content['info_priority']))
+					{
+						$content['info_priority'] = 1;
+					}
+					// normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
 					{
@@ -2057,8 +2233,14 @@ 
 					{
 						$content['info_type'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['preferred_type'];
 					}
-					if (empty($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-					if (empty($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					if (empty($content['info_status']))
+					{
+						$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+					}
+					if (empty($content['info_percent']))
+					{
+						$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					}
 					break;
 			}
 			if (!isset($this->bo->enums['type'][$content['info_type']]))
@@ -2161,12 +2343,18 @@ 
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
-		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
+		if ($this->prefs['show_id'])
+		{
+			$content['info_number'] = $info_id;
+		}
 
 		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
-		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
+		if (!isset($content['pm_id']) && $old_pm_id)
+		{
+			$content['pm_id'] = $old_pm_id;
+		}
 
 		if ($info_id && $this->bo->history)
 		{
@@ -2239,7 +2427,10 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
+		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))
+		{
+			$content['info_cc'] = explode(',',$content['info_cc']);
+		}
 		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
@@ -2267,7 +2458,11 @@ 
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from')
+			{
+				unset($content['info_link_id']);
+			}
+			// both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2295,13 +2490,25 @@ 
 			$content['info_type'] = $types[0];
 		}
 		// get a consistent status, percent and date-completed
-		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		if (!isset($content['info_status']))
+		{
+			$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+		}
+		if (!isset($content['info_percent']))
+		{
+			$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		}
 		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
-		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
+		if (!isset($content['info_cat']))
+		{
+			$content['info_cat'] = $this->prefs['cat_add_default'];
+		}
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if(!is_array($content['link_to']))
+		{
+			$content['link_to'] = array();
+		}
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
@@ -2332,7 +2539,10 @@ 
 			{
 				$linkinfos = Link::get_link($info_link_id);
 				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				if (stripos($content['info_contact'],'projectmanager')!==false)
+				{
+					$content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				}
 			}
 			unset($content['info_link_id']);
 		}
@@ -2637,7 +2847,10 @@ 
 		}
 		foreach($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2'])))
+			{
+				continue;
+			}
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

Spacing +352 added lines, -356 removed lines

@@ -55,32 +55,32 @@ 
 	 *
 	 * @var string
 	 */
-	var $duration_format = ',';	// comma is necessary!
+	var $duration_format = ','; // comma is necessary!
 
 	var $icons = array(
 		'type' => array(
-			'task'      => 'task.gif',      'task_alt'      => 'Task',
-			'phone'     => 'phone.gif',     'phone_alt'     => 'Phonecall',
-			'note'      => 'note.gif',      'note_alt'      => 'Note',
-			'confirm'   => 'confirm.gif',   'confirm_alt'   => 'Confirmation',
-			'reject'    => 'reject.gif',    'reject_alt'    => 'Reject',
-			'email'     => 'email.gif',     'email_alt'     => 'Email' ),
+			'task'      => 'task.gif', 'task_alt'      => 'Task',
+			'phone'     => 'phone.gif', 'phone_alt'     => 'Phonecall',
+			'note'      => 'note.gif', 'note_alt'      => 'Note',
+			'confirm'   => 'confirm.gif', 'confirm_alt'   => 'Confirmation',
+			'reject'    => 'reject.gif', 'reject_alt'    => 'Reject',
+			'email'     => 'email.gif', 'email_alt'     => 'Email' ),
 		'action' => array(
-			'new'       => 'new.gif',       'new_alt'       => 'Add Sub',
-			'view'      => 'view.gif',      'view_alt'      => 'View Subs',
-			'parent'    => 'parent.gif',    'parent_alt'    => 'View other Subs',
-			'edit'      => 'edit.gif',      'edit_alt'      => 'Edit',
-			'addfile'   => 'addfile.gif',   'addfile_alt'   => 'Add a file',
-			'delete'    => 'delete.gif',    'delete_alt'    => 'Delete',
-			'close'     => 'done.gif',      'close_alt'     => 'Close' ,
-			'close_all' => 'done_all.gif',  'close_all_alt' => 'Close' ),
+			'new'       => 'new.gif', 'new_alt'       => 'Add Sub',
+			'view'      => 'view.gif', 'view_alt'      => 'View Subs',
+			'parent'    => 'parent.gif', 'parent_alt'    => 'View other Subs',
+			'edit'      => 'edit.gif', 'edit_alt'      => 'Edit',
+			'addfile'   => 'addfile.gif', 'addfile_alt'   => 'Add a file',
+			'delete'    => 'delete.gif', 'delete_alt'    => 'Delete',
+			'close'     => 'done.gif', 'close_alt'     => 'Close',
+			'close_all' => 'done_all.gif', 'close_all_alt' => 'Close' ),
 		'status' => array(
-			'billed'    => 'billed.gif',    'billed_alt'    => 'billed',
-			'done'      => 'done.gif',      'done_alt'      => 'done',
+			'billed'    => 'billed.gif', 'billed_alt'    => 'billed',
+			'done'      => 'done.gif', 'done_alt'      => 'done',
 			'will-call' => 'will-call.gif', 'will-call_alt' => 'will-call',
-			'call'      => 'call.gif',      'call_alt'      => 'call',
-			'ongoing'   => 'ongoing.gif',   'ongoing_alt'   => 'ongoing',
-			'offer'     => 'offer.gif',     'offer_alt'     => 'offer' )
+			'call'      => 'call.gif', 'call_alt'      => 'call',
+			'ongoing'   => 'ongoing.gif', 'ongoing_alt'   => 'ongoing',
+			'offer'     => 'offer.gif', 'offer_alt'     => 'offer' )
 	);
 	var $filters;
 	var $messages = array(
@@ -100,7 +100,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') Api\Translation::add_app('infolog');
 
 		// Make sure Global category is infolog - on first load, it may not be
-		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
 		{
 			$GLOBALS['egw']->categories = new Api\Categories();
 		}
@@ -111,18 +111,18 @@ 
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['infolog'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['infolog'];
 
 		// read the duration format from project-manager
 		if ($GLOBALS['egw_info']['apps']['projectmanager'])
 		{
 			$pm_config = Api\Config::read('projectmanager');
-			$this->duration_format = str_replace(',','',implode('', (array)$pm_config['duration_units']));
+			$this->duration_format = str_replace(',', '', implode('', (array)$pm_config['duration_units']));
 			//error_log(__METHOD__."() ".__LINE__." duration_format=$this->duration_format, duration_unit=".array2string($pm_config['duration_units']));
 			$this->hours_per_workday = $pm_config['hours_per_workday'];
 			unset($pm_config);
 		}
-		$this->filters =& $this->bo->filters;
+		$this->filters = & $this->bo->filters;
 		/* these are just for testing of the notifications
 		for($i = -1; $i <= 3; ++$i)
 		{
@@ -141,7 +141,7 @@ 
 			$this->filters['responsible-open-date'.date('Y-m-d',time()+$i*24*60*60)] = "responsible starting in $i day(s)";
 		}
 		*/
-		$GLOBALS['infolog_ui'] =& $this;	// make ourself availible for ExecMethod of get_rows function
+		$GLOBALS['infolog_ui'] = & $this; // make ourself availible for ExecMethod of get_rows function
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param int $details
 	 * @return array
 	 */
-	function get_info($info,&$readonlys,$action='',$action_id='',$show_links=false,$details = 1)
+	function get_info($info, &$readonlys, $action = '', $action_id = '', $show_links = false, $details = 1)
 	{
 		if (!is_array($info))
 		{
@@ -165,19 +165,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
-		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent'] == 100) $done = true;
+		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']].($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
 		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
-		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
-		$info['info_percent'] = (int) $info['info_percent'].'%';
-		$editrights = $this->bo->check_access($info,Acl::EDIT);
+		$this->bo->link_id2from($info, $action, $action_id); // unset from for $action:$action_id
+		$info['info_percent'] = (int)$info['info_percent'].'%';
+		$editrights = $this->bo->check_access($info, Acl::EDIT);
 		$isresposible = $this->bo->is_responsible($info);
 		if ((!($editrights || // edit rights or more then standard responsible rights
-			$isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')))))
+			$isresposible && array_diff($this->bo->responsible_edit, array('info_status', 'info_percent', 'info_datecompleted')))))
 		{
 			$info['class'] .= 'rowNoEdit ';
 		}
@@ -196,11 +196,11 @@ 
 		{
 			$info['class'] .= 'rowNoCloseAll ';
 		}
-		if (!$this->bo->check_access($info,Acl::DELETE))
+		if (!$this->bo->check_access($info, Acl::DELETE))
 		{
 			$info['class'] .= 'rowNoDelete ';
 		}
-		if (!$this->bo->check_access($info,Acl::ADD))
+		if (!$this->bo->check_access($info, Acl::ADD))
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
@@ -212,7 +212,7 @@ 
 		if (!$show_links) $show_links = $this->prefs['show_links'];
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
-			(isset($info['links']) || ($info['links'] = Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
+			(isset($info['links']) || ($info['links'] = Link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true, true))))
 		{
 			$timesheets = array();
 			foreach ($info['links'] as $link)
@@ -221,7 +221,7 @@ 
 				$link_mod = Api\DateTime::server2user($link['lastmod']);
 				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted']) continue; // skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -238,7 +238,7 @@ 
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
-				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
+				$sum = ExecMethod('timesheet.timesheet_bo.sum', $timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
 				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
@@ -256,7 +256,7 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif ($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
@@ -277,7 +277,7 @@ 
 	protected static function filter(array $query)
 	{
 		$filter = $query['filter'] ? 'filter' : ($query['cat_id'] ? 'cat_id' : null);
-		foreach((array)$query['col_filter'] as $name => $value)
+		foreach ((array)$query['col_filter'] as $name => $value)
 		{
 			if ((string)$value !== '')
 			{
@@ -297,7 +297,7 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	function get_rows(&$query,&$rows,&$readonlys)
+	function get_rows(&$query, &$rows, &$readonlys)
 	{
 		//error_log(__METHOD__."() query[csv_export]=".array2string($query['csv_export']).", query[filter]=".array2string($query['filter']).", query[col_filter]=".array2string(array_diff($query['col_filter'],array('',0))).' '.function_backtrace());
 		if (!$query['csv_export'])
@@ -314,7 +314,7 @@ 
 			}
 			//error_log(__METHOD__."() prefs[listNoSubs]=".array2string($this->prefs['listNoSubs'])." --> parent_id=$parent_id");
 			unset($query['col_filter']['parent_id']);
-			if(!$query['action'])
+			if (!$query['action'])
 			{
 				Api\Cache::setSession('infolog', $query['session_for'].'session_data', $query);
 			}
@@ -323,10 +323,10 @@ 
 			$query['row_modified'] = 'row_mod';
 			$query['parent_id'] = 'info_id_parent';
 			$query['is_parent'] = 'info_anz_subs';
-			$query['action_var'] = 'multi_action';	// as 'action' is already used in infolog
+			$query['action_var'] = 'multi_action'; // as 'action' is already used in infolog
 		}
 		// nextmatch opened an infolog containing children --> do not filter them, always show all children
-		elseif($query['csv_export'] === 'children')
+		elseif ($query['csv_export'] === 'children')
 		{
 			$query['filter'] = $query['search'] = $query['cat_id'] = '';
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
@@ -346,17 +346,17 @@ 
 			$links['linked'] = array();
 			unset($query['col_filter']['linked']);
 		}
-		if($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
+		if ($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
 		{
 			$link_filters['action'] = array('app'=>$query['action'], 'id' => $query['action_id']);
 			$links['action'] = array();
 		}
-		foreach($link_filters as $key => $link)
+		foreach ($link_filters as $key => $link)
 		{
-			if(!is_array($link))
+			if (!is_array($link))
 			{
 				// Legacy string style
-				list($app,$id) = explode(':',$link);
+				list($app, $id) = explode(':', $link);
 			}
 			else
 			{
@@ -364,25 +364,25 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
-			if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
+			if (!is_array($id)) $id = explode(',', $id);
+			if (!($linked = Link::get_links_multiple($app, $id, true, 'infolog', '', $query['col_filter']['info_status'] == 'deleted')))
 			{
-				$rows = array();	// no infologs linked to selected link --> no rows to return
+				$rows = array(); // no infologs linked to selected link --> no rows to return
 				return 0;
 			}
 
 
-			foreach($linked as $infos)
+			foreach ($linked as $infos)
 			{
-				$links[$key] = array_merge($links[$key],$infos);
+				$links[$key] = array_merge($links[$key], $infos);
 			}
 			$links[$key] = array_unique($links[$key]);
-			if($key == 'linked')
+			if ($key == 'linked')
 			{
 				$linked = array('app' => $app, 'id' => $id, 'title' => (count($id) == 1 ? Link::title($app, $id) : lang('multiple')));
 			}
 		}
-		if(count($links))
+		if (count($links))
 		{
 			$query['col_filter']['info_id'] = count($links) > 1 ? call_user_func_array('array_intersect', $links) : $links[$key];
 		}
@@ -391,7 +391,7 @@ 
 		$old_template = $query['template'];
 
 		// Reset custom, type-specific template if type was cleared (without changing it for home)
-		if(!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
+		if (!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
 		{
 			$query['template'] = 'infolog.index.rows';
 		}
@@ -402,10 +402,10 @@ 
 			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
 			}
 			// If status is not valid for selected type, clear status filter
-			if($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
+			if ($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
 				!in_array($query['col_filter']['info_status'], array_keys($this->bo->status[$query['col_filter']['info_type']])))
 			{
 				$query['col_filter']['info_status'] = '';
@@ -413,7 +413,7 @@ 
 			}
 		}
 		// Framework\Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if ($old_template && $old_template != $query['template']) return 0;
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -426,14 +426,14 @@ 
 
 		if (!$query['selectcols'] && $columselection)
 		{
-			$columselection = is_array($columselection) ? $columselection : explode(',',$columselection);
+			$columselection = is_array($columselection) ? $columselection : explode(',', $columselection);
 		}
 		else
 		{
-			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols'])) : array();
+			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols'])) : array();
 		}
 		// do we need to query the cf's
-		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields',$columselection));
+		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields', $columselection));
 
 		$infos = $this->bo->search($query);
 		$query['col_filter'] = $orginal_colfilter;
@@ -451,12 +451,12 @@ 
 			$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
 		}
 		// set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols)
-		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
+		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']], 'info_used_time_info_planned_time') !== false;
 
 		// query all links and sub counts in one go
 		if ($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))
 		{
-			$links = Link::get_links_multiple('infolog',array_keys($infos),true,'','link_lastmod DESC',true);	// true=incl. deleted
+			$links = Link::get_links_multiple('infolog', array_keys($infos), true, '', 'link_lastmod DESC', true); // true=incl. deleted
 			$anzSubs = $this->bo->anzSubs(array_keys($infos));
 		}
 		$rows = array();
@@ -467,27 +467,27 @@ 
 			$parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array();
 			if (count($parents) == 1 && is_array($query['action_id']))
 			{
-				$query['action_id'] = array_shift($query['action_id']);	// display single parent as app_header
+				$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
 			}
 		}
 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if ($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
 
 		// Check to see if we need to remove description
-		foreach($infos as $id => $info)
+		foreach ($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'], ',') === false) && strpos($info['info_addr'], ', ') === false) $info['info_addr'] = str_replace(',', ', ', $info['info_addr']);
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
-				$info['links'] =& $links[$id];
+				$info['links'] = & $links[$id];
 				$info['info_anz_subs'] = (int)$anzSubs[$id];
-				$info = $this->get_info($info,$readonlys,null,null,false,$details);
+				$info = $this->get_info($info, $readonlys, null, null, false, $details);
 			}
 			// for subs view ('sp') add parent(s) in front of subs once(!)
-			if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
+			if ($parent_first && ($main = $this->bo->read($query['action_id'])) ||
 				$parents && ($parent_index = array_search($info['info_id_parent'], $parents)) !== false &&
 				($main = $this->bo->read($info['info_id_parent'])))
 			{
@@ -497,11 +497,11 @@ 
 				// as read() always read them all, while search() only reads the selected ones
 				if ($query['custom_fields'])
 				{
-					foreach($columselection as $col)
+					foreach ($columselection as $col)
 					{
 						if ($col[0] == '#')
 						{
-							foreach(array_keys($main) as $n)
+							foreach (array_keys($main) as $n)
 							{
 								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
 							}
@@ -510,7 +510,7 @@ 
 					}
 				}
 				$parent_first = false;
-				if($query['start'] == 0)
+				if ($query['start'] == 0)
 				{
 					array_splice($rows, $id, 0, array($main));
 					unset($parents[$parent_index]);
@@ -523,7 +523,7 @@ 
 		if ($query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['no_actions']) $rows['no_actions'] = true;
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
-		if($clear_status_filter)
+		if ($clear_status_filter)
 		{
 			$rows['info_status'] = '';
 		}
@@ -554,7 +554,7 @@ 
 				$headers[] = lang($this->filters[$query['filter']]);
 			}
 			if ($query['action'] && ($title = $query['action_title'] || is_array($query['action_id']) ?
-				$query['action_title'] : Link::title($query['action']=='sp'?'infolog':$query['action'],$query['action_id'])))
+				$query['action_title'] : Link::title($query['action'] == 'sp' ? 'infolog' : $query['action'], $query['action_id'])))
 			{
 				$headers[] = $title;
 			}
@@ -565,7 +565,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $headers);
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked)) $query['col_filter']['linked'] = $linked; // add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -584,7 +584,7 @@ 
 		{
 			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
 
-			foreach(Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{
@@ -609,7 +609,7 @@ 
 		{
 			return $data;
 		}
-		$event = array_merge($data,array(
+		$event = array_merge($data, array(
 			'category'	=> $GLOBALS['egw']->categories->check_list(Acl::READ, $infolog['info_cat']),
 			'priority'	=> $infolog['info_priority'] + 1,
 			'public'	=> $infolog['info_access'] != 'private',
@@ -620,7 +620,7 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end']) $event['end'] = $event['start'] + (int)$GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 
 		// Match Api\Categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(Api\Categories::id2name($infolog['info_cat']));
@@ -629,38 +629,38 @@ 
 		$event['owner'] = $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// add/modify participants according to prefs
-		$prefs = explode(',',$this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
+		$prefs = explode(',', $this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
 
 		// if no default participants (selected calendars) --> remove all
-		if (!in_array('selected',$prefs))
+		if (!in_array('selected', $prefs))
 		{
 			$event['participants'] = $event['participant_types'] = array();
 		}
 		// Add responsible as participant
-		if (in_array('responsible',$prefs))
+		if (in_array('responsible', $prefs))
 		{
-			foreach($infolog['info_responsible'] as $responsible)
+			foreach ($infolog['info_responsible'] as $responsible)
 			{
 				$event['participants'][$responsible] = $event['participant_types']['u'][$responsible] =
-					calendar_so::combine_status($user==$responsible?'A':'U');
+					calendar_so::combine_status($user == $responsible ? 'A' : 'U');
 			}
 		}
 		// Add linked contact as participant
-		if (in_array('contact',$prefs) && $infolog['info_link']['app'] == 'addressbook')
+		if (in_array('contact', $prefs) && $infolog['info_link']['app'] == 'addressbook')
 		{
-			$event['participants'][calendar_so::combine_user('c',$infolog['info_link']['id'])] =
+			$event['participants'][calendar_so::combine_user('c', $infolog['info_link']['id'])] =
 				$event['participant_types']['c'][$infolog['info_link']['id']] = calendar_so::combine_status('U');
 		}
-		if (in_array('owner',$prefs))
+		if (in_array('owner', $prefs))
 		{
 			$event['participants'][$infolog['info_owner']] = $event['participant_types']['u'][$infolog['info_owner']] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 		// Add current user, if set or no other participants, which is not allowed
-		if (in_array('user',$prefs))
+		if (in_array('user', $prefs))
 		{
 			$event['participants'][$user] = $event['participant_types']['u'][$user] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 
 		// Add infolog link to calendar entry
@@ -668,7 +668,7 @@ 
 		$event['link_id'][]  = $infolog['info_link']['id'];
 
 		// Copy infolog's links
-		foreach(Link::get_links('infolog',$infolog['info_id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('infolog', $infolog['info_id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -677,7 +677,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('calendar')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('calendar')) as $name)
 		{
 			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
 		}
@@ -696,9 +696,9 @@ 
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
-	function index($values = null,$action='',$action_id='',$called_as=0,$extra_app_header=False,$return_html=False,$own_referer='',$action_title='')
+	function index($values = null, $action = '', $action_id = '', $called_as = 0, $extra_app_header = False, $return_html = False, $own_referer = '', $action_title = '')
 	{
-		unset($extra_app_header);	// not used, but dont want to change signature
+		unset($extra_app_header); // not used, but dont want to change signature
 		if (is_array($values))
 		{
 			$called_as = $values['called_as'];
@@ -707,7 +707,7 @@ 
 		elseif ($own_referer === '')
 		{
 			$own_referer = Api\Header\Referer::get();
-			if (strpos($own_referer,'menuaction=infolog.infolog_ui.edit') !== false)
+			if (strpos($own_referer, 'menuaction=infolog.infolog_ui.edit') !== false)
 			{
 				$own_referer = Api\Cache::getSession('infolog', 'own_session');
 			}
@@ -718,11 +718,11 @@ 
 		}
 
 		// Handle legacy buttons like actions
-		if(is_array($values))
+		if (is_array($values))
 		{
-			foreach(array('document', 'view', 'delete') as $button)
+			foreach (array('document', 'view', 'delete') as $button)
 			{
-				if(isset($values['nm']['rows'][$button]))
+				if (isset($values['nm']['rows'][$button]))
 				{
 					list($id) = @each($values['nm']['rows'][$button]);
 					$values['nm']['multi_action'] = $button;
@@ -742,27 +742,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]);
 				}
@@ -770,18 +770,18 @@ 
 				if ($this->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);
+					$msg .= lang('%1 entries %2', $success, $action_msg);
 					Framework::message($msg);
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Framework::message($msg,'error');
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Framework::message($msg, 'error');
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Framework::message($msg,'error');
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Framework::message($msg, 'error');
 				}
 				unset($values['nm']['multi_action']);
 				unset($values['nm']['select_all']);
@@ -804,7 +804,7 @@ 
 				$action_id = 0;
 				$action_title = '';
 			}
-			if($_GET['ajax'] === 'true')
+			if ($_GET['ajax'] === 'true')
 			{
 				$nm['action'] = '';
 				$nm['action_id'] = 0;
@@ -820,8 +820,7 @@ 
 
 			if (isset($_GET['filter']) && $_GET['filter'] != 'default' || !isset($values['nm']['filter']) && !$this->called_by)
 			{
-				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] :
-					$this->prefs['defaultFilter'];
+				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] : $this->prefs['defaultFilter'];
 			}
 			if (!isset($values['nm']['order']) || !$values['nm']['order'])
 			{
@@ -835,21 +834,21 @@ 
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if ($_GET['search']) $values['nm']['search'] = $_GET['search'];
 
 		if ($values['nm']['add'])
 		{
 			$values['add'] = $values['nm']['add'];
 			unset($values['nm']['add']);
 		}
-		unset($values['nm']['rows']['checked']);	// not longer used, but hides button actions
+		unset($values['nm']['rows']['checked']); // not longer used, but hides button actions
 
 		if ($values['add'] || $values['cancel'] || isset($values['main']))
 		{
 			if ($values['add'])
 			{
 				list($type) = each($values['add']);
-				return $this->edit(0,$action,$action_id,$type,$called_as);
+				return $this->edit(0, $action, $action_id, $type, $called_as);
 			}
 			elseif ($values['cancel'] && $own_referer)
 			{
@@ -860,14 +859,14 @@ 
 			}
 			else
 			{
-				list($do,$do2) = each($values['main']);
+				list($do, $do2) = each($values['main']);
 				list($do_id) = @each($do2);
-				switch((string)$do)
+				switch ((string)$do)
 				{
 					case 'close':
-						$closesingle=true;
+						$closesingle = true;
 					case 'close_all':
-						$this->close($do_id,$called_as,$closesingle);
+						$this->close($do_id, $called_as, $closesingle);
 						break;
 					case 'view':
 						$value = array();
@@ -905,7 +904,7 @@ 
 		$this->tmpl->read('infolog.index');
 		$values['nm']['options-filter'] = $this->filters;
 		$values['nm']['get_rows'] = 'infolog.infolog_ui.get_rows';
-		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'],array('all','no_describtion')) ? array() : array(
+		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'], array('all', 'no_describtion')) ? array() : array(
 			''               => 'default',
 		)) + array(
 			'no_describtion' => 'no details',
@@ -926,34 +925,34 @@ 
 		else
 		{
 			// Allow saving parent ID into favorites
-			$values['nm']['favorites'] = array('action','action_id');
+			$values['nm']['favorites'] = array('action', 'action_id');
 		}
 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if (!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
-			.($values['nm']['filter2']=='all' ? '-details' : '');
+			.($values['nm']['filter2'] == 'all' ? '-details' : '');
 		if ($action == 'sp')
 		{
 			$pref = $values['nm']['columnselection_pref'];
-			foreach(array('info_used_time_info_planned_time_info_replanned_time','info_datemodified','info_owner_info_responsible','customfields') as $name)
+			foreach (array('info_used_time_info_planned_time_info_replanned_time', 'info_datemodified', 'info_owner_info_responsible', 'customfields') as $name)
 			{
-				$values['main']['no_'.$name] = strpos($this->prefs[$pref],$name) === false;
+				$values['main']['no_'.$name] = strpos($this->prefs[$pref], $name) === false;
 			}
 			if (!$values['main']['no_customfields'])
 			{
 				// set the column-header of the main table for the customfields.
-				foreach(array_keys($this->bo->customfields) as $lname)
+				foreach (array_keys($this->bo->customfields) as $lname)
 				{
-					$values['main']['customfields'].=$lname."\n";
+					$values['main']['customfields'] .= $lname."\n";
 				}
 			}
 		}
-		if ($values['nm']['filter']=='bydate')
+		if ($values['nm']['filter'] == 'bydate')
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
@@ -986,7 +985,7 @@ 
 		{
 			$values['css'] .= '<style type="text/css">@media screen { .infoDes {  '.
 				' max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	// dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
@@ -998,13 +997,13 @@ 
 
 		// remove group-types user has not any rights to as filter
 		// does not take implicit rights as delegated into account, so they will not be available as filters
-		foreach($this->bo->group_owners as $type => $group)
+		foreach ($this->bo->group_owners as $type => $group)
 		{
 			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
 		}
 
 
-		return $this->tmpl->exec('infolog.infolog_ui.index',$values,$sel_options,$readonlys,$persist,$return_html ? -1 : 0);
+		return $this->tmpl->exec('infolog.infolog_ui.index', $values, $sel_options, $readonlys, $persist, $return_html ? -1 : 0);
 	}
 
 	/**
@@ -1019,9 +1018,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & Acl::EDIT))
+				if (!($this->bo->grants[$group]&Acl::EDIT))
 				{
 					unset($types[$type]);
 				}
@@ -1038,7 +1037,7 @@ 
 	 */
 	private function get_actions(array $query)
 	{
-		for($i = 0; $i <= 100; $i += 10)
+		for ($i = 0; $i <= 100; $i += 10)
 		{
 			$percent[$i] = $i.'%';
 		}
@@ -1047,9 +1046,9 @@ 
 		$types_add = array();
 		// Do not add deleted type to add or change menus
 		unset($types['delete']);
-		foreach($types as $type => &$data)
+		foreach ($types as $type => &$data)
 		{
-			$image_exists = Api\Image::find('infolog',$type);
+			$image_exists = Api\Image::find('infolog', $type);
 			$data = array(
 				'caption' => $data,
 				'icon' => $image_exists ? $type : 'infolog/navbar',
@@ -1061,9 +1060,9 @@ 
 
 		$icons = null;
 		$statis = $this->bo->get_status($query['col_filter']['info_type'], $icons);
-		foreach($statis as $type => &$data)
+		foreach ($statis as $type => &$data)
 		{
-			$image_exists = Api\Image::find('infolog',$icons[$type]);
+			$image_exists = Api\Image::find('infolog', $icons[$type]);
 			$data = array(
 				'caption' => $data,
 				'icon' => $image_exists ? $icons[$type] : 'infolog/status',
@@ -1075,10 +1074,10 @@ 
 				'caption' => 'Open',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.infolog.viewEntry':'',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.infolog.viewEntry' : '',
 				'url' => 'menuaction=infolog.infolog_ui.edit&info_id=$id',
 				'popup' => Link::get_registry('infolog', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'mobileViewTemplate' => 'edit?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/infolog/templates/mobile/edit.xet'))
 			),
 			'parent' => array(
@@ -1152,7 +1151,7 @@ 
 						'icon' => 'completed',
 					),
 					'cat' =>  Etemplate\Widget\Nextmatch::category_action(
-						'infolog',$group,'Change category','cat_'
+						'infolog', $group, 'Change category', 'cat_'
 					),
 					'responsible' => array(
 						'caption' => 'Delegation',
@@ -1190,7 +1189,7 @@ 
 				'onExecute' => 'javaScript:app.infolog.infolog_menu_print'
 			)
 		);
-		++$group;	// integration with other apps
+		++$group; // integration with other apps
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -1208,7 +1207,7 @@ 
 				'caption' => 'Schedule appointment',
 				'group' => $group,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&'.
-					Link::get_registry('calendar', 'add_app') . '[]=infolog&'.Link::get_registry('calendar','add_id').'[]=$id',
+					Link::get_registry('calendar', 'add_app').'[]=infolog&'.Link::get_registry('calendar', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => Link::get_registry('calendar', 'add_popup'),
 			);
@@ -1232,7 +1231,7 @@ 
 				'hint' => 'Convert to a ticket',
 				'group' => $group,
 				'url' => 'menuaction=tracker.tracker_ui.edit&'.
-					Link::get_registry('tracker', 'add_app') . '[]=infolog&'.Link::get_registry('tracker','add_id').'[]=$id',
+					Link::get_registry('tracker', 'add_app').'[]=infolog&'.Link::get_registry('tracker', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => Link::get_registry('tracker', 'add_popup'),
 			);
@@ -1245,7 +1244,7 @@ 
 		$actions['ical'] = array(
 			'icon' => 'ical',
 			'caption' => 'Export iCal',
-			'postSubmit' => true,	// download needs post submit to work
+			'postSubmit' => true, // download needs post submit to work
 			'group' => $group,
 			'allowOnMultiple' => true,
 			'hideOnMobile' => true
@@ -1298,14 +1297,14 @@ 
 		$success = $failed = 0;
 		if ($use_all)
 		{
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
 			$result = $readonlys = null;
-			$this->get_rows($query,$result,$readonlys);
+			$this->get_rows($query, $result, $readonlys);
 			$checked = array();
-			foreach($result as $key => $info)
+			foreach ($result as $key => $info)
 			{
-				if(is_numeric($key))
+				if (is_numeric($key))
 				{
 					$checked[] = $info['info_id'];
 				}
@@ -1316,29 +1315,29 @@ 
 		list($action, $settings) = explode('_', $_action, 2);
 
 		// Actions that can handle a list of IDs
-		switch($action)
+		switch ($action)
 		{
 			case 'link':
 				list($add_remove, $link) = explode('_', $settings, 2);
-				list($app, $link_id) = explode(strpos($link,':') !== false ? ':' : ',', $link);
-				if(!$link_id)
+				list($app, $link_id) = explode(strpos($link, ':') !== false ? ':' : ',', $link);
+				if (!$link_id)
 				{
 					$action_msg = 'linked';
 					$msg = lang('You need to select an entry for linking.');
 					break;
 				}
 				$title = Link::title($app, $link_id);
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
-					if(!$this->bo->check_access($id, Acl::EDIT))
+					if (!$this->bo->check_access($id, Acl::EDIT))
 					{
 						$failed++;
 						continue;
 					}
-					if($add_remove == 'add')
+					if ($add_remove == 'add')
 					{
 						$action_msg = lang('linked to %1', $title);
-						if(Link::link('infolog', $id, $app, $link_id))
+						if (Link::link('infolog', $id, $app, $link_id))
 						{
 							$success++;
 						}
@@ -1365,20 +1364,20 @@ 
 			case 'ical':
 				// infolog_ical lets horde be auto-loaded, so it must go first
 				$boical = new infolog_ical();
-				Api\Header\Content::type('todo.ics','text/calendar');
+				Api\Header\Content::type('todo.ics', 'text/calendar');
 				echo $boical->exportvCalendar($checked);
 				exit();
 
 		}
 
 		// Actions that need to loop
-		foreach($checked as $id)
+		foreach ($checked as $id)
 		{
-			if(!$entry = $this->bo->read($id))
+			if (!$entry = $this->bo->read($id))
 			{
 				continue;
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'close':
 					$action_msg = lang('closed');
@@ -1388,8 +1387,8 @@ 
 
 				case 'delete':
 					$action_msg = $settings == 'sub' ? lang(' (and children) deleted') : lang('deleted');
-					$result = $this->bo->delete($id, $settings=='sub', false, $skip_notifications);
-					if($result == true)
+					$result = $this->bo->delete($id, $settings == 'sub', false, $skip_notifications);
+					if ($result == true)
 					{
 						$success++;
 					}
@@ -1402,14 +1401,14 @@ 
 				case 'type':
 					$action_msg = lang('changed type');
 					// Dont allow to change the type, if user has no delete rights from the group-owner
-					if ($id && !($this->bo->grants[$entry['info_owner']] & Acl::DELETE))
+					if ($id && !($this->bo->grants[$entry['info_owner']]&Acl::DELETE))
 					{
 						$failed++;
 						break;
 					}
 					$entry['info_type'] = $settings;
 					try {
-						$this->bo->write($entry, true,true,true,$skip_notifications,true); // Throw exceptions
+						$this->bo->write($entry, true, true, true, $skip_notifications, true); // Throw exceptions
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
@@ -1424,11 +1423,11 @@ 
 					$action_msg = lang('changed completion to %1%', $settings);
 					$entry['info_percent'] = $settings;
 					// Done and not-started entries will get changed right back if we don't change the status too
-					if(in_array($entry['info_status'],array('not-started','done','billed','cancelled','archive')))
+					if (in_array($entry['info_status'], array('not-started', 'done', 'billed', 'cancelled', 'archive')))
 					{
 						$entry['info_status'] = 'ongoing';
 					}
-					if($entry['info_percent'] == 0)
+					if ($entry['info_percent'] == 0)
 					{
 						$entry['info_status'] = 'not-started';
 					}
@@ -1436,7 +1435,7 @@ 
 					{
 						$entry['info_status'] = 'done';
 					}
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1448,24 +1447,23 @@ 
 
 				case 'undelete':	// set it to valid status != 'deleted' for that type
 					$settings = isset($this->bo->status[$entry['info_type']]['done']) ?
-						$this->bo->status[$entry['info_type']]['done'] :
-						$this->bo->status['defaults'][$entry['info_type']];
+						$this->bo->status[$entry['info_type']]['done'] : $this->bo->status['defaults'][$entry['info_type']];
 					// fall-through
 				case 'status':
-					if(isset($this->bo->status[$entry['info_type']][$settings]))
+					if (isset($this->bo->status[$entry['info_type']][$settings]))
 					{
 						$action_msg = lang('changed status to %1', lang($this->bo->status[$entry['info_type']][$settings]));
-						if(!in_array($settings,array('done','billed','cancelled','archive')) && $entry['info_percent'] == 100)
+						if (!in_array($settings, array('done', 'billed', 'cancelled', 'archive')) && $entry['info_percent'] == 100)
 						{
 							// Done entries will get changed right back if we don't change the completion too
 							$entry['info_percent'] = 10;
 						}
-						if(in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
+						if (in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
 						{
 							$entry['info_percent'] = 0;
 						}
 						$entry['info_status'] = $settings;
-						if($this->bo->write($entry, true,true,true,$skip_notifications))
+						if ($this->bo->write($entry, true, true, true, $skip_notifications))
 						{
 							$success++;
 						}
@@ -1478,7 +1476,7 @@ 
 					break;
 
 				case 'cat':
-					if($settings)
+					if ($settings)
 					{
 						$cat_name = Api\Categories::id2name($settings);
 						$action_msg = lang('changed category to %1', $cat_name);
@@ -1488,7 +1486,7 @@ 
 						$action_msg = lang('removed category');
 					}
 					$entry['info_cat'] = $settings;
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1500,15 +1498,15 @@ 
 
 				case 'responsible':
 					list($add_remove, $user_str) = explode('_', $settings, 2);
-					$action_msg = ($add_remove == 'ok' ? lang('changed') : ($add_remove == 'add' ? lang('added') : lang('removed'))) . ' ';
+					$action_msg = ($add_remove == 'ok' ? lang('changed') : ($add_remove == 'add' ? lang('added') : lang('removed'))).' ';
 					$names = array();
 					$users = explode(',', $user_str);
-					foreach($users as $account_id)
+					foreach ($users as $account_id)
 					{
 						$names[] = Api\Accounts::username($account_id);
 					}
 					$action_msg .= implode(', ', $names);
-					if($add_remove == 'ok')
+					if ($add_remove == 'ok')
 					{
 						$entry['info_responsible'] = (array)$users;
 					}
@@ -1517,7 +1515,7 @@ 
 						$function = $add_remove == 'add' ? 'array_merge' : 'array_diff';
 						$entry['info_responsible'] = array_unique($function($entry['info_responsible'], (array)$users));
 					}
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1538,10 +1536,10 @@ 
 	 * @param string $_referer=''
 	 * @param boolean $closesingle=false
 	 */
-	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
+	function close($values = 0, $_referer = '', $closesingle = false, $skip_notification = false)
 	{
 		//echo "<p>".__METHOD__."($values,$referer,$closeall)</p>\n";
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if ($info_id)
@@ -1551,11 +1549,11 @@ 
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
 			if (isset($this->bo->status[$info['info_type']]['done'])) {
-				$status ='done';
+				$status = 'done';
 			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
-				$status ='billed';
+				$status = 'billed';
 			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
-				$status ='cancelled';
+				$status = 'cancelled';
 			}
 			#_debug_array($status);
 			$values = array(
@@ -1565,15 +1563,15 @@ 
 				'info_percent'=> 100,
 				'info_datecompleted' => $this->bo->now_su,
 			);
-			$this->bo->write($values, true,true,true,$skip_notification);
+			$this->bo->write($values, true, true, true, $skip_notification);
 
-			$query = array('action'=>'sp','action_id'=>$info_id);
+			$query = array('action'=>'sp', 'action_id'=>$info_id);
 			if (!$closesingle) {
-				foreach((array)$this->bo->search($query) as $info)
+				foreach ((array)$this->bo->search($query) as $info)
 				{
 					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'], $referer, $closesingle, $skip_notification); // we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
@@ -1589,9 +1587,9 @@ 
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion
 	 */
-	function delete($values=0,$_referer='',$called_by='',$skip_notification=False)
+	function delete($values = 0, $_referer = '', $called_by = '', $skip_notification = False)
 	{
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
@@ -1602,9 +1600,9 @@ 
 
 		if (is_array($values) || $info_id <= 0)
 		{
-			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id,Acl::DELETE))
+			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id, Acl::DELETE))
 			{
-				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
+				$deleted = $this->bo->delete($info_id, $values['delete_subs'], $values['info_id_parent'], $skip_notification);
 			}
 			if ($called_by)		// direct call from the same request
 			{
@@ -1614,7 +1612,7 @@ 
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
-					'button'  => array('deleted' => true),	// not delete!
+					'button'  => array('deleted' => true), // not delete!
 					'referer' => $referer,
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
@@ -1622,7 +1620,7 @@ 
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
-		$values['main'][1] = $this->get_info($info_id,$readonlys['main']);
+		$values['main'][1] = $this->get_info($info_id, $readonlys['main']);
 
 		$this->tmpl->read('infolog.delete');
 
@@ -1643,7 +1641,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Delete');
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologDelete');
 
-		$this->tmpl->exec('infolog.infolog_ui.delete',$values,array(),$readonlys,$persist,$called_by == 'edit' ? 2 : 0);
+		$this->tmpl->exec('infolog.infolog_ui.delete', $values, array(), $readonlys, $persist, $called_by == 'edit' ? 2 : 0);
 	}
 
 	/**
@@ -1655,77 +1653,77 @@ 
 	 * @param string $type Type of log-entry: note,todo,task
 	 * @param string $referer array with param/get-vars of the refering page
 	 */
-	function edit($content = null,$action = '',$action_id=0,$type='',$referer='')
+	function edit($content = null, $action = '', $action_id = 0, $type = '', $referer = '')
 	{
 		if (($submit = is_array($content)))
 		{
 			//echo "infolog_ui::edit: content="; _debug_array($content);
 			$info_id   = $content['info_id'];
-			$action    = $content['action'];    unset($content['action']);
+			$action    = $content['action']; unset($content['action']);
 			$action_id = $content['action_id']; unset($content['action_id']);
-			$referer   = $content['referer'];   unset($content['referer']);
-			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
+			$referer   = $content['referer']; unset($content['referer']);
+			$no_popup  = $content['no_popup']; unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action) $button = $action; // action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
 			if (empty($content['info_cc'])) $content['info_cc'] = "";
 			if (is_array($content['info_cc']))
 			{
-				foreach($content['info_cc'] as $i => $value)
+				foreach ($content['info_cc'] as $i => $value)
 				{
 					//imap_rfc822 should not be used, but it works reliable here, until we have some regex solution or use horde stuff
 					$addresses = imap_rfc822_parse_adrlist($value, '');
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
-					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
+					$content['info_cc'][$i] = $addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',', $content['info_cc']);
 			}
 			unset($content['button']);
 			if ($button)
 			{
 				// Copy or schedule Infolog
-				if (in_array($button,array('copy','schedule','ical','tracker')))
+				if (in_array($button, array('copy', 'schedule', 'ical', 'tracker')))
 				{
 					$action = $button;
-					if (!$info_id || $this->bo->check_access($info_id,Acl::EDIT))
+					if (!$info_id || $this->bo->check_access($info_id, Acl::EDIT))
 					{
-						$button = 'apply';	// need to store infolog first
+						$button = 'apply'; // need to store infolog first
 					}
 				}
 				//Validate the enddate must be grather than startdate
 				if (!empty($content['info_enddate']) && !empty($content['info_startdate']))
 				{
-					$duration_date = $content['info_enddate']-$content['info_startdate'];
+					$duration_date = $content['info_enddate'] - $content['info_startdate'];
 					if ($duration_date < 0)
 					{
 						$this->tmpl->set_validation_error('info_startdate', lang('Startdate must be before Enddate!!!'));
-						$button = $action = '';	// stop save or apply
+						$button = $action = ''; // stop save or apply
 					}
 				}
 				//echo "<p>infolog_ui::edit(info_id=$info_id) '$button' button pressed, content="; _debug_array($content);
 				if (($button == 'save' || $button == 'apply') && isset($content['info_subject']) && empty($content['info_subject']))
 				{
-					$this->tmpl->set_validation_error('info_subject',lang('Field must not be empty !!!'));
-					$button = $action = '';	// stop save or apply
+					$this->tmpl->set_validation_error('info_subject', lang('Field must not be empty !!!'));
+					$button = $action = ''; // stop save or apply
 				}
 				if (($button == 'save' || $button == 'apply') && $info_id)
 				{
 					$old = $this->bo->read($info_id);
-					if (!($edit_acl = $this->bo->check_access($info_id,Acl::EDIT)))
+					if (!($edit_acl = $this->bo->check_access($info_id, Acl::EDIT)))
 					{
 						$status_only = $this->bo->is_responsible($old);
-						$undelete = $this->bo->check_access($old,infolog_bo::ACL_UNDELETE);
+						$undelete = $this->bo->check_access($old, infolog_bo::ACL_UNDELETE);
 					}
 				}
 				if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete))
 				{
-					$operation = $info_id ?  'edit' : 'add';
+					$operation = $info_id ? 'edit' : 'add';
 					if ($content['info_contact'])
 					{
 						$old_link_id = (int)$content['info_link_id'];
-						if(is_array($content['info_contact']))
+						if (is_array($content['info_contact']))
 						{
 							// eTemplate2 returns the array all ready
 							$app = $content['info_contact']['app'];
@@ -1738,11 +1736,11 @@ 
 						}
 						elseif ($app && $id)
 						{
-							if(!is_array($content['link_to']))
+							if (!is_array($content['link_to']))
 							{
 								$content['link_to'] = array();
 							}
-							$content['info_link_id'] = (int)($info_link_id = Link::link('infolog',$content['link_to']['to_id'],$app,$id));
+							$content['info_link_id'] = (int)($info_link_id = Link::link('infolog', $content['link_to']['to_id'], $app, $id));
 						}
 						else
 						{
@@ -1752,7 +1750,7 @@ 
 						{
 							$link = Link::get_link($old_link_id);
 							// remove selected project, if removed link is that project
-							if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
+							if ($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
 							{
 								unset($content['pm_id'], $content['old_pm_id']);
 							}
@@ -1766,39 +1764,38 @@ 
 					}
 					if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
-						$content['info_link_id'] = 0;	// as field has to be int
+						$content['info_link_id'] = 0; // as field has to be int
 					}
 					$active_tab = $content['tabs'];
 					if (!($info_id = $this->bo->write($content, true, true, true, $content['no_notifications'])))
 					{
-						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') :
-							lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(Egw::link('/index.php',array(
+						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') : lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(Egw::link('/index.php', array(
 									'menuaction' => 'infolog.infolog_ui.edit',
 									'info_id'    => $content['info_id'],
 									'no_popup'   => $no_popup,
 									'referer'    => $referer,
-								))).'">','</a>');
-						$button = $action = '';	// not exiting edit
+								))).'">', '</a>');
+						$button = $action = ''; // not exiting edit
 						$info_id = $content['info_id'];
 					}
 					else
 					{
-						$GLOBALS['egw']->preferences->add('infolog','preferred_type',$content['info_type']);
-						$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+						$GLOBALS['egw']->preferences->add('infolog', 'preferred_type', $content['info_type']);
+						$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 						$content['msg'] = lang('InfoLog entry saved');
-						Framework::refresh_opener($content['msg'],'infolog',$info_id,$operation);
+						Framework::refresh_opener($content['msg'], 'infolog', $info_id, $operation);
 					}
 					$content['tabs'] = $active_tab;
-					if ((int) $content['pm_id'] != (int) $content['old_pm_id'])
+					if ((int)$content['pm_id'] != (int)$content['old_pm_id'])
 					{
 						//echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n";
 						// update links accordingly, if selected project changed
 						if ($content['pm_id'])
 						{
 							//echo "<p>this->link->link('infolog',{$content['link_to']['to_id']},'projectmanager',{$content['pm_id']});</p>";
-							Link::link('infolog',$content['link_to']['to_id'],'projectmanager',$content['pm_id']);
+							Link::link('infolog', $content['link_to']['to_id'], 'projectmanager', $content['pm_id']);
 							// making the project the selected link, if no other link selected
 							if (!$info_link_id || $info_link_id == 'projectmanager:'.$content['old_pm_id'])
 							{
@@ -1808,7 +1805,7 @@ 
 						if ($content['old_pm_id'])
 						{
 							//echo "<p>this->link->unlink2(0,infolog,{$content['link_to']['to_id']},0,'projectmanager',{$content['old_pm_id']});</p>\n";
-							Link::unlink2(0,infolog,$content['link_to']['to_id'],0,'projectmanager',$content['old_pm_id']);
+							Link::unlink2(0, infolog, $content['link_to']['to_id'], 0, 'projectmanager', $content['old_pm_id']);
 						}
 						$content['old_pm_id'] = $content['pm_id'];
 					}
@@ -1816,14 +1813,14 @@ 
 					if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
 						//echo "<p>writing links for new entry $info_id</p>\n"; _debug_array($content['link_to']['to_id']);
-						Link::link('infolog',$info_id,$content['link_to']['to_id']);
+						Link::link('infolog', $info_id, $content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id, ':') !== false)	// updating info_link_id if necessary
 					{
-						list($app,$id) = explode(':',$info_link_id);
-						$link = Link::get_link('infolog',$info_id,$app,$id);
-						if ((int) $content['info_link_id'] != (int) $link['link_id'])
+						list($app, $id) = explode(':', $info_link_id);
+						$link = Link::get_link('infolog', $info_id, $app, $id);
+						if ((int)$content['info_link_id'] != (int)$link['link_id'])
 						{
 							$content['info_link_id'] = $link['link_id'];
 
@@ -1835,9 +1832,9 @@ 
 								'info_owner'   => $content['info_owner'],
 							);
 							//echo "<p>updating info_link_id: ".print_r($to_write,true)."</p>\n";
-							$this->bo->write($to_write,False,true,true,true);	// last true = no notifications, as no real change
+							$this->bo->write($to_write, False, true, true, true); // last true = no notifications, as no real change
 							// we need eg. the new modification date, for further updates
-							$content = array_merge($content,$to_write);
+							$content = array_merge($content, $to_write);
 						}
 					}
 				}
@@ -1848,33 +1845,33 @@ 
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					if (!($content['msg'] = $this->delete($info_id, $referer, 'edit'))) return; // checks ACL first
 
-					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					Framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				// called again after delete confirmation dialog
-				elseif ($button == 'deleted'  && $content['msg'])
+				elseif ($button == 'deleted' && $content['msg'])
 				{
-					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					Framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				if ($button == 'save' || $button == 'cancel' || $button == 'delete' || $button == 'deleted')
 				{
 					if ($no_popup)
 					{
-						Egw::redirect_link($referer,array('msg' => $content['msg']));
+						Egw::redirect_link($referer, array('msg' => $content['msg']));
 					}
 					Framework::window_close();
 				}
 			}
 			// on a type-change, set the status to the default status of that type, if the actual status is not supported by the new type
-			if (!array_key_exists($content['info_status'],$this->bo->status[$content['info_type']]))
+			if (!array_key_exists($content['info_status'], $this->bo->status[$content['info_type']]))
 			{
 				$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 				// Make sure we don't end up with invalid status / percent combinations
 				if ($content['info_status'] != 'done')
 				{
 					$content['info_datecompleted'] = '';
-					if((int)$content['info_percent'] === 100)
+					if ((int)$content['info_percent'] === 100)
 					{
 						$content['info_percent'] = 10;
 					}
@@ -1883,7 +1880,7 @@ 
 				{
 					$content['info_percent'] = 100;
 				}
-				if($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
+				if ($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
 				{
 					$content['info_percent'] = 10;
 				}
@@ -1892,25 +1889,24 @@ 
 		else	// new call via GET
 		{
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
-			$action    = $action    ? $action    : $_REQUEST['action'];
+			$action    = $action ? $action : $_REQUEST['action'];
 			$action_id = $action_id ? $action_id : $_REQUEST['action_id'];
-			$info_id   = $content   ? $content   : $_REQUEST['info_id'];
-			$type      = $type      ? $type      : $_REQUEST['type'];
-			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
-				Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			$info_id   = $content ? $content : $_REQUEST['info_id'];
+			$type      = $type ? $type : $_REQUEST['type'];
+			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] : Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
+			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/', '\\1', $referer); // remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
-			$print = (int) $_REQUEST['print'];
+			$print = (int)$_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
-			if (($content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id )) === false)
+			if (($content = $this->bo->read($info_id || $action != 'sp' ? $info_id : $action_id)) === false)
 			{
 				Framework::window_close(lang('Permission denied!'));
 			}
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
-			foreach(array('info_subject', 'info_des') as $key)
+			if (!(strpos($content['info_addr'], ',') === false) && strpos($content['info_addr'], ', ') === false) $content['info_addr'] = str_replace(',', ', ', $content['info_addr']);
+			foreach (array('info_subject', 'info_des') as $key)
 			{
-				if(!isset($content[$key]) || strlen($content[$key]) < 75)
+				if (!isset($content[$key]) || strlen($content[$key]) < 75)
 				{
 					continue;
 				}
@@ -1918,66 +1914,66 @@ 
 				$clarray = array();
 				foreach ($contlines as &$line)
 				{
-					if(strlen($line) < 75)
+					if (strlen($line) < 75)
 					{
 						$clarray[] = $line;
 						continue;
 					}
 					$cont = explode(' ', $line);
 					$ckarray = array();
-					foreach($cont as &$word)
+					foreach ($cont as &$word)
 					{
 						// set blank behind all , and . if words are too long, apply wordwrap afterwards to make sure we get
-						if (strlen($word)>75)
+						if (strlen($word) > 75)
 						{
 							$buff = Api\Html::activate_links($word);
 							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
 							{
-								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+								if (!(strpos($word, ',') === false) && strpos($word, ', ') === false) $word = str_replace(',', ', ', $word);
+								if (!(strpos($word, '.') === false) && strpos($word, '. ') === false) $word = str_replace('.', '. ', $word);
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
-						$ckarray[] =$word;
+						$ckarray[] = $word;
 					}
-					$line = join(' ',$ckarray);
+					$line = join(' ', $ckarray);
 					unset($ckarray);
 					$clarray[] = $line;
 				}
-				$content[$key] = join("\n",$clarray);
+				$content[$key] = join("\n", $clarray);
 				unset($clarray);
 			}
 			if (is_numeric($_REQUEST['cat_id']))
 			{
-				$content['info_cat'] = (int) $_REQUEST['cat_id'];
+				$content['info_cat'] = (int)$_REQUEST['cat_id'];
 			}
 			if (!$content)
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
 
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
 			if ((int)$content['info_link_id'] > 0 && !Link::get_link($content['info_link_id']))
 			{
-				$content['info_link_id'] = 0;	// link has been deleted
+				$content['info_link_id'] = 0; // link has been deleted
 				if (!$content['info_custom_link']) $content['info_from'] = '';
 			}
 			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
 			{
-				if (!$this->bo->check_access($action_id,Acl::ADD))
+				if (!$this->bo->check_access($action_id, Acl::ADD))
 				{
-					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+					return $referer ? $this->tmpl->location($referer) : $this->index(0, $action, $action_id);
 				}
 			}
 			else
 			{
-				$undelete = $this->bo->check_access($info_id,infolog_bo::ACL_UNDELETE);
+				$undelete = $this->bo->check_access($info_id, infolog_bo::ACL_UNDELETE);
 			}
 			$content['links'] = $content['link_to'] = array(
 				'to_id' => $info_id,
@@ -1985,12 +1981,12 @@ 
 			);
 		}
 		// new call via GET or some actions handled here, as they can happen both ways ($_GET[action] or button/action in GUI)
-		if (!$submit || in_array($action,array('sp','copy','schedule','ical','to_tracker')))
+		if (!$submit || in_array($action, array('sp', 'copy', 'schedule', 'ical', 'to_tracker')))
 		{
 			switch ($action)
 			{
 				case 'schedule':
-					Egw::redirect_link('/index.php',array(
+					Egw::redirect_link('/index.php', array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
 						'link_app' => 'infolog',
 						'link_id' => $info_id,
@@ -1998,7 +1994,7 @@ 
 					break;
 				case 'ical':
 					$boical = new infolog_ical();
-					$result = $boical->exportVTODO($content,'2.0','PUBLISH',false);
+					$result = $boical->exportVTODO($content, '2.0', 'PUBLISH', false);
 					Api\Header\Content::type('todo.ics', 'text/calendar');
 					echo $result;
 					exit();
@@ -2009,23 +2005,23 @@ 
 					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int)$_REQUEST['cat_id'];
 					}
-					unset($action);	// it get stored in $content and will cause an other copy after [apply]
+					unset($action); // it get stored in $content and will cause an other copy after [apply]
 					break;
 				case 'to_tracker':
-					Egw::redirect_link('/index.php',array(
+					Egw::redirect_link('/index.php', array(
 						'menuaction' => 'tracker.tracker_ui.edit',
 						Link::get_registry('tracker', 'add_app').'[]' => 'infolog',
-						Link::get_registry('tracker','add_id').'[]' => $info_id,
+						Link::get_registry('tracker', 'add_id').'[]' => $info_id,
 					));
 					break;
 				case 'projectmanager':
 					$pm_links = array($action_id);
 				default:	// to allow other apps to participate
 					$content['info_subject'] = Link::title($action, $id);
-					$action_ids = explode(',',$action_id);
-					if(count($action_ids) == 1)
+					$action_ids = explode(',', $action_id);
+					if (count($action_ids) == 1)
 					{
 						$content['info_contact'] = $action.':'.$action_id;
 					}
@@ -2034,11 +2030,11 @@ 
 						Link::link('infolog', $content['link_to']['to_id'], $action, $id);
 
 						// calling "infolog_set" hook for first, in case app wants to set some more values
-						if (!$n && ($set = Api\Hooks::single(array('location'=>'infolog_set','id'=>$action_id),$action)))
+						if (!$n && ($set = Api\Hooks::single(array('location'=>'infolog_set', 'id'=>$action_id), $action)))
 						{
-							foreach((array)$set['link_app'] as $i => $l_app)
+							foreach ((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) Link::link('infolog', $content['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2052,12 +2048,12 @@ 
 					{
 						if (!isset($pm_links))
 						{
-							$pm_links = Link::get_links('infolog',$info_id,'projectmanager');
+							$pm_links = Link::get_links('infolog', $info_id, 'projectmanager');
 						}
-						break;	// normal edit
+						break; // normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					if (empty($content['info_startdate'])) $content['info_startdate'] = (int)$_GET['startdate'] ? (int)$_GET['startdate'] : $set_startdate;
 					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
@@ -2082,9 +2078,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant (current type is made readonly)
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & Acl::EDIT))
+				if (!($this->bo->grants[$group]&Acl::EDIT))
 				{
 					if ($type == $content['info_type'])
 					{
@@ -2102,7 +2098,7 @@ 
 			{
 				$content['info_owner'] = $this->bo->group_owners[$content['info_type']];
 				// Dont allow to change the type, if user has no delete rights from the group-owner
-				if ($info_id && !($this->bo->grants[$content['info_owner']] & Acl::DELETE))
+				if ($info_id && !($this->bo->grants[$content['info_owner']]&Acl::DELETE))
 				{
 					//echo "<p>setting type to r/o as user has no delete rights from group #$group</p>\n";
 					$readonlys['info_type'] = true;
@@ -2110,7 +2106,7 @@ 
 				// disable info_access for group-owners
 				$readonlys['info_access'] = true;
 			}
-			elseif($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
+			elseif ($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
 			{
 				$content['info_owner'] = $this->user;
 			}
@@ -2122,18 +2118,18 @@ 
 		unset($preserv['links']); unset($preserv['link_to']);
 
 		// for no edit rights or implizit edit of responsible user make all fields readonly, but status and percent
-		if ($info_id && !$this->bo->check_access($info_id,Acl::EDIT) && !$undelete)
+		if ($info_id && !$this->bo->check_access($info_id, Acl::EDIT) && !$undelete)
 		{
-			$readonlys['__ALL__'] = true;	// make all fields not explicitly set readonly
+			$readonlys['__ALL__'] = true; // make all fields not explicitly set readonly
 			if ($this->bo->is_responsible($content))
 			{
-				foreach($this->bo->responsible_edit as $name)
+				foreach ($this->bo->responsible_edit as $name)
 				{
 					$readonlys[$name] = false;
 				}
 				$readonlys['button[edit]'] = $readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['no_notifications'] = false;
 			}
-			$readonlys['action'] = $readonlys['button[cancel]'] = false;	// always allowed
+			$readonlys['action'] = $readonlys['button[cancel]'] = false; // always allowed
 		}
 		elseif (!$info_id)
 		{
@@ -2146,16 +2142,16 @@ 
 			$this->tmpl->setElementAttribute('button[save]', 'label', 'Un-Delete');
 		}
 
-		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id,Acl::DELETE)))
+		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id, Acl::DELETE)))
 		{
-			$content['info_anz_subs'] = $this->bo->anzSubs($info_id);	// to determine js confirmation of delete or not
+			$content['info_anz_subs'] = $this->bo->anzSubs($info_id); // to determine js confirmation of delete or not
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->messages[$info_id ? 'edit' : ($action == 'sp' ? 'add_sub' : 'add')]);
 
 		// use a typ-specific template (infolog.edit.xyz), if one exists, otherwise fall back to the generic one
 		if (!$this->tmpl->read('infolog.edit.'.$content['info_type']))
 		{
-			$this->tmpl->read($print ? 'infolog.edit.print':'infolog.edit');
+			$this->tmpl->read($print ? 'infolog.edit.print' : 'infolog.edit');
 		}
 		if ($this->bo->has_customfields($content['info_type']))
 		{
@@ -2167,14 +2163,14 @@ 
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$readonlys['tabs']['project'] = true;	// disable the project tab
+			$readonlys['tabs']['project'] = true; // disable the project tab
 		}
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
 		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
 
-		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
+		$content['info_anz_subs'] = (int)$content['info_anz_subs']; // gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
 		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
@@ -2192,7 +2188,7 @@ 
 					'Pr' => $this->bo->enums['priority'],
 					'Ow' => 'select-account',
 					//'Ac',	//	info_access: private||public
-					'St' => $this->bo->status[$content['info_type']]+array('deleted' => 'deleted'),
+					'St' => $this->bo->status[$content['info_type']] + array('deleted' => 'deleted'),
 					'Pe' => 'select-percent',
 					'Co' => 'date-time',
 					'st' => 'date-time',
@@ -2209,7 +2205,7 @@ 
 			);
 			$history_stati = array();
 			$tracking = new infolog_tracking($this);
-			foreach($tracking->field2history as $field => $history)
+			foreach ($tracking->field2history as $field => $history)
 			{
 				$history_stati[$history] = $tracking->field2label[$field];
 			}
@@ -2250,15 +2246,15 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
-		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
+		if (!empty($content['info_cc']) && !is_array($content['info_cc']))$content['info_cc'] = explode(',', $content['info_cc']);
+		$this->tmpl->exec('infolog.infolog_ui.edit', $content, $sel_options, $readonlys, $preserv + array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
 			'action_id'     => $action_id,
 			'referer'       => $referer,
 			'no_popup'      => $no_popup,
 			'old_pm_id'     => $old_pm_id,
-		),$no_popup ? 0 : 2);
+		), $no_popup ? 0 : 2);
 	}
 
 	/**
@@ -2269,16 +2265,16 @@ 
 	 * @param array &$content
 	 * @param boolean $create_sub true: create a sub-entry instead of a copy, default false to create a copy
 	 */
-	private function create_copy(array &$content, $create_sub=false)
+	private function create_copy(array &$content, $create_sub = false)
 	{
-		$info_id = $content['info_id'];	// it will be unset by exclude-fields
+		$info_id = $content['info_id']; // it will be unset by exclude-fields
 
 		// empty fields configured to be excluded (also contains id, uid, ...)
 		$exclude_fields = $create_sub ? $this->bo->sub_excludefields : $this->bo->copy_excludefields;
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from') unset($content['info_link_id']); // both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2287,9 +2283,9 @@ 
 		// no startdate or startdate in the past --> set startdate from pref
 		if (!isset($content['info_startdate']) || $content['info_startdate'] < $this->bo->user_time_now)
 		{
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
@@ -2308,17 +2304,17 @@ 
 		// get a consistent status, percent and date-completed
 		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
-		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
+		$content['info_datecompleted'] = $content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
 		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if (!is_array($content['link_to'])) $content['link_to'] = array();
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
-		if (!in_array('link_to',$exclude_fields) || !in_array('attachments',$exclude_fields))
+		if (!in_array('link_to', $exclude_fields) || !in_array('attachments', $exclude_fields))
 		{
-			foreach(Link::get_links($content['link_to']['to_app'], $info_id) as $link)
+			foreach (Link::get_links($content['link_to']['to_app'], $info_id) as $link)
 			{
 				if ($link['app'] != Link::VFS_APPNAME && !in_array('link_to', $exclude_fields))
 				{
@@ -2342,19 +2338,19 @@ 
 			if (!isset($content['info_contact']) || empty($content['info_contact']) || $content['info_contact'] === 'copy:')
 			{
 				$linkinfos = Link::get_link($info_link_id);
-				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				$content['info_contact'] = $linkinfos['link_app1'] == 'infolog' ? $linkinfos['link_app2'].':'.$linkinfos['link_id2'] : $linkinfos['link_app1'].':'.$linkinfos['link_id1'];
+				if (stripos($content['info_contact'], 'projectmanager') !== false) $content['pm_id'] = $linkinfos['link_app1'] == 'projectmanager' ? $linkinfos['link_id1'] : $linkinfos['link_id2'];
 			}
 			unset($content['info_link_id']);
 		}
-		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD,0,$this->owner) ? $this->user : $this->owner;
+		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD, 0, $this->owner) ? $this->user : $this->owner;
 
 		if (!empty($content['info_subject']))
 		{
 			if ($create_sub)
 			{
 				$config = Api\Config::read('infolog');
-				$prefix = lang(empty($config['sub_prefix']) ? 'Re:': $config['sub_prefix']);
+				$prefix = lang(empty($config['sub_prefix']) ? 'Re:' : $config['sub_prefix']);
 			}
 			else
 			{
@@ -2364,11 +2360,11 @@ 
 		}
 		if (!$create_sub)
 		{
-			$content['msg'] .= ($content['msg']?"\n":'').lang('Infolog copied - the copy can now be edited');
+			$content['msg'] .= ($content['msg'] ? "\n" : '').lang('Infolog copied - the copy can now be edited');
 		}
 	}
 
-	function icon($cat,$id,$status='')
+	function icon($cat, $id, $status = '')
 	{
 		if (!$status || !($icon = $this->icons[$cat][$id.'_'.$status]))
 		{
@@ -2385,7 +2381,7 @@ 
 				$alt = $id;
 			}
 		}
-		return $icon ? Api\Html::image('infolog',$icon,lang($alt),'border=0') : lang($alt);
+		return $icon ? Api\Html::image('infolog', $icon, lang($alt), 'border=0') : lang($alt);
 	}
 
 	/**
@@ -2435,27 +2431,27 @@ 
 			'info_cc' => 'CC',
 		);
 		// add customfields to field list
-		foreach(Api\Storage\Customfields::get('infolog') as $name => $data)
+		foreach (Api\Storage\Customfields::get('infolog') as $name => $data)
 		{
 			$excludefields['#'.$name] = $data['label'];
 		}
 		$sub_excludefields = $excludefields;
-		unset($sub_excludefields['info_id_parent']);	// always set to parent!
+		unset($sub_excludefields['info_id_parent']); // always set to parent!
 
 		$config = Api\Config::read('infolog');
 
-		if($content)
+		if ($content)
 		{
 			// Save
 			$button = key($content['button']);
-			if($button == 'save' || $button == 'apply')
+			if ($button == 'save' || $button == 'apply')
 			{
-				$this->bo->responsible_edit = array('info_status','info_percent','info_datecompleted');
+				$this->bo->responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 
 				if ($content['responsible_edit'])
 				{
-					$extra = array_intersect($content['responsible_edit'],array_keys($fields));
-					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit,$extra));
+					$extra = array_intersect($content['responsible_edit'], array_keys($fields));
+					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit, $extra));
 				}
 				Api\Config::save_value('copy_excludefields', $content['copy_excludefields'] ? $content['copy_excludefields'] : null, 'infolog');
 				Api\Config::save_value('sub_excludefields', $content['sub_excludefields'] ? $content['sub_excludefields'] : array('*NONE*'), 'infolog');
@@ -2466,12 +2462,12 @@ 
 				Api\Config::save_value('sub_prefix', $content['sub_prefix'], 'infolog');
 
 				// Notifications
-				$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
+				$notifications = & $config[infolog_tracking::CUSTOM_NOTIFICATION];
 				$notifications[$content['notification_type']] = $content['notification'];
-				Api\Config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications,'infolog');
+				Api\Config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications, 'infolog');
 			}
 
-			if($button == 'save' || $button == 'cancel')
+			if ($button == 'save' || $button == 'cancel')
 			{
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
@@ -2494,7 +2490,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Site configuration');
 
 		// Load selected custom notification
-		if(!$content['notification_type'])
+		if (!$content['notification_type'])
 		{
 			$content['notification_type'] = '~global~';
 		}
@@ -2518,7 +2514,7 @@ 
 		);
 		$preserve['notification_old_type'] = $content['notification_type'];
 		$this->tmpl->read('infolog.config');
-		$this->tmpl->exec('infolog.infolog_ui.admin',$content,$sel_options,array(),$preserve);
+		$this->tmpl->exec('infolog.infolog_ui.admin', $content, $sel_options, array(), $preserve);
 	}
 
 	/**
@@ -2527,13 +2523,13 @@ 
 	 * @param array $mailContent = null content of mail
 	 * @return  array
 	 */
-	function mail_import(array $mailContent=null)
+	function mail_import(array $mailContent = null)
 	{
 		// It would get called from compose as a popup with egw_data
 		if (!is_array($mailContent) && ($_GET['egw_data']))
 		{
 			// get the mail raw data
-			Link::get_data ($_GET['egw_data']);
+			Link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -2564,7 +2560,7 @@ 
 	function hook_view($args)
 	{
 		// Load JS for infolog actions
-		Framework::includeJS('.','app','infolog');
+		Framework::includeJS('.', 'app', 'infolog');
 
 		switch ($args['location'])
 		{
@@ -2592,7 +2588,7 @@ 
 		{
 			return False;
 		}
-		$this->called_by = $app;	// for read/save_sessiondata, to have different sessions for the hooks
+		$this->called_by = $app; // for read/save_sessiondata, to have different sessions for the hooks
 
 		// Set to calling app, so actions wind up in the correct place client side
 		$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -2600,11 +2596,11 @@ 
 		Api\Translation::add_app('infolog');
 
 		// Still want infolog Api\Categories though
-		$GLOBALS['egw']->categories = new Api\Categories('','infolog');
-		$this->index(null,$app,$args[$view_id],array(
+		$GLOBALS['egw']->categories = new Api\Categories('', 'infolog');
+		$this->index(null, $app, $args[$view_id], array(
 			'menuaction' => $view,
 			isset($view_id2) ? $view_id2 : $view_id => $args[$view_id]
-		),True);
+		), True);
 	}
 
 	/**
@@ -2613,26 +2609,26 @@ 
 	 * @param string $type infolog type to include only the matching custom fields if set
 	 * @return array
 	 */
-	function csv_export_fields($type=null)
+	function csv_export_fields($type = null)
 	{
 		$fields = array(
 			'info_type'          => lang('Type'),
 			'info_from'          => lang('Contact'),
 			'info_addr'          => lang('Phone/Email'),
 //			'info_link_id'       => lang('primary link'),
-			'info_cat'           => array('label' => lang('Category'),'type' => 'select-cat'),
+			'info_cat'           => array('label' => lang('Category'), 'type' => 'select-cat'),
 			'info_priority'      => lang('Priority'),
-			'info_owner'         => array('label' => lang('Owner'),'type' => 'select-account'),
+			'info_owner'         => array('label' => lang('Owner'), 'type' => 'select-account'),
 			'info_access'        => lang('Access'),
 			'info_status'        => lang('Status'),
 			'info_percent'       => lang('Completed'),
 			'info_datecompleted' => lang('Date completed'),
 			'info_datemodified'  => lang('Last modified'),
-			'info_modifier'      => array('label' => lang('Modifier'),'type' => 'select-account'),
+			'info_modifier'      => array('label' => lang('Modifier'), 'type' => 'select-account'),
 			'info_location'      => lang('Location'),
 			'info_startdate'     => lang('Startdate'),
 			'info_enddate'       => lang('Enddate'),
-			'info_responsible'   => array('label' => lang('Responsible'),'type' => 'select-account'),
+			'info_responsible'   => array('label' => lang('Responsible'), 'type' => 'select-account'),
 			'info_subject'       => lang('Subject'),
 			'info_des'           => lang('Description'),
 			'info_id'            => lang('Id'),
@@ -2642,13 +2638,13 @@ 
 			'pl_id'              => lang('pricelist'),
 			'info_price'         => lang('price'),
 		);
-		foreach($this->bo->timestamps as $name)
+		foreach ($this->bo->timestamps as $name)
 		{
-			$fields[$name] = array('label' => $fields[$name],'type' => 'date-time');
+			$fields[$name] = array('label' => $fields[$name], 'type' => 'date-time');
 		}
-		foreach($this->bo->customfields as $name => $data)
+		foreach ($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type, explode(',', $data['type2']))) continue;
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

json.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * callback if the session-check fails, redirects to login.php, if no valid basic auth credentials given
  *
  * @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type'
- * @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise
+ * @return string|null true if we allow anon access and anon_account is set, a sessionid or false otherwise
  */
 function login_redirect(&$anon_account)
 {

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		return $session_id;
 	}
-	Json\Request::isJSONRequest(true);	// because Api\Json\Request::parseRequest() is not (yet) called
+	Json\Request::isJSONRequest(true); // because Api\Json\Request::parseRequest() is not (yet) called
 	$response = Json\Response::get();
 	$response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true);
 
@@ -53,7 +53,7 @@ 
 	$message = null;
 	if (function_exists('_egw_log_exception'))
 	{
-		_egw_log_exception($e,$message);
+		_egw_log_exception($e, $message);
 	}
 	$response = Json\Response::get();
 	$message .= ($message ? "\n\n" : '').$e->getMessage();
@@ -73,9 +73,9 @@ 
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'], '::') !== false && strpos($_GET['menuaction'], '.') === false)	// static method name app_something::method
 	{
-		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
+		@list($className, $functionName, $handler) = explode('::', $_GET['menuaction']);
 
 		if (substr($className, 0, 11) == 'EGroupware\\')
 		{
@@ -83,12 +83,12 @@ 
 		}
 		else
 		{
-			list($appName) = explode('_',$className);
+			list($appName) = explode('_', $className);
 		}
 	}
 	else
 	{
-		@list($appName, $className, $functionName, $handler) = explode('.',$_GET['menuaction']);
+		@list($appName, $className, $functionName, $handler) = explode('.', $_GET['menuaction']);
 	}
 	//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
@@ -98,7 +98,7 @@ 
 			'noheader'		=> True,
 			'disable_Template_class'	=> True,
 			'autocreate_session_callback' => 'login_redirect',
-			'no_exception_handler' => true,	// we already installed our own
+			'no_exception_handler' => true, // we already installed our own
 			// only log ajax requests which represent former GET requests or submits
 			// cuts down updates to egw_access_log table
 			'no_dla_update' => !preg_match('/(Etemplate::ajax_process_content|\.jdots_framework\.ajax_exec\.template)$/', $_GET['menuaction']),
@@ -113,7 +113,7 @@ 
 	//Check whether the request data is set
 	if (isset($GLOBALS['egw_unset_vars']['_POST[json_data]']))
 	{
-		$json->isJSONRequest(true);	// otherwise exception is not send back to client, as we have not yet called parseRequest()
+		$json->isJSONRequest(true); // otherwise exception is not send back to client, as we have not yet called parseRequest()
 		throw new Json\Exception\ScriptTags("JSON Data contains script tags. Aborting...");
 	}
 	$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
@@ -121,4 +121,4 @@ 
 	exit();
 }
 
-throw new Json\Exception($_SERVER['PHP_SELF'] . ' Invalid AJAX JSON Request');
+throw new Json\Exception($_SERVER['PHP_SELF'].' Invalid AJAX JSON Request');

Braces +4 added lines, -1 removed lines

@@ -73,9 +73,12 @@
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)
+	{
+		// static method name app_something::method
 	{
 		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
+	}
 
 		if (substr($className, 0, 11) == 'EGroupware\\')
 		{