EGroupware / egroupware

etemplate/inc/class.etemplate_widget_url.inc.php

Doc Comments -1 removed lines

@@ -52,7 +52,6 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -64,12 +64,12 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 				return;
 			}
 			elseif ((string)$value != '' && !isset($this->attrs['preg']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'url':
 						// if no protocol given eg. "www.egroupware.org" prepend "http://" for validation
@@ -79,7 +79,7 @@ 
 						}
 						$url_valid = filter_var($value, FILTER_VALIDATE_URL) ||
 							// Remove intl chars & check again, but if it passes we'll keep the original
-							filter_var(preg_replace('/[^[:print:]]/','',$value), FILTER_VALIDATE_URL);
+							filter_var(preg_replace('/[^[:print:]]/', '', $value), FILTER_VALIDATE_URL);
 						//error_log(__METHOD__."() filter_var(value=".array2string($value).", FILTER_VALIDATE_URL)=".array2string(filter_var($value, FILTER_VALIDATE_URL))." --> url_valid=".array2string($url_valid));
 						// remove http:// validation prefix again
 						if ($missing_protocol)
@@ -88,7 +88,7 @@ 
 						}
 						if (!$url_valid)
 						{
-							self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+							self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value), '');
 							return;
 						}
 						break;
@@ -98,19 +98,19 @@ 
 				}
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = substr($value,0,(int) $this->attrs['maxlength']);
+				$value = substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'],$value))
+			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					default:
 						//error_log("preg_match('{$this->attrs['preg']}', '$value')=".array2string(preg_match($this->attrs['preg'], $value)));
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[preg]', '$value')"*/, '');
 						break;
 				}
 			}

etemplate/inc/class.etemplate_widget_vfs.inc.php

Doc Comments +1 added lines

@@ -230,6 +230,7 @@
 	* If the entry is not yet created, the file information is stored into the widget's value.
 	* When the form is submitted, the information for all files uploaded is available in the returned
 	* $content array and the application should deal with the file.
+	* @return string
 	*/
 	public static function store_file($path, $file)
 	{

Indentation +7 added lines, -7 removed lines

@@ -224,13 +224,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, $file)
 	{
 		$name = $_REQUEST['widget_id'];

Spacing +33 added lines, -33 removed lines

@@ -21,8 +21,8 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='') {
-		if($xml) parent::__construct($xml);
+	public function __construct($xml = '') {
+		if ($xml) parent::__construct($xml);
 	}
 
 	/**
@@ -31,38 +31,38 @@ 
 	 */
 	public function beforeSendToClient($cname, $expand = array())
 	{
-		if($this->type == 'vfs-upload')
+		if ($this->type == 'vfs-upload')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
 
 			// ID maps to path - check there for any existing files
-			list($app,$id,$relpath) = explode(':',$this->id,3);
-			if($app && $id)
+			list($app, $id, $relpath) = explode(':', $this->id, 3);
+			if ($app && $id)
 			{
-				if(!is_numeric($id))
+				if (!is_numeric($id))
 				{
-					$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-					if($_id != $id)
+					$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+					if ($_id != $id)
 					{
 						$id = $_id;
 						$form_name = "$app:$id:$relpath";
 					}
 				}
-				$value =& self::get_array(self::$request->content, $form_name, true);
-				$path = egw_link::vfs_path($app,$id,'',true);
+				$value = & self::get_array(self::$request->content, $form_name, true);
+				$path = egw_link::vfs_path($app, $id, '', true);
 				if (!empty($relpath)) $path .= '/'.$relpath;
 
 				if (true) $value = array();
 
 				// Single file, already existing
-				if (substr($path,-1) != '/' && egw_vfs::file_exists($path) && !egw_vfs::is_dir($path))
+				if (substr($path, -1) != '/' && egw_vfs::file_exists($path) && !egw_vfs::is_dir($path))
 				{
 					$value = $path;
 				}
 				else if (substr($path, -1) == '/' && egw_vfs::is_dir($path))
 				{
 					$value = egw_vfs::scandir($path);
-					foreach($value as &$file)
+					foreach ($value as &$file)
 					{
 						$file = egw_vfs::stat("$path$file");
 					}
@@ -74,7 +74,7 @@ 
 	public static function ajax_upload()
 	{
 		parent::ajax_upload();
-		foreach($_FILES as $file)
+		foreach ($_FILES as $file)
 		{
 			self::store_file($field, $file);
 		}
@@ -87,7 +87,7 @@ 
 	{
 		$request_id = urldecode($_REQUEST['request_id']);
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = etemplate_request::read($request_id))
+		if (!self::$request = etemplate_request::read($request_id))
 		{
 			$error = lang("Could not read session");
 		}
@@ -147,10 +147,10 @@ 
 	static function fix_html_dragins($app, $id, array $links, &$html)
 	{
 		$replace = $remove_dir = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$matches = null;
-			if (is_array($link) && preg_match('|^'.preg_quote(egw_vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+			if (is_array($link) && preg_match('|^'.preg_quote(egw_vfs::PREFIX, '|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
 			{
 				$replace[substr($link['id']['tmp_name'], strlen(egw_vfs::PREFIX))] =
 					egw_link::vfs_path($app, $id, egw_vfs::basename($link['id']['tmp_name']), true);
@@ -162,7 +162,7 @@ 
 		{
 			$html = strtr($old = $html, $replace);
 			// remove all dirs
-			foreach($remove_dir as $dir)
+			foreach ($remove_dir as $dir)
 			{
 				egw_vfs::remove($dir);
 			}
@@ -177,7 +177,7 @@ 
 	 * @param string $postfix =null default random id
 	 * @return string vfs path
 	 */
-	static function get_temp_dir($app, $postfix=null)
+	static function get_temp_dir($app, $postfix = null)
 	{
 		if (!isset($postfix)) $postfix = md5(time().session_id());
 
@@ -197,15 +197,15 @@ 
 		$name = $path;
 
 		// Find real path
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
 			$path = self::get_vfs_path($path);
 		}
 		$filename = $file['name'];
-		if (substr($path,-1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))       // really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
@@ -215,14 +215,14 @@ 
 		{
 			$path .= egw_vfs::encodePathComponent($filename);
 		}
-		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!',egw_vfs::decodePath($dir)));
+			self::set_validation_error($name, lang('Error create parent directory %1!', egw_vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($file['tmp_name'],egw_vfs::PREFIX.$path))
+		if (!copy($file['tmp_name'], egw_vfs::PREFIX.$path))
 		{
-			self::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			self::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
 
@@ -241,7 +241,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		// do not validate, as it would overwrite preserved values with null!
 		if (in_array($this->type, array('vfs-size', 'vfs-uid', 'vfs-gid', 'vfs', 'vfs-mime')))
@@ -250,12 +250,12 @@ 
 		}
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = $value_in = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if (!is_array($value)) $value = array();
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 		//...
@@ -274,16 +274,16 @@ 
 	 */
 	public static function get_vfs_path($path)
 	{
-		list($app,$id,$relpath) = explode(':',$path,3);
+		list($app, $id, $relpath) = explode(':', $path, 3);
 		if (empty($id) || $id == 'undefined')
 		{
-			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
+			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir($app);
 			$path = $tmppath[$app];
 		}
 		else
 		{
-			$path = egw_link::vfs_path($app,$id,'',true);
+			$path = egw_link::vfs_path($app, $id, '', true);
 		}
 		if (!empty($relpath)) $path .= '/'.$relpath;
 		return $path;

Braces +42 added lines, -11 removed lines

@@ -21,8 +21,12 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='') {
-		if($xml) parent::__construct($xml);
+	public function __construct($xml='')
+	{
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -50,9 +54,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = egw_link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && egw_vfs::file_exists($path) && !egw_vfs::is_dir($path))
@@ -155,7 +165,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(egw_vfs::PREFIX))] =
 					egw_link::vfs_path($app, $id, egw_vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -179,7 +192,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -206,10 +222,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))       // really an extension --> add it to path
+			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else    // multiple upload with dir given (trailing slash)
 		{
@@ -255,7 +274,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 		//...
@@ -266,7 +288,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -278,14 +303,20 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
 		{
 			$path = egw_link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 }

etemplate/inc/class.historylog_widget.inc.php

Doc Comments +1 added lines

@@ -58,6 +58,7 @@
 	 *
 	 * @param mixed &$value value / existing content, can be modified
 	 * @param array &$cell array with the widget, can be modified for ui-independent widgets
+	 * @param etemplate $tmpl
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
 	private function pre_process_helper(&$value, &$cell, $tmpl)

Spacing +40 added lines, -40 removed lines

@@ -70,24 +70,24 @@ 
 		//echo $value.'/'.$cell['size']; _debug_array(self::$status_widgets);
 		$type = isset(self::$status_widgets[$cell['size']]) ? self::$status_widgets[$cell['size']] : 'label';
 		$options = '';
-		if (!is_array($type) && strpos($type,':') !== false)
+		if (!is_array($type) && strpos($type, ':') !== false)
 		{
-			list($type,$options) = explode(':',$type,2);
+			list($type, $options) = explode(':', $type, 2);
 		}
 		// For all select-cats, show missing entries as IDs
-		if($type == 'select-cat')
+		if ($type == 'select-cat')
 		{
-			list($rows,$type1,$type2,$type3,$type4,$type5,$type6) = explode(',',$options);
+			list($rows, $type1, $type2, $type3, $type4, $type5, $type6) = explode(',', $options);
 			$type6 = 2;
-			$options = implode(',',array($rows,$type1,$type2,$type3,$type4,$type5,$type6));
+			$options = implode(',', array($rows, $type1, $type2, $type3, $type4, $type5, $type6));
 		}
-		$cell = boetemplate::empty_cell($type,$cell['name'],array('readonly' => true,'size' => $options));
+		$cell = boetemplate::empty_cell($type, $cell['name'], array('readonly' => true, 'size' => $options));
 		// display unsupported iCal properties, which have multiple values or attributes, or multiple components
 		if ($type === 'label' && $value[1] === ':' && ($values = unserialize($value)))
 		{
 			if (isset($values['values']))
 			{
-				foreach((array)$values['params'] as $name => $val)
+				foreach ((array)$values['params'] as $name => $val)
 				{
 					$values['values'][] = $name.': '.$val;
 				}
@@ -97,28 +97,28 @@ 
 		}
 		elseif (is_array($type))
 		{
-			list($t) = explode(':',$type[0]);
-			if (isset($type[0]) &&	// numeric indexed array --> multiple values of 1:N releation
+			list($t) = explode(':', $type[0]);
+			if (isset($type[0]) && // numeric indexed array --> multiple values of 1:N releation
 				$tmpl->widgetExists($t))
 			{
 				$cell['type'] = 'vbox';
 				$cell['size'] = '0,,0,0';
-				$value = explode(bo_tracking::ONE2N_SEPERATOR,$value);
-				foreach($type as $n => $t)
+				$value = explode(bo_tracking::ONE2N_SEPERATOR, $value);
+				foreach ($type as $n => $t)
 				{
 					$opt = '';
-					if(is_array($t))
+					if (is_array($t))
 					{
 						$sel_options = $t;
 						$t = 'select';
 					}
 					else
 					{
-						list($t,$opt) = explode(':',$t);
+						list($t, $opt) = explode(':', $t);
 					}
-					$child = boetemplate::empty_cell($t,$cell['name']."[$n]",array('readonly' => true,'no_lang' => true,'size' => $opt));
+					$child = boetemplate::empty_cell($t, $cell['name']."[$n]", array('readonly' => true, 'no_lang' => true, 'size' => $opt));
 					$child['sel_options'] = $sel_options;
-					boetemplate::add_child($cell,$child);
+					boetemplate::add_child($cell, $child);
 					unset($sel_options);
 					unset($child);
 				}
@@ -150,7 +150,7 @@ 
 	 * @param etemplate $tmpl reference to the template we belong too
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
-	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,$tmpl)
+	function pre_process($name, &$value, &$cell, &$readonlys, &$extension_data, $tmpl)
 	{
 		switch ($cell['type'])
 		{
@@ -164,30 +164,30 @@ 
 		$filter = is_array($value) ? $value['filter'] : array();
 
 		$historylog = new historylog($app);
-		if (!$id || method_exists($historylog,'search'))
+		if (!$id || method_exists($historylog, 'search'))
 		{
 			$value = $id ? $historylog->search($filter ? array('history_record_id'=>$id) + $filter : $id, 'history_id', 'DESC', self::MAX_DISPLAY) : false;
 		}
 		unset($historylog);
 
 		$tpl = new etemplate;
-		$tpl->init('*** generated fields for historylog','','',0,'',0,0);	// make an empty template
+		$tpl->init('*** generated fields for historylog', '', '', 0, '', 0, 0); // make an empty template
 		// keep the editor away from the generated tmpls
 		$tpl->no_onclick = true;
 
 		// header rows
-		$tpl->new_cell(1,'label','Date');
-		$tpl->new_cell(1,'label','User');
-		$tpl->new_cell(1,'label','Changed');
-		$tpl->new_cell(1,'label','New value');
-		$tpl->new_cell(1,'label','Old value');
+		$tpl->new_cell(1, 'label', 'Date');
+		$tpl->new_cell(1, 'label', 'User');
+		$tpl->new_cell(1, 'label', 'Changed');
+		$tpl->new_cell(1, 'label', 'New value');
+		$tpl->new_cell(1, 'label', 'Old value');
 
 		$status = 'status';
 		// allow to set a diffent name for status (field-name), eg. because status is already used for something else
 		if (!empty($cell['size']) && isset($tmpl->sel_options[$cell['size']]) && is_array($value))
 		{
 			$status = $cell['size'];
-			foreach($value as &$row)
+			foreach ($value as &$row)
 			{
 				$row[$status] = $row['status'];
 			}
@@ -198,16 +198,16 @@ 
 		$tmpl->sel_options[$status]['user_agent_action'] = lang('User-agent & action');
 
 		// adding custom fields automatically to status-widgets, no need for each app to do that
-		foreach(config::get_customfields($app,true) as $cf_name => $cf_data)
+		foreach (config::get_customfields($app, true) as $cf_name => $cf_data)
 		{
 			// add cf label, if not set by app
 			if (!isset($tmpl->sel_options[$status]['#'.$cf_name]))
 			{
 				$tmpl->sel_options[$status]['#'.$cf_name] = lang($cf_data['label']);
 			}
-			if (isset(self::$status_widgets['#'.$cf_name])) continue;	// app set a status widget --> use that
+			if (isset(self::$status_widgets['#'.$cf_name])) continue; // app set a status widget --> use that
 
-			if(!is_array($cf_data['values']) || !$cf_data['values'])
+			if (!is_array($cf_data['values']) || !$cf_data['values'])
 			{
 				if (isset($GLOBALS['egw_info']['apps'][$cf_data['type']]))
 				{
@@ -218,11 +218,11 @@ 
 					self::$status_widgets['#'.$cf_name] = $cf_data['type'] != 'text' ? $cf_data['type'] : 'label';
 				}
 			}
-			elseif($cf_data['values']['@'])
+			elseif ($cf_data['values']['@'])
 			{
 				self::$status_widgets['#'.$cf_name] = egw_customfields::get_options_from_file($cf_data['values']['@']);
 			}
-			elseif(count($cf_data['values']))
+			elseif (count($cf_data['values']))
 			{
 				self::$status_widgets['#'.$cf_name] = $cf_data['values'];
 			}
@@ -231,7 +231,7 @@ 
 		if ($value)	// autorepeated data-row only if there is data
 		{
 			// add "labels" for unsupported iCal properties, we just remove the '##' prefix
-			foreach($value as &$row)
+			foreach ($value as &$row)
 			{
 				if ($row['status'][0] == '#' && $row['status'][1] == '#' &&
 					isset($tmpl->sel_options[$status]) && !isset($tmpl->sel_options[$status][$row['status']]))
@@ -240,32 +240,32 @@ 
 				}
 			}
 
-			$tpl->new_cell(2,'date-time','','${row}[user_ts]',array('readonly' => true));
-			$tpl->new_cell(2,'select-account','','${row}[owner]',array('readonly' => true));
+			$tpl->new_cell(2, 'date-time', '', '${row}[user_ts]', array('readonly' => true));
+			$tpl->new_cell(2, 'select-account', '', '${row}[owner]', array('readonly' => true));
 
 
 			// if $sel_options[status] is set, use them and a readonly selectbox
 			if (isset($tmpl->sel_options[$status]))
 			{
-				$tpl->new_cell(2,'select','','${row}['.$status.']',array('readonly' => true));
+				$tpl->new_cell(2, 'select', '', '${row}['.$status.']', array('readonly' => true));
 			}
 			else
 			{
-				$tpl->new_cell(2,'label','','${row}[status]',array('no_lang' => true));
+				$tpl->new_cell(2, 'label', '', '${row}[status]', array('no_lang' => true));
 			}
 			// if $value[status-widgets] is set, use them together with the historylog-helper
 			// to display new_ & old_value in the specified widget, otherwise use a label
 			if (self::$status_widgets)
 			{
-				$tpl->new_cell(2,'historylog-helper','','${row}[new_value]',array('size' => '$row_cont[status]','no_lang' => true,'readonly' => true));
-				$tpl->new_cell(2,'historylog-helper','','${row}[old_value]',array('size' => '$row_cont[status]','no_lang' => true,'readonly' => true));
+				$tpl->new_cell(2, 'historylog-helper', '', '${row}[new_value]', array('size' => '$row_cont[status]', 'no_lang' => true, 'readonly' => true));
+				$tpl->new_cell(2, 'historylog-helper', '', '${row}[old_value]', array('size' => '$row_cont[status]', 'no_lang' => true, 'readonly' => true));
 			}
 			else
 			{
-				$tpl->new_cell(2,'label','','${row}[new_value]',array('no_lang' => true));
-				$tpl->new_cell(2,'label','','${row}[old_value]',array('no_lang' => true));
+				$tpl->new_cell(2, 'label', '', '${row}[new_value]', array('no_lang' => true));
+				$tpl->new_cell(2, 'label', '', '${row}[old_value]', array('no_lang' => true));
 			}
-			array_unshift($value,false);	// addjust index to start with 1, as we have a header-row
+			array_unshift($value, false); // addjust index to start with 1, as we have a header-row
 		}
 		$tpl->data[0] = array(
 			'c1' => 'th',
@@ -278,6 +278,6 @@ 
 		$cell['name'] = $tpl->name;
 		$cell['obj'] = &$tpl;
 
-		return True;	// extra Label is ok
+		return True; // extra Label is ok
 	}
 }

Braces +13 added lines, -3 removed lines

@@ -134,7 +134,10 @@ 
 		{
 			$value = egw_time::server2user($value);
 		}
-		if ($cell['type'] == 'label') $cell['no_lang'] = 'true';
+		if ($cell['type'] == 'label')
+		{
+			$cell['no_lang'] = 'true';
+		}
 
 		return true;
 	}
@@ -205,7 +208,11 @@ 
 			{
 				$tmpl->sel_options[$status]['#'.$cf_name] = lang($cf_data['label']);
 			}
-			if (isset(self::$status_widgets['#'.$cf_name])) continue;	// app set a status widget --> use that
+			if (isset(self::$status_widgets['#'.$cf_name]))
+			{
+				continue;
+			}
+			// app set a status widget --> use that
 
 			if(!is_array($cf_data['values']) || !$cf_data['values'])
 			{
@@ -228,7 +235,9 @@ 
 			}
 		}
 
-		if ($value)	// autorepeated data-row only if there is data
+		if ($value)
+		{
+			// autorepeated data-row only if there is data
 		{
 			// add "labels" for unsupported iCal properties, we just remove the '##' prefix
 			foreach($value as &$row)
@@ -237,6 +246,7 @@ 
 					isset($tmpl->sel_options[$status]) && !isset($tmpl->sel_options[$status][$row['status']]))
 				{
 					$tmpl->sel_options[$status][$row['status']] = substr($row['status'], 2);
+		}
 				}
 			}
 

etemplate/inc/class.link_widget.inc.php

Doc Comments +2 added lines, -1 removed lines

@@ -115,7 +115,7 @@ 
 	 * @param array &$readonlys names of widgets as key, to be made readonly
 	 * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
 	 * @param object &$tmpl reference to the template we belong too
-	 * @return boolean true if extra label is allowed, false otherwise
+	 * @return null|boolean true if extra label is allowed, false otherwise
 	 */
 	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 	{
@@ -706,6 +706,7 @@ 
 
 	/**
 	*	Get sub-types for the current application
+	* @param etemplate $tpl
 	*/
 	private static function get_sub_types($cell, &$value, &$tpl) {
 		// Get sub-types

Indentation +2 added lines, -2 removed lines

@@ -705,8 +705,8 @@
 	}
 
 	/**
-	*	Get sub-types for the current application
-	*/
+	 *	Get sub-types for the current application
+	 */
 	private static function get_sub_types($cell, &$value, &$tpl) {
 		// Get sub-types
 		if($value['options-app']) {

Switch Indentation +260 added lines, -260 removed lines

@@ -147,331 +147,331 @@
 		}
 		switch ($cell['type'])
 		{
-		case 'link':
-			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
-			$extension_data = null;
-			$cell['no_lang'] = 1;
-			$link = $target = $popup = '';
-			if (!is_array($value) && $value && isset($GLOBALS['egw_info']['apps'][$cell['size']]))
-			{
-				$value = array(
-					'id' => $value,
-					'app' => $cell['size'],
-				);
-				$cell['size'] = '';
-			}
-			if ($value['app'] && $value['id'])
-			{
-				$view = egw_link::view($value['app'],$value['id']);
-				$link = $view['menuaction']; unset($view['menuaction']);
-				foreach($view as $var => $val)
+			case 'link':
+				$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+				$extension_data = null;
+				$cell['no_lang'] = 1;
+				$link = $target = $popup = '';
+				if (!is_array($value) && $value && isset($GLOBALS['egw_info']['apps'][$cell['size']]))
 				{
-					$link .= '&'.$var.'='.$val;
+					$value = array(
+						'id' => $value,
+						'app' => $cell['size'],
+					);
+					$cell['size'] = '';
 				}
-				if (isset($value['extra_args']))
+				if ($value['app'] && $value['id'])
 				{
-					foreach($value['extra_args'] as $var => $val)
+					$view = egw_link::view($value['app'],$value['id']);
+					$link = $view['menuaction']; unset($view['menuaction']);
+					foreach($view as $var => $val)
 					{
 						$link .= '&'.$var.'='.$val;
 					}
+					if (isset($value['extra_args']))
+					{
+						foreach($value['extra_args'] as $var => $val)
+						{
+							$link .= '&'.$var.'='.$val;
+						}
+					}
+					if (!($popup = egw_link::is_popup($value['app'],'view')) &&
+						etemplate::$request->output_mode == 2)	// we are in a popup
+					{
+						$target = '_blank';
+					}
+					if (!$cell['help'])
+					{
+						$cell['help'] = $value['help'];
+						$cell['no_lang'] = 2;
+					}
 				}
-				if (!($popup = egw_link::is_popup($value['app'],'view')) &&
-					etemplate::$request->output_mode == 2)	// we are in a popup
+				elseif (!$value['title'])
 				{
-					$target = '_blank';
+					$cell = $tmpl->empty_cell();
+					$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+					$extension_data = null;
+					return;
 				}
-				if (!$cell['help'])
+				$cell['type'] = 'label';
+				//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
+				list($cell['size']) = explode(',',$cell['size']);
+				// Pass link through framework's handler
+				if(!$popup) $link = str_replace(',','%2C',egw::link('/index.php?menuaction='.$link,false,$value['app']));
+				$cell['size'] .= ','.$link.',,,'.$target.','.$popup.','.$value['extra_title'];
+				$value = $value['title'] ? $value['title'] : egw_link::title($value['app'],$value['id']);
+				return true;
+
+			case 'link-string':
+				$str = '';
+				if ($value && !is_array($value) && $cell['size'])
 				{
-					$cell['help'] = $value['help'];
-					$cell['no_lang'] = 2;
+					$value = array('to_id' => $value);
+					list($value['to_app'],$value['only_app']) = explode(',',$cell['size']);
 				}
-			}
-			elseif (!$value['title'])
-			{
-				$cell = $tmpl->empty_cell();
-				$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
-				$extension_data = null;
-				return;
-			}
-			$cell['type'] = 'label';
-			//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
-			list($cell['size']) = explode(',',$cell['size']);
-			// Pass link through framework's handler
-			if(!$popup) $link = str_replace(',','%2C',egw::link('/index.php?menuaction='.$link,false,$value['app']));
-			$cell['size'] .= ','.$link.',,,'.$target.','.$popup.','.$value['extra_title'];
-			$value = $value['title'] ? $value['title'] : egw_link::title($value['app'],$value['id']);
-			return true;
-
-		case 'link-string':
-			$str = '';
-			if ($value && !is_array($value) && $cell['size'])
-			{
-				$value = array('to_id' => $value);
-				list($value['to_app'],$value['only_app']) = explode(',',$cell['size']);
-			}
-			if ($value['to_id'] && $value['to_app'])
-			{
-				$value = egw_link::get_links($value['to_app'], $value['to_id'], $only_app = $value['only_app'],
-					'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
-				if ($only_app)
+				if ($value['to_id'] && $value['to_app'])
 				{
-					foreach($value as $key => $id)
+					$value = egw_link::get_links($value['to_app'], $value['to_id'], $only_app = $value['only_app'],
+						'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
+					if ($only_app)
 					{
-						$value[$key] = array(
-							'id'  => $id,
-							'app' => $only_app,
-						);
+						foreach($value as $key => $id)
+						{
+							$value[$key] = array(
+								'id'  => $id,
+								'app' => $only_app,
+							);
+						}
 					}
 				}
-			}
-			if (is_array($value))
-			{
-				foreach ($value as $link)
+				if (is_array($value))
 				{
-					$str .= ($str !== '' ? ', ' : '') . self::link2a_href($link,$help);
+					foreach ($value as $link)
+					{
+						$str .= ($str !== '' ? ', ' : '') . self::link2a_href($link,$help);
+					}
 				}
-			}
-			$cell['type'] = 'html';
-			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
-			$extension_data = null;
-			$value = $str;
-			return True;
+				$cell['type'] = 'html';
+				$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+				$extension_data = null;
+				$value = $str;
+				return True;
 
-		case 'link-add':
-			$apps = egw_link::app_list($type == 'link-add' ? 'add_app' : 'query');
-			if (!$apps || !$value['to_id'] || is_array($value['to_id']))	// cant do an add without apps or already created entry
-			{
-				$cell = $tmpl->empty_cell();
-				return;
-			}
-			asort($apps);	// sort them alphabetic
-			$value['options-add_app'] = array();
-			foreach($apps as $app => $label)
-			{
-				$link = $GLOBALS['egw']->link('/index.php',egw_link::add($app,$value['to_app'],$value['to_id'])+
-					(is_array($value['extra']) ? $value['extra'] : array()));
-				if (($popup = egw_link::is_popup($app,'add')))
+			case 'link-add':
+				$apps = egw_link::app_list($type == 'link-add' ? 'add_app' : 'query');
+				if (!$apps || !$value['to_id'] || is_array($value['to_id']))	// cant do an add without apps or already created entry
 				{
-					list($w,$h) = explode('x',$popup);
-					$action = "window.open('$link','_blank','width=$w,height=$h,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');";
+					$cell = $tmpl->empty_cell();
+					return;
 				}
-				else
+				asort($apps);	// sort them alphabetic
+				$value['options-add_app'] = array();
+				foreach($apps as $app => $label)
 				{
-					$action = "location.href = '$link';";
+					$link = $GLOBALS['egw']->link('/index.php',egw_link::add($app,$value['to_app'],$value['to_id'])+
+						(is_array($value['extra']) ? $value['extra'] : array()));
+					if (($popup = egw_link::is_popup($app,'add')))
+					{
+						list($w,$h) = explode('x',$popup);
+						$action = "window.open('$link','_blank','width=$w,height=$h,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');";
+					}
+					else
+					{
+						$action = "location.href = '$link';";
+					}
+					$value['options-add_app'][$action] = $label;
+					// modify add_app default to the action used as value
+					if (isset($value['add_app']) && $app == $value['add_app']) $value['add_app'] = $action;
 				}
-				$value['options-add_app'][$action] = $label;
-				// modify add_app default to the action used as value
-				if (isset($value['add_app']) && $app == $value['add_app']) $value['add_app'] = $action;
-			}
-			$tpl = new etemplate('etemplate.link_widget.add');
-			break;
+				$tpl = new etemplate('etemplate.link_widget.add');
+				break;
 
-		case 'link-to':
-			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
-			if ($value['search_label'] && $extension_data['search_label'] != $value['search_label']) $value['search_label'] = lang($value['search_label']);
-			$extension_data = $value;
-			$tpl = new etemplate('etemplate.link_widget.to');
-			if ($value['link_label']) $tpl->set_cell_attribute('create','label',$value['link_label']);
-			if ($value['search_label']) $tpl->set_cell_attribute('search','label',$value['search_label']);
+			case 'link-to':
+				$GLOBALS['egw_info']['flags']['include_xajax'] = true;
+				if ($value['search_label'] && $extension_data['search_label'] != $value['search_label']) $value['search_label'] = lang($value['search_label']);
+				$extension_data = $value;
+				$tpl = new etemplate('etemplate.link_widget.to');
+				if ($value['link_label']) $tpl->set_cell_attribute('create','label',$value['link_label']);
+				if ($value['search_label']) $tpl->set_cell_attribute('search','label',$value['search_label']);
 
-			self::get_sub_types($cell, $value, $tpl);
+				self::get_sub_types($cell, $value, $tpl);
 
-			break;
+				break;
 
-		case 'link-list':
-			$app = $value['to_app'];
-			$id  = isset($extension_data['to_id']) ? $extension_data['to_id'] : $value['to_id'];
-			if ($this->debug)
-			{
-				echo "<p>link-list-widget[$name].preprocess: value="; _debug_array($value);
-			}
-			if (!isset($value['title']))
-			{
-				$value['title'] = egw_link::title($app,$id);
-			}
-			$links = egw_link::get_links($app, $id, '', 'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
-			$value['anz_links'] = count($links);
-			$extension_data = $value;
+			case 'link-list':
+				$app = $value['to_app'];
+				$id  = isset($extension_data['to_id']) ? $extension_data['to_id'] : $value['to_id'];
+				if ($this->debug)
+				{
+					echo "<p>link-list-widget[$name].preprocess: value="; _debug_array($value);
+				}
+				if (!isset($value['title']))
+				{
+					$value['title'] = egw_link::title($app,$id);
+				}
+				$links = egw_link::get_links($app, $id, '', 'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
+				$value['anz_links'] = count($links);
+				$extension_data = $value;
 
-			if (!count($links))
-			{
-				$cell = $tmpl->empty_cell();
-				$value = '';
-				return True;
-			}
-			$value['link_list_format'] = $GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'];
-			$tpl = new etemplate('etemplate.link_widget.list');
-			for($row=$tpl->rows-1; list(,$link) = each($links); ++$row)
-			{
-				$value[$row] = $link;
-				$value[$row]['title'] = egw_link::title($link['app'],($link['app'] == egw_link::VFS_APPNAME&&!is_array($link['id'])?egw_vfs::decodePath($link['id']):$link['id']),$link);
-				if (!is_array($link['id']))
+				if (!count($links))
 				{
-					$value[$row]['view']  = egw_link::view($link['app'],$link['id'],$link);
-					if (!($value[$row]['popup'] = egw_link::is_popup($link['app'],'view',$link)) &&
-						etemplate::$request->output_mode == 2)	// we are in a popup
-					{
-						$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
-					}
+					$cell = $tmpl->empty_cell();
+					$value = '';
+					return True;
 				}
-				if ($link['app'] == egw_link::VFS_APPNAME)
+				$value['link_list_format'] = $GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'];
+				$tpl = new etemplate('etemplate.link_widget.list');
+				for($row=$tpl->rows-1; list(,$link) = each($links); ++$row)
 				{
-					$value[$row]['target'] = '_blank';
-					$value[$row]['label'] = 'Delete';
-					$value[$row]['help'] = lang('Delete this file');
-					if ($value['link_list_format'] != 'text')
+					$value[$row] = $link;
+					$value[$row]['title'] = egw_link::title($link['app'],($link['app'] == egw_link::VFS_APPNAME&&!is_array($link['id'])?egw_vfs::decodePath($link['id']):$link['id']),$link);
+					if (!is_array($link['id']))
 					{
-						$value[$row]['title'] = preg_replace('/: ([^ ]+) /',': ',$value[$row]['title']);	// remove mime-type, it's alread in the icon
+						$value[$row]['view']  = egw_link::view($link['app'],$link['id'],$link);
+						if (!($value[$row]['popup'] = egw_link::is_popup($link['app'],'view',$link)) &&
+							etemplate::$request->output_mode == 2)	// we are in a popup
+						{
+							$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
+						}
 					}
-					$value[$row]['icon'] = egw_link::vfs_path($link['app2'],$link['id2'],$link['id'],true);
-				}
-				else
-				{
-					$value[$row]['icon'] = egw_link::get_registry($value[$row]['app'], 'icon');
-					$value[$row]['label'] = 'Unlink';
-					$value[$row]['help'] = lang('Remove this link (not the entry itself)');
-					if(!egw_link::is_popup($link['app'],'view') && etemplate::$request->output_mode == 2)
+					if ($link['app'] == egw_link::VFS_APPNAME)
 					{
-						// If link doesn't want a popup, make sure to open it in appropriate tab of main window
-						$value[$row]['view'] = "javascript:if(typeof opener.top.framework != 'undefined') {
+						$value[$row]['target'] = '_blank';
+						$value[$row]['label'] = 'Delete';
+						$value[$row]['help'] = lang('Delete this file');
+						if ($value['link_list_format'] != 'text')
+						{
+							$value[$row]['title'] = preg_replace('/: ([^ ]+) /',': ',$value[$row]['title']);	// remove mime-type, it's alread in the icon
+						}
+						$value[$row]['icon'] = egw_link::vfs_path($link['app2'],$link['id2'],$link['id'],true);
+					}
+					else
+					{
+						$value[$row]['icon'] = egw_link::get_registry($value[$row]['app'], 'icon');
+						$value[$row]['label'] = 'Unlink';
+						$value[$row]['help'] = lang('Remove this link (not the entry itself)');
+						if(!egw_link::is_popup($link['app'],'view') && etemplate::$request->output_mode == 2)
+						{
+							// If link doesn't want a popup, make sure to open it in appropriate tab of main window
+							$value[$row]['view'] = "javascript:if(typeof opener.top.framework != 'undefined') {
 							opener.top.egw_appWindowOpen('{$link['app']}','".egw::link('/index.php',$value[$row]['view'])."');
 						} else {
 							opener.open('".egw::link('/index.php',$value[$row]['view'])."','".$value[$row]['target']."');
 						}";
+						}
 					}
 				}
-			}
-			break;
+				break;
 
-		case 'link-entry':
-			if ($cell['readonly'] || $readonlys)
-			{
-				if(!is_array($value))
-				{
-					if (strpos($value,':') !== false) list($app,$value) = explode(':',$value,2);
-					$value = array('app' => $app ? $app : $cell['size'],'id' => $value);
-				}
-				$value = self::link2a_href($value,$help);
-				$cell['type'] = 'html';
-				$cell['readonly'] = true;
-				$extension_data = null;
-				return true;
-			}
-			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
-			$tpl = new etemplate('etemplate.link_widget.entry');
-			$options = $cell['size'] ? explode(',',$cell['size']) : array();
-			$app = $extension_data['app'] = $options[0];
-			$link_type = $extension_data['link_type'];
-			// handle extra args for onclick like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
-			if ( isset($value) && is_array($value) && isset($value['extra']) )
-			{
-				//echo '<p>extra='.htmlspecialchars($value['extra'])."</p>\n";
-				//something like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
-				$on_click_string =& $tpl->get_cell_attribute('search','onclick');
-				$on_click_string = str_replace(');',','.$value['extra'].');',$on_click_string);
-				//echo htmlspecialchars($on_click_string);
-			}
-			if ($value)	// show pre-selected entry in select-box and not the search
-			{
-				if (is_array($value))
+			case 'link-entry':
+				if ($cell['readonly'] || $readonlys)
 				{
-					if (isset($value['current']))
+					if(!is_array($value))
 					{
-						list($app,$id) = explode(':',$value['current'], 2);
-						if ($app) unset($value['default_sel']);	// would overwrite $app!
+						if (strpos($value,':') !== false) list($app,$value) = explode(':',$value,2);
+						$value = array('app' => $app ? $app : $cell['size'],'id' => $value);
 					}
+					$value = self::link2a_href($value,$help);
+					$cell['type'] = 'html';
+					$cell['readonly'] = true;
+					$extension_data = null;
+					return true;
 				}
-				else
+				$GLOBALS['egw_info']['flags']['include_xajax'] = true;
+				$tpl = new etemplate('etemplate.link_widget.entry');
+				$options = $cell['size'] ? explode(',',$cell['size']) : array();
+				$app = $extension_data['app'] = $options[0];
+				$link_type = $extension_data['link_type'];
+				// handle extra args for onclick like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
+				if ( isset($value) && is_array($value) && isset($value['extra']) )
+				{
+					//echo '<p>extra='.htmlspecialchars($value['extra'])."</p>\n";
+					//something like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
+					$on_click_string =& $tpl->get_cell_attribute('search','onclick');
+					$on_click_string = str_replace(');',','.$value['extra'].');',$on_click_string);
+					//echo htmlspecialchars($on_click_string);
+				}
+				if ($value)	// show pre-selected entry in select-box and not the search
 				{
-					// add selected-entry plus "new search" to the selectbox-options
-					if (!isset($app) || strpos($value,':') !== false)
+					if (is_array($value))
 					{
-						list($app,$id) = explode(':',$value, 2);
+						if (isset($value['current']))
+						{
+							list($app,$id) = explode(':',$value['current'], 2);
+							if ($app) unset($value['default_sel']);	// would overwrite $app!
+						}
 					}
 					else
 					{
-						$id = $value;
+						// add selected-entry plus "new search" to the selectbox-options
+						if (!isset($app) || strpos($value,':') !== false)
+						{
+							list($app,$id) = explode(':',$value, 2);
+						}
+						else
+						{
+							$id = $value;
+						}
 					}
-				}
-				$titles = array();
-				foreach(explode(',',$id) as $id)
-				{
-					if ($id)
+					$titles = array();
+					foreach(explode(',',$id) as $id)
 					{
-						if (!($title = egw_link::title($app,$id)))
+						if ($id)
 						{
-							$title = $app.': #'.$id;
+							if (!($title = egw_link::title($app,$id)))
+							{
+								$title = $app.': #'.$id;
+							}
+							$titles[$id] = $title;
 						}
-						$titles[$id] = $title;
+					}
+					if ($titles)
+					{
+						if ($cell['onchange']) $titles[0] = lang('Show all / cancel filter');
+						$titles[''] = lang('new search').' ...';
+						$selectbox =& $tpl->get_widget_by_name('id');
+						$selectbox['sel_options'] = $titles;
+						// remove link_hide class from select-box-line
+						$span =& $tpl->get_cell_attribute('select_line','span');
+						$span = str_replace('link_hide','',$span);
+						// add link_hide class to search_line
+						$span =& $tpl->get_cell_attribute('search_line','span');
+						$span .= ' link_hide';
+						unset($span);
 					}
 				}
-				if ($titles)
+				if ($extension_data['app'] && count($options) <= 1)	// no app-selection, using app given in first option
 				{
-					if ($cell['onchange']) $titles[0] = lang('Show all / cancel filter');
-					$titles[''] = lang('new search').' ...';
-					$selectbox =& $tpl->get_widget_by_name('id');
-					$selectbox['sel_options'] = $titles;
-					// remove link_hide class from select-box-line
-					$span =& $tpl->get_cell_attribute('select_line','span');
-					$span = str_replace('link_hide','',$span);
-					// add link_hide class to search_line
-					$span =& $tpl->get_cell_attribute('search_line','span');
-					$span .= ' link_hide';
-					unset($span);
+					$tpl->disable_cells('app');
+					$onchange =& $tpl->get_cell_attribute('search','onclick');
+					$onchange = str_replace("document.getElementById(form::name('app')).value",'\''.$cell['size'].'\'',$onchange);
+					unset($onchange);
 				}
-			}
-			if ($extension_data['app'] && count($options) <= 1)	// no app-selection, using app given in first option
-			{
-				$tpl->disable_cells('app');
-				$onchange =& $tpl->get_cell_attribute('search','onclick');
-				$onchange = str_replace("document.getElementById(form::name('app')).value",'\''.$cell['size'].'\'',$onchange);
-				unset($onchange);
-			}
 
-			// store now our values in extension_data to preserve them upon submits (after empty title submit for example)
-			$extension_data['default'] = $value;
+				// store now our values in extension_data to preserve them upon submits (after empty title submit for example)
+				$extension_data['default'] = $value;
 
-			// adding possibility to get a default selection on app select, use for resource in calendar edit.participant
-			$value = array(
-				'app'        => is_array($value) && isset($value['default_sel']) ? $value['default_sel'] : $app,
-				'no_app_sel' => !!$extension_data['app'],
-				'id'         => is_array($value) ? $value['current'] : $id,
-				'query'      => is_array($value) ? $value['query'] : '',
-				'blur'       => $cell['blur'] ? lang($cell['blur']) :
-					(count($options) == 1 ? lang($app) : lang('Search')),
-				'extra'      => $cell['onchange'] ? ','.self::AJAX_NEED_ONCHANGE : null,	// store flang for ajax_search, to display extra_line required by onchange
-			);
-			if ($cell['needed']) $value['class'] = 'inputRequired';
+				// adding possibility to get a default selection on app select, use for resource in calendar edit.participant
+				$value = array(
+					'app'        => is_array($value) && isset($value['default_sel']) ? $value['default_sel'] : $app,
+					'no_app_sel' => !!$extension_data['app'],
+					'id'         => is_array($value) ? $value['current'] : $id,
+					'query'      => is_array($value) ? $value['query'] : '',
+					'blur'       => $cell['blur'] ? lang($cell['blur']) :
+						(count($options) == 1 ? lang($app) : lang('Search')),
+					'extra'      => $cell['onchange'] ? ','.self::AJAX_NEED_ONCHANGE : null,	// store flang for ajax_search, to display extra_line required by onchange
+				);
+				if ($cell['needed']) $value['class'] = 'inputRequired';
 
-			if ($options)	// limit the app-selectbox to the given apps
-			{
-				$tpl->set_cell_attribute('app','type','select');
-				$tpl->set_cell_attribute('app','no_lang',true);
-				$apps = egw_link::app_list('query');
-				asort($apps);	// sort them alphabetic
-				foreach($apps as $app => $label)
+				if ($options)	// limit the app-selectbox to the given apps
 				{
-					if (!in_array($app,$options)) unset($apps[$app]);
+					$tpl->set_cell_attribute('app','type','select');
+					$tpl->set_cell_attribute('app','no_lang',true);
+					$apps = egw_link::app_list('query');
+					asort($apps);	// sort them alphabetic
+					foreach($apps as $app => $label)
+					{
+						if (!in_array($app,$options)) unset($apps[$app]);
+					}
+					$value['options-app'] = $apps;
 				}
-				$value['options-app'] = $apps;
-			}
 
-			self::get_sub_types($cell, $value, $tpl);
+				self::get_sub_types($cell, $value, $tpl);
 
-			break;
+				break;
 
-		case 'link-apps':
-			$apps = egw_link::app_list($cell['size'] ? $cell['size'] : 'query');
-			if (!$apps)	// cant do an add without apps or already created entry
-			{
-				$cell = $tmpl->empty_cell();
-				return;
-			}
-			asort($apps);	// sort them alphabetic
-			$cell['sel_options'] = $apps;
-			$cell['no_lang'] = True;	// already translated
-			$cell['type'] = 'select';
-			return true;
+			case 'link-apps':
+				$apps = egw_link::app_list($cell['size'] ? $cell['size'] : 'query');
+				if (!$apps)	// cant do an add without apps or already created entry
+				{
+					$cell = $tmpl->empty_cell();
+					return;
+				}
+				asort($apps);	// sort them alphabetic
+				$cell['sel_options'] = $apps;
+				$cell['no_lang'] = True;	// already translated
+				$cell['type'] = 'select';
+				return true;
 		}
 		$cell['size'] = $cell['name'];
 		$cell['type'] = 'template';

Spacing +126 added lines, -127 removed lines

@@ -99,7 +99,7 @@ 
 	 *
 	 * @param string $ui '' for html
 	 */
-	function link_widget($ui='')
+	function link_widget($ui = '')
 	{
 
 	}
@@ -117,13 +117,13 @@ 
 	 * @param object &$tmpl reference to the template we belong too
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
-	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	function pre_process($name, &$value, &$cell, &$readonlys, &$extension_data, &$tmpl)
 	{
 		$extension_data['type'] = $type = $cell['type'];
 		$extension_data['needed'] = $cell['needed'];
 		$help = $cell['help'] ? (is_array($value) && !empty($value['help']) ? $value['help'] : $cell['help']) : lang('view this linked entry in its application');
 
-		if ((in_array($type,array('link-to','link-add','link-entry')) && !$value) && ($cell['readonly'] || $readonlys))
+		if ((in_array($type, array('link-to', 'link-add', 'link-entry')) && !$value) && ($cell['readonly'] || $readonlys))
 		{
 			//echo "<p>link-to is readonly, cell=".print_r($cell,true).", readonlys=".print_r($readonlys).", value='$value'</p>\n";
 			// readonly ==> omit the whole widget
@@ -132,7 +132,7 @@ 
 			$extension_data = null;
 			return;
 		}
-		if (!is_array($value) && in_array($type,array('link-to','link-list','link-add')))
+		if (!is_array($value) && in_array($type, array('link-to', 'link-list', 'link-add')))
 		{
 			$value = array(
 				'to_id' => $value,
@@ -141,14 +141,14 @@ 
 		}
 		if ($this->debug)
 		{
-			echo "<p>link_widget::pre_process($name,$value,".print_r($cell,true).",$readonlys,,)</p>\n";
+			echo "<p>link_widget::pre_process($name,$value,".print_r($cell, true).",$readonlys,,)</p>\n";
 			echo "<p>start: $cell[type][$name]::pre_process: value ="; _debug_array($value);
 			echo "extension_data[$cell[type]][$name] ="; _debug_array($extension_data);
 		}
 		switch ($cell['type'])
 		{
 		case 'link':
-			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+			$cell['readonly'] = True; // set it readonly to NOT call our post_process function
 			$extension_data = null;
 			$cell['no_lang'] = 1;
 			$link = $target = $popup = '';
@@ -162,20 +162,20 @@ 
 			}
 			if ($value['app'] && $value['id'])
 			{
-				$view = egw_link::view($value['app'],$value['id']);
+				$view = egw_link::view($value['app'], $value['id']);
 				$link = $view['menuaction']; unset($view['menuaction']);
-				foreach($view as $var => $val)
+				foreach ($view as $var => $val)
 				{
 					$link .= '&'.$var.'='.$val;
 				}
 				if (isset($value['extra_args']))
 				{
-					foreach($value['extra_args'] as $var => $val)
+					foreach ($value['extra_args'] as $var => $val)
 					{
 						$link .= '&'.$var.'='.$val;
 					}
 				}
-				if (!($popup = egw_link::is_popup($value['app'],'view')) &&
+				if (!($popup = egw_link::is_popup($value['app'], 'view')) &&
 					etemplate::$request->output_mode == 2)	// we are in a popup
 				{
 					$target = '_blank';
@@ -189,17 +189,17 @@ 
 			elseif (!$value['title'])
 			{
 				$cell = $tmpl->empty_cell();
-				$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+				$cell['readonly'] = True; // set it readonly to NOT call our post_process function
 				$extension_data = null;
 				return;
 			}
 			$cell['type'] = 'label';
 			//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
-			list($cell['size']) = explode(',',$cell['size']);
+			list($cell['size']) = explode(',', $cell['size']);
 			// Pass link through framework's handler
-			if(!$popup) $link = str_replace(',','%2C',egw::link('/index.php?menuaction='.$link,false,$value['app']));
+			if (!$popup) $link = str_replace(',', '%2C', egw::link('/index.php?menuaction='.$link, false, $value['app']));
 			$cell['size'] .= ','.$link.',,,'.$target.','.$popup.','.$value['extra_title'];
-			$value = $value['title'] ? $value['title'] : egw_link::title($value['app'],$value['id']);
+			$value = $value['title'] ? $value['title'] : egw_link::title($value['app'], $value['id']);
 			return true;
 
 		case 'link-string':
@@ -207,7 +207,7 @@ 
 			if ($value && !is_array($value) && $cell['size'])
 			{
 				$value = array('to_id' => $value);
-				list($value['to_app'],$value['only_app']) = explode(',',$cell['size']);
+				list($value['to_app'], $value['only_app']) = explode(',', $cell['size']);
 			}
 			if ($value['to_id'] && $value['to_app'])
 			{
@@ -215,7 +215,7 @@ 
 					'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
 				if ($only_app)
 				{
-					foreach($value as $key => $id)
+					foreach ($value as $key => $id)
 					{
 						$value[$key] = array(
 							'id'  => $id,
@@ -228,11 +228,11 @@ 
 			{
 				foreach ($value as $link)
 				{
-					$str .= ($str !== '' ? ', ' : '') . self::link2a_href($link,$help);
+					$str .= ($str !== '' ? ', ' : '').self::link2a_href($link, $help);
 				}
 			}
 			$cell['type'] = 'html';
-			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+			$cell['readonly'] = True; // set it readonly to NOT call our post_process function
 			$extension_data = null;
 			$value = $str;
 			return True;
@@ -244,15 +244,15 @@ 
 				$cell = $tmpl->empty_cell();
 				return;
 			}
-			asort($apps);	// sort them alphabetic
+			asort($apps); // sort them alphabetic
 			$value['options-add_app'] = array();
-			foreach($apps as $app => $label)
+			foreach ($apps as $app => $label)
 			{
-				$link = $GLOBALS['egw']->link('/index.php',egw_link::add($app,$value['to_app'],$value['to_id'])+
+				$link = $GLOBALS['egw']->link('/index.php', egw_link::add($app, $value['to_app'], $value['to_id']) +
 					(is_array($value['extra']) ? $value['extra'] : array()));
-				if (($popup = egw_link::is_popup($app,'add')))
+				if (($popup = egw_link::is_popup($app, 'add')))
 				{
-					list($w,$h) = explode('x',$popup);
+					list($w, $h) = explode('x', $popup);
 					$action = "window.open('$link','_blank','width=$w,height=$h,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');";
 				}
 				else
@@ -271,8 +271,8 @@ 
 			if ($value['search_label'] && $extension_data['search_label'] != $value['search_label']) $value['search_label'] = lang($value['search_label']);
 			$extension_data = $value;
 			$tpl = new etemplate('etemplate.link_widget.to');
-			if ($value['link_label']) $tpl->set_cell_attribute('create','label',$value['link_label']);
-			if ($value['search_label']) $tpl->set_cell_attribute('search','label',$value['search_label']);
+			if ($value['link_label']) $tpl->set_cell_attribute('create', 'label', $value['link_label']);
+			if ($value['search_label']) $tpl->set_cell_attribute('search', 'label', $value['search_label']);
 
 			self::get_sub_types($cell, $value, $tpl);
 
@@ -287,7 +287,7 @@ 
 			}
 			if (!isset($value['title']))
 			{
-				$value['title'] = egw_link::title($app,$id);
+				$value['title'] = egw_link::title($app, $id);
 			}
 			$links = egw_link::get_links($app, $id, '', 'link_lastmod DESC', true, $value['show_deleted'], self::LIMIT_LINKS);
 			$value['anz_links'] = count($links);
@@ -301,17 +301,17 @@ 
 			}
 			$value['link_list_format'] = $GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'];
 			$tpl = new etemplate('etemplate.link_widget.list');
-			for($row=$tpl->rows-1; list(,$link) = each($links); ++$row)
+			for ($row = $tpl->rows - 1; list(,$link) = each($links); ++$row)
 			{
 				$value[$row] = $link;
-				$value[$row]['title'] = egw_link::title($link['app'],($link['app'] == egw_link::VFS_APPNAME&&!is_array($link['id'])?egw_vfs::decodePath($link['id']):$link['id']),$link);
+				$value[$row]['title'] = egw_link::title($link['app'], ($link['app'] == egw_link::VFS_APPNAME && !is_array($link['id']) ? egw_vfs::decodePath($link['id']) : $link['id']), $link);
 				if (!is_array($link['id']))
 				{
-					$value[$row]['view']  = egw_link::view($link['app'],$link['id'],$link);
-					if (!($value[$row]['popup'] = egw_link::is_popup($link['app'],'view',$link)) &&
+					$value[$row]['view'] = egw_link::view($link['app'], $link['id'], $link);
+					if (!($value[$row]['popup'] = egw_link::is_popup($link['app'], 'view', $link)) &&
 						etemplate::$request->output_mode == 2)	// we are in a popup
 					{
-						$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
+						$value[$row]['target'] = '_blank'; // we create a new window as the linked page is no popup
 					}
 				}
 				if ($link['app'] == egw_link::VFS_APPNAME)
@@ -321,22 +321,22 @@ 
 					$value[$row]['help'] = lang('Delete this file');
 					if ($value['link_list_format'] != 'text')
 					{
-						$value[$row]['title'] = preg_replace('/: ([^ ]+) /',': ',$value[$row]['title']);	// remove mime-type, it's alread in the icon
+						$value[$row]['title'] = preg_replace('/: ([^ ]+) /', ': ', $value[$row]['title']); // remove mime-type, it's alread in the icon
 					}
-					$value[$row]['icon'] = egw_link::vfs_path($link['app2'],$link['id2'],$link['id'],true);
+					$value[$row]['icon'] = egw_link::vfs_path($link['app2'], $link['id2'], $link['id'], true);
 				}
 				else
 				{
 					$value[$row]['icon'] = egw_link::get_registry($value[$row]['app'], 'icon');
 					$value[$row]['label'] = 'Unlink';
 					$value[$row]['help'] = lang('Remove this link (not the entry itself)');
-					if(!egw_link::is_popup($link['app'],'view') && etemplate::$request->output_mode == 2)
+					if (!egw_link::is_popup($link['app'], 'view') && etemplate::$request->output_mode == 2)
 					{
 						// If link doesn't want a popup, make sure to open it in appropriate tab of main window
 						$value[$row]['view'] = "javascript:if(typeof opener.top.framework != 'undefined') {
-							opener.top.egw_appWindowOpen('{$link['app']}','".egw::link('/index.php',$value[$row]['view'])."');
+							opener.top.egw_appWindowOpen('{$link['app']}','".egw::link('/index.php', $value[$row]['view'])."');
 						} else {
-							opener.open('".egw::link('/index.php',$value[$row]['view'])."','".$value[$row]['target']."');
+							opener.open('".egw::link('/index.php', $value[$row]['view'])."','".$value[$row]['target']."');
 						}";
 					}
 				}
@@ -346,12 +346,12 @@ 
 		case 'link-entry':
 			if ($cell['readonly'] || $readonlys)
 			{
-				if(!is_array($value))
+				if (!is_array($value))
 				{
-					if (strpos($value,':') !== false) list($app,$value) = explode(':',$value,2);
-					$value = array('app' => $app ? $app : $cell['size'],'id' => $value);
+					if (strpos($value, ':') !== false) list($app, $value) = explode(':', $value, 2);
+					$value = array('app' => $app ? $app : $cell['size'], 'id' => $value);
 				}
-				$value = self::link2a_href($value,$help);
+				$value = self::link2a_href($value, $help);
 				$cell['type'] = 'html';
 				$cell['readonly'] = true;
 				$extension_data = null;
@@ -359,16 +359,16 @@ 
 			}
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 			$tpl = new etemplate('etemplate.link_widget.entry');
-			$options = $cell['size'] ? explode(',',$cell['size']) : array();
+			$options = $cell['size'] ? explode(',', $cell['size']) : array();
 			$app = $extension_data['app'] = $options[0];
 			$link_type = $extension_data['link_type'];
 			// handle extra args for onclick like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
-			if ( isset($value) && is_array($value) && isset($value['extra']) )
+			if (isset($value) && is_array($value) && isset($value['extra']))
 			{
 				//echo '<p>extra='.htmlspecialchars($value['extra'])."</p>\n";
 				//something like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
-				$on_click_string =& $tpl->get_cell_attribute('search','onclick');
-				$on_click_string = str_replace(');',','.$value['extra'].');',$on_click_string);
+				$on_click_string = & $tpl->get_cell_attribute('search', 'onclick');
+				$on_click_string = str_replace(');', ','.$value['extra'].');', $on_click_string);
 				//echo htmlspecialchars($on_click_string);
 			}
 			if ($value)	// show pre-selected entry in select-box and not the search
@@ -377,16 +377,16 @@ 
 				{
 					if (isset($value['current']))
 					{
-						list($app,$id) = explode(':',$value['current'], 2);
-						if ($app) unset($value['default_sel']);	// would overwrite $app!
+						list($app, $id) = explode(':', $value['current'], 2);
+						if ($app) unset($value['default_sel']); // would overwrite $app!
 					}
 				}
 				else
 				{
 					// add selected-entry plus "new search" to the selectbox-options
-					if (!isset($app) || strpos($value,':') !== false)
+					if (!isset($app) || strpos($value, ':') !== false)
 					{
-						list($app,$id) = explode(':',$value, 2);
+						list($app, $id) = explode(':', $value, 2);
 					}
 					else
 					{
@@ -394,11 +394,11 @@ 
 					}
 				}
 				$titles = array();
-				foreach(explode(',',$id) as $id)
+				foreach (explode(',', $id) as $id)
 				{
 					if ($id)
 					{
-						if (!($title = egw_link::title($app,$id)))
+						if (!($title = egw_link::title($app, $id)))
 						{
 							$title = $app.': #'.$id;
 						}
@@ -409,13 +409,13 @@ 
 				{
 					if ($cell['onchange']) $titles[0] = lang('Show all / cancel filter');
 					$titles[''] = lang('new search').' ...';
-					$selectbox =& $tpl->get_widget_by_name('id');
+					$selectbox = & $tpl->get_widget_by_name('id');
 					$selectbox['sel_options'] = $titles;
 					// remove link_hide class from select-box-line
-					$span =& $tpl->get_cell_attribute('select_line','span');
-					$span = str_replace('link_hide','',$span);
+					$span = & $tpl->get_cell_attribute('select_line', 'span');
+					$span = str_replace('link_hide', '', $span);
 					// add link_hide class to search_line
-					$span =& $tpl->get_cell_attribute('search_line','span');
+					$span = & $tpl->get_cell_attribute('search_line', 'span');
 					$span .= ' link_hide';
 					unset($span);
 				}
@@ -423,8 +423,8 @@ 
 			if ($extension_data['app'] && count($options) <= 1)	// no app-selection, using app given in first option
 			{
 				$tpl->disable_cells('app');
-				$onchange =& $tpl->get_cell_attribute('search','onclick');
-				$onchange = str_replace("document.getElementById(form::name('app')).value",'\''.$cell['size'].'\'',$onchange);
+				$onchange = & $tpl->get_cell_attribute('search', 'onclick');
+				$onchange = str_replace("document.getElementById(form::name('app')).value", '\''.$cell['size'].'\'', $onchange);
 				unset($onchange);
 			}
 
@@ -437,21 +437,20 @@ 
 				'no_app_sel' => !!$extension_data['app'],
 				'id'         => is_array($value) ? $value['current'] : $id,
 				'query'      => is_array($value) ? $value['query'] : '',
-				'blur'       => $cell['blur'] ? lang($cell['blur']) :
-					(count($options) == 1 ? lang($app) : lang('Search')),
-				'extra'      => $cell['onchange'] ? ','.self::AJAX_NEED_ONCHANGE : null,	// store flang for ajax_search, to display extra_line required by onchange
+				'blur'       => $cell['blur'] ? lang($cell['blur']) : (count($options) == 1 ? lang($app) : lang('Search')),
+				'extra'      => $cell['onchange'] ? ','.self::AJAX_NEED_ONCHANGE : null, // store flang for ajax_search, to display extra_line required by onchange
 			);
 			if ($cell['needed']) $value['class'] = 'inputRequired';
 
 			if ($options)	// limit the app-selectbox to the given apps
 			{
-				$tpl->set_cell_attribute('app','type','select');
-				$tpl->set_cell_attribute('app','no_lang',true);
+				$tpl->set_cell_attribute('app', 'type', 'select');
+				$tpl->set_cell_attribute('app', 'no_lang', true);
 				$apps = egw_link::app_list('query');
-				asort($apps);	// sort them alphabetic
-				foreach($apps as $app => $label)
+				asort($apps); // sort them alphabetic
+				foreach ($apps as $app => $label)
 				{
-					if (!in_array($app,$options)) unset($apps[$app]);
+					if (!in_array($app, $options)) unset($apps[$app]);
 				}
 				$value['options-app'] = $apps;
 			}
@@ -467,16 +466,16 @@ 
 				$cell = $tmpl->empty_cell();
 				return;
 			}
-			asort($apps);	// sort them alphabetic
+			asort($apps); // sort them alphabetic
 			$cell['sel_options'] = $apps;
-			$cell['no_lang'] = True;	// already translated
+			$cell['no_lang'] = True; // already translated
 			$cell['type'] = 'select';
 			return true;
 		}
 		$cell['size'] = $cell['name'];
 		$cell['type'] = 'template';
 		$cell['name'] = $tpl->name;
-		$cell['obj'] =& $tpl;
+		$cell['obj'] = & $tpl;
 		// keep the editor away from the generated tmpls
 		$tpl->no_onclick = true;
 
@@ -484,7 +483,7 @@ 
 		{
 			echo "<p>end: $type"."[$name]::pre_process: value ="; _debug_array($value);
 		}
-		return True;	// extra Label is ok
+		return True; // extra Label is ok
 	}
 
 	/**
@@ -494,23 +493,23 @@ 
 	 * @param string $help=''
 	 * @return string
 	 */
-	static function link2a_href(array $link,$help='')
+	static function link2a_href(array $link, $help = '')
 	{
 		if (($popup = egw_link::is_popup($link['app'], 'view', $link)))
 		{
-			list($w,$h) = explode('x',$popup);
+			list($w, $h) = explode('x', $popup);
 			$options = ' onclick="window.open(this,this.target,\'width='.(int)$w.',height='.(int)$h.',location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;"';
 		}
-		elseif (etemplate::$request->output_mode == 2 || 	// we are in a popup
-			$link['app'] == egw_link::VFS_APPNAME ||		// or it's a link to an attachment
-			($target = egw_link::get_registry($link['app'],'view_target')))	// or explicit target set
+		elseif (etemplate::$request->output_mode == 2 || // we are in a popup
+			$link['app'] == egw_link::VFS_APPNAME || // or it's a link to an attachment
+			($target = egw_link::get_registry($link['app'], 'view_target')))	// or explicit target set
 		{
 			$options = ' target="'.($target ? $target : '_blank').'"';
 		}
 		else
 		{
 			// Pass link through framework's handler
-			$href = str_replace(',','%2C',egw::link('/index.php',egw_link::view($link['app'],$link['id'],$link),$link['app']));
+			$href = str_replace(',', '%2C', egw::link('/index.php', egw_link::view($link['app'], $link['id'], $link), $link['app']));
 		}
 		if ($help)
 		{
@@ -518,8 +517,8 @@ 
 			$options .= " onMouseOut=\"self.status=''; return true;\"";
 		}
 		return html::a_href(
-			html::htmlspecialchars(egw_link::title($link['app'],($link['app']==egw_link::VFS_APPNAME?egw_vfs::decodePath($link['id']):$link['id']))),
-			$href ? $href : egw_link::view($link['app'],$link['id'],$link),'',$options);
+			html::htmlspecialchars(egw_link::title($link['app'], ($link['app'] == egw_link::VFS_APPNAME ? egw_vfs::decodePath($link['id']) : $link['id']))),
+			$href ? $href : egw_link::view($link['app'], $link['id'], $link), '', $options);
 	}
 
 	/**
@@ -539,17 +538,17 @@ 
 	 * @param mixed &value_in the posted values (already striped of magic-quotes)
 	 * @return boolean true if $value has valid content, on false no content will be returned!
 	 */
-	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	function post_process($name, &$value, &$extension_data, &$loop, &$tmpl, $value_in)
 	{
 		//echo "<p>link_widget::post_process('$name',value=".print_r($value,true).",ext=".print_r($extension_data,true).",$loop,,value_in=".print_r($value_in,true)."</p>\n";
 
-		switch($extension_data['type'])
+		switch ($extension_data['type'])
 		{
 			case 'link-entry':
 				//error_log(__METHOD__.__LINE__.array2string(array('data'=>$value,'value in'=>$value_in,'extension_data'=>$extension_data,'source'=>function_backtrace())));
 				if (!$value_in['id'] && $extension_data['needed'])
 				{
-					$tmpl->set_validation_error($name,lang('Field must not be empty !!!'),'');
+					$tmpl->set_validation_error($name, lang('Field must not be empty !!!'), '');
 					return true;
 				}
 				$defaultData = false;
@@ -557,14 +556,14 @@ 
 				if (is_array($extension_data['default']) && !empty($extension_data['default']))
 				{
 					// this may fail, if $extension_data['default'][0] is set on purpose
-					foreach($extension_data['default'] as $k => $v)
+					foreach ($extension_data['default'] as $k => $v)
 					{
 						if ($v)
 						{
-							$defaultData=true;
-							if ($k==0 && !empty($value_in['id'])) // we have a valid incomming id, we intend to use that
+							$defaultData = true;
+							if ($k == 0 && !empty($value_in['id'])) // we have a valid incomming id, we intend to use that
 							{
-								$defaultData=false;
+								$defaultData = false;
 								continue;
 							}
 							break;
@@ -575,10 +574,10 @@ 
 						$value = $extension_data['default'];
 						$value['current'] = $extension_data['app'] ? $value_in['id'] : $value_in['app'].':'.$value_in['id'];
 						// we take care for id, in case it is empty AND needed
-						if(empty($value['id']) && $extension_data['needed']) $value['id'] = $value['current'];
+						if (empty($value['id']) && $extension_data['needed']) $value['id'] = $value['current'];
 					}
 				}
-				if($defaultData === false)
+				if ($defaultData === false)
 				{
 					// this was the line before the default opt, not sure it works well in all case
 					$value = $extension_data['app'] ? $value_in['id'] : $value['app'].':'.$value_in['id'];
@@ -589,13 +588,13 @@ 
 			case 'link-apps':
 				if (!$value_in && $extension_data['needed'])
 				{
-					$tmpl->set_validation_error($name,lang('Field must not be empty !!!'),'');
+					$tmpl->set_validation_error($name, lang('Field must not be empty !!!'), '');
 					return true;
 				}
 				$value = $value_in;
 				return !!$value;
 		}
-		$buttons = array('search','create','new','upload','attach');
+		$buttons = array('search', 'create', 'new', 'upload', 'attach');
 		while (!$button && list(,$bname) = each($buttons))
 		{
 			$button = $value[$bname] ? $bname : '';
@@ -611,7 +610,7 @@ 
 
 		if (is_array($extension_data))
 		{
-			$value = is_array($value) ? array_merge($extension_data,$value) : $extension_data;
+			$value = is_array($value) ? array_merge($extension_data, $value) : $extension_data;
 		}
 		if ($button && $this->debug)
 		{
@@ -622,11 +621,11 @@ 
 			case 'create':
 				if ($value['to_app'])						// make the link
 				{
-					$link_id = egw_link::link($value['to_app'],$value['to_id'],
-						$value['app'],$value['id'],$value['remark']);
+					$link_id = egw_link::link($value['to_app'], $value['to_id'],
+						$value['app'], $value['id'], $value['remark']);
 					$value['remark'] = $value['query'] = '';
 
-					if (isset($value['primary']) && !$value['anz_links'] )
+					if (isset($value['primary']) && !$value['anz_links'])
 					{
 						$value['primary'] = $link_id;
 					}
@@ -639,7 +638,7 @@ 
 				break;
 
 			case 'attach':
-				$name = preg_replace('/^exec\[([^]]+)\](.*)$/','\\1\\2',$name);	// remove exec prefix
+				$name = preg_replace('/^exec\[([^]]+)\](.*)$/', '\\1\\2', $name); // remove exec prefix
 				if (is_array($value['file']) && $value['to_app'] &&
 					!empty($value['file']['tmp_name']) && $value['file']['tmp_name'] != 'none')
 				{
@@ -647,25 +646,25 @@ 
 					{
 						if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 						{
-							$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
+							$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'egw_');
 						}
 						else
 						{
 							$new_file = $value['file']['tmp_name'].'+';
 						}
-						move_uploaded_file($value['file']['tmp_name'],$new_file);
+						move_uploaded_file($value['file']['tmp_name'], $new_file);
 						$value['file']['tmp_name'] = $new_file;
 					}
-					if (!($link_id = egw_link::link($value['to_app'],$value['to_id'],
-						egw_link::VFS_APPNAME,$value['file'],$value['remark'])))
+					if (!($link_id = egw_link::link($value['to_app'], $value['to_id'],
+						egw_link::VFS_APPNAME, $value['file'], $value['remark'])))
 					{
-						etemplate::set_validation_error($name.'[file]',lang('Error copying uploaded file to vfs!'));
+						etemplate::set_validation_error($name.'[file]', lang('Error copying uploaded file to vfs!'));
 					}
 					else
 					{
 						$value['remark'] = '';
 
-						if (isset($value['primary']) && !$value['anz_links'] )
+						if (isset($value['primary']) && !$value['anz_links'])
 						{
 							$value['primary'] = $link_id;
 						}
@@ -675,7 +674,7 @@ 
 				}
 				else
 				{
-					etemplate::set_validation_error($name.'[file]',lang('You need to select a file first!'));
+					etemplate::set_validation_error($name.'[file]', lang('You need to select a file first!'));
 				}
 				$extension_data = $value;
 				$loop = True;
@@ -687,10 +686,10 @@ 
 					//echo "<p>unlink(link-id=$unlink,$value[to_app],$value[to_id])</p>\n";
 					if (is_array($value['to_id'])) _debug_array($value['to_id']);
 				}
-				egw_link::unlink2($unlink,$value['to_app'],$value['to_id']);
+				egw_link::unlink2($unlink, $value['to_app'], $value['to_id']);
 				if (is_array($value['to_id']))
 				{
-					$extension_data['to_id'] = $value['to_id'];	// else changes from unlink get lost
+					$extension_data['to_id'] = $value['to_id']; // else changes from unlink get lost
 				}
 				$loop = True;
 				break;
@@ -709,20 +708,20 @@ 
 	*/
 	private static function get_sub_types($cell, &$value, &$tpl) {
 		// Get sub-types
-		if($value['options-app']) {
+		if ($value['options-app']) {
 			$apps = $value['options-app'];
 		} else {
 			$apps = egw_link::app_list($cell['size'] ? $cell['size'] : 'query');
-			asort($apps);	// sort them alphabetic
+			asort($apps); // sort them alphabetic
 		}
 
 		$current_app = $value['app'] ? $value['app'] : key($apps);
-		if(is_array(egw_link::$app_register[$current_app]['types'])) {
-			foreach(egw_link::$app_register[$current_app]['types'] as $key => $settings) {
+		if (is_array(egw_link::$app_register[$current_app]['types'])) {
+			foreach (egw_link::$app_register[$current_app]['types'] as $key => $settings) {
 				$value['options-link_type'][$key] = $settings['name'];
 			}
-			$span =& $tpl->get_cell_attribute('type_box','span');
-			$span = str_replace('type_hide','type_show',$span);
+			$span = & $tpl->get_cell_attribute('type_box', 'span');
+			$span = str_replace('type_hide', 'type_show', $span);
 			unset($span);
 		}
 	}
@@ -742,15 +741,15 @@ 
 	 * @param string $extra optionnal extra search arguments
 	 * @return string xajax xml response
 	 */
-	static function ajax_search($app,$type,$pattern,$id_res,$id_hide,$id_show,$id_input,$etemplate_exec_id,$extra=array())
+	static function ajax_search($app, $type, $pattern, $id_res, $id_hide, $id_show, $id_input, $etemplate_exec_id, $extra = array())
 	{
 		$extra_array = array();
 		if (!empty($extra))
 		{
 			//parse $extra as a get url
-			parse_str($extra,$extra_array) ;
+			parse_str($extra, $extra_array);
 			// securize entries as they were html encoded and so not checked on the first pass
-			_check_script_tag($extra_array,'extra_array');
+			_check_script_tag($extra_array, 'extra_array');
 		}
 		if ($pattern == lang('Search') || $pattern == lang($app)) $pattern = '';
 		if (empty($extra_array))
@@ -759,7 +758,7 @@ 
 		}
 		else
 		{
-			$extra_array['search']= $pattern;
+			$extra_array['search'] = $pattern;
 			$search = $extra_array;
 		}
 		// open request
@@ -769,10 +768,10 @@ 
 		$options = array();
 		//$args = func_get_args(); $response->addAlert("link_widget::ajax_search('".implode("',\n'",$args)."')\n calling link->query( $app , $search, $type )" );
 		//$args = func_get_args(); error_log(__METHOD__."('".implode("','",$args)."')");
-		if($type) {
+		if ($type) {
 			$options['type'] = $type;
 		}
-		if (!($found = egw_link::query($app,$search,$options)))       // ignore the blur-text
+		if (!($found = egw_link::query($app, $search, $options)))       // ignore the blur-text
 		{
 			$GLOBALS['egw']->translation->add_app('etemplate');
 			$response->addAlert(lang('Nothing found - try again !!!'));
@@ -785,30 +784,30 @@ 
 			// check if we need to add extra line to produce an onchange to submit the form
 			if (($data = $request->get_to_process($id_input)) && $data['maxlength'] == self::AJAX_NEED_ONCHANGE)
 			{
-				$script .= "opt = select.options[select.options.length] = new Option('".addslashes(lang('%1 entries found, select one ...',count($found)))."',' ');\n";
+				$script .= "opt = select.options[select.options.length] = new Option('".addslashes(lang('%1 entries found, select one ...', count($found)))."',' ');\n";
 			}
-			foreach($found as $id => $option)
+			foreach ($found as $id => $option)
 			{
 				if (!is_array($option)) $option = array('label' => $option);
 				// xajax uses xml to transport the label, therefore we have to replace not only CR, LF
 				// (not allowed unencoded in Javascript strings) but also all utf-8 C0 and C1 plus CR and LF
-				$option['label'] = preg_replace('/[\000-\037\177-\237]/u',' ',$option['label']);
+				$option['label'] = preg_replace('/[\000-\037\177-\237]/u', ' ', $option['label']);
 
 				$script .= "opt = select.options[select.options.length] = new Option('".addslashes($option['label'])."','".addslashes($id)."');\n";
 				if (count($option) > 1)
 				{
-					foreach($option as $name => $value)
+					foreach ($option as $name => $value)
 					{
 						if ($name != 'label') $script .= "opt.$name = '".addslashes($value)."';\n";
 					}
 				}
 			}
 			$script .= "select.options[select.options.length] = new Option('".addslashes(lang('New search').' ...')."','');\n";
-			foreach(explode(',',$id_show) as $id)
+			foreach (explode(',', $id_show) as $id)
 			{
 				$script .= "document.getElementById('$id').style.display='inline';\n";
 			}
-			foreach(explode(',',$id_hide) as $id)
+			foreach (explode(',', $id_hide) as $id)
 			{
 				$script .= "document.getElementById('$id').style.display='none';\n";
 			}
@@ -821,11 +820,11 @@ 
 			$data = $request->get_to_process($id_res);
 			//error_log($id_res.'='.array2string($data));
 			$data['allowed'] = $found ? array_keys($found) : array();
-			$request->set_to_process($id_res,$data);
+			$request->set_to_process($id_res, $data);
 			// update id, if request changed it (happens if the request data is stored direct in the form)
 			if ($etemplate_exec_id != ($new_id = $request->id()))
 			{
-				$response->addAssign('etemplate_exec_id','value',$new_id);
+				$response->addAssign('etemplate_exec_id', 'value', $new_id);
 			}
 		}
 		return $response->getXML();
@@ -841,7 +840,7 @@ 
 	 * @param string $etemplate_exec_id of the calling etemplate, to upate the allowed ids
 	 * @return string xajax xml response
 	 */
-	static function ajax_get_types($app,$id_res,$etemplate_exec_id)
+	static function ajax_get_types($app, $id_res, $etemplate_exec_id)
 	{
 		// open request
 		if ($etemplate_exec_id) $request = etemplate_request::read($etemplate_exec_id);
@@ -852,16 +851,16 @@ 
 
 
 		$script = "var select = document.getElementById('$id_res');\nselect.options.length=0;\n";
-		if(is_array(egw_link::$app_register[$app]['types']))
+		if (is_array(egw_link::$app_register[$app]['types']))
 		{
 			$found = egw_link::$app_register[$app]['types'];
-			foreach(egw_link::$app_register[$app]['types'] as $id => $option)
+			foreach (egw_link::$app_register[$app]['types'] as $id => $option)
 			{
 				$option = array('label' => $option['name']);
 				$script .= "opt = select.options[select.options.length] = new Option('".addslashes($option['label'])."','".addslashes($id)."');\n";
 				if (count($option) > 1)
 				{
-					foreach($option as $name => $value)
+					foreach ($option as $name => $value)
 					{
 						if ($name != 'label') $script .= "opt.$name = '".addslashes($value)."';\n";
 					}
@@ -881,11 +880,11 @@ 
 			$data = $request->get_to_process($id_res);
 			//error_log($id_res.'='.array2string($data));
 			$data['allowed'] = $found ? array_keys($found) : array();
-			$request->set_to_process($id_res,$data);
+			$request->set_to_process($id_res, $data);
 			// update id, if request changed it (happens if the request data is stored direct in the form)
 			if ($etemplate_exec_id != ($new_id = $request->id()))
 			{
-				$response->addAssign('etemplate_exec_id','value',$new_id);
+				$response->addAssign('etemplate_exec_id', 'value', $new_id);
 			}
 		}
 		return $response->getXML();

Braces +136 added lines, -37 removed lines

@@ -176,10 +176,13 @@ 
 					}
 				}
 				if (!($popup = egw_link::is_popup($value['app'],'view')) &&
-					etemplate::$request->output_mode == 2)	// we are in a popup
+					etemplate::$request->output_mode == 2)
+				{
+					// we are in a popup
 				{
 					$target = '_blank';
 				}
+				}
 				if (!$cell['help'])
 				{
 					$cell['help'] = $value['help'];
@@ -197,7 +200,10 @@ 
 			//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
 			list($cell['size']) = explode(',',$cell['size']);
 			// Pass link through framework's handler
-			if(!$popup) $link = str_replace(',','%2C',egw::link('/index.php?menuaction='.$link,false,$value['app']));
+			if(!$popup)
+			{
+				$link = str_replace(',','%2C',egw::link('/index.php?menuaction='.$link,false,$value['app']));
+			}
 			$cell['size'] .= ','.$link.',,,'.$target.','.$popup.','.$value['extra_title'];
 			$value = $value['title'] ? $value['title'] : egw_link::title($value['app'],$value['id']);
 			return true;
@@ -239,9 +245,12 @@ 
 
 		case 'link-add':
 			$apps = egw_link::app_list($type == 'link-add' ? 'add_app' : 'query');
-			if (!$apps || !$value['to_id'] || is_array($value['to_id']))	// cant do an add without apps or already created entry
+			if (!$apps || !$value['to_id'] || is_array($value['to_id']))
+			{
+				// cant do an add without apps or already created entry
 			{
 				$cell = $tmpl->empty_cell();
+			}
 				return;
 			}
 			asort($apps);	// sort them alphabetic
@@ -261,18 +270,30 @@ 
 				}
 				$value['options-add_app'][$action] = $label;
 				// modify add_app default to the action used as value
-				if (isset($value['add_app']) && $app == $value['add_app']) $value['add_app'] = $action;
+				if (isset($value['add_app']) && $app == $value['add_app'])
+				{
+					$value['add_app'] = $action;
+				}
 			}
 			$tpl = new etemplate('etemplate.link_widget.add');
 			break;
 
 		case 'link-to':
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
-			if ($value['search_label'] && $extension_data['search_label'] != $value['search_label']) $value['search_label'] = lang($value['search_label']);
+			if ($value['search_label'] && $extension_data['search_label'] != $value['search_label'])
+			{
+				$value['search_label'] = lang($value['search_label']);
+			}
 			$extension_data = $value;
 			$tpl = new etemplate('etemplate.link_widget.to');
-			if ($value['link_label']) $tpl->set_cell_attribute('create','label',$value['link_label']);
-			if ($value['search_label']) $tpl->set_cell_attribute('search','label',$value['search_label']);
+			if ($value['link_label'])
+			{
+				$tpl->set_cell_attribute('create','label',$value['link_label']);
+			}
+			if ($value['search_label'])
+			{
+				$tpl->set_cell_attribute('search','label',$value['search_label']);
+			}
 
 			self::get_sub_types($cell, $value, $tpl);
 
@@ -309,9 +330,13 @@ 
 				{
 					$value[$row]['view']  = egw_link::view($link['app'],$link['id'],$link);
 					if (!($value[$row]['popup'] = egw_link::is_popup($link['app'],'view',$link)) &&
-						etemplate::$request->output_mode == 2)	// we are in a popup
+						etemplate::$request->output_mode == 2)
+					{
+						// we are in a popup
 					{
-						$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
+						$value[$row]['target'] = '_blank';
+					}
+					// we create a new window as the linked page is no popup
 					}
 				}
 				if ($link['app'] == egw_link::VFS_APPNAME)
@@ -348,7 +373,10 @@ 
 			{
 				if(!is_array($value))
 				{
-					if (strpos($value,':') !== false) list($app,$value) = explode(':',$value,2);
+					if (strpos($value,':') !== false)
+					{
+						list($app,$value) = explode(':',$value,2);
+					}
 					$value = array('app' => $app ? $app : $cell['size'],'id' => $value);
 				}
 				$value = self::link2a_href($value,$help);
@@ -371,14 +399,21 @@ 
 				$on_click_string = str_replace(');',','.$value['extra'].');',$on_click_string);
 				//echo htmlspecialchars($on_click_string);
 			}
-			if ($value)	// show pre-selected entry in select-box and not the search
+			if ($value)
+			{
+				// show pre-selected entry in select-box and not the search
 			{
 				if (is_array($value))
 				{
 					if (isset($value['current']))
 					{
 						list($app,$id) = explode(':',$value['current'], 2);
-						if ($app) unset($value['default_sel']);	// would overwrite $app!
+			}
+						if ($app)
+						{
+							unset($value['default_sel']);
+						}
+						// would overwrite $app!
 					}
 				}
 				else
@@ -407,7 +442,10 @@ 
 				}
 				if ($titles)
 				{
-					if ($cell['onchange']) $titles[0] = lang('Show all / cancel filter');
+					if ($cell['onchange'])
+					{
+						$titles[0] = lang('Show all / cancel filter');
+					}
 					$titles[''] = lang('new search').' ...';
 					$selectbox =& $tpl->get_widget_by_name('id');
 					$selectbox['sel_options'] = $titles;
@@ -420,9 +458,12 @@ 
 					unset($span);
 				}
 			}
-			if ($extension_data['app'] && count($options) <= 1)	// no app-selection, using app given in first option
+			if ($extension_data['app'] && count($options) <= 1)
+			{
+				// no app-selection, using app given in first option
 			{
 				$tpl->disable_cells('app');
+			}
 				$onchange =& $tpl->get_cell_attribute('search','onclick');
 				$onchange = str_replace("document.getElementById(form::name('app')).value",'\''.$cell['size'].'\'',$onchange);
 				unset($onchange);
@@ -441,17 +482,26 @@ 
 					(count($options) == 1 ? lang($app) : lang('Search')),
 				'extra'      => $cell['onchange'] ? ','.self::AJAX_NEED_ONCHANGE : null,	// store flang for ajax_search, to display extra_line required by onchange
 			);
-			if ($cell['needed']) $value['class'] = 'inputRequired';
+			if ($cell['needed'])
+			{
+				$value['class'] = 'inputRequired';
+			}
 
-			if ($options)	// limit the app-selectbox to the given apps
+			if ($options)
+			{
+				// limit the app-selectbox to the given apps
 			{
 				$tpl->set_cell_attribute('app','type','select');
+			}
 				$tpl->set_cell_attribute('app','no_lang',true);
 				$apps = egw_link::app_list('query');
 				asort($apps);	// sort them alphabetic
 				foreach($apps as $app => $label)
 				{
-					if (!in_array($app,$options)) unset($apps[$app]);
+					if (!in_array($app,$options))
+					{
+						unset($apps[$app]);
+					}
 				}
 				$value['options-app'] = $apps;
 			}
@@ -462,9 +512,12 @@ 
 
 		case 'link-apps':
 			$apps = egw_link::app_list($cell['size'] ? $cell['size'] : 'query');
-			if (!$apps)	// cant do an add without apps or already created entry
+			if (!$apps)
+			{
+				// cant do an add without apps or already created entry
 			{
 				$cell = $tmpl->empty_cell();
+			}
 				return;
 			}
 			asort($apps);	// sort them alphabetic
@@ -503,10 +556,13 @@ 
 		}
 		elseif (etemplate::$request->output_mode == 2 || 	// we are in a popup
 			$link['app'] == egw_link::VFS_APPNAME ||		// or it's a link to an attachment
-			($target = egw_link::get_registry($link['app'],'view_target')))	// or explicit target set
+			($target = egw_link::get_registry($link['app'],'view_target')))
+		{
+			// or explicit target set
 		{
 			$options = ' target="'.($target ? $target : '_blank').'"';
 		}
+		}
 		else
 		{
 			// Pass link through framework's handler
@@ -562,9 +618,12 @@ 
 						if ($v)
 						{
 							$defaultData=true;
-							if ($k==0 && !empty($value_in['id'])) // we have a valid incomming id, we intend to use that
+							if ($k==0 && !empty($value_in['id']))
+							{
+								// we have a valid incomming id, we intend to use that
 							{
 								$defaultData=false;
+							}
 								continue;
 							}
 							break;
@@ -575,7 +634,10 @@ 
 						$value = $extension_data['default'];
 						$value['current'] = $extension_data['app'] ? $value_in['id'] : $value_in['app'].':'.$value_in['id'];
 						// we take care for id, in case it is empty AND needed
-						if(empty($value['id']) && $extension_data['needed']) $value['id'] = $value['current'];
+						if(empty($value['id']) && $extension_data['needed'])
+						{
+							$value['id'] = $value['current'];
+						}
 					}
 				}
 				if($defaultData === false)
@@ -620,10 +682,13 @@ 
 		switch ($button)
 		{
 			case 'create':
-				if ($value['to_app'])						// make the link
+				if ($value['to_app'])
+				{
+					// make the link
 				{
 					$link_id = egw_link::link($value['to_app'],$value['to_id'],
 						$value['app'],$value['id'],$value['remark']);
+				}
 					$value['remark'] = $value['query'] = '';
 
 					if (isset($value['primary']) && !$value['anz_links'] )
@@ -643,11 +708,14 @@ 
 				if (is_array($value['file']) && $value['to_app'] &&
 					!empty($value['file']['tmp_name']) && $value['file']['tmp_name'] != 'none')
 				{
-					if (!$value['to_id'] || is_array($value['to_id']))	// otherwise the webserver deletes the file
+					if (!$value['to_id'] || is_array($value['to_id']))
+					{
+						// otherwise the webserver deletes the file
 					{
 						if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 						{
 							$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
+					}
 						}
 						else
 						{
@@ -685,7 +753,10 @@ 
 				if ($this->debug)
 				{
 					//echo "<p>unlink(link-id=$unlink,$value[to_app],$value[to_id])</p>\n";
-					if (is_array($value['to_id'])) _debug_array($value['to_id']);
+					if (is_array($value['to_id']))
+					{
+						_debug_array($value['to_id']);
+					}
 				}
 				egw_link::unlink2($unlink,$value['to_app'],$value['to_id']);
 				if (is_array($value['to_id']))
@@ -707,18 +778,24 @@ 
 	/**
 	*	Get sub-types for the current application
 	*/
-	private static function get_sub_types($cell, &$value, &$tpl) {
+	private static function get_sub_types($cell, &$value, &$tpl)
+	{
 		// Get sub-types
-		if($value['options-app']) {
+		if($value['options-app'])
+		{
 			$apps = $value['options-app'];
-		} else {
+		}
+		else
+		{
 			$apps = egw_link::app_list($cell['size'] ? $cell['size'] : 'query');
 			asort($apps);	// sort them alphabetic
 		}
 
 		$current_app = $value['app'] ? $value['app'] : key($apps);
-		if(is_array(egw_link::$app_register[$current_app]['types'])) {
-			foreach(egw_link::$app_register[$current_app]['types'] as $key => $settings) {
+		if(is_array(egw_link::$app_register[$current_app]['types']))
+		{
+			foreach(egw_link::$app_register[$current_app]['types'] as $key => $settings)
+			{
 				$value['options-link_type'][$key] = $settings['name'];
 			}
 			$span =& $tpl->get_cell_attribute('type_box','span');
@@ -752,7 +829,10 @@ 
 			// securize entries as they were html encoded and so not checked on the first pass
 			_check_script_tag($extra_array,'extra_array');
 		}
-		if ($pattern == lang('Search') || $pattern == lang($app)) $pattern = '';
+		if ($pattern == lang('Search') || $pattern == lang($app))
+		{
+			$pattern = '';
+		}
 		if (empty($extra_array))
 		{
 			$search = $pattern;
@@ -763,18 +843,25 @@ 
 			$search = $extra_array;
 		}
 		// open request
-		if ($etemplate_exec_id) $request = etemplate_request::read($etemplate_exec_id);
+		if ($etemplate_exec_id)
+		{
+			$request = etemplate_request::read($etemplate_exec_id);
+		}
 
 		$response = new xajaxResponse();
 		$options = array();
 		//$args = func_get_args(); $response->addAlert("link_widget::ajax_search('".implode("',\n'",$args)."')\n calling link->query( $app , $search, $type )" );
 		//$args = func_get_args(); error_log(__METHOD__."('".implode("','",$args)."')");
-		if($type) {
+		if($type)
+		{
 			$options['type'] = $type;
 		}
-		if (!($found = egw_link::query($app,$search,$options)))       // ignore the blur-text
+		if (!($found = egw_link::query($app,$search,$options)))
+		{
+			// ignore the blur-text
 		{
 			$GLOBALS['egw']->translation->add_app('etemplate');
+		}
 			$response->addAlert(lang('Nothing found - try again !!!'));
 			$response->addScript("document.getElementById('$id_input').select();");
 		}
@@ -789,7 +876,10 @@ 
 			}
 			foreach($found as $id => $option)
 			{
-				if (!is_array($option)) $option = array('label' => $option);
+				if (!is_array($option))
+				{
+					$option = array('label' => $option);
+				}
 				// xajax uses xml to transport the label, therefore we have to replace not only CR, LF
 				// (not allowed unencoded in Javascript strings) but also all utf-8 C0 and C1 plus CR and LF
 				$option['label'] = preg_replace('/[\000-\037\177-\237]/u',' ',$option['label']);
@@ -799,7 +889,10 @@ 
 				{
 					foreach($option as $name => $value)
 					{
-						if ($name != 'label') $script .= "opt.$name = '".addslashes($value)."';\n";
+						if ($name != 'label')
+						{
+							$script .= "opt.$name = '".addslashes($value)."';\n";
+						}
 					}
 				}
 			}
@@ -844,7 +937,10 @@ 
 	static function ajax_get_types($app,$id_res,$etemplate_exec_id)
 	{
 		// open request
-		if ($etemplate_exec_id) $request = etemplate_request::read($etemplate_exec_id);
+		if ($etemplate_exec_id)
+		{
+			$request = etemplate_request::read($etemplate_exec_id);
+		}
 
 		$response = new xajaxResponse();
 		//$args = func_get_args(); $response->addAlert("link_widget::ajax_search('".implode("',\n'",$args)."')\n calling link->query( $app , $search )" );
@@ -863,7 +959,10 @@ 
 				{
 					foreach($option as $name => $value)
 					{
-						if ($name != 'label') $script .= "opt.$name = '".addslashes($value)."';\n";
+						if ($name != 'label')
+						{
+							$script .= "opt.$name = '".addslashes($value)."';\n";
+						}
 					}
 				}
 			}

etemplate/inc/class.nextmatch_widget.inc.php

Doc Comments +14 added lines, -21 removed lines

@@ -147,7 +147,7 @@ 
 	 *
 	 * @param string $name
 	 * @param int $offset positive or negative offset (negative is count from the end)
-	 * @param int $length=null positiv means return $length elements, negative return til negative offset in $length, default = null means all
+	 * @param integer $length positiv means return $length elements, negative return til negative offset in $length, default = null means all
 	 * @return array
 	 */
 	static private function get_parts($name,$offset,$length=null)
@@ -618,8 +618,7 @@ 
 	 * @param string $template_name='' name of the template, used as default for app name of images
 	 * @param string $prefix='' prefix for ids
 	 * @param array &$action_links=array() on return all first-level actions plus the ones with enabled='javaScript:...'
-	 * @param int $max_length=self::DEFAULT_MAX_MENU_LENGTH automatic pagination, not for first menu level!
-	 * @param array $default_attrs=null default attributes
+	 * @param array $default_attrs default attributes
 	 * @return array
 	 */
 	public static function egw_actions(array $actions=null, $template_name='', $prefix='', array &$action_links=array(),
@@ -770,12 +769,9 @@ 
 	 * Automatic switch to hierarchical display, if more than $max_cats_flat=14 cats found.
 	 *
 	 * @param string $app
-	 * @param int $group=0 see self::egw_actions
-	 * @param string $caption='Change category'
-	 * @param string $prefix='cat_' prefix category id to get action id
-	 * @param boolean $globals=true application global categories too
-	 * @param int $parent_id=0 only returns cats of a certain parent
-	 * @param int $max_cats_flat=self::DEFAULT_MAX_MENU_LENGTH use hierarchical display if more cats
+	 * @param int $group see self::egw_actions
+	 * @param boolean $globals application global categories too
+	 * @param int $parent_id only returns cats of a certain parent
 	 * @param boolean $none_option = true Include an option 'None' to clear category
 	 * @return array like self::egw_actions
 	 */
@@ -828,9 +824,8 @@ 
 	/**
 	 * Return one level of the category hierarchy
 	 *
-	 * @param array $cats=null all cats if already read
-	 * @param string $prefix='cat_' prefix category id to get action id
-	 * @param int $parent_id=0 only returns cats of a certain parent
+	 * @param int $parent_id only returns cats of a certain parent
+	 * @param string $prefix
 	 * @return array
 	 */
 	private static function category_hierarchy(array $cats, $prefix, $parent_id=0)
@@ -875,10 +870,9 @@ 
 	 *
 	 * Gets called from etemplate::show_grid() and addressbook_ui::view (without arguments).
 	 *
-	 * @param array $actions=null
-	 * @param array $action_links=null
+	 * @param array $actions
+	 * @param array $action_links
 	 * @param string $template_name='' name of the template, used as default for app name of images - e.g. infolog.index.rows
-	 * @param string $prefix='egw_' JS action objects generated for this widget are prefixed with given prefix
 	 */
 	public static function init_egw_actions(array $actions=null, $action_links=null, $template_name='', $prefix='egw_')
 	{
@@ -950,8 +944,7 @@ 
 	 * @param array &$value
 	 * @param array &$rows=null
 	 * @param array &$readonlys=null
-	 * @param object $obj=null (internal)
-	 * @param string|array $method=null (internal)
+	 * @param string|array $method (internal)
 	 * @return int|boolean total items found of false on error ($value['get_rows'] not callable)
 	 */
 	private static function call_get_rows(array &$value,array &$rows=null,array &$readonlys=null,$obj=null,$method=null)
@@ -1538,7 +1531,7 @@ 
 	 * @param array $row0 first row to guess the available fields
 	 * @param array $fields name=>label or name=>array('lable'=>label,'type'=>type) pairs
 	 * @param string $app app-name
-	 * @param string $charset_out=null output charset
+	 * @param string $charset_out output charset
 	 * @param string $charset data charset
 	 * @param string $separator=';'
 	 * @return FILE
@@ -1570,9 +1563,9 @@ 
 	 *
 	 * @param array $data
 	 * @param array $fields
-	 * @param boolean $use_type=true
-	 * @param array $extra_sel_options=null
-	 * @param string $charset_out=null output charset
+	 * @param boolean $use_type
+	 * @param array $extra_sel_options
+	 * @param string $charset_out output charset
 	 * @param string $charset data charset
 	 * @param string $separator=';'
 	 * @return string

Spacing +255 added lines, -255 removed lines

@@ -138,7 +138,7 @@ 
 	 */
 	static private function last_part($name)
 	{
-		list($last) = self::get_parts($name,-1,1);
+		list($last) = self::get_parts($name, -1, 1);
 		return $last;
 	}
 
@@ -150,11 +150,11 @@ 
 	 * @param int $length=null positiv means return $length elements, negative return til negative offset in $length, default = null means all
 	 * @return array
 	 */
-	static private function get_parts($name,$offset,$length=null)
+	static private function get_parts($name, $offset, $length = null)
 	{
-		$parts = explode('[',str_replace(']','',$name));
+		$parts = explode('[', str_replace(']', '', $name));
 		// php5.1 seems to have a bug: array_slice($parts,$offeset) != array_slice($parts,$offeset,null)
-		return is_null($length) ? array_slice($parts,$offset) : array_slice($parts,$offset,$length);
+		return is_null($length) ? array_slice($parts, $offset) : array_slice($parts, $offset, $length);
 	}
 
 	/**
@@ -164,12 +164,12 @@ 
 	 * @param string $type
 	 * @return mixed reference to storage: use =& to assign!
 	 */
-	static private function &get_nm_global($name,$type)
+	static private function &get_nm_global($name, $type)
 	{
 		static $nm_globals = array();
 
 		// extract the original nextmatch name from $name, taken into account the type of nextmatch-* subwidgets
-		$nm_global = implode('/',self::get_parts($name,1,$type == 'nextmatch' ? null : -2));
+		$nm_global = implode('/', self::get_parts($name, 1, $type == 'nextmatch' ? null : -2));
 		//echo '<p>'.__METHOD__."($name,$type) = $nm_global</p>\n";
 
 		return $nm_globals[$nm_global];
@@ -188,9 +188,9 @@ 
 	 * @param etemplate &$tmpl reference to the template we belong too
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
-	public function pre_process($name,&$value,array &$cell,&$readonlys,&$extension_data,$tmpl)
+	public function pre_process($name, &$value, array &$cell, &$readonlys, &$extension_data, $tmpl)
 	{
-		$nm_global =& self::get_nm_global($name,$cell['type']);
+		$nm_global = & self::get_nm_global($name, $cell['type']);
 		//echo "<p>nextmatch_widget.pre_process(name='$name',type='$cell[type]'): value = "; _debug_array($value);
 		//echo "<p>nextmatch_widget.pre_process(name='$name',type='$cell[type]'): nm_global = "; _debug_array($nm_global);
 
@@ -201,10 +201,10 @@ 
 		{
 			case 'nextmatch-header':
 				$cell['type'] = 'label';
-				return true;	// false = no extra label
+				return true; // false = no extra label
 
 			case 'nextmatch-sortheader':	// Option: default sort: ASC(default) or DESC
-				$extension_data['default_sort'] = $cell['size']&&preg_match('/^(ASC|DESC)/i',$cell['size'],$matches) ? strtoupper($matches[1]) : 'ASC';
+				$extension_data['default_sort'] = $cell['size'] && preg_match('/^(ASC|DESC)/i', $cell['size'], $matches) ? strtoupper($matches[1]) : 'ASC';
 				$cell['type'] = $cell['readonly'] ? 'label' : 'button';
 				$cell['onchange'] = True;
 				if (!$cell['help'])
@@ -216,11 +216,11 @@ 
 					$sorting = $cell;
 					unset($sorting['align']);
 					unset($sorting['span']);
-					$cell = boetemplate::empty_cell('hbox','',array(
+					$cell = boetemplate::empty_cell('hbox', '', array(
 						'span' => $cell['span'],
 						'size' => '2,,0,0',
 						1 => $sorting,
-						2 => boetemplate::empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'),
+						2 => boetemplate::empty_cell('image', $nm_global['sort'] != 'DESC' ? 'down' : 'up'),
 					));
 					$class = 'activ_sortcolumn';
 				}
@@ -228,16 +228,16 @@ 
 				{
 					$class = 'inactiv_sortcolumn';
 				}
-				$parts = explode(',',$cell['span']);
+				$parts = explode(',', $cell['span']);
 				$parts[1] .= ($parts[1] ? ' ' : '').$class;
-				$cell['span'] = implode(',',$parts);
+				$cell['span'] = implode(',', $parts);
 				return True;
 
 			case 'nextmatch-accountfilter':	// Option: as for selectbox: [extra-label(default ALL)[,#lines(default 1)]]
 				$cell['size'] = 'select-account,'.$cell['size'];
 				// fall through
 			case 'nextmatch-customfilter':	// Option: widget-name, options as for selectbox
-				list($type,$cell['size']) = explode(',',$cell['size'],2);
+				list($type, $cell['size']) = explode(',', $cell['size'], 2);
 				// fall through
 			case 'nextmatch-filterheader':	// Option: as for selectbox: [extra-label(default ALL)[,#lines(default 1)]]
 				if (!$type) $type = 'select';
@@ -251,52 +251,52 @@ 
 					$cell['help'] = 'select which values to show';
 				}
 				$cell['onchange'] = $cell['noprint'] = True;
-				$parts = explode(',',$cell['span']);
+				$parts = explode(',', $cell['span']);
 				$parts[1] .= ($parts[1] ? ' ' : '').'filterheader';
-				$cell['span'] = implode(',',$parts);
+				$cell['span'] = implode(',', $parts);
 				$extension_data['old_value'] = $value = $nm_global['col_filter'][self::last_part($name)];
 				return True;
 
 			case 'nextmatch-customfields':
-				$extra_label = $this->pre_process_cf_header($cell,$tmpl, $value, $nm_global);
+				$extra_label = $this->pre_process_cf_header($cell, $tmpl, $value, $nm_global);
 				$extension_data['old_value'] = $value;
 				return $extra_label;
 		}
 
 		// does NOT work with php5.2.6+
-		if (version_compare(PHP_VERSION,'5.2.6','>='))
+		if (version_compare(PHP_VERSION, '5.2.6', '>='))
 		{
 			$value['bottom_too'] = false;
 		}
 		// presetting the selectboxes with their default values, to NOT loop, because post-process thinks they changed
 		if (!isset($value['cat_id'])) $value['cat_id'] = '';
 		if (!isset($value['search'])) $value['search'] = '';
-		foreach(array('filter','filter2') as $f)
+		foreach (array('filter', 'filter2') as $f)
 		{
 			if (!isset($value[$f]))
 			{
 				list($value[$f]) = isset($tmpl->sel_options[$f]) ? @each($tmpl->sel_options[$f]) : @each($value['options-'.$f]);
-				if (!is_string($value[$f])) $value[$f] = (string) $value[$f];
+				if (!is_string($value[$f])) $value[$f] = (string)$value[$f];
 			}
 		}
 		// save values in persistent extension_data to be able use it in post_process
 		unset($value['rows']);
 		$extension_data += $value;
-		list($app) = explode('.',$tmpl->name);
+		list($app) = explode('.', $tmpl->name);
 		$export_limit = bo_merge::getExportLimit($app);
 		$value['no_csv_export'] = $value['csv_fields'] === false ||
-			!bo_merge::hasExportLimit($export_limit,'ISALLOWED') &&
+			!bo_merge::hasExportLimit($export_limit, 'ISALLOWED') &&
 			!bo_merge::is_export_limit_excepted();
 
 		if (!$value['filter_onchange']) $value['filter_onchange'] = 'this.form.submit();';
 		if (!$value['filter2_onchange']) $value['filter2_onchange'] = 'this.form.submit();';
-		if (!isset($value['cat_app'])) list($value['cat_app']) = explode('.',$value['get_rows']);	// if no cat_app set, use the app from the get_rows func
+		if (!isset($value['cat_app'])) list($value['cat_app']) = explode('.', $value['get_rows']); // if no cat_app set, use the app from the get_rows func
 
 		if (!($max = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $max = 15;
 		$row_options = array();
-		foreach(array(5,12,25,50,100,200,500,999) as $n)
+		foreach (array(5, 12, 25, 50, 100, 200, 500, 999) as $n)
 		{
-			if ($n-5 <= $max && $max <= $n+5) $n = $max;
+			if ($n - 5 <= $max && $max <= $n + 5) $n = $max;
 			$row_options[$n] = $n;
 		}
 		if (!isset($value['num_rows']) || $value['num_rows'] <= 0)	// can be -1 if importexport crashes
@@ -309,7 +309,7 @@ 
 			$row_options[$value['num_rows']] = $value['num_rows'];
 			ksort($row_options);
 		}
-		$value['options-num_rows'] =& $row_options;
+		$value['options-num_rows'] = & $row_options;
 
 		if ($value['num_rows'] != $max)
 		{
@@ -322,21 +322,21 @@ 
 		}
 		$rows = array();
 		if (!is_array($readonlys)) $readonlys = array();
-		if (($total = $extension_data['total'] = $value['total'] = self::call_get_rows($value,$rows,$readonlys['rows'])) === false)
+		if (($total = $extension_data['total'] = $value['total'] = self::call_get_rows($value, $rows, $readonlys['rows'])) === false)
 		{
 			//error_log(__METHOD__."() etemplate::set_validation_error('$name') '$value[get_rows]' is no valid method!!!");
-			etemplate::set_validation_error($name,__METHOD__."($cell[name]): '$value[get_rows]' is no valid method !!!");
+			etemplate::set_validation_error($name, __METHOD__."($cell[name]): '$value[get_rows]' is no valid method !!!");
 		}
 		// allow the get_rows function to override / set sel_options
 		if (isset($rows['sel_options']) && is_array($rows['sel_options']))
 		{
-			$tmpl->sel_options = array_merge($tmpl->sel_options,$rows['sel_options']);
+			$tmpl->sel_options = array_merge($tmpl->sel_options, $rows['sel_options']);
 			unset($rows['sel_options']);
 		}
-		$value['rows'] =& $rows;
+		$value['rows'] = & $rows;
 		unset($rows);
 
-		list($template,$hide_header,$header_left,$header_right) = explode(',',$cell['size']);
+		list($template, $hide_header, $header_left, $header_right) = explode(',', $cell['size']);
 		if ($header_left) $value['header_left'] = $header_left;
 		if ($header_right) $value['header_right'] = $header_right;
 		if ((string)$hide_header !== '') $value['hide_header'] = $hide_header;
@@ -347,21 +347,21 @@ 
 		}
 		if (!is_object($value['template']))
 		{
-			$value['template'] = new etemplate($value['template'],$tmpl->as_array());
+			$value['template'] = new etemplate($value['template'], $tmpl->as_array());
 		}
 		if (is_array($value['rows'][0]))	// pad 0 based arrays with rows-1 false values
 		{
-			for($i = 1; $i < $value['template']->rows; $i++)
+			for ($i = 1; $i < $value['template']->rows; $i++)
 			{
-				array_unshift($value['rows'],false);
+				array_unshift($value['rows'], false);
 			}
 		}
-		$extension_data['template'] = $value['template']->name;	// used for the column-selection, and might be set in get_rows()
+		$extension_data['template'] = $value['template']->name; // used for the column-selection, and might be set in get_rows()
 		$extension_data['columnselection_pref'] = $value['columnselection_pref'];
 
 		if ($total < 1 && $value['template']->rows > 1)
 		{
-			$value['template']->data[0]['h'.$value['template']->rows] .= ',1';	// disable the last data row
+			$value['template']->data[0]['h'.$value['template']->rows] .= ',1'; // disable the last data row
 		}
 		if (!$value['never_hide'] && $total <= $max && $value['hide_header'] && $value['search'] == '' &&
 			 ($value['no_cat'] || !$value['cat_id']) &&
@@ -380,7 +380,7 @@ 
 				$cell['size'] = $cell['name'].'[rows]';
 				$cell['obj'] = &$value['template'];
 				$cell['name'] = $value['template']->name;
-				$cell['span'] .= (strpos($cell['span'],',') === false ? ',' : '').' egwGridView_grid';
+				$cell['span'] .= (strpos($cell['span'], ',') === false ? ',' : '').' egwGridView_grid';
 			}
 		}
 		else
@@ -390,58 +390,58 @@ 
 			$nextmatch->no_onclick = true;
 
 			// category is a selectbox, not a category select widget
-			if ($value['cat_is_select'] && ($cat_widget =& $nextmatch->get_widget_by_name('cat_id')))
+			if ($value['cat_is_select'] && ($cat_widget = & $nextmatch->get_widget_by_name('cat_id')))
 			{
 				$cat_widget['type'] = 'select';
 				if ($value['cat_is_select'] == 'no_lang') $cat_widget['no_lang'] = true;
 			}
 			if ($value['lettersearch'])
 			{
-				$lettersearch =& $nextmatch->get_widget_by_name('lettersearch');	// hbox for the letters
+				$lettersearch = & $nextmatch->get_widget_by_name('lettersearch'); // hbox for the letters
 				if (($alphabet = lang('alphabet')) == 'alphabet*') $alphabet = 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z';
-				$alphabet = explode(',',$alphabet);
+				$alphabet = explode(',', $alphabet);
 				$alphabet['all'] = lang('all');
-				foreach($alphabet as $key => $letter)
+				foreach ($alphabet as $key => $letter)
 				{
 					// make each letter internally behave like a button
 					$form_name = $name.'[searchletter]['.($key === 'all' ? $key : $letter).']';
-					etemplate::$request->set_to_process($form_name,'button');
+					etemplate::$request->set_to_process($form_name, 'button');
 
-					if (!$key) $letterbox =& $lettersearch[1];	// to re-use the first child
-					$letterbox = boetemplate::empty_cell('label',$letter,array(
+					if (!$key) $letterbox = & $lettersearch[1]; // to re-use the first child
+					$letterbox = boetemplate::empty_cell('label', $letter, array(
 						'label'   => $letter,
-						'span'    => ',lettersearch'.($letter == (string) $value['searchletter'] ||
+						'span'    => ',lettersearch'.($letter == (string)$value['searchletter'] ||
 							$key === 'all' && !$value['searchletter'] ? '_active' : ''),
 						'no_lang' => 2,
 						'align'   => $key == 'all' ? 'right' : '',
 						'onclick' => 'return submitit('.etemplate::$name_form.",'$form_name');",
 					));
 					// if not the first (re-used) child, add it to the parent
-					if ($key) boetemplate::add_child($lettersearch,$letterbox);
+					if ($key) boetemplate::add_child($lettersearch, $letterbox);
 					unset($letterbox);
 				}
 				//_debug_array(etemplate::$request->to_process);
 			}
-			if(isset($value['no_search'])) $value['no_start_search'] = $value['no_search'];
-			foreach(array('no_cat'=>'cat_id','no_filter'=>'filter','no_filter2'=>'filter2', 'no_search' => 'search', 'no_start_search' => 'start_search' ) as $val_name => $cell_name)
+			if (isset($value['no_search'])) $value['no_start_search'] = $value['no_search'];
+			foreach (array('no_cat'=>'cat_id', 'no_filter'=>'filter', 'no_filter2'=>'filter2', 'no_search' => 'search', 'no_start_search' => 'start_search') as $val_name => $cell_name)
 			{
-				if (isset($value[$val_name])) $nextmatch->disable_cells($cell_name,$value[$val_name]);
+				if (isset($value[$val_name])) $nextmatch->disable_cells($cell_name, $value[$val_name]);
 			}
-			foreach(array('header_left','header_right') as $name)
+			foreach (array('header_left', 'header_right') as $name)
 			{
 				if (!$value[$name]) $nextmatch->disable_cells('@'.$name);
 			}
-			foreach(array('filter','filter2') as $cell_name)
+			foreach (array('filter', 'filter2') as $cell_name)
 			{
-				if (isset($value[$cell_name.'_no_lang'])) $nextmatch->set_cell_attribute($cell_name,'no_lang',$value[$cell_name.'_no_lang']);
+				if (isset($value[$cell_name.'_no_lang'])) $nextmatch->set_cell_attribute($cell_name, 'no_lang', $value[$cell_name.'_no_lang']);
 			}
 			$start = $value['start'];
-			$end   = $start+$max > $total ? $total : $start+$max;
-			$value['range'] = $total ? (1+$start) . ' - ' . $end : '0';
-			$nextmatch->set_cell_attribute('first','readonly',$start <= 0);
-			$nextmatch->set_cell_attribute('left', 'readonly',$start <= 0);
-			$nextmatch->set_cell_attribute('right','readonly',$start+$max >= $total);
-			$nextmatch->set_cell_attribute('last', 'readonly',$start+$max >= $total);
+			$end   = $start + $max > $total ? $total : $start + $max;
+			$value['range'] = $total ? (1 + $start).' - '.$end : '0';
+			$nextmatch->set_cell_attribute('first', 'readonly', $start <= 0);
+			$nextmatch->set_cell_attribute('left', 'readonly', $start <= 0);
+			$nextmatch->set_cell_attribute('right', 'readonly', $start + $max >= $total);
+			$nextmatch->set_cell_attribute('last', 'readonly', $start + $max >= $total);
 
 			$cell['size'] = $cell['name'];
 			$cell['obj'] = &$nextmatch;
@@ -451,11 +451,11 @@ 
 		if (!$value['no_columnselection'])
 		{
 			$name = is_object($value['template']) ? $value['template']->name : $value['template'];
-			list($app) = explode('.',$name);
+			list($app) = explode('.', $name);
 			if (isset($value['columnselection_pref'])) $name = $value['columnselection_pref'];
 			$this->selectcols = $value['selectcols'] = $GLOBALS['egw_info']['user']['preferences'][$app]['nextmatch-'.$name];
 			// fetching column-names & -labels from the template
-			if ($this->cols_from_tpl($value['template'],$value['options-selectcols'],$name2col,$value['rows'],$value['selectcols']))
+			if ($this->cols_from_tpl($value['template'], $value['options-selectcols'], $name2col, $value['rows'], $value['selectcols']))
 			{
 				//_debug_array($name2col);
 				//_debug_array($value['options-selectcols']);
@@ -467,7 +467,7 @@ 
 					{
 						if ($value['default_cols'][0] == '!')
 						{
-							$value['selectcols'] = array_diff($value['selectcols'],explode(',',substr($value['default_cols'],1)));
+							$value['selectcols'] = array_diff($value['selectcols'], explode(',', substr($value['default_cols'], 1)));
 						}
 						else
 						{
@@ -476,27 +476,27 @@ 
 					}
 					$this->selectcols = $value['selectcols'];
 				}
-				if (!is_array($value['selectcols'])) $value['selectcols'] = explode(',',$value['selectcols']);
-				foreach(array_unique(array_keys($value['options-selectcols']+$name2col)) as $name)
+				if (!is_array($value['selectcols'])) $value['selectcols'] = explode(',', $value['selectcols']);
+				foreach (array_unique(array_keys($value['options-selectcols'] + $name2col)) as $name)
 				{
 					// set 'no_'.$col for each column-name to true, if the column is not selected
 					// (and the value is not set be the get_rows function / programmer!)
-					if (!isset($value['rows']['no_'.$name])) $value['rows']['no_'.$name] = !in_array($name,$value['selectcols']);
+					if (!isset($value['rows']['no_'.$name])) $value['rows']['no_'.$name] = !in_array($name, $value['selectcols']);
 					// setting '@no_'.$name as disabled attr for each column, that has only a single nextmatch-header
 					if (is_object($value['template']))
 					{
 						$col = $name2col[$name];
 						list(,$disabled) = $value['template']->set_column_attributes($col);
 						//echo "<p>$col: $name: $disabled</p>\n";
-						if (!isset($disabled)) $value['template']->set_column_attributes($col,0,'@no_'.$name);
+						if (!isset($disabled)) $value['template']->set_column_attributes($col, 0, '@no_'.$name);
 					}
 				}
 				//_debug_array($value);
 				if (is_object($nextmatch))
 				{
-					$size =& $nextmatch->get_cell_attribute('selectcols','size');
+					$size = & $nextmatch->get_cell_attribute('selectcols', 'size');
 					// Don't change to fancy multi-select here
-					$nextmatch->set_cell_attribute('selectcols','enhance',false);
+					$nextmatch->set_cell_attribute('selectcols', 'enhance', false);
 					if ($size > count($value['options-selectcols'])) $size = '0'.count($value['options-selectcols']);
 					if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 					{
@@ -510,18 +510,18 @@ 
 
 		// Check for preferred import/export definition
 		$name = is_object($extension_data['template']) ? $extension_data['template']->name : $extension_data['template'];
-		list($app) = explode('.',$name);
+		list($app) = explode('.', $name);
 		$definition = $GLOBALS['egw_info']['user']['preferences'][$app]['nextmatch-export-definition'];
-		if(!$value['no_csv_export'] && $definition != '~nextmatch~' && ($definition || !is_array($value['csv_fields'])))
+		if (!$value['no_csv_export'] && $definition != '~nextmatch~' && ($definition || !is_array($value['csv_fields'])))
 		{
-			if($GLOBALS['egw_info']['user']['apps']['importexport'] && ($definition || $value['csv_fields']) && is_object($nextmatch))
+			if ($GLOBALS['egw_info']['user']['apps']['importexport'] && ($definition || $value['csv_fields']) && is_object($nextmatch))
 			{
 				$nextmatch->set_cell_attribute('export', 'onclick',
-					"egw_openWindowCentered2('". egw::link('/index.php', array(
+					"egw_openWindowCentered2('".egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_export_ui.export_dialog',
 						'appname' => $app,
 						'definition' => $definition ? $definition : $value['csv_fields']
-					)) .
+					)).
 					"', '_blank', 850, 440, 'yes'); return false;"
 				);
 			}
@@ -530,16 +530,16 @@ 
 		$cell['type'] = 'template';
 		$cell['label'] = $cell['help'] = '';
 
-		foreach(array('sort','order','col_filter') as $n)	// save them for the sortheader
+		foreach (array('sort', 'order', 'col_filter') as $n)	// save them for the sortheader
 		{
 			$nm_global[$n] = $value[$n];
 		}
-		$value['bottom'] = $value;	// copy the values for the bottom-bar
+		$value['bottom'] = $value; // copy the values for the bottom-bar
 
 		// pass actions and row_id to etemplate::show_grid()
-		$value['rows']['_actions'] =& $value['actions'];
-		$value['rows']['_action_links'] =& $value['action_links'];
-		$value['rows']['_row_id']  =& $value['row_id'];
+		$value['rows']['_actions'] = & $value['actions'];
+		$value['rows']['_action_links'] = & $value['action_links'];
+		$value['rows']['_row_id']  = & $value['row_id'];
 
 		// values are NOT yet used on client side, but give warnings if array are not converted to strings
 		$extension_data['action_var'] = !empty($value['action_var']) ? $value['action_var'] : 'action';
@@ -557,7 +557,7 @@ 
 		}
 		$value['checkboxes'] = implode(',',$checkboxes);
 */
-		return False;	// NO extra Label
+		return False; // NO extra Label
 	}
 
 	/**
@@ -622,19 +622,19 @@ 
 	 * @param array $default_attrs=null default attributes
 	 * @return array
 	 */
-	public static function egw_actions(array $actions=null, $template_name='', $prefix='', array &$action_links=array(),
-		$max_length=self::DEFAULT_MAX_MENU_LENGTH, array $default_attrs=null)
+	public static function egw_actions(array $actions = null, $template_name = '', $prefix = '', array &$action_links = array(),
+		$max_length = self::DEFAULT_MAX_MENU_LENGTH, array $default_attrs = null)
 	{
 		//echo "<p>".__METHOD__."(\$actions, '$template_name', '$prefix', \$action_links, $max_length) \$actions="; _debug_array($actions);
 		// default icons for some common actions
 		static $default_icons = array(
 			'view' => 'view',
 			'edit' => 'edit',
-			'open' => 'edit',	// does edit if possible, otherwise view
+			'open' => 'edit', // does edit if possible, otherwise view
 			'add'  => 'new',
 			'new'  => 'new',
 			'delete' => 'delete',
-			'cat'  => 'category',		// add as category icon to api
+			'cat'  => 'category', // add as category icon to api
 			'document' => 'etemplate/merge',
 			'print'=> 'print',
 			'copy' => 'copy',
@@ -643,12 +643,12 @@ 
 			'paste'=> 'editpaste',
 		);
 
-		$first_level = !$action_links;	// add all first level actions
+		$first_level = !$action_links; // add all first level actions
 
 		//echo "actions="; _debug_array($actions);
 		$egw_actions = array();
 		$n = 1;
-		foreach((array)$actions as $id => $action)
+		foreach ((array)$actions as $id => $action)
 		{
 			// in case it's only selectbox  id => label pairs
 			if (!is_array($action)) $action = array('caption' => $action);
@@ -656,12 +656,12 @@ 
 
 			if (!$first_level && $n == $max_length && count($actions) > $max_length)
 			{
-				$id = 'more_'.count($actions);	// we need a new unique id
+				$id = 'more_'.count($actions); // we need a new unique id
 				$action = array(
 					'caption' => 'More',
 					'prefix' => $prefix,
 					// display rest of actions incl. current one as children
-					'children' => array_slice($actions, $max_length-1, count($actions)-$max_length+1, true),
+					'children' => array_slice($actions, $max_length - 1, count($actions) - $max_length + 1, true),
 				);
 				//echo "*** Inserting id=$prefix$id"; _debug_array($action);
 				// we break at end of foreach loop, as rest of actions is already dealt with
@@ -670,8 +670,8 @@ 
 			$action['id'] = $prefix.$id;
 
 			// add all first level popup actions plus ones with enabled = 'javaScript:...' to action_links
-			if ((!isset($action['type']) || in_array($action['type'],array('popup','drag'))) &&	// popup is the default
-				($first_level || substr($action['enabled'],0,11) == 'javaScript:'))
+			if ((!isset($action['type']) || in_array($action['type'], array('popup', 'drag'))) && // popup is the default
+				($first_level || substr($action['enabled'], 0, 11) == 'javaScript:'))
 			{
 				$action_links[] = $action['id'];
 			}
@@ -684,14 +684,14 @@ 
 			// use common eTemplate image semantics
 			if (!isset($action['iconUrl']) && !empty($action['icon']))
 			{
-				list($app,$img) = explode('/',$action['icon'],2);
-				if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
+				list($app, $img) = explode('/', $action['icon'], 2);
+				if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img, '/') !== false)
 				{
 					$img = $action['icon'];
 					list($app) = explode('.', $template_name);
 				}
 				$action['iconUrl'] = common::find_image($app, $img);
-				unset($action['icon']);	// no need to submit it
+				unset($action['icon']); // no need to submit it
 			}
 			// translate labels
 			if (!$action['no_lang'])
@@ -701,18 +701,18 @@ 
 			}
 			unset($action['no_lang']);
 
-			foreach(array('confirm','confirm_multiple') as $confirm)
+			foreach (array('confirm', 'confirm_multiple') as $confirm)
 			{
 				if (isset($action[$confirm]))
 				{
-					$action[$confirm] = lang($action[$confirm]).(substr($action[$confirm],-1) != '?' ? '?' : '');
+					$action[$confirm] = lang($action[$confirm]).(substr($action[$confirm], -1) != '?' ? '?' : '');
 				}
 			}
 
 			// add sub-menues
 			if ($action['children'])
 			{
-				static $inherit_attrs = array('url','popup','nm_action','onExecute','type','egw_open','allowOnMultiple','confirm','confirm_multiple');
+				static $inherit_attrs = array('url', 'popup', 'nm_action', 'onExecute', 'type', 'egw_open', 'allowOnMultiple', 'confirm', 'confirm_multiple');
 				$action['children'] = self::egw_actions($action['children'], $template_name, $action['prefix'], $action_links, $max_length,
 					array_intersect_key($action, array_flip($inherit_attrs)));
 
@@ -723,10 +723,10 @@ 
 			// link or popup action
 			if ($action['url'])
 			{
-				$action['url'] = egw::link('/index.php',str_replace('$action',$id,$action['url']));
+				$action['url'] = egw::link('/index.php', str_replace('$action', $id, $action['url']));
 				if ($action['popup'])
 				{
-					list($action['data']['width'],$action['data']['height']) = explode('x',$action['popup']);
+					list($action['data']['width'], $action['data']['height']) = explode('x', $action['popup']);
 					unset($action['popup']);
 					$action['data']['nm_action'] = 'popup';
 				}
@@ -747,13 +747,13 @@ 
 			}
 
 			static $egw_action_supported = array(	// attributes supported by egw_action
-				'id','caption','iconUrl','type','default','onExecute','group',
-				'enabled','allowOnMultiple','hideOnDisabled','data','children',
-				'hint','checkbox','checked','radioGroup','acceptedTypes','dragType',
+				'id', 'caption', 'iconUrl', 'type', 'default', 'onExecute', 'group',
+				'enabled', 'allowOnMultiple', 'hideOnDisabled', 'data', 'children',
+				'hint', 'checkbox', 'checked', 'radioGroup', 'acceptedTypes', 'dragType',
 				'shortcut'
 			);
 			// add all not egw_action supported attributes to data
-			$action['data'] = array_merge(array_diff_key($action, array_flip($egw_action_supported)),(array)$action['data']);
+			$action['data'] = array_merge(array_diff_key($action, array_flip($egw_action_supported)), (array)$action['data']);
 			if (!$action['data']) unset($action['data']);
 			// only add egw_action attributes
 			$egw_actions[] = array_intersect_key($action, array_flip($egw_action_supported));
@@ -779,13 +779,13 @@ 
 	 * @param boolean $none_option = true Include an option 'None' to clear category
 	 * @return array like self::egw_actions
 	 */
-	public static function category_action($app, $group=0, $caption='Change category',
-		$prefix='cat_', $globals=true, $parent_id=0, $max_cats_flat=self::DEFAULT_MAX_MENU_LENGTH, $none_option = true)
+	public static function category_action($app, $group = 0, $caption = 'Change category',
+		$prefix = 'cat_', $globals = true, $parent_id = 0, $max_cats_flat = self::DEFAULT_MAX_MENU_LENGTH, $none_option = true)
 	{
-		$cat = new categories(null,$app);
-		$cats = $cat->return_sorted_array($start=0, $limit=false, $query='', $sort='ASC', $order='cat_name', $globals, $parent_id, $unserialize_data=true);
+		$cat = new categories(null, $app);
+		$cats = $cat->return_sorted_array($start = 0, $limit = false, $query = '', $sort = 'ASC', $order = 'cat_name', $globals, $parent_id, $unserialize_data = true);
 
-		if($none_option)
+		if ($none_option)
 		{
 			array_unshift($cats, array(
 				'id'	=> $prefix.'',
@@ -801,9 +801,9 @@ 
 		else	// flat, indented categories
 		{
 			$cat_actions = array();
-			foreach((array)$cats as $cat)
+			foreach ((array)$cats as $cat)
 			{
-				$name = str_repeat('&nbsp;',2*$cat['level']) . stripslashes($cat['name']);
+				$name = str_repeat('&nbsp;', 2 * $cat['level']).stripslashes($cat['name']);
 
 				$cat_actions[$cat['id']] = array(
 					'caption' => $name,
@@ -833,10 +833,10 @@ 
 	 * @param int $parent_id=0 only returns cats of a certain parent
 	 * @return array
 	 */
-	private static function category_hierarchy(array $cats, $prefix, $parent_id=0)
+	private static function category_hierarchy(array $cats, $prefix, $parent_id = 0)
 	{
 		$cat_actions = array();
-		foreach($cats as $key => $cat)
+		foreach ($cats as $key => $cat)
 		{
 			// current hierarchy level
 			if ($cat['parent'] == $parent_id)
@@ -856,14 +856,14 @@ 
 				unset($cats[$key]);
 			}
 			// direct children
-			elseif(isset($cat_actions[$cat['parent']]))
+			elseif (isset($cat_actions[$cat['parent']]))
 			{
 				$cat_actions['sub_'.$cat['parent']] = $cat_actions[$cat['parent']];
 				// have to add category itself to children, to be able to select it!
-				$cat_actions[$cat['parent']]['group'] = -1;	// own group on top
+				$cat_actions[$cat['parent']]['group'] = -1; // own group on top
 				$cat_actions['sub_'.$cat['parent']]['children'] = array(
 					$cat['parent'] => $cat_actions[$cat['parent']],
-				)+self::category_hierarchy($cats, $prefix, $cat['parent']);
+				) + self::category_hierarchy($cats, $prefix, $cat['parent']);
 				unset($cat_actions[$cat['parent']]);
 			}
 		}
@@ -880,19 +880,19 @@ 
 	 * @param string $template_name='' name of the template, used as default for app name of images - e.g. infolog.index.rows
 	 * @param string $prefix='egw_' JS action objects generated for this widget are prefixed with given prefix
 	 */
-	public static function init_egw_actions(array $actions=null, $action_links=null, $template_name='', $prefix='egw_')
+	public static function init_egw_actions(array $actions = null, $action_links = null, $template_name = '', $prefix = 'egw_')
 	{
 		// Load some JS files needed for the egw_action framework
 		egw_framework::includeCSS('/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css');
 
-		egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxcommon');
-		egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxmenu');
-		egw_framework::validate_file('egw_action','egw_action');
-		egw_framework::validate_file('egw_action','egw_action_common');
-		egw_framework::validate_file('egw_action','egw_action_popup');
-		egw_framework::validate_file('egw_action','egw_menu');
-		egw_framework::validate_file('egw_action','egw_menu_dhtmlx');
-		egw_framework::validate_file('egw_action','egw_keymanager');
+		egw_framework::validate_file('dhtmlxtree', 'dhtmlxMenu/codebase/dhtmlxcommon');
+		egw_framework::validate_file('dhtmlxtree', 'dhtmlxMenu/codebase/dhtmlxmenu');
+		egw_framework::validate_file('egw_action', 'egw_action');
+		egw_framework::validate_file('egw_action', 'egw_action_common');
+		egw_framework::validate_file('egw_action', 'egw_action_popup');
+		egw_framework::validate_file('egw_action', 'egw_menu');
+		egw_framework::validate_file('egw_action', 'egw_menu_dhtmlx');
+		egw_framework::validate_file('egw_action', 'egw_keymanager');
 		egw_framework::validate_file('.', 'nextmatch_action', 'etemplate');
 
 		//egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/ext/dhtmlxmenu_ext');
@@ -929,7 +929,7 @@ 
 			// Create a new action object
 			if (elem.id) {
 				var obj = objectCntr.addObject(elem.id, new nextmatchRowAOI(elem, '.
-					($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']?$GLOBALS['egw_info']['user']['preferences']['common']['select_mode']:'EGW_SELECTMODE_DEFAULT').'));
+					($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] ? $GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] : 'EGW_SELECTMODE_DEFAULT').'));
 
 				obj.updateActionLinks(actionLinks);
 			}
@@ -954,27 +954,27 @@ 
 	 * @param string|array $method=null (internal)
 	 * @return int|boolean total items found of false on error ($value['get_rows'] not callable)
 	 */
-	private static function call_get_rows(array &$value,array &$rows=null,array &$readonlys=null,$obj=null,$method=null)
+	private static function call_get_rows(array &$value, array &$rows = null, array &$readonlys = null, $obj = null, $method = null)
 	{
 		if (is_null($method)) $method = $value['get_rows'];
 
 		if (is_null($obj))
 		{
 			// allow static callbacks
-			if(strpos($method,'::') !== false)
+			if (strpos($method, '::') !== false)
 			{
-				list($class,$method) = explode('::',$method);
+				list($class, $method) = explode('::', $method);
 
 				//  workaround for php < 5.2.3: do NOT call it static, but allow application code to specify static callbacks
-				if (version_compare(PHP_VERSION,'5.2.3','>='))
+				if (version_compare(PHP_VERSION, '5.2.3', '>='))
 				{
-					$method = array($class,$method);
+					$method = array($class, $method);
 					unset($class);
 				}
 			}
 			else
 			{
-				list($app,$class,$method) = explode('.',$value['get_rows']);
+				list($app, $class, $method) = explode('.', $value['get_rows']);
 			}
 			if ($class)
 			{
@@ -992,23 +992,23 @@ 
 				}
 			}
 		}
-		if(is_callable($method))	// php5.2.3+ static call (value is always a var param!)
+		if (is_callable($method))	// php5.2.3+ static call (value is always a var param!)
 		{
-			$total = call_user_func_array($method,array(&$value,&$rows,&$readonlys));
+			$total = call_user_func_array($method, array(&$value, &$rows, &$readonlys));
 		}
-		elseif(is_object($obj) && method_exists($obj,$method))
+		elseif (is_object($obj) && method_exists($obj, $method))
 		{
 			if (!is_array($readonlys)) $readonlys = array();
-			$total = $obj->$method($value,$rows,$readonlys);
+			$total = $obj->$method($value, $rows, $readonlys);
 		}
 		else
 		{
-			$total = false;	// method not callable
+			$total = false; // method not callable
 		}
 		if ($method && $total && $value['start'] >= $total)
 		{
 			$value['start'] = 0;
-			$total = self::call_get_rows($value,$rows,$readonlys,$obj,$method);
+			$total = self::call_get_rows($value, $rows, $readonlys, $obj, $method);
 		}
 		// otherwise we get stoped by max_excutiontime
 		if ($total > 200) @set_time_limit(0);
@@ -1021,12 +1021,12 @@ 
 	 *
 	 * @param array &$cell
 	 */
-	private function pre_process_cf_header(array &$cell,$tmpl, &$value, $nm_global)
+	private function pre_process_cf_header(array &$cell, $tmpl, &$value, $nm_global)
 	{
 		//echo __CLASS__.'::'.__METHOD__."() selectcols=$this->selectcols\n";
 		if (is_null($this->cfs))
 		{
-			list($app) = explode('.',$tmpl->name);
+			list($app) = explode('.', $tmpl->name);
 
 			$this->cfs = config::get_customfields($app);
 		}
@@ -1040,46 +1040,46 @@ 
 
 		if ($this->selectcols)
 		{
-			foreach(is_array($this->selectcols) ? $this->selectcols : explode(',',$this->selectcols) as $col)
+			foreach (is_array($this->selectcols) ? $this->selectcols : explode(',', $this->selectcols) as $col)
 			{
 				if ($col[0] == self::CF_PREFIX) $allowed[] = $col;
 			}
 		}
-		foreach($this->cfs as $name => $field)
+		foreach ($this->cfs as $name => $field)
 		{
-			if (!$allowed || in_array(self::CF_PREFIX.$name,$allowed))
+			if (!$allowed || in_array(self::CF_PREFIX.$name, $allowed))
 			{
-				if($field['type'] == 'select')
+				if ($field['type'] == 'select')
 				{
-					$header =& boetemplate::empty_cell('nextmatch-filterheader',self::CF_PREFIX.$name,array(
+					$header = & boetemplate::empty_cell('nextmatch-filterheader', self::CF_PREFIX.$name, array(
 						'sel_options' => $field['values'],
 						'size'        => $field['label'],
 						'no_lang'     => True,
 						'readonly'    => $cell['readonly'],
 					));
 				}
-				elseif($GLOBALS['egw_info']['apps'][$field['type']])
+				elseif ($GLOBALS['egw_info']['apps'][$field['type']])
 				{
-					$header =& boetemplate::empty_cell('link-entry', $cell_name . '['.self::CF_PREFIX.$name .']', array(
+					$header = & boetemplate::empty_cell('link-entry', $cell_name.'['.self::CF_PREFIX.$name.']', array(
 						'label'		=>	$field['label'],
 						'size'		=>	$field['type'],
 						'readonly'	=>	$cell['readonly'],
 						'onchange'	=>	1
 					));
-					boetemplate::add_child($cell,$header);
+					boetemplate::add_child($cell, $header);
 					unset($header);
 
-					$header =& boetemplate::empty_cell('label', '');
-					$value[self::CF_PREFIX.$name] = $field['type'] . ':' . $nm_global['col_filter'][self::CF_PREFIX.$name];
+					$header = & boetemplate::empty_cell('label', '');
+					$value[self::CF_PREFIX.$name] = $field['type'].':'.$nm_global['col_filter'][self::CF_PREFIX.$name];
 				}
 				else
 				{
-					$header =& boetemplate::empty_cell('nextmatch-sortheader',self::CF_PREFIX.$name,array(
+					$header = & boetemplate::empty_cell('nextmatch-sortheader', self::CF_PREFIX.$name, array(
 						'label'       => $field['label'],
 						'readonly'    => $cell['readonly'],
 					));
 				}
-				boetemplate::add_child($cell,$header);
+				boetemplate::add_child($cell, $header);
 				unset($header);
 			}
 		}
@@ -1088,13 +1088,13 @@ 
 		if ($num > 5)
 		{
 			$vbox = $cell;
-			$cell = boetemplate::empty_cell('box','',array(
+			$cell = boetemplate::empty_cell('box', '', array(
 				'size' => '0,,0,0',
 				'span' => ',cf_header_height_limit',
 			));
-			boetemplate::add_child($cell,$vbox);
+			boetemplate::add_child($cell, $vbox);
 		}
-		return false;	// no extra label
+		return false; // no extra label
 	}
 
 	/**
@@ -1107,50 +1107,50 @@ 
 	 * @param array $selectcols selected colums
 	 * @return int columns found, count($cols)
 	 */
-	private function cols_from_tpl($tmpl,&$cols,&$name2col,&$content,$selectcols)
+	private function cols_from_tpl($tmpl, &$cols, &$name2col, &$content, $selectcols)
 	{
 		//_debug_array($cols);
 		// fetching column-names & -labels from the template
-		$cols['__content__'] =& $content;
-		$tmpl->widget_tree_walk(array($this,'cols_from_tpl_walker'),$cols);
+		$cols['__content__'] = & $content;
+		$tmpl->widget_tree_walk(array($this, 'cols_from_tpl_walker'), $cols);
 		unset($cols['__content__']);
 		$col2names = is_array($cols['col2names']) ? $cols['col2names'] : array(); unset($cols['col2names']);
 		//_debug_array($col2names);
 		//_debug_array($cols);
-		foreach($cols as $name => $label)
+		foreach ($cols as $name => $label)
 		{
 			if (!$label) unset($cols[$name]);
 		}
 		//_debug_array($cols);
 		$cols2 = $cols;
 		$cols = array();
-		foreach($cols2 as $name => $label)
+		foreach ($cols2 as $name => $label)
 		{
 			$col = $name;
 			// and replace the column letter then with the name concatinated by an underscore
 			if (is_array($col2names[$name]))
 			{
-				$name = implode('_',$col2names[$name]);
+				$name = implode('_', $col2names[$name]);
 				$name2col[$name] = $col;
 			}
 			$cols[$name] = $label;
 
 			// we are behind the column of a custom fields header --> add the individual fields
 			if ($name == $this->cf_header && (!$selectcols ||
-				in_array($this->cf_header,explode(',',$selectcols))))
+				in_array($this->cf_header, explode(',', $selectcols))))
 			{
 				$cols[$name] .= ':';
-				list($app) = explode('.',$tmpl->name);
+				list($app) = explode('.', $tmpl->name);
 				if (($this->cfs = config::get_customfields($app)))
 				{
-					foreach($this->cfs as $name => $field)
+					foreach ($this->cfs as $name => $field)
 					{
 						$cols[self::CF_PREFIX.$name] = '- '.$field['label'];
 					}
 				}
 				else
 				{
-					unset($cols[$name]);	// no cf's defined -> no header
+					unset($cols[$name]); // no cf's defined -> no header
 				}
 			}
 		}
@@ -1165,9 +1165,9 @@ 
 	 * @param array &$cols here we add the column-name/-label
 	 * @param string $path
 	 */
-	function cols_from_tpl_walker(&$widget,&$cols,$path)
+	function cols_from_tpl_walker(&$widget, &$cols, $path)
 	{
-		list($type,$subtype) = explode('-',$widget['type']);
+		list($type, $subtype) = explode('-', $widget['type']);
 
 		if ($subtype == 'customfields')
 		{
@@ -1179,28 +1179,28 @@ 
 		{
 			return;
 		}
-		$options = explode(',',$widget['size']);
-		if (!($label = $widget['label']) || in_array($subtype,array('header','sortheader')) && $options[1])
+		$options = explode(',', $widget['size']);
+		if (!($label = $widget['label']) || in_array($subtype, array('header', 'sortheader')) && $options[1])
 		{
-			if (in_array($subtype,array('customfilter','sortheader'))) $subtype = array_shift($options);
+			if (in_array($subtype, array('customfilter', 'sortheader'))) $subtype = array_shift($options);
 
 			$label = $options[0];
 
 			// some widgets have label as second option (column name with _ as first), not a perfect detection ...
-			if (strpos($label,'_') !== false && !empty($options[1])) $label = $options[1];
+			if (strpos($label, '_') !== false && !empty($options[1])) $label = $options[1];
 		}
-		list(,,$col,$sub) = explode('/',$path);
+		list(,, $col, $sub) = explode('/', $path);
 		$row = (int)$col;
-		$col = substr($col,$row > 9 ? 2 : 1);
-		if (($label[0] == '@' || strchr($lable,'$') !== false) && is_array($cols['__content__']))
+		$col = substr($col, $row > 9 ? 2 : 1);
+		if (($label[0] == '@' || strchr($lable, '$') !== false) && is_array($cols['__content__']))
 		{
-			$label = boetemplate::expand_name($label,$col,$row,'','',$cols['__content__']);
+			$label = boetemplate::expand_name($label, $col, $row, '', '', $cols['__content__']);
 		}
 		if (!isset($cols[$widget['name']]) && $label)
 		{
-			$label = substr($label,-3) == '...' ? lang(substr($label,0,-3)) : lang($label);
+			$label = substr($label, -3) == '...' ? lang(substr($label, 0, -3)) : lang($label);
 
-			if (empty($label) || strpos($cols[$col],$label) === false)
+			if (empty($label) || strpos($cols[$col], $label) === false)
 			{
 				$cols[$col] .= ($cols[$col] ? ', ' : '').$label;
 			}
@@ -1227,13 +1227,13 @@ 
 	 * @param mixed &value_in the posted values (already striped of magic-quotes)
 	 * @return boolean true if $value has valid content, on false no content will be returned!
 	 */
-	public function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	public function post_process($name, &$value, &$extension_data, &$loop, &$tmpl, $value_in)
 	{
-		$nm_global =& self::get_nm_global($name,$extension_data['type']);
+		$nm_global = & self::get_nm_global($name, $extension_data['type']);
 
-		if ($this->debug) { echo "<p>nextmatch_widget.post_process(type='$extension_data[type]', name='$name',value_in=".print_r($value_in,true).",order='$nm_global[order]'): value = "; _debug_array($value); }
+		if ($this->debug) { echo "<p>nextmatch_widget.post_process(type='$extension_data[type]', name='$name',value_in=".print_r($value_in, true).",order='$nm_global[order]'): value = "; _debug_array($value); }
 
-		switch($extension_data['type'])
+		switch ($extension_data['type'])
 		{
 			case 'nextmatch':
 				break;
@@ -1244,11 +1244,11 @@ 
 					$nm_global['order'] = self::last_part($name);
 					$nm_global['default_sort'] = $extension_data['default_sort'];
 				}
-				return False;	// dont report value back, as it's in the wrong location (rows)
+				return False; // dont report value back, as it's in the wrong location (rows)
 
 			case 'nextmatch-customfields':
 				$this->post_process_cf_header($value, $extension_data, $tmpl, $value_in, $nm_global);
-				return False;   // dont report value back, as it's in the wrong location (rows)
+				return False; // dont report value back, as it's in the wrong location (rows)
 			case 'link-entry':	// allways return app:id, if an entry got selected, otherwise null
 				if (is_array($value_in) && !empty($value_in['id']))
 				{
@@ -1267,21 +1267,21 @@ 
 					if ($this->debug) echo "<p>setting nm_global[filter][".self::last_part($name)."]='$value_in' (was '$extension_data[old_value]')</p>\n";
 					$nm_global['filter'][self::last_part($name)] = $value_in;
 				}
-				return False;	// dont report value back, as it's in the wrong location (rows)
+				return False; // dont report value back, as it's in the wrong location (rows)
 
 			case 'nextmatch-header':
-				return False;	// nothing to report
+				return False; // nothing to report
 		}
 		$old_value = $extension_data;
 		if ($this->debug) { echo "old_value="; _debug_array($old_value); }
 
-		$value['start'] = $old_value['start'];	// need to be set, to be reported back
+		$value['start'] = $old_value['start']; // need to be set, to be reported back
 		$value['return'] = $old_value['return'];
 
 		if (is_array($value['bottom']))			// we have a second bottom-bar
 		{
-			$inputs = array('search','cat_id','filter','filter2','num_rows');
-			foreach($inputs as $name)
+			$inputs = array('search', 'cat_id', 'filter', 'filter2', 'num_rows');
+			foreach ($inputs as $name)
 			{
 				if (isset($value['bottom'][$name]) && $value[$name] == $old_value[$name])
 				{
@@ -1289,8 +1289,8 @@ 
 					$value[$name] = $value['bottom'][$name];
 				}
 			}
-			$buttons = array('start_search','first','left','right','last','export');
-			foreach($buttons as $name)
+			$buttons = array('start_search', 'first', 'left', 'right', 'last', 'export');
+			foreach ($buttons as $name)
 			{
 				if (isset($value['bottom'][$name]) && $value['bottom'][$name])
 				{
@@ -1307,19 +1307,19 @@ 
 		if (isset($old_value['num_rows']) && !is_null($value['num_rows']) && $value['num_rows'] != $old_value['num_rows'])
 		{
 			if ($this->debug) echo "<p>nextmatch_widget::post_process() num_rows changed {$old_value['num_rows']} --> {$value['num_rows']} ==> looping</p>\n";
-			$loop = true;	// num_rows changed
+			$loop = true; // num_rows changed
 		}
 		// num_rows: use old value in extension data, if $value['num_rows'] is not set because nm-header is not shown
-		$value['num_rows'] = isset($value['num_rows']) ? (int) $value['num_rows'] : (int) $extension_data['num_rows'];
+		$value['num_rows'] = isset($value['num_rows']) ? (int)$value['num_rows'] : (int)$extension_data['num_rows'];
 		$max = $value['num_rows'] ? $value['num_rows'] : (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 
-		if(strpos($value['search'],'xjxquery')) {
+		if (strpos($value['search'], 'xjxquery')) {
 			// We deal with advancedsearch
 			$aXml = $value['search'];
 			$value['search'] = '';
-			$aXml = str_replace("<xjxquery><q>","&",$aXml);
-			$aXml = str_replace("</q></xjxquery>","",$aXml);
-			$value['advsearch_cont'] = explode('&',$aXml);
+			$aXml = str_replace("<xjxquery><q>", "&", $aXml);
+			$aXml = str_replace("</q></xjxquery>", "", $aXml);
+			$value['advsearch_cont'] = explode('&', $aXml);
 			//$GLOBALS['egw']->boetemplate = &CreateObject('etemplate.boetemplate');
 			//print_r($GLOBALS['egw']->boetemplate->get_array($value['advsearch_cont'],'exec[]',true));
 			//$value['advsearch_cont'] = preg_replace("/exec\[ (.*)/",'$1',$value['advsearch_cont']);
@@ -1361,7 +1361,7 @@ 
 		}
 		elseif ($value['last'])
 		{
-			$value['start'] = (int) (($old_value['total']-1) / $max) * $max;
+			$value['start'] = (int)(($old_value['total'] - 1) / $max) * $max;
 			unset($value['last']);
 			$loop = True;
 		}
@@ -1395,12 +1395,12 @@ 
 		if ($value['savecols'])
 		{
 			$name = is_object($extension_data['template']) ? $extension_data['template']->name : $extension_data['template'];
-			list($app) = explode('.',$name);
+			list($app) = explode('.', $name);
 			if (isset($extension_data['columnselection_pref'])) $name = $extension_data['columnselection_pref'];
 			$pref = !$GLOBALS['egw_info']['user']['apps']['admin'] && $value['default_prefs'] ? 'default' : 'user';
-			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->add($app,'nextmatch-'.$name,is_array($value['selectcols']) ?
-				implode(',',$value['selectcols']) : $value['selectcols'],$pref);
-			$GLOBALS['egw']->preferences->save_repository(false,$pref);
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->add($app, 'nextmatch-'.$name, is_array($value['selectcols']) ?
+				implode(',', $value['selectcols']) : $value['selectcols'], $pref);
+			$GLOBALS['egw']->preferences->save_repository(false, $pref);
 			$loop = True;
 		}
 		if ($value['export'])
@@ -1412,12 +1412,12 @@ 
 		$value['selected'] = $value['selected'] === '' ? array() : boetemplate::csv_split($value['selected']);
 		$checkboxes = $value['checkboxes'];
 		$value['checkboxes'] = array();
-		foreach(explode(';',$checkboxes) as $data)
+		foreach (explode(';', $checkboxes) as $data)
 		{
-			list($name,$checked) = explode(':',$data);
+			list($name, $checked) = explode(':', $data);
 			if ($name) $value['checkboxes'][$name] = (boolean)$checked;
 		}
-		$value['select_all'] =& $value['checkboxes']['select_all'];
+		$value['select_all'] = & $value['checkboxes']['select_all'];
 
 		return True;
 	}
@@ -1431,14 +1431,14 @@ 
 	{
 		if (is_null($this->cfs))
 		{
-			list($app) = explode('.',$tmpl->name);
+			list($app) = explode('.', $tmpl->name);
 			$this->cfs = config::get_customfields($app);
 		}
-		foreach($this->cfs as $name => $field) {
-			if($GLOBALS['egw_info']['apps'][$field['type']]) {
-				if(is_array($value_in[self::CF_PREFIX.$name])) {
+		foreach ($this->cfs as $name => $field) {
+			if ($GLOBALS['egw_info']['apps'][$field['type']]) {
+				if (is_array($value_in[self::CF_PREFIX.$name])) {
 					list($old_app, $old_id) = explode(':', $extension_data['old_value'][self::CF_PREFIX.$name]);
-					if($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id)  {
+					if ($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id) {
 						$nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id'];
 					}
 				}
@@ -1458,13 +1458,13 @@ 
 	 * @param string $separator=';'
 	 * @return boolean false=error, eg. get_rows callback does not exits, true=nothing to export, otherwise we do NOT return!
 	 */
-	static public function csv_export(&$value,$separator=';')
+	static public function csv_export(&$value, $separator = ';')
 	{
 		$exportLimitExempted = bo_merge::is_export_limit_excepted();
 		if (!$exportLimitExempted)
 		{
 			$name = is_object($value['template']) ? $value['template']->name : $value['template'];
-			list($app) = explode('.',$name);
+			list($app) = explode('.', $name);
 			$export_limit = bo_merge::getExportLimit($app);
 			//if (isset($value['export_limit'])) $export_limit = $value['export_limit'];
 		}
@@ -1482,16 +1482,16 @@ 
 
 		$value['start'] = 0;
 		$value['num_rows'] = 500;
-		$value['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+		$value['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 		do
 		{
-			if (!($total = self::call_get_rows($value,$rows)))
+			if (!($total = self::call_get_rows($value, $rows)))
 			{
-				break;	// nothing to export
+				break; // nothing to export
 			}
-			if (!$exportLimitExempted && (!bo_merge::hasExportLimit($export_limit,'ISALLOWED') || (bo_merge::hasExportLimit($export_limit) && (int)$export_limit < $total)))
+			if (!$exportLimitExempted && (!bo_merge::hasExportLimit($export_limit, 'ISALLOWED') || (bo_merge::hasExportLimit($export_limit) && (int)$export_limit < $total)))
 			{
-				etemplate::set_validation_error($name,lang('You are not allowed to export more than %1 entries!',(int)$export_limit));
+				etemplate::set_validation_error($name, lang('You are not allowed to export more than %1 entries!', (int)$export_limit));
 				return false;
 			}
 			if (!isset($value['no_csv_support'])) $value['no_csv_support'] = !is_array($value['csv_fields']);
@@ -1500,22 +1500,22 @@ 
 			if (!$value['start'])	// send the neccessary headers
 			{
 				// skip empty data row(s) used to adjust to number of header-lines
-				foreach($rows as $row0)
+				foreach ($rows as $row0)
 				{
 					if (is_array($row0) && count($row0) > 1) break;
 				}
-				$fp = self::csv_open($row0,$value['csv_fields'],$app,$charset_out,$charset,$separator);
+				$fp = self::csv_open($row0, $value['csv_fields'], $app, $charset_out, $charset, $separator);
 			}
-			foreach($rows as $key => $row)
+			foreach ($rows as $key => $row)
 			{
-				if (!is_numeric($key) || !$row) continue;	// not a real rows
-				fwrite($fp,self::csv_encode($row,$value['csv_fields'],true,$rows['sel_options'],$charset_out,$charset,$separator)."\n");
+				if (!is_numeric($key) || !$row) continue; // not a real rows
+				fwrite($fp, self::csv_encode($row, $value['csv_fields'], true, $rows['sel_options'], $charset_out, $charset, $separator)."\n");
 			}
 			$value['start'] += $value['num_rows'];
 
-			@set_time_limit(10);	// 10 more seconds
+			@set_time_limit(10); // 10 more seconds
 		}
-		while($total > $value['start']);
+		while ($total > $value['start']);
 
 		unset($value['csv_export']);
 		$value['start'] = $backup_start;
@@ -1543,24 +1543,24 @@ 
 	 * @param string $separator=';'
 	 * @return FILE
 	 */
-	private static function csv_open($row0,&$fields,$app,$charset_out=null,$charset=null,$separator=';')
+	private static function csv_open($row0, &$fields, $app, $charset_out = null, $charset = null, $separator = ';')
 	{
 		if (!is_array($fields) || !count($fields))
 		{
-			$fields = self::autodetect_fields($row0,$app);
+			$fields = self::autodetect_fields($row0, $app);
 		}
-		html::content_header('export.csv','text/comma-separated-values');
+		html::content_header('export.csv', 'text/comma-separated-values');
 		//echo "<pre>";
 
-		if (($fp = fopen('php://output','w')))
+		if (($fp = fopen('php://output', 'w')))
 		{
 			$labels = array();
-			foreach($fields as $field => $label)
+			foreach ($fields as $field => $label)
 			{
 				if (is_array($label)) $label = $label['label'];
 				$labels[$field] = $label ? $label : $field;
 			}
-			fwrite($fp,self::csv_encode($labels,$fields,false,null,$charset_out,$charset,$separator)."\n");
+			fwrite($fp, self::csv_encode($labels, $fields, false, null, $charset_out, $charset, $separator)."\n");
 		}
 		return $fp;
 	}
@@ -1577,19 +1577,19 @@ 
 	 * @param string $separator=';'
 	 * @return string
 	 */
-	private static function csv_encode($data,$fields,$use_type=true,$extra_sel_options=null,$charset_out=null,$charset=null,$separator=';')
+	private static function csv_encode($data, $fields, $use_type = true, $extra_sel_options = null, $charset_out = null, $charset = null, $separator = ';')
 	{
-		$sel_options =& etemplate::$request->sel_options;
+		$sel_options = & etemplate::$request->sel_options;
 
 		$out = array();
-		foreach($fields as $field => $label)
+		foreach ($fields as $field => $label)
 		{
 			$value = (array)$data[$field];
-			if ($use_type && is_array($label) && in_array($label['type'],array('select-account','select-cat','date-time','date','select','int','float')))
+			if ($use_type && is_array($label) && in_array($label['type'], array('select-account', 'select-cat', 'date-time', 'date', 'select', 'int', 'float')))
 			{
-				foreach($value as $key => $val)
+				foreach ($value as $key => $val)
 				{
-					switch($label['type'])
+					switch ($label['type'])
 					{
 						case 'select-account':
 							if ($val) $value[$key] = common::grab_owner_name($val);
@@ -1598,11 +1598,11 @@ 
 							if ($val)
 							{
 								$cats = array();
-								foreach(is_array($val) ? $val : explode(',',$val) as $cat_id)
+								foreach (is_array($val) ? $val : explode(',', $val) as $cat_id)
 								{
 									$cats[] = $GLOBALS['egw']->categories->id2name($cat_id);
 								}
-								$value[$key] = implode('; ',$cats);
+								$value[$key] = implode('; ', $cats);
 							}
 							break;
 						case 'date-time':
@@ -1610,7 +1610,7 @@ 
 							if ($val)
 							{
 								try {
-									$value[$key] = egw_time::to($val,$label['type'] == 'date' ? true : '');
+									$value[$key] = egw_time::to($val, $label['type'] == 'date' ? true : '');
 								}
 								catch (Exception $e) {
 									// ignore conversation errors, leave value unchanged (might be a wrongly as date(time) detected field
@@ -1622,36 +1622,36 @@ 
 							{
 								if ($val) $value[$key] = lang($sel_options[$field][$val]);
 							}
-							elseif(is_array($extra_sel_options) && isset($extra_sel_options[$field]))
+							elseif (is_array($extra_sel_options) && isset($extra_sel_options[$field]))
 							{
 								if ($val) $value[$key] = lang($extra_sel_options[$field][$val]);
 							}
 							break;
 						case 'int':		// size: [min],[max],[len],[precission/sprint format]
 						case 'float':
-							list(,,,$pre) = explode(',',$label['size']);
+							list(,,,$pre) = explode(',', $label['size']);
 							if (($label['type'] == 'float' || !is_numeric($pre)) && $val && $pre)
 							{
-								$val = str_replace(array(' ',','),array('','.'),$val);
-								$value[$key] = is_numeric($pre) ? round($value,$pre) : sprintf($pre,$value);
+								$val = str_replace(array(' ', ','), array('', '.'), $val);
+								$value[$key] = is_numeric($pre) ? round($value, $pre) : sprintf($pre, $value);
 							}
 					}
 				}
 			}
-			$value = implode(', ',$value);
+			$value = implode(', ', $value);
 
-			if (strpos($value,$separator) !== false || strpos($value,"\n") !== false || strpos($value,"\r") !== false)
+			if (strpos($value, $separator) !== false || strpos($value, "\n") !== false || strpos($value, "\r") !== false)
 			{
-				$value = '"'.str_replace(array('\\', '"',),array('\\\\','""'),$value).'"';
+				$value = '"'.str_replace(array('\\', '"',), array('\\\\', '""'), $value).'"';
 				$value = str_replace("\r\n", "\n", $value); // to avoid early linebreak by Excel
 			}
 			$out[] = $value;
 		}
-		$out = implode($separator,$out);
+		$out = implode($separator, $out);
 
 		if ($charset_out && $charset != $charset_out)
 		{
-			$out = translation::convert($out,$charset,$charset_out);
+			$out = translation::convert($out, $charset, $charset_out);
 		}
 		return $out;
 	}
@@ -1662,27 +1662,27 @@ 
 	 * @param array $row0 first data-row
 	 * @param string $app
 	 */
-	private static function autodetect_fields($row0,$app)
+	private static function autodetect_fields($row0, $app)
 	{
-		$fields = array_combine(array_keys($row0),array_keys($row0));
+		$fields = array_combine(array_keys($row0), array_keys($row0));
 
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
 			// try to guess field-type from the fieldname
-			if (preg_match('/(modified|created|start|end)/',$name) && strpos($name,'by')===false &&
+			if (preg_match('/(modified|created|start|end)/', $name) && strpos($name, 'by') === false &&
 				(!$row0[$name] || is_numeric($row0[$name])))	// only use for real timestamps
 			{
-				$fields[$name] = array('label' => $label,'type' => 'date-time');
+				$fields[$name] = array('label' => $label, 'type' => 'date-time');
 			}
-			elseif (preg_match('/(cat_id|category|cat)/',$name))
+			elseif (preg_match('/(cat_id|category|cat)/', $name))
 			{
-				$fields[$name] = array('label' => $label,'type' => 'select-cat');
+				$fields[$name] = array('label' => $label, 'type' => 'select-cat');
 			}
-			elseif (preg_match('/(owner|creator|modifier|assigned|by|coordinator|responsible)/',$name))
+			elseif (preg_match('/(owner|creator|modifier|assigned|by|coordinator|responsible)/', $name))
 			{
-				$fields[$name] = array('label' => $label,'type' => 'select-account');
+				$fields[$name] = array('label' => $label, 'type' => 'select-account');
 			}
-			elseif(preg_match('/(jpeg|photo)/',$name))
+			elseif (preg_match('/(jpeg|photo)/', $name))
 			{
 				unset($fields[$name]);
 			}
@@ -1693,7 +1693,7 @@ 
 
 			if (is_array($customfields))
 			{
-				foreach($customfields as $name => $data)
+				foreach ($customfields as $name => $data)
 				{
 					$fields['#'.$name] = array(
 						'label' => $data['label'],

Braces +295 added lines, -77 removed lines

@@ -211,9 +211,12 @@ 
 				{
 					$cell['help'] = 'click to order after that criteria';
 				}
-				if (self::last_part($name) == $nm_global['order'] && !$cell['readonly'])	// we're the active column
+				if (self::last_part($name) == $nm_global['order'] && !$cell['readonly'])
+				{
+					// we're the active column
 				{
 					$sorting = $cell;
+				}
 					unset($sorting['align']);
 					unset($sorting['span']);
 					$cell = boetemplate::empty_cell('hbox','',array(
@@ -240,12 +243,18 @@ 
 				list($type,$cell['size']) = explode(',',$cell['size'],2);
 				// fall through
 			case 'nextmatch-filterheader':	// Option: as for selectbox: [extra-label(default ALL)[,#lines(default 1)]]
-				if (!$type) $type = 'select';
+				if (!$type)
+				{
+					$type = 'select';
+				}
 				$cell['type'] = $type;
-				if (!$cell['size'] && $type != 'link-entry')	// link-entry without option shows application selection!
+				if (!$cell['size'] && $type != 'link-entry')
+				{
+					// link-entry without option shows application selection!
 				{
 					$cell['size'] = 'All';
 				}
+				}
 				if (!$cell['help'])
 				{
 					$cell['help'] = 'select which values to show';
@@ -269,14 +278,23 @@ 
 			$value['bottom_too'] = false;
 		}
 		// presetting the selectboxes with their default values, to NOT loop, because post-process thinks they changed
-		if (!isset($value['cat_id'])) $value['cat_id'] = '';
-		if (!isset($value['search'])) $value['search'] = '';
+		if (!isset($value['cat_id']))
+		{
+			$value['cat_id'] = '';
+		}
+		if (!isset($value['search']))
+		{
+			$value['search'] = '';
+		}
 		foreach(array('filter','filter2') as $f)
 		{
 			if (!isset($value[$f]))
 			{
 				list($value[$f]) = isset($tmpl->sel_options[$f]) ? @each($tmpl->sel_options[$f]) : @each($value['options-'.$f]);
-				if (!is_string($value[$f])) $value[$f] = (string) $value[$f];
+				if (!is_string($value[$f]))
+				{
+					$value[$f] = (string) $value[$f];
+				}
 			}
 		}
 		// save values in persistent extension_data to be able use it in post_process
@@ -288,21 +306,40 @@ 
 			!bo_merge::hasExportLimit($export_limit,'ISALLOWED') &&
 			!bo_merge::is_export_limit_excepted();
 
-		if (!$value['filter_onchange']) $value['filter_onchange'] = 'this.form.submit();';
-		if (!$value['filter2_onchange']) $value['filter2_onchange'] = 'this.form.submit();';
-		if (!isset($value['cat_app'])) list($value['cat_app']) = explode('.',$value['get_rows']);	// if no cat_app set, use the app from the get_rows func
+		if (!$value['filter_onchange'])
+		{
+			$value['filter_onchange'] = 'this.form.submit();';
+		}
+		if (!$value['filter2_onchange'])
+		{
+			$value['filter2_onchange'] = 'this.form.submit();';
+		}
+		if (!isset($value['cat_app']))
+		{
+			list($value['cat_app']) = explode('.',$value['get_rows']);
+		}
+		// if no cat_app set, use the app from the get_rows func
 
-		if (!($max = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $max = 15;
+		if (!($max = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$max = 15;
+		}
 		$row_options = array();
 		foreach(array(5,12,25,50,100,200,500,999) as $n)
 		{
-			if ($n-5 <= $max && $max <= $n+5) $n = $max;
+			if ($n-5 <= $max && $max <= $n+5)
+			{
+				$n = $max;
+			}
 			$row_options[$n] = $n;
 		}
-		if (!isset($value['num_rows']) || $value['num_rows'] <= 0)	// can be -1 if importexport crashes
+		if (!isset($value['num_rows']) || $value['num_rows'] <= 0)
+		{
+			// can be -1 if importexport crashes
 		{
 			$extension_data['num_rows'] = $value['num_rows'] = $max;
 		}
+		}
 		if (!isset($row_options[$max]) || !isset($row_options[$value['num_rows']]))
 		{
 			$row_options[$max] = $max;
@@ -321,7 +358,10 @@ 
 			$value['options-selectcols'] = is_array($value['options-selectcols']) ? $value['options-selectcols'] : array();
 		}
 		$rows = array();
-		if (!is_array($readonlys)) $readonlys = array();
+		if (!is_array($readonlys))
+		{
+			$readonlys = array();
+		}
 		if (($total = $extension_data['total'] = $value['total'] = self::call_get_rows($value,$rows,$readonlys['rows'])) === false)
 		{
 			//error_log(__METHOD__."() etemplate::set_validation_error('$name') '$value[get_rows]' is no valid method!!!");
@@ -337,21 +377,37 @@ 
 		unset($rows);
 
 		list($template,$hide_header,$header_left,$header_right) = explode(',',$cell['size']);
-		if ($header_left) $value['header_left'] = $header_left;
-		if ($header_right) $value['header_right'] = $header_right;
-		if ((string)$hide_header !== '') $value['hide_header'] = $hide_header;
+		if ($header_left)
+		{
+			$value['header_left'] = $header_left;
+		}
+		if ($header_right)
+		{
+			$value['header_right'] = $header_right;
+		}
+		if ((string)$hide_header !== '')
+		{
+			$value['hide_header'] = $hide_header;
+		}
 
-		if (!$value['template'] && $template)	// template name can be supplied either in $value['template'] or the options-field
+		if (!$value['template'] && $template)
+		{
+			// template name can be supplied either in $value['template'] or the options-field
 		{
 			$value['template'] = $template;
 		}
+		}
 		if (!is_object($value['template']))
 		{
 			$value['template'] = new etemplate($value['template'],$tmpl->as_array());
 		}
-		if (is_array($value['rows'][0]))	// pad 0 based arrays with rows-1 false values
+		if (is_array($value['rows'][0]))
+		{
+			// pad 0 based arrays with rows-1 false values
 		{
-			for($i = 1; $i < $value['template']->rows; $i++)
+			for($i = 1;
+		}
+		$i < $value['template']->rows; $i++)
 			{
 				array_unshift($value['rows'],false);
 			}
@@ -367,7 +423,8 @@ 
 			 ($value['no_cat'] || !$value['cat_id']) &&
 			 ($value['no_filter'] || !$value['filter'] || $value['filter'] == 'none') &&
 			 ($value['no_filter2'] || !$value['filter2'] || $value['filter2'] == 'none'))
-		{											// disable whole nextmatch line if no scrolling necessary
+		{
+// disable whole nextmatch line if no scrolling necessary
 			if ($value['header_left'] || $value['header_right'])
 			{
 				$nextmatch = new etemplate('etemplate.nextmatch_widget.header_only');
@@ -393,12 +450,18 @@ 
 			if ($value['cat_is_select'] && ($cat_widget =& $nextmatch->get_widget_by_name('cat_id')))
 			{
 				$cat_widget['type'] = 'select';
-				if ($value['cat_is_select'] == 'no_lang') $cat_widget['no_lang'] = true;
+				if ($value['cat_is_select'] == 'no_lang')
+				{
+					$cat_widget['no_lang'] = true;
+				}
 			}
 			if ($value['lettersearch'])
 			{
 				$lettersearch =& $nextmatch->get_widget_by_name('lettersearch');	// hbox for the letters
-				if (($alphabet = lang('alphabet')) == 'alphabet*') $alphabet = 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z';
+				if (($alphabet = lang('alphabet')) == 'alphabet*')
+				{
+					$alphabet = 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z';
+				}
 				$alphabet = explode(',',$alphabet);
 				$alphabet['all'] = lang('all');
 				foreach($alphabet as $key => $letter)
@@ -407,7 +470,11 @@ 
 					$form_name = $name.'[searchletter]['.($key === 'all' ? $key : $letter).']';
 					etemplate::$request->set_to_process($form_name,'button');
 
-					if (!$key) $letterbox =& $lettersearch[1];	// to re-use the first child
+					if (!$key)
+					{
+						$letterbox =& $lettersearch[1];
+					}
+					// to re-use the first child
 					$letterbox = boetemplate::empty_cell('label',$letter,array(
 						'label'   => $letter,
 						'span'    => ',lettersearch'.($letter == (string) $value['searchletter'] ||
@@ -417,23 +484,38 @@ 
 						'onclick' => 'return submitit('.etemplate::$name_form.",'$form_name');",
 					));
 					// if not the first (re-used) child, add it to the parent
-					if ($key) boetemplate::add_child($lettersearch,$letterbox);
+					if ($key)
+					{
+						boetemplate::add_child($lettersearch,$letterbox);
+					}
 					unset($letterbox);
 				}
 				//_debug_array(etemplate::$request->to_process);
 			}
-			if(isset($value['no_search'])) $value['no_start_search'] = $value['no_search'];
+			if(isset($value['no_search']))
+			{
+				$value['no_start_search'] = $value['no_search'];
+			}
 			foreach(array('no_cat'=>'cat_id','no_filter'=>'filter','no_filter2'=>'filter2', 'no_search' => 'search', 'no_start_search' => 'start_search' ) as $val_name => $cell_name)
 			{
-				if (isset($value[$val_name])) $nextmatch->disable_cells($cell_name,$value[$val_name]);
+				if (isset($value[$val_name]))
+				{
+					$nextmatch->disable_cells($cell_name,$value[$val_name]);
+				}
 			}
 			foreach(array('header_left','header_right') as $name)
 			{
-				if (!$value[$name]) $nextmatch->disable_cells('@'.$name);
+				if (!$value[$name])
+				{
+					$nextmatch->disable_cells('@'.$name);
+				}
 			}
 			foreach(array('filter','filter2') as $cell_name)
 			{
-				if (isset($value[$cell_name.'_no_lang'])) $nextmatch->set_cell_attribute($cell_name,'no_lang',$value[$cell_name.'_no_lang']);
+				if (isset($value[$cell_name.'_no_lang']))
+				{
+					$nextmatch->set_cell_attribute($cell_name,'no_lang',$value[$cell_name.'_no_lang']);
+				}
 			}
 			$start = $value['start'];
 			$end   = $start+$max > $total ? $total : $start+$max;
@@ -452,7 +534,10 @@ 
 		{
 			$name = is_object($value['template']) ? $value['template']->name : $value['template'];
 			list($app) = explode('.',$name);
-			if (isset($value['columnselection_pref'])) $name = $value['columnselection_pref'];
+			if (isset($value['columnselection_pref']))
+			{
+				$name = $value['columnselection_pref'];
+			}
 			$this->selectcols = $value['selectcols'] = $GLOBALS['egw_info']['user']['preferences'][$app]['nextmatch-'.$name];
 			// fetching column-names & -labels from the template
 			if ($this->cols_from_tpl($value['template'],$value['options-selectcols'],$name2col,$value['rows'],$value['selectcols']))
@@ -476,19 +561,28 @@ 
 					}
 					$this->selectcols = $value['selectcols'];
 				}
-				if (!is_array($value['selectcols'])) $value['selectcols'] = explode(',',$value['selectcols']);
+				if (!is_array($value['selectcols']))
+				{
+					$value['selectcols'] = explode(',',$value['selectcols']);
+				}
 				foreach(array_unique(array_keys($value['options-selectcols']+$name2col)) as $name)
 				{
 					// set 'no_'.$col for each column-name to true, if the column is not selected
 					// (and the value is not set be the get_rows function / programmer!)
-					if (!isset($value['rows']['no_'.$name])) $value['rows']['no_'.$name] = !in_array($name,$value['selectcols']);
+					if (!isset($value['rows']['no_'.$name]))
+					{
+						$value['rows']['no_'.$name] = !in_array($name,$value['selectcols']);
+					}
 					// setting '@no_'.$name as disabled attr for each column, that has only a single nextmatch-header
 					if (is_object($value['template']))
 					{
 						$col = $name2col[$name];
 						list(,$disabled) = $value['template']->set_column_attributes($col);
 						//echo "<p>$col: $name: $disabled</p>\n";
-						if (!isset($disabled)) $value['template']->set_column_attributes($col,0,'@no_'.$name);
+						if (!isset($disabled))
+						{
+							$value['template']->set_column_attributes($col,0,'@no_'.$name);
+						}
 					}
 				}
 				//_debug_array($value);
@@ -497,7 +591,10 @@ 
 					$size =& $nextmatch->get_cell_attribute('selectcols','size');
 					// Don't change to fancy multi-select here
 					$nextmatch->set_cell_attribute('selectcols','enhance',false);
-					if ($size > count($value['options-selectcols'])) $size = '0'.count($value['options-selectcols']);
+					if ($size > count($value['options-selectcols']))
+					{
+						$size = '0'.count($value['options-selectcols']);
+					}
 					if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 					{
 						$nextmatch->disable_cells('default_prefs');
@@ -526,14 +623,20 @@ 
 				);
 			}
 		}
-		if (!$value['filter_onchange']) $value['filter_onchange'] = 'this.form.submit();';
+		if (!$value['filter_onchange'])
+		{
+			$value['filter_onchange'] = 'this.form.submit();';
+		}
 		$cell['type'] = 'template';
 		$cell['label'] = $cell['help'] = '';
 
-		foreach(array('sort','order','col_filter') as $n)	// save them for the sortheader
+		foreach(array('sort','order','col_filter') as $n)
+		{
+			// save them for the sortheader
 		{
 			$nm_global[$n] = $value[$n];
 		}
+		}
 		$value['bottom'] = $value;	// copy the values for the bottom-bar
 
 		// pass actions and row_id to etemplate::show_grid()
@@ -651,8 +754,14 @@ 
 		foreach((array)$actions as $id => $action)
 		{
 			// in case it's only selectbox  id => label pairs
-			if (!is_array($action)) $action = array('caption' => $action);
-			if ($default_attrs) $action += $default_attrs;
+			if (!is_array($action))
+			{
+				$action = array('caption' => $action);
+			}
+			if ($default_attrs)
+			{
+				$action += $default_attrs;
+			}
 
 			if (!$first_level && $n == $max_length && count($actions) > $max_length)
 			{
@@ -697,7 +806,10 @@ 
 			if (!$action['no_lang'])
 			{
 				$action['caption'] = lang($action['caption']);
-				if ($action['hint']) $action['hint'] = lang($action['hint']);
+				if ($action['hint'])
+				{
+					$action['hint'] = lang($action['hint']);
+				}
 			}
 			unset($action['no_lang']);
 
@@ -754,11 +866,17 @@ 
 			);
 			// add all not egw_action supported attributes to data
 			$action['data'] = array_merge(array_diff_key($action, array_flip($egw_action_supported)),(array)$action['data']);
-			if (!$action['data']) unset($action['data']);
+			if (!$action['data'])
+			{
+				unset($action['data']);
+			}
 			// only add egw_action attributes
 			$egw_actions[] = array_intersect_key($action, array_flip($egw_action_supported));
 
-			if (!$first_level && $n++ == $max_length) break;
+			if (!$first_level && $n++ == $max_length)
+			{
+				break;
+			}
 		}
 		//echo "egw_actions="; _debug_array($egw_actions);
 		return $egw_actions;
@@ -897,7 +1015,10 @@ 
 
 		//egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/ext/dhtmlxmenu_ext');
 
-		if (!is_array($action_links)) $action_links = array();
+		if (!is_array($action_links))
+		{
+			$action_links = array();
+		}
 
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -956,7 +1077,10 @@ 
 	 */
 	private static function call_get_rows(array &$value,array &$rows=null,array &$readonlys=null,$obj=null,$method=null)
 	{
-		if (is_null($method)) $method = $value['get_rows'];
+		if (is_null($method))
+		{
+			$method = $value['get_rows'];
+		}
 
 		if (is_null($obj))
 		{
@@ -982,23 +1106,32 @@ 
 				{
 					$GLOBALS[$class] = new $class();
 				}
-				if (is_object($GLOBALS[$class]))	// use existing instance (put there by a previous CreateObject)
+				if (is_object($GLOBALS[$class]))
+				{
+					// use existing instance (put there by a previous CreateObject)
 				{
 					$obj = $GLOBALS[$class];
 				}
+				}
 				else
 				{
 					$obj = CreateObject($app.'.'.$class);
 				}
 			}
 		}
-		if(is_callable($method))	// php5.2.3+ static call (value is always a var param!)
+		if(is_callable($method))
+		{
+			// php5.2.3+ static call (value is always a var param!)
 		{
 			$total = call_user_func_array($method,array(&$value,&$rows,&$readonlys));
 		}
+		}
 		elseif(is_object($obj) && method_exists($obj,$method))
 		{
-			if (!is_array($readonlys)) $readonlys = array();
+			if (!is_array($readonlys))
+			{
+				$readonlys = array();
+			}
 			$total = $obj->$method($value,$rows,$readonlys);
 		}
 		else
@@ -1011,7 +1144,10 @@ 
 			$total = self::call_get_rows($value,$rows,$readonlys,$obj,$method);
 		}
 		// otherwise we get stoped by max_excutiontime
-		if ($total > 200) @set_time_limit(0);
+		if ($total > 200)
+		{
+			@set_time_limit(0);
+		}
 		//error_log($value['get_rows'].'() returning '.array2string($total).', method = '.array2string($method).', value = '.array2string($value));
 		return $total;
 	}
@@ -1042,7 +1178,10 @@ 
 		{
 			foreach(is_array($this->selectcols) ? $this->selectcols : explode(',',$this->selectcols) as $col)
 			{
-				if ($col[0] == self::CF_PREFIX) $allowed[] = $col;
+				if ($col[0] == self::CF_PREFIX)
+				{
+					$allowed[] = $col;
+				}
 			}
 		}
 		foreach($this->cfs as $name => $field)
@@ -1119,7 +1258,10 @@ 
 		//_debug_array($cols);
 		foreach($cols as $name => $label)
 		{
-			if (!$label) unset($cols[$name]);
+			if (!$label)
+			{
+				unset($cols[$name]);
+			}
 		}
 		//_debug_array($cols);
 		$cols2 = $cols;
@@ -1171,8 +1313,14 @@ 
 
 		if ($subtype == 'customfields')
 		{
-			if (!$widget['name']) $widget['name'] = 'customfields';
-			if (!$widget['label']) $widget['label'] = 'Custom fields';
+			if (!$widget['name'])
+			{
+				$widget['name'] = 'customfields';
+			}
+			if (!$widget['label'])
+			{
+				$widget['label'] = 'Custom fields';
+			}
 			$this->cf_header = $widget['name'];
 		}
 		if ($type != 'nextmatch' || !$subtype || !$widget['name'] || $widget['disabled'])
@@ -1182,12 +1330,18 @@ 
 		$options = explode(',',$widget['size']);
 		if (!($label = $widget['label']) || in_array($subtype,array('header','sortheader')) && $options[1])
 		{
-			if (in_array($subtype,array('customfilter','sortheader'))) $subtype = array_shift($options);
+			if (in_array($subtype,array('customfilter','sortheader')))
+			{
+				$subtype = array_shift($options);
+			}
 
 			$label = $options[0];
 
 			// some widgets have label as second option (column name with _ as first), not a perfect detection ...
-			if (strpos($label,'_') !== false && !empty($options[1])) $label = $options[1];
+			if (strpos($label,'_') !== false && !empty($options[1]))
+			{
+				$label = $options[1];
+			}
 		}
 		list(,,$col,$sub) = explode('/',$path);
 		$row = (int)$col;
@@ -1231,7 +1385,9 @@ 
 	{
 		$nm_global =& self::get_nm_global($name,$extension_data['type']);
 
-		if ($this->debug) { echo "<p>nextmatch_widget.post_process(type='$extension_data[type]', name='$name',value_in=".print_r($value_in,true).",order='$nm_global[order]'): value = "; _debug_array($value); }
+		if ($this->debug)
+		{
+echo "<p>nextmatch_widget.post_process(type='$extension_data[type]', name='$name',value_in=".print_r($value_in,true).",order='$nm_global[order]'): value = "; _debug_array($value); }
 
 		switch($extension_data['type'])
 		{
@@ -1264,7 +1420,10 @@ 
 			case 'nextmatch-filterheader':
 				if ((string)$value_in != (string)$extension_data['old_value'])
 				{
-					if ($this->debug) echo "<p>setting nm_global[filter][".self::last_part($name)."]='$value_in' (was '$extension_data[old_value]')</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>setting nm_global[filter][".self::last_part($name)."]='$value_in' (was '$extension_data[old_value]')</p>\n";
+					}
 					$nm_global['filter'][self::last_part($name)] = $value_in;
 				}
 				return False;	// dont report value back, as it's in the wrong location (rows)
@@ -1273,19 +1432,27 @@ 
 				return False;	// nothing to report
 		}
 		$old_value = $extension_data;
-		if ($this->debug) { echo "old_value="; _debug_array($old_value); }
+		if ($this->debug)
+		{
+echo "old_value="; _debug_array($old_value); }
 
 		$value['start'] = $old_value['start'];	// need to be set, to be reported back
 		$value['return'] = $old_value['return'];
 
-		if (is_array($value['bottom']))			// we have a second bottom-bar
+		if (is_array($value['bottom']))
+		{
+			// we have a second bottom-bar
 		{
 			$inputs = array('search','cat_id','filter','filter2','num_rows');
+		}
 			foreach($inputs as $name)
 			{
 				if (isset($value['bottom'][$name]) && $value[$name] == $old_value[$name])
 				{
-					if ($this->debug) echo "value[$name] overwritten by bottom-value[$name]='".$value['bottom'][$name]."', old_value[$name]='".$old_value[$name]."'<br>\n";
+					if ($this->debug)
+					{
+						echo "value[$name] overwritten by bottom-value[$name]='".$value['bottom'][$name]."', old_value[$name]='".$old_value[$name]."'<br>\n";
+					}
 					$value[$name] = $value['bottom'][$name];
 				}
 			}
@@ -1306,14 +1473,18 @@ 
 		}
 		if (isset($old_value['num_rows']) && !is_null($value['num_rows']) && $value['num_rows'] != $old_value['num_rows'])
 		{
-			if ($this->debug) echo "<p>nextmatch_widget::post_process() num_rows changed {$old_value['num_rows']} --> {$value['num_rows']} ==> looping</p>\n";
+			if ($this->debug)
+			{
+				echo "<p>nextmatch_widget::post_process() num_rows changed {$old_value['num_rows']} --> {$value['num_rows']} ==> looping</p>\n";
+			}
 			$loop = true;	// num_rows changed
 		}
 		// num_rows: use old value in extension data, if $value['num_rows'] is not set because nm-header is not shown
 		$value['num_rows'] = isset($value['num_rows']) ? (int) $value['num_rows'] : (int) $extension_data['num_rows'];
 		$max = $value['num_rows'] ? $value['num_rows'] : (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 
-		if(strpos($value['search'],'xjxquery')) {
+		if(strpos($value['search'],'xjxquery'))
+		{
 			// We deal with advancedsearch
 			$aXml = $value['search'];
 			$value['search'] = '';
@@ -1376,12 +1547,18 @@ 
 			{
 				$value['sort'] = $old_value['sort'] != 'DESC' ? 'DESC' : 'ASC';
 			}
-			if ($this->debug) echo "<p>old_value=$old_value[order]/$old_value[sort] ==> $value[order]/$value[sort]</p>\n";
+			if ($this->debug)
+			{
+				echo "<p>old_value=$old_value[order]/$old_value[sort] ==> $value[order]/$value[sort]</p>\n";
+			}
 			$loop = True;
 		}
 		elseif ($nm_global['filter'])
 		{
-			if (!is_array($value['col_filter'])) $value['col_filter'] = array();
+			if (!is_array($value['col_filter']))
+			{
+				$value['col_filter'] = array();
+			}
 
 			$value['col_filter'] += $nm_global['filter'];
 			$loop = True;
@@ -1389,14 +1566,20 @@ 
 		elseif (isset($value['searchletter']))
 		{
 			list($value['searchletter']) = @each($value['searchletter']);
-			if ($value['searchletter'] === 'all') $value['searchletter'] = false;
+			if ($value['searchletter'] === 'all')
+			{
+				$value['searchletter'] = false;
+			}
 			$loop = True;
 		}
 		if ($value['savecols'])
 		{
 			$name = is_object($extension_data['template']) ? $extension_data['template']->name : $extension_data['template'];
 			list($app) = explode('.',$name);
-			if (isset($extension_data['columnselection_pref'])) $name = $extension_data['columnselection_pref'];
+			if (isset($extension_data['columnselection_pref']))
+			{
+				$name = $extension_data['columnselection_pref'];
+			}
 			$pref = !$GLOBALS['egw_info']['user']['apps']['admin'] && $value['default_prefs'] ? 'default' : 'user';
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->add($app,'nextmatch-'.$name,is_array($value['selectcols']) ?
 				implode(',',$value['selectcols']) : $value['selectcols'],$pref);
@@ -1415,7 +1598,10 @@ 
 		foreach(explode(';',$checkboxes) as $data)
 		{
 			list($name,$checked) = explode(':',$data);
-			if ($name) $value['checkboxes'][$name] = (boolean)$checked;
+			if ($name)
+			{
+				$value['checkboxes'][$name] = (boolean)$checked;
+			}
 		}
 		$value['select_all'] =& $value['checkboxes']['select_all'];
 
@@ -1434,11 +1620,15 @@ 
 			list($app) = explode('.',$tmpl->name);
 			$this->cfs = config::get_customfields($app);
 		}
-		foreach($this->cfs as $name => $field) {
-			if($GLOBALS['egw_info']['apps'][$field['type']]) {
-				if(is_array($value_in[self::CF_PREFIX.$name])) {
+		foreach($this->cfs as $name => $field)
+		{
+			if($GLOBALS['egw_info']['apps'][$field['type']])
+			{
+				if(is_array($value_in[self::CF_PREFIX.$name]))
+				{
 					list($old_app, $old_id) = explode(':', $extension_data['old_value'][self::CF_PREFIX.$name]);
-					if($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id)  {
+					if($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id)
+					{
 						$nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id'];
 					}
 				}
@@ -1494,21 +1684,31 @@ 
 				etemplate::set_validation_error($name,lang('You are not allowed to export more than %1 entries!',(int)$export_limit));
 				return false;
 			}
-			if (!isset($value['no_csv_support'])) $value['no_csv_support'] = !is_array($value['csv_fields']);
+			if (!isset($value['no_csv_support']))
+			{
+				$value['no_csv_support'] = !is_array($value['csv_fields']);
+			}
 
 			//echo "<p>start=$value[start], num_rows=$value[num_rows]: total=$total, count(\$rows)=".count($rows)."</p>\n";
-			if (!$value['start'])	// send the neccessary headers
+			if (!$value['start'])
+			{
+				// send the neccessary headers
 			{
 				// skip empty data row(s) used to adjust to number of header-lines
 				foreach($rows as $row0)
 				{
 					if (is_array($row0) && count($row0) > 1) break;
+			}
 				}
 				$fp = self::csv_open($row0,$value['csv_fields'],$app,$charset_out,$charset,$separator);
 			}
 			foreach($rows as $key => $row)
 			{
-				if (!is_numeric($key) || !$row) continue;	// not a real rows
+				if (!is_numeric($key) || !$row)
+				{
+					continue;
+				}
+				// not a real rows
 				fwrite($fp,self::csv_encode($row,$value['csv_fields'],true,$rows['sel_options'],$charset_out,$charset,$separator)."\n");
 			}
 			$value['start'] += $value['num_rows'];
@@ -1520,10 +1720,13 @@ 
 		unset($value['csv_export']);
 		$value['start'] = $backup_start;
 		$value['num_rows'] = $backup_num_rows;
-		if ($value['no_csv_support'])	// we need to call the get_rows method in case start&num_rows are stored in the session
+		if ($value['no_csv_support'])
+		{
+			// we need to call the get_rows method in case start&num_rows are stored in the session
 		{
 			self::call_get_rows($value);
 		}
+		}
 		if ($fp)
 		{
 			fclose($fp);
@@ -1557,7 +1760,10 @@ 
 			$labels = array();
 			foreach($fields as $field => $label)
 			{
-				if (is_array($label)) $label = $label['label'];
+				if (is_array($label))
+				{
+					$label = $label['label'];
+				}
 				$labels[$field] = $label ? $label : $field;
 			}
 			fwrite($fp,self::csv_encode($labels,$fields,false,null,$charset_out,$charset,$separator)."\n");
@@ -1592,7 +1798,10 @@ 
 					switch($label['type'])
 					{
 						case 'select-account':
-							if ($val) $value[$key] = common::grab_owner_name($val);
+							if ($val)
+							{
+								$value[$key] = common::grab_owner_name($val);
+							}
 							break;
 						case 'select-cat':
 							if ($val)
@@ -1620,11 +1829,17 @@ 
 						case 'select':
 							if (isset($sel_options[$field]))
 							{
-								if ($val) $value[$key] = lang($sel_options[$field][$val]);
+								if ($val)
+								{
+									$value[$key] = lang($sel_options[$field][$val]);
+								}
 							}
 							elseif(is_array($extra_sel_options) && isset($extra_sel_options[$field]))
 							{
-								if ($val) $value[$key] = lang($extra_sel_options[$field][$val]);
+								if ($val)
+								{
+									$value[$key] = lang($extra_sel_options[$field][$val]);
+								}
 							}
 							break;
 						case 'int':		// size: [min],[max],[len],[precission/sprint format]
@@ -1670,10 +1885,13 @@ 
 		{
 			// try to guess field-type from the fieldname
 			if (preg_match('/(modified|created|start|end)/',$name) && strpos($name,'by')===false &&
-				(!$row0[$name] || is_numeric($row0[$name])))	// only use for real timestamps
+				(!$row0[$name] || is_numeric($row0[$name])))
+			{
+				// only use for real timestamps
 			{
 				$fields[$name] = array('label' => $label,'type' => 'date-time');
 			}
+			}
 			elseif (preg_match('/(cat_id|category|cat)/',$name))
 			{
 				$fields[$name] = array('label' => $label,'type' => 'select-cat');

etemplate/inc/class.so_sql.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -704,7 +704,7 @@ 
 	 *
 	 * @param array $_fields
 	 * @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields
-	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
+	 * @return integer 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
 	function update($_fields,$merge=true)
 	{
@@ -1194,7 +1194,7 @@ 
 	 * @param string &$wildcard ='' on return wildcard char to use, if pattern does not already contain wildcards!
 	 * @param string &$op ='AND' on return boolean operation to use, if pattern does not start with ! we use OR else AND
 	 * @param string $extra_col =null extra column to search
-	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
+	 * @param string[] $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
 	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())

Indentation +8 added lines, -8 removed lines

@@ -1367,14 +1367,14 @@
 	}
 
 	/**
-	* Get a default list of columns to search
-	* This is to be used as a fallback, for when the extending class does not define
-	* $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
-	* their name are discarded because these columns are expected to be foreign keys or other numeric
-	* values with no meaning to the user.
-	*
-	* @return array of column names
-	*/
+	 * Get a default list of columns to search
+	 * This is to be used as a fallback, for when the extending class does not define
+	 * $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
+	 * their name are discarded because these columns are expected to be foreign keys or other numeric
+	 * values with no meaning to the user.
+	 *
+	 * @return array of column names
+	 */
 	protected function get_default_search_columns()
 	{
 		$skip_columns_with = array('_id', 'modified', 'modifier', 'status', 'cat_id', 'owner');

Spacing +227 added lines, -227 removed lines

@@ -180,7 +180,7 @@ 
 	 *
 	 * @return so_sql
 	 */
-	function __construct($app='',$table='',$db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
+	function __construct($app = '', $table = '', $db = null, $column_prefix = '', $no_clone = false, $timestamp_type = null)
 	{
 		if ($no_clone)
 		{
@@ -198,11 +198,11 @@ 
 
 			if (!$no_clone) $this->db->set_app($app);
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table) $this->setup_table($app, $table, $column_prefix);
 		}
 		$this->init();
 
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
 			echo "<p>so_sql('$app','$table')</p>\n";
 			_debug_array($this);
@@ -217,21 +217,21 @@ 
 	 * 	null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use egw_time objects,
 	 *  'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	public function set_times($timestamp_type=false)
+	public function set_times($timestamp_type = false)
 	{
 		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
 
 		// set current time
-		switch($this->timestamp_type)
+		switch ($this->timestamp_type)
 		{
 			case 'object':
 				$this->now = new egw_time('now');
 				break;
 			case 'string':
-				$this->now = egw_time::to('now',egw_time::DATABASE);
+				$this->now = egw_time::to('now', egw_time::DATABASE);
 				break;
 			default:
-				$this->now = egw_time::to('now','ts');
+				$this->now = egw_time::to('now', 'ts');
 		}
 		$this->tz_offset_s = egw_time::tz_offset_s();
 	}
@@ -241,9 +241,9 @@ 
 	 *
 	 * @deprecated use __construct
 	 */
-	function so_sql($app='',$table='',$db=null,$column_prefix='',$no_clone=false)
+	function so_sql($app = '', $table = '', $db = null, $column_prefix = '', $no_clone = false)
 	{
-		self::__construct($app,$table,$db,$column_prefix,$no_clone);
+		self::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -255,10 +255,10 @@ 
 	 * @param string $table table-name
 	 * @param string $colum_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
 	 */
-	function setup_table($app,$table,$colum_prefix='')
+	function setup_table($app, $table, $colum_prefix = '')
 	{
 		$this->table_name = $table;
-		$this->table_def = $this->db->get_table_definitions($app,$table);
+		$this->table_def = $this->db->get_table_definitions($app, $table);
 		if (!$this->table_def || !is_array($this->table_def['fd']))
 		{
 			throw new egw_exception_wrong_parameter(__METHOD__."('$app','$table'): No table definition for '$table' found !!!");
@@ -266,14 +266,14 @@ 
 		$this->db_key_cols = $this->db_data_cols = $this->db_cols = array();
 		$this->autoinc_id = '';
 		$len_prefix = strlen($colum_prefix);
-		foreach($this->table_def['fd'] as $col => $def)
+		foreach ($this->table_def['fd'] as $col => $def)
 		{
 			$name = $col;
-			if ($len_prefix && substr($name,0,$len_prefix) == $colum_prefix)
+			if ($len_prefix && substr($name, 0, $len_prefix) == $colum_prefix)
 			{
-				$name = substr($col,$len_prefix);
+				$name = substr($col, $len_prefix);
 			}
-			if (in_array($col,$this->table_def['pk']))
+			if (in_array($col, $this->table_def['pk']))
 			{
 				$this->db_key_cols[$col] = $name;
 			}
@@ -289,13 +289,13 @@ 
 			}
 			if ($def['type'] == 'bool') $this->has_bools = true;
 
-			foreach($this->table_def['uc'] as $k => $uni_index)
+			foreach ($this->table_def['uc'] as $k => $uni_index)
 			{
-				if (is_array($uni_index) && in_array($name,$uni_index))
+				if (is_array($uni_index) && in_array($name, $uni_index))
 				{
 					$this->db_uni_cols[$k][$col] = $name;
 				}
-				elseif($name === $uni_index)
+				elseif ($name === $uni_index)
 				{
 					$this->db_uni_cols[$col] = $name;
 				}
@@ -310,9 +310,9 @@ 
 	function convert_all_timestamps()
 	{
 		$check_already_included = !empty($this->timestamps);
-		foreach($this->table_def['fd'] as $name => $data)
+		foreach ($this->table_def['fd'] as $name => $data)
 		{
-			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name,$this->timestamps)))
+			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name, $this->timestamps)))
 			{
 				$this->timestamps[] = $name;
 			}
@@ -326,22 +326,22 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new, true).")</p>\n";
 
 		if (!is_array($new) || !count($new))
 		{
 			return;
 		}
-		foreach($this->db_cols as $db_col => $col)
+		foreach ($this->db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
 		}
-		foreach($this->non_db_cols as $db_col => $col)
+		foreach ($this->non_db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
@@ -350,7 +350,7 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int)$this->debug >= 4) _debug_array($this->data);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -382,7 +382,7 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
@@ -392,7 +392,7 @@ 
 					}
 					else
 					{
-						$data[$name] = egw_time::server2user($data[$name],$this->timestamp_type);
+						$data[$name] = egw_time::server2user($data[$name], $this->timestamp_type);
 					}
 				}
 			}
@@ -408,7 +408,7 @@ 
 					throw new egw_exception_wrong_parameter(__METHOD__."(): No table definition for '$this->table' found !!!");
 				}
 			}
-			foreach($this->table_def['fd'] as $col => $def)
+			foreach ($this->table_def['fd'] as $col => $def)
 			{
 				if ($def['type'] == 'bool' && isset($data[$col]))
 				{
@@ -440,7 +440,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -448,11 +448,11 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
-					$data[$name] = egw_time::user2server($data[$name],$this->timestamp_type);
+					$data[$name] = egw_time::user2server($data[$name], $this->timestamp_type);
 				}
 			}
 		}
@@ -465,7 +465,7 @@ 
 	 * @param array $keys =array() array with keys in form internalName => value
 	 * @return array internal data after init
 	 */
-	function init($keys=array())
+	function init($keys = array())
 	{
 		$this->data = array();
 
@@ -489,7 +489,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (!is_array($keys))
 		{
@@ -510,16 +510,16 @@ 
 		}
 		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
 		{
-			foreach($this->db_uni_cols as $db_col => $col)
+			foreach ($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
 				}
-				elseif(is_array($col))
+				elseif (is_array($col))
 				{
 					$q = array();
-					foreach($col as $db_c => $c)
+					foreach ($col as $db_c => $c)
 					{
 						if ($this->data[$col] == '')
 						{
@@ -534,7 +534,7 @@ 
 		}
 		if (!$query)	// no unique key in keys, lets try everything else
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
@@ -550,22 +550,22 @@ 
 		}
 		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
 		{
-			foreach($query as $col => $val)
+			foreach ($query as $col => $val)
 			{
-				if (is_int($col) || strpos($join,$col) === false) continue;
-				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
+				if (is_int($col) || strpos($join, $col) === false) continue;
+				$query[] = $this->db->expression($this->table_name, $this->table_name.'.', array($col=>$val));
 				unset($query[$col]);
 			}
 		}
-		foreach($this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''),
-			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
+		foreach ($this->db->select($this->table_name, '*'.($extra_cols ? ','.(is_array($extra_cols) ? implode(',', $extra_cols) : $extra_cols) : ''),
+			$query, __LINE__, __FILE__, False, '', $this->app, 0, $join) as $row)
 		{
 			$cols = $this->db_cols;
 			if ($extra_cols)	// extra columns to report
 			{
-				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
+				foreach (is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
-					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+					if (FALSE !== stripos($col, ' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i', '\\1', $col);
 					$cols[$col] = $col;
 				}
 			}
@@ -578,7 +578,7 @@ 
 			// store user timezone used for reading
 			$this->data[self::USER_TIMEZONE_READ] = egw_time::$user_timezone->getName();
 
-			if ((int) $this->debug >= 4)
+			if ((int)$this->debug >= 4)
 			{
 				echo "data =\n"; _debug_array($this->data);
 			}
@@ -588,7 +588,7 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int)$this->debug >= 4) echo "nothing found !!!</p>\n";
 
 		$this->db2data();
 
@@ -602,7 +602,7 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
@@ -621,65 +621,65 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int)$this->debug >= 4) { echo "so_sql::save(".print_r($keys, true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
 		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (!$this->autoinc_id || $db_col != $this->autoinc_id)	// not write auto-inc-id
 				{
-					if (!array_key_exists($col,$this->data) && 	// handling of unset columns in $this->data
-						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
+					if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+						(isset($this->table_def['fd'][$db_col]['default']) || // we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue; // no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
 					{
 						// truncate the field to mamimum length, if upper layers didn't care
-						$data[$db_col] = substr($this->data[$col],0,$this->table_def['fd'][$db_col]['precision']);
+						$data[$db_col] = substr($this->data[$col], 0, $this->table_def['fd'][$db_col]['precision']);
 					}
 					else
 					{
-						$data[$db_col] = (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+						$data[$db_col] = (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 					}
 				}
 			}
-			$this->db->insert($this->table_name,$data,false,__LINE__,__FILE__,$this->app);
+			$this->db->insert($this->table_name, $data, false, __LINE__, __FILE__, $this->app);
 
 			if ($this->autoinc_id)
 			{
-				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name,$this->autoinc_id);
+				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name, $this->autoinc_id);
 			}
 		}
 		else // insert in table without auto id or update of existing row, dont write colums unset in $this->data
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				// we need to update columns set to null: after a $this->data[$col]=null:
 				// - array_key_exits($col,$this->data) === true
 				// - isset($this->data[$col]) === false
-				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
-					($this->autoinc_id ||			// update of table with auto id or
-					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
+				if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+					($this->autoinc_id || // update of table with auto id or
+					 isset($this->table_def['fd'][$db_col]['default']) || // we have a default value or
 					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 				{
-					continue;	// no need to write that (unset) column
+					continue; // no need to write that (unset) column
 				}
-				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+				$data[$db_col] = !is_object($this->data[$col]) && (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
 			// allow to add direct sql updates, eg. "etag=etag+1" with int keys
 			if (is_array($keys) && isset($keys[0]))
 			{
-				for($n=0; isset($keys[$n]); ++$n)
+				for ($n = 0; isset($keys[$n]); ++$n)
 				{
 					$data[] = $keys[$n];
 				}
 			}
 			$keys = $extra_where;
-			foreach($this->db_key_cols as $db_col => $col)
+			foreach ($this->db_key_cols as $db_col => $col)
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
@@ -690,16 +690,16 @@ 
 			}
 			if ($this->autoinc_id)
 			{
-				$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 				if (($nothing_affected = !$this->db->Errno && !$this->db->affected_rows()) && $extra_where)
 				{
-					return true;	// extra_where not met, eg. etag wrong
+					return true; // extra_where not met, eg. etag wrong
 				}
 			}
 			// always try an insert if we have no autoinc_id, as we dont know if the data exists
 			if (!$this->autoinc_id || $nothing_affected)
 			{
-				$this->db->insert($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->insert($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 			}
 		}
 		$this->db2data();
@@ -714,7 +714,7 @@ 
 	 * @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function update($_fields,$merge=true)
+	function update($_fields, $merge = true)
 	{
 		if ($merge) $this->data_merge($_fields);
 
@@ -722,23 +722,23 @@ 
 
 		// extract the keys from $fields or - if not set there - from $this->data
 		$keys = array();
-		foreach($this->db_key_cols as $col => $name)
+		foreach ($this->db_key_cols as $col => $name)
 		{
 			$keys[$col] = isset($fields[$name]) ? $fields[$name] : $this->data[$name];
 			unset($fields[$name]);
 		}
 		// extract the data from $fields
 		$data = array();
-		foreach($this->db_data_cols as $col => $name)
+		foreach ($this->db_data_cols as $col => $name)
 		{
-			if (array_key_exists($name,$fields))
+			if (array_key_exists($name, $fields))
 			{
 				$data[$col] = $fields[$name];
 				unset($fields[$name]);
 			}
 		}
 		// add direct sql like 'etag=etag+1' (it has integer keys)
-		foreach($fields as $key => $value)
+		foreach ($fields as $key => $value)
 		{
 			if (is_int($key))
 			{
@@ -747,9 +747,9 @@ 
 		}
 		if (!$data)
 		{
-			return 0;	// nothing to update
+			return 0; // nothing to update
 		}
-		if (!$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app))
+		if (!$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app))
 		{
 			return $this->db->Errno;
 		}
@@ -763,7 +763,7 @@ 
 	 * @param boolean $only_return_query =false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_query=false)
+	function delete($keys = null, $only_return_query = false)
 	{
 		if ($this->autoinc_id && $keys && !is_array($keys))
 		{
@@ -777,7 +777,7 @@ 
 		else	// data and keys are supplied in $keys
 		{
 			$data = $keys; $keys = array();
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (isset($data[$col]))
 				{
@@ -787,13 +787,13 @@ 
 		}
 		$data = $this->data2db($data);
 
-		foreach($keys as $db_col => $col)
+		foreach ($keys as $db_col => $col)
 		{
 			$query[$db_col] = $data[$col];
 		}
 		if ($only_return_query) return $query;
 
-		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
+		$this->db->delete($this->table_name, $query, __LINE__, __FILE__, $this->app);
 
 		return $this->db->affected_rows();
 	}
@@ -821,15 +821,15 @@ 
 	 * @todo return an interator instead of an array
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria, true).",'$only_keys','$order_by',".print_r($extra_cols, true).",'$wildcard','$empty','$op','$start',".print_r($filter, true).",'$join')</p>\n";
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
 		{
-			$search = $this->search2criteria($criteria,$wildcard,$op);
+			$search = $this->search2criteria($criteria, $wildcard, $op);
 			$criteria = array($search);
 		}
 		if (!is_array($criteria))
@@ -839,7 +839,7 @@ 
 		else
 		{
 			$criteria = $this->data2db($criteria);
-			foreach($criteria as $col => $val)
+			foreach ($criteria as $col => $val)
 			{
 				if (is_int($col))
 				{
@@ -847,7 +847,7 @@ 
 				}
 				elseif ($empty || $val != '')
 				{
-					if (!($db_col = array_search($col,$this->db_cols)))
+					if (!($db_col = array_search($col, $this->db_cols)))
 					{
 						$db_col = $col;
 					}
@@ -858,7 +858,7 @@ 
 							$this->table_def['fd'][$db_col]['nullable'] !== false)
 						{
 							unset($criteria[$col]);
-							$query[] =  '(' . $db_col . ' IS NULL OR ' . $db_col . " = '')";
+							$query[] = '('.$db_col.' IS NULL OR '.$db_col." = '')";
 						}
 						else
 						{
@@ -866,10 +866,10 @@ 
 						}
 					}
 					elseif ($wildcard || $criteria[$col][0] == '!' ||
-						is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 					{
 						// if search pattern alread contains a wildcard, do NOT add further ones automatic
-						if (is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						if (is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 						{
 							$wildcard = '';
 						}
@@ -878,19 +878,19 @@ 
 						if ($criteria[$col][0] == '!')
 						{
 							$cmp_op = ' NOT'.$cmp_op;
-							$criteria[$col] = substr($criteria[$col],1);
+							$criteria[$col] = substr($criteria[$col], 1);
 							$negate = true;
 						}
-						foreach(explode(' ',$criteria[$col]) as $crit)
+						foreach (explode(' ', $criteria[$col]) as $crit)
 						{
 							$query[] = ($negate ? ' ('.$db_col.' IS NULL OR ' : '').$db_col.$cmp_op.
-								$this->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$crit).$wildcard).
+								$this->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $crit).$wildcard).
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col, '.') !== false)	// we have a table-name specified
 					{
-						list($table,$only_col) = explode('.',$db_col);
+						list($table, $only_col) = explode('.', $db_col);
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -898,15 +898,15 @@ 
 						}
 						if (is_array($val) && count($val) > 1)
 						{
-							foreach($val as &$v)
+							foreach ($val as &$v)
 							{
 								$v = $this->db->quote($v, $type);
 							}
-							$query[] = $sql = $db_col.' IN (' .implode(',',$val).')';
+							$query[] = $sql = $db_col.' IN ('.implode(',', $val).')';
 						}
 						else
 						{
-							$query[] = $db_col.'='.$this->db->quote(is_array($val)?array_shift($val):$val,$type);
+							$query[] = $db_col.'='.$this->db->quote(is_array($val) ? array_shift($val) : $val, $type);
 						}
 					}
 					else
@@ -915,7 +915,7 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ', $query);
 		}
 		if (is_array($filter))
 		{
@@ -923,29 +923,29 @@ 
 			$data2db_filter = $this->data2db($filter);
 			if (!is_array($data2db_filter)) {
 				echo function_backtrace()."<br/>\n";
-				echo "filter=";_debug_array($filter);
-				echo "data2db(filter)=";_debug_array($data2db_filter);
+				echo "filter="; _debug_array($filter);
+				echo "data2db(filter)="; _debug_array($data2db_filter);
 			}
-			foreach($data2db_filter as $col => $val)
+			foreach ($data2db_filter as $col => $val)
 			{
 				if ($val !== '')
 				{
 					// check if a db-internal name conversation necessary
-					if (!is_int($col) && ($c = array_search($col,$this->db_cols)))
+					if (!is_int($col) && ($c = array_search($col, $this->db_cols)))
 					{
 						$col = $c;
 					}
-					if(is_int($col))
+					if (is_int($col))
 					{
 						$db_filter[] = $val;
 					}
 					elseif ($val === "!''")
 					{
-						$db_filter[] = $this->table_name . '.' .$col." != ''";
+						$db_filter[] = $this->table_name.'.'.$col." != ''";
 					}
 					else
 					{
-						$db_filter[$this->table_name . '.' .$col] = $val;
+						$db_filter[$this->table_name.'.'.$col] = $val;
 					}
 				}
 			}
@@ -953,35 +953,35 @@ 
 			{
 				if ($op != 'AND')
 				{
-					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ',$query).')';
+					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ', $query).')';
 				}
 				else
 				{
-					$db_filter = array_merge($db_filter,$query);
+					$db_filter = array_merge($db_filter, $query);
 				}
 			}
 			$query = $db_filter;
 		}
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter,true).") query=".print_r($query,true).", total='$this->total'</p>\n";
+			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter, true).") query=".print_r($query, true).", total='$this->total'</p>\n";
 			echo "<br>criteria = "; _debug_array($criteria);
 		}
 		if ($only_keys === true)
 		{
 			$colums = array_keys($this->db_key_cols);
-			foreach($colums as &$column)
+			foreach ($colums as &$column)
 			{
-				$column = $this->table_name . '.' . $column;
+				$column = $this->table_name.'.'.$column;
 			}
 		}
 		elseif (is_array($only_keys))
 		{
 			$colums = array();
-			foreach($only_keys as $key => $col)
+			foreach ($only_keys as $key => $col)
 			{
 				//Convert ambiguous columns to prefixed tablename.column name
-				$colums[] = ($db_col = array_search($col,$this->db_cols)) ?  $this->table_name .'.'.$db_col.' AS '.$col :$col;
+				$colums[] = ($db_col = array_search($col, $this->db_cols)) ? $this->table_name.'.'.$db_col.' AS '.$col : $col;
 			}
 		}
 		elseif (!$only_keys)
@@ -1011,20 +1011,20 @@ 
 			{
 				$colums[$key] = $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id;
 			}
-			elseif (!is_array($colums) && strpos($colums,$this->autoinc_id) !== false)
+			elseif (!is_array($colums) && strpos($colums, $this->autoinc_id) !== false)
 			{
-				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/','\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2',$colums);
+				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/', '\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2', $colums);
 			}
 		}
-		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		$num_rows = 0; // as spec. in max_matches in the user-prefs
+		if (is_array($start)) list($start, $num_rows) = $start;
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
-		if ($order_by && stripos($order_by,'GROUP BY') !== false)
+		if ($order_by && stripos($order_by, 'GROUP BY') !== false)
 		{
 			$order_by = $this->fix_group_by_columns($order_by, $colums, $this->table_name, $this->autoinc_id);
 		}
-		elseif ($order_by && stripos($order_by,'ORDER BY')===false && stripos($order_by,'GROUP BY')===false && stripos($order_by,'HAVING')===false)
+		elseif ($order_by && stripos($order_by, 'ORDER BY') === false && stripos($order_by, 'GROUP BY') === false && stripos($order_by, 'HAVING') === false)
 		{
 			$order_by = 'ORDER BY '.$order_by;
 		}
@@ -1047,9 +1047,9 @@ 
 				);
 				if (!$union_cols)	// union used the colum-names of the first query
 				{
-					$union_cols = $this->_get_columns($only_keys,$extra_cols);
+					$union_cols = $this->_get_columns($only_keys, $extra_cols);
 				}
-				return true;	// waiting for further calls, before running the union-query
+				return true; // waiting for further calls, before running the union-query
 			}
 			// running the union query now
 			if ($start !== false)	// need to get the total too, saved in $this->total
@@ -1060,10 +1060,10 @@ 
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->union($union,__LINE__,__FILE__)->NumRows();
+					$this->total = $this->db->union($union, __LINE__, __FILE__)->NumRows();
 				}
 			}
-			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
+			$rs = $this->db->union($union, __LINE__, __FILE__, $order_by, $start, $num_rows);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
 
 			$cols = $union_cols;
@@ -1077,21 +1077,21 @@ 
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
 				}
-				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
+				elseif (!$need_full_no_count && (!$join || stripos($join, 'LEFT JOIN') !== false))
 				{
-					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchColumn();
+					$this->total = $this->db->select($this->table_name, 'COUNT(*)', $query, __LINE__, __FILE__, false, '', $this->app, 0, $join)->fetchColumn();
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->select($this->table_name,$colums,$query,__LINE__,__FILE__,false,$order_by,false,0,$join)->NumRows();
+					$this->total = $this->db->select($this->table_name, $colums, $query, __LINE__, __FILE__, false, $order_by, false, 0, $join)->NumRows();
 				}
 			}
-			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
-				$start,$order_by,$this->app,$num_rows,$join);
+			$rs = $this->db->select($this->table_name, $mysql_calc_rows.$colums, $query, __LINE__, __FILE__,
+				$start, $order_by, $this->app, $num_rows, $join);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
-			$cols = $this->_get_columns($only_keys,$extra_cols);
+			$cols = $this->_get_columns($only_keys, $extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
 
 		if ($mysql_calc_rows)
 		{
@@ -1100,14 +1100,14 @@ 
 		// ToDo: Implement that as an iterator, as $rs is also an interator and we could return one instead of an array
 		if ($this->search_return_iterator)
 		{
-			return new so_sql_db2data_iterator($this,$rs);
+			return new so_sql_db2data_iterator($this, $rs);
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs) foreach ($rs as $row)
 		{
 			$data = array();
-			foreach($cols as $db_col => $col)
+			foreach ($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
 			}
@@ -1138,7 +1138,7 @@ 
 		//error_log(__METHOD__."('$group_by', ..., '$table_name', '$autoinc_id') db->Type=".array2string($GLOBALS['egw']->db->Type));
 		if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
 		{
-			return $group_by;	// nothing to do
+			return $group_by; // nothing to do
 		}
 		$changes = 0;
 		$group_by_cols = preg_split('/, */', trim(substr($matches[1], 9)));
@@ -1148,9 +1148,9 @@ 
 			$columns = preg_split('/, */', $columns);
 
 			// fix columns containing commas as part of function calls
-			for($n = 0; $n < count($columns); ++$n)
+			for ($n = 0; $n < count($columns); ++$n)
 			{
-				$col =& $columns[$n];
+				$col = & $columns[$n];
 				while (substr_count($col, '(') > substr_count($col, ')') && ++$n < count($columns))
 				{
 					$col .= ','.$columns[$n];
@@ -1159,7 +1159,7 @@ 
 			}
 			unset($col);
 		}
-		foreach($columns as $n => $col)
+		foreach ($columns as $n => $col)
 		{
 			if ($col == '*')
 			{
@@ -1172,7 +1172,7 @@ 
 			{
 				if (($pos = stripos($col, 'DISTINCT ')) !== false)
 				{
-					$col = substr($col, $pos+9);
+					$col = substr($col, $pos + 9);
 				}
 				$alias = $col;
 				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
@@ -1190,7 +1190,7 @@ 
 		$ret = $group_by;
 		if ($changes)
 		{
-			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ',  $group_by);
+			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ', $group_by);
 			//error_log(__METHOD__."('$group_by', ".array2string($columns).") group_by_cols=".array2string($group_by_cols)." changed to $ret");
 		}
 		return $ret;
@@ -1206,12 +1206,12 @@ 
 	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
-	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())
+	public function search2criteria($_pattern, &$wildcard = '', &$op = 'AND', $extra_col = null, $search_cols = array())
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
 		if (empty($pattern) || is_array($pattern)) return $pattern;
-		if(strpos($pattern, 'CAST(COALESCE(') !== false)
+		if (strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
 		}
@@ -1227,20 +1227,20 @@ 
 		$numeric_types = array('auto', 'int', 'float', 'double', 'decimal');
 		$numeric_columns = array();
 
-		if(!$search_cols)
+		if (!$search_cols)
 		{
 			$search_cols = $this->get_default_search_columns();
 		}
 		// Concat all fields to be searched together, so the conditions operate across the whole record
-		foreach($search_cols as $col)
+		foreach ($search_cols as $col)
 		{
 			$col_name = $col;
 			$table = $this->table_name;
-			if (strpos($col,'.') !== false)
+			if (strpos($col, '.') !== false)
 			{
-				list($table,$col_name) = explode('.',$col);
+				list($table, $col_name) = explode('.', $col);
 			}
-			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true,$table);
+			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true, $table);
 			if ($table_def['fd'][$col_name] && in_array($table_def['fd'][$col_name]['type'], $numeric_types))
 			{
 				$numeric_columns[] = $col;
@@ -1248,11 +1248,11 @@ 
 			}
 			if ($this->db->Type == 'mysql' && $table_def['fd'][$col_name]['type'] === 'ascii' && preg_match('/[\x80-\xFF]/', $_pattern))
 			{
-				continue;	// will only give sql error
+				continue; // will only give sql error
 			}
-			$columns[] = sprintf($this->db->capabilities[egw_db::CAPABILITY_CAST_AS_VARCHAR],"COALESCE($col,'')");
+			$columns[] = sprintf($this->db->capabilities[egw_db::CAPABILITY_CAST_AS_VARCHAR], "COALESCE($col,'')");
 		}
-		if(!$columns)
+		if (!$columns)
 		{
 			return array();
 		}
@@ -1261,9 +1261,9 @@ 
 		$break = ' ';
 		$token = strtok($pattern, $break);
 
-		while($token)
+		while ($token)
 		{
-			if($token == strtoupper(lang('AND')) || $token == 'AND')
+			if ($token == strtoupper(lang('AND')) || $token == 'AND')
 			{
 				$token = '+'.strtok($break);
 			}
@@ -1276,10 +1276,10 @@ 
 			{
 				$token = '-'.strtok($break);
 			}
-			if ($token[0]=='"')
+			if ($token[0] == '"')
 			{
-				$token = substr($token, 1,strlen($token));
- 				if(substr($token, -1) != '"')
+				$token = substr($token, 1, strlen($token));
+ 				if (substr($token, -1) != '"')
 				{
 					$token .= ' '.strtok('"');
 				}
@@ -1290,16 +1290,16 @@ 
 			}
 
 			// prepend and append extra wildcard %, if pattern does NOT already contain wildcards
-			if (strpos($token,'*') === false && strpos($token,'?') === false)
+			if (strpos($token, '*') === false && strpos($token, '?') === false)
 			{
-				$wildcard = '%';	// if pattern contains no wildcards, add them before AND after the pattern
+				$wildcard = '%'; // if pattern contains no wildcards, add them before AND after the pattern
 			}
 			else
 			{
-				$wildcard = '';		// no extra wildcard, if pattern already contains some
+				$wildcard = ''; // no extra wildcard, if pattern already contains some
 			}
 
-			switch($token[0])
+			switch ($token[0])
 			{
 				case '+':
 					$op = 'AND';
@@ -1314,32 +1314,32 @@ 
 					$op = 'OR';
 					break;
 			}
-			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns).' '.
-				$this->db->capabilities['case_insensitive_like'] . ' ' .
-				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard);
+			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db, 'concat'), $columns).' '.
+				$this->db->capabilities['case_insensitive_like'].' '.
+				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $token).$wildcard);
 
 			// Compare numeric token as equality for numeric columns
 			// skip user-wildcards (*,?) in is_numeric test, but not SQL wildcards, which get escaped and give sql-error
-			if (is_numeric(str_replace(array('*','?'), '', $token)))
+			if (is_numeric(str_replace(array('*', '?'), '', $token)))
 			{
 				$numeric_filter = array();
-				foreach($numeric_columns as $col)
+				foreach ($numeric_columns as $col)
 				{
-					if($wildcard == '')
+					if ($wildcard == '')
 					{
 						// Token has a wildcard from user, use LIKE
-						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) " .
-							$this->db->capabilities['case_insensitive_like'] . ' ' .
-							$GLOBALS['egw']->db->quote(str_replace(array('*','?'), array('%','_'), $token)) . ')';
+						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) ".
+							$this->db->capabilities['case_insensitive_like'].' '.
+							$GLOBALS['egw']->db->quote(str_replace(array('*', '?'), array('%', '_'), $token)).')';
 					}
 					else
 					{
 						$numeric_filter[] = "($col IS NOT NULL AND $col = $token)";
 					}
 				}
-				if(count($numeric_filter) > 0)
+				if (count($numeric_filter) > 0)
 				{
-					$token_filter = '(' . $token_filter . ' OR ' . implode(' OR ', $numeric_filter) . ')';
+					$token_filter = '('.$token_filter.' OR '.implode(' OR ', $numeric_filter).')';
 				}
 			}
 			$criteria[$op][] = $token_filter;
@@ -1347,32 +1347,32 @@ 
 			$token = strtok($break);
 		}
 
-		if($criteria['NOT'])
+		if ($criteria['NOT'])
 		{
-			$filter[] = 'NOT (' . implode(' OR ', $criteria['NOT']) . ') ';
+			$filter[] = 'NOT ('.implode(' OR ', $criteria['NOT']).') ';
 		}
-		if($criteria['AND'])
+		if ($criteria['AND'])
 		{
-			$filter[] = implode(' AND ', $criteria['AND']) . ' ';
+			$filter[] = implode(' AND ', $criteria['AND']).' ';
 		}
-		if($criteria['OR'])
+		if ($criteria['OR'])
 		{
-			$filter[] = '(' . implode(' OR ', $criteria['OR']) . ') ';
+			$filter[] = '('.implode(' OR ', $criteria['OR']).') ';
 		}
 
-		if(count($filter))
+		if (count($filter))
 		{
-			$result = '(' . implode(' AND ', $filter) . ')';
+			$result = '('.implode(' AND ', $filter).')';
 		}
 
 		// OR extra column on the end so a null or blank won't block a hit in the main columns
 		if ($extra_col)
 		{
-			$result .= (strlen($result) ? ' OR ' : ' ') . "$extra_col = " . $GLOBALS['egw']->db->quote($pattern);
+			$result .= (strlen($result) ? ' OR ' : ' ')."$extra_col = ".$GLOBALS['egw']->db->quote($pattern);
 		}
 
 		$op = 'OR';
-		return array('(' . $result . ')');
+		return array('('.$result.')');
 	}
 
 	/**
@@ -1391,21 +1391,21 @@ 
 		$numeric_types = array('auto', 'int', 'float', 'double');
 
 		// Skip some numeric columns that don't make sense to search if we have to default to all columns
-		if(is_null($this->columns_to_search))
+		if (is_null($this->columns_to_search))
 		{
-			foreach($search_cols as $key => &$col)
+			foreach ($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if (!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
 				}
-				if(in_array($this->table_def['fd'][$col]['type'], $numeric_types))
+				if (in_array($this->table_def['fd'][$col]['type'], $numeric_types))
 				{
-					foreach($skip_columns_with as $bad)
+					foreach ($skip_columns_with as $bad)
 					{
-						if(strpos($col, $bad) !== false)
+						if (strpos($col, $bad) !== false)
 						{
 							unset($search_cols[$key]);
 							continue 2;
@@ -1427,7 +1427,7 @@ 
 	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @return array with columns as db-name => internal-name pairs
 	 */
-	function _get_columns($only_keys,$extra_cols)
+	function _get_columns($only_keys, $extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
 		if ($only_keys === true)	// only primary key
@@ -1438,7 +1438,7 @@ 
 		{
 			$cols = array();
 			$distinct_checked = false;
-			foreach(is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
+			foreach (is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
 			{
 				if (!$distinct_checked)
 				{
@@ -1447,17 +1447,17 @@ 
 				}
 				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
 				{
-					$cols = array_merge($cols,$this->db_cols);
+					$cols = array_merge($cols, $this->db_cols);
 				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col, 'as'))	// if there's already an explicit naming of the column, just use it
 					{
-						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
 						$cols[$col] = $col;
 						continue;
 					}
-					if (($db_col = array_search($col,$this->db_cols)) !== false)
+					if (($db_col = array_search($col, $this->db_cols)) !== false)
 					{
 						$cols[$db_col] = $col;
 					}
@@ -1470,10 +1470,10 @@ 
 		}
 		if ($extra_cols)	// extra columns to report
 		{
-			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
+			foreach (is_array($extra_cols) ? $extra_cols : explode(',', $extra_cols) as $col)
 			{
-				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
-				if (($db_col = array_search($col,$this->db_cols)) !== false)
+				if (stripos($col, 'as ') !== false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
+				if (($db_col = array_search($col, $this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
 				}
@@ -1500,12 +1500,12 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		unset($readonlys);	// required by function signature, but not used in this default implementation
-		if ((int) $this->debug >= 4)
+		unset($readonlys); // required by function signature, but not used in this default implementation
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::get_rows(".print_r($query,true).",,)</p>\n";
+			echo "<p>so_sql::get_rows(".print_r($query, true).",,)</p>\n";
 		}
 		$criteria = array();
 		$op = 'AND';
@@ -1513,11 +1513,11 @@ 
 		{
 			$criteria = $query['search'];
 		}
-		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
-			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
-			$query['col_filter'],$join,$need_full_no_count);
+		$rows = $this->search($criteria, $only_keys, $query['order'] ? $query['order'].' '.$query['sort'] : '', $extra_cols,
+			'', false, $op, $query['num_rows'] ? array((int)$query['start'], $query['num_rows']) : (int)$query['start'],
+			$query['col_filter'], $join, $need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1528,7 +1528,7 @@ 
 	 * @param array $data =null data-set to check, defaults to $this->data
 	 * @return int 0: all keys are unique, 1: first key not unique, 2: ...
 	 */
-	function not_unique($data=null)
+	function not_unique($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -1541,12 +1541,12 @@ 
 		{
 			$uni_keys[] = $this->db_key_cols;
 		}
-		foreach($uni_keys as $db_col => $col)
+		foreach ($uni_keys as $db_col => $col)
 		{
 			if (is_array($col))
 			{
 				$query = array();
-				foreach($col as $db_c => $c)
+				foreach ($col as $db_c => $c)
 				{
 					$query[$db_c] = $data[$c];
 				}
@@ -1555,17 +1555,17 @@ 
 			{
 				$query = array($db_col => $data[$col]);
 			}
-			foreach($this->db->select($this->table_name,$this->db_key_cols,$query,__LINE__,__FILE__,false,'',$this->app) as $other)
+			foreach ($this->db->select($this->table_name, $this->db_key_cols, $query, __LINE__, __FILE__, false, '', $this->app) as $other)
 			{
-				foreach($this->db_key_cols as $key_col)
+				foreach ($this->db_key_cols as $key_col)
 				{
 					if ($data[$key_col] != $other[$key_col])
 					{
-						if ((int) $this->debug >= 4)
+						if ((int)$this->debug >= 4)
 						{
 							echo "<p>not_unique in ".array2string($col)." as for '$key_col': '${data[$key_col]}' != '${other[$key_col]}'</p>\n";
 						}
-						return $n;	// different entry => $n not unique
+						return $n; // different entry => $n not unique
 					}
 				}
 			}
@@ -1586,7 +1586,7 @@ 
 	 * @param string $order ='' order, default '' = same as (first) $value_col
 	 * @return array with key_col => value_col pairs or array if more then one value_col given (keys as in value_col)
 	 */
-	function query_list($value_col,$key_col='',$filter=array(),$order='')
+	function query_list($value_col, $key_col = '', $filter = array(), $order = '')
 	{
 		static $cache = array();
 
@@ -1599,16 +1599,16 @@ 
 		if (!is_array($value_col)) $value_col = array($value_col);
 
 		$cols = $ret = array();
-		foreach($value_col as $key => $col)
+		foreach ($value_col as $key => $col)
 		{
 			$matches = null;
-			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
+			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i', $col, $matches) ? $matches[1] : $col;
 		}
 		if (!$order) $order = current($cols);
 
-		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
+		if (($search = & $this->search(array(), ($key_col ? $key_col.',' : 'DISTINCT ').implode(',', $value_col), $order, '', '', false, 'AND', false, $filter)))
 		{
-			if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches))
+			if (preg_match('/AS ([a-z_0-9]+)$/i', $key_col, $matches))
 			{
 				$key_col = $matches[1];
 			}
@@ -1616,12 +1616,12 @@ 
 			{
 				$key_col = current($cols);
 			}
-			foreach($search as $row)
+			foreach ($search as $row)
 			{
 				if (count($cols) > 1)
 				{
 					$data = array();
-					foreach($cols as $key => $col)
+					foreach ($cols as $key => $col)
 					{
 						$data[$key] = $row[$col];
 					}
@@ -1633,7 +1633,7 @@ 
 				if ($data) $ret[$row[$key_col]] = $data;
 			}
 		}
-		return $cache[$cache_key] =& $ret;
+		return $cache[$cache_key] = & $ret;
 	}
 
 	/**
@@ -1642,13 +1642,13 @@ 
 	 * @param string $column =null name of column or null for all (default)
 	 * @return array|string array with internal-name => comment pairs, or string with comment, if $column given
 	 */
-	public function get_comments($column=null)
+	public function get_comments($column = null)
 	{
-		static $comments=null;
+		static $comments = null;
 
 		if (is_null($comments))
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				$comments[$col] = $this->table_def['fd'][$db_col]['comment'];
 			}
@@ -1690,13 +1690,13 @@ 
 	 * @param so_sql $so_sql
 	 * @param Traversable $rs
 	 */
-	public function __construct(so_sql $so_sql,Traversable $rs=null)
+	public function __construct(so_sql $so_sql, Traversable $rs = null)
 	{
 		$this->so_sql = $so_sql;
 
 		$this->total = $so_sql->total;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -1713,7 +1713,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$data = $this->rs->current();
 
@@ -1729,7 +1729,7 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->key();
 		}
@@ -1741,7 +1741,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -1752,7 +1752,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -1763,9 +1763,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

Braces +189 added lines, -50 removed lines

@@ -196,9 +196,15 @@ 
 		{
 			$this->app = $app;
 
-			if (!$no_clone) $this->db->set_app($app);
+			if (!$no_clone)
+			{
+				$this->db->set_app($app);
+			}
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table)
+			{
+				$this->setup_table($app,$table,$column_prefix);
+			}
 		}
 		$this->init();
 
@@ -219,7 +225,10 @@ 
 	 */
 	public function set_times($timestamp_type=false)
 	{
-		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
+		if ($timestamp_type !== false)
+		{
+			$this->timestamp_type = $timestamp_type;
+		}
 
 		// set current time
 		switch($this->timestamp_type)
@@ -287,7 +296,10 @@ 
 			{
 				$this->autoinc_id = $col;
 			}
-			if ($def['type'] == 'bool') $this->has_bools = true;
+			if ($def['type'] == 'bool')
+			{
+				$this->has_bools = true;
+			}
 
 			foreach($this->table_def['uc'] as $k => $uni_index)
 			{
@@ -326,7 +338,10 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		}
 
 		if (!is_array($new) || !count($new))
 		{
@@ -350,7 +365,10 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int) $this->debug >= 4)
+		{
+			_debug_array($this->data);
+		}
 	}
 
 	/**
@@ -494,7 +512,10 @@ 
 		if (!is_array($keys))
 		{
 			$pk = array_values($this->db_key_cols);
-			if ($pk) $keys = array($pk[0] => $keys);
+			if ($pk)
+			{
+				$keys = array($pk[0] => $keys);
+			}
 		}
 
 		$this->init($keys);
@@ -508,13 +529,16 @@ 
 				$query[$db_col] = $this->data[$col];
 			}
 		}
-		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
+		if (!$query)
+		{
+			// no primary key in keys, lets try the data_cols for a unique key
 		{
 			foreach($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 				elseif(is_array($col))
 				{
@@ -528,31 +552,43 @@ 
 						}
 						$q[$db_c] = $this->data[$c];
 					}
-					if ($q) $query += $q;
+					if ($q)
+					{
+						$query += $q;
+					}
 				}
 			}
 		}
-		if (!$query)	// no unique key in keys, lets try everything else
+		if (!$query)
+		{
+			// no unique key in keys, lets try everything else
 		{
 			foreach($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 			}
 		}
-		if (!$query)	// keys has no cols
+		if (!$query)
+		{
+			// keys has no cols
 		{
 			$this->db2data();
+		}
 
 			return False;
 		}
-		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
+		if ($join)
+		{
+			// Prefix the columns with the table-name, as they might exist in the join
 		{
 			foreach($query as $col => $val)
 			{
 				if (is_int($col) || strpos($join,$col) === false) continue;
+		}
 				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
 				unset($query[$col]);
 			}
@@ -561,11 +597,14 @@ 
 			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
 		{
 			$cols = $this->db_cols;
-			if ($extra_cols)	// extra columns to report
+			if ($extra_cols)
+			{
+				// extra columns to report
 			{
 				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
 					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+			}
 					$cols[$col] = $col;
 				}
 			}
@@ -588,7 +627,10 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "nothing found !!!</p>\n";
+		}
 
 		$this->db2data();
 
@@ -604,7 +646,10 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		// check if data contains user timezone during read AND user changed timezone since then
 		// --> load old timezone for the rest of this request
@@ -621,9 +666,13 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int) $this->debug >= 4)
+		{
+echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
-		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
+		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])
+		{
+			// insert with auto id
 		{
 			foreach($this->db_cols as $db_col => $col)
 			{
@@ -633,7 +682,9 @@ 
 						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue;
+		}
+		// no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
@@ -664,9 +715,13 @@ 
 				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
 					($this->autoinc_id ||			// update of table with auto id or
 					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
-					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
+					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))
+				{
+					// column is nullable
 				{
-					continue;	// no need to write that (unset) column
+					continue;
+				}
+				// no need to write that (unset) column
 				}
 				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
@@ -683,9 +738,12 @@ 
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
-			if (!$data && !$this->autoinc_id)	// happens if all columns are in the primary key
+			if (!$data && !$this->autoinc_id)
+			{
+				// happens if all columns are in the primary key
 			{
 				$data = $keys;
+			}
 				$keys = False;
 			}
 			if ($this->autoinc_id)
@@ -716,7 +774,10 @@ 
 	 */
 	function update($_fields,$merge=true)
 	{
-		if ($merge) $this->data_merge($_fields);
+		if ($merge)
+		{
+			$this->data_merge($_fields);
+		}
 
 		$fields = $this->data2db($_fields);
 
@@ -769,9 +830,12 @@ 
 		{
 			$keys = array($this->autoinc_id => $keys);
 		}
-		if (!is_array($keys) || !count($keys))	// use internal data
+		if (!is_array($keys) || !count($keys))
+		{
+			// use internal data
 		{
 			$data = $this->data;
+		}
 			$keys = $this->db_key_cols;
 		}
 		else	// data and keys are supplied in $keys
@@ -791,7 +855,10 @@ 
 		{
 			$query[$db_col] = $data[$col];
 		}
-		if ($only_return_query) return $query;
+		if ($only_return_query)
+		{
+			return $query;
+		}
 
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
@@ -824,7 +891,10 @@ 
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		}
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
@@ -888,9 +958,12 @@ 
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col,'.') !== false)
+					{
+						// we have a table-name specified
 					{
 						list($table,$only_col) = explode('.',$db_col);
+					}
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -915,13 +988,17 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND')
+			{
+				$query = $this->db->column_data_implode(' '.$op.' ',$query);
+			}
 		}
 		if (is_array($filter))
 		{
 			$db_filter = array();
 			$data2db_filter = $this->data2db($filter);
-			if (!is_array($data2db_filter)) {
+			if (!is_array($data2db_filter))
+			{
 				echo function_backtrace()."<br/>\n";
 				echo "filter=";_debug_array($filter);
 				echo "data2db(filter)=";_debug_array($data2db_filter);
@@ -1017,7 +1094,10 @@ 
 			}
 		}
 		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		if (is_array($start))
+		{
+			list($start,$num_rows) = $start;
+		}
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
 		if ($order_by && stripos($order_by,'GROUP BY') !== false)
@@ -1045,18 +1125,24 @@ 
 					'append' => $order_by,
 					'join'   => $join,
 				);
-				if (!$union_cols)	// union used the colum-names of the first query
+				if (!$union_cols)
+				{
+					// union used the colum-names of the first query
 				{
 					$union_cols = $this->_get_columns($only_keys,$extra_cols);
 				}
+				}
 				return true;	// waiting for further calls, before running the union-query
 			}
 			// running the union query now
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
+			}
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -1064,18 +1150,24 @@ 
 				}
 			}
 			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 
 			$cols = $union_cols;
 			$union = $union_cols = array();
 		}
 		else	// no UNION
 		{
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
+			}
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
@@ -1088,10 +1180,16 @@ 
 			}
 			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
 				$start,$order_by,$this->app,$num_rows,$join);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 			$cols = $this->_get_columns($only_keys,$extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		}
 
 		if ($mysql_calc_rows)
 		{
@@ -1104,9 +1202,12 @@ 
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs)
+		{
+			foreach($rs as $row)
 		{
 			$data = array();
+		}
 			foreach($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
@@ -1175,9 +1276,15 @@ 
 					$col = substr($col, $pos+9);
 				}
 				$alias = $col;
-				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
+				if (stripos($col, ' AS '))
+				{
+					list($col, $alias) = preg_split('/ +AS +/i', $col);
+				}
 				// do NOT group by constant expressions
-				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col)) continue;
+				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col))
+				{
+					continue;
+				}
 				if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
 				{
 					// instead of aliased primary key, we have to use original column incl. table-name as alias is ambigues
@@ -1210,7 +1317,10 @@ 
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
-		if (empty($pattern) || is_array($pattern)) return $pattern;
+		if (empty($pattern) || is_array($pattern))
+		{
+			return $pattern;
+		}
 		if(strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
@@ -1280,7 +1390,7 @@ 
 			{
 				$token = substr($token, 1,strlen($token));
  				if(substr($token, -1) != '"')
-				{
+ 				{
 					$token .= ' '.strtok('"');
 				}
 				else
@@ -1396,7 +1506,8 @@ 
 			foreach($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols)))
+				{
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
@@ -1430,10 +1541,13 @@ 
 	function _get_columns($only_keys,$extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
-		if ($only_keys === true)	// only primary key
+		if ($only_keys === true)
+		{
+			// only primary key
 		{
 			$cols = $this->db_key_cols;
 		}
+		}
 		else
 		{
 			$cols = array();
@@ -1442,18 +1556,27 @@ 
 			{
 				if (!$distinct_checked)
 				{
-					if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
+					if (stripos($col, 'DISTINCT ') === 0)
+					{
+						$col = substr($col, 9);
+					}
 					$distinct_checked = true;
 				}
-				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
+				if (!$col || $col == '*' || $col == $this->table_name.'.*')
+				{
+					// all columns
 				{
 					$cols = array_merge($cols,$this->db_cols);
 				}
+				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col,'as'))
+					{
+						// if there's already an explicit naming of the column, just use it
 					{
 						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+					}
 						$cols[$col] = $col;
 						continue;
 					}
@@ -1468,11 +1591,14 @@ 
 				}
 			}
 		}
-		if ($extra_cols)	// extra columns to report
+		if ($extra_cols)
+		{
+			// extra columns to report
 		{
 			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
 			{
 				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+		}
 				if (($db_col = array_search($col,$this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
@@ -1517,7 +1643,11 @@ 
 			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows)
+		{
+			$rows = array();
+		}
+		// otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1596,7 +1726,10 @@ 
 		{
 			return $cache[$cache_key];
 		}
-		if (!is_array($value_col)) $value_col = array($value_col);
+		if (!is_array($value_col))
+		{
+			$value_col = array($value_col);
+		}
 
 		$cols = $ret = array();
 		foreach($value_col as $key => $col)
@@ -1604,7 +1737,10 @@ 
 			$matches = null;
 			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
 		}
-		if (!$order) $order = current($cols);
+		if (!$order)
+		{
+			$order = current($cols);
+		}
 
 		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
 		{
@@ -1630,7 +1766,10 @@ 
 				{
 					$data = $row[current($cols)];
 				}
-				if ($data) $ret[$row[$key_col]] = $data;
+				if ($data)
+				{
+					$ret[$row[$key_col]] = $data;
+				}
 			}
 		}
 		return $cache[$cache_key] =& $ret;

etemplate/inc/class.so_sql2.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * @param string $table should be set if table-defs to be read from <app>/setup/tables_current.inc.php
 	 * @param object/db $db database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
 	 * @param string $colum_prefix='' column prefix to automatic remove from the column-name, if the column name starts with it
-	 * @param boolean $no_clone=false can we avoid to clone the db-object, default no
+	 * @param boolean $no_clone can we avoid to clone the db-object, default no
 	 * 	new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object
 	 *
 	 * @return so_sql2

Spacing +9 added lines, -9 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @return so_sql2
 	 */
-	function __construct($app='',$table='',$db=null,$column_prefix='',$no_clone=false)
+	function __construct($app = '', $table = '', $db = null, $column_prefix = '', $no_clone = false)
 	{
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -63,9 +63,9 @@ 
 	 *
 	 * @deprecated use __construct
 	 */
-	function so_sql2($app='',$table='',$db=null,$column_prefix='',$no_clone=false)
+	function so_sql2($app = '', $table = '', $db = null, $column_prefix = '', $no_clone = false)
 	{
-		self::__construct($app,$table,$db,$column_prefix,$no_clone);
+		self::__construct($app, $table, $db, $column_prefix, $no_clone);
 	}
 
 	/**
@@ -78,13 +78,13 @@ 
 	 */
 	function __get($property)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			return $this->data[$property];
 		}
@@ -98,15 +98,15 @@ 
 	 * @param string $property
 	 * @param mixed $value
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
-		switch($property)
+		switch ($property)
 		{
 			case 'id':
 				$property = $this->autoinc_id;
 				break;
 		}
-		if (in_array($property,$this->db_cols) || in_array($property,$this->non_db_cols))
+		if (in_array($property, $this->db_cols) || in_array($property, $this->non_db_cols))
 		{
 			$this->data[$property] = $value;
 		}

etemplate/inc/class.so_sql_cf.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
-	 * @param mixed $only_keys =false, see search
+	 * @param boolean $only_keys =false, see search
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
@@ -734,7 +734,7 @@ 
 	 * Check if cf is stored as 1:N relation in DB and array in memory
 	 *
 	 * @param string $name
-	 * @return string
+	 * @return boolean
 	 */
 	function is_multiple($name)
 	{

Indentation +6 added lines, -6 removed lines

@@ -207,12 +207,12 @@
 	}
 
 	/**
-	* saves custom field data
-	*
-	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
-	* @param array $extra_cols =array()
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves custom field data
+	 *
+	 * @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	 * @param array $extra_cols =array()
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save_customfields($data, array $extra_cols=array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)

Spacing +100 added lines, -102 removed lines

@@ -115,41 +115,41 @@ 
 	 * @param boolean $allow_multiple_values =false should we allow AND store multiple values (1:N relations)
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use egw_time objects
 	 */
-	function __construct($app,$table,$extra_table,$column_prefix='',
-		$extra_key='_name',$extra_value='_value',$extra_id='_id',
-		$db=null,$no_clone=true,$allow_multiple_values=false,$timestamp_type=null)
+	function __construct($app, $table, $extra_table, $column_prefix = '',
+		$extra_key = '_name', $extra_value = '_value', $extra_id = '_id',
+		$db = null, $no_clone = true, $allow_multiple_values = false, $timestamp_type = null)
 	{
 		// calling the so_sql constructor
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone,$timestamp_type);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone, $timestamp_type);
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id) $this->extra_id = $this->autoinc_id; // default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
-		if (!($prefix=$column_prefix))
+		if (!($prefix = $column_prefix))
 		{
-			list($prefix) = explode('_',$this->autoinc_id);
+			list($prefix) = explode('_', $this->autoinc_id);
 		}
-		elseif(substr($prefix,-1) == '_')
+		elseif (substr($prefix, -1) == '_')
 		{
-			$prefix = substr($prefix,0,-1);	// remove trailing underscore from column prefix parameter
+			$prefix = substr($prefix, 0, -1); // remove trailing underscore from column prefix parameter
 		}
-		foreach(array(
+		foreach (array(
 			'extra_id' => $extra_id,
 			'extra_key' => $extra_key,
 			'extra_value' => $extra_value
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_') $this->$col = $prefix.$val;
 		}
 		// some sanity checks, maybe they should be active only for development
-		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
+		if (!($extra_defs = $this->db->get_table_definitions($app, $extra_table)))
 		{
 			throw new egw_exception_wrong_parameter("extra table $extra_table is NOT defined!");
 		}
-		foreach(array('extra_id','extra_key','extra_value') as $col)
+		foreach (array('extra_id', 'extra_key', 'extra_value') as $col)
 		{
 			if (!$this->$col || !isset($extra_defs['fd'][$this->$col]))
 			{
@@ -174,23 +174,23 @@ 
 	 * @param array $field_names =null custom fields to read, default all
 	 * @return array id => $this->cf_field(name) => value
 	 */
-	function read_customfields($ids,$field_names=null)
+	function read_customfields($ids, $field_names = null)
 	{
 		if (is_null($field_names)) $field_names = array_keys($this->customfields);
 
-		foreach((array)$ids as $key => $id)
+		foreach ((array)$ids as $key => $id)
 		{
 			if (!(int)$id && is_array($ids)) unset($ids[$key]);
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names) return array(); // nothing to do
 
 		$entries = array();
-		foreach($this->db->select($this->extra_table,'*',array(
+		foreach ($this->db->select($this->extra_table, '*', array(
 			$this->extra_id => $ids,
 			$this->extra_key => $field_names,
-		),__LINE__,__FILE__,false,'',$this->app) as $row)
+		), __LINE__, __FILE__, false, '', $this->app) as $row)
 		{
-			$entry =& $entries[$row[$this->extra_id]];
+			$entry = & $entries[$row[$this->extra_id]];
 			if (!is_array($entry)) $entry = array();
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
@@ -213,7 +213,7 @@ 
 	* @param array $extra_cols =array()
 	* @return bool false on success, errornumber on failure
 	*/
-	function save_customfields($data, array $extra_cols=array())
+	function save_customfields($data, array $extra_cols = array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
@@ -226,22 +226,21 @@ 
 			$is_multiple = $this->is_multiple($name);
 
 			// we explicitly need to delete fields, if value is empty or field allows multiple values or we have no unique index
-			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
+			if (empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
-				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				$this->db->delete($this->extra_table, $where, __LINE__, __FILE__, $this->app);
+				if (empty($data[$field])) continue; // nothing else to do for empty values
 			}
-			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
-				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
+			foreach ($is_multiple && !is_array($data[$field]) ? explode(',', $data[$field]) : // regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
 				(array)(!$is_multiple && is_array($data[$field]) ? implode(',', $data[$field]) : $data[$field]) as $value)
 			{
-				if (!$this->db->insert($this->extra_table,array($this->extra_value => $value)+$extra_cols,$where,__LINE__,__FILE__,$this->app))
+				if (!$this->db->insert($this->extra_table, array($this->extra_value => $value) + $extra_cols, $where, __LINE__, __FILE__, $this->app))
 				{
 					return $this->db->Errno;
 				}
 			}
 		}
-		return false;	// no error
+		return false; // no error
 	}
 
 	/**
@@ -257,7 +256,7 @@ 
 
 		if ($this->customfields)
 		{
-			foreach(array_keys($this->customfields) as $name)
+			foreach (array_keys($this->customfields) as $name)
 			{
 				if (isset($new[$field = $this->get_cf_field($name)]))
 				{
@@ -277,16 +276,16 @@ 
 	 * @param string $join sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
-		if (!parent::read($keys,$extra_cols,$join))
+		if (!parent::read($keys, $extra_cols, $join))
 		{
 			return false;
 		}
 		if (($id = (int)$this->data[$this->db_key_cols[$this->autoinc_id]]) && $this->customfields &&
 			($cfs = $this->read_customfields($id)))
 		{
-			$this->data = array_merge($this->data,$cfs[$id]);
+			$this->data = array_merge($this->data, $cfs[$id]);
 		}
 		return $this->data;
 	}
@@ -300,14 +299,14 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
 			$keys = null;
 		}
-		$ret = parent::save($keys,$extra_where);
+		$ret = parent::save($keys, $extra_where);
 
 		if ($ret == 0 && $this->customfields)
 		{
@@ -325,26 +324,26 @@ 
 	 * @param boolean $only_return_ids =false return $ids of delete call to db object, but not run it (can be used by extending classes!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_ids=false)
+	function delete($keys = null, $only_return_ids = false)
 	{
 		if ($this->customfields || $only_return_ids)
 		{
-			$query = parent::delete($keys,true);
+			$query = parent::delete($keys, true);
 			// check if query contains more then the id's
 			if (!isset($query[$this->autoinc_id]) || count($query) != 1)
 			{
-				foreach($this->db->select($this->table_name,$this->autoinc_id,$query,__LINE__,__FILE__,false,'',$this->app) as $row)
+				foreach ($this->db->select($this->table_name, $this->autoinc_id, $query, __LINE__, __FILE__, false, '', $this->app) as $row)
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids) return 0; // no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
 			if ($only_return_ids) return $ids;
-			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, array($this->extra_id => $ids), __LINE__, __FILE__);
 		}
 		return parent::delete($keys);
 	}
@@ -367,32 +366,32 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		parent::get_rows($query,$rows,$readonlys,$join,$need_full_no_count,$only_keys,$extra_cols);
+		parent::get_rows($query, $rows, $readonlys, $join, $need_full_no_count, $only_keys, $extra_cols);
 
-		$selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
+		$selectcols = $query['selectcols'] ? explode(',', $query['selectcols']) : array();
 
-		if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
+		if ($rows && $this->customfields && (!$selectcols || in_array('customfields', $selectcols)))
 		{
 			$id2keys = array();
-			foreach($rows as $key => $row)
+			foreach ($rows as $key => $row)
 			{
 				$id2keys[$row[$this->db_key_cols[$this->autoinc_id]]] = $key;
 			}
 			// check if only certain cf's to show
 			if (!in_array('customfields', $selectcols))
 			{
-				foreach($selectcols as $col)
+				foreach ($selectcols as $col)
 				{
 					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
 				}
 			}
-			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
+			if (($cfs = $this->read_customfields(array_keys($id2keys), $fields)))
 			{
-				foreach($cfs as $id => $data)
+				foreach ($cfs as $id => $data)
 				{
-					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
+					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]], $data);
 				}
 			}
 		}
@@ -419,12 +418,12 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
 		if (!$this->customfields)
 		{
-			return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+			return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 		}
 		if ($only_keys === false)
 		{
@@ -433,7 +432,7 @@ 
 		// if string given as criteria --> search in all (or $this->columns_to_search) columns including custom fields
 		if ($criteria && is_string($criteria))
 		{
-			$criteria = $this->search2criteria($criteria,$wildcard,$op);
+			$criteria = $this->search2criteria($criteria, $wildcard, $op);
 		}
 		if ($criteria && is_array($criteria))
 		{
@@ -442,10 +441,10 @@ 
 			{
 				if (($negate = $criteria[$this->extra_value][0] === '!'))
 				{
-					$criteria[$this->extra_value] = substr($criteria[$this->extra_value],1);
+					$criteria[$this->extra_value] = substr($criteria[$this->extra_value], 1);
 				}
-				$criteria[] = $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-					$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
+				$criteria[] = $this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+					$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
 					$this->db->quote($wildcard.$criteria[$this->extra_value].$wildcard);
 				unset($criteria[$this->extra_value]);
 			}
@@ -454,14 +453,14 @@ 
 			{
 				if ($criteria[$this->autoinc_id])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.',
 						array($this->autoinc_id => $criteria[$this->autoinc_id]));
 				}
 				unset($criteria[$this->autoinc_id]);
 			}
 			// replace ambiguous column with (an exact match of) table_name.column
 			$extra_join_added = $join && strpos($join, $this->extra_join) !== false;
-			foreach($criteria as $name => $val)
+			foreach ($criteria as $name => $val)
 			{
 				// only add extra_join, if we really need it
 				if (!$extra_join_added && (
@@ -473,9 +472,9 @@ 
 					$extra_join_added = true;
 				}
 				$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
-				if(is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
+				if (is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 						array_search($name, $this->db_cols) => $val,
 					));
 					unset($criteria[$name]);
@@ -487,12 +486,12 @@ 
 						$name = substr($name, 1);
 						if (($negate = $criteria[$name][0] === '!'))
 						{
-							$val = substr($val,1);
+							$val = substr($val, 1);
 						}
-						$cfcriteria[] = '(' . $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-							$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
-							$this->db->quote($wildcard.$val.$wildcard) . ' AND ' .
-							$this->extra_table.'.'.$this->extra_key . ' = ' . $this->db->quote($name) .
+						$cfcriteria[] = '('.$this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+							$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
+							$this->db->quote($wildcard.$val.$wildcard).' AND '.
+							$this->extra_table.'.'.$this->extra_key.' = '.$this->db->quote($name).
 							')';
 						unset($criteria[self::CF_PREFIX.$name]);
 					}
@@ -504,38 +503,38 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op == 'OR') $criteria[] = implode(' OR ', $cfcriteria);
 		}
-		if($only_keys === true)
+		if ($only_keys === true)
 		{
 			// Expand to keys here, so table_name can be prepended below
 			$only_keys = array_values($this->db_key_cols);
 		}
 		// replace ambiguous column with (an exact match of) table_name.column
-		if(is_array($only_keys))
+		if (is_array($only_keys))
 		{
-			foreach($only_keys as $key => &$col)
+			foreach ($only_keys as $key => &$col)
 			{
-				if(is_numeric($key) && in_array($col, $this->db_cols, true))
+				if (is_numeric($key) && in_array($col, $this->db_cols, true))
 				{
-					$col = $this->table_name .'.'.array_search($col, $this->db_cols).' AS '.$col;
+					$col = $this->table_name.'.'.array_search($col, $this->db_cols).' AS '.$col;
 				}
 			}
 		}
 		// check if we order by a custom field --> join cf table for given cf and order by it's value
-		if (strpos($order_by,self::CF_PREFIX) !== false)
+		if (strpos($order_by, self::CF_PREFIX) !== false)
 		{
 			// fields to order by, as cutomfields may have names with spaces, we examine each order by criteria
-			$fields2order = explode(',',$order_by);
-			foreach($fields2order as $v)
+			$fields2order = explode(',', $order_by);
+			foreach ($fields2order as $v)
 			{
-				if (strpos($v,self::CF_PREFIX) !== false)
+				if (strpos($v, self::CF_PREFIX) !== false)
 				{
 					// we found a customfield, so we split that part by space char in order to get Sorting Direction and Fieldname
-					$buff = explode(' ',trim($v));
+					$buff = explode(' ', trim($v));
 					$orderDir = array_pop($buff);
-					$key = substr(trim(implode(' ',$buff)), 1);
-					switch($this->customfields[$key]['type'])
+					$key = substr(trim(implode(' ', $buff)), 1);
+					switch ($this->customfields[$key]['type'])
 					{
 						case 'int':
 							$order_by = str_replace($v, 'extra_order.'.$this->extra_value.' IS NULL,'.
@@ -568,26 +567,26 @@ 
 		{
 			$_cfnames = array_keys($this->customfields);
 			$extra_filter = null;
-			foreach($filter as $name => $val)
+			foreach ($filter as $name => $val)
 			{
 				// replace ambiguous auto-id with (an exact match of) table_name.autoid
 				if (is_string($name) && $name == $this->autoinc_id)
 				{
 					if ((int)$filter[$this->autoinc_id])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							$this->autoinc_id => $filter[$this->autoinc_id],
 						));
 					}
 					unset($filter[$this->autoinc_id]);
 				}
 				// replace ambiguous column with (an exact match of) table_name.column
-				elseif (is_string($name) && $val!=null && in_array($name, $this->db_cols))
+				elseif (is_string($name) && $val != null && in_array($name, $this->db_cols))
 				{
 					$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
 					if ($extra_columns['fd'][array_search($name, $this->db_cols)])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							array_search($name, $this->db_cols) => $val,
 						));
 						unset($filter[$name]);
@@ -599,61 +598,61 @@ 
 					{
 						if ($val[0] === '!')	// negative filter
 						{
-							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val, 1));
 						}
 						else	// using egw_db::expression to allow to use array() with possible values or NULL
 						{
-							if($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
+							if ($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
 								$this->customfields[$this->get_cf_name($name)]['rows'] > 1)
 							{
 								// Multi-select - any entry with the filter value selected matches
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array(
-										$this->db->concat("','",$this->extra_value,"','").' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array(
+										$this->db->concat("','", $this->extra_value, "','").' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
 									))
 								);
 							}
 							elseif ($this->customfields[$this->get_cf_name($name)]['type'] == 'text')
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.$this->extra_value,
-										$this->db->expression($this->extra_table,array(
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.$this->extra_value,
+										$this->db->expression($this->extra_table, array(
 										$this->extra_value.' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($wildcard.$val.$wildcard)
 									))
 								);
 							}
 							else
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array($this->extra_value => $val)));
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array($this->extra_value => $val)));
 							}
 						}
 						// need to use a LEFT JOIN for negative search or to allow NULL values
-						$need_left_join = $val[0] === '!' || strpos($sql_filter,'IS NULL') !== false ? ' LEFT ' : '';
-						$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$need_left_join.$this->extra_join_filter.
+						$need_left_join = $val[0] === '!' || strpos($sql_filter, 'IS NULL') !== false ? ' LEFT ' : '';
+						$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $need_left_join.$this->extra_join_filter.
 							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($name)).
 							' AND '.$sql_filter);
 						++$extra_filter;
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif (is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
 				{
-					$_cf = explode(' ',$val);
-					foreach($_cf as $cf_np)
+					$_cf = explode(' ', $val);
+					foreach ($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)
-						$tcf_name = ($tcf_name?$tcf_name.' ':'').$cf_np;
+						$tcf_name = ($tcf_name ? $tcf_name.' ' : '').$cf_np;
 						// reacts on the first one found that matches an existing customfield, should be better then the old behavior of
 						// simply splitting by " " and using the first part
-						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn,(array)$_cfnames,true)!==false )
+						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn, (array)$_cfnames, true) !== false)
 						{
 							$cf = $tcf_name;
 							break;
 						}
 					}
-					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+					$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $this->extra_join_filter.
 						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)).
-						' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
+						' AND '.str_replace($cf, 'extra_filter.'.$this->extra_value, $val));
 					++$extra_filter;
 					unset($filter[$name]);
 				}
@@ -665,15 +664,14 @@ 
 			if (is_array($only_keys))
 			{
 				$only_keys = array_values($only_keys);
-				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] :
-					$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
+				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] : $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
 			}
 			else
 			{
 				$only_keys = 'DISTINCT '.$only_keys;
 			}
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -713,7 +711,7 @@ 
 	 */
 	function get_cf_name($field)
 	{
-		return substr($field,1);
+		return substr($field, 1);
 	}
 
 	/**
@@ -735,7 +733,7 @@ 
 	 */
 	function is_multiple($name)
 	{
-		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'],array('select','select-account')) &&
+		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'], array('select', 'select-account')) &&
 			$this->customfields[$name]['rows'] > 1;
 	}
 

Braces +64 added lines, -15 removed lines

@@ -127,7 +127,11 @@ 
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id)
+		{
+			$this->extra_id = $this->autoinc_id;
+		}
+		// default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
 		if (!($prefix=$column_prefix))
@@ -145,7 +149,10 @@ 
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_')
+			{
+				$this->$col = $prefix . $val;
+			}
 		}
 		// some sanity checks, maybe they should be active only for development
 		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
@@ -179,13 +186,23 @@ 
 	 */
 	function read_customfields($ids,$field_names=null)
 	{
-		if (is_null($field_names)) $field_names = array_keys($this->customfields);
+		if (is_null($field_names))
+		{
+			$field_names = array_keys($this->customfields);
+		}
 
 		foreach((array)$ids as $key => $id)
 		{
-			if (!(int)$id && is_array($ids)) unset($ids[$key]);
+			if (!(int)$id && is_array($ids))
+			{
+				unset($ids[$key]);
+			}
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names)
+		{
+			return array();
+		}
+		// nothing to do
 
 		$entries = array();
 		foreach($this->db->select($this->extra_table,'*',array(
@@ -194,7 +211,10 @@ 
 		),__LINE__,__FILE__,false,'',$this->app) as $row)
 		{
 			$entry =& $entries[$row[$this->extra_id]];
-			if (!is_array($entry)) $entry = array();
+			if (!is_array($entry))
+			{
+				$entry = array();
+			}
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
 			if ($this->allow_multiple_values && $this->is_multiple($row[$this->extra_key]))
@@ -220,7 +240,10 @@ 
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
-			if (!isset($data[$field = $this->get_cf_field($name)])) continue;
+			if (!isset($data[$field = $this->get_cf_field($name)]))
+			{
+				continue;
+			}
 
 			$where = array(
 				$this->extra_id    => isset($data[$this->autoinc_id]) ? $data[$this->autoinc_id] : $data[$this->db_key_cols[$this->autoinc_id]],
@@ -232,7 +255,11 @@ 
 			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				if (empty($data[$field]))
+				{
+					continue;
+				}
+				// nothing else to do for empty values
 			}
 			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
 				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
@@ -305,9 +332,12 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
+		if (is_array($keys) && count($keys) && !isset($keys[0]))
+		{
+			// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
+		}
 			$keys = null;
 		}
 		$ret = parent::save($keys,$extra_where);
@@ -340,13 +370,20 @@ 
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids)
+				{
+					return 0;
+				}
+				// no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
-			if ($only_return_ids) return $ids;
+			if ($only_return_ids)
+			{
+				return $ids;
+			}
 			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
 		}
 		return parent::delete($keys);
@@ -388,7 +425,10 @@ 
 			{
 				foreach($selectcols as $col)
 				{
-					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
+					if ($this->is_cf($col))
+					{
+						$fields[] = $this->get_cf_name($col);
+					}
 				}
 			}
 			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
@@ -507,7 +547,10 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op =='OR')
+			{
+				$criteria[] = implode(' OR ',$cfcriteria);
+			}
 		}
 		if($only_keys === true)
 		{
@@ -598,11 +641,14 @@ 
 				}
 				elseif (is_string($name) && $this->is_cf($name))
 				{
-					if (!empty($val))	// empty -> dont filter
+					if (!empty($val))
+					{
+						// empty -> dont filter
 					{
 						if ($val[0] === '!')	// negative filter
 						{
 							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+					}
 						}
 						else	// using Db::expression to allow to use array() with possible values or NULL
 						{
@@ -639,9 +685,12 @@ 
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif(is_int($name) && $this->is_cf($val))
+				{
+					// lettersearch: #cfname LIKE 's%'
 				{
 					$_cf = explode(' ',$val);
+				}
 					foreach($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)

etemplate/inc/class.soetemplate.inc.php

Doc Comments +4 added lines, -5 removed lines

@@ -161,7 +161,7 @@ 
 	 *
 	 * @param string $type type of the widget
 	 * @param string $name name of widget
-	 * @param array $attributes=null array with further attributes
+	 * @param array $attributes array with further attributes
 	 * @return array the cell
 	 */
 	static function empty_cell($type='label',$name='',$attributes=null)
@@ -685,7 +685,7 @@ 
 	 * Calls it self recursivly for arrays / the rows
 	 *
 	 * @param array $arr the array to compress
-	 * @param boolean $remove_all_objs if true unset all objs, on false use as_array to save only the data of objs
+	 * @param boolean $remove_objs if true unset all objs, on false use as_array to save only the data of objs
 	 * @return array
 	 */
 	function compress_array($arr,$remove_objs=false)
@@ -1102,9 +1102,8 @@ 
 	 *
 	 * Please note: as call_user_func_array does not return references, methods ($func is an array) can not either!!!
 	 *
-	 * @param string/array $func function to use or array($obj,'method')
+	 * @param callable $func function to use or array($obj,'method')
 	 * @param mixed &$extra extra parameter passed to function
-	 * @param string $path='/' start-path
 	 * @return mixed return-value of func or null if nothing returned at all
 	 */
 	function &widget_tree_walk($func,&$extra,$path='/')
@@ -1146,7 +1145,7 @@ 
 	 * a further widget with children.
 	 *
 	 * @param array $widget the widget(-tree) the function should be applied too
-	 * @param string/array $func function to use or array($obj,'method')
+	 * @param callable $func function to use or array($obj,'method')
 	 * @param mixed &$extra extra parameter passed to function
 	 * @param string $path path of widget in the widget-tree
 	 * @return mixed return-value of func or null if nothing returned at all

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->id);

Spacing +138 added lines, -139 removed lines

@@ -30,16 +30,16 @@ 
  */
 class soetemplate
 {
-	public $debug;		// =1 show some debug-messages, = 'app.name' show messages only for eTemplate 'app.name'
-	public $name;		// name of the template, e.g. 'infolog.edit'
-	public $template;	// '' = default (not 'default')
-	public $lang;		// '' if general template else language short, e.g. 'de'
-	public $group;		// 0 = not specific else groupId or if < 0  userId
-	public $version;	// like 0.9.13.001
-	public $style;		// embeded CSS style-sheet
-	public $children;	// array with children
-	public $data;		// depricated: first grid of the children
-	public $size;		// depricated: witdh,height,border of first grid
+	public $debug; // =1 show some debug-messages, = 'app.name' show messages only for eTemplate 'app.name'
+	public $name; // name of the template, e.g. 'infolog.edit'
+	public $template; // '' = default (not 'default')
+	public $lang; // '' if general template else language short, e.g. 'de'
+	public $group; // 0 = not specific else groupId or if < 0  userId
+	public $version; // like 0.9.13.001
+	public $style; // embeded CSS style-sheet
+	public $children; // array with children
+	public $data; // depricated: first grid of the children
+	public $size; // depricated: witdh,height,border of first grid
 	/**
 	 * private reference to the global db-object
 	 *
@@ -95,7 +95,7 @@ 
 	 * @param int $cols initial size of the template, default 1, only used if no name given !!!
 	 * @return soetemplate
 	 */
-	function __construct($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
+	function __construct($name = '', $template = '', $lang = '', $group = 0, $version = '', $rows = 1, $cols = 1)
 	{
 		if (isset($GLOBALS['egw']->db))
 		{
@@ -107,11 +107,11 @@ 
 		}
 		if (empty($name))
 		{
-			$this->init($name,$template,$lang,$group,$version,$rows,$cols);
+			$this->init($name, $template, $lang, $group, $version, $rows, $cols);
 		}
 		else
 		{
-			$this->read($name,$template,$lang,$group,$version);
+			$this->read($name, $template, $lang, $group, $version);
 		}
 	}
 
@@ -145,11 +145,11 @@ 
 		$min = ord('A');
 		$max = ord('Z') - $min + 1;
 
-		$num = 1+ord($chrs{0})-$min;
+		$num = 1 + ord($chrs{0}) - $min;
 		if (strlen($chrs) > 1)
 		{
 			$num *= 1 + $max - $min;
-			$num += 1+ord($chrs{1})-$min;
+			$num += 1 + ord($chrs{1}) - $min;
 		}
 		return $num;
 	}
@@ -164,7 +164,7 @@ 
 	 * @param array $attributes=null array with further attributes
 	 * @return array the cell
 	 */
-	static function empty_cell($type='label',$name='',$attributes=null)
+	static function empty_cell($type = 'label', $name = '', $attributes = null)
 	{
 		$cell = array(
 			'type' => $type,
@@ -188,7 +188,7 @@ 
 	 * @param array $attributes other attributes for the cell
 	 * @return array a reference to the new cell, use $new_cell = &$tpl->new_cell(); (!)
 	*/
-	function &new_cell($row=False,$type='label',$label='',$name='',$attributes=False)
+	function &new_cell($row = False, $type = 'label', $label = '', $name = '', $attributes = False)
 	{
 		$row = $row >= 0 ? intval($row) : 0;
 		if ($row && !isset($this->data[$row]) || !isset($this->data[1]))	// new row ?
@@ -208,14 +208,14 @@ 
 		$row = &$this->data[$row];
 		$col = $this->num2chrs(count($row));
 		$cell = &$row[$col];
-		$cell = $this->empty_cell($type,$name);
+		$cell = $this->empty_cell($type, $name);
 		if ($label !== '')
 		{
 			$attributes['label'] = $label;
 		}
 		if (is_array($attributes))
 		{
-			foreach($attributes as $name => $value)
+			foreach ($attributes as $name => $value)
 			{
 				$cell[$name] = $value;
 			}
@@ -229,14 +229,14 @@ 
 	 * @param array &$parent referenc to the parent
 	 * @param array &$cell cell to add (need to be unset after the call to add_child, as it's a referenc !)
 	 */
-	static function add_child(&$parent,&$cell)
+	static function add_child(&$parent, &$cell)
 	{
 		if (is_object($parent))	// parent is the template itself
 		{
 			$parent->children[] = &$cell;
 			return;
 		}
-		switch($parent['type'])
+		switch ($parent['type'])
 		{
 			case 'vbox':
 			case 'hbox':
@@ -244,9 +244,9 @@ 
 			case 'box':
 			case 'deck':
 			default:
-				list($n,$options) = explode(',',$parent['size'],2);
+				list($n, $options) = explode(',', $parent['size'], 2);
 				$parent[++$n] = &$cell;
-				$parent['size'] = $n . ($options ? ','.$options : '');
+				$parent['size'] = $n.($options ? ','.$options : '');
 				break;
 
 			case 'grid':
@@ -263,7 +263,7 @@ 
 				if (is_array($cell))	// real cell to add
 				{
 					$row[soetemplate::num2chrs($col++)] = &$cell;
-					list($spanned) = explode(',',$cell['span']);
+					list($spanned) = explode(',', $cell['span']);
 					$spanned = $spanned == 'all' ? 1 + $cols - $col : $spanned;
 					while (--$spanned > 0)
 					{
@@ -284,7 +284,7 @@ 
 	{
 		$grid['rows'] = count($grid['data']) - 1;
 		$grid['cols'] = 0;
-		for($r = 1; $r <= $grid['rows']; ++$r)
+		for ($r = 1; $r <= $grid['rows']; ++$r)
 		{
 			$cols = count($grid['data'][$r]);
 			if ($grid['cols'] < $cols)
@@ -326,14 +326,14 @@ 
 	 * @param int $rows initial size of the template, default 1
 	 * @param int $cols initial size of the template, default 1
 	 */
-	function init($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
+	function init($name = '', $template = '', $lang = '', $group = 0, $version = '', $rows = 1, $cols = 1)
 	{
 		// unset children and data as they are referenzes to each other
 		unset($this->children); unset($this->data);
 
-		foreach(self::$db_cols as $db_col => $col)
+		foreach (self::$db_cols as $db_col => $col)
 		{
-			if ($col != 'data') $this->$col = is_array($name) ? (string) $name[$col] : $$col;
+			if ($col != 'data') $this->$col = is_array($name) ? (string)$name[$col] : $$col;
 		}
 		if ($this->template == 'default')
 		{
@@ -347,7 +347,7 @@ 
 
 		if (is_array($name) && $name['onclick_handler']) $this->onclick_handler = $name['onclick_handler'];
 
-		if (is_array($name)  && isset($name['data']))
+		if (is_array($name) && isset($name['data']))
 		{
 			// data/children are in $name['data']
 			$this->children = is_array($name['data']) ? $name['data'] : unserialize($name['data']);
@@ -364,7 +364,7 @@ 
 			{
 				for ($col = 0; $col < $cols; ++$col)
 				{
-					if (!is_array($this->data[$row])) $this->data[$row]=array();
+					if (!is_array($this->data[$row])) $this->data[$row] = array();
 					$this->data[$row][$this->num2chrs($col)] = $this->empty_cell();
 				}
 			}
@@ -388,9 +388,9 @@ 
 	 * @param string $version version of the eTemplate
 	 * @return boolean True if a fitting template is found, else False
 	 */
-	function read($name,$template='default',$lang='default',$group=0,$version='')
+	function read($name, $template = 'default', $lang = 'default', $group = 0, $version = '')
 	{
-		$this->init($name,$template,$lang,$group,$version);
+		$this->init($name, $template, $lang, $group, $version);
 		if ($this->debug == 1 || $this->debug == $this->name)
 		{
 			echo "<p>soetemplate::read('$this->name','$this->template','$this->lang',$this->group,'$this->version')</p>\n";
@@ -434,7 +434,7 @@ 
 		{
 			$where['et_version'] = $this->version;
 		}
-		if (!($row = $this->db->select(self::TABLE,'*',$where,__LINE__,__FILE__,false,'ORDER BY et_lang DESC,et_template DESC,et_version DESC','etemplate',1)->fetch()))
+		if (!($row = $this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, 'ORDER BY et_lang DESC,et_template DESC,et_version DESC', 'etemplate', 1)->fetch()))
 		{
 			$version = $this->version;
 			return $this->readfile() && (empty($version) || $version == $this->version);
@@ -455,19 +455,19 @@ 
 	 */
 	function readfile()
 	{
-		list($app,$name) = explode('.',$this->name,2);
+		list($app, $name) = explode('.', $this->name, 2);
 		$template = $this->template == '' ? 'default' : $this->template;
 
 		if ($this->lang)
 		{
-			$lang = '.' . $this->lang;
+			$lang = '.'.$this->lang;
 		}
 		$first_try = $ext = $GLOBALS['egw_info']['server']['eTemplate-source'] == 'xslt' ? '.xsl' : '.xet';
 
-		while ((!$lang || !@file_exists($file = EGW_SERVER_ROOT . "/$app/templates/$template/$name$lang$ext") &&
-											!@file_exists($file = EGW_SERVER_ROOT . "/$app/templates/default/$name$lang$ext")) &&
-						!@file_exists($file = EGW_SERVER_ROOT . "/$app/templates/$template/$name$ext") &&
-						!@file_exists($file = EGW_SERVER_ROOT . "/$app/templates/default/$name$ext"))
+		while ((!$lang || !@file_exists($file = EGW_SERVER_ROOT."/$app/templates/$template/$name$lang$ext") &&
+											!@file_exists($file = EGW_SERVER_ROOT."/$app/templates/default/$name$lang$ext")) &&
+						!@file_exists($file = EGW_SERVER_ROOT."/$app/templates/$template/$name$ext") &&
+						!@file_exists($file = EGW_SERVER_ROOT."/$app/templates/default/$name$ext"))
 		{
 			if ($ext == $first_try)
 			{
@@ -483,7 +483,7 @@ 
 				break;
 			}
 		}
-		if ($this->name == '' || $app == '' || $name == '' || !@file_exists($file) || !($f = @fopen($file,'r')))
+		if ($this->name == '' || $app == '' || $name == '' || !@file_exists($file) || !($f = @fopen($file, 'r')))
 		{
 			if ($this->debug == 1 || $this->name != '' && $this->debug == $this->name)
 			{
@@ -491,7 +491,7 @@ 
 			}
 			return False;
 		}
-		$xml = fread ($f, filesize ($file));
+		$xml = fread($f, filesize($file));
 		fclose($f);
 
 		if ($ext == '.xsl')
@@ -501,22 +501,22 @@ 
 			$cell['size'] = $this->name;
 			//$cell['xslt'] = &$xml;	xslttemplate class cant use it direct at the moment
 			$cell['name'] = '';
-			$this->data = array(0 => array(),1 => array('A' => &$cell));
+			$this->data = array(0 => array(), 1 => array('A' => &$cell));
 			$this->rows = $this->cols = 1;
 		}
 		else
 		{
 			if (!is_object($this->xul_io))
 			{
-				$this->xul_io =& CreateObject('etemplate.xul_io');
+				$this->xul_io = & CreateObject('etemplate.xul_io');
 			}
-			$loaded = $this->xul_io->import($this,$xml);
+			$loaded = $this->xul_io->import($this, $xml);
 
 			if (!is_array($loaded))
 			{
 				return False;
 			}
-			$this->name = $app . '.' . $name;	// if template was copied or app was renamed
+			$this->name = $app.'.'.$name; // if template was copied or app was renamed
 
 			$this->tpls_in_file = count($loaded);
 		}
@@ -531,7 +531,7 @@ 
 	 */
 	static function sql_wildcards($pattern)
 	{
-		return str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$pattern);
+		return str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $pattern);
 	}
 
 	/**
@@ -544,19 +544,19 @@ 
 	 * @param string $version version of the eTemplate
 	 * @return array of arrays with the template-params
 	 */
-	function search($name,$template='default',$lang='default',$group=0,$version='')
+	function search($name, $template = 'default', $lang = 'default', $group = 0, $version = '')
 	{
 		if ($this->name)
 		{
-			boetemplate::test_import($this->name);	// import updates in setup-dir
+			boetemplate::test_import($this->name); // import updates in setup-dir
 		}
 		if (is_array($name))
 		{
-			$template = (string) $name['template'];
-			$lang     = (string) $name['lang'];
-			$group    = (int) $name['group'];
-			$version  = (string) $name['version'];
-			$name     = (string) $name['name'];
+			$template = (string)$name['template'];
+			$lang     = (string)$name['lang'];
+			$group    = (int)$name['group'];
+			$version  = (string)$name['version'];
+			$name     = (string)$name['name'];
 		}
 		$where = array();
 		$where[] = 'et_name LIKE '.$this->db->quote($this->sql_wildcards($name).'%');
@@ -573,11 +573,11 @@ 
 			$where[] = 'et_version LIKE '.$this->db->quote($this->sql_wildcards($version).'%');
 		}
 		$result = array();
-		foreach($this->db->select(self::TABLE,'et_name,et_template,et_lang,et_group,et_version',$where,__LINE__,__FILE__,false,'ORDER BY et_name DESC,et_lang DESC,et_template DESC,et_version DESC','etemplate') as $row)
+		foreach ($this->db->select(self::TABLE, 'et_name,et_template,et_lang,et_group,et_version', $where, __LINE__, __FILE__, false, 'ORDER BY et_name DESC,et_lang DESC,et_template DESC,et_version DESC', 'etemplate') as $row)
 		{
 			if ($row['et_lang'] != '##')	// exclude or import-time-stamps
 			{
-				$result[] = egw_db::strip_array_keys($row,'et_');
+				$result[] = egw_db::strip_array_keys($row, 'et_');
 			}
 		}
 		if ($this->debug)
@@ -632,9 +632,9 @@ 
 			if ($this->name[0] != '.' && is_array($this->data))
 			{
 				reset($this->data); each($this->data);
-				while (list($row,$cols) = each($this->data))
+				while (list($row, $cols) = each($this->data))
 				{
-					while (list($col,$cell) = each($cols))
+					while (list($col, $cell) = each($cols))
 					{
 						if (is_array($cell['type']))
 						{
@@ -654,7 +654,7 @@ 
 		{
 			unset($this->data);
 			// for the moment we make $this->data as a referenz to the first grid
-			foreach($this->children as $key => $child)
+			foreach ($this->children as $key => $child)
 			{
 				if ($child['type'] == 'grid')
 				{
@@ -688,7 +688,7 @@ 
 	 * @param boolean $remove_all_objs if true unset all objs, on false use as_array to save only the data of objs
 	 * @return array
 	 */
-	function compress_array($arr,$remove_objs=false)
+	function compress_array($arr, $remove_objs = false)
 	{
 		static $recursion = array();
 
@@ -696,7 +696,7 @@ 
 		{
 			return $arr;
 		}
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if ($remove_objs && $key === 'obj')	// it can be an array too
 			{
@@ -704,9 +704,9 @@ 
 			}
 			elseif (is_array($val))
 			{
-				$arr[$key] = $this->compress_array($val,$remove_objs);
+				$arr[$key] = $this->compress_array($val, $remove_objs);
 			}
-			elseif (!$remove_objs && $key == 'obj' && is_object($val) && method_exists($val,'as_array') &&
+			elseif (!$remove_objs && $key == 'obj' && is_object($val) && method_exists($val, 'as_array') &&
 				// this test prevents an infinit recursion of templates calling itself, atm. etemplate.editor.new
 				self::$compress_array_recursion[$this->name]++ < 2)
 			{
@@ -730,11 +730,11 @@ 
 	 * @param boolean $db_keys use db-column-names or internal names, default false=internal names
 	 * @return array with template-data
 	 */
-	function as_array($data_too=0,$db_keys=false)
+	function as_array($data_too = 0, $db_keys = false)
 	{
 		//echo "<p>soetemplate::as_array($data_too,$db_keys) name='$this->name', ver='$this->version'</p>\n";
 		$arr = array();
-		switch($data_too)
+		switch ($data_too)
 		{
 			case -1:
 				$cols = self::$db_key_cols;
@@ -745,14 +745,13 @@ 
 			default:
 				$cols = self::$db_cols;
 		}
-		foreach($cols as $db_col => $col)
+		foreach ($cols as $db_col => $col)
 		{
 			if ($col == 'data')
 			{
 				if ($data_too > 0)
 				{
-					$arr[$db_keys ? $db_col : $col] = $data_too < 2 ? $this->children :
-						serialize($this->compress_array($this->children,$db_keys));
+					$arr[$db_keys ? $db_col : $col] = $data_too < 2 ? $this->children : serialize($this->compress_array($this->children, $db_keys));
 				}
 			}
 			else
@@ -781,7 +780,7 @@ 
 	 * @param string $version version of the eTemplate
 	 * @return int number of affected rows, 1 should be ok, 0 somethings wrong
 	 */
-	function save($name='',$template='.',$lang='.',$group='',$version='.')
+	function save($name = '', $template = '.', $lang = '.', $group = '', $version = '.')
 	{
 		if (is_array($name))
 		{
@@ -822,9 +821,9 @@ 
 		if ($this->name[0] != '.' && is_array($this->data))		// correct old messed up templates
 		{
 			reset($this->data); each($this->data);
-			while (list($row,$cols) = each($this->data))
+			while (list($row, $cols) = each($this->data))
 			{
-				while (list($col,$cell) = each($cols))
+				while (list($col, $cell) = each($cols))
 				{
 					if (is_array($cell['type'])) {
 						$this->data[$row][$col]['type'] = $cell['type'][0];
@@ -843,7 +842,7 @@ 
 		}
 		if (is_null($this->group) || !is_int($this->group)) $this->group = 0;
 
-		$this->db->insert(self::TABLE,$this->as_array(3,true),$this->as_array(-1,true),__LINE__,__FILE__,'etemplate');
+		$this->db->insert(self::TABLE, $this->as_array(3, true), $this->as_array(-1, true), __LINE__, __FILE__, 'etemplate');
 
 		if (!($rows = $this->db->affected_rows()))
 		{
@@ -859,7 +858,7 @@ 
 	 */
 	function delete()
 	{
-		$this->db->delete(self::TABLE,$this->as_array(-1,true),__LINE__,__FILE__,'etemplate');
+		$this->db->delete(self::TABLE, $this->as_array(-1, true), __LINE__, __FILE__, 'etemplate');
 
 		return $this->db->affected_rows();
 	}
@@ -872,9 +871,9 @@ 
 	 */
 	function dump4setup($app)
 	{
-		list($app) = explode('.',$app);
+		list($app) = explode('.', $app);
 
-		$dir = EGW_SERVER_ROOT . "/$app/setup";
+		$dir = EGW_SERVER_ROOT."/$app/setup";
 		if (!is_writeable($dir))
 		{
 			// if dir is not writable, download file
@@ -891,32 +890,32 @@ 
 				{
 					unlink($old_file);
 				}
-				rename($file,$old_file);
+				rename($file, $old_file);
 			}
 		}
-		if (!($f = fopen($file,'w')))
+		if (!($f = fopen($file, 'w')))
 		{
 			return 0;
 		}
-		fwrite($f,'<?php
+		fwrite($f, '<?php
 /**
- * EGroupware - eTemplates for Application '. $app. '
+ * EGroupware - eTemplates for Application '. $app.'
  * http://www.egroupware.org
- * generated by soetemplate::dump4setup() '.date('Y-m-d H:i'). '
+ * generated by soetemplate::dump4setup() '.date('Y-m-d H:i').'
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package '. $app. '
+ * @package '. $app.'
  * @subpackage setup
  * @version $Id'.'$
  */'."\n\n\$templ_version=1;\n\n");
 
 		$n = 0;
 		$exported = array();
-		foreach($this->db->select(self::TABLE,'*','et_name LIKE '.$this->db->quote($app.'.%'),__LINE__, __FILE__,false,'ORDER BY et_name,et_version DESC','etemplate',0,'',false,egw_db::FETCH_ASSOC) as $row)
+		foreach ($this->db->select(self::TABLE, '*', 'et_name LIKE '.$this->db->quote($app.'.%'), __LINE__, __FILE__, false, 'ORDER BY et_name,et_version DESC', 'etemplate', 0, '', false, egw_db::FETCH_ASSOC) as $row)
 		{
 			if (isset($exported[$row['et_name']]) && $exported[$row['et_name']] === (string)$row['et_template'])
 			{
-				continue;	// only export highest version (we sort by version DESC!)
+				continue; // only export highest version (we sort by version DESC!)
 			}
 			$exported[$row['et_name']] = (string)$row['et_template'];
 
@@ -928,17 +927,17 @@ 
 					$row[$db_col] = preg_replace('/[ \t]+$/m', '', $row[$db_col]);
 				}
 				// escape only backslashes and single quotes (in that order)
-				$str .= "'$name' => '".str_replace(array('\\','\'',"\r"),array('\\\\','\\\'',''),$row[$db_col])."',";
+				$str .= "'$name' => '".str_replace(array('\\', '\'', "\r"), array('\\\\', '\\\'', ''), $row[$db_col])."',";
 			}
 			$str .= ");\n\n";
-			fwrite($f,$str);
+			fwrite($f, $str);
 			++$n;
 		}
 		fclose($f);
 
 		if ($file == 'php://stdout') common::egw_exit();
 
-		return lang("%1 eTemplates for Application '%2' dumped to '%3'",$n,$app,$file);
+		return lang("%1 eTemplates for Application '%2' dumped to '%3'", $n, $app, $file);
 	}
 
 	/**
@@ -952,7 +951,7 @@ 
 	{
 		$to_trans = array();
 
-		$this->widget_tree_walk(array('soetemplate','getToTranslateCell'),$to_trans);
+		$this->widget_tree_walk(array('soetemplate', 'getToTranslateCell'), $to_trans);
 
 		//echo '<b>'.$this->name.'</b>'; _debug_array($to_trans);
 		return $to_trans;
@@ -970,13 +969,13 @@ 
 
 		$tpls = $this->search($app);
 
-		$tpl = new soetemplate;	// to not alter our own data
+		$tpl = new soetemplate; // to not alter our own data
 
 		while (list(,$keys) = each($tpls))
 		{
-			if (($keys['name'] != $last['name'] ||		// write only newest version
+			if (($keys['name'] != $last['name'] || // write only newest version
 					$keys['template'] != $last['template']) &&
-					(strpos($keys['name'],'test') === false || $app == 'test'))
+					(strpos($keys['name'], 'test') === false || $app == 'test'))
 			{
 				$tpl->read($keys);
 				$to_trans += $tpl->getToTranslate();
@@ -995,41 +994,41 @@ 
 	 * 	select-options they get writen too (form is <unique key> => <message>)
 	 * @return string translated message with number of messages written (total and new), or error-message
 	 */
-	function writeLangFile($app,$lang='en',$additional='')
+	function writeLangFile($app, $lang = 'en', $additional = '')
 	{
 		if (!$additional)
 		{
 			$additional = array();
 		}
-		list($app) = explode('.',$app);
+		list($app) = explode('.', $app);
 
 		if (!file_exists(EGW_SERVER_ROOT.'/developer_tools/inc/class.solangfile.inc.php'))
 		{
-			$solangfile =& CreateObject('etemplate.solangfile');
+			$solangfile = & CreateObject('etemplate.solangfile');
 		}
 		else
 		{
-			$solangfile =& CreateObject('developer_tools.solangfile');
+			$solangfile = & CreateObject('developer_tools.solangfile');
 		}
-		$langarr = $solangfile->load_app($app,$lang);
+		$langarr = $solangfile->load_app($app, $lang);
 		if (!is_array($langarr))
 		{
 			$langarr = array();
 		}
-		$commonarr = $solangfile->load_app('phpgwapi',$lang) + $solangfile->load_app('etemplate',$lang);
+		$commonarr = $solangfile->load_app('phpgwapi', $lang) + $solangfile->load_app('etemplate', $lang);
 
 		$to_trans = $this->getToTranslateApp($app);
 		if (is_array($additional))
 		{
 			//echo "writeLangFile: additional ="; _debug_array($additional);
-			foreach($additional as $msg)
+			foreach ($additional as $msg)
 			{
 				if (!is_array($msg)) $to_trans[trim(strtolower($msg))] = $msg;
 			}
 		}
 		unset($to_trans['']);
 
-		for ($new = $n = 0; list($message_id,$content) = each($to_trans); ++$n)
+		for ($new = $n = 0; list($message_id, $content) = each($to_trans); ++$n)
 		{
 			if (!isset($langarr[$message_id]) && !isset($commonarr[$message_id]))
 			{
@@ -1047,15 +1046,15 @@ 
 		}
 		ksort($langarr);
 
-		$dir = EGW_SERVER_ROOT . "/$app/lang";
+		$dir = EGW_SERVER_ROOT."/$app/lang";
 		if (!is_writeable($dir))
 		{
-			return lang("Error: webserver is not allowed to write into '%1' !!!",$dir);
+			return lang("Error: webserver is not allowed to write into '%1' !!!", $dir);
 		}
-		$solangfile->write_file($app,$langarr,$lang);
-		$solangfile->loaddb($app,$lang);
+		$solangfile->write_file($app, $langarr, $lang);
+		$solangfile->loaddb($app, $lang);
 
-		return lang("%1 (%2 new) Messages writen for Application '%3' and Languages '%4'",$n,$new,$app,$lang);
+		return lang("%1 (%2 new) Messages writen for Application '%3' and Languages '%4'", $n, $new, $app, $lang);
 	}
 
 	/**
@@ -1064,15 +1063,15 @@ 
 	 * @param boolean $backtrace = true give a function backtrace
 	 * @param boolean $no_other_objs = true dump other objs (db, html, ...) too
 	 */
-	function echo_tmpl($backtrace=true,$no_other_objs=true)
+	function echo_tmpl($backtrace = true, $no_other_objs = true)
 	{
-		static $objs = array('db','html','xul_io');
+		static $objs = array('db', 'html', 'xul_io');
 
 		if ($backtrace) echo "<p>".function_backtrace(1)."</p>\n";
 
 		if ($no_other_objs)
 		{
-			foreach($objs as $obj)
+			foreach ($objs as $obj)
 			{
 				$$obj = &$this->$obj;
 				unset($this->$obj);
@@ -1082,7 +1081,7 @@ 
 
 		if ($no_other_objs)
 		{
-			foreach($objs as $obj)
+			foreach ($objs as $obj)
 			{
 				$this->$obj = &$$obj;
 				unset($$obj);
@@ -1107,27 +1106,27 @@ 
 	 * @param string $path='/' start-path
 	 * @return mixed return-value of func or null if nothing returned at all
 	 */
-	function &widget_tree_walk($func,&$extra,$path='/')
+	function &widget_tree_walk($func, &$extra, $path = '/')
 	{
 		if (!is_callable($func))
 		{
-			echo "<p><b>boetemplate($this->name)::widget_tree_walk</b>(".print_r($func,true).", ".print_r($extra,true).", ".print_r($opts,true).") func is not callable !!!<br>".function_backtrace()."</p>";
+			echo "<p><b>boetemplate($this->name)::widget_tree_walk</b>(".print_r($func, true).", ".print_r($extra, true).", ".print_r($opts, true).") func is not callable !!!<br>".function_backtrace()."</p>";
 			return false;
 		}
-		foreach($this->children as $c => &$child)
+		foreach ($this->children as $c => &$child)
 		{
 			$child = &$this->children[$c];
 			if (isset(soetemplate::$widgets_with_children[$child['type']]))
 			{
-				$result =& $this->tree_walk($child,$func,$extra,$path.$c);
+				$result = & $this->tree_walk($child, $func, $extra, $path.$c);
 			}
 			elseif (is_array($func))
 			{
-				$result =& call_user_func_array($func,array(&$child,&$extra,$path.$c));
+				$result = & call_user_func_array($func, array(&$child, &$extra, $path.$c));
 			}
 			else
 			{
-				$result =& $func($child,$extra,$path.$c);
+				$result = & $func($child, $extra, $path.$c);
 			}
 			if (!is_null($result) || is_array($extra) && isset($extra['__RETURN_NOW__'])) break;
 		}
@@ -1151,27 +1150,27 @@ 
 	 * @param string $path path of widget in the widget-tree
 	 * @return mixed return-value of func or null if nothing returned at all
 	 */
-	function &tree_walk(&$widget,$func,&$extra,$path='')
+	function &tree_walk(&$widget, $func, &$extra, $path = '')
 	{
 		if (!is_callable($func))
 		{
-			echo "<p><b>boetemplate::tree_walk</b>(, ".print_r($func,true).", ".print_r($extra,true).", ".print_r($opts,true).") func is not callable !!!<br>".function_backtrace()."</p>";
+			echo "<p><b>boetemplate::tree_walk</b>(, ".print_r($func, true).", ".print_r($extra, true).", ".print_r($opts, true).") func is not callable !!!<br>".function_backtrace()."</p>";
 			return false;
 		}
-		if(is_array($func))
+		if (is_array($func))
 		{
-			$result =& call_user_func_array($func,array(&$widget,&$extra,$path));
+			$result = & call_user_func_array($func, array(&$widget, &$extra, $path));
 		}
 		else
 		{
-			$result =& $func($widget,$extra,$path);
+			$result = & $func($widget, $extra, $path);
 		}
 		if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__']) ||
 			!isset(soetemplate::$widgets_with_children[$widget['type']]))
 		{
 			return $result;
 		}
-		switch($widget['type'])
+		switch ($widget['type'])
 		{
 			case 'split':
 			case 'box':
@@ -1179,21 +1178,21 @@ 
 			case 'hbox':
 			case 'groupbox':
 			case 'deck':
-				for($n = 1; is_array($widget[$n]); ++$n)
+				for ($n = 1; is_array($widget[$n]); ++$n)
 				{
 					$child = &$widget[$n];
 					$_path = $path.'/'.$n;
 					if (isset(soetemplate::$widgets_with_children[$child['type']]))
 					{
-						$result =& $this->tree_walk($child,$func,$extra,$_path);
+						$result = & $this->tree_walk($child, $func, $extra, $_path);
 					}
-					elseif(is_array($func))
+					elseif (is_array($func))
 					{
-						$result =& call_user_func_array($func,array(&$child,&$extra,$_path));
+						$result = & call_user_func_array($func, array(&$child, &$extra, $_path));
 					}
 					else
 					{
-						$result =& $func($child,$extra,$_path);
+						$result = & $func($child, $extra, $_path);
 					}
 					if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__'])) return $result;
 				}
@@ -1201,27 +1200,27 @@ 
 
 			case 'grid':
 				$data = &$widget['data'];
-				if (!is_array($data)) break;	// no children
+				if (!is_array($data)) break; // no children
 
-				foreach($data as $r => $row)
+				foreach ($data as $r => $row)
 				{
 					if (!$r || !is_array($row)) continue;
 
-					foreach($row as $c => $col)
+					foreach ($row as $c => $col)
 					{
 						$child = &$data[$r][$c];
 						$_path = $path.'/'.$r.$c;
 						if (isset(soetemplate::$widgets_with_children[$child['type']]))
 						{
-							$result =& $this->tree_walk($child,$func,$extra,$_path);
+							$result = & $this->tree_walk($child, $func, $extra, $_path);
 						}
-						elseif(is_array($func))
+						elseif (is_array($func))
 						{
-							$result =& call_user_func_array($func,array(&$child,&$extra,$_path));
+							$result = & call_user_func_array($func, array(&$child, &$extra, $_path));
 						}
 						else
 						{
-							$result =& $func($child,$extra,$_path);
+							$result = & $func($child, $extra, $_path);
 						}
 						if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__'])) return $result;
 						unset($child);
@@ -1235,9 +1234,9 @@ 
 					$widget['obj'] = new etemplate;
 					if (!$widget['obj']->read($widget['name'])) $widget['obj'] = false;
 				}
-				if (!is_object($widget['obj'])) break;	// cant descent into template
+				if (!is_object($widget['obj'])) break; // cant descent into template
 				$_path = $path.'/';
-				$result =& $widget['obj']->widget_tree_walk($func,$extra,$_path);
+				$result = & $widget['obj']->widget_tree_walk($func, $extra, $_path);
 				break;
 		}
 		return $result;
@@ -1249,17 +1248,17 @@ 
 	 * @param array $cell the widget
 	 * @param array &$to_trans array with (lowercased) label => translation pairs
 	 */
-	static function getToTranslateCell($cell,&$to_trans)
+	static function getToTranslateCell($cell, &$to_trans)
 	{
 		//echo $cell['name']; _debug_array($cell);
-		$strings = explode('|',$cell['help']);
+		$strings = explode('|', $cell['help']);
 
 		if ($cell['type'] != 'image')
 		{
-			$strings = array_merge($strings,explode('|',$cell['label']));
+			$strings = array_merge($strings, explode('|', $cell['label']));
 		}
-		list($extra_row) = explode(',',$cell['size']);
-		if (substr($cell['type'],0,6) == 'select' && !empty($extra_row) && !intval($extra_row))
+		list($extra_row) = explode(',', $cell['size']);
+		if (substr($cell['type'], 0, 6) == 'select' && !empty($extra_row) && !intval($extra_row))
 		{
 			$strings[] = $extra_row;
 		}
@@ -1267,10 +1266,10 @@ 
 		{
 			$strings[] = $cell['blur'];
 		}
-		foreach($strings as $str)
+		foreach ($strings as $str)
 		{
 			if (strlen($str) > 1 && $str{0} != '@' && $str{0} != '$' &&
-				strpos($str,'$row') === false && strpos($str,'$cont') === false)
+				strpos($str, '$row') === false && strpos($str, '$cont') === false)
 			{
 				$to_trans[trim(strtolower($str))] = $str;
 			}

Braces +128 added lines, -33 removed lines

@@ -191,15 +191,21 @@ 
 	function &new_cell($row=False,$type='label',$label='',$name='',$attributes=False)
 	{
 		$row = $row >= 0 ? intval($row) : 0;
-		if ($row && !isset($this->data[$row]) || !isset($this->data[1]))	// new row ?
+		if ($row && !isset($this->data[$row]) || !isset($this->data[1]))
+		{
+			// new row ?
 		{
 			if (!$row) $row = 1;
+		}
 
 			$this->data[$row] = array();
 		}
-		if (!$row)	// use last row
+		if (!$row)
+		{
+			// use last row
 		{
 			$row = count($this->data);
+		}
 			while (!isset($this->data[$row]))
 			{
 				--$row;
@@ -231,9 +237,12 @@ 
 	 */
 	static function add_child(&$parent,&$cell)
 	{
-		if (is_object($parent))	// parent is the template itself
+		if (is_object($parent))
+		{
+			// parent is the template itself
 		{
 			$parent->children[] = &$cell;
+		}
 			return;
 		}
 		switch($parent['type'])
@@ -255,21 +264,30 @@ 
 				$rows = &$parent['rows'];
 				$row = &$data[$rows];
 				$col = count($row);
-				if (!$rows || !is_array($cell))	// create a new row
+				if (!$rows || !is_array($cell))
+				{
+					// create a new row
 				{
 					$row = &$data[++$rows];
+				}
 					$row = array();
 				}
-				if (is_array($cell))	// real cell to add
+				if (is_array($cell))
+				{
+					// real cell to add
 				{
 					$row[soetemplate::num2chrs($col++)] = &$cell;
+				}
 					list($spanned) = explode(',',$cell['span']);
 					$spanned = $spanned == 'all' ? 1 + $cols - $col : $spanned;
 					while (--$spanned > 0)
 					{
 						$row[soetemplate::num2chrs($col++)] = soetemplate::empty_cell();
 					}
-					if ($col > $cols) $cols = $col;
+					if ($col > $cols)
+					{
+						$cols = $col;
+					}
 				}
 				break;
 		}
@@ -301,10 +319,13 @@ 
 	 */
 	function set_rows_cols()
 	{
-		if (is_null($this->data))	// tmpl contains no grid
+		if (is_null($this->data))
+		{
+			// tmpl contains no grid
 		{
 			$this->rows = $this->cols = 0;
 		}
+		}
 		else
 		{
 			$grid['data'] = &$this->data;
@@ -333,7 +354,10 @@ 
 
 		foreach(self::$db_cols as $db_col => $col)
 		{
-			if ($col != 'data') $this->$col = is_array($name) ? (string) $name[$col] : $$col;
+			if ($col != 'data')
+			{
+				$this->$col = is_array($name) ? (string) $name[$col] : $$col;
+			}
 		}
 		if ($this->template == 'default')
 		{
@@ -345,7 +369,10 @@ 
 		}
 		$this->tpls_in_file = is_array($name) ? $name['tpls_in_file'] : 0;
 
-		if (is_array($name) && $name['onclick_handler']) $this->onclick_handler = $name['onclick_handler'];
+		if (is_array($name) && $name['onclick_handler'])
+		{
+			$this->onclick_handler = $name['onclick_handler'];
+		}
 
 		if (is_array($name)  && isset($name['data']))
 		{
@@ -364,12 +391,21 @@ 
 			{
 				for ($col = 0; $col < $cols; ++$col)
 				{
-					if (!is_array($this->data[$row])) $this->data[$row]=array();
+					if (!is_array($this->data[$row]))
+					{
+						$this->data[$row]=array();
+					}
 					$this->data[$row][$this->num2chrs($col)] = $this->empty_cell();
 				}
 			}
-			if (!is_array($this->children)) $this->children = array();
-			if (!is_array($this->children[0])) $this->children[0] = array();
+			if (!is_array($this->children))
+			{
+				$this->children = array();
+			}
+			if (!is_array($this->children[0]))
+			{
+				$this->children[0] = array();
+			}
 			$this->children[0]['type'] = 'grid';
 			$this->children[0]['data'] = &$this->data;
 			$this->children[0]['rows'] = &$this->rows;
@@ -575,10 +611,13 @@ 
 		$result = array();
 		foreach($this->db->select(self::TABLE,'et_name,et_template,et_lang,et_group,et_version',$where,__LINE__,__FILE__,false,'ORDER BY et_name DESC,et_lang DESC,et_template DESC,et_version DESC','etemplate') as $row)
 		{
-			if ($row['et_lang'] != '##')	// exclude or import-time-stamps
+			if ($row['et_lang'] != '##')
+			{
+				// exclude or import-time-stamps
 			{
 				$result[] = egw_db::strip_array_keys($row,'et_');
 			}
+			}
 		}
 		if ($this->debug)
 		{
@@ -614,7 +653,10 @@ 
 	 */
 	function fix_old_template_format()
 	{
-		if (!is_array($this->children)) $this->children = array();
+		if (!is_array($this->children))
+		{
+			$this->children = array();
+		}
 
 		if (!isset($this->children[0]['type']))
 		{
@@ -698,10 +740,13 @@ 
 		}
 		foreach($arr as $key => $val)
 		{
-			if ($remove_objs && $key === 'obj')	// it can be an array too
+			if ($remove_objs && $key === 'obj')
+			{
+				// it can be an array too
 			{
 				unset($arr[$key]);
 			}
+			}
 			elseif (is_array($val))
 			{
 				$arr[$key] = $this->compress_array($val,$remove_objs);
@@ -811,26 +856,35 @@ 
 		{
 			$this->version = $version;
 		}
-		if ($this->name == '')	// name need to be set !!!
+		if ($this->name == '')
+		{
+			// name need to be set !!!
 		{
 			return False;
 		}
+		}
 		if ($this->debug > 0 || $this->debug == $this->name)
 		{
 			echo "<p>soetemplate::save('$this->name','$this->template','$this->lang',$this->group,'$this->version')</p>\n";
 		}
-		if ($this->name[0] != '.' && is_array($this->data))		// correct old messed up templates
+		if ($this->name[0] != '.' && is_array($this->data))
+		{
+			// correct old messed up templates
 		{
-			reset($this->data); each($this->data);
+			reset($this->data);
+		}
+		each($this->data);
 			while (list($row,$cols) = each($this->data))
 			{
 				while (list($col,$cell) = each($cols))
 				{
-					if (is_array($cell['type'])) {
+					if (is_array($cell['type']))
+					{
 						$this->data[$row][$col]['type'] = $cell['type'][0];
 						//echo "corrected in $this->name cell $col$row attribute type<br>\n";
 					}
-					if (is_array($cell['align'])) {
+					if (is_array($cell['align']))
+					{
 						$this->data[$row][$col]['align'] = $cell['align'][0];
 						//echo "corrected in $this->name cell $col$row attribute align<br>\n";
 					}
@@ -841,7 +895,10 @@ 
 		{
 			$this->modified = time();
 		}
-		if (is_null($this->group) || !is_int($this->group)) $this->group = 0;
+		if (is_null($this->group) || !is_int($this->group))
+		{
+			$this->group = 0;
+		}
 
 		$this->db->insert(self::TABLE,$this->as_array(3,true),$this->as_array(-1,true),__LINE__,__FILE__,'etemplate');
 
@@ -923,10 +980,13 @@ 
 			$str = '$templ_data[] = array(';
 			foreach (self::$db_cols as $db_col => $name)
 			{
-				if ($name == 'style')	// remove trailing whitespace
+				if ($name == 'style')
+				{
+					// remove trailing whitespace
 				{
 					$row[$db_col] = preg_replace('/[ \t]+$/m', '', $row[$db_col]);
 				}
+				}
 				// escape only backslashes and single quotes (in that order)
 				$str .= "'$name' => '".str_replace(array('\\','\'',"\r"),array('\\\\','\\\'',''),$row[$db_col])."',";
 			}
@@ -936,7 +996,10 @@ 
 		}
 		fclose($f);
 
-		if ($file == 'php://stdout') common::egw_exit();
+		if ($file == 'php://stdout')
+		{
+			common::egw_exit();
+		}
 
 		return lang("%1 eTemplates for Application '%2' dumped to '%3'",$n,$app,$file);
 	}
@@ -1024,7 +1087,10 @@ 
 			//echo "writeLangFile: additional ="; _debug_array($additional);
 			foreach($additional as $msg)
 			{
-				if (!is_array($msg)) $to_trans[trim(strtolower($msg))] = $msg;
+				if (!is_array($msg))
+				{
+					$to_trans[trim(strtolower($msg))] = $msg;
+				}
 			}
 		}
 		unset($to_trans['']);
@@ -1033,10 +1099,13 @@ 
 		{
 			if (!isset($langarr[$message_id]) && !isset($commonarr[$message_id]))
 			{
-				if (@isset($langarr[$content]))	// caused by not lowercased-message_id's
+				if (@isset($langarr[$content]))
+				{
+					// caused by not lowercased-message_id's
 				{
 					unset($langarr[$content]);
 				}
+				}
 				$langarr[$message_id] = array(
 					'message_id' => $message_id,
 					'app_name'   => $app,
@@ -1068,7 +1137,10 @@ 
 	{
 		static $objs = array('db','html','xul_io');
 
-		if ($backtrace) echo "<p>".function_backtrace(1)."</p>\n";
+		if ($backtrace)
+		{
+			echo "<p>".function_backtrace(1)."</p>\n";
+		}
 
 		if ($no_other_objs)
 		{
@@ -1129,7 +1201,10 @@ 
 			{
 				$result =& $func($child,$extra,$path.$c);
 			}
-			if (!is_null($result) || is_array($extra) && isset($extra['__RETURN_NOW__'])) break;
+			if (!is_null($result) || is_array($extra) && isset($extra['__RETURN_NOW__']))
+			{
+				break;
+			}
 		}
 		return $result;
 	}
@@ -1195,17 +1270,27 @@ 
 					{
 						$result =& $func($child,$extra,$_path);
 					}
-					if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__'])) return $result;
+					if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__']))
+					{
+						return $result;
+					}
 				}
 				break;
 
 			case 'grid':
 				$data = &$widget['data'];
-				if (!is_array($data)) break;	// no children
+				if (!is_array($data))
+				{
+					break;
+				}
+				// no children
 
 				foreach($data as $r => $row)
 				{
-					if (!$r || !is_array($row)) continue;
+					if (!$r || !is_array($row))
+					{
+						continue;
+					}
 
 					foreach($row as $c => $col)
 					{
@@ -1223,7 +1308,10 @@ 
 						{
 							$result =& $func($child,$extra,$_path);
 						}
-						if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__'])) return $result;
+						if (!is_null($result) || is_array($extra) && isset($extra['__RETURN__NOW__']))
+						{
+							return $result;
+						}
 						unset($child);
 					}
 				}
@@ -1233,9 +1321,16 @@ 
 				if (!isset($widget['obj']) && $widget['name'][0] != '@')
 				{
 					$widget['obj'] = new etemplate;
-					if (!$widget['obj']->read($widget['name'])) $widget['obj'] = false;
+					if (!$widget['obj']->read($widget['name']))
+					{
+						$widget['obj'] = false;
+					}
+				}
+				if (!is_object($widget['obj']))
+				{
+					break;
 				}
-				if (!is_object($widget['obj'])) break;	// cant descent into template
+				// cant descent into template
 				$_path = $path.'/';
 				$result =& $widget['obj']->widget_tree_walk($func,$extra,$_path);
 				break;