EGroupware / egroupware

etemplate/inc/class.bo_merge.inc.php

Doc Comments +18 added lines, -16 removed lines

@@ -353,9 +353,9 @@ 
 	 *
 	 * Calls get_links() repeatedly to get all the combinations for the content.
 	 *
-	 * @param $app String appname
+	 * @param string $app String appname
 	 * @param $id String ID of record
-	 * @param $prefix
+	 * @param string $prefix
 	 * @param $content String document content
 	 */
 	protected function get_all_links($app, $id, $prefix, &$content)
@@ -428,7 +428,7 @@ 
 	 * Format a datetime
 	 *
 	 * @param int|string|DateTime $time unix timestamp or Y-m-d H:i:s string (in user time!)
-	 * @param string $format=null format string, default $this->datetime_format
+	 * @param string $format format string, default $this->datetime_format
 	 * @deprecated use egw_time::to($time='now',$format='')
 	 * @return string
 	 */
@@ -470,7 +470,6 @@ 
 	/**
 	 * getExportLimit
 	 * checks if there is an exportlimit set, and returns
-	 * @param mixed $app_limit checks and validates app_limit, if not set returns the global limit
 	 *
 	 * @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction
 	 *		you may have to cast the returned value to int, if you want to use it as number
@@ -517,7 +516,7 @@ 
 	 * @param mixed $app_limit app_limit, if not set checks the global limit
 	 * @param string $checkas [AND|ISALLOWED], AND default; if set to ISALLOWED it is checked if Export is allowed
 	 *
-	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
+	 * @return boolean|null - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
@@ -534,7 +533,6 @@ 
 	 * @param array $ids array with contact id(s)
 	 * @param string &$err error-message on error
 	 * @param string $mimetype mimetype of complete document, eg. text/*, application/vnd.oasis.opendocument.text, application/rtf
-	 * @param array $fix=null regular expression => replacement pairs eg. to fix garbled placeholders
 	 * @return string|boolean merged document or false on error
 	 */
 	public function &merge($document,$ids,&$err,$mimetype,array $fix=null)
@@ -566,6 +564,9 @@ 
 		return $content;
 	}
 
+	/**
+	 * @param string $mimetype
+	 */
 	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
 	{
 		if (!isset($mso_application_progid))
@@ -666,8 +667,7 @@ 
 	 * @param array $ids array with contact id(s)
 	 * @param string &$err error-message on error
 	 * @param string $mimetype mimetype of complete document, eg. text/*, application/vnd.oasis.opendocument.text, application/rtf
-	 * @param array $fix=null regular expression => replacement pairs eg. to fix garbled placeholders
-	 * @param string $charset=null charset to override default set by mimetype or export charset
+	 * @param string $charset charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
 	public function &merge_string($content,$ids,&$err,$mimetype,array $fix=null,$charset=null)
@@ -904,7 +904,7 @@ 
 	 * @param array $replacements name => replacement pairs
 	 * @param string $mimetype mimetype of content
 	 * @param string $mso_application_progid='' MS Office 2003: 'Excel.Sheet' or 'Word.Document'
-	 * @param string $charset=null charset to override default set by mimetype or export charset
+	 * @param string $charset charset to override default set by mimetype or export charset
 	 * @return string
 	 */
 	protected function replace($content,array $replacements,$mimetype,$mso_application_progid='',$charset=null)
@@ -1123,6 +1123,8 @@ 
 
 	/**
 	 * Convert numeric values in spreadsheets into actual numeric values
+	 * @param string $content
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
@@ -1192,6 +1194,7 @@ 
 
 	/**
 	 * Convert date / timestamp values in spreadsheets into actual date / timestamp values
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
@@ -1296,6 +1299,7 @@ 
 	/**
 	 * Expand link_to custom fields with the merge replacements from the app
 	 * but only if the template uses them.
+	 * @param string $app
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
@@ -1360,7 +1364,7 @@ 
 	/**
 	 * Process special flags, such as IF or NELF
 	 *
-	 * @param content Text to be examined and changed
+	 * @param content string to be examined and changed
 	 * @param replacements array of markers => replacement
 	 *
 	 * @return changed content
@@ -1672,8 +1676,7 @@ 
 	 * Get a list of document actions / files from the given directory
 	 *
 	 * @param string $dirs Directory(s comma or space separated) to search
-	 * @param string $prefix='document_' prefix for array keys
-	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
+	 * @param array|string $mime_filter allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
@@ -1728,10 +1731,8 @@ 
 	 *
 	 * @param string $dirs Directory(s comma or space separated) to search
 	 * @param int $group see nextmatch_widget::egw_actions
-	 * @param string $caption='Insert in document'
-	 * @param string $prefix='document_'
 	 * @param string $default_doc='' full path to default document to show on top with action == 'document'!
-	 * @param int|string $export_limit=null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
+	 * @param int|string $export_limit export-limit, default $GLOBALS['egw_info']['server']['export_limit']
 	 * @return array see nextmatch_widget::egw_actions
 	 */
 	public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
@@ -1934,6 +1935,7 @@ 
 	 *
 	 * @param string &$document maybe relative path of document, on return true absolute path to existing document
 	 * @param string $dirs comma or whitespace separated directories
+	 * @param string $document
 	 * @return string|boolean false if document exists, otherwise string with error-message
 	 */
 	public static function check_document(&$document, $dirs)
@@ -1977,7 +1979,7 @@ 
 	 * Reimplemented from etemplate to NOT use user prefs for Excel 2003, which gives an xml error
 	 *
 	 * @param int|float|string $number
-	 * @param int $num_decimal_places=2
+	 * @param int $num_decimal_places
 	 * @param string $_mimetype=''
 	 * @return string
 	 */

Indentation +4 added lines, -4 removed lines

@@ -417,10 +417,10 @@
 			}
 		}
 		// Need to set each app, to make sure placeholders are removed
-                foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
-                {
-                        $array[($prefix?$prefix.'/':'')."links/$app"] = $this->get_links($app,$id,$_app);
-                }
+				foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
+				{
+						$array[($prefix?$prefix.'/':'')."links/$app"] = $this->get_links($app,$id,$_app);
+				}
 		return $array;
 	}
 

Spacing +355 added lines, -355 removed lines

@@ -68,14 +68,14 @@ 
 	 * Configuration for HTML Tidy to clean up any HTML content that is kept
 	 */
 	public static $tidy_config = array(
-		'output-xml'		=> true,	// Entity encoding
+		'output-xml'		=> true, // Entity encoding
 		'show-body-only'	=> true,
 		'output-encoding'	=> 'utf-8',
 		'input-encoding'	=> 'utf-8',
-		'quote-ampersand'	=> false,	// Prevent double encoding
-		'quote-nbsp'		=> true,	// XSLT can handle spaces easier
+		'quote-ampersand'	=> false, // Prevent double encoding
+		'quote-nbsp'		=> true, // XSLT can handle spaces easier
 		'preserve-entities'	=> true,
-		'wrap'			=> 0,		// Wrapping can break output
+		'wrap'			=> 0, // Wrapping can break output
 	);
 
 	/**
@@ -108,7 +108,7 @@ 
 		$this->contacts = new addressbook_bo();
 
 		$this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
-			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12 ? 'h:i a' : 'H:i');
+			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 
 		$this->export_limit = self::getExportLimit();
 	}
@@ -123,7 +123,7 @@ 
 		$accountsel = new uiaccountsel();
 
 		return '<input type="hidden" value="" name="newsettings[export_limit_excepted]" />'.
-			$accountsel->selection('newsettings[export_limit_excepted]','export_limit_excepted',$config['export_limit_excepted'],'both',4);
+			$accountsel->selection('newsettings[export_limit_excepted]', 'export_limit_excepted', $config['export_limit_excepted'], 'both', 4);
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean array with replacements or false if entry not found
 	 */
-	abstract protected function get_replacements($id,&$content=null);
+	abstract protected function get_replacements($id, &$content = null);
 
 	/**
 	 * Return if merge-print is implemented for given mime-type (and/or extension)
@@ -145,13 +145,13 @@ 
 	 * @param string $mimetype eg. text/plain
 	 * @param string $extension only checked for applications/msword and .rtf
 	 */
-	static public function is_implemented($mimetype,$extension=null)
+	static public function is_implemented($mimetype, $extension = null)
 	{
 		static $zip_available;
 		if (is_null($zip_available))
 		{
 			$zip_available = check_load_extension('zip') &&
-				class_exists('ZipArchive');	// some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
+				class_exists('ZipArchive'); // some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
 		}
 		switch ($mimetype)
 		{
@@ -159,25 +159,25 @@ 
 				if (strtolower($extension) != '.rtf') break;
 			case 'application/rtf':
 			case 'text/rtf':
-				return true;	// rtf files
+				return true; // rtf files
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
 				if (!$zip_available) break;
-				return true;	// open office write xml files
+				return true; // open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':	// ms excel 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
 				if (!$zip_available) break;
-				return true;	// ms word xml format
+				return true; // ms word xml format
 			case 'application/xml':
-				return true;	// alias for text/xml, eg. ms office 2003 word format
+				return true; // alias for text/xml, eg. ms office 2003 word format
 			case 'message/rfc822':
 				return true; // ToDo: check if you are theoretical able to send mail
 			default:
-				if (substr($mimetype,0,5) == 'text/')
+				if (substr($mimetype, 0, 5) == 'text/')
 				{
-					return true;	// text files
+					return true; // text files
 				}
 				break;
 		}
@@ -195,7 +195,7 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array
 	 */
-	public function contact_replacements($contact,$prefix='',$ignore_acl=false)
+	public function contact_replacements($contact, $prefix = '', $ignore_acl = false)
 	{
 		if (!is_array($contact))
 		{
@@ -204,19 +204,19 @@ 
 		if (!is_array($contact)) return array();
 		
 		$replacements = array();
-		foreach(array_keys($this->contacts->contact_fields) as $name)
+		foreach (array_keys($this->contacts->contact_fields) as $name)
 		{
 			$value = $contact[$name];
-			switch($name)
+			switch ($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = egw_time::to($value);
+					if ($value) $value = egw_time::to($value);
 					break;
 				case 'bday':
 					if ($value)
 					{
-						list($y,$m,$d) = explode('-',$value);
-						$value = common::dateformatorder($y,$m,$d,true);
+						list($y, $m, $d) = explode('-', $value);
+						$value = common::dateformatorder($y, $m, $d, true);
 					}
 					break;
 				case 'owner': case 'creator': case 'modifier':
@@ -228,11 +228,11 @@ 
 						// if cat-tree is displayed, we return a full category path not just the name of the cat
 						$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
 						$cats = array();
-						foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
+						foreach (is_array($value) ? $value : explode(',', $value) as $cat_id)
 						{
-							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id,$use);
+							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id, $use);
 						}
-						$value = implode(', ',$cats);
+						$value = implode(', ', $cats);
 					}
 					break;
 				case 'jpegphoto':	// returning a link might make more sense then the binary photo
@@ -240,7 +240,7 @@ 
 					{
 						$value = ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 							($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-							$GLOBALS['egw']->link('/index.php',$contact['photo']);
+							$GLOBALS['egw']->link('/index.php', $contact['photo']);
 					}
 					break;
 				case 'tel_prefer':
@@ -252,38 +252,38 @@ 
 				case 'account_id':
 					if ($value)
 					{
-						$replacements['$$'.($prefix ? $prefix.'/':'').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
+						$replacements['$$'.($prefix ? $prefix.'/' : '').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = $value;
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
-		foreach($ignore_acl ? egw_customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
+		foreach ($ignore_acl ? egw_customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
 		{
 			$name = '#'.$name;
-			$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = egw_customfields::format($field, (string)$contact[$name]);
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = egw_customfields::format($field, (string)$contact[$name]);
 		}
 
 		// Add in extra cat field
 		$cats = array();
-		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
+		foreach (is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',', $contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
-			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
+			if (!$cat_id) continue;
+			if ($GLOBALS['egw']->categories->id2name($cat_id, 'main') != $cat_id)
 			{
-				$path = $GLOBALS['egw']->categories->id2name($cat_id,'path');
+				$path = $GLOBALS['egw']->categories->id2name($cat_id, 'path');
 				$path = explode(' / ', $path);
 				unset($path[0]); // Drop main
-				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+				$cats[$GLOBALS['egw']->categories->id2name($cat_id, 'main')][] = implode(' / ', $path);
+			} elseif ($cat_id) {
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
-			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
-				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
+		foreach ($cats as $main => $cat) {
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main, 'name')
+				. (count($cat) > 0 ? ': ' : '').implode(', ', $cats[$main])."\n";
 		}
 		return $replacements;
 	}
@@ -302,34 +302,34 @@ 
 	 * 	'link' - URL to the entry
 	 * 	'href' - HREF tag wrapped around the title
 	 */
-	protected function get_links($app, $id, $only_app='', $exclude = array(), $style = 'title')
+	protected function get_links($app, $id, $only_app = '', $exclude = array(), $style = 'title')
 	{
 		$links = egw_link::get_links($app, $id, $only_app);
 		$link_titles = array();
-		foreach($links as $link_id => $link_info)
+		foreach ($links as $link_id => $link_info)
 		{
 			// Using only_app only returns the ID
-			if(!is_array($link_info) && $only_app && $only_app[0] !== '!')
+			if (!is_array($link_info) && $only_app && $only_app[0] !== '!')
 			{
 				$link_info = array(
 					'app'	=> $only_app,
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if ($exclude && in_array($link_info['id'], $exclude)) continue;
 
 			$title = egw_link::title($link_info['app'], $link_info['id']);
-			if(class_exists('stylite_links_stream_wrapper') && $link_info['app'] != egw_link::VFS_APPNAME)
+			if (class_exists('stylite_links_stream_wrapper') && $link_info['app'] != egw_link::VFS_APPNAME)
 			{
 				$title = stylite_links_stream_wrapper::entry2name($link_info['app'], $link_info['id'], $title);
 			}
-			if($style == 'href' || $style == 'link')
+			if ($style == 'href' || $style == 'link')
 			{
 				$link = egw_link::view($link_info['app'], $link_info['id'], $link_info);
-				if($link_info['app'] != egw_link::VFS_APPNAME)
+				if ($link_info['app'] != egw_link::VFS_APPNAME)
 				{
 					// Set app to false so we always get an external link
-					$link = str_replace(',','%2C',egw::link('/index.php',$link, false));
+					$link = str_replace(',', '%2C', egw::link('/index.php', $link, false));
 				}
 				else
 				{
@@ -345,7 +345,7 @@ 
 			}
 			$link_titles[] = $title;
 		}
-		return implode("\n",$link_titles);
+		return implode("\n", $link_titles);
 	}
 
 	/**
@@ -363,31 +363,31 @@ 
 		$array = array();
 		$pattern = '@\$(links_attachments|links|attachments|link)\/?(title|href|link)?\/?([a-z]*)\$@';
 		static $link_cache;
-		if(preg_match_all($pattern, $content, $matches))
+		if (preg_match_all($pattern, $content, $matches))
 		{
-			foreach($matches[0] as $i => $placeholder)
+			foreach ($matches[0] as $i => $placeholder)
 			{
 				$placeholder = substr($placeholder, 1, -1);
-				if($link_cache[$id][$placeholder])
+				if ($link_cache[$id][$placeholder])
 				{
 					$array[$placeholder] = $link_cache[$id][$placeholder];
 					continue;
 				}
-				switch($matches[1][$i])
+				switch ($matches[1][$i])
 				{
 					case 'link':
 						// Link to current record
 						$title = egw_link::title($app, $id);
-						if(class_exists('stylite_links_stream_wrapper') && $app != egw_link::VFS_APPNAME)
+						if (class_exists('stylite_links_stream_wrapper') && $app != egw_link::VFS_APPNAME)
 						{
 							$title = stylite_links_stream_wrapper::entry2name($app, $id, $title);
 						}
 
 						$link = egw_link::view($app, $id);
-						if($app != egw_link::VFS_APPNAME)
+						if ($app != egw_link::VFS_APPNAME)
 						{
 							// Set app to false so we always get an external link
-							$link = str_replace(',','%2C',egw::link('/index.php',$link, false));
+							$link = str_replace(',', '%2C', egw::link('/index.php', $link, false));
 						}
 						else
 						{
@@ -400,26 +400,26 @@ 
 								($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$link;
 						}
 						$title = html::a_href(html::htmlspecialchars($title), $link);
-						$array[($prefix?$prefix.'/':'').$placeholder] = $title;
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $title;
 						break;
 					case 'links':
-						$link_app = $matches[3][$i] ? $matches[3][$i] :  '!'.egw_link::VFS_APPNAME;
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, $link_app, array(),$matches[2][$i]);
+						$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.egw_link::VFS_APPNAME;
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, $link_app, array(), $matches[2][$i]);
 						break;
 					case 'attachments':
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, egw_link::VFS_APPNAME,array(),$matches[2][$i]);
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, egw_link::VFS_APPNAME, array(), $matches[2][$i]);
 						break;
 					default:
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
 						break;
 				}
 				$link_cache[$id][$placeholder] = $array[$placeholder];
 			}
 		}
 		// Need to set each app, to make sure placeholders are removed
-                foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
+                foreach (array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
                 {
-                        $array[($prefix?$prefix.'/':'')."links/$app"] = $this->get_links($app,$id,$_app);
+                        $array[($prefix ? $prefix.'/' : '')."links/$app"] = $this->get_links($app, $id, $_app);
                 }
 		return $array;
 	}
@@ -432,12 +432,12 @@ 
 	 * @deprecated use egw_time::to($time='now',$format='')
 	 * @return string
 	 */
-	protected function format_datetime($time,$format=null)
+	protected function format_datetime($time, $format = null)
 	{
-		trigger_error(__METHOD__ . ' is deprecated, use egw_time::to($time, $format)', E_USER_DEPRECATED);
+		trigger_error(__METHOD__.' is deprecated, use egw_time::to($time, $format)', E_USER_DEPRECATED);
 		if (is_null($format)) $format = $this->datetime_format;
 
-		return egw_time::to($time,$format);
+		return egw_time::to($time, $format);
 	}
 
 	/**
@@ -459,9 +459,9 @@ 
 			if (!$is_excepted && (is_array($export_limit_excepted = $GLOBALS['egw_info']['server']['export_limit_excepted']) ||
 				is_array($export_limit_excepted = unserialize($export_limit_excepted))))
 			{
-				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$id_and_memberships[] = $GLOBALS['egw_info']['user']['account_id'];
-				$is_excepted = (bool) array_intersect($id_and_memberships, $export_limit_excepted);
+				$is_excepted = (bool)array_intersect($id_and_memberships, $export_limit_excepted);
 			}
 		}
 		return $is_excepted;
@@ -475,19 +475,19 @@ 
 	 * @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction
 	 *		you may have to cast the returned value to int, if you want to use it as number
 	 */
-	public static function getExportLimit($app='common')
+	public static function getExportLimit($app = 'common')
 	{
 		static $exportLimitStore;
-		if (is_null($exportLimitStore)) $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		if (is_null($exportLimitStore)) $exportLimitStore = array();
+		if (empty($app)) $app = 'common';
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
-		if (!array_key_exists($app,$exportLimitStore))
+		if (!array_key_exists($app, $exportLimitStore))
 		{
 			//error_log(__METHOD__.__LINE__.' -> '.$app_limit.' '.function_backtrace());
 			$exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit'];
-			if ($app !='common')
+			if ($app != 'common')
 			{
-				$app_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
+				$app_limit = $GLOBALS['egw']->hooks->single('export_limit', $app);
 				if ($app_limit) $exportLimitStore[$app] = $app_limit;
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
@@ -519,9 +519,9 @@ 
 	 *
 	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
-	public static function hasExportLimit($app_limit,$checkas='AND')
+	public static function hasExportLimit($app_limit, $checkas = 'AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit != 'no' && $app_limit > 0));
 		if (empty($app_limit)) return false;
 		if ($app_limit == 'no') return true;
 		if ($app_limit > 0) return true;
@@ -537,28 +537,28 @@ 
 	 * @param array $fix=null regular expression => replacement pairs eg. to fix garbled placeholders
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge($document,$ids,&$err,$mimetype,array $fix=null)
+	public function &merge($document, $ids, &$err, $mimetype, array $fix = null)
 	{
 		if (!($content = file_get_contents($document)))
 		{
-			$err = lang("Document '%1' does not exist or is not readable for you!",$document);
+			$err = lang("Document '%1' does not exist or is not readable for you!", $document);
 			return false;
 		}
 
 		if (self::hasExportLimit($this->export_limit) && !self::is_export_limit_excepted() && count($ids) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			return false;
 		}
 
 		// fix application/msword mimetype for rtf files
-		if ($mimetype == 'application/msword' && strtolower(substr($document,-4)) == '.rtf')
+		if ($mimetype == 'application/msword' && strtolower(substr($document, -4)) == '.rtf')
 		{
 			$mimetype = 'application/rtf';
 		}
 
 		try {
-			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
+			$content = $this->merge_string($content, $ids, $err, $mimetype, $fix);
 		} catch (Exception $e) {
 			$err = $e->getMessage();
 			return false;
@@ -566,17 +566,17 @@ 
 		return $content;
 	}
 
-	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
+	protected function apply_styles(&$content, $mimetype, $mso_application_progid = null)
 	{
 		if (!isset($mso_application_progid))
 		{
 			$mso_application_progid = $mimetype == 'application/xml' &&
-				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($content,0,200),$matches) ?
+				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($content, 0, 200), $matches) ?
 					$matches[1] : '';
 		}
 		// Tags we can replace with the target document's version
 		$replace_tags = array();
-		switch($mimetype.$mso_application_progid)
+		switch ($mimetype.$mso_application_progid)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -586,7 +586,7 @@ 
 					'/<\/(ol|ul|table)>/' => '</$1><text:p>',
 					//'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
+				$content = preg_replace(array_keys($replace_tags), array_values($replace_tags), $content);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -611,7 +611,7 @@ 
 					// Remove spans with no attributes, linebreaks inside them cause problems
 					'/<span>(.*?)<\/span>/' => '$1'
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content, -1, $count);
+				$content = preg_replace(array_keys($replace_tags), array_values($replace_tags), $content, -1, $count);
 
 				/*
 				In the case where you have something like <span><span></w:t><w:br/><w:t></span></span> (invalid - mismatched tags),
@@ -621,9 +621,9 @@ 
 				$count = $i = 0;
 				do
 				{
-					$content = preg_replace('/<span>(.*?)<\/span>/','$1',$content, -1, $count);
+					$content = preg_replace('/<span>(.*?)<\/span>/', '$1', $content, -1, $count);
 					$i++;
-				} while($count > 0 && $i < 10);
+				} while ($count > 0 && $i < 10);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -634,20 +634,20 @@ 
 		}
 
 		// XSLT transform known tags
-		if($xslt)
+		if ($xslt)
 		{
 			// does NOT work with php 5.2.6: Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
 			//$element = new SimpleXMLelement($content);
 			$element = new DOMDocument('1.0', 'utf-8');
 			$result = $element->loadXML($content);
-			if(!$result)
+			if (!$result)
 			{
 				throw new Exception('Unable to parse merged document for styles.  Check warnings in log for details.');
 			}
 			$content = $xslt->transformToXml($element);
 
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if ($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -670,10 +670,10 @@ 
 	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge_string($content,$ids,&$err,$mimetype,array $fix=null,$charset=null)
+	public function &merge_string($content, $ids, &$err, $mimetype, array $fix = null, $charset = null)
 	{
 		if ($mimetype == 'application/xml' &&
-			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($content,0,200),$matches))
+			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($content, 0, 200), $matches))
 		{
 			$mso_application_progid = $matches[1];
 		}
@@ -683,7 +683,7 @@ 
 		}
 		// alternative syntax using double curly brackets (eg. {{cat_id}} instead $$cat_id$$),
 		// agressivly removing all xml-tags eg. Word adds within placeholders
-		$content = preg_replace_callback('/{{[^}]+}}/i',create_function('$p','return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'),$content);
+		$content = preg_replace_callback('/{{[^}]+}}/i', create_function('$p', 'return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'), $content);
 
 		// make currently processed mimetype available to class methods;
 		$this->mimetype = $mimetype;
@@ -691,16 +691,16 @@ 
 		// fix garbled placeholders
 		if ($fix && is_array($fix))
 		{
-			$content = preg_replace(array_keys($fix),array_values($fix),$content);
+			$content = preg_replace(array_keys($fix), array_values($fix), $content);
 			//die("<pre>".htmlspecialchars($content)."</pre>\n");
 		}
-		list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
+		list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
 		if ($mimetype == 'text/plain' && count($ids) > 1)
 		{
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart, '$$') !== false) $nohead = true;
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -711,14 +711,14 @@ 
 		}
 		if ($mimetype == 'application/vnd.oasis.opendocument.text' && count($ids) > 1)
 		{
-			if(strpos($content, '$$pagerepeat') === false)
+			if (strpos($content, '$$pagerepeat') === false)
 			{
 				//for odt files we have to split the content and add a style for page break to  the style area
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/office:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-				$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "<"
-				$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/office:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+				$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "<"
+				$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 				// need to add page-break style to the style list
-				list($stylestart,$stylerepeat,$styleend) = preg_split('/<\/office:automatic-styles>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document style sheets
+				list($stylestart, $stylerepeat, $styleend) = preg_split('/<\/office:automatic-styles>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document style sheets
 				$contentstart = $stylestart.'<style:style style:name="P200" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:break-before="page"/></style:style></office:automatic-styles>';
 				$contentstart .= '<office:body>';
 				$contentend = '</office:body></office:document-content>';
@@ -726,22 +726,22 @@ 
 			else
 			{
 				// Template specifies where to repeat
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get different parts of document, seperated by pagerepeat
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get different parts of document, seperated by pagerepeat
 			}
 		}
 		if ($mimetype == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' && count($ids) > 1)
 		{
 			//for Word 2007 XML files we have to split the content and add a style for page break to  the style area
-			list($contentstart,$contentrepeat,$contentend) = preg_split('/w:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-			$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "</"
-			$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+			list($contentstart, $contentrepeat, $contentend) = preg_split('/w:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+			$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "</"
+			$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 			$contentstart .= '<w:body>';
 			$contentend = '</w:body></w:document>';
 		}
-		list($Labelstart,$Labelrepeat,$Labeltend) = preg_split('/\$\$label\$\$/',$contentrepeat,-1, PREG_SPLIT_NO_EMPTY);  //get the Lable content
-		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
+		list($Labelstart, $Labelrepeat, $Labeltend) = preg_split('/\$\$label\$\$/', $contentrepeat, -1, PREG_SPLIT_NO_EMPTY); //get the Lable content
+		preg_match_all('/\$\$labelplacement\$\$/', $contentrepeat, $countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
-		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
+		preg_replace('/\$\$labelplacement\$\$/', '', $Labelrepeat, 1);
 		if ($countlables > 1) $lableprint = true;
 		if (count($ids) > 1 && !$contentrepeat)
 		{
@@ -752,10 +752,10 @@ 
 
 		if ($contentrepeat)
 		{
-			$content_stream = fopen('php://temp','r+');
+			$content_stream = fopen('php://temp', 'r+');
 			fwrite($content_stream, $contentstart);
 			$joiner = '';
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
@@ -775,19 +775,19 @@ 
 					$joiner = "\r\n";
 					break;
 				default:
-					$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
+					$err = lang('%1 not implemented for %2!', '$$pagerepeat$$', $mimetype);
 					return false;
 			}
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
+			if ($contentrepeat) $content = $contentrepeat; //content to repeat
 			if ($lableprint) $content = $Labelrepeat;
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
 			{
-				if(!($replacements = $this->get_replacements($id,$content)))
+				if (!($replacements = $this->get_replacements($id, $content)))
 				{
 					$err = lang('Entry not found!');
 					return false;
@@ -801,88 +801,88 @@ 
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".egw_vfs::hsize(memory_get_usage(true)));
 			// some general replacements: current user, date and time
-			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
+			if (strpos($content, '$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')))
 			{
-				$replacements += $this->contact_replacements($user,'user');
-				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'account_primary_group'));
+				$replacements += $this->contact_replacements($user, 'user');
+				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'account_primary_group'));
 			}
-			$replacements['$$date$$'] = egw_time::to('now',true);
+			$replacements['$$date$$'] = egw_time::to('now', true);
 			$replacements['$$datetime$$'] = egw_time::to('now');
-			$replacements['$$time$$'] = egw_time::to('now',false);
+			$replacements['$$time$$'] = egw_time::to('now', false);
 
 			// does our extending class registered table-plugins AND document contains table tags
-			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
+			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s', $content, $matches, PREG_SET_ORDER))
 			{
 				// process each table
-				foreach($matches as $match)
+				foreach ($matches as $match)
 				{
-					$plugin   = $match[1];	// plugin name
+					$plugin   = $match[1]; // plugin name
 					$callback = $this->table_plugins[$plugin];
-					$repeat   = $match[2];	// line to repeat
+					$repeat   = $match[2]; // line to repeat
 					$repeats = '';
 					if (isset($callback))
 					{
-						for($n = 0; ($row_replacements = $this->$callback($plugin,$id,$n,$repeat)); ++$n)
+						for ($n = 0; ($row_replacements = $this->$callback($plugin, $id, $n, $repeat)); ++$n)
 						{
 							$_repeat = $this->process_commands($repeat, $row_replacements);
-							$repeats .= $this->replace($_repeat,$row_replacements,$mimetype,$mso_application_progid);
+							$repeats .= $this->replace($_repeat, $row_replacements, $mimetype, $mso_application_progid);
 						}
 					}
-					$content = str_replace($match[0],$repeats,$content);
+					$content = str_replace($match[0], $repeats, $content);
 				}
 			}
-			$content = $this->replace($content,$replacements,$mimetype,$mso_application_progid,$charset);
+			$content = $this->replace($content, $replacements, $mimetype, $mso_application_progid, $charset);
 
 			$content = $this->process_commands($content, $replacements);
 
 			// remove not existing replacements (eg. from calendar array)
-			if (strpos($content,'$$') !== null)
+			if (strpos($content, '$$') !== null)
 			{
-				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
+				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i', '', $content);
 			}
 			if ($contentrepeat)
 			{
-				fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content);
+				fwrite($content_stream, ($n == 0 ? '' : $joiner).$content);
 			}
-			if($lableprint)
+			if ($lableprint)
 			{
-				$contentrep[is_array($id) ? implode(':',$id) : $id] = $content;
+				$contentrep[is_array($id) ? implode(':', $id) : $id] = $content;
 			}
 		}
 		if ($Labelrepeat)
 		{
-			$countpage=0;
-			$count=0;
+			$countpage = 0;
+			$count = 0;
 			$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 
 			foreach ($contentrep as $Label)
 			{
-				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
-				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', $Label, $contentrepeatpages[$countpage], 1);
+				$count = $count + 1;
+				if (($count % $countlables) == 0 && count($contentrep) > $count)  //new page
 				{
-					$countpage = $countpage+1;
+					$countpage = $countpage + 1;
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
-			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/','',$contentrepeatpages[$countpage],-1);  //clean empty fields
+			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', '', $contentrepeatpages[$countpage], -1); //clean empty fields
 
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
-					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+					return $contentstart.implode('\\par \\page\\pard\\plain', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.text':
-					return $contentstart.implode('<text:line-break />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<text:line-break />', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.spreadsheet':
-					return $contentstart.implode('</text:p><text:p>',$contentrepeatpages).$contentend;
+					return $contentstart.implode('</text:p><text:p>', $contentrepeatpages).$contentend;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-					return $contentstart.implode('<w:br w:type="page" />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<w:br w:type="page" />', $contentrepeatpages).$contentend;
 				case 'text/plain':
-					return $contentstart.implode("\r\n",$contentrep).$contentend;
+					return $contentstart.implode("\r\n", $contentrep).$contentend;
 			}
-			$err = lang('%1 not implemented for %2!','$$labelplacement$$',$mimetype);
+			$err = lang('%1 not implemented for %2!', '$$labelplacement$$', $mimetype);
 			return false;
 		}
 
@@ -907,9 +907,9 @@ 
 	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string
 	 */
-	protected function replace($content,array $replacements,$mimetype,$mso_application_progid='',$charset=null)
+	protected function replace($content, array $replacements, $mimetype, $mso_application_progid = '', $charset = null)
 	{
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -918,12 +918,12 @@ 
 			case 'application/xml':
 			case 'text/xml':
 				$is_xml = true;
-				$charset = 'utf-8';	// xml files --> always use utf-8
+				$charset = 'utf-8'; // xml files --> always use utf-8
 				break;
 
 			case 'text/html':
 				$is_xml = true;
-				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i',$content,$matches))
+				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i', $content, $matches))
 				{
 					$charset = $matches[1];
 				}
@@ -942,18 +942,18 @@ 
 		// do we need to convert charset
 		if ($charset && $charset != translation::charset())
 		{
-			$replacements = translation::convert($replacements,translation::charset(),$charset);
+			$replacements = translation::convert($replacements, translation::charset(), $charset);
 		}
 
 		// Date only placeholders for timestamps
-		if(is_array($this->date_fields))
+		if (is_array($this->date_fields))
 		{
-			foreach($this->date_fields as $field)
+			foreach ($this->date_fields as $field)
 			{
-				if($value = $replacements['$$'.$field.'$$'])
+				if ($value = $replacements['$$'.$field.'$$'])
 				{
 					$time = egw_time::createFromFormat('+'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat.'*', $value);
-					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(egw_time::$user_dateformat)  : '';
+					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(egw_time::$user_dateformat) : '';
 				}
 			}
 		}
@@ -967,66 +967,66 @@ 
 			// only keep tags, if we have xsl extension available
 			if (class_exists(XSLTProcessor) && class_exists(DOMDocument) && $this->parse_html_styles)
 			{
-				switch($mimetype.$mso_application_progid)
+				switch ($mimetype.$mso_application_progid)
 				{
 					case 'text/html':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>','<style>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>', '<style>',
 						);
 						break;
 					case 'application/vnd.oasis.opendocument.text':		// open office
 					case 'application/vnd.oasis.opendocument.spreadsheet':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>',
 						);
 						break;
 					case 'application/xmlWord.Document':	// Word 2003*/
 					case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms office 2007
 					case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>',
 						);
 						break;
 				}
 			}
 			// clean replacements from array values and html or html-entities, which mess up xml
-			foreach($replacements as $name => &$value)
+			foreach ($replacements as $name => &$value)
 			{
 				// set unresolved array values to empty string
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$value = '';
 					continue;
 				}
 				// decode html entities back to utf-8
 
-				if (is_string($value) && (strpos($value,'&') !== false) && $this->parse_html_styles)
+				if (is_string($value) && (strpos($value, '&') !== false) && $this->parse_html_styles)
 				{
-					$value = html_entity_decode($value,ENT_QUOTES,$charset);
+					$value = html_entity_decode($value, ENT_QUOTES, $charset);
 
 					// remove all non-decodable entities
-					if (strpos($value,'&') !== false)
+					if (strpos($value, '&') !== false)
 					{
-						$value = preg_replace('/&[^; ]+;/','',$value);
+						$value = preg_replace('/&[^; ]+;/', '', $value);
 					}
 				}
 
-				if(!$this->parse_html_styles)
+				if (!$this->parse_html_styles)
 				{
 					// Encode special chars so they don't break the file
-					$value = htmlspecialchars($value,ENT_NOQUOTES);
+					$value = htmlspecialchars($value, ENT_NOQUOTES);
 				}
-				else if (is_string($value) && (strpos($value,'<') !== false))
+				else if (is_string($value) && (strpos($value, '<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if ($replace_tags && extension_loaded('tidy')) {
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
-						if($tidy->getStatus() == 2)
+						if ($tidy->getStatus() == 2)
 						{
 							error_log($tidy->errorBuffer);
 							$value = strip_tags($value);
@@ -1037,51 +1037,51 @@ 
 						}
 					}
 					// replace </p> and <br /> with CRLF (remove <p> and CRLF)
-					$value = str_replace(array("\r","\n",'<p>','</p>','<div>','</div>','<br />'),array('','','',"\r\n",'',"\r\n","\r\n"),$value);
-					$value = strip_tags($value,implode('',$replace_tags));
+					$value = str_replace(array("\r", "\n", '<p>', '</p>', '<div>', '</div>', '<br />'), array('', '', '', "\r\n", '', "\r\n", "\r\n"), $value);
+					$value = strip_tags($value, implode('', $replace_tags));
 
 					// Change <tag>...\r\n</tag> to <tag>...</tag>\r\n or simplistic line break below will mangle it
 					// Loop to catch things like <b><span>Break:\r\n</span></b>
-					if($mso_application_progid)
+					if ($mso_application_progid)
 					{
 						$count = $i = 0;
 						do
 						{
-							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n",$value,-1,$count);
+							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n", $value, -1, $count);
 							$i++;
-						} while($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
+						} while ($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
 					}
 				}
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
-				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u', ' ', $value);
+				if (is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
 				{
-					$names[] = preg_quote($name,'/');
+					$names[] = preg_quote($name, '/');
 				}
 			}
 
 			// Look for numbers, set their value if needed
-			if($this->numeric_fields || count($names))
+			if ($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
-					$names[] = preg_quote($fieldname,'/');
+				foreach ((array)$this->numeric_fields as $fieldname) {
+					$names[] = preg_quote($fieldname, '/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
 			}
 
 			// Look for dates, set their value if needed
-			if($this->date_fields || count($names))
+			if ($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach ((array)$this->date_fields as $fieldname) {
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
 			}
 
 			// replace CRLF with linebreak tag of given type
-			switch($mimetype.$mso_application_progid)
+			switch ($mimetype.$mso_application_progid)
 			{
 				case 'application/vnd.oasis.opendocument.text':		// open office writer
 					$break = '<text:line-break/>';
@@ -1108,17 +1108,17 @@ 
 			}
 			// now decode &, < and >, which need to be encoded as entities in xml
 			// Check for encoded >< getting double-encoded
-			if($this->parse_html_styles)
+			if ($this->parse_html_styles)
 			{
-				$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
+				$replacements = str_replace(array('&', "\r", "\n", '&amp;lt;', '&amp;gt;'), array('&amp;', '', $break, '&lt;', '&gt;'), $replacements);
 			}
 			else
 			{
 				// Need to at least handle new lines, or it'll be run together on one line
-				$replacements = str_replace(array("\r","\n"),array('',$break),$replacements);
+				$replacements = str_replace(array("\r", "\n"), array('', $break), $replacements);
 			}
 		}
-		return str_replace(array_keys($replacements),array_values($replacements),$content);
+		return str_replace(array_keys($replacements), array_values($replacements), $content);
 	}
 
 	/**
@@ -1126,36 +1126,36 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
-			$names[] = preg_quote($fieldname,'/');
+		foreach ((array)$this->numeric_fields as $fieldname) {
+			$names[] = preg_quote($fieldname, '/');
 		}
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2 calcext:value-type="float"><$3>$4</$3></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// tables in open office writer
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2><text:p text:style-name="Standard">$4</text:p></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// open office writer
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'('.implode('|',$names).')'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'('.implode('|', $names).')'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="Number">$1</Data>';
 
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1166,7 +1166,7 @@ 
 	 */
 	protected static function increase_backtrack_limit()
 	{
-		static $backtrack_limit=null,$memory_limit=null;
+		static $backtrack_limit = null, $memory_limit = null;
 		if (!isset($backtrack_limit))
 		{
 			$backtrack_limit = ini_get('pcre.backtrack_limit');
@@ -1174,16 +1174,16 @@ 
 		if (!isset($memory_limit))
 		{
 			$memory_limit = ini_get('memory_limit');
-			switch(strtoupper(substr($memory_limit, -1)))
+			switch (strtoupper(substr($memory_limit, -1)))
 			{
 				case 'G': $memory_limit *= 1024;
 				case 'M': $memory_limit *= 1024;
 				case 'K': $memory_limit *= 1024;
 			}
 		}
-		if ($backtrack_limit < $memory_limit/8)
+		if ($backtrack_limit < $memory_limit / 8)
 		{
-			ini_set( 'pcre.backtrack_limit', $backtrack_limit*=2);
+			ini_set('pcre.backtrack_limit', $backtrack_limit *= 2);
 			return true;
 		}
 		error_log("pcre.backtrack_limit exceeded @ $backtrack_limit, some cells left as text.");
@@ -1195,32 +1195,32 @@ 
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
-		if(!in_array($mimetype, array(
-			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
-			'application/xmlExcel.Sheet',					// Excel 2003
+		if (!in_array($mimetype, array(
+			'application/vnd.oasis.opendocument.spreadsheet', // open office calc
+			'application/xmlExcel.Sheet', // Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
 		))) return;
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
-			'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat.':s',
-			'!'.egw_time::$user_dateformat . '*' .egw_time::$user_timeformat.':s',
-			'!'.egw_time::$user_dateformat . '* ' .egw_time::$user_timeformat,
-			'!'.egw_time::$user_dateformat . '*',
+			'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat.':s',
+			'!'.egw_time::$user_dateformat.'*'.egw_time::$user_timeformat.':s',
+			'!'.egw_time::$user_dateformat.'* '.egw_time::$user_timeformat,
+			'!'.egw_time::$user_dateformat.'*',
 			'!'.egw_time::$user_dateformat,
 		);
 
 		// Properly format values for spreadsheet
-		foreach($names as $idx => &$field)
+		foreach ($names as $idx => &$field)
 		{
 			$key = '$$'.$field.'$$';
 			$field = preg_quote($field, '/');
-			if($values[$key])
+			if ($values[$key])
 			{
-				if(!is_numeric($values[$key]))
+				if (!is_numeric($values[$key]))
 				{
 					// Try the different formats, stop when one works
-					foreach($formats as $f)
+					foreach ($formats as $f)
 					{
 						try {
 							$date = egw_time::createFromFormat(
@@ -1228,12 +1228,12 @@ 
 								$values[$key],
 								egw_time::$user_timezone
 							);
-							if($date) break;
+							if ($date) break;
 						} catch (Exception $e) {
 
 						}
 					}
-					if(!$date)
+					if (!$date)
 					{
 						// Couldn't get a date out of it... skip it
 						trigger_error("Unable to parse date $key = '{$values[$key]}' - left as text", E_USER_NOTICE);
@@ -1245,16 +1245,16 @@ 
 				{
 					$date = new egw_time($values[$key]);
 				}
-				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
+				if ($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
 				{
 					$interval = $date->diff(new egw_time('1900-01-00 0:00'));
-					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
+					$values[$key] = $interval->format('%a') + 1; // 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
-					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
+					$values[$key] += ($date->format('H') * 60 + $date->format('i')) / 1440;
 				}
 				else
 				{
-					$values[$key] = date('Y-m-d\TH:i:s',egw_time::to($date,'ts'));
+					$values[$key] = date('Y-m-d\TH:i:s', egw_time::to($date, 'ts'));
 				}
 			}
 			else
@@ -1263,33 +1263,33 @@ 
 			}
 		}
 
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 				// Removing these forces calc to respect our set value-type
-				$content = str_ireplace('calcext:value-type="string"','',$content);
+				$content = str_ireplace('calcext:value-type="string"', '', $content);
 
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|',$names).')\$\$<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|', $names).')\$\$<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="date" office:date-value="\$\$$4\$\$"$2><$3>\$\$$4\$\$</$3></table:table-cell>';
 				break;
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'..('.implode('|',$names).')..'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'..('.implode('|', $names).')..'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="DateTime">\$\$$1\$\$</Data>';
 
 				break;
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1299,9 +1299,9 @@ 
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
-		if($app == null)
+		if ($app == null)
 		{
-			$app = str_replace('_merge','',get_class($this));
+			$app = str_replace('_merge', '', get_class($this));
 		}
 		$cfs = config::get_customfields($app);
 
@@ -1313,11 +1313,11 @@ 
 		preg_match_all('/\${2}(([^\/#]*?\/)?)#([^$\/]+)\/(.*?)[$}]{2}/', $content, $matches);
 		list($placeholders, $prefixes, $pre, $cf, $sub) = $matches;
 
-		foreach($cf as $index => $field)
+		foreach ($cf as $index => $field)
 		{
-			if($cfs[$field])
+			if ($cfs[$field])
 			{
-				if(in_array($cfs[$field]['type'],array_keys($GLOBALS['egw_info']['apps'])))
+				if (in_array($cfs[$field]['type'], array_keys($GLOBALS['egw_info']['apps'])))
 				{
 					$field_app = $cfs[$field]['type'];
 				}
@@ -1328,7 +1328,7 @@ 
 					$account = $GLOBALS['egw']->accounts->read($values['#'.$field]);
 					$app_replacements[$field] = $this->contact_replacements($account['person_id']);
 				}
-				else if ($list = explode('-',$cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps'])))
+				else if ($list = explode('-', $cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps'])))
 				{
 					// Sub-type - use app
 					$field_app = $list[0];
@@ -1339,7 +1339,7 @@ 
 				}
 
 				// Get replacements for that application
-				if(!$app_replacements[$field])
+				if (!$app_replacements[$field])
 				{
 					$classname = "{$field_app}_merge";
 					$class = new $classname();
@@ -1367,33 +1367,33 @@ 
 	 */
 	private function process_commands($content, $replacements)
 	{
-		if (strpos($content,'$$IF') !== false)
+		if (strpos($content, '$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NELF') !== false)
+		if (strpos($content, '$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NENVLF') !== false)
+		if (strpos($content, '$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$LETTERPREFIX$$') !== false)
+		if (strpos($content, '$$LETTERPREFIX$$') !== false)
 		{	//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
-			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
+			$content = str_replace('$$LETTERPREFIX$$', $LETTERPREFIXCUSTOM, $content);
 		}
-		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
+		if (strpos($content, '$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -1407,16 +1407,16 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$', $this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
+		if (array_key_exists('$$'.$param[3].'$$', $this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
 		
 		$pattern = '/'.preg_quote($param[2], '/').'/';
-		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
+		if (strpos($param[0], '$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
 		{
 			$pattern = '/^$/';
 		}
-		$replace = preg_match($pattern,$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
-		switch($this->mimetype)
+		$replace = preg_match($pattern, $this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
+		switch ($this->mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1429,14 +1429,14 @@ 
 				break;
 		}
 
-		switch($this->mimetype)
+		switch ($this->mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
 					break;
 				case 'application/vnd.oasis.opendocument.text':
-					$LF ='<text:line-break/>';
+					$LF = '<text:line-break/>';
 					break;
 				case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 					$LF = '</text:p><text:p>';
@@ -1446,35 +1446,35 @@ 
 					break;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-					$LF ='</w:t></w:r></w:p><w:p><w:r><w:t>';
+					$LF = '</w:t></w:r></w:p><w:p><w:r><w:t>';
 					break;
 				case 'application/xml';
-					$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
+					$LF = '</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
 					break;
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
-			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
+		if ($is_xml) {
+			$this->replacements = str_replace(array('&', '&amp;amp;', '<', '>', "\r", "\n"), array('&amp;', '&amp;', '&lt;', '&gt;', '', $LF), $this->replacements);
 		}
-		if (strpos($param[0],'$$NELF') === 0)
+		if (strpos($param[0], '$$NELF') === 0)
 		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
 		}
-		if (strpos($param[0],'$$NENVLF') === 0)
+		if (strpos($param[0], '$$NENVLF') === 0)
 		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF;
 		}
-		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
+		if (strpos($param[0], '$$LETTERPREFIXCUSTOM') === 0)
 		{	//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
-			$replaceprefix = explode(' ',substr($param[0],21,-2));
+			$replaceprefix = explode(' ', substr($param[0], 21, -2));
 			foreach ($replaceprefix as $key => $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] != '') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
 			}
-			$replace = implode($replaceprefixsort,' ');
+			$replace = implode($replaceprefixsort, ' ');
 		}
 		return $replace;
 	}
@@ -1488,7 +1488,7 @@ 
 	 * @param string $dirs comma or whitespace separated directories, used if $document is a relative path
 	 * @return string with error-message on error, otherwise it does NOT return
 	 */
-	public function download($document, $ids, $name='', $dirs='')
+	public function download($document, $ids, $name = '', $dirs = '')
 	{
 		//error_log(__METHOD__."('$document', ".array2string($ids).", '$name', dirs='$dirs') ->".function_backtrace());
 		if (($error = $this->check_document($document, $dirs)))
@@ -1504,7 +1504,7 @@ 
 				$mail_bo->openConnection();
 				try
 				{
-					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder='', $importID='');
+					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder = '', $importID = '');
 				}
 				catch (egw_exception_wrong_userinput $e)
 				{
@@ -1513,39 +1513,39 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success']) > 0) $retString .= count($msgs['success']).' '.(count($msgs['success']) + count($msgs['failed']) == 1 ? lang('Message prepared for sending.') : lang('Message(s) send ok.')); //implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
-				foreach($msgs['failed'] as $c =>$e)
+				foreach ($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed']) > 0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
 				return $retString;
 				break;
 			case 'application/vnd.oasis.opendocument.text':
 			case 'application/vnd.oasis.opendocument.spreadsheet':
 				$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,$ext).'-').$ext;
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, $ext).'-').$ext;
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'content.xml');
 				break;
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 				$mimetype = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.docx').'-').'.docx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.docx').'-').'.docx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'word/document.xml');
 				$fix = array(		// regular expression to fix garbled placeholders
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$$\\1$$',
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$','/').'/i' => '$$\\2$$',
-					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$\\1$',
-					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$ $\\1$ $',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$$\\1$$',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$', '/').'/i' => '$$\\2$$',
+					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$\\1$',
+					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$ $\\1$ $',
 				);
 				break;
 			case 'application/xml':
@@ -1559,12 +1559,12 @@ 
 				$fix = array(	// hack to get Excel 2007 to display additional rows in tables
 					'/ss:ExpandedRowCount="\d+"/' => 'ss:ExpandedRowCount="9999"',
 				);
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.xlsx').'-').'.xlsx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.xlsx').'-').'.xlsx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'xl/sharedStrings.xml');
 				break;
 		}
-		if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+		if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 		{
 			//error_log(__METHOD__."() !this->merge() err=$err");
 			return $err;
@@ -1581,22 +1581,22 @@ 
 			{
 				// Error converting HTML styles over
 				error_log($e->getMessage());
-				error_log("Target document: $content_url, IDs: ". array2string($ids));
+				error_log("Target document: $content_url, IDs: ".array2string($ids));
 
 				// Try again, but strip HTML so user gets something
 				$this->parse_html_styles = false;
-				if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+				if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 				{
 					return $err;
 				}
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
 		}
-		if(!empty($name))
+		if (!empty($name))
 		{
-			if(empty($ext))
+			if (empty($ext))
 			{
-				$ext = '.'.pathinfo($document,PATHINFO_EXTENSION);
+				$ext = '.'.pathinfo($document, PATHINFO_EXTENSION);
 			}
 			$name .= $ext;
 		}
@@ -1607,38 +1607,38 @@ 
 		if (isset($archive))
 		{
 			$zip = new ZipArchive;
-			if ($zip->open($archive,ZIPARCHIVE::CHECKCONS) !== true)
+			if ($zip->open($archive, ZIPARCHIVE::CHECKCONS) !== true)
 			{
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE::CHECKCONS) failed. Trying open without validating");
 				if ($zip->open($archive) !== true) throw new Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			if ($zip->addFromString($content_file, $merged) !== true) throw new Exception("!ZipArchive::addFromString('$content_file',\$merged)");
 			if ($zip->close() !== true) throw new Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
-			if (substr($mimetype,0,35) == 'application/vnd.oasis.opendocument.' && 			// only open office archives need that, ms word files brake
-				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))	// fix broken zip archives generated by current php
+			if (substr($mimetype, 0, 35) == 'application/vnd.oasis.opendocument.' && // only open office archives need that, ms word files brake
+				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION, '5.3.1', '<'))	// fix broken zip archives generated by current php
 			{
 				exec('/usr/bin/zip -F '.escapeshellarg($archive));
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
-			html::content_header($name,$mimetype,filesize($archive));
-			readfile($archive,'r');
+			html::content_header($name, $mimetype, filesize($archive));
+			readfile($archive, 'r');
 		}
 		else
 		{
 			if ($mimetype == 'application/xml')
 			{
-				if (strpos($merged,'<?mso-application progid="Word.Document"?>') !== false)
+				if (strpos($merged, '<?mso-application progid="Word.Document"?>') !== false)
 				{
-					$mimetype = 'application/msword';	// to open it automatically in word or oowriter
+					$mimetype = 'application/msword'; // to open it automatically in word or oowriter
 				}
-				elseif (strpos($merged,'<?mso-application progid="Excel.Sheet"?>') !== false)
+				elseif (strpos($merged, '<?mso-application progid="Excel.Sheet"?>') !== false)
 				{
-					$mimetype = 'application/vnd.ms-excel';	// to open it automatically in excel or oocalc
+					$mimetype = 'application/vnd.ms-excel'; // to open it automatically in excel or oocalc
 				}
 			}
-			html::content_header($name,$mimetype);
+			html::content_header($name, $mimetype);
 			echo $merged;
 		}
 		common::egw_exit();
@@ -1656,13 +1656,13 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if (empty($_POST['data_document_name'])) return false;
+		if (empty($_POST['data_document_dir'])) return false;
+		if (empty($_POST['data_checked'])) return false;
 
 		return $this->download(
 			$_POST['data_document_name'],
-			explode(',',$_POST['data_checked']),
+			explode(',', $_POST['data_checked']),
 			'',
 			$_POST['data_document_dir']
 		);
@@ -1676,16 +1676,16 @@ 
 	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
-	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
+	public static function get_documents($dirs, $prefix = 'document_', $mime_filter = null, $app = '')
 	{
-		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		$export_limit = self::getExportLimit($app);
+		if (!$dirs || (!self::hasExportLimit($export_limit, 'ISALLOWED') && !self::is_export_limit_excepted())) return array();
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 		if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 		{
-			foreach($dirs as $n => &$d) if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+			foreach ($dirs as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
 		{
@@ -1699,15 +1699,15 @@ 
 			}
 		}
 		$list = array();
-		foreach($dirs as $dir)
+		foreach ($dirs as $dir)
 		{
-			if (($files = egw_vfs::find($dir,array('need_mime'=>true),true)))
+			if (($files = egw_vfs::find($dir, array('need_mime'=>true), true)))
 			{
-				foreach($files as $file)
+				foreach ($files as $file)
 				{
 					// return only the mime-types we support
-					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
+					$parts = explode('.', $file['name']);
+					if (!self::is_implemented($file['mime'], '.'.array_pop($parts))) continue;
 					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
 					$list[$prefix.$file['name']] = egw_vfs::decodePath($file['name']);
 				}
@@ -1734,14 +1734,14 @@ 
 	 * @param int|string $export_limit=null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
 	 * @return array see nextmatch_widget::egw_actions
 	 */
-	public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
-		$export_limit=null)
+	public static function document_action($dirs, $group = 0, $caption = 'Insert in document', $prefix = 'document_', $default_doc = '',
+		$export_limit = null)
 	{
 		$documents = array();
 		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
 		if ($default_doc && ($file = egw_vfs::stat($default_doc)))	// put default document on top
 		{
-			if(!$file['mime'])
+			if (!$file['mime'])
 			{
 				$file['mime'] = egw_vfs::mime_content_type($default_doc);
 				$file['path'] = $default_doc;
@@ -1750,7 +1750,7 @@ 
 				'icon' => egw_vfs::mime_icon($file['mime']),
 				'caption' => egw_vfs::decodePath(egw_vfs::basename($default_doc)),
 				'group' => 1,
-				'postSubmit' => true,	// download needs post submit (not Ajax) to work
+				'postSubmit' => true, // download needs post submit (not Ajax) to work
 			);
 			if ($file['mime'] == 'message/rfc822')
 			{
@@ -1765,25 +1765,25 @@ 
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 			{
-				foreach($dirs as $n => &$d) if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				foreach ($dirs as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 			}
-			foreach($dirs as $dir)
+			foreach ($dirs as $dir)
 			{
-				$files += egw_vfs::find($dir,array(
+				$files += egw_vfs::find($dir, array(
 					'need_mime' => true,
 					'order' => 'fs_name',
 					'sort' => 'ASC',
-				),true);
+				), true);
 			}
 		}
 
 		$dircount = array();
-		foreach($files as $key => $file)
+		foreach ($files as $key => $file)
 		{
 			// use only the mime-types we support
-			$parts = explode('.',$file['name']);
-			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
-				!egw_vfs::check_access($file['path'], egw_vfs::READABLE, $file) ||	// remove files not readable by user
+			$parts = explode('.', $file['name']);
+			if (!self::is_implemented($file['mime'], '.'.array_pop($parts)) ||
+				!egw_vfs::check_access($file['path'], egw_vfs::READABLE, $file) || // remove files not readable by user
 				$file['path'] === $default_doc)	// default doc already added
 			{
 				unset($files[$key]);
@@ -1791,40 +1791,40 @@ 
 			else
 			{
 				$dirname = egw_vfs::dirname($file['path']);
-				if(!isset($dircount[$dirname]))
+				if (!isset($dircount[$dirname]))
 				{
 					$dircount[$dirname] = 1;
 				}
 				else
 				{
-					$dircount[$dirname] ++;
+					$dircount[$dirname]++;
 				}
 			}
 		}
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if (count($dircount) > 1)
 			{
 				$name_arr = explode('/', $file['name']);
 				$current_level = &$documents;
-				for($count = 0; $count < count($name_arr); $count++)
+				for ($count = 0; $count < count($name_arr); $count++)
 				{
-					if($count == 0)
+					if ($count == 0)
 					{
 						$current_level = &$documents;
 					}
 					else
 					{
-						$current_level = &$current_level[$prefix.$name_arr[($count-1)]]['children'];
+						$current_level = &$current_level[$prefix.$name_arr[($count - 1)]]['children'];
 					}
-					switch($count)
+					switch ($count)
 					{
-						case (count($name_arr)-1):
+						case (count($name_arr) - 1):
 							$current_level[$prefix.$file['name']] = array(
 								'icon'		=> egw_vfs::mime_icon($file['mime']),
 								'caption'	=> egw_vfs::decodePath($name_arr[$count]),
 								'group'		=> 2,
-								'postSubmit' => true,	// download needs post submit (not Ajax) to work
+								'postSubmit' => true, // download needs post submit (not Ajax) to work
 							);
 							if ($file['mime'] == 'message/rfc822')
 							{
@@ -1833,7 +1833,7 @@ 
 							break;
 
 						default:
-							if(!is_array($current_level[$prefix.$name_arr[$count]]))
+							if (!is_array($current_level[$prefix.$name_arr[$count]]))
 							{
 								// create parent folder
 								$current_level[$prefix.$name_arr[$count]] = array(
@@ -1860,7 +1860,7 @@ 
 				}
 				$documents[$file['mime']]['children'][$prefix.$file['name']] = array(
 					'caption' => egw_vfs::decodePath($file['name']),
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -1873,7 +1873,7 @@ 
 					'icon' => egw_vfs::mime_icon($file['mime']),
 					'caption' => egw_vfs::decodePath($file['name']),
 					'group' => 2,
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -1887,8 +1887,8 @@ 
 			'caption' => $caption,
 			'children' => $documents,
 			// disable action if no document or export completly forbidden for non-admins
-			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit,'ISALLOWED') || self::is_export_limit_excepted()),
-			'hideOnDisabled' => true,	// do not show 'Insert in document', if no documents defined or no export allowed
+			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit, 'ISALLOWED') || self::is_export_limit_excepted()),
+			'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined or no export allowed
 			'group' => $group,
 		);
 	}
@@ -1919,14 +1919,14 @@ 
 		);
 
 		// egw.open() used if only 1 row selected
-		$action['egw_open'] = 'edit-mail--'.implode('&',$extra);
-		$action['target'] = 'compose_' .$file['path'];
+		$action['egw_open'] = 'edit-mail--'.implode('&', $extra);
+		$action['target'] = 'compose_'.$file['path'];
 
 		// long_task runs menuaction once for each selected row
 		$action['nm_action'] = 'long_task';
 		$action['popup'] = egw_link::get_registry('mail', 'edit_popup');
-		$action['message'] = lang('insert in %1',egw_vfs::decodePath($file['name']));
-		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='. get_called_class();
+		$action['message'] = lang('insert in %1', egw_vfs::decodePath($file['name']));
+		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='.get_called_class();
 	}
 
 	/**
@@ -1938,15 +1938,15 @@ 
 	 */
 	public static function check_document(&$document, $dirs)
 	{
-		if($document[0] !== '/')
+		if ($document[0] !== '/')
 		{
 			// split multiple comma or whitespace separated directories
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if ($dirs && ($dirs = preg_split('/[,\s]+\//', $dirs)))
 			{
-				foreach($dirs as $n => $dir)
+				foreach ($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 					if (egw_vfs::stat($dir.'/'.$document) && egw_vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -1960,7 +1960,7 @@ 
 			return false;
 		}
 		//error_log(__METHOD__."('$document', dirs='$dirs') returning 'Document '$document' does not exist or is not readable for you!'");
-		return lang("Document '%1' does not exist or is not readable for you!",$document);
+		return lang("Document '%1' does not exist or is not readable for you!", $document);
 	}
 
 	/**
@@ -1981,16 +1981,16 @@ 
 	 * @param string $_mimetype=''
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
+	static public function number_format($number, $num_decimal_places = 2, $_mimetype = '')
 	{
 		if ((string)$number === '') return '';
 		//error_log(__METHOD__.$_mimetype);
-		switch($_mimetype)
+		switch ($_mimetype)
 		{
 			case 'application/xml':	// Excel 2003
 			case 'application/vnd.oasis.opendocument.spreadsheet': // OO.o spreadsheet
-				return number_format(str_replace(' ','',$number),$num_decimal_places,'.','');
+				return number_format(str_replace(' ', '', $number), $num_decimal_places, '.', '');
 		}
-		return etemplate::number_format($number,$num_decimal_places);
+		return etemplate::number_format($number, $num_decimal_places);
 	}
 }

Braces +282 added lines, -78 removed lines

@@ -156,19 +156,28 @@ 
 		switch ($mimetype)
 		{
 			case 'application/msword':
-				if (strtolower($extension) != '.rtf') break;
+				if (strtolower($extension) != '.rtf')
+				{
+					break;
+				}
 			case 'application/rtf':
 			case 'text/rtf':
 				return true;	// rtf files
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':	// ms excel 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// ms word xml format
 			case 'application/xml':
 				return true;	// alias for text/xml, eg. ms office 2003 word format
@@ -201,7 +210,10 @@ 
 		{
 			$contact = $this->contacts->read($contact, $ignore_acl);
 		}
-		if (!is_array($contact)) return array();
+		if (!is_array($contact))
+		{
+			return array();
+		}
 		
 		$replacements = array();
 		foreach(array_keys($this->contacts->contact_fields) as $name)
@@ -210,7 +222,10 @@ 
 			switch($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = egw_time::to($value);
+					if($value)
+					{
+						$value = egw_time::to($value);
+					}
 					break;
 				case 'bday':
 					if ($value)
@@ -256,7 +271,10 @@ 
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo')
+			{
+				$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			}
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
@@ -270,18 +288,24 @@ 
 		$cats = array();
 		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
+			if(!$cat_id)
+			{
+				continue;
+			}
 			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
 			{
 				$path = $GLOBALS['egw']->categories->id2name($cat_id,'path');
 				$path = explode(' / ', $path);
 				unset($path[0]); // Drop main
 				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+			}
+			elseif($cat_id)
+			{
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
+		foreach($cats as $main => $cat)
+		{
 			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
 				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
 		}
@@ -316,7 +340,10 @@ 
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if($exclude && in_array($link_info['id'], $exclude))
+			{
+				continue;
+			}
 
 			$title = egw_link::title($link_info['app'], $link_info['id']);
 			if(class_exists('stylite_links_stream_wrapper') && $link_info['app'] != egw_link::VFS_APPNAME)
@@ -435,7 +462,10 @@ 
 	protected function format_datetime($time,$format=null)
 	{
 		trigger_error(__METHOD__ . ' is deprecated, use egw_time::to($time, $format)', E_USER_DEPRECATED);
-		if (is_null($format)) $format = $this->datetime_format;
+		if (is_null($format))
+		{
+			$format = $this->datetime_format;
+		}
 
 		return egw_time::to($time,$format);
 	}
@@ -478,8 +508,14 @@ 
 	public static function getExportLimit($app='common')
 	{
 		static $exportLimitStore;
-		if (is_null($exportLimitStore)) $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		if (is_null($exportLimitStore))
+		{
+			$exportLimitStore=array();
+		}
+		if (empty($app))
+		{
+			$app='common';
+		}
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
 		if (!array_key_exists($app,$exportLimitStore))
 		{
@@ -488,7 +524,10 @@ 
 			if ($app !='common')
 			{
 				$app_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
-				if ($app_limit) $exportLimitStore[$app] = $app_limit;
+				if ($app_limit)
+				{
+					$exportLimitStore[$app] = $app_limit;
+				}
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
 			if (empty($exportLimitStore[$app]))
@@ -521,10 +560,22 @@ 
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
-		if (empty($app_limit)) return false;
-		if ($app_limit == 'no') return true;
-		if ($app_limit > 0) return true;
+		if (strtoupper($checkas) == 'ISALLOWED')
+		{
+			return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		}
+		if (empty($app_limit))
+		{
+			return false;
+		}
+		if ($app_limit == 'no')
+		{
+			return true;
+		}
+		if ($app_limit > 0)
+		{
+			return true;
+		}
 	}
 
 	/**
@@ -559,7 +610,8 @@ 
 
 		try {
 			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$err = $e->getMessage();
 			return false;
 		}
@@ -647,7 +699,8 @@ 
 			$content = $xslt->transformToXml($element);
 
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0)
+			{
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -700,7 +753,10 @@ 
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart,'$$') !== false)
+			{
+				$nohead = true;
+			}
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -742,13 +798,19 @@ 
 		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
 		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
-		if ($countlables > 1) $lableprint = true;
+		if ($countlables > 1)
+		{
+			$lableprint = true;
+		}
 		if (count($ids) > 1 && !$contentrepeat)
 		{
 			$err = lang('for more than one contact in a document use the tag pagerepeat!');
 			return false;
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		}
 
 		if ($contentrepeat)
 		{
@@ -781,8 +843,15 @@ 
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
-			if ($lableprint) $content = $Labelrepeat;
+			if ($contentrepeat)
+			{
+				$content = $contentrepeat;
+			}
+			//content to repeat
+			if ($lableprint)
+			{
+				$content = $Labelrepeat;
+			}
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
@@ -799,7 +868,10 @@ 
 				$err = $e->getMessage();
 				return false;
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".egw_vfs::hsize(memory_get_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() $n: $id ".egw_vfs::hsize(memory_get_usage(true)));
+			}
 			// some general replacements: current user, date and time
 			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
 			{
@@ -859,9 +931,12 @@ 
 			{
 				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
 				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				if (($count % $countlables) == 0 && count($contentrep)>$count)
+				{
+					//new page
 				{
 					$countpage = $countpage+1;
+				}
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
@@ -892,7 +967,10 @@ 
 			rewind($content_stream);
 			return stream_get_contents($content_stream);
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."() returning ".egw_vfs::hsize(memory_get_peak_usage(true)));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."() returning ".egw_vfs::hsize(memory_get_peak_usage(true)));
+		}
 
 		return $content;
 	}
@@ -934,7 +1012,10 @@ 
 				break;
 
 			default:	// div. text files --> use our export-charset, defined in addressbook prefs
-				if (empty($charset)) $charset = $this->contacts->prefs['csv_charset'];
+				if (empty($charset))
+				{
+					$charset = $this->contacts->prefs['csv_charset'];
+				}
 				break;
 		}
 		//error_log(__METHOD__."('$document', ... ,$mimetype) --> $charset (egw=".translation::charset().', export='.$this->contacts->prefs['csv_charset'].')');
@@ -957,10 +1038,13 @@ 
 				}
 			}
 		}
-		if ($is_xml)	// zip'ed xml document (eg. OO)
+		if ($is_xml)
+		{
+			// zip'ed xml document (eg. OO)
 		{
 			// Numeric fields
 			$names = array();
+		}
 
 			// Tags we can replace with the target document's version
 			$replace_tags = array();
@@ -1022,7 +1106,8 @@ 
 				else if (is_string($value) && (strpos($value,'<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if($replace_tags && extension_loaded('tidy'))
+					{
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
@@ -1055,16 +1140,20 @@ 
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
 				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				if(is_numeric($value) && $name != '$$user/account_id$$')
+				{
+					// account_id causes problems with the preg_replace below
 				{
 					$names[] = preg_quote($name,'/');
 				}
+				}
 			}
 
 			// Look for numbers, set their value if needed
 			if($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
+				foreach((array)$this->numeric_fields as $fieldname)
+				{
 					$names[] = preg_quote($fieldname,'/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
@@ -1074,7 +1163,8 @@ 
 			if($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach((array)$this->date_fields as $fieldname)
+				{
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
@@ -1126,7 +1216,8 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
+		foreach((array)$this->numeric_fields as $fieldname)
+		{
 			$names[] = preg_quote($fieldname,'/');
 		}
 		switch($mimetype)
@@ -1155,7 +1246,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1199,7 +1294,10 @@ 
 			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
 			'application/xmlExcel.Sheet',					// Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
-		))) return;
+		)))
+		{
+			return;
+		}
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
@@ -1228,8 +1326,12 @@ 
 								$values[$key],
 								egw_time::$user_timezone
 							);
-							if($date) break;
-						} catch (Exception $e) {
+							if($date)
+							{
+								break;
+							}
+						}
+						catch (Exception $e) {
 
 						}
 					}
@@ -1245,9 +1347,12 @@ 
 				{
 					$date = new egw_time($values[$key]);
 				}
-				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
+				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+				{
+					//Excel WTF
 				{
 					$interval = $date->diff(new egw_time('1900-01-00 0:00'));
+				}
 					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
 					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
@@ -1289,7 +1394,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1352,7 +1461,10 @@ 
 			}
 			else
 			{
-				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time') $this->date_fields[] = '#'.$field;
+				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time')
+				{
+					$this->date_fields[] = '#'.$field;
+				}
 			}
 		}
 	}
@@ -1368,30 +1480,35 @@ 
 	private function process_commands($content, $replacements)
 	{
 		if (strpos($content,'$$IF') !== false)
-		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
+		{
+//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
-		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
+		{
+//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
-		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
+		{
+//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
-		{	//Example use to use: $$LETTERPREFIX$$
+		{
+//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
 			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
 		}
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
-		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
+		{
+//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
@@ -1407,8 +1524,14 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$',$this->replacements))
+		{
+			$param[4] = $this->replacements['$$'.$param[4].'$$'];
+		}
+		if (array_key_exists('$$'.$param[3].'$$',$this->replacements))
+		{
+			$param[3] = $this->replacements['$$'.$param[3].'$$'];
+		}
 		
 		$pattern = '/'.preg_quote($param[2], '/').'/';
 		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
@@ -1430,7 +1553,7 @@ 
 		}
 
 		switch($this->mimetype)
-			{
+		{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
@@ -1454,25 +1577,38 @@ 
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
+		if($is_xml)
+		{
 			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
 		}
 		if (strpos($param[0],'$$NELF') === 0)
-		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+		{
+//sets a Pagebreak and value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			}
 		}
 		if (strpos($param[0],'$$NENVLF') === 0)
-		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+		{
+//sets a Pagebreak without any value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF;
+			}
 		}
 		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
-		{	//sets a Letterprefix
+		{
+//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
 			$replaceprefix = explode(' ',substr($param[0],21,-2));
 			foreach ($replaceprefix as $key => $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] !='')
+				{
+					$replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				}
 			}
 			$replace = implode($replaceprefixsort,' ');
 		}
@@ -1513,13 +1649,20 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success'])>0)
+				{
+					$retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));
+				}
+				//implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
 				foreach($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed'])>0)
+				{
+					$retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				}
 				return $retString;
 				break;
 			case 'application/vnd.oasis.opendocument.text':
@@ -1590,7 +1733,10 @@ 
 					return $err;
 				}
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after HTML processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
+			}
 		}
 		if(!empty($name))
 		{
@@ -1610,18 +1756,33 @@ 
 			if ($zip->open($archive,ZIPARCHIVE::CHECKCONS) !== true)
 			{
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE::CHECKCONS) failed. Trying open without validating");
-				if ($zip->open($archive) !== true) throw new Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				if ($zip->open($archive) !== true)
+				{
+					throw new Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				}
+			}
+			if ($zip->addFromString($content_file,$merged) !== true)
+			{
+				throw new Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			}
+			if ($zip->close() !== true)
+			{
+				throw new Exception("!ZipArchive::close()");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Exception("!ZipArchive::addFromString('$content_file',\$merged)");
-			if ($zip->close() !== true) throw new Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
 			if (substr($mimetype,0,35) == 'application/vnd.oasis.opendocument.' && 			// only open office archives need that, ms word files brake
-				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))	// fix broken zip archives generated by current php
+				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))
+			{
+				// fix broken zip archives generated by current php
 			{
 				exec('/usr/bin/zip -F '.escapeshellarg($archive));
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
+			}
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after ZIP processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
+			}
 			html::content_header($name,$mimetype,filesize($archive));
 			readfile($archive,'r');
 		}
@@ -1656,9 +1817,18 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if(empty($_POST['data_document_name']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_document_dir']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_checked']))
+		{
+			return false;
+		}
 
 		return $this->download(
 			$_POST['data_document_name'],
@@ -1679,13 +1849,20 @@ 
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
 	{
 		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted()))
+		{
+			return array();
+		}
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 		if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 		{
-			foreach($dirs as $n => &$d) if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+			foreach($dirs as $n => &$d)
+			{
+				if ($n) $d = '/'.$d;
+			}
+			// re-adding trailing slash removed by split
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
 		{
@@ -1707,8 +1884,14 @@ 
 				{
 					// return only the mime-types we support
 					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
-					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
+					if (!self::is_implemented($file['mime'],'.'.array_pop($parts)))
+					{
+						continue;
+					}
+					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter))
+					{
+						continue;
+					}
 					$list[$prefix.$file['name']] = egw_vfs::decodePath($file['name']);
 				}
 			}
@@ -1738,12 +1921,19 @@ 
 		$export_limit=null)
 	{
 		$documents = array();
-		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
-		if ($default_doc && ($file = egw_vfs::stat($default_doc)))	// put default document on top
+		if ($export_limit == null)
+		{
+			$export_limit = self::getExportLimit();
+		}
+		// check if there is a globalsetting
+		if ($default_doc && ($file = egw_vfs::stat($default_doc)))
+		{
+			// put default document on top
 		{
 			if(!$file['mime'])
 			{
 				$file['mime'] = egw_vfs::mime_content_type($default_doc);
+		}
 				$file['path'] = $default_doc;
 			}
 			$documents['document'] = array(
@@ -1765,7 +1955,11 @@ 
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 			{
-				foreach($dirs as $n => &$d) if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				foreach($dirs as $n => &$d)
+				{
+					if ($n) $d = '/'.$d;
+				}
+				// re-adding trailing slash removed by split
 			}
 			foreach($dirs as $dir)
 			{
@@ -1784,10 +1978,13 @@ 
 			$parts = explode('.',$file['name']);
 			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
 				!egw_vfs::check_access($file['path'], egw_vfs::READABLE, $file) ||	// remove files not readable by user
-				$file['path'] === $default_doc)	// default doc already added
+				$file['path'] === $default_doc)
+			{
+				// default doc already added
 			{
 				unset($files[$key]);
 			}
+			}
 			else
 			{
 				$dirname = egw_vfs::dirname($file['path']);
@@ -1946,7 +2143,11 @@ 
 			{
 				foreach($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n)
+					{
+						$dir = '/'.$dir;
+					}
+					// re-adding trailing slash removed by split
 					if (egw_vfs::stat($dir.'/'.$document) && egw_vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -1983,7 +2184,10 @@ 
 	 */
 	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
 	{
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 		//error_log(__METHOD__.$_mimetype);
 		switch($_mimetype)
 		{

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

@@ -1417,19 +1417,19 @@ 
 		if (strpos($content,'$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
@@ -1440,7 +1440,7 @@ 
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -1958,7 +1958,7 @@ 
 	 * @param Array $file Array of information about the document from Api\Vfs::find
 	 * @return void
 	 */
-	private static function document_mail_action(Array &$action, $file)
+	private static function document_mail_action(array &$action, $file)
 	{
 		unset($action['postSubmit']);
 

etemplate/inc/class.bo_tracking.inc.php

Doc Comments +3 added lines, -4 removed lines

@@ -521,7 +521,7 @@ 
 	 * @param array $data current entry
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
-	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
+	 * @param array $email_notified if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
@@ -789,7 +789,7 @@ 
 	 * Return date+time formatted for the currently notified user (prefs in $GLOBALS['egw_info']['user']['preferences'])
 	 *
 	 * @param int|string|DateTime $timestamp in server-time
-	 * @param boolean $do_time=true true=allways (default), false=never print the time, null=print time if != 00:00
+	 * @param boolean $do_time true=allways (default), false=never print the time, null=print time if != 00:00
 	 *
 	 * @return string
 	 */
@@ -816,7 +816,6 @@ 
 	 * The default implementation prefers depending on the prefer_user_as_sender class-var the user over
 	 * what is returned by get_config('sender').
 	 *
-	 * @param int $user account_lid of user
 	 * @param array $data
 	 * @param array $old
 	 * @param bool $prefer_id returns the userid rather than email
@@ -866,7 +865,7 @@ 
 	 *
 	 * @param array $data
 	 * @param array $old
-	 * @param boolean $deleted=null can be set to true to let the tracking know the item got deleted or undelted
+	 * @param boolean $deleted can be set to true to let the tracking know the item got deleted or undelted
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */

Spacing +153 added lines, -153 removed lines

@@ -188,12 +188,12 @@ 
 	{
 		if ($cf_app)
 		{
-			$linkable_cf_types = array('link-entry')+array_keys(egw_link::app_list());
-			foreach(egw_customfields::get($cf_app, true) as $cf_name => $cf_data)
+			$linkable_cf_types = array('link-entry') + array_keys(egw_link::app_list());
+			foreach (egw_customfields::get($cf_app, true) as $cf_name => $cf_data)
 			{
 				$this->field2history['#'.$cf_name] = '#'.$cf_name;
 
-				if (in_array($cf_data['type'],$linkable_cf_types))
+				if (in_array($cf_data['type'], $linkable_cf_types))
 				{
 					$this->cf_link_fields['#'.$cf_name] = $cf_data['type'] == 'link-entry' ? '' : $cf_data['type'];
 				}
@@ -215,7 +215,7 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
 		return array();
 	}
@@ -227,14 +227,14 @@ 
 	 * @param string $only_type2 = null if given only return fields of type2 == $only_type2
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_customfields($data, $only_type2=null)
+	function get_customfields($data, $only_type2 = null)
 	{
 		$details = array();
 
-		if (($cfs = egw_customfields::get($this->app, $all_private_too=false, $only_type2)))
+		if (($cfs = egw_customfields::get($this->app, $all_private_too = false, $only_type2)))
 		{
 			$header_done = false;
-			foreach($cfs as $name => $field)
+			foreach ($cfs as $name => $field)
 			{
 				if (in_array($field['type'], egw_customfields::$non_printable_fields)) continue;
 
@@ -275,7 +275,7 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	protected function get_config($name,$data,$old=null)
+	protected function get_config($name, $data, $old = null)
 	{
 		return null;
 	}
@@ -291,7 +291,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
 
@@ -300,7 +300,7 @@ 
 		if ($old && $this->field2history)
 		{
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
 			//error_log(__METHOD__.__LINE__.' Changes:'.print_r($changes,true));
 		}
@@ -308,10 +308,10 @@ 
 		//error_log(__METHOD__.__LINE__.' LinkFields:'.array2string($this->cf_link_fields));
 		if ($changes && $this->cf_link_fields)
 		{
-			$this->update_links($data,(array)$old);
+			$this->update_links($data, (array)$old);
 		}
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -328,45 +328,45 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($data).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($this->cf_link_fields));
-		foreach((array)$this->cf_link_fields as $name => $val)
+		foreach ((array)$this->cf_link_fields as $name => $val)
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id', $data[$name])) $data[$name] = $data[$name]['id'];
+			if (is_array($old[$name]) && array_key_exists('id', $old[$name])) $old[$name] = $old[$name]['id'];
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
-		$current_ids = array_unique(array_diff(array_intersect_key($data,$this->cf_link_fields),array('',0,NULL)));
-		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old,$this->cf_link_fields),array('',0,NULL))) : array();
+		$current_ids = array_unique(array_diff(array_intersect_key($data, $this->cf_link_fields), array('', 0, NULL)));
+		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old, $this->cf_link_fields), array('', 0, NULL))) : array();
 		//error_log(__METHOD__.__LINE__.array2string($current_ids));
 		//error_log(__METHOD__.__LINE__.array2string($old_ids));
 		// create links for added application entry
-		foreach(array_diff($current_ids,$old_ids) as $name => $id)
+		foreach (array_diff($current_ids, $old_ids) as $name => $id)
 		{
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				list($app, $id) = explode(':', $id);
+				if (!$id) continue; // can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) egw_link::link($this->app,$source_id,$app,$id);
+			if ($source_id) egw_link::link($this->app, $source_id, $app, $id);
 			//error_log(__METHOD__.__LINE__."egw_link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>egw_link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
 
 		// unlink removed application entries
-		foreach(array_diff($old_ids,$current_ids) as $name => $id)
+		foreach (array_diff($old_ids, $current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name])) continue; // ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
+				list($app, $id) = explode(':', $id);
 				if (!$id) continue;
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) egw_link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id) egw_link::unlink(null, $this->app, $source_id, 0, $app, $id);
 			//echo "<p>egw_link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -381,19 +381,19 @@ 
 	 * @param array $changed_fields = null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
 		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
-			$this->historylog = new historylog($this->app,$this->user);
+			$this->historylog = new historylog($this->app, $this->user);
 		}
 		// log user-agent and session-action
 		if ($GLOBALS['egw_info']['server']['log_user_agent_action'] && ($changed_fields || !$old))
@@ -401,30 +401,30 @@ 
 			$this->historylog->add('user_agent_action', $data[$this->id_field],
 				$_SERVER['HTTP_USER_AGENT'], $_SESSION[egw_session::EGW_SESSION_VAR]['session_action']);
 		}
-		foreach($changed_fields as $name)
+		foreach ($changed_fields as $name)
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
 			if (is_array($status))	// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
-				$added = array_values(array_diff($data[$name],$old[$name]));
-				$removed = array_values(array_diff($old[$name],$data[$name]));
-				$n = max(array(count($added),count($removed)));
-				for($i = 0; $i < $n; ++$i)
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
+				$added = array_values(array_diff($data[$name], $old[$name]));
+				$removed = array_values(array_diff($old[$name], $data[$name]));
+				$n = max(array(count($added), count($removed)));
+				for ($i = 0; $i < $n; ++$i)
 				{
 					//error_log(__METHOD__."() $i: historylog->add('$name',data['$this->id_field']={$data[$this->id_field]},".array2string($added[$i]).','.array2string($removed[$i]));
-					$this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]);
+					$this->historylog->add($name, $data[$this->id_field], $added[$i], $removed[$i]);
 				}
 			}
 			else
 			{
 				//error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]);
-				$this->historylog->add($status,$data[$this->id_field],
-					is_array($data[$name]) ? implode(',',$data[$name]) : $data[$name],
-					is_array($old[$name]) ? implode(',',$old[$name]) : $old[$name]);
+				$this->historylog->add($status, $data[$this->id_field],
+					is_array($data[$name]) ? implode(',', $data[$name]) : $data[$name],
+					is_array($old[$name]) ? implode(',', $old[$name]) : $old[$name]);
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' return:'.count($changed_fields));
@@ -440,28 +440,28 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
 		if (is_null($old)) return array_keys($data);
 		$changed_fields = array();
-		foreach($this->field2history as $name => $status)
+		foreach ($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name]) continue; // treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name])) continue; // no set customfields are not stored, therefore not changed
 
 			if (is_array($status))	// 1:N relation
 			{
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
 			}
 			if ($old[$name] != $data[$name])
 			{
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name])) $data[$name] = explode(',', $data[$name]);
+					if (!is_array($old[$name])) $old[$name] = explode(',', $old[$name]);
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
@@ -471,13 +471,13 @@ 
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
 				{
-					continue;	// change only in CR (eg. different OS) --> ignore
+					continue; // change only in CR (eg. different OS) --> ignore
 				}
 				$changed_fields[] = $name;
 				//echo "<p>$name: ".array2string($data[$name]).' != '.array2string($old[$name])."</p>\n";
 			}
 		}
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			if ($name[0] == '#' && $name[1] == '#' && $value !== $old[$name])
 			{
@@ -494,18 +494,18 @@ 
 	 * @param array &$rows rows of the 1:N relation
 	 * @param array $cols field names as values
 	 */
-	private static function compact_1_N_relation(&$rows,array $cols)
+	private static function compact_1_N_relation(&$rows, array $cols)
 	{
 		if (is_array($rows))
 		{
-			foreach($rows as $key => &$row)
+			foreach ($rows as $key => &$row)
 			{
 				$values = array();
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					$values[] = $row[$col];
 				}
-				$row = implode(self::ONE2N_SEPERATOR,$values);
+				$row = implode(self::ONE2N_SEPERATOR, $values);
 			}
 		}
 		else
@@ -524,7 +524,7 @@ 
 	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
-	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
+	public function do_notifications($data, $old, $deleted = null, &$email_notified = null)
 	{
 		$this->errors = $email_sent = array();
 		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
@@ -532,19 +532,19 @@ 
 		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
-			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
+			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email');
 		}
-		$skip_notify = $this->get_config('skip_notify',$data,$old);
-		if($skip_notify && is_array($skip_notify))
+		$skip_notify = $this->get_config('skip_notify', $data, $old);
+		if ($skip_notify && is_array($skip_notify))
 		{
 			$email_sent = array_merge($email_sent, $skip_notify);
 		}
 
 		// entry creator
-		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field],'account_email')) &&
+		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field], 'account_email')) &&
 			!in_array($email, $email_sent))
 		{
-			if ($this->send_notification($data,$old,$email,$data[$this->creator_field],'notify_creator'))
+			if ($this->send_notification($data, $old, $email, $data[$this->creator_field], 'notify_creator'))
 			{
 				$email_sent[] = $email;
 			}
@@ -553,12 +553,12 @@ 
 		// members of group when entry owned by group
 		if ($this->creator_field && $GLOBALS['egw']->accounts->get_type($data[$this->creator_field]) == 'g')
 		{
-			foreach($GLOBALS['egw']->accounts->members($data[$this->creator_field],true) as $u)
+			foreach ($GLOBALS['egw']->accounts->members($data[$this->creator_field], true) as $u)
 			{
-				if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) &&
+				if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) &&
 					!in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$u,'notify_owner_group_member'))
+					if ($this->send_notification($data, $old, $email, $u, 'notify_owner_group_member'))
 					{
 						$email_sent[] = $email;
 					}
@@ -575,14 +575,14 @@ 
 			if ($data[$this->assigned_field])	// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
-					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
+					$data[$this->assigned_field] : explode(',', $data[$this->assigned_field]);
 			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
-					$old[$this->assigned_field] : explode(',',$old[$this->assigned_field]);
+					$old[$this->assigned_field] : explode(',', $old[$this->assigned_field]);
 			}
-			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
+			foreach (array_unique(array_merge($assignees, $old_assignees)) as $assignee)
 			{
 				//error_log("bo_tracking::do_notifications() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
 				if (!$assignee) continue;
@@ -590,10 +590,10 @@ 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
 				{
-					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
+					if (($email = $GLOBALS['egw']->accounts->id2name($assignee, 'account_email')) && !in_array($email, $email_sent))
 					{
-						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+						if ($this->send_notification($data, $old, $email, $assignee, 'notify_assigned',
+							in_array($assignee, $assignees) !== in_array($assignee, $old_assignees) || $deleted))	// assignment changed
 						{
 							$email_sent[] = $email;
 						}
@@ -601,12 +601,12 @@ 
 				}
 				else	// item assignee is a group
 				{
-					foreach($GLOBALS['egw']->accounts->members($assignee,true) as $u)
+					foreach ($GLOBALS['egw']->accounts->members($assignee, true) as $u)
 					{
-						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
+						if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) && !in_array($email, $email_sent))
 						{
-							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+							if ($this->send_notification($data, $old, $email, $u, 'notify_assigned',
+								in_array($u, $assignees) !== in_array($u, $old_assignees) || $deleted))	// assignment changed
 							{
 								$email_sent[] = $email;
 							}
@@ -617,14 +617,14 @@ 
 		}
 
 		// notification copies
-		if (($copies = $this->get_config('copy',$data,$old)))
+		if (($copies = $this->get_config('copy', $data, $old)))
 		{
-			$lang = $this->get_config('lang',$data,$old);
-			foreach($copies as $email)
+			$lang = $this->get_config('lang', $data, $old);
+			foreach ($copies as $email)
 			{
-				if (strchr($email,'@') !== false && !in_array($email, $email_sent))
+				if (strchr($email, '@') !== false && !in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$lang,'notify_copy'))
+					if ($this->send_notification($data, $old, $email, $lang, 'notify_copy'))
 					{
 						$email_sent[] = $email;
 					}
@@ -669,7 +669,7 @@ 
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
 	 * @return boolean true on success or false if notification not requested or error (error-message is in $this->errors)
 	 */
-	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
+	public function send_notification($data, $old, $email, $user_or_lang, $check = null, $assignment_changed = true, $deleted = null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
 		if (!$email) return false;
@@ -681,16 +681,16 @@ 
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
-			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 			if ($check && $this->check2pref) $check = $this->check2pref[$check];
 
-			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
+			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] || // no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
 				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
 			{
-				$do_notify = false;	// no notification requested / necessary
+				$do_notify = false; // no notification requested / necessary
 			}
 		}
 		else
@@ -711,33 +711,33 @@ 
 
 			// Cache message body to not have to re-generate it every time
 			$lang = translation::$userlang;
-			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] .
+			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].
 				$GLOBALS['egw_info']['user']['preferences']['common']['timeformat'];
 
 			// Cache text body
-			$body_cache =& $this->body_cache[$data[$this->id_field]][$lang][$date_format];
-			if(empty($data[$this->id_field]) || !isset($body_cache['text']))
+			$body_cache = & $this->body_cache[$data[$this->id_field]][$lang][$date_format];
+			if (empty($data[$this->id_field]) || !isset($body_cache['text']))
 			{
-				$body_cache['text'] = $this->get_body(false,$data,$old,false,$receiver);
+				$body_cache['text'] = $this->get_body(false, $data, $old, false, $receiver);
 			}
 			// Cache HTML body
-			if(empty($data[$this->id_field]) || !isset($body_cache['html']))
+			if (empty($data[$this->id_field]) || !isset($body_cache['html']))
 			{
-				$body_cache['html'] = $this->get_body(true,$data,$old,false,$receiver);
+				$body_cache['html'] = $this->get_body(true, $data, $old, false, $receiver);
 			}
 
 			// get rest of notification message
-			$sender = $this->get_sender($data,$old,true,$receiver);
-			$subject = $this->get_subject($data,$old,$deleted,$receiver);
-			$link = $this->get_notification_link($data,$old,$receiver);
-			$attachments = $this->get_attachments($data,$old,$receiver);
+			$sender = $this->get_sender($data, $old, true, $receiver);
+			$subject = $this->get_subject($data, $old, $deleted, $receiver);
+			$link = $this->get_notification_link($data, $old, $receiver);
+			$attachments = $this->get_attachments($data, $old, $receiver);
 		}
 
 		// restore user enviroment BEFORE calling notification class or returning
 		$GLOBALS['egw_info']['user'] = $save_user;
 		// need to call preferences constructor and read_repository, to set user timezone again
 		$GLOBALS['egw']->preferences->__construct($GLOBALS['egw_info']['user']['account_id']);
-		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 		// Re-load date/time preferences
 		egw_time::init();
@@ -793,11 +793,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function datetime($timestamp,$do_time=true)
+	public function datetime($timestamp, $do_time = true)
 	{
-		if (!is_a($timestamp,'DateTime'))
+		if (!is_a($timestamp, 'DateTime'))
 		{
-			$timestamp = new egw_time($timestamp,egw_time::$server_timezone);
+			$timestamp = new egw_time($timestamp, egw_time::$server_timezone);
 		}
 		$timestamp->setTimezone(egw_time::$user_timezone);
 		if (is_null($do_time))
@@ -823,23 +823,23 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string or userid
 	 */
-	protected function get_sender($data,$old,$prefer_id=false,$receiver=null)
+	protected function get_sender($data, $old, $prefer_id = false, $receiver = null)
 	{
-		$sender = $this->get_config('sender',$data,$old);
+		$sender = $this->get_config('sender', $data, $old);
 		//echo "<p>bo_tracking::get_sender() get_config('sender',...)='".htmlspecialchars($sender)."'</p>\n";
 
 		if (($this->prefer_user_as_sender || !$sender) && $this->user &&
-			($email = $GLOBALS['egw']->accounts->id2name($this->user,'account_email')))
+			($email = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email')))
 		{
-			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
+			$name = $GLOBALS['egw']->accounts->id2name($this->user, 'account_fullname');
 
-			if($prefer_id) {
+			if ($prefer_id) {
 				$sender = $this->user;
 			} else {
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
-		elseif(!$sender)
+		elseif (!$sender)
 		{
 			$sender = 'eGroupWare '.lang($this->app).' <noreply@'.$GLOBALS['egw_info']['server']['mail_suffix'].'>';
 		}
@@ -854,9 +854,9 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	protected function get_title($data,$old)
+	protected function get_title($data, $old)
 	{
-		return egw_link::title($this->app,$data[$this->id_field]);
+		return egw_link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -870,9 +870,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		return egw_link::title($this->app,$data[$this->id_field]);
+		return egw_link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -885,7 +885,7 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
 		return '';
 	}
@@ -901,22 +901,22 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string|array string with link (!$allow_popup) or array(link,popup-size), popup size is something like '640x480'
 	 */
-	protected function get_link($data,$old,$allow_popup=false,$receiver=null)
+	protected function get_link($data, $old, $allow_popup = false, $receiver = null)
 	{
-		if (($link = $this->get_config('link',$data,$old)))
+		if (($link = $this->get_config('link', $data, $old)))
 		{
-			if (!$this->get_config('link_no_id', $data) && strpos($link,$this->id_field.'=') === false && isset($data[$this->id_field]))
+			if (!$this->get_config('link_no_id', $data) && strpos($link, $this->id_field.'=') === false && isset($data[$this->id_field]))
 			{
-				$link .= strpos($link,'?') === false ? '?' : '&';
+				$link .= strpos($link, '?') === false ? '?' : '&';
 				$link .= $this->id_field.'='.$data[$this->id_field];
 			}
 		}
 		else
 		{
-			if (($view = egw_link::view($this->app,$data[$this->id_field])))
+			if (($view = egw_link::view($this->app, $data[$this->id_field])))
 			{
-				$link = $GLOBALS['egw']->link('/index.php',$view);
-				$popup = egw_link::is_popup($this->app,'view');
+				$link = $GLOBALS['egw']->link('/index.php', $view);
+				$popup = egw_link::is_popup($this->app, 'view');
 			}
 		}
 		if ($link[0] == '/')
@@ -927,12 +927,12 @@ 
 		if (!$allow_popup)
 		{
 			// remove the session-id in the notification mail!
-			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
+			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', $link);
 
 			if ($popup) $link .= '&nopopup=1';
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
-		return $allow_popup ? array($link,$popup) : $link;
+		return $allow_popup ? array($link, $popup) : $link;
 	}
 
 	/**
@@ -943,16 +943,16 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array with link
 	 */
-	protected function get_notification_link($data,$old,$receiver=null)
+	protected function get_notification_link($data, $old, $receiver = null)
 	{
-		if (($view = egw_link::view($this->app,$data[$this->id_field])))
+		if (($view = egw_link::view($this->app, $data[$this->id_field])))
 		{
 			return array(
-				'text' 	=> $this->get_title($data,$old),
+				'text' 	=> $this->get_title($data, $old),
 				'app'	=> $this->app,
 				'id'	=> $data[$this->id_field],
 				'view' 	=> $view,
-				'popup'	=> egw_link::is_popup($this->app,'view'),
+				'popup'	=> egw_link::is_popup($this->app, 'view'),
 			);
 		}
 		return false;
@@ -968,15 +968,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	public function get_body($html_email,$data,$old,$integrate_link = true,$receiver=null)
+	public function get_body($html_email, $data, $old, $integrate_link = true, $receiver = null)
 	{
 		$body = '';
-		if($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
+		if ($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
 		{
-			$body = $this->get_custom_message($data,$old);
-			if(($sig = $this->get_signature($data,$old,$receiver)))
+			$body = $this->get_custom_message($data, $old);
+			if (($sig = $this->get_signature($data, $old, $receiver)))
 			{
-				$body .= ($html_email ? '<br />':'') . "\n$sig";
+				$body .= ($html_email ? '<br />' : '')."\n$sig";
 			}
 			return $body;
 		}
@@ -985,35 +985,35 @@ 
 			$body = '<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
 		}
 		// new or modified message
-		if (($message = $this->get_message($data,$old,$receiver)))
+		if (($message = $this->get_message($data, $old, $receiver)))
 		{
 			foreach ((array)$message as $k => $_message)
 			{
-				$body .= $this->format_line($html_email,'message',false,($_message=='---'?($html_email?'<hr/>':$_message):$_message));
+				$body .= $this->format_line($html_email, 'message', false, ($_message == '---' ? ($html_email ? '<hr/>' : $_message) : $_message));
 			}
 		}
-		if ($integrate_link && ($link = $this->get_link($data,$old,false,$receiver)))
+		if ($integrate_link && ($link = $this->get_link($data, $old, false, $receiver)))
 		{
-			$body .= $this->format_line($html_email,'link',false,$integrate_link === true ? lang('You can respond by visiting:') : $integrate_link,$link);
+			$body .= $this->format_line($html_email, 'link', false, $integrate_link === true ? lang('You can respond by visiting:') : $integrate_link, $link);
 		}
-		foreach($this->get_details($data,$receiver) as $name => $detail)
+		foreach ($this->get_details($data, $receiver) as $name => $detail)
 		{
 			// if there's no old entry, the entry is not modified by definition
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values
 
-			$body .= $this->format_line($html_email,$detail['type'],$modified,
+			$body .= $this->format_line($html_email, $detail['type'], $modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
 		}
 		if ($html_email)
 		{
 			$body .= "</table>\n";
 		}
-		if(($sig = $this->get_signature($data,$old,$receiver)))
+		if (($sig = $this->get_signature($data, $old, $receiver)))
 		{
-			$body .= ($html_email ? '<br />':'') . "\n$sig";
+			$body .= ($html_email ? '<br />' : '')."\n$sig";
 		}
 		return $body;
 	}
@@ -1029,20 +1029,20 @@ 
 	 * @param string $data = null data or null to display just $line over 2 columns
 	 * @return string
 	 */
-	protected function format_line($html_mail,$type,$modified,$line,$data=null)
+	protected function format_line($html_mail, $type, $modified, $line, $data = null)
 	{
 		//error_log(__METHOD__.'('.array2string($html_mail).",'$type',".array2string($modified).",'$line',".array2string($data).')');
 		$content = '';
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow) $line = html::htmlspecialchars($line); // XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
 			$bold = false;
 			$background = '#FFFFF1';
-			switch($type)
+			switch ($type)
 			{
 				case 'message':
 					$background = '#D3DCE3;';
@@ -1060,7 +1060,7 @@ 
 					if (strpos($data, '<br') === false)
 					{
 						$data = nl2br($this->html_content_allow ? $data : html::htmlspecialchars($data));
-						$this->html_content_allow = true;	// to NOT do htmlspecialchars again
+						$this->html_content_allow = true; // to NOT do htmlspecialchars again
 					}
 					break;
 				case 'reply':
@@ -1069,13 +1069,13 @@ 
 				default:
 					$size = false;
 			}
-			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:'');
+			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color ? 'color:'.$color : '');
 
-			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data?'" width="20%':'" colspan="2').'">';
+			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data ? '" width="20%' : '" colspan="2').'">';
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply') $content = str_repeat('-', 64)."\n";
 
 			if ($modified) $content .= '> ';
 		}
@@ -1087,7 +1087,7 @@ 
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
-				$content .= html::a_href(chunk_split(rawurldecode($data),40,'&#8203;'),$data,'','target="_blank"');
+				$content .= html::a_href(chunk_split(rawurldecode($data), 40, '&#8203;'), $data, '', 'target="_blank"');
 			}
 			elseif ($this->html_content_allow)
 			{
@@ -1100,7 +1100,7 @@ 
 		}
 		else
 		{
-			$content .= ($content&&$data?': ':'').$data;
+			$content .= ($content && $data ? ': ' : '').$data;
 		}
 		if ($html_mail) $content .= '</td></tr>';
 
@@ -1117,7 +1117,7 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array or array with values for either 'string' or 'path' and optionally (mime-)'type', 'filename' and 'encoding'
 	 */
-	protected function get_attachments($data,$old,$receiver=null)
+	protected function get_attachments($data, $old, $receiver = null)
 	{
 	 	return array();
 	}
@@ -1131,16 +1131,16 @@ 
 	protected function get_signature($data, $old, $receiver)
 	{
 		$config = config::read('notifications');
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 		}
-		elseif(class_exists($this->app. '_merge'))
+		elseif (class_exists($this->app.'_merge'))
 		{
 			$merge_class = $this->app.'_merge';
 			$merge = new $merge_class();
 			$sig = $merge->merge_string($config['signature'], array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $config['signature'];
@@ -1157,26 +1157,26 @@ 
 	protected function get_custom_message($data, $old, $merge_class = null)
 	{
 		$message = $this->get_config(self::CUSTOM_NOTIFICATION, $data, $old);
-		if(!$message)
+		if (!$message)
 		{
 			return '';
 		}
 
 		// Automatically set merge class from naming conventions
-		if($merge_class == null)
+		if ($merge_class == null)
 		{
 			$merge_class = $this->app.'_merge';
 		}
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 			return $message;
 		}
-		elseif(class_exists($merge_class))
+		elseif (class_exists($merge_class))
 		{
 			$merge = new $merge_class();
 			$merged_message = $merge->merge_string($message, array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $message;

Braces +157 added lines, -39 removed lines

@@ -236,7 +236,10 @@ 
 			$header_done = false;
 			foreach($cfs as $name => $field)
 			{
-				if (in_array($field['type'], egw_customfields::$non_printable_fields)) continue;
+				if (in_array($field['type'], egw_customfields::$non_printable_fields))
+				{
+					continue;
+				}
 
 				if (!$header_done)
 				{
@@ -332,8 +335,14 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id',$data[$name]))
+			{
+				$data[$name] = $data[$name]['id'];
+			}
+			if (is_array($old[$name]) && array_key_exists('id',$old[$name]))
+			{
+				$old[$name] = $old[$name]['id'];
+			}
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
@@ -347,11 +356,18 @@ 
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				if (!$id)
+				{
+					continue;
+				}
+				// can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) egw_link::link($this->app,$source_id,$app,$id);
+			if ($source_id)
+			{
+				egw_link::link($this->app,$source_id,$app,$id);
+			}
 			//error_log(__METHOD__.__LINE__."egw_link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>egw_link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
@@ -359,14 +375,24 @@ 
 		// unlink removed application entries
 		foreach(array_diff($old_ids,$current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name]))
+			{
+				continue;
+			}
+			// ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;
+				if (!$id)
+				{
+					continue;
+				}
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) egw_link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id)
+			{
+				egw_link::unlink(null,$this->app,$source_id,0,$app,$id);
+			}
 			//echo "<p>egw_link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -389,7 +415,10 @@ 
 			$changed_fields = self::changed_fields($data,$old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
-		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
+		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action']))
+		{
+			return 0;
+		}
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
@@ -405,10 +434,13 @@ 
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
-			if (is_array($status))	// 1:N relation --> remove common rows
+			if (is_array($status))
+			{
+				// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 				$added = array_values(array_diff($data[$name],$old[$name]));
 				$removed = array_values(array_diff($old[$name],$data[$name]));
@@ -442,17 +474,31 @@ 
 	 */
 	public function changed_fields(array $data,array $old=null)
 	{
-		if (is_null($old)) return array_keys($data);
+		if (is_null($old))
+		{
+			return array_keys($data);
+		}
 		$changed_fields = array();
 		foreach($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name])
+			{
+				continue;
+			}
+			// treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name]))
+			{
+				continue;
+			}
+			// no set customfields are not stored, therefore not changed
 
-			if (is_array($status))	// 1:N relation
+			if (is_array($status))
+			{
+				// 1:N relation
 			{
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 			}
 			if ($old[$name] != $data[$name])
@@ -460,13 +506,22 @@ 
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name]))
+					{
+						$data[$name] = explode(',',$data[$name]);
+					}
+					if (!is_array($old[$name]))
+					{
+						$old[$name] = explode(',',$old[$name]);
+					}
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
 						sort($old[$name]);
-						if ($data[$name] == $old[$name]) continue;
+						if ($data[$name] == $old[$name])
+						{
+							continue;
+						}
 					}
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
@@ -527,13 +582,19 @@ 
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
 	{
 		$this->errors = $email_sent = array();
-		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
+		if (!empty($email_notified) && is_array($email_notified))
+		{
+			$email_sent = $email_notified;
+		}
 
-		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
+		if (!$this->notify_current_user && $this->user)
+		{
+			// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
 			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
 		}
+		}
 		$skip_notify = $this->get_config('skip_notify',$data,$old);
 		if($skip_notify && is_array($skip_notify))
 		{
@@ -572,11 +633,14 @@ 
 			//error_log("bo_tracking::do_notifications() data[$this->assigned_field]=".print_r($data[$this->assigned_field],true).", old[$this->assigned_field]=".print_r($old[$this->assigned_field],true));
 			$assignees = $old_assignees = array();
 			$assignees = $assigned ? $assigned : $assignees;
-			if ($data[$this->assigned_field])	// current assignments
+			if ($data[$this->assigned_field])
+			{
+				// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
 					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
 			}
+			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
@@ -585,7 +649,10 @@ 
 			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
 			{
 				//error_log("bo_tracking::do_notifications() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
-				if (!$assignee) continue;
+				if (!$assignee)
+				{
+					continue;
+				}
 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
@@ -593,10 +660,13 @@ 
 					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
 					{
 						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))
+						{
+							// assignment changed
 						{
 							$email_sent[] = $email;
 						}
+						}
 					}
 				}
 				else	// item assignee is a group
@@ -606,10 +676,13 @@ 
 						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
 						{
 							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))
+							{
+								// assignment changed
 							{
 								$email_sent[] = $email;
 							}
+							}
 						}
 					}
 				}
@@ -672,25 +745,38 @@ 
 	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
-		if (!$email) return false;
+		if (!$email)
+		{
+			return false;
+		}
 
 		$save_user = $GLOBALS['egw_info']['user'];
 		$do_notify = true;
 
-		if (is_numeric($user_or_lang))	// user --> read everything from his prefs
+		if (is_numeric($user_or_lang))
+		{
+			// user --> read everything from his prefs
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
+		}
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
 
-			if ($check && $this->check2pref) $check = $this->check2pref[$check];
+			if ($check && $this->check2pref)
+			{
+				$check = $this->check2pref[$check];
+			}
 
 			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
-				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
+				$this->user == $user_or_lang && !$this->notify_current_user)
 			{
-				$do_notify = false;	// no notification requested / necessary
+				// no popup for own actions
+			{
+				$do_notify = false;
+			}
+			// no notification requested / necessary
 			}
 		}
 		else
@@ -699,10 +785,13 @@ 
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default_prefs();
 			$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
 		}
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang)	// load the right language if needed
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang)
+		{
+			// load the right language if needed
 		{
 			translation::init();
 		}
+		}
 
 		if ($do_notify)
 		{
@@ -805,7 +894,10 @@ 
 			$do_time = ($timestamp->format('Hi') != '0000');
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if ($do_time) $format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		if ($do_time)
+		{
+			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		}
 
 		return $timestamp->format($format);
 	}
@@ -833,9 +925,12 @@ 
 		{
 			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
 
-			if($prefer_id) {
+			if($prefer_id)
+			{
 				$sender = $this->user;
-			} else {
+			}
+			else
+			{
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
@@ -929,7 +1024,10 @@ 
 			// remove the session-id in the notification mail!
 			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
 
-			if ($popup) $link .= '&nopopup=1';
+			if ($popup)
+			{
+				$link .= '&nopopup=1';
+			}
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
 		return $allow_popup ? array($link,$popup) : $link;
@@ -1002,7 +1100,11 @@ 
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified)
+			{
+				continue;
+			}
+			// skip unchanged, empty values
 
 			$body .= $this->format_line($html_email,$detail['type'],$modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
@@ -1036,7 +1138,11 @@ 
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow)
+			{
+				$line = html::htmlspecialchars($line);
+			}
+			// XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
@@ -1075,15 +1181,24 @@ 
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply')
+			{
+				$content = str_repeat('-',64)."\n";
+			}
 
-			if ($modified) $content .= '> ';
+			if ($modified)
+			{
+				$content .= '> ';
+			}
 		}
 		$content .= $line;
 
 		if ($html_mail)
 		{
-			if ($line && $data) $content .= '</td><td style="'.$style.'">';
+			if ($line && $data)
+			{
+				$content .= '</td><td style="'.$style.'">';
+			}
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
@@ -1102,7 +1217,10 @@ 
 		{
 			$content .= ($content&&$data?': ':'').$data;
 		}
-		if ($html_mail) $content .= '</td></tr>';
+		if ($html_mail)
+		{
+			$content .= '</td></tr>';
+		}
 
 		$content .= "\n";
 

etemplate/inc/class.boetemplate.inc.php

Doc Comments +14 added lines, -25 removed lines

@@ -103,8 +103,8 @@ 
 	 *
 	 * @param string $disabled expression to check, eg. "!@var" for !$content['var']
 	 * @param array $content the content-array in the context of the grid
-	 * @param int $row=null to be able to use $row or $row_content in value of checks
-	 * @param int $c=null to be able to use $row or $row_content in value of checks
+	 * @param integer $row
+	 * @param integer $c
 	 * @return boolean true if the row/col is disabled or false if not
 	 */
 	protected function check_disabled($disabled,$content,$row=null,$c=null)
@@ -263,7 +263,6 @@ 
 	 * As you usually have col- and row-headers, data-cells start with '1' or 'A' !!!
 	 *
 	 * @param array $cell with data of cell: name, type, size, ...
-	 * @param int $c,$r col/row index starting from 0
 	 * @param string &$idx returns the index in $content and $readonlys (NOT $sel_options !!!)
 	 * @param string &$idx_cname returns the basename for the form-name: is $idx if only one value
 	 *		(no ',') is given in size (name (not template-fields) are always only one value)
@@ -346,7 +345,7 @@ 
 	 *  disables all cells with name == $name
 	 *
 	 * @param sting $name cell-name
-	 * @param boolean $disabled=true disable or enable a cell, default true=disable
+	 * @param boolean $disabled disable or enable a cell, default true=disable
 	 * @return mixed number of changed cells or False, if none changed
 	 */
 	function disableElement($name,$disabled=True)
@@ -387,8 +386,8 @@ 
 	/**
 	 *  disables all cells with name == $name
 	 *
-	 * @param sting $name cell-name
-	 * @param boolean $disabled=true disable or enable a cell, default true=disable
+	 * @param string $name cell-name
+	 * @param boolean $disabled disable or enable a cell, default true=disable
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
@@ -401,11 +400,10 @@ 
 	 * set one or more attibutes for row $n
 	 *
 	 * @param int $n numerical row-number starting with 1 (!)
-	 * @param string $height percent or pixel or '' for no height
-	 * @param string $class name of css class (without the leading '.') or '' for no class
-	 * @param string $valign alignment (top,middle,bottom) or '' for none
-	 * @param boolean $disabled True or expression or False to disable or enable the row (Only the number 0 means dont change the attribute !!!)
-	 * @param string $path='/0' default is the first widget in the tree of children
+	 * @param integer $height percent or pixel or '' for no height
+	 * @param integer $class name of css class (without the leading '.') or '' for no class
+	 * @param integer $valign alignment (top,middle,bottom) or '' for none
+	 * @param integer $disabled True or expression or False to disable or enable the row (Only the number 0 means dont change the attribute !!!)
 	 * @return false if $path is no grid or array(height,class,valign,disabled) otherwise
 	 */
 	function set_row_attributes($n,$height=0,$class=0,$valign=0,$disabled=0,$path='/0')
@@ -432,8 +430,6 @@ 
 	 * disables row $n
 	 *
 	 * @param int $n numerical row-number starting with 1 (!)
-	 * @param boolean $enable=false can be used to re-enable a row if set to True
-	 * @param string $path='/0' default is the first widget in the tree of children
 	 */
 	function disable_row($n,$enable=False,$path='/0')
 	{
@@ -444,9 +440,8 @@ 
 	 * set one or more attibutes for column $c
 	 *
 	 * @param int|string $c numerical column-number starting with 0 (!), or the char-code starting with 'A'
-	 * @param string $width percent or pixel or '' for no height
-	 * @param mixed $disabled=0 True or expression or False to disable or enable the column (Only the number 0 means dont change the attribute !!!)
-	 * @param string $path='/0' default is the first widget in the tree of children
+	 * @param integer $width percent or pixel or '' for no height
+	 * @param mixed $disabled True or expression or False to disable or enable the column (Only the number 0 means dont change the attribute !!!)
 	 * @return false if $path specifies no grid or array(width,disabled) otherwise
 	 */
 	function set_column_attributes($c,$width=0,$disabled=0,$path='/0')
@@ -473,7 +468,6 @@ 
 	 *
 	 * @param int|string $c numerical column-number starting with 0 (!), or the char-code starting with 'A'
 	 * @param boolean $enable can be used to re-enable a column if set to True
-	 * @param string $path='/0' default is the first widget in the tree of children
 	 */
 	function disable_column($c,$enable=False,$path='/0')
 	{
@@ -490,8 +484,6 @@ 
 	/**
 	 * trys to load the Extension / Widget-class from the app or etemplate
 	 *
-	 * @param string $name name of the extension, the classname should be class.${name}_widget.inc.php
-	 *	the $name might be "$name.$app" to give a app-name (default is the current app,or template-name)
 	 * @return string|boolean human readable name or false if not found/loadable
 	 */
 	function loadExtension($type)
@@ -527,8 +519,6 @@ 
 	/**
 	 * checks if extension is loaded (load it if it isnt) and optional checks if it has a given method
 	 *
-	 * @param string $name name of the extension, the classname should be class.${name}_widget.inc.php
-	 *	the $name might be "$name.$app" to give a app-name (default is the current app,or template-name)
 	 * @param string $function 'pre_process', 'post_process' or 'render'
 	 * @return boolean true if the extension (incl. method) exists, else false
 	 */
@@ -782,7 +772,7 @@ 
 	 * For the 3. Column in the 2. row of a grid which is the only widget in the children-tree it is eg.: "/0/2C"
 	 *
 	 * @param string $path path in the widget tree
-	 * @param int $ancestor=0 0: widget itself, 1: parent, 2: grand-parent, ...
+	 * @param int $ancestor 0: widget itself, 1: parent, 2: grand-parent, ...
 	 * @return array referenz to the widget spezified or null, if it's not found
 	 */
 	function &get_widget_by_path($path,$ancestor=0)
@@ -838,9 +828,9 @@ 
 	 * - csv_split('"a""b,c",d') === array('a"b,c','d')	// to escape enclosures double them!
 	 *
 	 * @param string $str
-	 * @param int $num=null in how many parts to split maximal, parts over this number end up (unseparated) in the last part
 	 * @param string $delimiter=','
 	 * @param string $enclosure='"'
+	 * @param integer $num
 	 * @return array
 	 */
 	static function csv_split($str,$num=null,$delimiter=',',$enclosure='"')
@@ -908,8 +898,7 @@ 
 	/**
 	 * stores the etemplate in the cache in egw_info
 	 *
-	 * @param boetemplate $tpl=null required parameter for static use!
-	 * @param boolean $only_update_older=false true only update cache, if it contains an older template
+	 * @param boolean $only_update_older true only update cache, if it contains an older template
 	 */
 	public /*static*/ function store_in_cache(boetemplate $tpl=null, $only_update_older=false)
 	{

Indentation +2 added lines, -2 removed lines

@@ -927,8 +927,8 @@
 	}
 
 	/**
-	* deletes the etemplate in the cache
-	*/
+	 * deletes the etemplate in the cache
+	 */
 	private function delete_in_cache()
 	{
 		//echo "<p>".__METHOD__."('$this->name','$this->template','$this->lang','$this->version')</p>\n";

Spacing +189 added lines, -189 removed lines

@@ -22,34 +22,34 @@ 
 	 * @var array intern name => label
 	 */
 	static public $types = array(
-		'label'	=> 'Label',			// Label $cell['label'] is (to be translated) textual content
-		'text'	=> 'Text',			// Textfield 1 Line (size = [length][,maxlength])
-		'int'	=> 'Integer',		// like text, but only numbers (size = [min][,max])
+		'label'	=> 'Label', // Label $cell['label'] is (to be translated) textual content
+		'text'	=> 'Text', // Textfield 1 Line (size = [length][,maxlength])
+		'int'	=> 'Integer', // like text, but only numbers (size = [min][,max])
 		'float'	=> 'Floating Point', // --------------- " --------------------------
-		'textarea'=> 'Textarea',	// Multiline Text Input (size = [rows][,cols])
+		'textarea'=> 'Textarea', // Multiline Text Input (size = [rows][,cols])
 		'htmlarea' => 'Formatted Text (HTML)',
 		'checkbox'=> 'Checkbox',
-		'radio'	=> 'Radiobutton',	// Radiobutton (size = value if checked)
+		'radio'	=> 'Radiobutton', // Radiobutton (size = value if checked)
 		'button'=> 'Submitbutton',
-		'buttononly' => 'Button',	// input type="button"
+		'buttononly' => 'Button', // input type="button"
 		'hrule'	=> 'Horizontal Rule',
-		'template' => 'Template',	// $cell['name'] contains template-name, $cell['size'] index into $content,$cname,$readonlys
-		'image'	=> 'Image',			// label = url, name=link or method, help=alt or title
-		'progress' => 'Progressbar',// for BC, identical to image with percent value
-		'date'	=> '', 				// Datefield, size='' timestamp or size=format like 'm/d/Y'
-		'select'=>	'Selectbox',	// Selectbox ($sel_options[$name] or $content[options-$name] is array with options)
+		'template' => 'Template', // $cell['name'] contains template-name, $cell['size'] index into $content,$cname,$readonlys
+		'image'	=> 'Image', // label = url, name=link or method, help=alt or title
+		'progress' => 'Progressbar', // for BC, identical to image with percent value
+		'date'	=> '', // Datefield, size='' timestamp or size=format like 'm/d/Y'
+		'select'=>	'Selectbox', // Selectbox ($sel_options[$name] or $content[options-$name] is array with options)
 									// if size > 1 then multiple selections, size lines showed
-		'html'	=> 'Html',			// Raw html in $content[$cell['name']]
-		'file'	=> 'FileUpload',	// show an input type='file', set the local name as ${name}_path
-		'vbox'	=> 'VBox',			// a (vertical) box to contain widgets in rows, size = # of rows
-		'hbox'	=> 'HBox',			// a (horizontal) box to contain widgets in cols, size = # of cols
-		'groupbox' => 'GroupBox',	// a box with a label containing other elements to group them (html: fieldset)
-		'box'	=> 'Box',			// just a container for widgets (html: div)
-		'grid'	=> 'Grid',			// tabular widget containing rows with columns of widgets
-		'deck'	=> 'Deck',			// a container of elements where only one is visible, size = # of elem.
-		'passwd' => 'Password',		// a text of type password
-		'colorpicker' => 'Colorpicker',	// input for a color (eg. #123456)
-		'hidden'=> 'Hidden input',	// a hidden input eg. to submit javascript computed values back
+		'html'	=> 'Html', // Raw html in $content[$cell['name']]
+		'file'	=> 'FileUpload', // show an input type='file', set the local name as ${name}_path
+		'vbox'	=> 'VBox', // a (vertical) box to contain widgets in rows, size = # of rows
+		'hbox'	=> 'HBox', // a (horizontal) box to contain widgets in cols, size = # of cols
+		'groupbox' => 'GroupBox', // a box with a label containing other elements to group them (html: fieldset)
+		'box'	=> 'Box', // just a container for widgets (html: div)
+		'grid'	=> 'Grid', // tabular widget containing rows with columns of widgets
+		'deck'	=> 'Deck', // a container of elements where only one is visible, size = # of elem.
+		'passwd' => 'Password', // a text of type password
+		'colorpicker' => 'Colorpicker', // input for a color (eg. #123456)
+		'hidden'=> 'Hidden input', // a hidden input eg. to submit javascript computed values back
 	);
 
 	/**
@@ -76,7 +76,7 @@ 
 	 * @param string|array $name name of etemplate or array with name and other keys
 	 * @param string|array $load_via name or array with keys of other etemplate to load in order to get $name
 	 */
-	function __construct($name='',$load_via='')
+	function __construct($name = '', $load_via = '')
 	{
 		parent::__construct();
 
@@ -85,10 +85,10 @@ 
 		{
 			$tname = &$name['name'];
 		}
-		$tname = (strpos($tname,'.') === false && !empty($tname) ?
-			(is_array($load_via) ? $load_via['name'] : $load_via).'.':'').$tname;
+		$tname = (strpos($tname, '.') === false && !empty($tname) ?
+			(is_array($load_via) ? $load_via['name'] : $load_via).'.' : '').$tname;
 
-		if (empty($tname) || !$this->read($name,'','',0,'',$load_via))
+		if (empty($tname) || !$this->read($name, '', '', 0, '', $load_via))
 		{
 			$this->init($name);
 		}
@@ -107,22 +107,22 @@ 
 	 * @param int $c=null to be able to use $row or $row_content in value of checks
 	 * @return boolean true if the row/col is disabled or false if not
 	 */
-	protected function check_disabled($disabled,$content,$row=null,$c=null)
+	protected function check_disabled($disabled, $content, $row = null, $c = null)
 	{
 		if ($this->onclick_handler && !$this->no_onclick)
 		{
-			return false;	// we have an onclick handler
+			return false; // we have an onclick handler
 		}
 		if ($not = $disabled[0] == '!')
 		{
-			$disabled = substr($disabled,1);
+			$disabled = substr($disabled, 1);
 		}
-		list($val,$check_val) = $vals = explode('=',$disabled);
+		list($val, $check_val) = $vals = explode('=', $disabled);
 
 		// use expand_name to be able to use @ or $
-		$val = $this->expand_name($val,$c,$row,'','',$content);
-		$check_val = $this->expand_name($check_val,$c,$row,'','',$content);
-		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
+		$val = $this->expand_name($val, $c, $row, '', '', $content);
+		$check_val = $this->expand_name($check_val, $c, $row, '', '', $content);
+		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val, $val) : $val == $check_val);
 		if ($not) $result = !$result;
 		//echo "<p>check_disabled: '".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False')."</p>\n";
 		return $result;
@@ -163,69 +163,69 @@ 
 	 * 	"del[$cont[id]]" expands to "del[123]" if $cont = array('id' => 123)
 	 * @return string the expanded name
 	 */
-	static function expand_name($name,$c,$row,$c_='',$row_='',$cont='')
+	static function expand_name($name, $c, $row, $c_ = '', $row_ = '', $cont = '')
 	{
 		$is_index_in_content = $name[0] == '@';
-		if (($pos_var=strpos($name,'$')) !== false)
+		if (($pos_var = strpos($name, '$')) !== false)
 		{
 			if (!$cont)
 			{
 				$cont = array();
 			}
 			if (!is_numeric($c)) $c = boetemplate::chrs2num($c);
-			$col = boetemplate::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
-			$col_ = boetemplate::num2chrs($c_-1);
+			$col = boetemplate::num2chrs($c - 1); // $c-1 to get: 0:'@', 1:'A', ...
+			$col_ = boetemplate::num2chrs($c_ - 1);
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
 			// check if name is enclosed in single quotes as argument eg. to an event handler or
 			// variable name is contained in quotes and curly brackets, eg. "'{$cont[nm][path]}'" or
 			// used as name for a button like "delete[$row_cont[something]]" --> quote contained quotes (' or ")
-			if (in_array($name[$pos_var-1],array('[',"'",'{')) && preg_match('/[\'\[]{?('.self::PHP_VAR_PREG.')}?[\'\]]+/',$name,$matches))
+			if (in_array($name[$pos_var - 1], array('[', "'", '{')) && preg_match('/[\'\[]{?('.self::PHP_VAR_PREG.')}?[\'\]]+/', $name, $matches))
 			{
-				if (eval($code='$value = '.$matches[1].';') === false)
+				if (eval($code = '$value = '.$matches[1].';') === false)
 				{
 					error_log(__METHOD__."(name='$name', c='$c', row=$row, c_='$c_', row_=$row_, ...) line ".__LINE__." ERROR parsing: $code");
 					error_log(function_backtrace());
 				}
-				if (is_array($value) && $name[$pos_var-1] == "'")	// arrays are only supported for '
+				if (is_array($value) && $name[$pos_var - 1] == "'")	// arrays are only supported for '
 				{
-					foreach($value as &$val)
+					foreach ($value as &$val)
 					{
-						$val = "'".str_replace(array("'",'"'),array('\\\'','&quot;'),$val)."'";
+						$val = "'".str_replace(array("'", '"'), array('\\\'', '&quot;'), $val)."'";
 					}
-					$value = '[ '.implode(', ',$value).' ]';
-					$name = str_replace("'".$matches[1]."'",$value,$name);
+					$value = '[ '.implode(', ', $value).' ]';
+					$name = str_replace("'".$matches[1]."'", $value, $name);
 				}
 				else
 				{
-					$value = str_replace(array("'",'"','[',']'),array('\\\'','&quot;','&#x5B;','&#x5D;'),$value);
-					$name = str_replace(array('{'.$matches[1].'}',$matches[1]),$value,$name);
+					$value = str_replace(array("'", '"', '[', ']'), array('\\\'', '&quot;', '&#x5B;', '&#x5D;'), $value);
+					$name = str_replace(array('{'.$matches[1].'}', $matches[1]), $value, $name);
 				}
 			}
 			// check if name is assigned in an url --> urlendcode contained & as %26, as egw::link explodes it on &
-			if ($name[$pos_var-1] == '=' && preg_match('/[&?]([A-Za-z0-9_]+(\[[A-Za-z0-9_]+\])*)=('.self::PHP_VAR_PREG.')/',$name,$matches))
+			if ($name[$pos_var - 1] == '=' && preg_match('/[&?]([A-Za-z0-9_]+(\[[A-Za-z0-9_]+\])*)=('.self::PHP_VAR_PREG.')/', $name, $matches))
 			{
-				if (eval($code='$value = '.$matches[3].';') === false)
+				if (eval($code = '$value = '.$matches[3].';') === false)
 				{
 					error_log(__METHOD__."(name='$name', c='$c', row=$row, c_='$c_', row_=$row_, ...) line ".__LINE__." ERROR parsing: $code");
 					error_log(function_backtrace());
 				}
 				if (is_array($value))	// works only reasonable, if get-parameter uses array notation, eg. &file[]=$cont[filenames]
 				{
-					foreach($value as &$val)
+					foreach ($value as &$val)
 					{
-						$val = str_replace('&',urlencode('&'),$val);
+						$val = str_replace('&', urlencode('&'), $val);
 					}
-					$name = str_replace($matches[3],implode('&'.$matches[1].'=',$value),$name);
+					$name = str_replace($matches[3], implode('&'.$matches[1].'=', $value), $name);
 				}
 				else
 				{
-					$value = str_replace('&',urlencode('&'),$value);
-					$name = str_replace($matches[3],$value,$name);
+					$value = str_replace('&', urlencode('&'), $value);
+					$name = str_replace($matches[3], $value, $name);
 				}
 			}
-			if (eval($code='$name = "'.str_replace(array('\\', '"'), array('\\\\', '\\"'),
+			if (eval($code = '$name = "'.str_replace(array('\\', '"'), array('\\\\', '\\"'),
 				// fix non-fatal PHP Parse error, when $j was used eg. in onload
 				str_replace(array('$j.', '$j('), array('jQuery.', 'jQuery('), $name)).'";') === false)
 			{
@@ -237,11 +237,11 @@ 
 		{
 			if ($name[1] == '@')
 			{
-				$name = self::get_array(self::$request->content,substr($name,2));
+				$name = self::get_array(self::$request->content, substr($name, 2));
 			}
 			else
 			{
-				$name = self::get_array($cont,substr($name,1));
+				$name = self::get_array($cont, substr($name, 1));
 			}
 		}
 		return $name;
@@ -270,40 +270,40 @@ 
 	 * @param boolean $check_col to check for col- or row-autorepeat
 	 * @return boolean true if cell is autorepeat (has index with vars / '$') or false otherwise
 	 */
-	function autorepeat_idx($cell,$c,$r,&$idx,&$idx_cname,$check_col=False,$cont=null)
+	function autorepeat_idx($cell, $c, $r, &$idx, &$idx_cname, $check_col = False, $cont = null)
 	{
-		$org_idx = $idx = $cell[ $cell['type'] == 'template' ? 'size' : 'name' ];
+		$org_idx = $idx = $cell[$cell['type'] == 'template' ? 'size' : 'name'];
 
-		$idx = $this->expand_name($idx,$c,$r,'','',$cont);
-		if (!($komma = strpos($idx,',')))
+		$idx = $this->expand_name($idx, $c, $r, '', '', $cont);
+		if (!($komma = strpos($idx, ',')))
 		{
 			$idx_cname = $idx;
 		}
 		else
 		{
-			$idx_cname = substr($idx,1+$komma);
-			$idx = substr($idx,0,$komma);
+			$idx_cname = substr($idx, 1 + $komma);
+			$idx = substr($idx, 0, $komma);
 		}
 		$Ok = False;
 		$pat = $org_idx;
-		while (!$Ok && ($pat = @strstr($pat,'$')))
+		while (!$Ok && ($pat = @strstr($pat, '$')))
 		{
-			$pat = substr($pat,$pat[1] == '{' ? 2 : 1);
+			$pat = substr($pat, $pat[1] == '{' ? 2 : 1);
 
 			if ($check_col)
 			{
-				$Ok = $pat[0] == 'c' && !(substr($pat,0,4) == 'cont' ||
-						substr($pat,0,2) == 'c_' || substr($pat,0,4) == 'col_');
+				$Ok = $pat[0] == 'c' && !(substr($pat, 0, 4) == 'cont' ||
+						substr($pat, 0, 2) == 'c_' || substr($pat, 0, 4) == 'col_');
 			}
 			else
 			{
-				$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-					substr($pat,0,4) == 'row_');
+				$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+					substr($pat, 0, 4) == 'row_');
 			}
 		}
 		if ($this->name && $this->name == $this->debug)
 		{
-			echo "$this->name ".($check_col ? 'col' : 'row')."-check: c=$c, r=$r, idx='$org_idx'='$idx' idx_cname='$idx_cname' ==> ".($Ok?'True':'False')."<p>\n";
+			echo "$this->name ".($check_col ? 'col' : 'row')."-check: c=$c, r=$r, idx='$org_idx'='$idx' idx_cname='$idx_cname' ==> ".($Ok ? 'True' : 'False')."<p>\n";
 		}
 		return $Ok;
 	}
@@ -315,9 +315,9 @@ 
 	 * @param string $attr attribute-name
 	 * @return mixed the attribute or False if named cell not found
 	 */
-	function &getElementAttribute($name,$attr)
+	function &getElementAttribute($name, $attr)
 	{
-		return $this->setElementAttribute($name,$attr,NULL);
+		return $this->setElementAttribute($name, $attr, NULL);
 	}
 
 	/**
@@ -328,12 +328,12 @@ 
 	 * @param mixed $val if not NULL sets attribute else returns it
 	 * @return mixed number of changed cells or False, if none changed
 	 */
-	function &setElementAttribute($name,$attr,$val)
+	function &setElementAttribute($name, $attr, $val)
 	{
 		//echo "<p>set_cell_attribute(tpl->name=$this->name, name='$name', attr='$attr',val='$val')</p>\n";
 
-		$extra = array(false,$name,$attr,$val);
-		$result =& $this->widget_tree_walk('set_cell_attribute_helper',$extra);
+		$extra = array(false, $name, $attr, $val);
+		$result = & $this->widget_tree_walk('set_cell_attribute_helper', $extra);
 
 		if (is_null($val))
 		{
@@ -349,9 +349,9 @@ 
 	 * @param boolean $disabled=true disable or enable a cell, default true=disable
 	 * @return mixed number of changed cells or False, if none changed
 	 */
-	function disableElement($name,$disabled=True)
+	function disableElement($name, $disabled = True)
 	{
-		return $this->set_cell_attribute($name,'disabled',$disabled);
+		return $this->set_cell_attribute($name, 'disabled', $disabled);
 	}
 
 	/**
@@ -365,7 +365,7 @@ 
 	 * @return mixed reference to attribute, usually NULL
 	 * @deprecated use getElementAttribute($name, $attr)
 	 */
-	public function &get_cell_attribute($name,$attr)
+	public function &get_cell_attribute($name, $attr)
 	{
 		return self::getElementAttribute($name, $attr);
 	}
@@ -379,7 +379,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */
-	public function &set_cell_attribute($name,$attr,$val)
+	public function &set_cell_attribute($name, $attr, $val)
 	{
 		return self::setElementAttribute($name, $attr, $val);
 	}
@@ -392,7 +392,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
-	public function disable_cells($name,$disabled=True)
+	public function disable_cells($name, $disabled = True)
 	{
 		return self::disableElement($name, $disabled);
 	}
@@ -408,24 +408,24 @@ 
 	 * @param string $path='/0' default is the first widget in the tree of children
 	 * @return false if $path is no grid or array(height,class,valign,disabled) otherwise
 	 */
-	function set_row_attributes($n,$height=0,$class=0,$valign=0,$disabled=0,$path='/0')
+	function set_row_attributes($n, $height = 0, $class = 0, $valign = 0, $disabled = 0, $path = '/0')
 	{
-		$grid =& $this->get_widget_by_path($path);
+		$grid = & $this->get_widget_by_path($path);
 		if (is_null($grid) || $grid['type'] != 'grid') return false;
-		$grid_attr =& $grid['data'][0];
+		$grid_attr = & $grid['data'][0];
 
-		list($old_height,$old_disabled) = explode(',',$grid_attr["h$n"]);
+		list($old_height, $old_disabled) = explode(',', $grid_attr["h$n"]);
 		$disabled = $disabled !== 0 ? $disabled : $old_disabled;
 		$grid_attr["h$n"] = ($height !== 0 ? $height : $old_height).
 			($disabled ? ','.$disabled : '');
-		list($old_class,$old_valign) = explode(',',$grid_attr["c$n"]);
+		list($old_class, $old_valign) = explode(',', $grid_attr["c$n"]);
 		$valign = $valign !== 0 ? $valign : $old_valign;
 		$grid_attr["c$n"] = ($class !== 0 ? $class : $old_class).
 			($valign ? ','.$valign : '');
 
-		list($height,$disabled) = explode(',',$grid_attr["h$n"]);
-		list($class,$valign) = explode(',',$grid_attr["c$n"]);
-		return array($height,$class,$valign,$disabled);
+		list($height, $disabled) = explode(',', $grid_attr["h$n"]);
+		list($class, $valign) = explode(',', $grid_attr["c$n"]);
+		return array($height, $class, $valign, $disabled);
 	}
 
 	/**
@@ -435,9 +435,9 @@ 
 	 * @param boolean $enable=false can be used to re-enable a row if set to True
 	 * @param string $path='/0' default is the first widget in the tree of children
 	 */
-	function disable_row($n,$enable=False,$path='/0')
+	function disable_row($n, $enable = False, $path = '/0')
 	{
-		$this->set_row_attributes($n,0,0,0,!$enable,$path);
+		$this->set_row_attributes($n, 0, 0, 0, !$enable, $path);
 	}
 
 	/**
@@ -449,23 +449,23 @@ 
 	 * @param string $path='/0' default is the first widget in the tree of children
 	 * @return false if $path specifies no grid or array(width,disabled) otherwise
 	 */
-	function set_column_attributes($c,$width=0,$disabled=0,$path='/0')
+	function set_column_attributes($c, $width = 0, $disabled = 0, $path = '/0')
 	{
 		if (is_numeric($c))
 		{
 			$c = $this->num2chrs($c);
 		}
-		$grid =& $this->get_widget_by_path($path);
+		$grid = & $this->get_widget_by_path($path);
 		if (is_null($grid) || $grid['type'] != 'grid') return false;
-		$grid_attr =& $grid['data'][0];
+		$grid_attr = & $grid['data'][0];
 
-		list($old_width,$old_disabled) = explode(',',$grid_attr[$c]);
+		list($old_width, $old_disabled) = explode(',', $grid_attr[$c]);
 		$disabled = $disabled !== 0 ? $disabled : $old_disabled;
 		$grid_attr[$c] = ($width !== 0 ? $width : $old_width).
 			($disabled ? ','.$disabled : '');
 
 		//echo "set_column_attributes('$c',,'$path'): ".$grid_attr[$c]."</p>\n"; _debug_array($grid_attr);
-		return explode(',',$grid_attr[$c]);
+		return explode(',', $grid_attr[$c]);
 	}
 
 	/**
@@ -475,9 +475,9 @@ 
 	 * @param boolean $enable can be used to re-enable a column if set to True
 	 * @param string $path='/0' default is the first widget in the tree of children
 	 */
-	function disable_column($c,$enable=False,$path='/0')
+	function disable_column($c, $enable = False, $path = '/0')
 	{
-		$this->set_column_attributes($c,0,!$enable,$path);
+		$this->set_column_attributes($c, 0, !$enable, $path);
 	}
 
 	/**
@@ -496,18 +496,18 @@ 
 	 */
 	function loadExtension($type)
 	{
-		list($class,$app) = explode('.',$type);
+		list($class, $app) = explode('.', $type);
 		$class .= '_widget';
 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['current_app'];
 
 		if (!file_exists(EGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
 		{
-			list($app) = explode('_',$type);
+			list($app) = explode('_', $type);
 		}
 		if (!file_exists(EGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
 		{
-			list($app) = explode('.',$this->name);
+			list($app) = explode('.', $this->name);
 		}
 		if (!file_exists(EGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
 		{
@@ -518,7 +518,7 @@ 
 			//echo "<p>boetemplate::loadExtension($type) extension not found</p>\n";
 			return self::$extensions[$type] = False;
 		}
-		self::$extensions[$type] =& CreateObject($app.'.'.$class,$ui='html');
+		self::$extensions[$type] = & CreateObject($app.'.'.$class, $ui = 'html');
 
 		//echo "<p>boetemplate::loadExtension($type) extension found in App. $app</p>\n";
 		return self::$extensions[$type]->human_name;
@@ -532,9 +532,9 @@ 
 	 * @param string $function 'pre_process', 'post_process' or 'render'
 	 * @return boolean true if the extension (incl. method) exists, else false
 	 */
-	protected function haveExtension($type,$function='')
+	protected function haveExtension($type, $function = '')
 	{
-		return (self::$extensions[$type] || $this->loadExtension($type,$ui)) &&
+		return (self::$extensions[$type] || $this->loadExtension($type, $ui)) &&
 						($function == '' || self::$extensions[$type]->public_functions[$function]);
 	}
 
@@ -548,7 +548,7 @@ 
 	{
 		if (isset(self::$types[$type])) return true;
 
-		list($main,$sub) = explode('-',$type);
+		list($main, $sub) = explode('-', $type);
 
 		if ($this->haveExtension($main) && $this->loadExtension($main) && ($extension = self::$extensions[$main]))
 		{
@@ -567,7 +567,7 @@ 
 	 * @param array &$readonlys value of the extensions readonly-setting(-array)
 	 * @return mixed the return-value of the extensions preprocess function
 	 */
-	protected function extensionPreProcess($type,&$name,&$value,&$cell,&$readonlys)
+	protected function extensionPreProcess($type, &$name, &$value, &$cell, &$readonlys)
 	{
 		if (!$this->haveExtension($type))
 		{
@@ -577,9 +577,9 @@ 
 		// otherwise lists store >10k unnecessary data in each etemplate-session
 		if (!($cell['readonly'] || $readonlys && !is_array($readonlys)) || isset(self::$request->extension_data[$name]))
 		{
-			$extension_data =& self::$request->extension_data[$name];
+			$extension_data = & self::$request->extension_data[$name];
 		}
-		return self::$extensions[$type]->pre_process($name,$value,$cell,$readonlys,$extension_data,$this);
+		return self::$extensions[$type]->pre_process($name, $value, $cell, $readonlys, $extension_data, $this);
 	}
 
 	/**
@@ -591,15 +591,15 @@ 
 	 * @param mixed $value_in unprocessed value, eg. as posted by the browser
 	 * @return boolean True if a value should be returned (default for no postprocess fkt.), else False
 	 */
-	protected function extensionPostProcess($type,$name,&$value,$value_in)
+	protected function extensionPostProcess($type, $name, &$value, $value_in)
 	{
-		if (!$this->haveExtension($type,'post_process'))
+		if (!$this->haveExtension($type, 'post_process'))
 		{
 			return True;
 		}
-		return self::$extensions[$type]->post_process($name,$value,
+		return self::$extensions[$type]->post_process($name, $value,
 			self::$request->extension_data[$name],
-			self::$loop,$this,$value_in);
+			self::$loop, $this, $value_in);
 	}
 
 	/**
@@ -612,14 +612,14 @@ 
 	 * @param array &$readonlys value of the extensions readonly-setting(-array)
 	 * @return mixed return-value of the render function
 	 */
-	protected function extensionRender($type,$name,&$value,&$cell,$readonly)
+	protected function extensionRender($type, $name, &$value, &$cell, $readonly)
 	{
-		if (!$this->haveExtension($type,'render'))
+		if (!$this->haveExtension($type, 'render'))
 		{
 			return False;
 		}
-		return self::$extensions[$type]->render($cell,$name,$value,$readonly,
-			self::$request->extension_data[$name],$this);
+		return self::$extensions[$type]->render($cell, $name, $value, $readonly,
+			self::$request->extension_data[$name], $this);
 	}
 
 	/**
@@ -631,15 +631,15 @@ 
 	 * @param string $idx may contain multiple subindex (eg.'x[y][z]')
 	 * @return boolean true if set, else false
 	 */
-	static function isset_array($arr,$idx)
+	static function isset_array($arr, $idx)
 	{
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$last_idx = array_pop($idxs);
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
 			if (!is_array($pos))
 			{
@@ -649,7 +649,7 @@ 
 		}
 		// was return isset($pos[$last_idx]);
 		// array_key_exists also returns true for keys with value null, which fixes some problems with autorepeating rows
-		return is_array($pos) && array_key_exists($last_idx,$pos);
+		return is_array($pos) && array_key_exists($last_idx, $pos);
 	}
 
 	/**
@@ -661,16 +661,16 @@ 
 	 * @param string $idx the index, may contain sub-indices like a[b], see example below
 	 * @param mixed $val value to set
 	 */
-	static function set_array(&$arr,$idx,$val)
+	static function set_array(&$arr, $idx, $val)
 	{
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
-			if (!is_array($pos) && !is_null($pos)) return;	// gives fatal error under PHP5.3
+			if (!is_array($pos) && !is_null($pos)) return; // gives fatal error under PHP5.3
 
 			$pos = &$pos[$idx];
 		}
@@ -689,26 +689,26 @@ 
 	 * @param bool $skip_empty returns false if $idx is not present in $arr
 	 * @return mixed reference to $arr[$idx] or false if $idx is not set and not $reference_into
 	 */
-	static function &get_array(&$arr,$idx,$reference_into=False,$skip_empty=False)
+	static function &get_array(&$arr, $idx, $reference_into = False, $skip_empty = False)
 	{
 		if (!is_array($arr))
 		{
 			throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($idx)) return false;	// given an error in php5.2
+		if (is_object($idx)) return false; // given an error in php5.2
 
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
 			if (!is_array($pos) && !$reference_into)
 			{
 				return False;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return false;
+			if ($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return false;
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -723,7 +723,7 @@ 
 	 * @param array $arr the array to search, referenz as a referenz gets returned
 	 * @param string $idx the index, may contain sub-indices like a[b], see example below
 	 */
-	static function unset_array(&$arr,$idx)
+	static function unset_array(&$arr, $idx)
 	{
 		if (!is_array($arr))
 		{
@@ -731,11 +731,11 @@ 
 		}
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$last_idx = array_pop($idxs);
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
 			$pos = &$pos[$idx];
 		}
@@ -753,22 +753,22 @@ 
 	 * @param array $new
 	 * @return array the merged array
 	 */
-	static function complete_array_merge($old,$new)
+	static function complete_array_merge($old, $new)
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old)) $old = (array)$old;
 
-			foreach($new as $k => $v)
+			foreach ($new as $k => $v)
 			{
-				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
-					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1]))	// or no associative array, eg. selecting multiple accounts
+				if (!is_array($v) || !isset($old[$k]) || // no array or a new array
+					isset($v[0]) && !is_array($v[0]) && isset($v[count($v) - 1]))	// or no associative array, eg. selecting multiple accounts
 				{
 					$old[$k] = $v;
 				}
 				else
 				{
-					$old[$k] = self::complete_array_merge($old[$k],$v);
+					$old[$k] = self::complete_array_merge($old[$k], $v);
 				}
 			}
 		}
@@ -785,19 +785,19 @@ 
 	 * @param int $ancestor=0 0: widget itself, 1: parent, 2: grand-parent, ...
 	 * @return array referenz to the widget spezified or null, if it's not found
 	 */
-	function &get_widget_by_path($path,$ancestor=0)
+	function &get_widget_by_path($path, $ancestor = 0)
 	{
 		//echo "<p>boetemplate::get_widget_by_path('$path',$ancestor)</p>\n";
-		$path_parts = explode('/',$path);
-		while($ancestor-- > 0)
+		$path_parts = explode('/', $path);
+		while ($ancestor-- > 0)
 		{
 			if (array_pop($path_parts) === '') return null;
 		}
-		$path = implode('/',$path_parts);
+		$path = implode('/', $path_parts);
 		if ($path == '/' || $path === '') return $this->children;
 		if (count($path_parts) == 2) return $this->children[$path_parts[1]];
 
-		return $this->widget_tree_walk('get_widget_by_path_helper',$path);
+		return $this->widget_tree_walk('get_widget_by_path_helper', $path);
 	}
 
 	/**
@@ -810,7 +810,7 @@ 
 	 */
 	function &get_widget_by_name($name)
 	{
-		return $this->widget_tree_walk('get_widget_by_name_helper',$name);
+		return $this->widget_tree_walk('get_widget_by_name_helper', $name);
 	}
 
 	/**
@@ -843,32 +843,32 @@ 
 	 * @param string $enclosure='"'
 	 * @return array
 	 */
-	static function csv_split($str,$num=null,$delimiter=',',$enclosure='"')
+	static function csv_split($str, $num = null, $delimiter = ',', $enclosure = '"')
 	{
-		if (strpos($str,$enclosure) === false)
+		if (strpos($str, $enclosure) === false)
 		{
-			return is_null($num) ? explode($delimiter,$str) : explode($delimiter,$str,$num);	// no need to run this more expensive code
+			return is_null($num) ? explode($delimiter, $str) : explode($delimiter, $str, $num); // no need to run this more expensive code
 		}
-		$parts = explode($delimiter,$str);
-		for($n = 0; isset($parts[$n]); ++$n)
+		$parts = explode($delimiter, $str);
+		for ($n = 0; isset($parts[$n]); ++$n)
 		{
-			$part =& $parts[$n];
+			$part = & $parts[$n];
 			if ($part[0] === $enclosure)
 			{
-				while (isset($parts[$n+1]) && substr($part,-1) !== $enclosure)
+				while (isset($parts[$n + 1]) && substr($part, -1) !== $enclosure)
 				{
 					$part .= $delimiter.$parts[++$n];
 					unset($parts[$n]);
 				}
-				$part = substr(str_replace($enclosure.$enclosure,$enclosure,$part),1,-1);
+				$part = substr(str_replace($enclosure.$enclosure, $enclosure, $part), 1, -1);
 			}
 		}
-		$parts = array_values($parts);	// renumber the parts (in case we had to concat them)
+		$parts = array_values($parts); // renumber the parts (in case we had to concat them)
 
 		if ($num > 0 && count($parts) > $num)
 		{
-			$parts[$num-1] = implode($delimiter,array_slice($parts,$num-1,count($parts)-$num+1));
-			$parts = array_slice($parts,0,$num);
+			$parts[$num - 1] = implode($delimiter, array_slice($parts, $num - 1, count($parts) - $num + 1));
+			$parts = array_slice($parts, 0, $num);
 		}
 		return $parts;
 	}
@@ -881,7 +881,7 @@ 
 	 * @param string $lang language to use
 	 * @return string
 	 */
-	private /* static */ function cache_name($name='',$template='default',$lang='default')
+	private /* static */ function cache_name($name = '', $template = 'default', $lang = 'default')
 	{
 		if (empty($name))
 		{
@@ -899,7 +899,7 @@ 
 		{
 			$template = 'default';
 		}
-		$cname = $template . '/' . $name . (!empty($lang) && $lang != 'default' ? '.' . $lang : '');
+		$cname = $template.'/'.$name.(!empty($lang) && $lang != 'default' ? '.'.$lang : '');
 		//echo "<p>".__METHOD__."('$name','$template','$lang') = '$cname'</p>";
 
 		return $cname;
@@ -911,18 +911,18 @@ 
 	 * @param boetemplate $tpl=null required parameter for static use!
 	 * @param boolean $only_update_older=false true only update cache, if it contains an older template
 	 */
-	public /*static*/ function store_in_cache(boetemplate $tpl=null, $only_update_older=false)
+	public /*static*/ function store_in_cache(boetemplate $tpl = null, $only_update_older = false)
 	{
 		if (is_null($tpl)) $tpl = $this;
 
 		$cname = $tpl->cache_name();
-		$old = egw_cache::getInstance('etemplate',$cname);
+		$old = egw_cache::getInstance('etemplate', $cname);
 
 		// only cache newest versions (currently cached one is older or same version)
-		if (is_null($old) && !$only_update_older || !is_null($old) && version_compare($old['version'],$tpl->version,'<='))
+		if (is_null($old) && !$only_update_older || !is_null($old) && version_compare($old['version'], $tpl->version, '<='))
 		{
 			//error_log(__METHOD__."('$tpl->name','$tpl->template','$tpl->lang','$tpl->version') cached=".array2string($old).", modified=$tpl->modified, time()=".time());
-			egw_cache::setInstance('etemplate',$cname,$tpl->as_array(1));
+			egw_cache::setInstance('etemplate', $cname, $tpl->as_array(1));
 		}
 	}
 
@@ -932,7 +932,7 @@ 
 	private function delete_in_cache()
 	{
 		//echo "<p>".__METHOD__."('$this->name','$this->template','$this->lang','$this->version')</p>\n";
-		egw_cache::unsetInstance('etemplate',$this->cache_name());
+		egw_cache::unsetInstance('etemplate', $this->cache_name());
 	}
 
 	static private $import_tested;
@@ -949,33 +949,33 @@ 
 	static function test_import($app)	// should be done from the setup-App
 	{
 		if (is_array($app)) $app = $app['name'];
-		list($app) = explode('.',$app);
+		list($app) = explode('.', $app);
 
 		if (is_null(self::$import_tested))
 		{
-			self::$import_tested =& egw_cache::getSession('etemplate','import_tested');
+			self::$import_tested = & egw_cache::getSession('etemplate', 'import_tested');
 			if (is_null(self::$import_tested)) self::$import_tested = array();
 		}
 		if (!$app || self::$import_tested[$app])
 		{
-			return '';	// ensure test is done only once per session and app
+			return ''; // ensure test is done only once per session and app
 		}
-		self::$import_tested[$app] = True;	// need to be done before new ...
+		self::$import_tested[$app] = True; // need to be done before new ...
 
 		$path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php";
 
 		if (($time = @filemtime($path)))
 		{
-			$templ = new boetemplate(array('name' => '.'.$app,'lang' => '##'));
+			$templ = new boetemplate(array('name' => '.'.$app, 'lang' => '##'));
 			if ($templ->lang != '##' || $templ->version != $GLOBALS['egw_info']['apps'][$app]['version'] ||
 				$templ->modified < $time) // need to import
 			{
-				$templ->delete();	// delete old timestamp
+				$templ->delete(); // delete old timestamp
 				//echo "<p>".__METHOD__."($app) import necessary, as app-modified=$templ->modified < filemtime($path)=$time test-tpl=".array2string($templ->as_array(1))."</p>\n";
 				$ret = self::import_dump($app);
 				$templ->modified = $time;
 				// store new timestamp incl. app version
-				$templ->save('.'.$app,'','##',0,$GLOBALS['egw_info']['apps'][$app]['version']);
+				$templ->save('.'.$app, '', '##', 0, $GLOBALS['egw_info']['apps'][$app]['version']);
 			}
 		}
 		return $ret;
@@ -989,12 +989,12 @@ 
 	 */
 	static function import_dump($app)
 	{
-		$templ_version=0;
+		$templ_version = 0;
 
 		include($path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php");
 		$templ = new boetemplate($app);
 
-		foreach($templ_data as $data)
+		foreach ($templ_data as $data)
 		{
 			if ((int)$templ_version < 1)	// we need to stripslashes
 			{
@@ -1010,7 +1010,7 @@ 
 
 			$n++;
 		}
-		return lang("%1 new eTemplates imported for Application '%2'",$n,$app);
+		return lang("%1 new eTemplates imported for Application '%2'", $n, $app);
 	}
 
 	/**
@@ -1025,7 +1025,7 @@ 
 	 * @param string $version of the template
 	 * @return boolean true if the eTemplate was found in the cache
 	 */
-	private function read_from_cache($name,$template='default',$lang='default',$group=0,$version='')
+	private function read_from_cache($name, $template = 'default', $lang = 'default', $group = 0, $version = '')
 	{
 		// check if new import necessary, currently on every request
 		$msg = self::test_import($name);
@@ -1041,7 +1041,7 @@ 
 		// templates starting with . (as the import timestamp) never use the cache
 		if ($name[0] == '.') return false;
 
-		$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
+		$data = egw_cache::getInstance('etemplate', $cname = self::cache_name($name, $template, $lang));
 		//echo "<p>".__METHOD__.'('.array2string($name).",$template,$lang,$group,$version) egw_cache::getInstance('etemplate','$cname')=".array2string(array('name'=>$data['name'],'version'=>$data['version'],'modified'=>$data['modified']))."</p>\n";
 
 		if (!is_null($data) && (empty($version) || $data['version'] == $version))
@@ -1068,7 +1068,7 @@ 
 	 * @param mixed $load_via name/array of keys of etemplate to load in order to get $name (only as second try!)
 	 * @return boolean True if a fitting template is found, else False
 	 */
-	function read($name,$template='default',$lang='default',$group=0,$version='',$load_via='')
+	function read($name, $template = 'default', $lang = 'default', $group = 0, $version = '', $load_via = '')
 	{
 		if (is_array($name))
 		{
@@ -1084,23 +1084,23 @@ 
 		}
 		$parent = is_array($load_via) ? $load_via['name'] : $load_via;
 
-		if (strstr($pname,'.') === False && !empty($parent))
+		if (strstr($pname, '.') === False && !empty($parent))
 		{
-			$pname = $parent . '.' . $pname;
+			$pname = $parent.'.'.$pname;
 		}
-		if (!$this->read_from_cache($name,$template,$lang,$group,$version))
+		if (!$this->read_from_cache($name, $template, $lang, $group, $version))
 		{
-			if (!parent::read($name,$template,$lang,$group,$version))
+			if (!parent::read($name, $template, $lang, $group, $version))
 			{
 				if ($load_via && (is_string($load_via) ||
 					!isset($load_via['tpls_in_file']) || $load_via['tpls_in_file'] > 1))
 				{
 					parent::read($load_via);
-					return $this->read_from_cache($name,$template,$lang,$group,$version);
+					return $this->read_from_cache($name, $template, $lang, $group, $version);
 				}
 				return False;
 			}
-			if (!$version) $this->store_in_cache();	// only store default version (none given)
+			if (!$version) $this->store_in_cache(); // only store default version (none given)
 		}
 		return True;
 	}
@@ -1120,11 +1120,11 @@ 
 	 * @param string $version version of the eTemplate
 	 * @return the number of affected rows, 1 should be ok, 0 somethings wrong
 	 */
-	function save($name='',$template='.',$lang='.',$group=0,$version='.')
+	function save($name = '', $template = '.', $lang = '.', $group = 0, $version = '.')
 	{
-		if ($result = parent::save($name,$template,$lang,$group,$version))
+		if ($result = parent::save($name, $template, $lang, $group, $version))
 		{
-			$this->store_in_cache(null, true);	// true = only update older (smaller version) copies
+			$this->store_in_cache(null, true); // true = only update older (smaller version) copies
 		}
 		return $result;
 	}
@@ -1154,14 +1154,14 @@ 
 
 if (!function_exists('set_cell_attribute_helper'))
 {
-	function &set_cell_attribute_helper(&$widget,&$extra)
+	function &set_cell_attribute_helper(&$widget, &$extra)
 	{
 		// extra = array(0=>n,1=>name,2=>attr,3=>value)
 		if ($widget['name'] == $extra[1] || $widget['type'] == 'tab' && strpos($widget['name'], $extra[1].'=') === 0)
 		{
 			if (is_null($extra[3]))
 			{
-				$extra['__RETURN_NOW__'] = true;	// wouldnt work otherwise, if attr is not yet set == null
+				$extra['__RETURN_NOW__'] = true; // wouldnt work otherwise, if attr is not yet set == null
 				return $widget[$extra[2]];
 			}
 			$widget[$extra[2]] = $extra[3];
@@ -1169,12 +1169,12 @@ 
 		}
 	}
 
-	function &get_widget_by_name_helper(&$widget,$extra)
+	function &get_widget_by_name_helper(&$widget, $extra)
 	{
 		if ($widget['name'] == $extra) return $widget;
 	}
 
-	function &get_widget_by_path_helper(&$widget,$extra,$path)
+	function &get_widget_by_path_helper(&$widget, $extra, $path)
 	{
 		//echo "<p>path_searched='$extra', widget-path($widget[type]:$widget[name])='$path'</p>\n";
 		if ($path == $extra) return $widget;
@@ -1183,12 +1183,12 @@ 
 	function &get_widgets_by_type_helper(&$widget, &$extra)
 	{
 		//echo '<br />get_widgets_by_type_helper(' . $widget['name'] . ',' . $extra['type'] . ')<br />';
-		if($widget['type'] == $extra['type'])
+		if ($widget['type'] == $extra['type'])
 		{
-			$extra['widgets'][] =& $widget;
+			$extra['widgets'][] = & $widget;
 		}
 	}
 }
 // just in case someone still uses the old var
 if (!is_array($GLOBALS['egw_info']['flags']['etemplate'])) $GLOBALS['egw_info']['flags']['etemplate'] = array();
-$GLOBALS['egw_info']['flags']['etemplate']['loop'] =& boetemplate::$loop;
+$GLOBALS['egw_info']['flags']['etemplate']['loop'] = & boetemplate::$loop;

Braces +109 added lines, -27 removed lines

@@ -123,7 +123,10 @@ 
 		$val = $this->expand_name($val,$c,$row,'','',$content);
 		$check_val = $this->expand_name($check_val,$c,$row,'','',$content);
 		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
-		if ($not) $result = !$result;
+		if ($not)
+		{
+			$result = !$result;
+		}
 		//echo "<p>check_disabled: '".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False')."</p>\n";
 		return $result;
 	}
@@ -172,7 +175,10 @@ 
 			{
 				$cont = array();
 			}
-			if (!is_numeric($c)) $c = boetemplate::chrs2num($c);
+			if (!is_numeric($c))
+			{
+				$c = boetemplate::chrs2num($c);
+			}
 			$col = boetemplate::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
 			$col_ = boetemplate::num2chrs($c_-1);
 			$row_cont = $cont[$row];
@@ -188,11 +194,14 @@ 
 					error_log(__METHOD__."(name='$name', c='$c', row=$row, c_='$c_', row_=$row_, ...) line ".__LINE__." ERROR parsing: $code");
 					error_log(function_backtrace());
 				}
-				if (is_array($value) && $name[$pos_var-1] == "'")	// arrays are only supported for '
+				if (is_array($value) && $name[$pos_var-1] == "'")
+				{
+					// arrays are only supported for '
 				{
 					foreach($value as &$val)
 					{
 						$val = "'".str_replace(array("'",'"'),array('\\\'','&quot;'),$val)."'";
+				}
 					}
 					$value = '[ '.implode(', ',$value).' ]';
 					$name = str_replace("'".$matches[1]."'",$value,$name);
@@ -211,11 +220,14 @@ 
 					error_log(__METHOD__."(name='$name', c='$c', row=$row, c_='$c_', row_=$row_, ...) line ".__LINE__." ERROR parsing: $code");
 					error_log(function_backtrace());
 				}
-				if (is_array($value))	// works only reasonable, if get-parameter uses array notation, eg. &file[]=$cont[filenames]
+				if (is_array($value))
+				{
+					// works only reasonable, if get-parameter uses array notation, eg. &file[]=$cont[filenames]
 				{
 					foreach($value as &$val)
 					{
 						$val = str_replace('&',urlencode('&'),$val);
+				}
 					}
 					$name = str_replace($matches[3],implode('&'.$matches[1].'=',$value),$name);
 				}
@@ -411,7 +423,10 @@ 
 	function set_row_attributes($n,$height=0,$class=0,$valign=0,$disabled=0,$path='/0')
 	{
 		$grid =& $this->get_widget_by_path($path);
-		if (is_null($grid) || $grid['type'] != 'grid') return false;
+		if (is_null($grid) || $grid['type'] != 'grid')
+		{
+			return false;
+		}
 		$grid_attr =& $grid['data'][0];
 
 		list($old_height,$old_disabled) = explode(',',$grid_attr["h$n"]);
@@ -456,7 +471,10 @@ 
 			$c = $this->num2chrs($c);
 		}
 		$grid =& $this->get_widget_by_path($path);
-		if (is_null($grid) || $grid['type'] != 'grid') return false;
+		if (is_null($grid) || $grid['type'] != 'grid')
+		{
+			return false;
+		}
 		$grid_attr =& $grid['data'][0];
 
 		list($old_width,$old_disabled) = explode(',',$grid_attr[$c]);
@@ -499,7 +517,10 @@ 
 		list($class,$app) = explode('.',$type);
 		$class .= '_widget';
 
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['current_app'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['current_app'];
+		}
 
 		if (!file_exists(EGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
 		{
@@ -546,7 +567,10 @@ 
 	 */
 	public function widgetExists($type)
 	{
-		if (isset(self::$types[$type])) return true;
+		if (isset(self::$types[$type]))
+		{
+			return true;
+		}
 
 		list($main,$sub) = explode('-',$type);
 
@@ -670,7 +694,11 @@ 
 		$pos = &$arr;
 		foreach($idxs as $idx)
 		{
-			if (!is_array($pos) && !is_null($pos)) return;	// gives fatal error under PHP5.3
+			if (!is_array($pos) && !is_null($pos))
+			{
+				return;
+			}
+			// gives fatal error under PHP5.3
 
 			$pos = &$pos[$idx];
 		}
@@ -695,7 +723,11 @@ 
 		{
 			throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($idx)) return false;	// given an error in php5.2
+		if (is_object($idx))
+		{
+			return false;
+		}
+		// given an error in php5.2
 
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
@@ -708,7 +740,10 @@ 
 			{
 				return False;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return false;
+			if($skip_empty && (!is_array($pos) || !isset($pos[$idx])))
+			{
+				return false;
+			}
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -757,15 +792,21 @@ 
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old))
+			{
+				$old = (array) $old;
+			}
 
 			foreach($new as $k => $v)
 			{
 				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
-					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1]))	// or no associative array, eg. selecting multiple accounts
+					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1]))
+				{
+					// or no associative array, eg. selecting multiple accounts
 				{
 					$old[$k] = $v;
 				}
+				}
 				else
 				{
 					$old[$k] = self::complete_array_merge($old[$k],$v);
@@ -791,11 +832,20 @@ 
 		$path_parts = explode('/',$path);
 		while($ancestor-- > 0)
 		{
-			if (array_pop($path_parts) === '') return null;
+			if (array_pop($path_parts) === '')
+			{
+				return null;
+			}
 		}
 		$path = implode('/',$path_parts);
-		if ($path == '/' || $path === '') return $this->children;
-		if (count($path_parts) == 2) return $this->children[$path_parts[1]];
+		if ($path == '/' || $path === '')
+		{
+			return $this->children;
+		}
+		if (count($path_parts) == 2)
+		{
+			return $this->children[$path_parts[1]];
+		}
 
 		return $this->widget_tree_walk('get_widget_by_path_helper',$path);
 	}
@@ -913,7 +963,10 @@ 
 	 */
 	public /*static*/ function store_in_cache(boetemplate $tpl=null, $only_update_older=false)
 	{
-		if (is_null($tpl)) $tpl = $this;
+		if (is_null($tpl))
+		{
+			$tpl = $this;
+		}
 
 		$cname = $tpl->cache_name();
 		$old = egw_cache::getInstance('etemplate',$cname);
@@ -948,13 +1001,19 @@ 
 	 */
 	static function test_import($app)	// should be done from the setup-App
 	{
-		if (is_array($app)) $app = $app['name'];
+		if (is_array($app))
+		{
+			$app = $app['name'];
+		}
 		list($app) = explode('.',$app);
 
 		if (is_null(self::$import_tested))
 		{
 			self::$import_tested =& egw_cache::getSession('etemplate','import_tested');
-			if (is_null(self::$import_tested)) self::$import_tested = array();
+			if (is_null(self::$import_tested))
+			{
+				self::$import_tested = array();
+			}
 		}
 		if (!$app || self::$import_tested[$app])
 		{
@@ -968,9 +1027,13 @@ 
 		{
 			$templ = new boetemplate(array('name' => '.'.$app,'lang' => '##'));
 			if ($templ->lang != '##' || $templ->version != $GLOBALS['egw_info']['apps'][$app]['version'] ||
-				$templ->modified < $time) // need to import
+				$templ->modified < $time)
+			{
+				// need to import
 			{
-				$templ->delete();	// delete old timestamp
+				$templ->delete();
+			}
+			// delete old timestamp
 				//echo "<p>".__METHOD__."($app) import necessary, as app-modified=$templ->modified < filemtime($path)=$time test-tpl=".array2string($templ->as_array(1))."</p>\n";
 				$ret = self::import_dump($app);
 				$templ->modified = $time;
@@ -996,10 +1059,13 @@ 
 
 		foreach($templ_data as $data)
 		{
-			if ((int)$templ_version < 1)	// we need to stripslashes
+			if ((int)$templ_version < 1)
+			{
+				// we need to stripslashes
 			{
 				$data['data'] = stripslashes($data['data']);
 			}
+			}
 			$templ->init($data);
 
 			if (!$templ->modified)
@@ -1039,7 +1105,10 @@ 
 			$name = $name['name'];
 		}
 		// templates starting with . (as the import timestamp) never use the cache
-		if ($name[0] == '.') return false;
+		if ($name[0] == '.')
+		{
+			return false;
+		}
 
 		$data = egw_cache::getInstance('etemplate',$cname=self::cache_name($name,$template,$lang));
 		//echo "<p>".__METHOD__.'('.array2string($name).",$template,$lang,$group,$version) egw_cache::getInstance('etemplate','$cname')=".array2string(array('name'=>$data['name'],'version'=>$data['version'],'modified'=>$data['modified']))."</p>\n";
@@ -1100,7 +1169,11 @@ 
 				}
 				return False;
 			}
-			if (!$version) $this->store_in_cache();	// only store default version (none given)
+			if (!$version)
+			{
+				$this->store_in_cache();
+			}
+			// only store default version (none given)
 		}
 		return True;
 	}
@@ -1171,13 +1244,19 @@ 
 
 	function &get_widget_by_name_helper(&$widget,$extra)
 	{
-		if ($widget['name'] == $extra) return $widget;
+		if ($widget['name'] == $extra)
+		{
+			return $widget;
+		}
 	}
 
 	function &get_widget_by_path_helper(&$widget,$extra,$path)
 	{
 		//echo "<p>path_searched='$extra', widget-path($widget[type]:$widget[name])='$path'</p>\n";
-		if ($path == $extra) return $widget;
+		if ($path == $extra)
+		{
+			return $widget;
+		}
 	}
 
 	function &get_widgets_by_type_helper(&$widget, &$extra)
@@ -1190,5 +1269,8 @@ 
 	}
 }
 // just in case someone still uses the old var
-if (!is_array($GLOBALS['egw_info']['flags']['etemplate'])) $GLOBALS['egw_info']['flags']['etemplate'] = array();
+if (!is_array($GLOBALS['egw_info']['flags']['etemplate']))
+{
+	$GLOBALS['egw_info']['flags']['etemplate'] = array();
+}
 $GLOBALS['egw_info']['flags']['etemplate']['loop'] =& boetemplate::$loop;

etemplate/inc/class.bolangfile.inc.php

Doc Comments +3 added lines

@@ -218,6 +218,9 @@
 		return $this->target_langarray;
 	}
 
+	/**
+	 * @param string $which
+	 */
 	function write_file($which,$app_name,$userlang)
 	{
 		switch ($which)

Spacing +49 added lines, -49 removed lines

@@ -33,11 +33,11 @@ 
 
 	function __construct()
 	{
-		$this->so = new solangfile();	// is now in etemplate, to not doublicate it
+		$this->so = new solangfile(); // is now in etemplate, to not doublicate it
 	}
 
 	/* Sessions used to save state and not reread the langfile between adding/deleting phrases */
-	function save_sessiondata($source='##unset##',$target='##unset##')
+	function save_sessiondata($source = '##unset##', $target = '##unset##')
 	{
 		if ($source == '##unset##')
 		{
@@ -47,37 +47,37 @@ 
 		{
 			$target = &$this->target_langarray;
 		}
-		if($this->debug) { echo '<br>Save:'; _debug_array($source); }
-		$GLOBALS['egw']->session->appsession('developer_source_lang','developer_tools',$source);
-		if($this->debug) { echo '<br>Save:'; _debug_array($target); }
-		$GLOBALS['egw']->session->appsession('developer_target_lang','developer_tools',$target);
-		$GLOBALS['egw']->session->appsession('developer_source_file','developer_tools',$this->src_file);
-		$GLOBALS['egw']->session->appsession('developer_target_file','developer_tools',$this->tgt_file);
-		$GLOBALS['egw']->session->appsession('developer_t_lang','developer_tools',$this->tgt_lang);
-		$GLOBALS['egw']->session->appsession('developer_loaded_apps','developer_tools',$this->loaded_apps);
-		$GLOBALS['egw']->session->appsession('developer_src_apps','developer_tools',$this->src_apps);
-		$GLOBALS['egw']->session->appsession('developer_missing_lang','developer_tools',$this->missing_langarray);
+		if ($this->debug) { echo '<br>Save:'; _debug_array($source); }
+		$GLOBALS['egw']->session->appsession('developer_source_lang', 'developer_tools', $source);
+		if ($this->debug) { echo '<br>Save:'; _debug_array($target); }
+		$GLOBALS['egw']->session->appsession('developer_target_lang', 'developer_tools', $target);
+		$GLOBALS['egw']->session->appsession('developer_source_file', 'developer_tools', $this->src_file);
+		$GLOBALS['egw']->session->appsession('developer_target_file', 'developer_tools', $this->tgt_file);
+		$GLOBALS['egw']->session->appsession('developer_t_lang', 'developer_tools', $this->tgt_lang);
+		$GLOBALS['egw']->session->appsession('developer_loaded_apps', 'developer_tools', $this->loaded_apps);
+		$GLOBALS['egw']->session->appsession('developer_src_apps', 'developer_tools', $this->src_apps);
+		$GLOBALS['egw']->session->appsession('developer_missing_lang', 'developer_tools', $this->missing_langarray);
 	}
 
 	function read_sessiondata()
 	{
-		$source = $GLOBALS['egw']->session->appsession('developer_source_lang','developer_tools');
-		if($this->debug) { echo '<br>Read:'; _debug_array($source); }
+		$source = $GLOBALS['egw']->session->appsession('developer_source_lang', 'developer_tools');
+		if ($this->debug) { echo '<br>Read:'; _debug_array($source); }
 
-		$target = $GLOBALS['egw']->session->appsession('developer_target_lang','developer_tools');
-		if($this->debug) { echo '<br>Read:'; _debug_array($target); }
+		$target = $GLOBALS['egw']->session->appsession('developer_target_lang', 'developer_tools');
+		if ($this->debug) { echo '<br>Read:'; _debug_array($target); }
 
-		$src_file = $GLOBALS['egw']->session->appsession('developer_source_file','developer_tools');
-		$tgt_file = $GLOBALS['egw']->session->appsession('developer_target_file','developer_tools');
-		$tgt_lang = $GLOBALS['egw']->session->appsession('developer_t_lang','developer_tools');
-		$loaded_apps = $GLOBALS['egw']->session->appsession('developer_loaded_apps','developer_tools');
-		$src_apps = $GLOBALS['egw']->session->appsession('developer_src_apps','developer_tools');
-		$missing = $GLOBALS['egw']->session->appsession('developer_missing_lang','developer_tools');
+		$src_file = $GLOBALS['egw']->session->appsession('developer_source_file', 'developer_tools');
+		$tgt_file = $GLOBALS['egw']->session->appsession('developer_target_file', 'developer_tools');
+		$tgt_lang = $GLOBALS['egw']->session->appsession('developer_t_lang', 'developer_tools');
+		$loaded_apps = $GLOBALS['egw']->session->appsession('developer_loaded_apps', 'developer_tools');
+		$src_apps = $GLOBALS['egw']->session->appsession('developer_src_apps', 'developer_tools');
+		$missing = $GLOBALS['egw']->session->appsession('developer_missing_lang', 'developer_tools');
 
-		$this->set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps,$missing);
+		$this->set_sessiondata($source, $target, $src_file, $tgt_file, $tgt_lang, $loaded_apps, $src_apps, $missing);
 	}
 
-	function set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps,$missing)
+	function set_sessiondata($source, $target, $src_file, $tgt_file, $tgt_lang, $loaded_apps, $src_apps, $missing)
 	{
 		$this->source_langarray = $source;
 		$this->target_langarray = $target;
@@ -91,12 +91,12 @@ 
 
 	function clear_sessiondata()
 	{
-		$GLOBALS['egw']->session->appsession('developer_source_lang','developer_tools','');
-		$GLOBALS['egw']->session->appsession('developer_target_lang','developer_tools','');
-		$GLOBALS['egw']->session->appsession('developer_source_file','developer_tools','');
-		$GLOBALS['egw']->session->appsession('developer_target_file','developer_tools','');
-		$GLOBALS['egw']->session->appsession('developer_t_lang','developer_tools','');
-		$GLOBALS['egw']->session->appsession('developer_loaded_apps','developer_tools','');
+		$GLOBALS['egw']->session->appsession('developer_source_lang', 'developer_tools', '');
+		$GLOBALS['egw']->session->appsession('developer_target_lang', 'developer_tools', '');
+		$GLOBALS['egw']->session->appsession('developer_source_file', 'developer_tools', '');
+		$GLOBALS['egw']->session->appsession('developer_target_file', 'developer_tools', '');
+		$GLOBALS['egw']->session->appsession('developer_t_lang', 'developer_tools', '');
+		$GLOBALS['egw']->session->appsession('developer_loaded_apps', 'developer_tools', '');
 	}
 
 	function addphrase($entry)
@@ -124,9 +124,9 @@ 
 		}
 	}
 
-	function movephrase($mess='')
+	function movephrase($mess = '')
 	{
-		if ($mess !='' && ($this->missing_langarray[$mess]['message_id']))
+		if ($mess != '' && ($this->missing_langarray[$mess]['message_id']))
 		{
 			$this->source_langarray[$mess] = $m = array(
 				'message_id' => $this->missing_langarray[$mess]['message_id'],
@@ -148,24 +148,24 @@ 
 		//else echo "'$mess' not found in missing_langarray !!!<br>\n";
 	}
 
-	function missing_app($app,$userlang='en')
+	function missing_app($app, $userlang = 'en')
 	{
 		$this->missing_langarray = array();
 
 		if (!is_array($this->extra_langarray['common']))
 		{
-			$this->extra_langarray['common'] = $this->so->load_app('phpgwapi',$userlang);
+			$this->extra_langarray['common'] = $this->so->load_app('phpgwapi', $userlang);
 		}
-		$plist = $this->so->missing_app($app = trim($app),$userlang);
+		$plist = $this->so->missing_app($app = trim($app), $userlang);
 
-		foreach($plist as $p => $loc)
+		foreach ($plist as $p => $loc)
 		{
 			$_mess_id = strtolower(trim($p));
 			if ($loc != $app)
 			{
 				if (!is_array($this->extra_langarray[$loc]))
 				{
-					$this->extra_langarray[$loc] = $this->so->load_app($loc,$userlang);
+					$this->extra_langarray[$loc] = $this->so->load_app($loc, $userlang);
 					//echo "<p>loading translations for '$loc'</p>\n";
 				}
 			}
@@ -183,57 +183,57 @@ 
 		}
 		if (is_array($this->missing_langarray))
 		{
-			reset ($this->missing_langarray);
+			reset($this->missing_langarray);
 			@ksort($this->missing_langarray);
 		}
 		return $this->missing_langarray;
 	}
 
-	function add_app($app,$userlang='en')
+	function add_app($app, $userlang = 'en')
 	{
-		if(gettype($this->source_langarray) == 'array')
+		if (gettype($this->source_langarray) == 'array')
 		{
 			return $this->source_langarray;
 		}
-		$this->source_langarray = $this->so->load_app($app,$userlang,False);
+		$this->source_langarray = $this->so->load_app($app, $userlang, False);
 		$this->src_file = $this->so->src_file;
 		$this->loaded_apps = $this->so->loaded_apps;
 		$this->src_apps = $this->so->src_apps;
 		return $this->source_langarray;
 	}
 
-	function load_app($app,$userlang='en')
+	function load_app($app, $userlang = 'en')
 	{
-		if(gettype($this->target_langarray) == 'array')
+		if (gettype($this->target_langarray) == 'array')
 		{
 			if ($this->tgt_lang == $userlang)
 			{
 				return $this->target_langarray;
 			}
 		}
-		$this->target_langarray = $this->so->load_app($app,$userlang);
+		$this->target_langarray = $this->so->load_app($app, $userlang);
 		$this->tgt_file = $this->so->tgt_file;
 		$this->tgt_lang = $userlang;
 		$this->loaded_apps = $this->so->loaded_apps;
 		return $this->target_langarray;
 	}
 
-	function write_file($which,$app_name,$userlang)
+	function write_file($which, $app_name, $userlang)
 	{
 		switch ($which)
 		{
 			case 'source':
-				$this->src_file = $this->so->write_file($app_name,$this->source_langarray,$userlang,$which);
+				$this->src_file = $this->so->write_file($app_name, $this->source_langarray, $userlang, $which);
 				break;
 			case 'target':
 				// removing phrases not in the source language
 				$before = count($this->target_langarray);
-				$this->target_langarray = array_intersect_assoc($this->target_langarray,$this->source_langarray);
+				$this->target_langarray = array_intersect_assoc($this->target_langarray, $this->source_langarray);
 				if ($before > ($after = count($this->target_langarray)))
 				{
-					echo '<br />'. lang('Removed %1 phrases from the target language, as they are not present in the source language!',$before-$after)."\n";
+					echo '<br />'.lang('Removed %1 phrases from the target language, as they are not present in the source language!', $before - $after)."\n";
 				}
-				$this->tgt_file = $this->so->write_file($app_name,$this->target_langarray,$userlang,$which);
+				$this->tgt_file = $this->so->write_file($app_name, $this->target_langarray, $userlang, $which);
 				break;
 			default:
 				break;

Braces +16 added lines, -5 removed lines

@@ -47,9 +47,13 @@ 
 		{
 			$target = &$this->target_langarray;
 		}
-		if($this->debug) { echo '<br>Save:'; _debug_array($source); }
+		if($this->debug)
+		{
+echo '<br>Save:'; _debug_array($source); }
 		$GLOBALS['egw']->session->appsession('developer_source_lang','developer_tools',$source);
-		if($this->debug) { echo '<br>Save:'; _debug_array($target); }
+		if($this->debug)
+		{
+echo '<br>Save:'; _debug_array($target); }
 		$GLOBALS['egw']->session->appsession('developer_target_lang','developer_tools',$target);
 		$GLOBALS['egw']->session->appsession('developer_source_file','developer_tools',$this->src_file);
 		$GLOBALS['egw']->session->appsession('developer_target_file','developer_tools',$this->tgt_file);
@@ -62,10 +66,14 @@ 
 	function read_sessiondata()
 	{
 		$source = $GLOBALS['egw']->session->appsession('developer_source_lang','developer_tools');
-		if($this->debug) { echo '<br>Read:'; _debug_array($source); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($source); }
 
 		$target = $GLOBALS['egw']->session->appsession('developer_target_lang','developer_tools');
-		if($this->debug) { echo '<br>Read:'; _debug_array($target); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($target); }
 
 		$src_file = $GLOBALS['egw']->session->appsession('developer_source_file','developer_tools');
 		$tgt_file = $GLOBALS['egw']->session->appsession('developer_target_file','developer_tools');
@@ -102,7 +110,10 @@ 
 	function addphrase($entry)
 	{
 		/* _debug_array($this->source_langarray);exit; */
-		if (empty($entry['content'])) $entry['content'] = $entry['message_id'];
+		if (empty($entry['content']))
+		{
+			$entry['content'] = $entry['message_id'];
+		}
 
 		$mess_id = strtolower(trim($entry['message_id']));
 		$this->source_langarray[$mess_id] = array(

etemplate/inc/class.contact_widget.inc.php

Doc Comments -1 removed lines

@@ -125,7 +125,6 @@
 
 	/**
 	 * Legacy support for putting the template name in 'label' param
-	 * @param string $label
 	 * @param array $attrs
 	 */
 	public function parse_template($template, &$attrs)

Spacing +16 added lines, -16 removed lines

@@ -143,7 +143,7 @@ 
 		translation::add_app('addressbook');
 		$this->contacts->__construct();
 		$options = $this->contacts->contact_fields;
-		foreach($this->contacts->customfields as $name => $data)
+		foreach ($this->contacts->customfields as $name => $data)
 		{
 			$options['#'.$name] = $data['label'];
 		}
@@ -164,28 +164,28 @@ 
 	public function get_contact($value, array $attrs)
 	{
 		$field = $attrs['field'] ? $attrs['field'] : '';
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app', $value) && array_key_exists('id', $value))) return $value;
 
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
-		switch($attrs['type'])
+		if (is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		switch ($attrs['type'])
 		{
 			case 'contact-account':
 			case 'contact-template':
-				if (substr($value,0,8) != 'account:')
+				if (substr($value, 0, 8) != 'account:')
 				{
 					$value = 'account:'.($attrs['name'] != 'account:' ? $value : $GLOBALS['egw_info']['user']['account_id']);
 				}
 				// fall-through
 			case 'contact-value':
 			default:
-				if (substr($value,0,12) == 'addressbook:') $value = substr($value,12);	// link-entry syntax
+				if (substr($value, 0, 12) == 'addressbook:') $value = substr($value, 12); // link-entry syntax
 				if (!($contact = $this->contacts->read($value)))
 				{
 					$contact = array();
 				}
 				break;
 		}
-		unset($contact['jpegphoto']);	// makes no sense to return binary image
+		unset($contact['jpegphoto']); // makes no sense to return binary image
 
 		//error_log(__METHOD__."('$value') returning ".array2string($contact));
 		return $contact;
@@ -204,10 +204,10 @@ 
 	 * @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)
 	{
 		//echo "<p>contact_widget::pre_process('$name','$value',".print_r($cell,true).",...)</p>\n";
-		switch($type = $cell['type'])
+		switch ($type = $cell['type'])
 		{
 			case 'contact-fields':
 				$cell['sel_options'] = $this->get_contact_fields();
@@ -218,7 +218,7 @@ 
 
 			case 'contact-account':
 			case 'contact-template':
-				if (substr($value,0,8) != 'account:')
+				if (substr($value, 0, 8) != 'account:')
 				{
 					$value = 'account:'.($cell['name'] != 'account:' ? $value : $GLOBALS['egw_info']['user']['account_id']);
 				}
@@ -226,7 +226,7 @@ 
 				// fall-throught
 			case 'contact-value':
 			default:
-				if (substr($value,0,12) == 'addressbook:') $value = substr($value,12);	// link-entry syntax
+				if (substr($value, 0, 12) == 'addressbook:') $value = substr($value, 12); // link-entry syntax
 				if (!$value || !$cell['size'] || (!is_array($this->contact) ||
 					!($this->contact['id'] == $value || 'account:'.$this->contact['account_id'] == $value)) &&
 					!($this->contact = $this->contacts->read($value)))
@@ -242,15 +242,15 @@ 
 				{
 					$name = $this->contact[$type];
 					$cell['type'] = 'template';
-					if (($prefix = $cell['label'])) $name = strpos($prefix,'%s') !== false ? str_replace('%s',$name,$prefix) : $prefix.$name;
-					$cell['obj'] = new etemplate($name,$tmpl->as_array());
+					if (($prefix = $cell['label'])) $name = strpos($prefix, '%s') !== false ? str_replace('%s', $name, $prefix) : $prefix.$name;
+					$cell['obj'] = new etemplate($name, $tmpl->as_array());
 					return false;
 				}
 				$value = $this->contact[$type];
 				$cell['no_lang'] = 1;
 				$cell['readonly'] = true;
 
-				switch($type)
+				switch ($type)
 				{
 					// ToDo: pseudo types like address-label
 
@@ -282,8 +282,8 @@ 
 		}
 		$cell['id'] = ($cell['id'] ? $cell['id'] : $cell['name'])."[$type]";
 
-		return True;	// extra label ok
+		return True; // extra label ok
 	}
 }
 // register widgets for etemplate2
-etemplate_widget::registerWidget('contact_widget',array('contact-value', 'contact-account', 'contact-template', 'contact-fields'));
+etemplate_widget::registerWidget('contact_widget', array('contact-value', 'contact-account', 'contact-template', 'contact-fields'));

Braces +23 added lines, -6 removed lines

@@ -164,9 +164,15 @@ 
 	public function get_contact($value, array $attrs)
 	{
 		$field = $attrs['field'] ? $attrs['field'] : '';
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value)))
+		{
+			return $value;
+		}
 
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value))
+		{
+			$value = $value['id'];
+		}
 		switch($attrs['type'])
 		{
 			case 'contact-account':
@@ -178,7 +184,11 @@ 
 				// fall-through
 			case 'contact-value':
 			default:
-				if (substr($value,0,12) == 'addressbook:') $value = substr($value,12);	// link-entry syntax
+				if (substr($value,0,12) == 'addressbook:')
+				{
+					$value = substr($value,12);
+				}
+				// link-entry syntax
 				if (!($contact = $this->contacts->read($value)))
 				{
 					$contact = array();
@@ -205,7 +215,7 @@ 
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
  	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
-	{
+ 	{
 		//echo "<p>contact_widget::pre_process('$name','$value',".print_r($cell,true).",...)</p>\n";
 		switch($type = $cell['type'])
 		{
@@ -226,7 +236,11 @@ 
 				// fall-throught
 			case 'contact-value':
 			default:
-				if (substr($value,0,12) == 'addressbook:') $value = substr($value,12);	// link-entry syntax
+				if (substr($value,0,12) == 'addressbook:')
+				{
+					$value = substr($value,12);
+				}
+				// link-entry syntax
 				if (!$value || !$cell['size'] || (!is_array($this->contact) ||
 					!($this->contact['id'] == $value || 'account:'.$this->contact['account_id'] == $value)) &&
 					!($this->contact = $this->contacts->read($value)))
@@ -242,7 +256,10 @@ 
 				{
 					$name = $this->contact[$type];
 					$cell['type'] = 'template';
-					if (($prefix = $cell['label'])) $name = strpos($prefix,'%s') !== false ? str_replace('%s',$name,$prefix) : $prefix.$name;
+					if (($prefix = $cell['label']))
+					{
+						$name = strpos($prefix,'%s') !== false ? str_replace('%s',$name,$prefix) : $prefix.$name;
+					}
 					$cell['obj'] = new etemplate($name,$tmpl->as_array());
 					return false;
 				}

etemplate/inc/class.db_tools.inc.php

Doc Comments +4 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
 	/**
 	 * table editor (and the callback/submit-method too)
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	function edit(array $content=null,$msg = '')
 	{
@@ -390,7 +389,7 @@ 
 	 * @param string $col column name
 	 * @param array $index ix or uc array of table-defintion
 	 * @param string &$options db specific options
-	 * @return True if $col has a single index
+	 * @return boolean if $col has a single index
 	 */
 	function has_single_index($col,$index,&$options)
 	{
@@ -942,7 +941,7 @@ 
 	 * unsets all keys in an array which have a given value
 	 *
 	 * @param array &$arr
-	 * @param mixed $val value to check against
+	 * @param mixed $value value to check against
 	 */
 	function remove_from_array(&$arr,$value)
 	{
@@ -1138,6 +1137,7 @@ 
 	/**
 	 * creates file header
 	 *
+	 * @param string $app
 	 */
 	function setup_header($app)
 	{

Spacing +158 added lines, -158 removed lines

@@ -113,7 +113,7 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	function edit(array $content=null,$msg = '')
+	function edit(array $content = null, $msg = '')
 	{
 		if (is_array($content))
 		{
@@ -121,15 +121,15 @@ 
 			{
 				echo "content ="; _debug_array($content);
 			}
-			$this->app = $content['app'];	// this is what the user selected
+			$this->app = $content['app']; // this is what the user selected
 			$this->table = $content['table_name'];
-			$posted_app = $content['posted_app'];	// this is the old selection
+			$posted_app = $content['posted_app']; // this is the old selection
 			$posted_table = $content['posted_table'];
 		}
-		if ($posted_app && $posted_table &&		// user changed app or table
+		if ($posted_app && $posted_table && // user changed app or table
 			 ($posted_app != $this->app || $posted_table != $this->table))
 		{
-			if ($this->needs_save('',$posted_app,$posted_table,$this->content2table($content)))
+			if ($this->needs_save('', $posted_app, $posted_table, $this->content2table($content)))
 			{
 				return;
 			}
@@ -142,9 +142,9 @@ 
 		}
 		else
 		{
-			$this->read($this->app,$this->data);
+			$this->read($this->app, $this->data);
 
-			foreach($this->data as $name => $table)
+			foreach ($this->data as $name => $table)
 			{
 				$table_names[$name] = $name;
 			}
@@ -152,7 +152,7 @@ 
 		if (!$this->table || $this->app != $posted_app)
 		{
 			reset($this->data);
-			list($this->table) = each($this->data);	// use first table
+			list($this->table) = each($this->data); // use first table
 		}
 		elseif ($this->app == $posted_app && $posted_table)
 		{
@@ -160,7 +160,7 @@ 
 		}
 		if ($content['write_tables'])
 		{
-			if ($this->needs_save('',$this->app,$this->table,$this->data[$posted_table]))
+			if ($this->needs_save('', $this->app, $this->table, $this->data[$posted_table]))
 			{
 				return;
 			}
@@ -170,7 +170,7 @@ 
 		{
 			list($col) = each($content['delete']);
 			@reset($this->data[$posted_table]['fd']);
-			while ($col-- > 0 && list($key) = @each($this->data[$posted_table]['fd'])) ;
+			while ($col-- > 0 && list($key) = @each($this->data[$posted_table]['fd']));
 			unset($this->data[$posted_table]['fd'][$key]);
 			$this->changes[$posted_table][$key] = '**deleted**';
 		}
@@ -191,26 +191,26 @@ 
 			elseif ($content['add_table'])
 			{
 				$this->table = $content['new_table_name'];
-				$this->data[$this->table] = array('fd' => array(),'pk' =>array(),'ix' => array(),'uc' => array(),'fk' => array());
+				$this->data[$this->table] = array('fd' => array(), 'pk' =>array(), 'ix' => array(), 'uc' => array(), 'fk' => array());
 				$msg .= lang('New table created');
 			}
 			else // import
 			{
-				$oProc =& CreateObject('phpgwapi.schema_proc',$GLOBALS['egw_info']['server']['db_type']);
-				if (method_exists($oProc,'GetTableDefinition'))
+				$oProc = & CreateObject('phpgwapi.schema_proc', $GLOBALS['egw_info']['server']['db_type']);
+				if (method_exists($oProc, 'GetTableDefinition'))
 				{
 					$this->data[$this->table = $content['new_table_name']] = $oProc->GetTableDefinition($content['new_table_name']);
 				}
 				else	// to support eGW 1.0
 				{
 					$oProc->m_odb = clone($GLOBALS['egw']->db);
-					$oProc->m_oTranslator->_GetColumns($oProc,$content['new_table_name'],$nul);
+					$oProc->m_oTranslator->_GetColumns($oProc, $content['new_table_name'], $nul);
 
-					while (list($key,$tbldata) = each ($oProc->m_oTranslator->sCol))
+					while (list($key, $tbldata) = each($oProc->m_oTranslator->sCol))
 					{
 						$cols .= $tbldata;
 					}
-					eval('$cols = array('. $cols . ');');
+					eval('$cols = array('.$cols.');');
 
 					$this->data[$this->table = $content['new_table_name']] = array(
 						'fd' => $cols,
@@ -243,14 +243,14 @@ 
 			'table_name' => $table_names,
 			'type' => $this->types,
 		);
-		foreach(self::$meta_types as $value => $title)
+		foreach (self::$meta_types as $value => $title)
 		{
 			$sel_options['meta'][$value] = $value ? array(
 				'label' => $value,
 				'title' => $title,
 			) : $title;
 		}
-		foreach($this->data[$this->table]['fd'] as $col => $data)
+		foreach ($this->data[$this->table]['fd'] as $col => $data)
 		{
 			$meta = $title = $data['meta'];
 			if (empty($meta)) continue;
@@ -269,7 +269,7 @@ 
 		}
 		if ($this->table != '' && isset($this->data[$this->table]))
 		{
-			$content += $this->table2content($this->data[$this->table],$sel_options['Index'],$add_index);
+			$content += $this->table2content($this->data[$this->table], $sel_options['Index'], $add_index);
 		}
 		$no_button = array( );
 		if (!$this->app || !$this->table)
@@ -281,8 +281,8 @@ 
 			echo 'editor.edit: content ='; _debug_array($content);
 		}
 		$tpl = new etemplate('etemplate.db-tools.edit');
-		$tpl->exec('etemplate.db_tools.edit',$content,$sel_options,$no_button,
-			array('posted_table' => $this->table,'posted_app' => $this->app,'changes' => $this->changes));
+		$tpl->exec('etemplate.db_tools.edit', $content, $sel_options, $no_button,
+			array('posted_table' => $this->table, 'posted_app' => $this->app, 'changes' => $this->changes));
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 * @param array $edited_table the edited table-definitions
 	 * @return only if no changes
 	 */
-	function needs_save($cont='',$posted_app='',$posted_table='',$edited_table='',$msg='')
+	function needs_save($cont = '', $posted_app = '', $posted_table = '', $edited_table = '', $msg = '')
 	{
 		//echo "<p>db_tools::needs_save(cont,'$posted_app','$posted_table',edited_table,'$msg')</p> cont=\n"; _debug_array($cont); echo "edited_table="; _debug_array($edited_table);
 		if (!$posted_app && is_array($cont))
@@ -303,27 +303,27 @@ 
 			{
 				$this->app   = $cont['app'];
 				$this->table = $cont['table'];
-				$this->read($this->app,$this->data);
+				$this->read($this->app, $this->data);
 				$this->data[$this->table] = $cont['edited_table'];
 				$this->changes = $cont['changes'];
 				if ($cont['new_version'])
 				{
-					$this->update($this->app,$this->data,$cont['new_version']);
+					$this->update($this->app, $this->data, $cont['new_version']);
 				}
 				else
 				{
-					foreach($this->data as $tname => $tinfo)
+					foreach ($this->data as $tname => $tinfo)
 					{
-						$tables .= ($tables ? ',' : '') . "'$tname'";
+						$tables .= ($tables ? ',' : '')."'$tname'";
 					}
-					$this->setup_version($this->app,'',$tables);
+					$this->setup_version($this->app, '', $tables);
 				}
-				if (!$this->write($this->app,$this->data))
+				if (!$this->write($this->app, $this->data))
 				{
-					$this->app = $cont['new_app'];	// these are the ones, the users whiches to change too
+					$this->app = $cont['new_app']; // these are the ones, the users whiches to change too
 					$this->table = $cont['new_table'];
 
-					return $this->needs_save('',$cont['app'],$cont['table'],$cont['edited_table'],
+					return $this->needs_save('', $cont['app'], $cont['table'], $cont['edited_table'],
 						lang('Error: writing file (no write-permission for the webserver) !!!'));
 				}
 				$msg = lang('File writen');
@@ -332,28 +332,28 @@ 
 			// return to edit with everything set, so the user gets the table he asked for
 			$this->edit(array(
 				'app' => $cont['new_app'],
-				'table_name' => $cont['app']==$cont['new_app'] ? $cont['new_table'] : '',
+				'table_name' => $cont['app'] == $cont['new_app'] ? $cont['new_table'] : '',
 				'posted_app' => $cont['new_app']
-			),$msg);
+			), $msg);
 
 			return True;
 		}
-		$new_app   = $this->app;	// these are the ones, the users whiches to change too
+		$new_app   = $this->app; // these are the ones, the users whiches to change too
 		$new_table = $this->table;
 
 		$this->app = $posted_app;
 		$this->data = array();
-		$this->read($posted_app,$this->data);
+		$this->read($posted_app, $this->data);
 
 		if (isset($this->data[$posted_table]) &&
-			 $this->tables_identical($this->data[$posted_table],$edited_table))
+			 $this->tables_identical($this->data[$posted_table], $edited_table))
 		{
 			if ($new_app != $this->app)	// are we changeing the app, or hit the user just write
 			{
-				$this->app = $new_app;	// if we change init the data empty
+				$this->app = $new_app; // if we change init the data empty
 				$this->data = array();
 			}
-			return False;	// continue edit
+			return False; // continue edit
 		}
 		$content = array(
 			'msg' => $msg,
@@ -367,10 +367,10 @@ 
 			'edited_table' => $edited_table,
 			'changes' => $this->changes
 		);
-		$new_version = explode('.',$content['version']);
-		$minor = count($new_version)-1;
-		$new_version[$minor] = sprintf('%03d',1+$new_version[$minor]);
-		$content['new_version'] = implode('.',$new_version);
+		$new_version = explode('.', $content['version']);
+		$minor = count($new_version) - 1;
+		$new_version[$minor] = sprintf('%03d', 1 + $new_version[$minor]);
+		$content['new_version'] = implode('.', $new_version);
 
 		$tmpl = new etemplate('etemplate.db-tools.ask_save');
 
@@ -379,9 +379,9 @@ 
 			$tmpl->disable_cells('version');
 			$tmpl->disable_cells('new_version');
 		}
-		$tmpl->exec('etemplate.db_tools.needs_save',$content,array(),array(),$preserv);
+		$tmpl->exec('etemplate.db_tools.needs_save', $content, array(), array(), $preserv);
 
-		return True;	// dont continue in edit
+		return True; // dont continue in edit
 	}
 
 	/**
@@ -392,19 +392,19 @@ 
 	 * @param string &$options db specific options
 	 * @return True if $col has a single index
 	 */
-	function has_single_index($col,$index,&$options)
+	function has_single_index($col, $index, &$options)
 	{
-		foreach($index as $in)
+		foreach ($index as $in)
 		{
 			if ($in == $col || is_array($in) && $in[0] == $col && !isset($in[1]))
 			{
 				if ($in != $col && isset($in['options']))
 				{
-					foreach($in['options'] as $db => $opts)
+					foreach ($in['options'] as $db => $opts)
 					{
-						$options[] = $db.'('.(is_array($opts)?implode(',',$opts):$opts).')';
+						$options[] = $db.'('.(is_array($opts) ? implode(',', $opts) : $opts).')';
 					}
-					$options = implode(', ',$options);
+					$options = implode(', ', $options);
 				}
 				return True;
 			}
@@ -420,7 +420,7 @@ 
 	 * @param bool $extra_index add an additional index-row
 	 * @return array content-array to call exec with
 	 */
-	function table2content($table,&$columns,$extra_index=False)
+	function table2content($table, &$columns, $extra_index = False)
 	{
 		if ($this->debug >= 3)
 		{
@@ -428,16 +428,16 @@ 
 		}
 		$content = $columns = array();
 		$n = 1;
-		foreach($table['fd'] as $col_name => $col_defs)
+		foreach ($table['fd'] as $col_name => $col_defs)
 		{
 			$col_defs['name'] = $col_name;
-			$col_defs['pk'] = in_array($col_name,$table['pk']);
-			$col_defs['uc']  = $this->has_single_index($col_name,$table['uc'],$col_defs['options']);
-			$col_defs['ix'] = $this->has_single_index($col_name,$table['ix'],$col_defs['options']);
+			$col_defs['pk'] = in_array($col_name, $table['pk']);
+			$col_defs['uc'] = $this->has_single_index($col_name, $table['uc'], $col_defs['options']);
+			$col_defs['ix'] = $this->has_single_index($col_name, $table['ix'], $col_defs['options']);
 			$col_defs['fk'] = $table['fk'][$col_name];
 			if (isset($col_defs['default']) && $col_defs['default'] == '')
 			{
-				$col_defs['default'] = is_int($col_defs['default']) ? '0' : "''";	// spezial value for empty, but set, default
+				$col_defs['default'] = is_int($col_defs['default']) ? '0' : "''"; // spezial value for empty, but set, default
 			}
 			$col_defs['notnull'] = isset($col_defs['nullable']) && !$col_defs['nullable'];
 
@@ -448,17 +448,17 @@ 
 			$columns[$n++] = $col_name;
 		}
 		$n = 2;
-		foreach(array('uc','ix') as $type)
+		foreach (array('uc', 'ix') as $type)
 		{
-			foreach($table[$type] as $index)
+			foreach ($table[$type] as $index)
 			{
 				if (is_array($index) && isset($index[1]))	// multicolum index
 				{
 					$content['Index'][$n]['unique'] = $type == 'uc';
 					$content['Index'][$n]['n'] = $n - 1;
-					foreach($index as $col)
+					foreach ($index as $col)
 					{
-						$content['Index'][$n][] = array_search($col,$columns);
+						$content['Index'][$n][] = array_search($col, $columns);
 					}
 					++$n;
 				}
@@ -466,7 +466,7 @@ 
 		}
 		if ($extra_index)
 		{
-			$content['Index'][$n]['n'] = $n-1;
+			$content['Index'][$n]['n'] = $n - 1;
 		}
 		if ($this->debug >= 3)
 		{
@@ -488,28 +488,28 @@ 
 	{
 		if (!is_array($this->data))
 		{
-			$this->read($content['posted_app'],$this->data);
+			$this->read($content['posted_app'], $this->data);
 		}
 		$old_cols = $this->data[$posted_table = $content['posted_table']]['fd'];
 		$this->changes = $content['changes'];
 
 		$table = array();
-		$table['fd'] = array();	// do it in the default order of tables_*
+		$table['fd'] = array(); // do it in the default order of tables_*
 		$table['pk'] = array();
 		$table['fk'] = array();
 		$table['ix'] = array();
 		$table['uc'] = array();
-		for (reset($content),$n = 1; isset($content["Row$n"]); ++$n)
+		for (reset($content), $n = 1; isset($content["Row$n"]); ++$n)
 		{
 			$col = $content["Row$n"];
 
 			if ($col['type'] == 'auto')	// auto columns are the primary key and not null!
 			{
-				$col['pk'] = $col['notnull'] = true;	// set it, in case the user forgot
+				$col['pk'] = $col['notnull'] = true; // set it, in case the user forgot
 			}
 
-			while ((list($old_name,$old_col) = @each($old_cols)) &&
-						 $this->changes[$posted_table][$old_name] == '**deleted**') ;
+			while ((list($old_name, $old_col) = @each($old_cols)) &&
+						 $this->changes[$posted_table][$old_name] == '**deleted**');
 
 			if (($name = $col['name']) != '')		// ignoring lines without column-name
 			{
@@ -528,7 +528,7 @@ 
 						case 'varchar': $col['precision'] = 255; break;
 					}
 				}
-				foreach($col as $prop => $val)
+				foreach ($col as $prop => $val)
 				{
 					switch ($prop)
 					{
@@ -540,7 +540,7 @@ 
 						case 'comment':
 							if ($val != '')
 							{
-								$table['fd'][$name][$prop] = $prop=='default'&& $val=="''" ? '' : $val;
+								$table['fd'][$name][$prop] = $prop == 'default' && $val == "''" ? '' : $val;
 							}
 							break;
 						case 'notnull':
@@ -557,9 +557,9 @@ 
 								if ($col['options'])
 								{
 									$opts = array();
-									foreach(explode(',',$col['options']) as $opt)
+									foreach (explode(',', $col['options']) as $opt)
 									{
-										list($db,$opt) = preg_split('/[(:)]/',$opt);
+										list($db, $opt) = preg_split('/[(:)]/', $opt);
 										$opts[$db] = is_numeric($opt) ? intval($opt) : $opt;
 									}
 									$table[$prop][] = array(
@@ -584,10 +584,10 @@ 
 				$num2col[$n] = $col['name'];
 			}
 		}
-		foreach($content['Index'] as $n => $index)
+		foreach ($content['Index'] as $n => $index)
 		{
 			$idx_arr = array();
-			foreach($index as $key => $num)
+			foreach ($index as $key => $num)
 			{
 				if (is_numeric($key) && $num && @$num2col[$num])
 				{
@@ -620,7 +620,7 @@ 
 	 * @param array &$phpgw_baseline where to return the data
 	 * @return boolean True if file found, False else
 	 */
-	function read($app,&$phpgw_baseline)
+	function read($app, &$phpgw_baseline)
 	{
 		$file = EGW_SERVER_ROOT."/$app/setup/tables_current.inc.php";
 
@@ -650,21 +650,21 @@ 
 	 * @param string $parent
 	 * @return string
 	 */
-	function write_array($arr,$depth,$parent='')
+	function write_array($arr, $depth, $parent = '')
 	{
-		if (in_array($parent,array('pk','fk','ix','uc')))
+		if (in_array($parent, array('pk', 'fk', 'ix', 'uc')))
 		{
 			$depth = 0;
 		}
 		if ($depth)
 		{
-			$tabs = "\n".str_repeat("\t",$depth-1);
+			$tabs = "\n".str_repeat("\t", $depth - 1);
 			++$depth;
 		}
 		$def = 'array('.$tabs.($tabs ? "\t" : '');
 
 		$n = 0;
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if (!is_int($key))
 			{
@@ -685,7 +685,7 @@ 
 			}
 			if (is_array($val))
 			{
-				$def .= $this->write_array($val,$parent == 'fd' ? 0 : $depth,$key);
+				$def .= $this->write_array($val, $parent == 'fd' ? 0 : $depth, $key);
 			}
 			else
 			{
@@ -702,7 +702,7 @@ 
 					$def .= "'".addslashes($val)."'";
 				}
 			}
-			if ($n < count($arr)-1)
+			if ($n < count($arr) - 1)
 			{
 				$def .= ','.$tabs.($tabs ? "\t" : '');
 			}
@@ -720,47 +720,47 @@ 
 	 * @param array $phpgw_baseline tabledefinitions
 	 * @return boolean True if file writen else False
 	 */
-	function write($app,$phpgw_baseline)
+	function write($app, $phpgw_baseline)
 	{
 		$file = EGW_SERVER_ROOT."/$app/setup/tables_current.inc.php";
 
-		if (file_exists($file) && ($f = fopen($file,'r')))
+		if (file_exists($file) && ($f = fopen($file, 'r')))
 		{
-			$header = fread($f,filesize($file));
-			if ($end = strpos($header,');'))
+			$header = fread($f, filesize($file));
+			if ($end = strpos($header, ');'))
 			{
-				$footer = substr($header,$end+3);	// this preservs other stuff, which should not be there
+				$footer = substr($header, $end + 3); // this preservs other stuff, which should not be there
 			}
-			$header = substr($header,0,strpos($header,'$phpgw_baseline'));
+			$header = substr($header, 0, strpos($header, '$phpgw_baseline'));
 			fclose($f);
 
 			if (is_writable(EGW_SERVER_ROOT."/$app/setup"))
 			{
-				$old_file = EGW_SERVER_ROOT . "/$app/setup/tables_current.old.inc.php";
+				$old_file = EGW_SERVER_ROOT."/$app/setup/tables_current.old.inc.php";
 				if (file_exists($old_file))
 				{
 					unlink($old_file);
 				}
-				rename($file,$old_file);
+				rename($file, $old_file);
 			}
-			while ($header[strlen($header)-1] == "\t")
+			while ($header[strlen($header) - 1] == "\t")
 			{
-				$header = substr($header,0,strlen($header)-1);
+				$header = substr($header, 0, strlen($header) - 1);
 			}
 		}
 		if (!$header)
 		{
-			$header = $this->setup_header($this->app) . "\n\n";
+			$header = $this->setup_header($this->app)."\n\n";
 		}
-		if (!is_writeable(EGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file,'w')))
+		if (!is_writeable(EGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file, 'w')))
 		{
 			return False;
 		}
 		$def .= "\$phpgw_baseline = ";
-		$def .= $this->write_array($phpgw_baseline,1);
+		$def .= $this->write_array($phpgw_baseline, 1);
 		$def .= ";\n";
 
-		fwrite($f,$header . $def . $footer);
+		fwrite($f, $header.$def.$footer);
 		fclose($f);
 
 		return True;
@@ -773,7 +773,7 @@ 
 	 * @param string $tables new tables to include (comma delimited), if != ''
 	 * @return the version or False if the file could not be read or written
 	 */
-	function setup_version($app,$new = '',$tables='')
+	function setup_version($app, $new = '', $tables = '')
 	{
 		//echo "<p>etemplate.db_tools.setup_version('$app','$new','$tables')</p>\n";
 
@@ -787,51 +787,51 @@ 
 			return False;
 		}
 		if (($new == '' || $setup_info[$app]['version'] == $new) &&
-				(!$tables || $setup_info[$app]['tables'] && "'".implode("','",$setup_info[$app]['tables'])."'" == $tables))
+				(!$tables || $setup_info[$app]['tables'] && "'".implode("','", $setup_info[$app]['tables'])."'" == $tables))
 		{
-			return $setup_info[$app]['version'];	// no change requested or not necessary
+			return $setup_info[$app]['version']; // no change requested or not necessary
 		}
 		if ($new == '')
 		{
 			$new = $setup_info[$app]['version'];
 		}
-		if (!($f = fopen($file,'r')))
+		if (!($f = fopen($file, 'r')))
 		{
 			return False;
 		}
-		$fcontent = fread($f,filesize($file));
-		fclose ($f);
+		$fcontent = fread($f, filesize($file));
+		fclose($f);
 
 		$app_pattern = "'$app'";
-		if (preg_match("/define\('([^']+)',$app_pattern\)/",$fcontent,$matches))
+		if (preg_match("/define\('([^']+)',$app_pattern\)/", $fcontent, $matches))
 		{
 			$app_pattern = $matches[1];
 		}
 		if (is_writable(EGW_SERVER_ROOT."/$app/setup"))
 		{
-			$old_file = EGW_SERVER_ROOT . "/$app/setup/setup.old.inc.php";
+			$old_file = EGW_SERVER_ROOT."/$app/setup/setup.old.inc.php";
 			if (file_exists($old_file))
 			{
 				unlink($old_file);
 			}
-			rename($file,$old_file);
+			rename($file, $old_file);
 		}
-		$fnew = preg_replace('/(.*\\$'."setup_info\\[$app_pattern\\]\\['version'\\][ \\t]*=[ \\t]*)'[^']*'(.*)/i","\\1'$new'\\2",$fcontent);
+		$fnew = preg_replace('/(.*\\$'."setup_info\\[$app_pattern\\]\\['version'\\][ \\t]*=[ \\t]*)'[^']*'(.*)/i", "\\1'$new'\\2", $fcontent);
 
 		if ($tables != '')
 		{
 			if (isset($setup_info[$app]['tables']))	// if there is already tables array, update it
 			{
-				$fnew = preg_replace('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*/i","\\1$tables",$fwas=$fnew);
+				$fnew = preg_replace('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*/i", "\\1$tables", $fwas = $fnew);
 
 				if ($fwas == $fnew)	// nothing changed => tables are in single lines
 				{
-					$fwas = explode("\n",$fwas);
+					$fwas = explode("\n", $fwas);
 					$fnew = $prefix = '';
-					$stage = 0;	// 0 = before, 1 = in, 2 = after tables section
-					foreach($fwas as $line)
+					$stage = 0; // 0 = before, 1 = in, 2 = after tables section
+					foreach ($fwas as $line)
 					{
-						if (preg_match('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\]\\[[ \\t]*\\][ \\t]*=[ \\t]*)'/i",$line,$parts))
+						if (preg_match('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\]\\[[ \\t]*\\][ \\t]*=[ \\t]*)'/i", $line, $parts))
 						{
 							if ($stage == 0)	// first line of tables-section
 							{
@@ -843,16 +843,16 @@ 
 						{
 							if ($stage == 1)	// first line after tables-section ==> add it
 							{
-								$tables = explode(',',$tables);
+								$tables = explode(',', $tables);
 								foreach ($tables as $table)
 								{
-									$fnew .= $prefix . $table . ";\n";
+									$fnew .= $prefix.$table.";\n";
 								}
 								$stage = 2;
 							}
-							if (strpos($line,'?>') === False)	// dont write the closeing tag
+							if (strpos($line, '?>') === False)	// dont write the closeing tag
 							{
-								$fnew .= $line . "\n";
+								$fnew .= $line."\n";
 							}
 						}
 					}
@@ -860,18 +860,18 @@ 
 			}
 			else	// add the tables array
 			{
-				if (strpos($fnew,'?>') !== false)	// remove a closeing tag
+				if (strpos($fnew, '?>') !== false)	// remove a closeing tag
 				{
-					$fnew = str_replace('?>','',$fnew);
+					$fnew = str_replace('?>', '', $fnew);
 				}
 				$fnew .= "\t\$setup_info[$app_pattern]['tables'] = array($tables);\n";
 			}
 		}
-		if (!is_writeable(EGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file,'w')))
+		if (!is_writeable(EGW_SERVER_ROOT."/$app/setup") || !($f = fopen($file, 'w')))
 		{
 			return False;
 		}
-		fwrite($f,$fnew);
+		fwrite($f, $fnew);
 		fclose($f);
 
 		return $new;
@@ -885,7 +885,7 @@ 
 	 * @param string $version new version
 	 * @return boolean True if file writen else False
 	 */
-	function update($app,$current,$version)
+	function update($app, $current, $version)
 	{
 		//echo "<p>etemplate.db_tools.update('$app',...,'$version')</p>\n";
 		if (!is_writable(EGW_SERVER_ROOT."/$app/setup"))
@@ -896,20 +896,20 @@ 
 		$file_update   = EGW_SERVER_ROOT."/$app/setup/tables_update.inc.php";
 
 		$old_version = $this->setup_version($app);
-		$old_version_ = str_replace('.','_',$old_version);
+		$old_version_ = str_replace('.', '_', $old_version);
 
 		if (file_exists($file_update))
 		{
-			$f = fopen($file_update,'r');
-			$update = fread($f,filesize($file_update));
-			$update = str_replace('?>','',$update);
+			$f = fopen($file_update, 'r');
+			$update = fread($f, filesize($file_update));
+			$update = str_replace('?>', '', $update);
 			fclose($f);
-			$old_file = EGW_SERVER_ROOT . "/$app/setup/tables_update.old.inc.php";
+			$old_file = EGW_SERVER_ROOT."/$app/setup/tables_update.old.inc.php";
 			if (file_exists($old_file))
 			{
 				unlink($old_file);
 			}
-			rename($file_update,$old_file);
+			rename($file_update, $old_file);
 		}
 		else
 		{
@@ -919,21 +919,21 @@ 
 function $app"."_upgrade$old_version_()
 {\n";
 
-			$update .= $this->update_schema($app,$current,$tables);
+			$update .= $this->update_schema($app, $current, $tables);
 
 			$update .= "
 	return \$GLOBALS['setup_info']['$app']['currentver'] = '$version';
 }
 \n";
-		if (!($f = fopen($file_update,'w')))
+		if (!($f = fopen($file_update, 'w')))
 		{
 			//echo "<p>Cant open '$update' for writing !!!</p>\n";
 			return False;
 		}
-		fwrite($f,$update);
+		fwrite($f, $update);
 		fclose($f);
 
-		$this->setup_version($app,$version,$tables);
+		$this->setup_version($app, $version, $tables);
 
 		return True;
 	}
@@ -944,9 +944,9 @@ 
 	 * @param array &$arr
 	 * @param mixed $val value to check against
 	 */
-	function remove_from_array(&$arr,$value)
+	function remove_from_array(&$arr, $value)
 	{
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if ($val == $value)
 			{
@@ -963,12 +963,12 @@ 
 	 * @param string &$tables returns comma delimited list of new table-names
 	 * @return string the update-script
 	 */
-	function update_schema($app,$current,&$tables)
+	function update_schema($app, $current, &$tables)
 	{
-		$this->read($app,$old);
+		$this->read($app, $old);
 
 		$tables = '';
-		foreach($old as $name => $table_def)
+		foreach ($old as $name => $table_def)
 		{
 			if (!isset($current[$name]))	// table $name droped
 			{
@@ -976,22 +976,22 @@ 
 			}
 			else
 			{
-				$tables .= ($tables ? ',' : '') . "'$name'";
+				$tables .= ($tables ? ',' : '')."'$name'";
 
 				$new_table_def = $table_def;
-				foreach($table_def['fd'] as $col => $col_def)
+				foreach ($table_def['fd'] as $col => $col_def)
 				{
 					if (!isset($current[$name]['fd'][$col]))	// column $col droped
 					{
 						if (!isset($this->changes[$name][$col]) || $this->changes[$name][$col] == '**deleted**')
 						{
 							unset($new_table_def['fd'][$col]);
-							$this->remove_from_array($new_table_def['pk'],$col);
-							$this->remove_from_array($new_table_def['fk'],$col);
-							$this->remove_from_array($new_table_def['ix'],$col);
-							$this->remove_from_array($new_table_def['uc'],$col);
+							$this->remove_from_array($new_table_def['pk'], $col);
+							$this->remove_from_array($new_table_def['fk'], $col);
+							$this->remove_from_array($new_table_def['ix'], $col);
+							$this->remove_from_array($new_table_def['uc'], $col);
 							$update .= "\t\$GLOBALS['egw_setup']->oProc->DropColumn('$name',";
-							$update .= $this->write_array($new_table_def,2).",'$col');\n";
+							$update .= $this->write_array($new_table_def, 2).",'$col');\n";
 						}
 						else	// column $col renamed
 						{
@@ -1002,25 +1002,25 @@ 
 				}
 				if (is_array($this->changes[$name]))
 				{
-					foreach($this->changes[$name] as $col => $new_col)
+					foreach ($this->changes[$name] as $col => $new_col)
 					{
 						if ($new_col != '**deleted**')
 						{
-							$old[$name]['fd'][$new_col] = $old[$name]['fd'][$col];	// to be able to detect further changes of the definition
+							$old[$name]['fd'][$new_col] = $old[$name]['fd'][$col]; // to be able to detect further changes of the definition
 							unset($old[$name]['fd'][$col]);
 						}
 					}
 				}
 			}
 		}
-		foreach($current as $name => $table_def)
+		foreach ($current as $name => $table_def)
 		{
 			if (!isset($old[$name]))	// table $name added
 			{
-				$tables .= ($tables ? ',' : '') . "'$name'";
+				$tables .= ($tables ? ',' : '')."'$name'";
 
 				$update .= "\t\$GLOBALS['egw_setup']->oProc->CreateTable('$name',";
-				$update .= $this->write_array($table_def,2).");\n";
+				$update .= $this->write_array($table_def, 2).");\n";
 			}
 			else
 			{
@@ -1032,20 +1032,20 @@ 
 				// check if the indices are changed and refresh the table if so
 				$do_refresh = serialize($old_norm) != serialize($new_norm);
 				// we comment out the Add or AlterColumn code as it is not needed, but might be useful for more complex updates
-				foreach($table_def['fd'] as $col => $col_def)
+				foreach ($table_def['fd'] as $col => $col_def)
 				{
-					if (($add = !isset($old[$name]['fd'][$col])) ||	// column $col added
+					if (($add = !isset($old[$name]['fd'][$col])) || // column $col added
 						 serialize($old_norm_fd[$col]) != serialize($new_norm_fd[$col])) // column definition altered
 					{
 						$update .= "\t".($do_refresh ? "/* done by RefreshTable() anyway\n\t" : '').
 							"\$GLOBALS['egw_setup']->oProc->".($add ? 'Add' : 'Alter')."Column('$name','$col',";
-						$update .= $this->write_array($col_def,2) . ');' . ($do_refresh ? '*/' : '') . "\n";
+						$update .= $this->write_array($col_def, 2).');'.($do_refresh ? '*/' : '')."\n";
 					}
 				}
 				if ($do_refresh)
 				{
 					$update .= "\t\$GLOBALS['egw_setup']->oProc->RefreshTable('$name',";
-					$update .= $this->write_array($table_def,2).");\n";
+					$update .= $this->write_array($table_def, 2).");\n";
 				}
 			}
 		}
@@ -1063,12 +1063,12 @@ 
 	 * @param array $cols array with column-defs (col-name is the key)
 	 * @return array the new array of indices
 	 */
-	function normalize_index($index,$cols)
+	function normalize_index($index, $cols)
 	{
 		$normalized = array();
-		foreach($cols as $col => $data)
+		foreach ($cols as $col => $data)
 		{
-			foreach($index as $n => $idx)
+			foreach ($index as $n => $idx)
 			{
 				if ($idx == $col || is_array($idx) && $idx[0] == $col && !isset($idx[1]))
 				{
@@ -1078,7 +1078,7 @@ 
 				}
 			}
 		}
-		foreach($index as $idx)
+		foreach ($index as $idx)
 		{
 			$normalized[] = $idx;
 		}
@@ -1095,12 +1095,12 @@ 
 	 */
 	function normalize($table)
 	{
-		foreach($table['fd'] as $col => $props)
+		foreach ($table['fd'] as $col => $props)
 		{
 			$table['fd'][$col] = array(
 				'type' => (string)$props['type'],
-				'precision' => 0+$props['precision'],
-				'scale' => 0+$props['scale'],
+				'precision' => 0 + $props['precision'],
+				'scale' => 0 + $props['scale'],
 				'nullable' => !isset($props['nullable']) || !!$props['nullable'],
 				'default' => (string)$props['default'],
 				'comment' => (string)$props['comment'],
@@ -1111,8 +1111,8 @@ 
 			'fd' => $table['fd'],
 			'pk' => $table['pk'],
 			'fk' => $table['fk'],
-			'ix' => $this->normalize_index($table['ix'],$table['fd']),
-			'uc' => $this->normalize_index($table['uc'],$table['fd'])
+			'ix' => $this->normalize_index($table['ix'], $table['fd']),
+			'uc' => $this->normalize_index($table['uc'], $table['fd'])
 		);
 	}
 
@@ -1124,7 +1124,7 @@ 
 	 * @return boolean true if they are identical (would create an identical schema), false otherwise
 	 *
 	 */
-	function tables_identical($a,$b)
+	function tables_identical($a, $b)
 	{
 		$a = serialize($this->normalize($a));
 		$b = serialize($this->normalize($b));
@@ -1148,7 +1148,7 @@ 
  * Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package '. $app. '
+ * @package '. $app.'
  * @subpackage setup
  * @version $Id'.'$
  */

Braces +68 added lines, -18 removed lines

@@ -235,10 +235,13 @@ 
 			'table_name' => $this->table,
 			'app' => $this->app,
 		);
-		if (!isset($table_names[$this->table]))	// table is not jet written
+		if (!isset($table_names[$this->table]))
+		{
+			// table is not jet written
 		{
 			$table_names[$this->table] = $this->table;
 		}
+		}
 		$sel_options = array(
 			'table_name' => $table_names,
 			'type' => $this->types,
@@ -253,7 +256,10 @@ 
 		foreach($this->data[$this->table]['fd'] as $col => $data)
 		{
 			$meta = $title = $data['meta'];
-			if (empty($meta)) continue;
+			if (empty($meta))
+			{
+				continue;
+			}
 			if (is_array($meta))
 			{
 				$this->data[$this->table]['fd'][$col]['meta'] = $meta = serialize($meta);
@@ -348,9 +354,13 @@ 
 		if (isset($this->data[$posted_table]) &&
 			 $this->tables_identical($this->data[$posted_table],$edited_table))
 		{
-			if ($new_app != $this->app)	// are we changeing the app, or hit the user just write
+			if ($new_app != $this->app)
 			{
-				$this->app = $new_app;	// if we change init the data empty
+				// are we changeing the app, or hit the user just write
+			{
+				$this->app = $new_app;
+			}
+			// if we change init the data empty
 				$this->data = array();
 			}
 			return False;	// continue edit
@@ -452,9 +462,12 @@ 
 		{
 			foreach($table[$type] as $index)
 			{
-				if (is_array($index) && isset($index[1]))	// multicolum index
+				if (is_array($index) && isset($index[1]))
+				{
+					// multicolum index
 				{
 					$content['Index'][$n]['unique'] = $type == 'uc';
+				}
 					$content['Index'][$n]['n'] = $n - 1;
 					foreach($index as $col)
 					{
@@ -503,19 +516,26 @@ 
 		{
 			$col = $content["Row$n"];
 
-			if ($col['type'] == 'auto')	// auto columns are the primary key and not null!
+			if ($col['type'] == 'auto')
 			{
-				$col['pk'] = $col['notnull'] = true;	// set it, in case the user forgot
+				// auto columns are the primary key and not null!
+			{
+				$col['pk'] = $col['notnull'] = true;
+			}
+			// set it, in case the user forgot
 			}
 
 			while ((list($old_name,$old_col) = @each($old_cols)) &&
 						 $this->changes[$posted_table][$old_name] == '**deleted**') ;
 
-			if (($name = $col['name']) != '')		// ignoring lines without column-name
+			if (($name = $col['name']) != '')
+			{
+				// ignoring lines without column-name
 			{
 				if ($col['name'] != $old_name && $n <= count($old_cols))	// column renamed --> remeber it
 				{
 					$this->changes[$posted_table][$old_name] = $col['name'];
+			}
 					//echo "<p>content2table: $posted_table.$old_name renamed to $col[name]</p>\n";
 				}
 				if ($col['precision'] <= 0)
@@ -820,50 +840,68 @@ 
 
 		if ($tables != '')
 		{
-			if (isset($setup_info[$app]['tables']))	// if there is already tables array, update it
+			if (isset($setup_info[$app]['tables']))
+			{
+				// if there is already tables array, update it
 			{
 				$fnew = preg_replace('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*/i","\\1$tables",$fwas=$fnew);
+			}
 
-				if ($fwas == $fnew)	// nothing changed => tables are in single lines
+				if ($fwas == $fnew)
+				{
+					// nothing changed => tables are in single lines
 				{
 					$fwas = explode("\n",$fwas);
+				}
 					$fnew = $prefix = '';
 					$stage = 0;	// 0 = before, 1 = in, 2 = after tables section
 					foreach($fwas as $line)
 					{
 						if (preg_match('/(.*\\$'."setup_info\\[$app_pattern\\]\\['tables'\\]\\[[ \\t]*\\][ \\t]*=[ \\t]*)'/i",$line,$parts))
 						{
-							if ($stage == 0)	// first line of tables-section
+							if ($stage == 0)
+							{
+								// first line of tables-section
 							{
 								$stage = 1;
+							}
 								$prefix = $parts[1];
 							}
 						}
 						else					// not in table-section
 						{
-							if ($stage == 1)	// first line after tables-section ==> add it
+							if ($stage == 1)
+							{
+								// first line after tables-section ==> add it
 							{
 								$tables = explode(',',$tables);
+							}
 								foreach ($tables as $table)
 								{
 									$fnew .= $prefix . $table . ";\n";
 								}
 								$stage = 2;
 							}
-							if (strpos($line,'?>') === False)	// dont write the closeing tag
+							if (strpos($line,'?>') === False)
+							{
+								// dont write the closeing tag
 							{
 								$fnew .= $line . "\n";
 							}
+							}
 						}
 					}
 				}
 			}
 			else	// add the tables array
 			{
-				if (strpos($fnew,'?>') !== false)	// remove a closeing tag
+				if (strpos($fnew,'?>') !== false)
+				{
+					// remove a closeing tag
 				{
 					$fnew = str_replace('?>','',$fnew);
 				}
+				}
 				$fnew .= "\t\$setup_info[$app_pattern]['tables'] = array($tables);\n";
 			}
 		}
@@ -970,10 +1008,13 @@ 
 		$tables = '';
 		foreach($old as $name => $table_def)
 		{
-			if (!isset($current[$name]))	// table $name droped
+			if (!isset($current[$name]))
+			{
+				// table $name droped
 			{
 				$update .= "\t\$GLOBALS['egw_setup']->oProc->DropTable('$name');\n";
 			}
+			}
 			else
 			{
 				$tables .= ($tables ? ',' : '') . "'$name'";
@@ -981,11 +1022,14 @@ 
 				$new_table_def = $table_def;
 				foreach($table_def['fd'] as $col => $col_def)
 				{
-					if (!isset($current[$name]['fd'][$col]))	// column $col droped
+					if (!isset($current[$name]['fd'][$col]))
+					{
+						// column $col droped
 					{
 						if (!isset($this->changes[$name][$col]) || $this->changes[$name][$col] == '**deleted**')
 						{
 							unset($new_table_def['fd'][$col]);
+					}
 							$this->remove_from_array($new_table_def['pk'],$col);
 							$this->remove_from_array($new_table_def['fk'],$col);
 							$this->remove_from_array($new_table_def['ix'],$col);
@@ -1015,9 +1059,12 @@ 
 		}
 		foreach($current as $name => $table_def)
 		{
-			if (!isset($old[$name]))	// table $name added
+			if (!isset($old[$name]))
+			{
+				// table $name added
 			{
 				$tables .= ($tables ? ',' : '') . "'$name'";
+			}
 
 				$update .= "\t\$GLOBALS['egw_setup']->oProc->CreateTable('$name',";
 				$update .= $this->write_array($table_def,2).");\n";
@@ -1035,10 +1082,13 @@ 
 				foreach($table_def['fd'] as $col => $col_def)
 				{
 					if (($add = !isset($old[$name]['fd'][$col])) ||	// column $col added
-						 serialize($old_norm_fd[$col]) != serialize($new_norm_fd[$col])) // column definition altered
+						 serialize($old_norm_fd[$col]) != serialize($new_norm_fd[$col]))
+					{
+						// column definition altered
 					{
 						$update .= "\t".($do_refresh ? "/* done by RefreshTable() anyway\n\t" : '').
 							"\$GLOBALS['egw_setup']->oProc->".($add ? 'Add' : 'Alter')."Column('$name','$col',";
+					}
 						$update .= $this->write_array($col_def,2) . ');' . ($do_refresh ? '*/' : '') . "\n";
 					}
 				}

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

@@ -443,7 +443,7 @@ 
 
 			$col_defs['n'] = $n;
 
-			$content["Row$n"] = $col_defs;
+			$content["row$n"] = $col_defs;
 
 			$columns[$n++] = $col_name;
 		}
@@ -499,9 +499,9 @@ 
 		$table['fk'] = array();
 		$table['ix'] = array();
 		$table['uc'] = array();
-		for (reset($content),$n = 1; isset($content["Row$n"]); ++$n)
+		for (reset($content),$n = 1; isset($content["row$n"]); ++$n)
 		{
-			$col = $content["Row$n"];
+			$col = $content["row$n"];
 
 			if ($col['type'] == 'auto')	// auto columns are the primary key and not null!
 			{

etemplate/inc/class.editor.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -1039,7 +1039,7 @@ 
 	 *
 	 * @param array &$widget reference into the widget-tree
 	 * @param array &$cell_content cell array in content
-	 * @param boolean $widget2content=true copy from widget to content or other direction
+	 * @param boolean $widget2content copy from widget to content or other direction
 	 */
 	function fix_set_onclick(&$widget,&$cell_content,$widget2content=true)
 	{
@@ -1116,7 +1116,7 @@ 
 	 *
 	 * @param array &$widget reference into the widget-tree
 	 * @param array &$cell_content cell array in content
-	 * @param boolean $widget2content=true copy from widget to content or other direction
+	 * @param boolean $widget2content copy from widget to content or other direction
 	 */
 	function fix_set_onchange(&$widget,&$cell_content,$widget2content=true)
 	{
@@ -1586,7 +1586,6 @@ 
 	 * extensions are class-files in $app/inc/class.${name}_widget.inc.php
 	 * the extensions found will be saved in a class-var and in the session
 	 *
-	 * @param string $app='etemplate' app to scan
 	 * @return string comma delimited list of new found extensions
 	 */
 	function scan_for_extensions($app='etemplate')

Spacing +261 added lines, -262 removed lines

@@ -97,8 +97,7 @@ 
 	);
 	var $extensions = '';
 
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'edit'         => True,
 		'widget'       => True,
 		'styles'       => True,
@@ -108,15 +107,15 @@ 
 	{
 		$this->etemplate = new etemplate();
 
-		$this->extensions = $GLOBALS['egw']->session->appsession('extensions','etemplate');
+		$this->extensions = $GLOBALS['egw']->session->appsession('extensions', 'etemplate');
 	}
 
-	function export_xml(&$xml,&$xml_label)
+	function export_xml(&$xml, &$xml_label)
 	{
 		$name = $this->etemplate->name;
 		$template = $this->etemplate->template != '' ? $this->etemplate->template : 'default';
 
-		list($app) = explode('.',$name);
+		list($app) = explode('.', $name);
 
 		if (!is_object($this->etemplate->xul_io))
 		{
@@ -124,15 +123,15 @@ 
 		}
 		$xml = $this->etemplate->xul_io->export($this->etemplate);
 
-		$dir = EGW_SERVER_ROOT . "/$app/templates/$template";
+		$dir = EGW_SERVER_ROOT."/$app/templates/$template";
 		if (($create_it = !is_dir($dir)))
 		{
-			$dir = EGW_SERVER_ROOT . "/$app/templates";
+			$dir = EGW_SERVER_ROOT."/$app/templates";
 		}
 		if (!is_writeable($dir))
 		{
 			// if dir is not writable, download file
-			html::content_header($name.'.xet','application/xml',bytes($xml));
+			html::content_header($name.'.xet', 'application/xml', bytes($xml));
 			echo $xml;
 			common::egw_exit();
 			//return lang("Error: webserver is not allowed to write into '%1' !!!",$dir);
@@ -141,12 +140,12 @@ 
 		{
 			mkdir($dir .= "/$template");
 		}
-		$file = $dir . '/' . substr($name,strlen($app)+1);
+		$file = $dir.'/'.substr($name, strlen($app) + 1);
 		if ($this->etemplate->lang)
 		{
-			$file .= '.' . $this->etemplate->lang;
+			$file .= '.'.$this->etemplate->lang;
 		}
-		$old_file = $file . '.old.xet';
+		$old_file = $file.'.old.xet';
 		$file .= '.xet';
 		if (file_exists($file))
 		{
@@ -154,10 +153,10 @@ 
 			{
 				unlink($old_file);
 			}
-			rename($file,$old_file);
+			rename($file, $old_file);
 		}
 
-		if (!($f = fopen($xml_label=$file,'w')))
+		if (!($f = fopen($xml_label = $file, 'w')))
 		{
 			return 0;
 		}
@@ -167,26 +166,26 @@ 
 		}
 		$xml = $this->etemplate->xul_io->export($this->etemplate);
 
-		fwrite($f,$xml);
+		fwrite($f, $xml);
 		fclose($f);
 
-		return lang("eTemplate '%1' written to '%2'",$name,$file);
+		return lang("eTemplate '%1' written to '%2'", $name, $file);
 	}
 
-	function import_xml($file,&$xml)
+	function import_xml($file, &$xml)
 	{
-		if ($file == 'none' || $file == '' || !($f = fopen($file,'r')))
+		if ($file == 'none' || $file == '' || !($f = fopen($file, 'r')))
 		{
 			return lang('no filename given or selected via Browse...')."file='$file'";
 		}
-		$xml = fread ($f, filesize ($file));
+		$xml = fread($f, filesize($file));
 		fclose($f);
 
 		if (!is_object($this->etemplate->xul_io))
 		{
 			$this->etemplate->xul_io = new xul_io();
 		}
-		$imported = $this->etemplate->xul_io->import($this->etemplate,$xml);
+		$imported = $this->etemplate->xul_io->import($this->etemplate, $xml);
 		$this->etemplate->modified = @filemtime($f);
 		$this->etemplate->modified_set = 'xul-import';
 
@@ -194,7 +193,7 @@ 
 		{
 			if (count($imported) == 1)
 			{
-				$imported = lang("eTemplate '%1' imported, use Save to put it in the database",$this->etemplate->name);
+				$imported = lang("eTemplate '%1' imported, use Save to put it in the database", $this->etemplate->name);
 			}
 			else
 			{
@@ -204,7 +203,7 @@ 
 		return $imported;
 	}
 
-	function list_result($cont='',$msg='')
+	function list_result($cont = '', $msg = '')
 	{
 		if ($this->debug)
 		{
@@ -223,11 +222,11 @@ 
 		if (isset($cont['delete']))
 		{
 			list($delete) = each($cont['delete']);
-			$this->etemplate->init($result[$delete-1]);
+			$this->etemplate->init($result[$delete - 1]);
 			if ($this->etemplate->delete())
 			{
 				$msg = lang('Template deleted');
-				unset($result[$delete-1]);
+				unset($result[$delete - 1]);
 				$result = array_values($result);
 			}
 			else
@@ -237,21 +236,21 @@ 
 		}
 		if (isset($cont['delete_selected']))
 		{
-			foreach($cont['selected'] as $row => $sel)
+			foreach ($cont['selected'] as $row => $sel)
 			{
 				if ($sel)
 				{
-					$this->etemplate->init($result[$row-1]);
+					$this->etemplate->init($result[$row - 1]);
 					if ($this->etemplate->delete())
 					{
-						unset($result[$row-1]);
+						unset($result[$row - 1]);
 						++$n;
 					}
 				}
 			}
 			if ($n)
 			{
-				$msg = lang('%1 eTemplates deleted',$n);
+				$msg = lang('%1 eTemplates deleted', $n);
 			}
 			unset($cont['selected']);
 			unset($cont['delete_selected']);
@@ -260,13 +259,13 @@ 
 		if (isset($cont['read']))
 		{
 			list($read) = each($cont['read']);
-			$this->etemplate->read($result[$read-1]);
+			$this->etemplate->read($result[$read - 1]);
 			$this->edit();
 			return;
 		}
 		if (!$msg)
 		{
-			$msg = lang('%1 eTemplates found',count($result));
+			$msg = lang('%1 eTemplates found', count($result));
 		}
 		unset($cont['result']);
 		if (!isset($cont['name']))
@@ -276,15 +275,15 @@ 
 		$content = $cont + array('msg' => $msg);
 
 		reset($result);
-		for ($row=1; list(,$param) = each($result); ++$row)
+		for ($row = 1; list(,$param) = each($result); ++$row)
 		{
 			$content[$row] = $param;
 		}
 		$list_result = new etemplate('etemplate.editor.list_result');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Editable Templates - Search');
-		$list_result->exec('etemplate.editor.list_result',$content,'','',array(
+		$list_result->exec('etemplate.editor.list_result', $content, '', '', array(
 			'result' => $result,
-		),'');
+		), '');
 	}
 
 	/**
@@ -293,7 +292,7 @@ 
 	 * @param array $content content from the process_exec call
 	 * @param string $msg message to show
 	 */
-	function edit($content=null,$msg = '')
+	function edit($content = null, $msg = '')
 	{
 		if ($this->debug)
 		{
@@ -304,7 +303,7 @@ 
 
 		if ($content['import_xml'])
 		{
-			$msg .= $this->import_xml($content['file']['tmp_name'],$xml);
+			$msg .= $this->import_xml($content['file']['tmp_name'], $xml);
 			//$this->etemplate->echo_tmpl();
 			$xml_label = $content['file']['name'];
 			$preserv['import'] = $this->etemplate->as_array(1);
@@ -322,7 +321,7 @@ 
 			{
 				$this->etemplate->modified = time();
 			}
-			$ok = $this->etemplate->save(trim($content['name']),trim($content['template']),trim($content['lang']),(int) $content['group'],trim($content['version']));
+			$ok = $this->etemplate->save(trim($content['name']), trim($content['template']), trim($content['lang']), (int)$content['group'], trim($content['version']));
 			$msg = $ok ? lang('Template saved') : lang('Error: while saving !!!');
 			if ($ok) unset($preserv['import']);
 		}
@@ -330,7 +329,7 @@ 
 		{
 			if ($_GET['name'])
 			{
-				foreach(boetemplate::$db_key_cols as $var)
+				foreach (boetemplate::$db_key_cols as $var)
 				{
 					$content[$var] = $_GET[$var];
 				}
@@ -348,7 +347,7 @@ 
 				if (isset($content['name']))
 				{
 					$version_backup = $content['version'];
-					$content['version'] = '';	// trying it without version
+					$content['version'] = ''; // trying it without version
 					if ($this->etemplate->read($content))
 					{
 						$msg = lang('only an other Version found !!!');
@@ -381,36 +380,36 @@ 
 				$link = $this->etemplate->as_array(-1);
 				$link['menuaction'] = 'etemplate.editor.edit';
 				$link['version'] = $newest_version;
-				$msg = lang("newer version '%1' exists !!!",html::a_href($newest_version,$link));
+				$msg = lang("newer version '%1' exists !!!", html::a_href($newest_version, $link));
 			}
 		}
 		if (!is_array($this->extensions))
 		{
 			if (($extensions = $this->scan_for_extensions()))
 			{
-				$msg .= lang('Extensions loaded:') . ' ' . $extensions."\n";
+				$msg .= lang('Extensions loaded:').' '.$extensions."\n";
 				$msg_ext_loaded = True;
 			}
 		}
-		list($app) = explode('.',$this->etemplate->name?$this->etemplate->name:$content['name']);
+		list($app) = explode('.', $this->etemplate->name ? $this->etemplate->name : $content['name']);
 		if ($app && $app != 'etemplate')
 		{
-			translation::add_app($app);	// load translations for app
+			translation::add_app($app); // load translations for app
 
 			if (($extensions = $this->scan_for_extensions($app)))
 			{
-				$msg .= (!$msg_ext_loaded?lang('Extensions loaded:').' ':', ') . $extensions."\n";
+				$msg .= (!$msg_ext_loaded ? lang('Extensions loaded:').' ' : ', ').$extensions."\n";
 			}
 		}
 		if (!$msg && $content['delete'])
 		{
 			if (!$content['version'] && $this->etemplate->version)
 			{
-				$this->etemplate->version = '';	// else the newest would get deleted and not the one without version
+				$this->etemplate->version = ''; // else the newest would get deleted and not the one without version
 			}
 			$ok = $this->etemplate->delete();
 			$msg = $ok ? lang('Template deleted') : lang('Error: Template not found !!!');
-			$preserv['import'] = $this->etemplate->as_array(1);	// that way the content can be saved again
+			$preserv['import'] = $this->etemplate->as_array(1); // that way the content can be saved again
 		}
 		elseif ($content['restore'])
 		{
@@ -418,9 +417,9 @@ 
 			{
 				$msg .= lang('Application name needed to restore eTemplates!');
 			}
-			elseif (!@file_exists(EGW_SERVER_ROOT.'/'.($file=$app.'/setup/etemplates.inc.php')))
+			elseif (!@file_exists(EGW_SERVER_ROOT.'/'.($file = $app.'/setup/etemplates.inc.php')))
 			{
-				$msg .= lang('Application has no eTemplates (no file %1) to restore!',$file);
+				$msg .= lang('Application has no eTemplates (no file %1) to restore!', $file);
 			}
 			else
 			{
@@ -454,10 +453,10 @@ 
 				}
 				else	// try to call the writeLangFile function of the app's ui-layer
 				{
-					foreach(array('ui'.$name,'ui',$name,'bo'.$name) as $class)
+					foreach (array('ui'.$name, 'ui', $name, 'bo'.$name) as $class)
 					{
 						if (file_exists(EGW_INCLUDE_ROOT.'/'.$name.'/inc/class.'.$class.'.inc.php') &&
-							($ui =& CreateObject($name.'.'.$class)) && is_object($ui))
+							($ui = & CreateObject($name.'.'.$class)) && is_object($ui))
 						{
 							break;
 						}
@@ -470,13 +469,13 @@ 
 				}
 				//if (empty($msg))
 				{
-					$msg = $this->etemplate->writeLangFile($app,'en',$additional);
+					$msg = $this->etemplate->writeLangFile($app, 'en', $additional);
 				}
 			}
 		}
 		elseif ($content['export_xml'])
 		{
-			$msg .= $this->export_xml($xml,$xml_label);
+			$msg .= $this->export_xml($xml, $xml_label);
 		}
 		$new_content = $this->etemplate->as_array() + array(
 			'msg' => $msg,
@@ -488,7 +487,7 @@ 
 		if (isset($content['values']) && !isset($content['vals']))
 		{
 			$r = 1;
-			foreach((array)$content['cont'] as $key => $val)
+			foreach ((array)$content['cont'] as $key => $val)
 			{
 				$vals["@$r"] = $key;
 				$vals["A$r"] = is_array($val) ? serialize($val).'#SeR#' : $val;
@@ -507,7 +506,7 @@ 
 			<script language="javascript">
 				function edit_widget(path)
 				{
-					var url = "'.$GLOBALS['egw']->link('/index.php',$this->etemplate->as_array(-1)+array(
+					var url = "'.$GLOBALS['egw']->link('/index.php', $this->etemplate->as_array(-1) + array(
 						'menuaction' => 'etemplate.editor.widget',
 					)).'";
 					url = url.replace(/index.php\\?/,"index.php?path="+path+"&");
@@ -521,7 +520,7 @@ 
 			// check if application of template has a app.js file --> load it
 			if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
 			{
-				$GLOBALS['egw']->js->validate_file('.','app',$app,false);
+				$GLOBALS['egw']->js->validate_file('.', 'app', $app, false);
 			}
 			$editor->data[$editor->rows]['A']['obj'] = &$this->etemplate;
 			$vals = $content['vals'];
@@ -529,22 +528,22 @@ 
 
 			for ($r = 1; isset($vals["A$r"]); ++$r)
 			{
-				$new_content['cont'][$olds["@$r"]] = substr($vals["A$r"],-5)=='#SeR#' ?
-					unserialize(substr($vals["A$r"],0,-5)) : $vals["A$r"];
+				$new_content['cont'][$olds["@$r"]] = substr($vals["A$r"], -5) == '#SeR#' ?
+					unserialize(substr($vals["A$r"], 0, -5)) : $vals["A$r"];
 			}
 		}
 		// check if bo class of $app exists and has a labels method --> add labels to content to display them in the editor
-		if(class_exists($app.'_bo') && method_exists($app.'_bo','labels'))
+		if (class_exists($app.'_bo') && method_exists($app.'_bo', 'labels'))
 		{
-			$new_content['labels'] = ExecMethod($acm=$app.'.'.$app.'_bo.labels');
-			$new_content['cont']['labels'] =& $new_content['labels'];
+			$new_content['labels'] = ExecMethod($acm = $app.'.'.$app.'_bo.labels');
+			$new_content['cont']['labels'] = & $new_content['labels'];
 			//echo $acm; _debug_array($new_content['labels']);
 		}
 		$preserv['olds'] = $vals;
-		$preserv['old_keys'] = $this->etemplate->as_array(-1);	// in case we do a save as
+		$preserv['old_keys'] = $this->etemplate->as_array(-1); // in case we do a save as
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Editable Templates - Show Template');
-		$editor->exec('etemplate.editor.edit',$new_content,array(),'',$preserv,0,'/^cont/');
+		$editor->exec('etemplate.editor.edit', $new_content, array(), '', $preserv, 0, '/^cont/');
 	}
 
 	/**
@@ -554,7 +553,7 @@ 
 	 * @param array &$widget reference to the new widget data
 	 * @param array $old the old widget data
 	 */
-	function change_widget_type(&$widget,$old)
+	function change_widget_type(&$widget, $old)
 	{
 		//echo "<p>editor::change_widget_type($widget[type]=$old[type])</p>\n";
 		$old_type = $old['type'];
@@ -565,13 +564,13 @@ 
 		{
 			if (boetemplate::$widgets_with_children[$widget['type']] == 'box')	// box
 			{
-				if ((int) $widget['size'] < 1)	// min. 1 child
+				if ((int)$widget['size'] < 1)	// min. 1 child
 				{
-					list(,$options) = explode(',',$widget['size'],2);
+					list(,$options) = explode(',', $widget['size'], 2);
 					$widget['size'] = '1'.($options ? ','.$options : '');
 				}
 				// create the needed cells, if they dont exist
-				for ($n = 1; $n <= (int) $widget['size']; ++$n)
+				for ($n = 1; $n <= (int)$widget['size']; ++$n)
 				{
 					if (!is_array($widget[$n])) $widget[$n] = $n == 1 ? $old : boetemplate::empty_cell();
 				}
@@ -586,19 +585,19 @@ 
 
 				if ($old_had_children)	// box --> grid: hbox --> 1 row, other boxes --> 1 column
 				{
-					list($num) = explode(',',$old['size']);
+					list($num) = explode(',', $old['size']);
 					for ($n = 1; is_array($old[$n]) && $n <= $num; ++$n)
 					{
 						$new_line = null;
-						if ($old_type != 'hbox') boetemplate::add_child($widget,$new_line);
-						boetemplate::add_child($widget,$old[$n]);
+						if ($old_type != 'hbox') boetemplate::add_child($widget, $new_line);
+						boetemplate::add_child($widget, $old[$n]);
 						unset($widget[$n]);
 					}
 					$widget['size'] = '';
 				}
 				else	// 1 row with 1 column/child
 				{
-					boetemplate::add_child($widget,$cell=boetemplate::empty_cell());
+					boetemplate::add_child($widget, $cell = boetemplate::empty_cell());
 				}
 				break;
 
@@ -607,7 +606,7 @@ 
 
 				if ($old_type == 'grid')
 				{
-					if (preg_match('/,(vertical|horizontal)/',$widget['size'],$matches))
+					if (preg_match('/,(vertical|horizontal)/', $widget['size'], $matches))
 					{
 						$orient = $matches[1];
 					}
@@ -617,12 +616,12 @@ 
 					}
 					if ($orient == 'horizontal')	// ==> use first row
 					{
-						$row =& $old['data'][1];
+						$row = & $old['data'][1];
 						for ($n = 0; $n < $old['cols']; ++$n)
 						{
-							$cell =& $row[boetemplate::num2chrs($n)];
-							boetemplate::add_child($widget,$cell);
-							list($span) = (int)explode(',',$cell['span']);
+							$cell = & $row[boetemplate::num2chrs($n)];
+							boetemplate::add_child($widget, $cell);
+							list($span) = (int)explode(',', $cell['span']);
 							if ($span == 'all') break;
 							while ($span-- > 1) ++$n;
 						}
@@ -631,13 +630,13 @@ 
 					{
 						for ($n = 1; $n <= $old['rows']; ++$n)
 						{
-							boetemplate::add_child($widget,$old['data'][$n][boetemplate::num2chrs(0)]);
+							boetemplate::add_child($widget, $old['data'][$n][boetemplate::num2chrs(0)]);
 						}
 					}
 				}
 				if (!$widget['size']) // minimum one child
 				{
-					boetemplate::add_child($widget,boetemplate::empty_cell());
+					boetemplate::add_child($widget, boetemplate::empty_cell());
 				}
 				break;
 		}
@@ -652,16 +651,16 @@ 
 	 */
 	function path_components($path)
 	{
-		$path_parts = explode('/',$path);
-		array_pop($path_parts);		// removed the widget itself
-		array_shift($path_parts);	// removed the leading empty string
+		$path_parts = explode('/', $path);
+		array_pop($path_parts); // removed the widget itself
+		array_shift($path_parts); // removed the leading empty string
 
 		$components = array();
 		$part_path = '';
-		foreach($path_parts as $part)
+		foreach ($path_parts as $part)
 		{
 			$part_path .= '/'.$part;
-			$parent =& $this->etemplate->get_widget_by_path($part_path);
+			$parent = & $this->etemplate->get_widget_by_path($part_path);
 			$components[$part_path] = $parent['type'];
 		}
 		return $components;
@@ -675,33 +674,33 @@ 
 	 * @param string $parent_path path of the parent
 	 * @return array with keys left, right, up and down and their pathes set (if applicable)
 	 */
-	function parent_navigation($parent,$parent_path,$child_id,$widget)
+	function parent_navigation($parent, $parent_path, $child_id, $widget)
 	{
-		if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches))
+		if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/', $child_id, $matches))
 		{
-			list(,$r,$c) = $matches;
+			list(,$r, $c) = $matches;
 			// find the column-number (base 0) for $c (A, B, C, ...)
-			for($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col) ;
+			for ($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col);
 
-			if ($col > 0) $left = $parent_path.'/'.$r.boetemplate::num2chrs($col-1);
+			if ($col > 0) $left = $parent_path.'/'.$r.boetemplate::num2chrs($col - 1);
 
-			if ($col < $parent['cols']-1) $right = $parent_path.'/'.$r.boetemplate::num2chrs($col+1);
+			if ($col < $parent['cols'] - 1) $right = $parent_path.'/'.$r.boetemplate::num2chrs($col + 1);
 
-			if ($r > 1) $up = $parent_path.'/'.($r-1).$c;
+			if ($r > 1) $up = $parent_path.'/'.($r - 1).$c;
 
-			if ($r < $parent['rows']) $down = $parent_path.'/'.($r+1).$c;
+			if ($r < $parent['rows']) $down = $parent_path.'/'.($r + 1).$c;
 		}
 		elseif ($parent['type']) // any box
 		{
-			if ($child_id > 1) $previous = $parent_path.'/'.($child_id-1);
+			if ($child_id > 1) $previous = $parent_path.'/'.($child_id - 1);
 
-			if ($child_id < (int) $parent['size'])  $next = $parent_path.'/'.($child_id+1);
+			if ($child_id < (int)$parent['size'])  $next = $parent_path.'/'.($child_id + 1);
 		}
 		else // template
 		{
-			if ($child_id > 0) $previous = '/'.($child_id-1);
+			if ($child_id > 0) $previous = '/'.($child_id - 1);
 
-			if ($child_id < count($this->etemplate->children)-1)  $next = '/'.($child_id+1);
+			if ($child_id < count($this->etemplate->children) - 1)  $next = '/'.($child_id + 1);
 		}
 		if ($widget['type'] == 'grid')
 		{
@@ -719,8 +718,8 @@ 
 			}
 		}
 		$navi = array();
-		foreach(array('left'=>'&larr;','up'=>'&nbsp;&uarr;&nbsp;','down'=>'&nbsp;&darr;&nbsp;',
-			'right'=>'&rarr;','previous'=>'&larr;&uarr;','next'=>'&darr;&rarr;','in'=>'&times;') as $var => $dir)
+		foreach (array('left'=>'&larr;', 'up'=>'&nbsp;&uarr;&nbsp;', 'down'=>'&nbsp;&darr;&nbsp;',
+			'right'=>'&rarr;', 'previous'=>'&larr;&uarr;', 'next'=>'&darr;&rarr;', 'in'=>'&times;') as $var => $dir)
 		{
 			if ($$var) $navi[$$var] = $dir;
 		}
@@ -737,27 +736,27 @@ 
 	 * @param string $child_id id of a cell
 	 * @return string msg to display
 	 */
-	function edit_actions(&$action,&$parent,&$content,$child_id)
+	function edit_actions(&$action, &$parent, &$content, $child_id)
 	{
 		switch ($action)
 		{
 			case 'paste':
 			case 'swap':
-				$clipboard = $GLOBALS['egw']->session->appsession('clipboard','etemplate');
+				$clipboard = $GLOBALS['egw']->session->appsession('clipboard', 'etemplate');
 				if (!is_array($clipboard))
 				{
 					return lang('nothing in clipboard to paste !!!');
 				}
 				if ($action == 'swap')
 				{
-					$GLOBALS['egw']->session->appsession('clipboard','etemplate',$content['cell']);
+					$GLOBALS['egw']->session->appsession('clipboard', 'etemplate', $content['cell']);
 				}
 				$content['cell'] = $clipboard;
 				break;
 
 			case 'copy':
 			case 'cut':
-				$GLOBALS['egw']->session->appsession('clipboard','etemplate',$content['cell']);
+				$GLOBALS['egw']->session->appsession('clipboard', 'etemplate', $content['cell']);
 				if ($action != 'cut')
 				{
 					return lang('widget copied into clipboard');
@@ -769,20 +768,20 @@ 
 					// delete widget from parent
 					if ($parent['type'])	// box
 					{
-						list($num,$options) = explode(',',$parent['size'],2);
+						list($num, $options) = explode(',', $parent['size'], 2);
 						if ($num <= 1)	// cant delete last child --> only empty it
 						{
-							$parent[$num=1] = boetemplate::empty_cell();
+							$parent[$num = 1] = boetemplate::empty_cell();
 						}
 						else
 						{
-							for($n = $child_id; $n < $num; ++$n)
+							for ($n = $child_id; $n < $num; ++$n)
 							{
-								$parent[$n] = $parent[1+$n];
+								$parent[$n] = $parent[1 + $n];
 							}
 							unset($parent[$num--]);
 						}
-						$parent['size'] = $num . ($options ? ','.$options : '');
+						$parent['size'] = $num.($options ? ','.$options : '');
 					}
 					else	// template itself
 					{
@@ -819,7 +818,7 @@ 
 	 * @param string $parent_path path of parent
 	 * @return string msg to display
 	 */
-	function box_actions(&$action,&$parent,&$content,&$child_id,$parent_path)
+	function box_actions(&$action, &$parent, &$content, &$child_id, $parent_path)
 	{
 		switch ($action)
 		{
@@ -828,38 +827,38 @@ 
 				$n = $child_id + (int)($action == 'box_insert_behind');
 				if (!$parent['type'])	// template
 				{
-					$num = count($parent)-1;	// 0..count()-1
+					$num = count($parent) - 1; // 0..count()-1
 				}
 				else // boxes
 				{
-					list($num,$options) = explode(',',$parent['size'],2);
+					list($num, $options) = explode(',', $parent['size'], 2);
 				}
-				for($i = $num; $i >= $n; --$i)
+				for ($i = $num; $i >= $n; --$i)
 				{
-					$parent[1+$i] = $parent[$i];
+					$parent[1 + $i] = $parent[$i];
 				}
 				$parent[$n] = $content['cell'] = boetemplate::empty_cell();
 				$child_id = $n;
-				if ($parent['type']) $parent['size'] = (1+$num) . ($options ? ','.$options : '');
+				if ($parent['type']) $parent['size'] = (1 + $num).($options ? ','.$options : '');
 				break;
 
 			case 'box_swap_next':
 				if (!$parent['type'])	// template
 				{
-					$num = count($parent)-1;	// 0..count()-1
+					$num = count($parent) - 1; // 0..count()-1
 				}
 				else // boxes
 				{
-					list($num) = explode(',',$parent['size'],2);
+					list($num) = explode(',', $parent['size'], 2);
 				}
 				if ($child_id == $num)	// if on last cell, swap with the one before
 				{
-					$this->swap($parent[$child_id],$parent[$child_id-1]);
+					$this->swap($parent[$child_id], $parent[$child_id - 1]);
 					--$child_id;
 				}
 				else
 				{
-					$this->swap($parent[$child_id],$parent[$child_id+1]);
+					$this->swap($parent[$child_id], $parent[$child_id + 1]);
 					++$child_id;
 				}
 				break;
@@ -878,28 +877,28 @@ 
 	 * @param string $child_id id of a cell
 	 * @return string msg to display
 	 */
-	function row_actions(&$action,&$grid,$child_id)
+	function row_actions(&$action, &$grid, $child_id)
 	{
-		$data =& $grid['data'];
-		$rows =& $grid['rows'];
-		$cols =& $grid['cols'];
-		$opts =& $data[0];
+		$data = & $grid['data'];
+		$rows = & $grid['rows'];
+		$cols = & $grid['cols'];
+		$opts = & $data[0];
 
-		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches)) list(,$r,$c) = $matches;
+		if (preg_match('/^([0-9]+)([A-Z]+)$/', $child_id, $matches)) list(,$r, $c) = $matches;
 
 		if (!$c || !$r || $r > $rows) return "wrong child_id='$child_id' => r='$r', c='$c'";
 
-		switch($action)
+		switch ($action)
 		{
 			case 'row_swap_next':
-				if ($r > $rows-1)
+				if ($r > $rows - 1)
 				{
 					if ($r != $rows) return lang('no row to swap with !!!');
-					--$r;	// in last row swap with row above
+					--$r; // in last row swap with row above
 				}
-				$this->swap($data[$r],$data[1+$r]);
-				$this->swap($opts['c'.$r],$opts['c'.(1+$r)]);
-				$this->swap($opts['h'.$r],$opts['h'.(1+$r)]);
+				$this->swap($data[$r], $data[1 + $r]);
+				$this->swap($opts['c'.$r], $opts['c'.(1 + $r)]);
+				$this->swap($opts['h'.$r], $opts['h'.(1 + $r)]);
 				break;
 
 			case 'row_delete':
@@ -908,11 +907,11 @@ 
 					return lang('cant delete the only row in a grid !!!');
 					// todo: delete whole grid instead
 				}
-				for($i = $r; $i < $rows; ++$i)
+				for ($i = $r; $i < $rows; ++$i)
 				{
-					$opts['c'.$i] = $opts['c'.(1+$i)];
-					$opts['h'.$i] = $opts['h'.(1+$i)];
-					$data[$i] = $data[1+$i];
+					$opts['c'.$i] = $opts['c'.(1 + $i)];
+					$opts['h'.$i] = $opts['h'.(1 + $i)];
+					$data[$i] = $data[1 + $i];
 				}
 				unset($opts['c'.$rows]);
 				unset($opts['h'.$rows]);
@@ -925,19 +924,19 @@ 
 			case 'row_insert_below':
 				//echo "row_insert_below($r) rows=$rows, cols=$cols"; _debug_array($grid);
 				// move height + class options of rows
-				for($i = $rows; $i > $r; --$i)
+				for ($i = $rows; $i > $r; --$i)
 				{
-					echo ($i+1)."=$i<br>\n";
-					$data[1+$i] = $data[$i];
-					$opts['c'.(1+$i)] = $opts['c'.$i];
-					$opts['h'.(1+$i)] = $opts['h'.$i];
+					echo ($i + 1)."=$i<br>\n";
+					$data[1 + $i] = $data[$i];
+					$opts['c'.(1 + $i)] = $opts['c'.$i];
+					$opts['h'.(1 + $i)] = $opts['h'.$i];
 				}
-				for($i = 0; $i < $cols; ++$i)
+				for ($i = 0; $i < $cols; ++$i)
 				{
-					echo (1+$r).":$i=".boetemplate::num2chrs($i)."=empty_cell()<br>\n";
-					$data[1+$r][boetemplate::num2chrs($i)] = boetemplate::empty_cell();
+					echo (1 + $r).":$i=".boetemplate::num2chrs($i)."=empty_cell()<br>\n";
+					$data[1 + $r][boetemplate::num2chrs($i)] = boetemplate::empty_cell();
 				}
-				$opts['c'.(1+$r)] = $opts['h'.(1+$r)] = '';
+				$opts['c'.(1 + $r)] = $opts['h'.(1 + $r)] = '';
 				++$rows;
 				//_debug_array($grid); return '';
 				break;
@@ -956,33 +955,33 @@ 
 	 * @param string $child_id id of a cell
 	 * @return string msg to display
 	 */
-	function column_actions(&$action,&$grid,$child_id)
+	function column_actions(&$action, &$grid, $child_id)
 	{
-		$data =& $grid['data'];
-		$rows =& $grid['rows'];
-		$cols =& $grid['cols'];
-		$opts =& $data[0];
+		$data = & $grid['data'];
+		$rows = & $grid['rows'];
+		$cols = & $grid['cols'];
+		$opts = & $data[0];
 
-		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches)) list(,$r,$c) = $matches;
+		if (preg_match('/^([0-9]+)([A-Z]+)$/', $child_id, $matches)) list(,$r, $c) = $matches;
 		// find the column-number (base 0) for $c (A, B, C, ...)
-		for($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col) ;
+		for ($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col);
 
 		if (!$c || !$r || $r > $rows || $col >= $cols) return "wrong child_id='$child_id' => r='$r', c='$c', col=$col";
 
-		switch($action)
+		switch ($action)
 		{
 			case 'column_swap_next':
-				if ($col >= $cols-1)
+				if ($col >= $cols - 1)
 				{
-					if ($col != $cols-1) return lang('no column to swap with !!!');
+					if ($col != $cols - 1) return lang('no column to swap with !!!');
 					$c = boetemplate::num2chrs(--$col); // in last column swap with the one before
 				}
-				$c_next = boetemplate::num2chrs(1+$col);
-				for($row = 1; $row <= $rows; ++$row)
+				$c_next = boetemplate::num2chrs(1 + $col);
+				for ($row = 1; $row <= $rows; ++$row)
 				{
-					$this->swap($data[$row][$c],$data[$row][$c_next]);
+					$this->swap($data[$row][$c], $data[$row][$c_next]);
 				}
-				$this->swap($opts[$c],$opts[$c_next]);
+				$this->swap($opts[$c], $opts[$c_next]);
 				//_debug_array($grid); return '';
 				break;
 
@@ -995,13 +994,13 @@ 
 				{
 					for ($i = $cols; $i > $col; --$i)
 					{
-						$data[$row][boetemplate::num2chrs($i)] = $data[$row][boetemplate::num2chrs($i-1)];
+						$data[$row][boetemplate::num2chrs($i)] = $data[$row][boetemplate::num2chrs($i - 1)];
 					}
 					$data[$row][boetemplate::num2chrs($col)] = boetemplate::empty_cell();
 				}
 				for ($i = $cols; $i > $col; --$i)
 				{
-					$opts[boetemplate::num2chrs($i)] = $opts[boetemplate::num2chrs($i-1)];
+					$opts[boetemplate::num2chrs($i)] = $opts[boetemplate::num2chrs($i - 1)];
 				}
 				unset($opts[boetemplate::num2chrs($col)]);
 				++$cols;
@@ -1016,15 +1015,15 @@ 
 				}
 				for ($row = 1; $row <= $rows; ++$row)
 				{
-					for ($i = $col; $i < $cols-1; ++$i)
+					for ($i = $col; $i < $cols - 1; ++$i)
 					{
-						$data[$row][boetemplate::num2chrs($i)] = $data[$row][boetemplate::num2chrs($i+1)];
+						$data[$row][boetemplate::num2chrs($i)] = $data[$row][boetemplate::num2chrs($i + 1)];
 					}
-					unset($data[$row][boetemplate::num2chrs($cols-1)]);
+					unset($data[$row][boetemplate::num2chrs($cols - 1)]);
 				}
-				for ($i = $col; $i < $cols-1; ++$i)
+				for ($i = $col; $i < $cols - 1; ++$i)
 				{
-					$opts[boetemplate::num2chrs($i)] = $opts[boetemplate::num2chrs($i+1)];
+					$opts[boetemplate::num2chrs($i)] = $opts[boetemplate::num2chrs($i + 1)];
 				}
 				unset($opts[boetemplate::num2chrs(--$cols)]);
 				break;
@@ -1041,29 +1040,29 @@ 
 	 * @param array &$cell_content cell array in content
 	 * @param boolean $widget2content=true copy from widget to content or other direction
 	 */
-	function fix_set_onclick(&$widget,&$cell_content,$widget2content=true)
+	function fix_set_onclick(&$widget, &$cell_content, $widget2content = true)
 	{
 		if ($widget2content)
 		{
-			if (preg_match('/^return confirm\(["\']{1}?(.*)["\']{1}\);?$/',$widget['onclick'],$matches))
+			if (preg_match('/^return confirm\(["\']{1}?(.*)["\']{1}\);?$/', $widget['onclick'], $matches))
 			{
 				$cell_content['onclick'] = $matches[1];
 				$cell_content['onclick_type'] = 'confirm';
 			}
-			elseif (preg_match('/^window.open\(egw::link\(\'\/index.php\',\'([^\']+)\'\)(\+values2url\(.*\))?,\'([^\']+)\',\'dependent=yes,width=([0-9]+),height=([0-9]+),scrollbars=yes,status=yes\'\); return false;$/',$widget['onclick'],$matches))
+			elseif (preg_match('/^window.open\(egw::link\(\'\/index.php\',\'([^\']+)\'\)(\+values2url\(.*\))?,\'([^\']+)\',\'dependent=yes,width=([0-9]+),height=([0-9]+),scrollbars=yes,status=yes\'\); return false;$/', $widget['onclick'], $matches))
 			{
-				$cell_content['onclick'] = $matches[1].($matches[2] ? str_replace('+values2url(this.form,','&values2url(',$matches[2]) : '');
+				$cell_content['onclick'] = $matches[1].($matches[2] ? str_replace('+values2url(this.form,', '&values2url(', $matches[2]) : '');
 				if ($matches[3] != '_blank')
 				{
 					$cell_content['onclick'] .= ','.$matches[3];
 				}
 				if ($matches[4] != '600')
 				{
-					$cell_content['onclick'] .= ($matches[3]=='_blank' ? ',':'').','.$matches[4];
+					$cell_content['onclick'] .= ($matches[3] == '_blank' ? ',' : '').','.$matches[4];
 				}
 				if ($matches[5] != '450')
 				{
-					$cell_content['onclick'] .= ($matches[4]=='600' ? ','.($matches[3]=='_blank' ? ',':'') : '').
+					$cell_content['onclick'] .= ($matches[4] == '600' ? ','.($matches[3] == '_blank' ? ',' : '') : '').
 						','.$matches[5];
 				}
 				$cell_content['onclick_type'] = 'popup';
@@ -1075,7 +1074,7 @@ 
 		}
 		else	// content --> widget
 		{
-			if (preg_match('/^return confirm\(["\']{1}?(.*)["\']{1}\);?$/',$cell_content['onclick'],$matches) ||
+			if (preg_match('/^return confirm\(["\']{1}?(.*)["\']{1}\);?$/', $cell_content['onclick'], $matches) ||
 				$cell_content['onclick_type'] == 'confirm' && $cell_content['onclick'])
 			{
 				$cell_content['onclick_type'] = 'confirm';
@@ -1085,12 +1084,12 @@ 
 			elseif ($cell_content['onclick_type'] == 'popup' && $cell_content['onclick'])
 			{
 				// eg: menuaction=calendar.uiforms.freetimesearch&values2url('start,end,participants'),ft_search,700,500
-				if  (($values2url = preg_match('/&values2url\((\'[^\']+\')\)/',$cell_content['onclick'],$matches)))
+				if (($values2url = preg_match('/&values2url\((\'[^\']+\')\)/', $cell_content['onclick'], $matches)))
 				{
 					$values2url = $matches[1];
-					$onclick = str_replace('&values2url('.$values2url.')','',$cell_content['onclick']);
+					$onclick = str_replace('&values2url('.$values2url.')', '', $cell_content['onclick']);
 				}
-				list($get,$target,$width,$height) = explode(',',$values2url ? $onclick : $cell_content['onclick']);
+				list($get, $target, $width, $height) = explode(',', $values2url ? $onclick : $cell_content['onclick']);
 				if (!$target) $target = '_blank';
 				if (!$width)  $width  = 600;
 				if (!$height) $height = 450;
@@ -1118,7 +1117,7 @@ 
 	 * @param array &$cell_content cell array in content
 	 * @param boolean $widget2content=true copy from widget to content or other direction
 	 */
-	function fix_set_onchange(&$widget,&$cell_content,$widget2content=true)
+	function fix_set_onchange(&$widget, &$cell_content, $widget2content = true)
 	{
 		if ($widget2content)
 		{
@@ -1142,7 +1141,7 @@ 
 			{
 				$widget['onchange'] = 1;
 			}
-			elseif(!$cell_content['onchange'])
+			elseif (!$cell_content['onchange'])
 			{
 				$widget['onchange'] = 0;
 			}
@@ -1157,12 +1156,12 @@ 
 	 * @param array $content the submitted content of the etemplate::exec function, default null
 	 * @param string $msg msg to display, default ''
 	 */
-	function widget($content=null,$msg='')
+	function widget($content = null, $msg = '')
 	{
 		if (is_array($content))
 		{
 			$path = $content['goto'] ? $content['goto'] : ($content['goto2'] ? $content['goto2'] : $content['path']);
-			$Ok = $this->etemplate->read($content['name'],$content['template'],$content['lang'],0,$content['goto'] || $content['goto2'] ? $content['version'] : $content['old_version']);
+			$Ok = $this->etemplate->read($content['name'], $content['template'], $content['lang'], 0, $content['goto'] || $content['goto2'] ? $content['version'] : $content['old_version']);
 
 			// build size from options array, if applicable
 			if (is_array($content['cell']['options']))
@@ -1181,7 +1180,7 @@ 
 		else
 		{
 			//echo "<p><b>".($_GET['path']).":</b></p>\n";
-			list($name,$version,$path) = explode(':',$_GET['path'],3);	// <name>:<version>:<path>
+			list($name, $version, $path) = explode(':', $_GET['path'], 3); // <name>:<version>:<path>
 			$Ok = $this->etemplate->read(array(
 				'name'    => $name,
 				'version' => $version,
@@ -1191,15 +1190,15 @@ 
 		{
 			$msg .= lang('Error: Template not found !!!');
 		}
-		$path_parts = explode('/',$path);
+		$path_parts = explode('/', $path);
 		$child_id = array_pop($path_parts);
-		$parent_path = implode('/',$path_parts);
+		$parent_path = implode('/', $path_parts);
 		//echo "<p>path='$path': child_id='$child_id', parent_path='$parent_path'</p>\n";
-		$parent =& $this->etemplate->get_widget_by_path($parent_path);
+		$parent = & $this->etemplate->get_widget_by_path($parent_path);
 
 		if (is_array($content))
 		{
-			foreach(array('save','apply','cancel','goto','goto2','edit_menu','box_menu','row_menu','column_menu') as $n => $name)
+			foreach (array('save', 'apply', 'cancel', 'goto', 'goto2', 'edit_menu', 'box_menu', 'row_menu', 'column_menu') as $n => $name)
 			{
 				if (($action = $content[$name] ? ($n < 5 ? $name : $content[$name]) : false)) break;
 				$name = '';
@@ -1210,25 +1209,25 @@ 
 			if (($name == 'row_menu' || $name == 'column_menu') && $parent['type'] != 'grid' ||
 				$name == 'box_menu' && $parent['type'] == 'grid')
 			{
-				$msg .= lang("parent is a '%1' !!!",lang($parent['type'] ? $parent['type'] : 'template'));
+				$msg .= lang("parent is a '%1' !!!", lang($parent['type'] ? $parent['type'] : 'template'));
 				$action = false;
 			}
-			switch($name)
+			switch ($name)
 			{
 				case 'edit_menu':
-					$msg .= $this->edit_actions($action,$parent,$content,$child_id);
+					$msg .= $this->edit_actions($action, $parent, $content, $child_id);
 					break;
 
 				case 'box_menu':
-					$msg .= $this->box_actions($action,$parent,$content,$child_id,$parent_path);
+					$msg .= $this->box_actions($action, $parent, $content, $child_id, $parent_path);
 					break;
 
 				case 'row_menu':
-					$msg .= $this->row_actions($action,$parent,$child_id);
+					$msg .= $this->row_actions($action, $parent, $child_id);
 					break;
 
 				case 'column_menu':
-					$msg .= $this->column_actions($action,$parent,$child_id);
+					$msg .= $this->column_actions($action, $parent, $child_id);
 					break;
 
 				case '':	// reload, eg. by changing the type
@@ -1238,7 +1237,7 @@ 
 				default:
 					// all menu's are (only) working on the parent, referencing widget is unnecessary
 					// and gives unexpected results, if parent is changed (eg. content gets copied)
-					$widget =& $this->etemplate->get_widget_by_path($path);
+					$widget = & $this->etemplate->get_widget_by_path($path);
 					break;
 			}
 			switch ($action)
@@ -1246,8 +1245,8 @@ 
 				case 'goto':
 				case 'goto2':
 					$content['cell'] = $widget;
-					$this->fix_set_onclick($widget,$content['cell'],true);
-					$this->fix_set_onchange($widget,$content['cell'],true);
+					$this->fix_set_onclick($widget, $content['cell'], true);
+					$this->fix_set_onchange($widget, $content['cell'], true);
 					break;
 
 				case '':
@@ -1256,30 +1255,30 @@ 
 					//echo "<p>$content[path]: $widget[type] --> ".$content['cell']['type']."</p>\n";
 					if (isset(boetemplate::$widgets_with_children[$content['cell']['type']]))
 					{
-						$this->change_widget_type($content['cell'],$widget);
+						$this->change_widget_type($content['cell'], $widget);
 					}
 					if (!$action) break;
 					// save+apply only
 					$widget = $content['cell'];
 					if ($content['cell']['onclick_type'] || $content['cell']['onclick'])
 					{
-						$this->fix_set_onclick($widget,$content['cell'],false);
+						$this->fix_set_onclick($widget, $content['cell'], false);
 					}
 					if ($content['cell']['onchange_type'] || $content['cell']['onchange'])
 					{
-						$this->fix_set_onchange($widget,$content['cell'],false);
+						$this->fix_set_onchange($widget, $content['cell'], false);
 					}
 					// row- and column-attr for a grid
-					if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches))
+					if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/', $child_id, $matches))
 					{
-						list(,$row,$col) = $matches;
+						list(,$row, $col) = $matches;
 						$parent['data'][0]['h'.$row] = $content['grid_row']['height'].
-							($content['grid_row']['disabled']||$content['grid_row']['part']?','.$content['grid_row']['disabled']:'').
-							($content['grid_row']['part']?','.$content['grid_row']['part']:'');
+							($content['grid_row']['disabled'] || $content['grid_row']['part'] ? ','.$content['grid_row']['disabled'] : '').
+							($content['grid_row']['part'] ? ','.$content['grid_row']['part'] : '');
 						$parent['data'][0]['c'.$row] = $content['grid_row']['class'].
-							($content['grid_row']['valign']?','.$content['grid_row']['valign']:'');
+							($content['grid_row']['valign'] ? ','.$content['grid_row']['valign'] : '');
 						$parent['data'][0][$col] = $content['grid_column']['width'].
-							($content['grid_column']['disabled']?','.$content['grid_column']['disabled']:'');
+							($content['grid_column']['disabled'] ? ','.$content['grid_column']['disabled'] : '');
 					}
 					// fall-through
 				case 'save-no-merge':
@@ -1296,9 +1295,9 @@ 
 					{
 						$content['opener']['version'] = $content['version'];
 					}
-					$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array(
+					$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php', array(
 							'menuaction' => 'etemplate.editor.edit',
-						)+$content['opener'])."';";
+						) + $content['opener'])."';";
 					if ($action == 'apply' || $action == 'apply-no-merge') break;
 					// fall through
 				case 'cancel':
@@ -1314,14 +1313,14 @@ 
 		}
 		else
 		{
-			$widget =& $this->etemplate->get_widget_by_path($path);
+			$widget = & $this->etemplate->get_widget_by_path($path);
 
 			$content = $this->etemplate->as_array(-1);
 			$content['cell'] = $widget;
-			$this->fix_set_onclick($widget,$content['cell'],true);
-			$this->fix_set_onchange($widget,$content['cell'],true);
+			$this->fix_set_onclick($widget, $content['cell'], true);
+			$this->fix_set_onchange($widget, $content['cell'], true);
 
-			foreach(boetemplate::$db_key_cols as $var)
+			foreach (boetemplate::$db_key_cols as $var)
 			{
 				if (isset($_GET[$var]))
 				{
@@ -1329,23 +1328,23 @@ 
 				}
 			}
 		}
-		unset($content['cell']['obj']);	// just in case it contains a template-object
+		unset($content['cell']['obj']); // just in case it contains a template-object
 
-		if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches))
+		if ($parent['type'] == 'grid' && preg_match('/^([0-9]+)([A-Z]+)$/', $child_id, $matches))
 		{
-			list(,$row,$col) = $matches;
+			list(,$row, $col) = $matches;
 
-			$grid_row =& $content['grid_row'];
-			list($grid_row['height'],$grid_row['disabled'],$grid_row['part']) = explode(',',$parent['data'][0]['h'.$row]);
-			list($grid_row['class'],$grid_row['valign']) = explode(',',$parent['data'][0]['c'.$row]);
+			$grid_row = & $content['grid_row'];
+			list($grid_row['height'], $grid_row['disabled'], $grid_row['part']) = explode(',', $parent['data'][0]['h'.$row]);
+			list($grid_row['class'], $grid_row['valign']) = explode(',', $parent['data'][0]['c'.$row]);
 
-			$grid_column =& $content['grid_column'];
-			list($grid_column['width'],$grid_column['disabled']) = explode(',',$parent['data'][0][$col]);
+			$grid_column = & $content['grid_column'];
+			list($grid_column['width'], $grid_column['disabled']) = explode(',', $parent['data'][0][$col]);
 			//echo "<p>grid_row($row)=".print_r($grid_row,true).", grid_column($col)=".print_r($grid_column,true)."</p>\n";
 
-			list(,,$previous_part) = explode(',',$parent['data'][0]['h'.($row-1)]);
-			list(,,$next_part) = explode(',',$parent['data'][0]['h'.($row+1)]);
-			$allowed_parts = $this->get_allowed_parts($row,$previous_part,$next_part);
+			list(,, $previous_part) = explode(',', $parent['data'][0]['h'.($row - 1)]);
+			list(,, $next_part) = explode(',', $parent['data'][0]['h'.($row + 1)]);
+			$allowed_parts = $this->get_allowed_parts($row, $previous_part, $next_part);
 			//echo "<p>$row: previous=$previous_part, current={$grid_row['part']}, next=$next_part".(!isset($allowed_parts[$grid_row['part']])?': current part is NOT allowed!!!':'')."</p>\n"; _debug_array($allowed_parts);
 		}
 		else
@@ -1353,23 +1352,23 @@ 
 			unset($content['grid_row']);
 			unset($content['grid_column']);
 		}
-		$content['path'] = ($parent_path!='/'?$parent_path:'').'/'.$child_id;
+		$content['path'] = ($parent_path != '/' ? $parent_path : '').'/'.$child_id;
 		$content['msg'] = $msg;
 		$content['goto'] = $this->path_components($content['path']);
-		$content['goto2'] = $this->parent_navigation($parent,$parent_path,$child_id,$widget);
+		$content['goto2'] = $this->parent_navigation($parent, $parent_path, $child_id, $widget);
 
-		$content['cell']['options'] = explode(',',$content['cell']['size']);
+		$content['cell']['options'] = explode(',', $content['cell']['size']);
 
 		$editor = new etemplate('etemplate.editor.widget');
 		$type_tmpl = new etemplate;
 
-		list($ext_type) = explode('-',$widget['type']);
+		list($ext_type) = explode('-', $widget['type']);
 		// allow to read template of app-specific widgets from their app: eg. "infolog-value" --> "infolog.widget.infolog-value"
 		if (isset($GLOBALS['egw_info']['apps'][$ext_type]) && $type_tmpl->read($ext_type.'.widget.'.$widget['type']) ||
 			$type_tmpl->read('etemplate.editor.widget.'.$widget['type']) ||
 			$type_tmpl->read('etemplate.editor.widget.'.$ext_type))
 		{
-			$editor->set_cell_attribute('etemplate.editor.widget.generic','obj',$type_tmpl);
+			$editor->set_cell_attribute('etemplate.editor.widget.generic', 'obj', $type_tmpl);
 		}
 		/*
 		Not a known type, use a generic attribute thing to at least allow working
@@ -1377,27 +1376,27 @@ 
 		*/
 		if ($widget['type'] && !boetemplate::$types[$widget['type']] && !$this->extensions[$widget['type']])
 		{
-			$grid =& $editor->get_widget_by_name('etemplate.editor.widget.generic');
+			$grid = & $editor->get_widget_by_name('etemplate.editor.widget.generic');
 			$grid['type'] = 'grid';
 			$grid['name'] = 'cell';
 			$grid['data'] = array(array());
-			$grid['data'][] = array('A'=>boetemplate::empty_cell('label','',array('label' => 'Type')), 'B' => boetemplate::empty_cell('select','type'));
-			$attributes = array('type'=>$widget_type,'name'=>'');
-			if(is_array($widget))
+			$grid['data'][] = array('A'=>boetemplate::empty_cell('label', '', array('label' => 'Type')), 'B' => boetemplate::empty_cell('select', 'type'));
+			$attributes = array('type'=>$widget_type, 'name'=>'');
+			if (is_array($widget))
 			{
 				$attributes += $widget;
 			}
-			foreach($attributes as $attr_name => $attr_value)
+			foreach ($attributes as $attr_name => $attr_value)
 			{
-				if(is_array($attr_value) || in_array($attr_value, array('type','options')))
+				if (is_array($attr_value) || in_array($attr_value, array('type', 'options')))
 				{
 					continue;
 				}
 				else
 				{
-					$attr = boetemplate::empty_cell('text',$attr_name,array());
+					$attr = boetemplate::empty_cell('text', $attr_name, array());
 				}
-				$grid['data'][] = array('A' => boetemplate::empty_cell('label','',array('label' => $attr_name)),'B'=>$attr);
+				$grid['data'][] = array('A' => boetemplate::empty_cell('label', '', array('label' => $attr_name)), 'B'=>$attr);
 				//boetemplate::add_child($grid,$attr);
 				unset($attr);
 			}
@@ -1411,7 +1410,7 @@ 
 			$editor->disable_cells('row_menu');
 			$editor->disable_cells('column_menu');
 		}
-		$preserv = $this->etemplate->as_array()+array(
+		$preserv = $this->etemplate->as_array() + array(
 			'path'        => $content['path'],
 			'type'        => $content['type'],
 			'old_version' => $this->etemplate->version,
@@ -1419,13 +1418,13 @@ 
 			'cell'        => $content['cell'],
 			'goto'        => $content['goto'],
 		);
-		unset($preserv['cell']['options']);	// otherwise we never know if content is returned via options array or size
+		unset($preserv['cell']['options']); // otherwise we never know if content is returned via options array or size
 
 		$GLOBALS['egw_info']['flags']['java_script'] = "<script>window.focus();</script>\n";
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Editable Templates - Editor');
-		$editor->exec('etemplate.editor.widget',$content,array(
-				'type'       => array_merge(array($widget['type'] => $widget['type'] . ' (?)'),
-					boetemplate::$types,$this->extensions
+		$editor->exec('etemplate.editor.widget', $content, array(
+				'type'       => array_merge(array($widget['type'] => $widget['type'].' (?)'),
+					boetemplate::$types, $this->extensions
 				),
 				'align'      => &$this->aligns,
 				'valign'     => &$this->valigns,
@@ -1437,7 +1436,7 @@ 
 				'onclick_type'=>&$this->onclick_types,
 				'onchange_type'=>&$this->onchange_types,
 				'options[6]' => &$this->overflows,
-			),'',$preserv,2);
+			), '', $preserv, 2);
 	}
 
 	/**
@@ -1448,10 +1447,10 @@ 
 	 * @param string $next_part see above
 	 * @return array
 	 */
-	private function get_allowed_parts($row,$previous_part,$next_part)
+	private function get_allowed_parts($row, $previous_part, $next_part)
 	{
 		$allowed_parts = $this->parts;
-		switch((string)$previous_part)
+		switch ((string)$previous_part)
 		{
 			case 'footer':
 				unset($allowed_parts['header']);
@@ -1460,7 +1459,7 @@ 
 				if ($row > 1) $allowed_parts = array('' => $allowed_parts['']);
 				break;
 		}
-		switch($next_part)
+		switch ($next_part)
 		{
 			case 'header':
 				$allowed_parts = array('header' => $allowed_parts['header']);
@@ -1478,20 +1477,20 @@ 
 	 * @param array $content the submitted content of the etemplate::exec function, default null
 	 * @param string $msg msg to display, default ''
 	 */
-	function styles($content=null,$msg='')
+	function styles($content = null, $msg = '')
 	{
 		if (!is_array($content))
 		{
-			foreach(boetemplate::$db_key_cols as $var)
+			foreach (boetemplate::$db_key_cols as $var)
 			{
 				if (isset($_GET[$var])) $content[$var] = $_GET[$var];
 			}
 		}
 		//_debug_array($content);
 		// security check for content[from]
-		if ($content['from'] && !preg_match('/^[A-Za-z0-9_-]+\/templates\/[A-Za-z0-9_-]+\/app.css$/',$content['from']))
+		if ($content['from'] && !preg_match('/^[A-Za-z0-9_-]+\/templates\/[A-Za-z0-9_-]+\/app.css$/', $content['from']))
 		{
-			$content['from'] = '';	// someone tried to trick us reading a file we are not suppost to read
+			$content['from'] = ''; // someone tried to trick us reading a file we are not suppost to read
 		}
 		if (!$this->etemplate->read($content))
 		{
@@ -1504,22 +1503,22 @@ 
 				$path = EGW_SERVER_ROOT.'/'.$content['from'];
 				if (is_writable(dirname($path)) && file_exists($path))
 				{
-					rename($path,str_replace('.css','.old.css',$path));
+					rename($path, str_replace('.css', '.old.css', $path));
 				}
 				if (file_exists($path) && !is_writable(dirname($path)))
 				{
-					$msg .= lang("Error: webserver is not allowed to write into '%1' !!!",dirname($path));
+					$msg .= lang("Error: webserver is not allowed to write into '%1' !!!", dirname($path));
 				}
 				else
 				{
-					$fp = fopen($path,'w');
-					if (!$fp || !fwrite($fp,$content['styles']))
+					$fp = fopen($path, 'w');
+					if (!$fp || !fwrite($fp, $content['styles']))
 					{
 						$msg .= lang('Error: while saving !!!');
 					}
 					else
 					{
-						$msg .= lang("File writen",$path);
+						$msg .= lang("File writen", $path);
 					}
 					@fclose($fp);
 				}
@@ -1530,9 +1529,9 @@ 
 				$ok = $this->etemplate->save();
 				$msg = $ok ? lang('Template saved') : lang('Error: while saving !!!');
 			}
-			$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array(
+			$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php', array(
 					'menuaction' => 'etemplate.editor.edit',
-				)+$this->etemplate->as_array(-1))."';";
+				) + $this->etemplate->as_array(-1))."';";
 		}
 		if ($content['save'] || $content['cancel'])
 		{
@@ -1550,10 +1549,10 @@ 
 		if ($content['from'])
 		{
 			$path = EGW_SERVER_ROOT.'/'.$content['from'];
-			$content['styles'] = file_exists($path) && is_readable($path) ? implode('',file($path)) : '';
+			$content['styles'] = file_exists($path) && is_readable($path) ? implode('', file($path)) : '';
 			if (!is_writable(dirname($path)) && (!file_exists($path) || !is_writable($path)))
 			{
-				$tmpl->set_cell_attribute('styles','readonly',true);
+				$tmpl->set_cell_attribute('styles', 'readonly', true);
 			}
 		}
 		else
@@ -1562,22 +1561,22 @@ 
 		}
 		// generate list of style-sources
 		$keys = $this->etemplate->as_array(-1); unset($keys['group']);
-		$sources[''] = lang('eTemplate').': '.implode(':',$keys);
-		list($app) = explode('.',$this->etemplate->name);
+		$sources[''] = lang('eTemplate').': '.implode(':', $keys);
+		list($app) = explode('.', $this->etemplate->name);
 		$app_templates = @opendir(EGW_SERVER_ROOT.'/'.$app.'/templates');
 		while (($template = @readdir($app_templates)) !== false)
 		{
 			$dir = EGW_SERVER_ROOT.'/'.$app.'/templates/'.$template;
-			if ($template[0] == '.' || $template == 'CVS' || !is_dir($dir.'/images')) continue;	// not a template-dir
+			if ($template[0] == '.' || $template == 'CVS' || !is_dir($dir.'/images')) continue; // not a template-dir
 			$exists = file_exists($dir.'/app.css');
 			$writable = is_writable($dir) || $exists && is_writable($dir.'/app.css');
-			if (!$exists && !$writable) continue;	// nothing to show
+			if (!$exists && !$writable) continue; // nothing to show
 			$rel_path = $app.'/templates/'.$template.'/app.css';
 			$sources[$rel_path] = lang('file').': '.$rel_path.($exists && !$writable ? ' ('.lang('readonly').')' : '');
 		}
 		$GLOBALS['egw_info']['flags']['java_script'] = "<script>window.focus();</script>\n";
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('etemplate').' - '.lang('CSS-styles');
-		$tmpl->exec('etemplate.editor.styles',$content,array('from'=>$sources),'',$keys,2);
+		$tmpl->exec('etemplate.editor.styles', $content, array('from'=>$sources), '', $keys, 2);
 	}
 
 	/**
@@ -1589,11 +1588,11 @@ 
 	 * @param string $app='etemplate' app to scan
 	 * @return string comma delimited list of new found extensions
 	 */
-	function scan_for_extensions($app='etemplate')
+	function scan_for_extensions($app = 'etemplate')
 	{
 		if (!is_array($this->extensions)) $this->extensions = array();
 
-		if (isset($this->extensions['**loaded**'][$app])) return '';	// already loaded
+		if (isset($this->extensions['**loaded**'][$app])) return ''; // already loaded
 
 		$labels = array();
 		$dir = @opendir(EGW_SERVER_ROOT.'/'.$app.'/inc');
@@ -1602,9 +1601,9 @@ 
 			// ignore et2 base widget matching name-schema of old eTemplate
 			if ($file == 'class.etemplate_widget.inc.php') continue;
 
-			if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/',$file,$regs) &&
+			if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/', $file, $regs) &&
 				($regs[1] != 'xslt' || $this->etemplate->xslt) &&
-				($ext = $this->etemplate->loadExtension($regs[1].'.'.$app,$this->etemplate)))
+				($ext = $this->etemplate->loadExtension($regs[1].'.'.$app, $this->etemplate)))
 			{
 				if (is_array($ext))
 				{
@@ -1619,13 +1618,13 @@ 
 			}
 		}
 		// store the information in the session, our constructor loads it from there
-		$GLOBALS['egw']->session->appsession('extensions','etemplate',$this->extensions);
-		$apps_loaded = $GLOBALS['egw']->session->appsession('apps_loaded','etemplate');
+		$GLOBALS['egw']->session->appsession('extensions', 'etemplate', $this->extensions);
+		$apps_loaded = $GLOBALS['egw']->session->appsession('apps_loaded', 'etemplate');
 		$apps_loaded[$app] = true;
-		$GLOBALS['egw']->session->appsession('apps_loaded','etemplate',$apps_loaded);
+		$GLOBALS['egw']->session->appsession('apps_loaded', 'etemplate', $apps_loaded);
 		//_debug_array($this->extensions); _debug_array($apps_loaded);
 
-		return implode(', ',$labels);
+		return implode(', ', $labels);
 	}
 
 	/**
@@ -1634,7 +1633,7 @@ 
 	 * @param mixed &$a
 	 * @param mixed &$b
 	 */
-	function swap(&$a,&$b)
+	function swap(&$a, &$b)
 	{
 		$h = $a;
 		$a = $b;

Braces +203 added lines, -51 removed lines

@@ -299,7 +299,10 @@ 
 		{
 			echo "<p>etemplate.editor.edit: content="; _debug_array($content);
 		}
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$preserv = array();
 
 		if ($content['import_xml'])
@@ -309,14 +312,20 @@ 
 			$xml_label = $content['file']['name'];
 			$preserv['import'] = $this->etemplate->as_array(1);
 		}
-		elseif (is_array($content['import']) && !$content['read'])	// imported not yet saved tmpl
+		elseif (is_array($content['import']) && !$content['read'])
+		{
+			// imported not yet saved tmpl
 		{
 			$this->etemplate->init($content['import']);
+		}
 			$preserv['import'] = $content['import'];
 		}
 		if ($content['save'])
 		{
-			if (!is_array($content['import'])) $this->etemplate->read($content['old_keys']);
+			if (!is_array($content['import']))
+			{
+				$this->etemplate->read($content['old_keys']);
+			}
 
 			if (!$this->etemplate->modified_set || !$this->etemplate->modified)
 			{
@@ -324,7 +333,10 @@ 
 			}
 			$ok = $this->etemplate->save(trim($content['name']),trim($content['template']),trim($content['lang']),(int) $content['group'],trim($content['version']));
 			$msg = $ok ? lang('Template saved') : lang('Error: while saving !!!');
-			if ($ok) unset($preserv['import']);
+			if ($ok)
+			{
+				unset($preserv['import']);
+			}
 		}
 		elseif (!$content['import_xml'] && (isset($_GET['name']) || isset($content['name'])) && !$content['restore'])
 		{
@@ -563,17 +575,23 @@ 
 		if (!isset(boetemplate::$widgets_with_children[$widget['type']]) ||
 			($old_type == 'grid') == ($widget['type'] == 'grid'))
 		{
-			if (boetemplate::$widgets_with_children[$widget['type']] == 'box')	// box
+			if (boetemplate::$widgets_with_children[$widget['type']] == 'box')
+			{
+				// box
 			{
 				if ((int) $widget['size'] < 1)	// min. 1 child
 				{
 					list(,$options) = explode(',',$widget['size'],2);
+			}
 					$widget['size'] = '1'.($options ? ','.$options : '');
 				}
 				// create the needed cells, if they dont exist
 				for ($n = 1; $n <= (int) $widget['size']; ++$n)
 				{
-					if (!is_array($widget[$n])) $widget[$n] = $n == 1 ? $old : boetemplate::empty_cell();
+					if (!is_array($widget[$n]))
+					{
+						$widget[$n] = $n == 1 ? $old : boetemplate::empty_cell();
+					}
 				}
 			}
 			return; // no change necessary, eg. between different box-types
@@ -584,13 +602,19 @@ 
 				$widget['data'] = array(array());
 				$widget['cols'] = $widget['rows'] = 0;
 
-				if ($old_had_children)	// box --> grid: hbox --> 1 row, other boxes --> 1 column
+				if ($old_had_children)
+				{
+					// box --> grid: hbox --> 1 row, other boxes --> 1 column
 				{
 					list($num) = explode(',',$old['size']);
+				}
 					for ($n = 1; is_array($old[$n]) && $n <= $num; ++$n)
 					{
 						$new_line = null;
-						if ($old_type != 'hbox') boetemplate::add_child($widget,$new_line);
+						if ($old_type != 'hbox')
+						{
+							boetemplate::add_child($widget,$new_line);
+						}
 						boetemplate::add_child($widget,$old[$n]);
 						unset($widget[$n]);
 					}
@@ -615,16 +639,25 @@ 
 					{
 						$orient = $widget['type'] == 'hbox' ? 'horizontal' : 'vertical';
 					}
-					if ($orient == 'horizontal')	// ==> use first row
+					if ($orient == 'horizontal')
+					{
+						// ==> use first row
 					{
 						$row =& $old['data'][1];
+					}
 						for ($n = 0; $n < $old['cols']; ++$n)
 						{
 							$cell =& $row[boetemplate::num2chrs($n)];
 							boetemplate::add_child($widget,$cell);
 							list($span) = (int)explode(',',$cell['span']);
-							if ($span == 'all') break;
-							while ($span-- > 1) ++$n;
+							if ($span == 'all')
+							{
+								break;
+							}
+							while ($span-- > 1)
+							{
+								++$n;
+							}
 						}
 					}
 					else	// vertical ==> use 1 column
@@ -635,10 +668,13 @@ 
 						}
 					}
 				}
-				if (!$widget['size']) // minimum one child
+				if (!$widget['size'])
+				{
+					// minimum one child
 				{
 					boetemplate::add_child($widget,boetemplate::empty_cell());
 				}
+				}
 				break;
 		}
 		//_debug_array($widget);
@@ -683,25 +719,49 @@ 
 			// find the column-number (base 0) for $c (A, B, C, ...)
 			for($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col) ;
 
-			if ($col > 0) $left = $parent_path.'/'.$r.boetemplate::num2chrs($col-1);
+			if ($col > 0)
+			{
+				$left = $parent_path.'/'.$r.boetemplate::num2chrs($col-1);
+			}
 
-			if ($col < $parent['cols']-1) $right = $parent_path.'/'.$r.boetemplate::num2chrs($col+1);
+			if ($col < $parent['cols']-1)
+			{
+				$right = $parent_path.'/'.$r.boetemplate::num2chrs($col+1);
+			}
 
-			if ($r > 1) $up = $parent_path.'/'.($r-1).$c;
+			if ($r > 1)
+			{
+				$up = $parent_path.'/'.($r-1).$c;
+			}
 
-			if ($r < $parent['rows']) $down = $parent_path.'/'.($r+1).$c;
+			if ($r < $parent['rows'])
+			{
+				$down = $parent_path.'/'.($r+1).$c;
+			}
 		}
-		elseif ($parent['type']) // any box
+		elseif ($parent['type'])
+		{
+			// any box
 		{
 			if ($child_id > 1) $previous = $parent_path.'/'.($child_id-1);
+		}
 
-			if ($child_id < (int) $parent['size'])  $next = $parent_path.'/'.($child_id+1);
+			if ($child_id < (int) $parent['size'])
+			{
+				$next = $parent_path.'/'.($child_id+1);
+			}
 		}
 		else // template
 		{
-			if ($child_id > 0) $previous = '/'.($child_id-1);
+			if ($child_id > 0)
+			{
+				$previous = '/'.($child_id-1);
+			}
 
-			if ($child_id < count($this->etemplate->children)-1)  $next = '/'.($child_id+1);
+			if ($child_id < count($this->etemplate->children)-1)
+			{
+				$next = '/'.($child_id+1);
+			}
 		}
 		if ($widget['type'] == 'grid')
 		{
@@ -709,10 +769,13 @@ 
 		}
 		elseif (isset(boetemplate::$widgets_with_children[$widget['type']]) && $widget['type'] != 'template')
 		{
-			if ($widget['type'])	// box
+			if ($widget['type'])
+			{
+				// box
 			{
 				$in = $parent_path.'/'.$child_id.'/1';
 			}
+			}
 			else
 			{
 				$in = '/0';
@@ -722,7 +785,10 @@ 
 		foreach(array('left'=>'&larr;','up'=>'&nbsp;&uarr;&nbsp;','down'=>'&nbsp;&darr;&nbsp;',
 			'right'=>'&rarr;','previous'=>'&larr;&uarr;','next'=>'&darr;&rarr;','in'=>'&times;') as $var => $dir)
 		{
-			if ($$var) $navi[$$var] = $dir;
+			if ($$var)
+			{
+				$navi[$$var] = $dir;
+			}
 		}
 		return $navi;
 	}
@@ -767,13 +833,19 @@ 
 				if ($parent['type'] != 'grid')
 				{
 					// delete widget from parent
-					if ($parent['type'])	// box
+					if ($parent['type'])
+					{
+						// box
 					{
 						list($num,$options) = explode(',',$parent['size'],2);
-						if ($num <= 1)	// cant delete last child --> only empty it
+					}
+						if ($num <= 1)
+						{
+							// cant delete last child --> only empty it
 						{
 							$parent[$num=1] = boetemplate::empty_cell();
 						}
+						}
 						else
 						{
 							for($n = $child_id; $n < $num; ++$n)
@@ -786,10 +858,13 @@ 
 					}
 					else	// template itself
 					{
-						if (count($this->etemplate->children) <= 1)	// cant delete last child
+						if (count($this->etemplate->children) <= 1)
+						{
+							// cant delete last child
 						{
 							$this->etemplate->children[0] = boetemplate::empty_cell();
 						}
+						}
 						else
 						{
 							unset($parent[$child_id]);
@@ -826,9 +901,13 @@ 
 			case 'box_insert_before':
 			case 'box_insert_behind':
 				$n = $child_id + (int)($action == 'box_insert_behind');
-				if (!$parent['type'])	// template
+				if (!$parent['type'])
+				{
+					// template
 				{
-					$num = count($parent)-1;	// 0..count()-1
+					$num = count($parent)-1;
+				}
+				// 0..count()-1
 				}
 				else // boxes
 				{
@@ -840,21 +919,31 @@ 
 				}
 				$parent[$n] = $content['cell'] = boetemplate::empty_cell();
 				$child_id = $n;
-				if ($parent['type']) $parent['size'] = (1+$num) . ($options ? ','.$options : '');
+				if ($parent['type'])
+				{
+					$parent['size'] = (1+$num) . ($options ? ','.$options : '');
+				}
 				break;
 
 			case 'box_swap_next':
-				if (!$parent['type'])	// template
+				if (!$parent['type'])
 				{
-					$num = count($parent)-1;	// 0..count()-1
+					// template
+				{
+					$num = count($parent)-1;
+				}
+				// 0..count()-1
 				}
 				else // boxes
 				{
 					list($num) = explode(',',$parent['size'],2);
 				}
-				if ($child_id == $num)	// if on last cell, swap with the one before
+				if ($child_id == $num)
+				{
+					// if on last cell, swap with the one before
 				{
 					$this->swap($parent[$child_id],$parent[$child_id-1]);
+				}
 					--$child_id;
 				}
 				else
@@ -885,16 +974,25 @@ 
 		$cols =& $grid['cols'];
 		$opts =& $data[0];
 
-		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches)) list(,$r,$c) = $matches;
+		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches))
+		{
+			list(,$r,$c) = $matches;
+		}
 
-		if (!$c || !$r || $r > $rows) return "wrong child_id='$child_id' => r='$r', c='$c'";
+		if (!$c || !$r || $r > $rows)
+		{
+			return "wrong child_id='$child_id' => r='$r', c='$c'";
+		}
 
 		switch($action)
 		{
 			case 'row_swap_next':
 				if ($r > $rows-1)
 				{
-					if ($r != $rows) return lang('no row to swap with !!!');
+					if ($r != $rows)
+					{
+						return lang('no row to swap with !!!');
+					}
 					--$r;	// in last row swap with row above
 				}
 				$this->swap($data[$r],$data[1+$r]);
@@ -903,9 +1001,12 @@ 
 				break;
 
 			case 'row_delete':
-				if ($rows <= 1)	// one row only => delete whole grid
+				if ($rows <= 1)
+				{
+					// one row only => delete whole grid
 				{
 					return lang('cant delete the only row in a grid !!!');
+				}
 					// todo: delete whole grid instead
 				}
 				for($i = $r; $i < $rows; ++$i)
@@ -963,18 +1064,27 @@ 
 		$cols =& $grid['cols'];
 		$opts =& $data[0];
 
-		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches)) list(,$r,$c) = $matches;
+		if (preg_match('/^([0-9]+)([A-Z]+)$/',$child_id,$matches))
+		{
+			list(,$r,$c) = $matches;
+		}
 		// find the column-number (base 0) for $c (A, B, C, ...)
 		for($col = 0; boetemplate::num2chrs($col) != $c && $col < 100; ++$col) ;
 
-		if (!$c || !$r || $r > $rows || $col >= $cols) return "wrong child_id='$child_id' => r='$r', c='$c', col=$col";
+		if (!$c || !$r || $r > $rows || $col >= $cols)
+		{
+			return "wrong child_id='$child_id' => r='$r', c='$c', col=$col";
+		}
 
 		switch($action)
 		{
 			case 'column_swap_next':
 				if ($col >= $cols-1)
 				{
-					if ($col != $cols-1) return lang('no column to swap with !!!');
+					if ($col != $cols-1)
+					{
+						return lang('no column to swap with !!!');
+					}
 					$c = boetemplate::num2chrs(--$col); // in last column swap with the one before
 				}
 				$c_next = boetemplate::num2chrs(1+$col);
@@ -1091,9 +1201,18 @@ 
 					$onclick = str_replace('&values2url('.$values2url.')','',$cell_content['onclick']);
 				}
 				list($get,$target,$width,$height) = explode(',',$values2url ? $onclick : $cell_content['onclick']);
-				if (!$target) $target = '_blank';
-				if (!$width)  $width  = 600;
-				if (!$height) $height = 450;
+				if (!$target)
+				{
+					$target = '_blank';
+				}
+				if (!$width)
+				{
+					$width  = 600;
+				}
+				if (!$height)
+				{
+					$height = 450;
+				}
 				$widget['onclick'] = "window.open(egw::link('/index.php','$get')".($values2url ? "+values2url(this.form,$values2url)" : '').
 					",'$target','dependent=yes,width=$width,height=$height,scrollbars=yes,status=yes'); return false;";
 			}
@@ -1201,7 +1320,10 @@ 
 		{
 			foreach(array('save','apply','cancel','goto','goto2','edit_menu','box_menu','row_menu','column_menu') as $n => $name)
 			{
-				if (($action = $content[$name] ? ($n < 5 ? $name : $content[$name]) : false)) break;
+				if (($action = $content[$name] ? ($n < 5 ? $name : $content[$name]) : false))
+				{
+					break;
+				}
 				$name = '';
 			}
 			unset($content[$name]);
@@ -1258,7 +1380,10 @@ 
 					{
 						$this->change_widget_type($content['cell'],$widget);
 					}
-					if (!$action) break;
+					if (!$action)
+					{
+						break;
+					}
 					// save+apply only
 					$widget = $content['cell'];
 					if ($content['cell']['onclick_type'] || $content['cell']['onclick'])
@@ -1299,7 +1424,10 @@ 
 					$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array(
 							'menuaction' => 'etemplate.editor.edit',
 						)+$content['opener'])."';";
-					if ($action == 'apply' || $action == 'apply-no-merge') break;
+					if ($action == 'apply' || $action == 'apply-no-merge')
+					{
+						break;
+					}
 					// fall through
 				case 'cancel':
 					$js .= 'window.close();';
@@ -1457,7 +1585,10 @@ 
 				unset($allowed_parts['header']);
 				break;
 			case '':
-				if ($row > 1) $allowed_parts = array('' => $allowed_parts['']);
+				if ($row > 1)
+				{
+					$allowed_parts = array('' => $allowed_parts['']);
+				}
 				break;
 		}
 		switch($next_part)
@@ -1484,7 +1615,10 @@ 
 		{
 			foreach(boetemplate::$db_key_cols as $var)
 			{
-				if (isset($_GET[$var])) $content[$var] = $_GET[$var];
+				if (isset($_GET[$var]))
+				{
+					$content[$var] = $_GET[$var];
+				}
 			}
 		}
 		//_debug_array($content);
@@ -1568,10 +1702,18 @@ 
 		while (($template = @readdir($app_templates)) !== false)
 		{
 			$dir = EGW_SERVER_ROOT.'/'.$app.'/templates/'.$template;
-			if ($template[0] == '.' || $template == 'CVS' || !is_dir($dir.'/images')) continue;	// not a template-dir
+			if ($template[0] == '.' || $template == 'CVS' || !is_dir($dir.'/images'))
+			{
+				continue;
+			}
+			// not a template-dir
 			$exists = file_exists($dir.'/app.css');
 			$writable = is_writable($dir) || $exists && is_writable($dir.'/app.css');
-			if (!$exists && !$writable) continue;	// nothing to show
+			if (!$exists && !$writable)
+			{
+				continue;
+			}
+			// nothing to show
 			$rel_path = $app.'/templates/'.$template.'/app.css';
 			$sources[$rel_path] = lang('file').': '.$rel_path.($exists && !$writable ? ' ('.lang('readonly').')' : '');
 		}
@@ -1591,16 +1733,26 @@ 
 	 */
 	function scan_for_extensions($app='etemplate')
 	{
-		if (!is_array($this->extensions)) $this->extensions = array();
+		if (!is_array($this->extensions))
+		{
+			$this->extensions = array();
+		}
 
-		if (isset($this->extensions['**loaded**'][$app])) return '';	// already loaded
+		if (isset($this->extensions['**loaded**'][$app]))
+		{
+			return '';
+		}
+		// already loaded
 
 		$labels = array();
 		$dir = @opendir(EGW_SERVER_ROOT.'/'.$app.'/inc');
 		while ($dir && ($file = readdir($dir)))
 		{
 			// ignore et2 base widget matching name-schema of old eTemplate
-			if ($file == 'class.etemplate_widget.inc.php') continue;
+			if ($file == 'class.etemplate_widget.inc.php')
+			{
+				continue;
+			}
 
 			if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/',$file,$regs) &&
 				($regs[1] != 'xslt' || $this->etemplate->xslt) &&

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

@@ -491,7 +491,7 @@ 
 			foreach((array)$content['cont'] as $key => $val)
 			{
 				$vals["@$r"] = $key;
-				$vals["A$r"] = is_array($val) ? serialize($val).'#SeR#' : $val;
+				$vals["a$r"] = is_array($val) ? serialize($val).'#SeR#' : $val;
 				++$r;
 			}
 			$editor->data[$editor->rows]['A']['name'] = 'etemplate.editor.values';
@@ -527,10 +527,10 @@ 
 			$vals = $content['vals'];
 			$olds = $content['olds'];
 
-			for ($r = 1; isset($vals["A$r"]); ++$r)
+			for ($r = 1; isset($vals["a$r"]); ++$r)
 			{
-				$new_content['cont'][$olds["@$r"]] = substr($vals["A$r"],-5)=='#SeR#' ?
-					unserialize(substr($vals["A$r"],0,-5)) : $vals["A$r"];
+				$new_content['cont'][$olds["@$r"]] = substr($vals["a$r"],-5)=='#SeR#' ?
+					unserialize(substr($vals["a$r"],0,-5)) : $vals["a$r"];
 			}
 		}
 		// check if bo class of $app exists and has a labels method --> add labels to content to display them in the editor

etemplate/inc/class.etemplate.inc.php

Doc Comments +7 added lines, -16 removed lines

@@ -357,8 +357,6 @@ 
 	* Check if we have not ignored validation errors
 	*
 	* @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
-	* @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
-	* @return boolean true if there are not ignored validation errors, false otherwise
 	*/
 	static function validation_errors($ignore_validation='',$cname=null)
 	{
@@ -382,7 +380,6 @@ 
 	 * Check if given form-name matches ai ignore-validation rule
 	 *
 	 * @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
-	 * @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
 	 * @param string $cname
 	 * @return boolean
 	 */
@@ -651,8 +648,8 @@ 
 	* 		This is to facilitate complex ACL's which denies access on field-level !!!
 	* @param string $cname basename of names for form-elements, means index in $_POST
 	* 		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
-	* @param string $show_c name/index for name expansion
-	* @param string $show_row name/index for name expansion
+	* @param integer $show_c name/index for name expansion
+	* @param integer $show_row name/index for name expansion
 	* @return string the generated HTML
 	*/
 	function show($content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0)
@@ -755,8 +752,8 @@ 
 	* 		This is to facilitate complex ACL's which denies access on field-level !!!
 	* @param string $cname basename of names for form-elements, means index in $_POST
 	*		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
-	* @param string $show_c name/index for name expansion
-	* @param string $show_row name/index for name expansion
+	* @param integer $show_c name/index for name expansion
+	* @param integer $show_row name/index for name expansion
 	* @param string $path path in the widget tree
 	* @return string the generated HTML
 	*/
@@ -2009,8 +2006,6 @@ 
 	 * (If no id is directly supplied internally.)
 	 *
 	 * @param string $form_name
-	 * @param string $name=null
-	 * @param string $id=null
 	 * @return string ' id="..."' or '' if no id found
 	 */
 	static public function get_id($form_name,$name=null,$id=null)
@@ -2038,8 +2033,8 @@ 
 	 * --> use . as decimal separator for browser supporting html5 input type=number
 	 *
 	 * @param int|float|string $number
-	 * @param int $num_decimal_places=2
-	 * @param boolean $readonly=true
+	 * @param int $num_decimal_places
+	 * @param boolean $readonly
 	 * @return string
 	 */
 	static public function number_format($number,$num_decimal_places=2,$readonly=true)
@@ -2067,8 +2062,6 @@ 
 	*
 	* @param array $cell
 	* @param string $name
-	* @param array $content=array();
-	* @return array
 	*/
 	function _sel_options($cell,$name,$content=array())
 	{
@@ -2236,8 +2229,6 @@ 
 	* @param array $content $_POST[$cname], on return the adjusted content
 	* @param array $to_process list of widgets/form-fields to process
 	* @param string $cname='' basename of our returnt content (same as in call to show)
-	* @param string $_type='regular' type of request
-	* @return array with validation errors
 	*/
 	function process_show(&$content,$to_process,$cname='',$_type='regular')
 	{
@@ -2484,7 +2475,7 @@ 
 	*
 	* @param string $name (complete) name of the widget causing the error
 	* @param string|boolean $error error-message already translated or false to reset all existing error for given name
-	* @param string $cname=null set it to '', if the name is already a form-name, defaults to self::$name_vars
+	* @param string $cname
 	*/
 	static function set_validation_error($name,$error,$cname=null)
 	{

Indentation +219 added lines, -219 removed lines

@@ -28,55 +28,55 @@ 
 class etemplate extends boetemplate
 {
 	/**
-	* integer debug-level or template-name or cell-type or '' = off
-	* 1=calls to show and process_show, 2=content after process_show,
-	* 3=calls to show_cell and process_show_cell
-	*
-	* @public int/string
-	*/
+	 * integer debug-level or template-name or cell-type or '' = off
+	 * 1=calls to show and process_show, 2=content after process_show,
+	 * 3=calls to show_cell and process_show_cell
+	 *
+	 * @public int/string
+	 */
 	public $debug;
 	/**
-	* Inner width of browser window
-	*
-	* @public int
-	*/
+	 * Inner width of browser window
+	 *
+	 * @public int
+	 */
 	public $innerWidth;
 	/**
-	* Reference to the content-param of the last call to show, for extensions to use
-	*
-	* @public array
-	*/
+	 * Reference to the content-param of the last call to show, for extensions to use
+	 *
+	 * @public array
+	 */
 	public $content;
 	/**
-	* Reference to the sel_options-param of the last call to show, for extensions to use
-	*
-	* @public array
-	*/
+	 * Reference to the sel_options-param of the last call to show, for extensions to use
+	 *
+	 * @public array
+	 */
 	public $sel_options;
 	/**
-	* Name of the form of the currently processed etemplate
-	*
-	* @public string
-	*/
+	 * Name of the form of the currently processed etemplate
+	 *
+	 * @public string
+	 */
 	static $name_form='eTemplate';
 	/**
-	* Used form-names in this request
-	*
-	* @public array
-	*/
+	 * Used form-names in this request
+	 *
+	 * @public array
+	 */
 	static $name_forms=array();
 	/**
-	* Basename of the variables (content) in $_POST and id's, usually 'exec',
-	* if there's not more then one eTemplate on the page (then it will be exec, exec2, exec3, ...
-	*
-	* @public string
-	*/
+	 * Basename of the variables (content) in $_POST and id's, usually 'exec',
+	 * if there's not more then one eTemplate on the page (then it will be exec, exec2, exec3, ...
+	 *
+	 * @public string
+	 */
 	static $name_vars='exec';
 	/**
-	* Are we running as sitemgr module or not
-	*
-	* @public boolean
-	*/
+	 * Are we running as sitemgr module or not
+	 *
+	 * @public boolean
+	 */
 	public $sitemgr=false;
 	/**
 	 * Javascript to be called, when a widget get's double-clicked (used only by the editor)
@@ -129,11 +129,11 @@ 
 	static private $hook_app;
 
 	/**
-	* constructor of etemplate class, reads an eTemplate if $name is given
-	*
-	* @param string $name of etemplate or array with name and other keys
-	* @param string/array $load_via with keys of other etemplate to load in order to get $name
-	*/
+	 * constructor of etemplate class, reads an eTemplate if $name is given
+	 *
+	 * @param string $name of etemplate or array with name and other keys
+	 * @param string/array $load_via with keys of other etemplate to load in order to get $name
+	 */
 	function __construct($name='',$load_via='')
 	{
 		// tell framework old eTemplate apps needs eval and inline javascript :(
@@ -155,13 +155,13 @@ 
 	}
 
 	/**
-	* Abstracts a html-location-header call
-	*
-	* In other UI's than html this needs to call the methode, defined by menuaction or
-	* open a browser-window for any other links.
-	*
-	* @param string/array $params url or array with get-params incl. menuaction
-	*/
+	 * Abstracts a html-location-header call
+	 *
+	 * In other UI's than html this needs to call the methode, defined by menuaction or
+	 * open a browser-window for any other links.
+	 *
+	 * @param string/array $params url or array with get-params incl. menuaction
+	 */
 	static function location($params='')
 	{
 		egw::redirect_link(is_array($params) ? '/index.php' : $params,
@@ -169,33 +169,33 @@ 
 	}
 
 	/**
-	* Generats a Dialog from an eTemplate - abstract the UI-layer
-	*
-	* This is the only function an application should use, all other are INTERNAL and
-	* do NOT abstract the UI-layer, because they return HTML.
-	* Generates a webpage with a form from the template and puts process_exec in the
-	* form as submit-url to call process_show for the template before it
-	* ExecuteMethod's the given $method of the caller.
-	*
-	* @param string $method Methode (e.g. 'etemplate.editor.edit') to be called if form is submitted
-	* @param array $content with content to fill the input-fields of template, eg. the text-field
-	* 		with name 'name' gets its content from $content['name']
-	* @param $sel_options array or arrays with the options for each select-field, keys are the
-	* 		field-names, eg. array('name' => array(1 => 'one',2 => 'two')) set the
-	* 		options for field 'name'. ($content['options-name'] is possible too !!!)
-	* @param array $readonlys with field-names as keys for fields with should be readonly
-	* 		(eg. to implement ACL grants on field-level or to remove buttons not applicable)
-	* @param array $preserv with vars which should be transported to the $method-call (eg. an id) array('id' => $id) sets $_POST['id'] for the $method-call
-	* @param int $output_mode
-	*	 0 = echo incl. navbar
-	*	 1 = return html
-	*	-1 = first time return html, after use 0 (echo html incl. navbar), eg. for home
-	*	 2 = echo without navbar (eg. for popups)
-	*	 3 = return eGW independent html site
-	* @param string $ignore_validation if not empty regular expression for validation-errors to ignore
-	* @param array $changes change made in the last call if looping, only used internaly by process_exec
-	* @return string html for $output_mode == 1, else nothing
-	*/
+	 * Generats a Dialog from an eTemplate - abstract the UI-layer
+	 *
+	 * This is the only function an application should use, all other are INTERNAL and
+	 * do NOT abstract the UI-layer, because they return HTML.
+	 * Generates a webpage with a form from the template and puts process_exec in the
+	 * form as submit-url to call process_show for the template before it
+	 * ExecuteMethod's the given $method of the caller.
+	 *
+	 * @param string $method Methode (e.g. 'etemplate.editor.edit') to be called if form is submitted
+	 * @param array $content with content to fill the input-fields of template, eg. the text-field
+	 * 		with name 'name' gets its content from $content['name']
+	 * @param $sel_options array or arrays with the options for each select-field, keys are the
+	 * 		field-names, eg. array('name' => array(1 => 'one',2 => 'two')) set the
+	 * 		options for field 'name'. ($content['options-name'] is possible too !!!)
+	 * @param array $readonlys with field-names as keys for fields with should be readonly
+	 * 		(eg. to implement ACL grants on field-level or to remove buttons not applicable)
+	 * @param array $preserv with vars which should be transported to the $method-call (eg. an id) array('id' => $id) sets $_POST['id'] for the $method-call
+	 * @param int $output_mode
+	 *	 0 = echo incl. navbar
+	 *	 1 = return html
+	 *	-1 = first time return html, after use 0 (echo html incl. navbar), eg. for home
+	 *	 2 = echo without navbar (eg. for popups)
+	 *	 3 = return eGW independent html site
+	 * @param string $ignore_validation if not empty regular expression for validation-errors to ignore
+	 * @param array $changes change made in the last call if looping, only used internaly by process_exec
+	 * @return string html for $output_mode == 1, else nothing
+	 */
 	function exec($method,$content,$sel_options='',$readonlys='',$preserv='',$output_mode=0,$ignore_validation='',$changes='')
 	{
 		if (!$sel_options)
@@ -354,12 +354,12 @@ 
 	}
 
 	/**
-	* Check if we have not ignored validation errors
-	*
-	* @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
-	* @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
-	* @return boolean true if there are not ignored validation errors, false otherwise
-	*/
+	 * Check if we have not ignored validation errors
+	 *
+	 * @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
+	 * @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
+	 * @return boolean true if there are not ignored validation errors, false otherwise
+	 */
 	static function validation_errors($ignore_validation='',$cname=null)
 	{
 		if (is_null($cname)) $cname = self::$name_vars;
@@ -397,17 +397,17 @@ 
 	}
 
 	/**
-	* Makes the necessary adjustments to _POST before it calls the app's method
-	*
-	* This function is only to submit forms to, create with exec.
-	* All eTemplates / forms executed with exec are submited to this function
-	* via /etemplate/process_exec.php?menuaction=<callback>. We cant use the global index.php as
-	* it would set some constants to etemplate instead of the calling app.
-	* process_exec then calls process_show for the eTemplate (to adjust the content of the _POST) and
-	* ExecMethod's the given callback from the app with the content of the form as first argument.
-	*
-	* @return mixed false if no sessiondata and $this->sitemgr, else the returnvalue of exec of the method-calls
-	*/
+	 * Makes the necessary adjustments to _POST before it calls the app's method
+	 *
+	 * This function is only to submit forms to, create with exec.
+	 * All eTemplates / forms executed with exec are submited to this function
+	 * via /etemplate/process_exec.php?menuaction=<callback>. We cant use the global index.php as
+	 * it would set some constants to etemplate instead of the calling app.
+	 * process_exec then calls process_show for the eTemplate (to adjust the content of the _POST) and
+	 * ExecMethod's the given callback from the app with the content of the form as first argument.
+	 *
+	 * @return mixed false if no sessiondata and $this->sitemgr, else the returnvalue of exec of the method-calls
+	 */
 	function process_exec($etemplate_exec_id = null, $submit_button = null, $exec = null, $type = 'regular' )
 	{
 		if(!$etemplate_exec_id) $etemplate_exec_id = $_POST['etemplate_exec_id'];
@@ -603,12 +603,12 @@ 
 	}
 
 	/**
-	* process the values transfered with the javascript function values2url
-	*
-	* The returned array contains the preserved values overwritten (only!) with the variables named in values2url
-	*
-	* @return array/boolean content array or false on error
-	*/
+	 * process the values transfered with the javascript function values2url
+	 *
+	 * The returned array contains the preserved values overwritten (only!) with the variables named in values2url
+	 *
+	 * @return array/boolean content array or false on error
+	 */
 	function process_values2url()
 	{
 		//echo "process_exec: _GET ="; _debug_array($_GET);
@@ -636,25 +636,25 @@ 
 	static private $styles_included = array();
 
 	/**
-	* creates HTML from an eTemplate
-	*
-	* This is done by calling show_cell for each cell in the form. show_cell itself
-	* calls show recursivly for each included eTemplate.
-	* You could use it in the UI-layer of an app, just make shure to call process_show !!!
-	* This is intended as internal function and should NOT be called by new app's direct,
-	* as it deals with HTML and is so UI-dependent, use exec instead.
-	*
-	* @internal
-	* @param array $content with content for the cells, keys are the names given in the cells/form elements
-	* @param array $sel_options with options for the selectboxes, keys are the name of the selectbox
-	* @param array $readonlys with names of cells/form-elements to be not allowed to change
-	* 		This is to facilitate complex ACL's which denies access on field-level !!!
-	* @param string $cname basename of names for form-elements, means index in $_POST
-	* 		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
-	* @param string $show_c name/index for name expansion
-	* @param string $show_row name/index for name expansion
-	* @return string the generated HTML
-	*/
+	 * creates HTML from an eTemplate
+	 *
+	 * This is done by calling show_cell for each cell in the form. show_cell itself
+	 * calls show recursivly for each included eTemplate.
+	 * You could use it in the UI-layer of an app, just make shure to call process_show !!!
+	 * This is intended as internal function and should NOT be called by new app's direct,
+	 * as it deals with HTML and is so UI-dependent, use exec instead.
+	 *
+	 * @internal
+	 * @param array $content with content for the cells, keys are the names given in the cells/form elements
+	 * @param array $sel_options with options for the selectboxes, keys are the name of the selectbox
+	 * @param array $readonlys with names of cells/form-elements to be not allowed to change
+	 * 		This is to facilitate complex ACL's which denies access on field-level !!!
+	 * @param string $cname basename of names for form-elements, means index in $_POST
+	 * 		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
+	 * @param string $show_c name/index for name expansion
+	 * @param string $show_row name/index for name expansion
+	 * @return string the generated HTML
+	 */
 	function show($content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0)
 	{
 		if (!$sel_options)
@@ -701,13 +701,13 @@ 
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int/string $cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int/string $cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($cats)
 	{
 		static $cat2color;
@@ -740,26 +740,26 @@ 
 	}
 
 	/**
-	* creates HTML from an eTemplate
-	*
-	* This is done by calling show_cell for each cell in the form. show_cell itself
-	* calls show recursivly for each included eTemplate.
-	* You can use it in the UI-layer of an app, just make shure to call process_show !!!
-	* This is intended as internal function and should NOT be called by new app's direct,
-	* as it deals with HTML and is so UI-dependent, use exec instead.
-	*
-	* @internal
-	* @param array $grid representing a grid
-	* @param array $content with content for the cells, keys are the names given in the cells/form elements
-	* @param array $readonlys with names of cells/form-elements to be not allowed to change
-	* 		This is to facilitate complex ACL's which denies access on field-level !!!
-	* @param string $cname basename of names for form-elements, means index in $_POST
-	*		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
-	* @param string $show_c name/index for name expansion
-	* @param string $show_row name/index for name expansion
-	* @param string $path path in the widget tree
-	* @return string the generated HTML
-	*/
+	 * creates HTML from an eTemplate
+	 *
+	 * This is done by calling show_cell for each cell in the form. show_cell itself
+	 * calls show recursivly for each included eTemplate.
+	 * You can use it in the UI-layer of an app, just make shure to call process_show !!!
+	 * This is intended as internal function and should NOT be called by new app's direct,
+	 * as it deals with HTML and is so UI-dependent, use exec instead.
+	 *
+	 * @internal
+	 * @param array $grid representing a grid
+	 * @param array $content with content for the cells, keys are the names given in the cells/form elements
+	 * @param array $readonlys with names of cells/form-elements to be not allowed to change
+	 * 		This is to facilitate complex ACL's which denies access on field-level !!!
+	 * @param string $cname basename of names for form-elements, means index in $_POST
+	 *		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
+	 * @param string $show_c name/index for name expansion
+	 * @param string $show_row name/index for name expansion
+	 * @param string $path path in the widget tree
+	 * @return string the generated HTML
+	 */
 	private function show_grid(&$grid,$content,$readonlys='',$cname='',$show_c=0,$show_row=0,$path='')
 	{
 		if (!$readonlys)
@@ -978,15 +978,15 @@ 
 	}
 
 	/**
-	* build the name of a form-element from a basename and name
-	*
-	* name and basename can contain sub-indices in square bracets, eg. basename="base[basesub1][basesub2]"
-	* and name = "name[sub]" gives "base[basesub1][basesub2][name][sub]"
-	*
-	* @param string $cname basename
-	* @param string $name name
-	* @return string complete form-name
-	*/
+	 * build the name of a form-element from a basename and name
+	 *
+	 * name and basename can contain sub-indices in square bracets, eg. basename="base[basesub1][basesub2]"
+	 * and name = "name[sub]" gives "base[basesub1][basesub2][name][sub]"
+	 *
+	 * @param string $cname basename
+	 * @param string $name name
+	 * @return string complete form-name
+	 */
 	static function form_name($cname,$name)
 	{
 		if(is_object($name)) return '';
@@ -1005,13 +1005,13 @@ 
 	}
 
 	/**
-	* strip the prefix of a form-element from a form_name
-	* This function removes the prefix of form_name().  It takes a name like base[basesub1][basesub2][name][sub]
-	* and gives basesub1[basesub2][name][sub]
-	*
-	* @param string form_name
-	* @return string name without prefix
-	*/
+	 * strip the prefix of a form-element from a form_name
+	 * This function removes the prefix of form_name().  It takes a name like base[basesub1][basesub2][name][sub]
+	 * and gives basesub1[basesub2][name][sub]
+	 *
+	 * @param string form_name
+	 * @return string name without prefix
+	 */
 	static private function template_name($form_name)
 	{
 		$parts = explode('[',str_replace(']','',$form_name));
@@ -1028,24 +1028,24 @@ 
 	static private $class_conf = array('nmh' => 'th','nmr0' => 'row_on','nmr1' => 'row_off');
 
 	/**
-	* generates HTML for one widget (input-field / cell)
-	*
-	* calls show to generate included eTemplates. Again only an INTERMAL function.
-	*
-	* @internal
-	* @param array $cell with data of the cell: name, type, ...
-	* @param array $content with content for the cells, keys are the names given in the cells/form elements
-	* @param array $readonlys with names of cells/form-elements to be not allowed to change
-	* 		This is to facilitate complex ACL's which denies access on field-level !!!
-	* @param string $cname basename of names for form-elements, means index in $_POST
-	*		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
-	* @param string $show_c name/index for name expansion
-	* @param string $show_row name/index for name expansion
-	* @param string &$span on return number of cells to span or 'all' for the rest (only used for grids)
-	* @param string &$class on return the css class of the cell, to be set in the <td> tag
-	* @param string $path path in the widget tree
-	* @return string the generated HTML
-	*/
+	 * generates HTML for one widget (input-field / cell)
+	 *
+	 * calls show to generate included eTemplates. Again only an INTERMAL function.
+	 *
+	 * @internal
+	 * @param array $cell with data of the cell: name, type, ...
+	 * @param array $content with content for the cells, keys are the names given in the cells/form elements
+	 * @param array $readonlys with names of cells/form-elements to be not allowed to change
+	 * 		This is to facilitate complex ACL's which denies access on field-level !!!
+	 * @param string $cname basename of names for form-elements, means index in $_POST
+	 *		eg. $cname='cont', element-name = 'name' returned content in $_POST['cont']['name']
+	 * @param string $show_c name/index for name expansion
+	 * @param string $show_row name/index for name expansion
+	 * @param string &$span on return number of cells to span or 'all' for the rest (only used for grids)
+	 * @param string &$class on return the css class of the cell, to be set in the <td> tag
+	 * @param string $path path in the widget tree
+	 * @return string the generated HTML
+	 */
 	private function show_cell(&$cell,$content,$readonlys,$cname,$show_c,$show_row,&$span,&$class,$path='')
 	{
 		if ($this->debug && (is_int($this->debug) && $this->debug >= 3 || $this->debug == $cell['type']))
@@ -2063,13 +2063,13 @@ 
 	}
 
 	/**
-	* Retrive options for selectboxes and similar widgets (eg. the tree)
-	*
-	* @param array $cell
-	* @param string $name
-	* @param array $content=array();
-	* @return array
-	*/
+	 * Retrive options for selectboxes and similar widgets (eg. the tree)
+	 *
+	 * @param array $cell
+	 * @param string $name
+	 * @param array $content=array();
+	 * @return array
+	 */
 	function _sel_options($cell,$name,$content=array())
 	{
 		$sels = array();
@@ -2129,18 +2129,18 @@ 
 	}
 
 	/**
-	* Resolve javascript pseudo functions in onclick or onchange:
-	* - egw::link('$l','$p') calls $egw->link($l,$p)
-	* - form::name('name') returns expanded name/id taking into account the name at that point of the template hierarchy
-	* - egw::lang('Message ...') translate the message
-	* - confirm('message') translates 'message' and adds a '?' if not present
-	* - window.open() replaces it with egw(window).openPopup()
-	* - xajax_doXMLHTTP('etemplate. replace ajax calls in widgets with special handler not requiring etemplate run rights
-	*
-	* @param string $on onclick, onchange, ... action
-	* @param string $cname name-prefix / name-space
-	* @return string
-	*/
+	 * Resolve javascript pseudo functions in onclick or onchange:
+	 * - egw::link('$l','$p') calls $egw->link($l,$p)
+	 * - form::name('name') returns expanded name/id taking into account the name at that point of the template hierarchy
+	 * - egw::lang('Message ...') translate the message
+	 * - confirm('message') translates 'message' and adds a '?' if not present
+	 * - window.open() replaces it with egw(window).openPopup()
+	 * - xajax_doXMLHTTP('etemplate. replace ajax calls in widgets with special handler not requiring etemplate run rights
+	 *
+	 * @param string $on onclick, onchange, ... action
+	 * @param string $cname name-prefix / name-space
+	 * @return string
+	 */
 	function js_pseudo_funcs($on,$cname)
 	{
 		if (strpos($on,'::') !== false)	// avoid the expensive regular expresions, for performance reasons
@@ -2208,11 +2208,11 @@ 
 	}
 
 	/**
-	* applies stripslashes recursivly on each element of an array
-	*
-	* @param array &$var
-	* @return array
-	*/
+	 * applies stripslashes recursivly on each element of an array
+	 *
+	 * @param array &$var
+	 * @return array
+	 */
 	static function array_stripslashes($var)
 	{
 		if (!is_array($var))
@@ -2227,18 +2227,18 @@ 
 	}
 
 	/**
-	* makes necessary adjustments on $_POST after a eTemplate / form gots submitted
-	*
-	* This is only an internal function, dont call it direct use only exec
-	* Process_show uses a list of input-fields/widgets generated by show.
-	*
-	* @internal
-	* @param array $content $_POST[$cname], on return the adjusted content
-	* @param array $to_process list of widgets/form-fields to process
-	* @param string $cname='' basename of our returnt content (same as in call to show)
-	* @param string $_type='regular' type of request
-	* @return array with validation errors
-	*/
+	 * makes necessary adjustments on $_POST after a eTemplate / form gots submitted
+	 *
+	 * This is only an internal function, dont call it direct use only exec
+	 * Process_show uses a list of input-fields/widgets generated by show.
+	 *
+	 * @internal
+	 * @param array $content $_POST[$cname], on return the adjusted content
+	 * @param array $to_process list of widgets/form-fields to process
+	 * @param string $cname='' basename of our returnt content (same as in call to show)
+	 * @param string $_type='regular' type of request
+	 * @return array with validation errors
+	 */
 	function process_show(&$content,$to_process,$cname='',$_type='regular')
 	{
 		if (!isset($content) || !is_array($content) || !is_array($to_process))
@@ -2480,12 +2480,12 @@ 
 	}
 
 	/**
-	* Sets a validation error, to be displayed in the next exec
-	*
-	* @param string $name (complete) name of the widget causing the error
-	* @param string|boolean $error error-message already translated or false to reset all existing error for given name
-	* @param string $cname=null set it to '', if the name is already a form-name, defaults to self::$name_vars
-	*/
+	 * Sets a validation error, to be displayed in the next exec
+	 *
+	 * @param string $name (complete) name of the widget causing the error
+	 * @param string|boolean $error error-message already translated or false to reset all existing error for given name
+	 * @param string $cname=null set it to '', if the name is already a form-name, defaults to self::$name_vars
+	 */
 	static function set_validation_error($name,$error,$cname=null)
 	{
 		if (is_null($cname)) $cname = self::$name_vars;

Spacing +458 added lines, -460 removed lines

@@ -58,26 +58,26 @@ 
 	*
 	* @public string
 	*/
-	static $name_form='eTemplate';
+	static $name_form = 'eTemplate';
 	/**
 	* Used form-names in this request
 	*
 	* @public array
 	*/
-	static $name_forms=array();
+	static $name_forms = array();
 	/**
 	* Basename of the variables (content) in $_POST and id's, usually 'exec',
 	* if there's not more then one eTemplate on the page (then it will be exec, exec2, exec3, ...
 	*
 	* @public string
 	*/
-	static $name_vars='exec';
+	static $name_vars = 'exec';
 	/**
 	* Are we running as sitemgr module or not
 	*
 	* @public boolean
 	*/
-	public $sitemgr=false;
+	public $sitemgr = false;
 	/**
 	 * Javascript to be called, when a widget get's double-clicked (used only by the editor)
 	 * A '%p' gets replace with the colon ':' separated template-name, -version and path of the clicked widget.
@@ -134,22 +134,22 @@ 
 	* @param string $name of etemplate or array with name and other keys
 	* @param string/array $load_via with keys of other etemplate to load in order to get $name
 	*/
-	function __construct($name='',$load_via='')
+	function __construct($name = '', $load_via = '')
 	{
 		// tell framework old eTemplate apps needs eval and inline javascript :(
 		egw_framework::csp_script_src_attrs(array('unsafe-eval', 'unsafe-inline'));
 
-		parent::__construct($name,$load_via);
+		parent::__construct($name, $load_via);
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if (($this->innerWidth = (int) $_POST['innerWidth']))
+		if (($this->innerWidth = (int)$_POST['innerWidth']))
 		{
-			$GLOBALS['egw']->session->appsession('innerWidth','etemplate',$this->innerWidth);
+			$GLOBALS['egw']->session->appsession('innerWidth', 'etemplate', $this->innerWidth);
 		}
-		elseif (!($this->innerWidth = (int) $GLOBALS['egw']->session->appsession('innerWidth','etemplate')))
+		elseif (!($this->innerWidth = (int)$GLOBALS['egw']->session->appsession('innerWidth', 'etemplate')))
 		{
-			$this->innerWidth = 1018;	// default width for an assumed screen-resolution of 1024x768
+			$this->innerWidth = 1018; // default width for an assumed screen-resolution of 1024x768
 		}
 		//echo "<p>_POST[innerWidth]='$_POST[innerWidth]', innerWidth=$this->innerWidth</p>\n";
 	}
@@ -162,7 +162,7 @@ 
 	*
 	* @param string/array $params url or array with get-params incl. menuaction
 	*/
-	static function location($params='')
+	static function location($params = '')
 	{
 		egw::redirect_link(is_array($params) ? '/index.php' : $params,
 			is_array($params) ? $params : '');
@@ -196,7 +196,7 @@ 
 	* @param array $changes change made in the last call if looping, only used internaly by process_exec
 	* @return string html for $output_mode == 1, else nothing
 	*/
-	function exec($method,$content,$sel_options='',$readonlys='',$preserv='',$output_mode=0,$ignore_validation='',$changes='')
+	function exec($method, $content, $sel_options = '', $readonlys = '', $preserv = '', $output_mode = 0, $ignore_validation = '', $changes = '')
 	{
 		if (!$sel_options)
 		{
@@ -220,19 +220,19 @@ 
 		}
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
 		{
-			translation::add_app('etemplate');	// some extensions have own texts
+			translation::add_app('etemplate'); // some extensions have own texts
 		}
 		// use different form-names to allows multiple eTemplates in one page, eg. addressbook-view
 		self::$name_form = 'eTemplate';
-		if (in_array(self::$name_form,self::$name_forms))
+		if (in_array(self::$name_form, self::$name_forms))
 		{
-			self::$name_form .= 1+count(self::$name_forms);
-			self::$name_vars .= 1+count(self::$name_forms);
+			self::$name_form .= 1 + count(self::$name_forms);
+			self::$name_vars .= 1 + count(self::$name_forms);
 		}
 		self::$name_forms[] = self::$name_form;
 
 		self::$request = etemplate_request::read();
-		self::$request->output_mode = $output_mode;	// let extensions "know" they are run eg. in a popup
+		self::$request->output_mode = $output_mode; // let extensions "know" they are run eg. in a popup
 		self::$request->readonlys = $readonlys;
 		self::$request->content = $content;
 		self::$request->changes = $changes;
@@ -245,7 +245,7 @@ 
 		// tell html5 form validation NOT to validate
 		if ($ignore_validation) self::$form_options .= ' novalidate="novalidate"';
 
-		if((int) $output_mode == 3)
+		if ((int)$output_mode == 3)
 		{
 			self::$styles_included[$this->name] = True;
 			return "<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
@@ -253,7 +253,7 @@ 
 				."<body>\n".$this->show($content)."\n</body>\n</html>";
 		}
 
-		$html = $this->show(self::complete_array_merge($content,$changes),$sel_options,$readonlys,self::$name_vars);
+		$html = $this->show(self::complete_array_merge($content, $changes), $sel_options, $readonlys, self::$name_vars);
 
 		self::$request->java_script_from_flags = $GLOBALS['egw_info']['flags']['java_script'];
 		self::$request->java_script_body_tags = array(
@@ -265,10 +265,10 @@ 
 		self::$request->include_xajax = $GLOBALS['egw_info']['flags']['include_xajax'];
 
 		// check if application of template has a app.js file --> load it
-		list($app) = explode('.',$this->name);
+		list($app) = explode('.', $this->name);
 		if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
 		{
-			egw_framework::validate_file('.','app',$app,false);
+			egw_framework::validate_file('.', 'app', $app, false);
 		}
 
 		if (!$this->sitemgr)
@@ -282,12 +282,12 @@ 
 		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
 		self::$request->template = $this->as_array(2);
 
-		$html = html::form(html::input('etemplate_exec_id',self::$request->id(),'hidden',' id="etemplate_exec_id"').$html.
+		$html = html::form(html::input('etemplate_exec_id', self::$request->id(), 'hidden', ' id="etemplate_exec_id"').$html.
 			html::input_hidden(array(
 				'submit_button' => '',
 				'innerWidth'    => '',
-			),'',false),array(),$this->sitemgr ? '' : '/etemplate/process_exec.php?menuaction='.$method,
-			'',self::$name_form,self::$form_options.
+			), '', false), array(), $this->sitemgr ? '' : '/etemplate/process_exec.php?menuaction='.$method,
+			'', self::$name_form, self::$form_options.
 			// dont set the width of popups!
 			($output_mode != 0 ? '' : ' onsubmit="this.innerWidth.value=window.innerWidth ? window.innerWidth : document.body.clientWidth;"'));
 			//echo "to_process="; _debug_array(self::$request->to_process);
@@ -300,7 +300,7 @@ 
 			// support the old global var, in case old apps like 1.6 infolog use it
 			if (isset($GLOBALS['egw_info']['etemplate']['hooked'])) self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked'];
 
-			if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1)	// not just returning the html
+			if (!@self::$hooked && (int)$output_mode != 1 && (int)$output_mode != -1)	// not just returning the html
 			{
 				if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
 				{
@@ -308,17 +308,17 @@ 
 				}
 			}
 			// saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook)
-			self::$previous_content =& $html;
+			self::$previous_content = & $html;
 		}
 		//echo '<p>'.__METHOD__."($method,...) after show: sitemgr=$this->sitemgr, hooked=".(int)$hooked.", output_mode=$output_mode</p>\n";
 
-		if (!$this->sitemgr && (int) $output_mode != 1 && (int) $output_mode != -1)	// NOT returning html
+		if (!$this->sitemgr && (int)$output_mode != 1 && (int)$output_mode != -1)	// NOT returning html
 		{
 			if (!@self::$hooked)
 			{
 				// let framework know, if we are a popup or not ('popup' not true, which is allways used by index.php!)
 				$GLOBALS['egw_info']['flags']['nonavbar'] = $output_mode == 2 ? 'popup' : false;
-				if((int) $output_mode != 2)
+				if ((int)$output_mode != 2)
 				{
 					echo $GLOBALS['egw']->framework->navbar();
 				}
@@ -332,22 +332,22 @@ 
 						echo $manual->show(array());
 						unset($manual);
 						echo '<style type="text/css">.ajax-loader { position: absolute; right: 27px; top: 24px; display: none; }</style>'."\n";
-						echo '<div class="ajax-loader">'.html::image('phpgwapi','ajax-loader') . '</div>';
+						echo '<div class="ajax-loader">'.html::image('phpgwapi', 'ajax-loader').'</div>';
 					}
 				}
 			}
 			echo self::$hook_content.$html;
 
-			if (!self::$hooked && (!isset($_GET['menuaction']) || strpos($_SERVER['PHP_SELF'],'process_exec.php') !== false))
+			if (!self::$hooked && (!isset($_GET['menuaction']) || strpos($_SERVER['PHP_SELF'], 'process_exec.php') !== false))
 			{
-				if((int) $output_mode == 2)
+				if ((int)$output_mode == 2)
 				{
 					echo "</div>\n";
 				}
 				common::egw_footer();
 			}
 		}
-		if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1)	// return html
+		if ($this->sitemgr || (int)$output_mode == 1 || (int)$output_mode == -1)	// return html
 		{
 			return $html;
 		}
@@ -360,13 +360,13 @@ 
 	* @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
 	* @return boolean true if there are not ignored validation errors, false otherwise
 	*/
-	static function validation_errors($ignore_validation='',$cname=null)
+	static function validation_errors($ignore_validation = '', $cname = null)
 	{
 		if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>uiself::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
 		if (!$ignore_validation) return count(self::$validation_errors) > 0;
 
-		foreach(self::$validation_errors as $name => $error)
+		foreach (self::$validation_errors as $name => $error)
 		{
 			if (!self::ignore_validation_match($name, $ignore_validation))
 			{
@@ -386,10 +386,10 @@ 
 	 * @param string $cname
 	 * @return boolean
 	 */
-	static function ignore_validation_match($form_name, $ignore_validation, $cname=null)
+	static function ignore_validation_match($form_name, $ignore_validation, $cname = null)
 	{
 		if (is_null($cname)) $cname = self::$name_vars;
-		if ($cname) $form_name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2', $form_name);
+		if ($cname) $form_name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/', '\\1\\2', $form_name);
 
 		return empty($ignore_validation) ||
 			$ignore_validation[0] == '/' && preg_match($ignore_validation, $form_name) ||
@@ -408,11 +408,11 @@ 
 	*
 	* @return mixed false if no sessiondata and $this->sitemgr, else the returnvalue of exec of the method-calls
 	*/
-	function process_exec($etemplate_exec_id = null, $submit_button = null, $exec = null, $type = 'regular' )
+	function process_exec($etemplate_exec_id = null, $submit_button = null, $exec = null, $type = 'regular')
 	{
-		if(!$etemplate_exec_id) $etemplate_exec_id = $_POST['etemplate_exec_id'];
-		if(!$submit_button) $submit_button = $_POST['submit_button'];
-		if(!$exec) $exec = $_POST;
+		if (!$etemplate_exec_id) $etemplate_exec_id = $_POST['etemplate_exec_id'];
+		if (!$submit_button) $submit_button = $_POST['submit_button'];
+		if (!$exec) $exec = $_POST;
 
 		//echo "process_exec: _POST ="; _debug_array($_POST);
 		if (!$etemplate_exec_id || !(self::$request = etemplate_request::read($etemplate_exec_id)))
@@ -429,7 +429,7 @@ 
 				// check if we have a failed upload, because user tried to uploaded a file
 				// bigger then php.ini setting post_max_size
 				// in that case the webserver calls PHP with $_POST === array()
-				if (substr($_SERVER['CONTENT_TYPE'],0,19) == 'multipart/form-data' &&
+				if (substr($_SERVER['CONTENT_TYPE'], 0, 19) == 'multipart/form-data' &&
 					$_SERVER['CONTENT_LENGTH'] > self::km2int(ini_get('post_max_size')))
 				{
 					$redirect['failed_upload'] = 1;
@@ -444,7 +444,7 @@ 
 		self::$name_vars = self::$request->name_vars;
 		if (isset($submit_button) && !empty($submit_button))
 		{
-			self::set_array($exec,$submit_button,'pressed');
+			self::set_array($exec, $submit_button, 'pressed');
 		}
 		$content = $exec[self::$name_vars];
 		if (!is_array($content))
@@ -455,35 +455,35 @@ 
 		//echo "process_exec($this->name) content ="; _debug_array($content);
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
 		{
-			$GLOBALS['egw']->translation->add_app('etemplate');	// some extensions have own texts
+			$GLOBALS['egw']->translation->add_app('etemplate'); // some extensions have own texts
 		}
-		$this->process_show($content,self::$request->to_process,self::$name_vars,$type);
+		$this->process_show($content, self::$request->to_process, self::$name_vars, $type);
 
 		self::$loop |= !$this->canceled && $this->button_pressed &&
-			$this->validation_errors(self::$request->ignore_validation);	// set by process_show
+			$this->validation_errors(self::$request->ignore_validation); // set by process_show
 
 		// If a tab has an error on it, change to that tab
-		foreach(self::$validation_errors as $form_name => $msg)
+		foreach (self::$validation_errors as $form_name => $msg)
 		{
 			$name = $this->template_name($form_name);
 			if (!$this->get_widget_by_name($name))
 			{
-				foreach($this->get_widgets_by_type('tab') as $widget)
+				foreach ($this->get_widgets_by_type('tab') as $widget)
 				{
 					$tab_name = $tabs = $widget['name'];
-					if (strpos($tabs,'=') !== false) list($tab_name,$tabs) = explode('=',$tabs,2);
-					foreach(explode('|',$tabs) as $tab)
+					if (strpos($tabs, '=') !== false) list($tab_name, $tabs) = explode('=', $tabs, 2);
+					foreach (explode('|', $tabs) as $tab)
 					{
-						if (strpos('.',$tab) === false) $tab = $this->name.'.'.$tab;
+						if (strpos('.', $tab) === false) $tab = $this->name.'.'.$tab;
 						$tab_tpl = new etemplate($tab);
 						if ($tab_tpl->get_widget_by_name($name))
 						{
 							$content[$tab_name] = $tab;
 							break 3;
 						}
-						elseif($name[0] == '#')
+						elseif ($name[0] == '#')
 						{
-							foreach($tab_tpl->get_widgets_by_type('customfields') as $cf_widget)
+							foreach ($tab_tpl->get_widgets_by_type('customfields') as $cf_widget)
 							{
 								if (empty($cf_widget['name']))
 								{
@@ -501,7 +501,7 @@ 
 
 		//echo "process_exec($this->name) process_show(content) ="; _debug_array($content);
 		//echo "process_exec($this->name) session_data[changes] ="; _debug_array(self::$request->changes);
-		$content = self::complete_array_merge(self::$request->changes,$content);
+		$content = self::complete_array_merge(self::$request->changes, $content);
 		//echo "process_exec($this->name) merge(changes,content) ="; _debug_array($content);
 
 		if (self::$loop && $type == 'regular')	// only loop for regular (not ajax_submit) requests
@@ -512,13 +512,13 @@ 
 				$GLOBALS['egw_info']['flags']['currentapp'] = self::$hook_app = self::$request->hook_app;
 
 				// Prevent previous content form names from being used again in exec()
-				preg_match_all('/<form .+name="('. self::$name_form . '[\d]*)"/',self::$request->hooked, $used);
-				if(is_array($used[1]) && count($used[1]))
+				preg_match_all('/<form .+name="('.self::$name_form.'[\d]*)"/', self::$request->hooked, $used);
+				if (is_array($used[1]) && count($used[1]))
 				{
 					self::$name_forms += $used[1];
 				}
 			}
-			if(self::$request->include_xajax) $GLOBALS['egw_info']['flags']['include_xajax'] = true;
+			if (self::$request->include_xajax) $GLOBALS['egw_info']['flags']['include_xajax'] = true;
 
 			if (!empty(self::$request->app_header))
 			{
@@ -530,7 +530,7 @@ 
 			{
 				foreach (self::$request->java_script_body_tags as $tag => $code)
 				{
-					call_user_func('egw_framework::set_'.$tag,$code);
+					call_user_func('egw_framework::set_'.$tag, $code);
 				}
 			}
 			if (is_array(self::$request->java_script_files))
@@ -538,7 +538,7 @@ 
 				$files = egw_framework::js_files();
 				if (is_array($files))
 				{
-					$files = array_unique(array_merge($files,self::$request->java_script_files));
+					$files = array_unique(array_merge($files, self::$request->java_script_files));
 				}
 				else
 				{
@@ -548,15 +548,15 @@ 
 			}
 
 			//echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array(self::complete_array_merge(self::$request->content,$content));
-			return $this->exec(self::$request->method,self::complete_array_merge(self::$request->content,$content),
-				self::$request->sel_options,self::$request->readonlys,self::$request->preserv,
-				self::$request->output_mode,self::$request->ignore_validation,$content);
+			return $this->exec(self::$request->method, self::complete_array_merge(self::$request->content, $content),
+				self::$request->sel_options, self::$request->readonlys, self::$request->preserv,
+				self::$request->output_mode, self::$request->ignore_validation, $content);
 		}
 		else
 		{
 			//echo "<p>process_exec($this->name): calling ".($type == 'regular' ? self::$request->method : $_GET['menuaction'])."</p>\n";
 			return ExecMethod($type == 'regular' ? self::$request->method : $_GET['menuaction'],
-				self::complete_array_merge(self::$request->preserv,$content));
+				self::complete_array_merge(self::$request->preserv, $content));
 		}
 	}
 
@@ -569,11 +569,11 @@ 
 	 * @param int &$max_upload=null on return max. upload size in byte
 	 * @return string
 	 */
-	static function max_upload_size_message(&$max_upload=null)
+	static function max_upload_size_message(&$max_upload = null)
 	{
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$post_max_size = ini_get('post_max_size');
-		$max_upload = min(self::km2int($upload_max_filesize),self::km2int($post_max_size)-2800);
+		$max_upload = min(self::km2int($upload_max_filesize), self::km2int($post_max_size) - 2800);
 
 		return lang('Maximum size for uploads').': '.egw_vfs::hsize($max_upload).
 			" (php.ini: upload_max_filesize=$upload_max_filesize, post_max_size=$post_max_size)";
@@ -589,13 +589,13 @@ 
 	{
 		if (!is_numeric($size))
 		{
-			switch(strtolower(substr($size,-1)))
+			switch (strtolower(substr($size, -1)))
 			{
 				case 'm':
-					$size = 1024*1024*(int)$size;
+					$size = 1024 * 1024 * (int)$size;
 					break;
 				case 'k':
-					$size = 1024*(int)$size;
+					$size = 1024 * (int)$size;
 					break;
 			}
 		}
@@ -623,9 +623,9 @@ 
 		{
 			$content = array();
 		}
-		$this->process_show($content,$request->to_process,self::$name_vars);
+		$this->process_show($content, $request->to_process, self::$name_vars);
 
-		return self::complete_array_merge($request->preserv,$content);
+		return self::complete_array_merge($request->preserv, $content);
 	}
 
 	/**
@@ -655,20 +655,20 @@ 
 	* @param string $show_row name/index for name expansion
 	* @return string the generated HTML
 	*/
-	function show($content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0)
+	function show($content, $sel_options = '', $readonlys = '', $cname = '', $show_c = 0, $show_row = 0)
 	{
 		if (!$sel_options)
 		{
 			$sel_options = array();
 		}
 		// make it globaly availible for show_cell and show_grid, or extensions
-		$this->sel_options =& $sel_options;
+		$this->sel_options = & $sel_options;
 
 		if (!$readonlys)
 		{
 			$readonlys = array();
 		}
-		if (++$this->already_showed > 1) return '';	// prefens infinit self-inclusion
+		if (++$this->already_showed > 1) return ''; // prefens infinit self-inclusion
 
 		if (is_int($this->debug) && $this->debug >= 1 || $this->name && $this->debug == $this->name)
 		{
@@ -677,12 +677,12 @@ 
 		}
 		if (!is_array($content))
 		{
-			$content = array();	// happens if incl. template has no content
+			$content = array(); // happens if incl. template has no content
 		}
 		// make the content availible as class-public for extensions
-		$this->content =& $content;
+		$this->content = & $content;
 
-		$html = "\n\n<!-- BEGIN eTemplate $this->name -->\n<div id=\"".str_replace('"','&quot;',$this->name)."\">\n\n";
+		$html = "\n\n<!-- BEGIN eTemplate $this->name -->\n<div id=\"".str_replace('"', '&quot;', $this->name)."\">\n\n";
 		if (!self::$styles_included[$this->name])
 		{
 			self::$styles_included[$this->name] = True;
@@ -691,11 +691,11 @@ 
 		$path = '/';
 		foreach ($this->children as $n => $child)
 		{
-			$h = $this->show_cell($child,$content,$readonlys,$cname,$show_c,$show_row,$nul,$class,$path.$n);
-			$html .= $class || $child['align'] ? html::div($h,html::formatOptions(array(
+			$h = $this->show_cell($child, $content, $readonlys, $cname, $show_c, $show_row, $nul, $class, $path.$n);
+			$html .= $class || $child['align'] ? html::div($h, html::formatOptions(array(
 				$class,
 				$child['align'],
-			),'class,align')) : $h;
+			), 'class,align')) : $h;
 		}
 		return $html."\n</div>\n<!-- END eTemplate $this->name -->\n\n";
 	}
@@ -713,7 +713,7 @@ 
 		static $cat2color;
 
 		// ACL check
-		$cats = $GLOBALS['egw']->categories->check_list(EGW_ACL_READ,$cats);
+		$cats = $GLOBALS['egw']->categories->check_list(EGW_ACL_READ, $cats);
 
 		if (!$cats) return null;
 
@@ -722,13 +722,13 @@ 
 			return $cat2color[$cats];
 		}
 
-		foreach(explode(',',$cats) as $cat)
+		foreach (explode(',', $cats) as $cat)
 		{
 			if (isset($cat2color[$cat]))
 			{
 				return $cat2color[$cat];
 			}
-			$data = categories::id2name($cat,'data');
+			$data = categories::id2name($cat, 'data');
 
 			if (is_array($data) && ($color = $data['color']))
 			{
@@ -760,7 +760,7 @@ 
 	* @param string $path path in the widget tree
 	* @return string the generated HTML
 	*/
-	private function show_grid(&$grid,$content,$readonlys='',$cname='',$show_c=0,$show_row=0,$path='')
+	private function show_grid(&$grid, $content, $readonlys = '', $cname = '', $show_c = 0, $show_row = 0, $path = '')
 	{
 		if (!$readonlys)
 		{
@@ -773,11 +773,11 @@ 
 		}
 		if (!is_array($content))
 		{
-			$content = array();	// happens if incl. template has no content
+			$content = array(); // happens if incl. template has no content
 		}
 		$content += array(	// for var-expansion in names in show_cell
 			'.c' => $show_c,
-			'.col' => $this->num2chrs($show_c-1),
+			'.col' => $this->num2chrs($show_c - 1),
 			'.row' => $show_row
 		);
 		$rows = array();
@@ -795,57 +795,57 @@ 
 		$row_id = $content['_row_id'];
 
 		$max_cols = $grid['cols'];
-		for ($r = 0; $row = 1+$r /*list($row,$cols) = each($data)*/; ++$r)
+		for ($r = 0; $row = 1 + $r /*list($row,$cols) = each($data)*/; ++$r)
 		{
 			if (!(list($r_key) = each($data)))	// no further row
 			{
-				if (!(($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname,false,$content) && $idx_cname) ||
-						(in_array($cols['A']['type'], array('vbox','hbox','box')) && $this->autorepeat_idx($cols['A'][1],0,$r,$idx,$idx_cname,false,$content) && $idx_cname) ||
-					($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname,false,$content) && $idx_cname)) ||
-					!$this->isset_array($content,$idx_cname))
+				if (!(($this->autorepeat_idx($cols['A'], 0, $r, $idx, $idx_cname, false, $content) && $idx_cname) ||
+						(in_array($cols['A']['type'], array('vbox', 'hbox', 'box')) && $this->autorepeat_idx($cols['A'][1], 0, $r, $idx, $idx_cname, false, $content) && $idx_cname) ||
+					($this->autorepeat_idx($cols['B'], 1, $r, $idx, $idx_cname, false, $content) && $idx_cname)) ||
+					!$this->isset_array($content, $idx_cname))
 				{
-					break;                     	// no auto-row-repeat
+					break; // no auto-row-repeat
 				}
 			}
 			else
 			{
 				$cols = &$data[$r_key];
-				$part = '';	// '' = body-prefix
-				list($height,$disabled,$part) = explode(',',$opts["h$row"]);
+				$part = ''; // '' = body-prefix
+				list($height, $disabled, $part) = explode(',', $opts["h$row"]);
 				$class = $opts["c$row"];
 			}
-			if ($disabled != '' && $this->check_disabled($disabled,$content,$r))
+			if ($disabled != '' && $this->check_disabled($disabled, $content, $r))
 			{
-				continue;	// row is disabled
+				continue; // row is disabled
 			}
-			if ($part) $row = $part[0].$row;	// add part prefix
-			$rows[".$row"] .= html::formatOptions($height,'height');
-			list($cl) = explode(',',$class);
-			if ($cl == '@' || $cl && strpos($cl,'$') !== false)
+			if ($part) $row = $part[0].$row; // add part prefix
+			$rows[".$row"] .= html::formatOptions($height, 'height');
+			list($cl) = explode(',', $class);
+			if ($cl == '@' || $cl && strpos($cl, '$') !== false)
 			{
-				$cl = $this->expand_name($cl,0,$r,$content['.c'],$content['.row'],$content);
-				if (!$cl || preg_match('/(^| )([0-9,]+)( |$)/',$cl,$matches))
+				$cl = $this->expand_name($cl, 0, $r, $content['.c'], $content['.row'], $content);
+				if (!$cl || preg_match('/(^| )([0-9,]+)( |$)/', $cl, $matches))
 				{
 					if (($color = $this->cats2color($matches[2])))
 					{
 						$rows[".$row"] .= ' style="background-color: '.$color.';"';
 					}
-					$cl = str_replace($matches[2],'row',$cl);
+					$cl = str_replace($matches[2], 'row', $cl);
 				}
 			}
-			if ($cl == 'nmr' || substr($cl,0,3) == 'row')	// allow to have further classes behind row
+			if ($cl == 'nmr' || substr($cl, 0, 3) == 'row')	// allow to have further classes behind row
 			{
-				$cl = 'row_'.($nmr_alternate++ & 1 ? 'off' : 'on').substr($cl,3); // alternate color
+				$cl = 'row_'.($nmr_alternate++ & 1 ? 'off' : 'on').substr($cl, 3); // alternate color
 			}
 			$cl = isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl;
-			$rows[".$row"] .= html::formatOptions($cl,'class');
-			$rows[".$row"] .= html::formatOptions($class,',valign');
+			$rows[".$row"] .= html::formatOptions($cl, 'class');
+			$rows[".$row"] .= html::formatOptions($class, ',valign');
 			// set row-id, if requested
 			if ($row_id && isset($content[$r][$row_id]))
 			{
 				$rows[".$row"] .= ' id="'.htmlspecialchars($content[$r][$row_id]).'"';
 			}
-			reset ($cols);
+			reset($cols);
 			$row_data = array();
 			for ($c = 0; True /*list($col,$cell) = each($cols)*/; ++$c)
 			{
@@ -856,18 +856,18 @@ 
 					// otherwise the rows have a differen number of cells and it saved a lot checks
 					if ($c >= $max_cols)
 					{
-						if (!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True,$content) ||
-							!$this->isset_array($content,$idx))
+						if (!$this->autorepeat_idx($cell, $c, $r, $idx, $idx_cname, True, $content) ||
+							!$this->isset_array($content, $idx))
 						{
-							break;	// no auto-col-repeat
+							break; // no auto-col-repeat
 						}
-						$max_cols = $c+1;
+						$max_cols = $c + 1;
 					}
 				}
 				else
 				{
 					$cell = $cols[$c_key];
-					list($col_width,$col_disabled) = explode(',',$opts[$col]);
+					list($col_width, $col_disabled) = explode(',', $opts[$col]);
 
 					if (!$cell['height'])	// if not set, cell-height = height of row
 					{
@@ -875,10 +875,10 @@ 
 					}
 					if (!$cell['width'])	// if not set, cell-width = width of column or table
 					{
-						list($col_span) = explode(',',$cell['span']);
+						list($col_span) = explode(',', $cell['span']);
 						if ($col_span == 'all' && !$c)
 						{
-							list($cell['width']) = explode(',',$this->size);
+							list($cell['width']) = explode(',', $this->size);
 						}
 						else
 						{
@@ -886,50 +886,50 @@ 
 						}
 					}
 				}
-				if ($col_disabled != '' && $this->check_disabled($col_disabled,$content,$r,$c))
+				if ($col_disabled != '' && $this->check_disabled($col_disabled, $content, $r, $c))
 				{
-					continue;	// col is disabled
+					continue; // col is disabled
 				}
 				$align_was = $cell['align'];
-				$row_data[$col] = $this->show_cell($cell,$content,$readonlys,$cname,$c,$r,$span,$cl,$path.'/'.$r_key.$c_key);
+				$row_data[$col] = $this->show_cell($cell, $content, $readonlys, $cname, $c, $r, $span, $cl, $path.'/'.$r_key.$c_key);
 
 				if ($row_data[$col] == '' && $this->rows == 1)
 				{
-					unset($row_data[$col]);	// omit empty/disabled cells if only one row
+					unset($row_data[$col]); // omit empty/disabled cells if only one row
 					continue;
 				}
 				if (strlen($cell['onclick']) > 1)
 				{
 					$onclick = $cell['onclick'];
-					if (strpos($onclick,'$') !== false || $onclick[0] == '@')
+					if (strpos($onclick, '$') !== false || $onclick[0] == '@')
 					{
-						$onclick = $this->expand_name($onclick,$c,$r,$content['.c'],$content['.row'],$content);
+						$onclick = $this->expand_name($onclick, $c, $r, $content['.c'], $content['.row'], $content);
 					}
-					$row_data[".$col"] .= ' onclick="'.$this->js_pseudo_funcs($onclick,$cname).'"' .self::get_id('',$cell['name'],$cell['id']);
+					$row_data[".$col"] .= ' onclick="'.$this->js_pseudo_funcs($onclick, $cname).'"'.self::get_id('', $cell['name'], $cell['id']);
 				}
-				$colspan = $span == 'all' ? $grid['cols']-$c : 0+$span;
+				$colspan = $span == 'all' ? $grid['cols'] - $c : 0 + $span;
 				if ($colspan > 1)
 				{
 					$row_data[".$col"] .= " colspan=\"$colspan\"";
-					for ($i = 1; $i < $colspan; ++$i,++$c)
+					for ($i = 1; $i < $colspan; ++$i, ++$c)
 					{
-						each($cols);	// skip next cell(s)
+						each($cols); // skip next cell(s)
 					}
 				}
 				else
 				{
-					list($width,$disable) = explode(',',$opts[$col]);
+					list($width, $disable) = explode(',', $opts[$col]);
 					if ($width)		// width only once for a non colspan cell
 					{
 						$row_data[".$col"] .= " width=\"$width\"";
 						$opts[$col] = "0,$disable";
 					}
 				}
-				$row_data[".$col"] .= html::formatOptions($cell['align']?$cell['align']:($align_was?$align_was:'left'),'align');
+				$row_data[".$col"] .= html::formatOptions($cell['align'] ? $cell['align'] : ($align_was ? $align_was : 'left'), 'align');
 				// allow to set further attributes in the tablecell, beside the class
 				if (is_array($cl))
 				{
-					foreach($cl as $attr => $val)
+					foreach ($cl as $attr => $val)
 					{
 						if ($attr != 'class' && $val)
 						{
@@ -939,33 +939,33 @@ 
 					$cl = $cl['class'];
 				}
 				$cl = $this->expand_name(isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl,
-					$c,$r,$show_c,$show_row,$content);
+					$c, $r, $show_c, $show_row, $content);
 				// else the class is set twice, in the table and the table-cell, which is not good for borders
 				if ($cl && $cell['type'] != 'template' && $cell['type'] != 'grid')
 				{
-					$row_data[".$col"] .= html::formatOptions($cl,'class');
+					$row_data[".$col"] .= html::formatOptions($cl, 'class');
 				}
 			}
 			$rows[$row] = $row_data;
 		}
 		if (!$rows) return '';
 
-		list($width,$height,,,,,$overflow) = $options = explode(',',$grid['size']);
+		list($width, $height,,,,, $overflow) = $options = explode(',', $grid['size']);
 		if ($overflow && $height)
 		{
-			$options[1] = '';	// set height in div only
+			$options[1] = ''; // set height in div only
 		}
-		$html = html::table($rows,html::formatOptions($options,'width,height,border,class,cellspacing,cellpadding').
-			html::formatOptions($grid['span'],',class').
-			html::formatOptions($grid['name']?self::form_name($cname,$grid['name']):'','id'));
+		$html = html::table($rows, html::formatOptions($options, 'width,height,border,class,cellspacing,cellpadding').
+			html::formatOptions($grid['span'], ',class').
+			html::formatOptions($grid['name'] ? self::form_name($cname, $grid['name']) : '', 'id'));
 
 		if (!empty($overflow))
 		{
 			if (is_numeric($height)) $height .= 'px';
 			if (is_numeric($width)) $width .= 'px';
-			if ($width == '100%') $overflow .= '; overflow-x: hidden';	// no horizontal scrollbar
-			$div_style=' style="'.($width?"width: $width; ":'').($height ? "height: $height; ":'')."overflow: $overflow;\"";
-			$html = html::div($html,$div_style);
+			if ($width == '100%') $overflow .= '; overflow-x: hidden'; // no horizontal scrollbar
+			$div_style = ' style="'.($width ? "width: $width; " : '').($height ? "height: $height; " : '')."overflow: $overflow;\"";
+			$html = html::div($html, $div_style);
 		}
 
 		// initialise egw_actions for nextmatch widget, if egwGridView_grid CSS class set
@@ -987,19 +987,19 @@ 
 	* @param string $name name
 	* @return string complete form-name
 	*/
-	static function form_name($cname,$name)
+	static function form_name($cname, $name)
 	{
-		if(is_object($name)) return '';
+		if (is_object($name)) return '';
 
-		$name_parts = explode('[',str_replace(']','',$name));
+		$name_parts = explode('[', str_replace(']', '', $name));
 		if (!empty($cname))
 		{
-			array_unshift($name_parts,$cname);
+			array_unshift($name_parts, $cname);
 		}
 		$form_name = array_shift($name_parts);
 		if (count($name_parts))
 		{
-			$form_name .= '['.implode('][',$name_parts).']';
+			$form_name .= '['.implode('][', $name_parts).']';
 		}
 		return $form_name;
 	}
@@ -1014,18 +1014,18 @@ 
 	*/
 	static private function template_name($form_name)
 	{
-		$parts = explode('[',str_replace(']','',$form_name));
+		$parts = explode('[', str_replace(']', '', $form_name));
 
-		array_shift($parts);	// remove exec
+		array_shift($parts); // remove exec
 
 		$name = array_shift($parts);
 
-		if ($parts) $name .= '['.implode('][',$parts).']';
+		if ($parts) $name .= '['.implode('][', $parts).']';
 
 		return $name;
 	}
 
-	static private $class_conf = array('nmh' => 'th','nmr0' => 'row_on','nmr1' => 'row_off');
+	static private $class_conf = array('nmh' => 'th', 'nmr0' => 'row_on', 'nmr1' => 'row_off');
 
 	/**
 	* generates HTML for one widget (input-field / cell)
@@ -1046,124 +1046,123 @@ 
 	* @param string $path path in the widget tree
 	* @return string the generated HTML
 	*/
-	private function show_cell(&$cell,$content,$readonlys,$cname,$show_c,$show_row,&$span,&$class,$path='')
+	private function show_cell(&$cell, $content, $readonlys, $cname, $show_c, $show_row, &$span, &$class, $path = '')
 	{
 		if ($this->debug && (is_int($this->debug) && $this->debug >= 3 || $this->debug == $cell['type']))
 		{
 			echo "<p>etemplate.show_cell($this->name,name='${cell['name']}',type='${cell['type']}',cname='$cname',...,'$path')</p>\n";
 		}
-		list($span) = explode(',',$cell['span']);	// evtl. overriten later for type template
+		list($span) = explode(',', $cell['span']); // evtl. overriten later for type template
 
 		if ($cell['name'][0] == '@' && $cell['type'] != 'template')
 		{
-			$cell['name'] = $this->get_array($content,$this->expand_name(substr($cell['name'],1),
-				$show_c,$show_row,$content['.c'],$content['.row'],$content));
+			$cell['name'] = $this->get_array($content, $this->expand_name(substr($cell['name'], 1),
+				$show_c, $show_row, $content['.c'], $content['.row'], $content));
 		}
-		$name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+		$name = $this->expand_name($cell['name'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		// allow names like "tabs=one|two|three", which will be equal to just "tabs"
 		// eg. for tabs to use a name independent of the tabs contained
-		if (is_string($name) && strpos($name,'=') !== false)
+		if (is_string($name) && strpos($name, '=') !== false)
 		{
-			list($name) = explode('=',$name);
+			list($name) = explode('=', $name);
 		}
-		$form_name = self::form_name($cname,$name);
+		$form_name = self::form_name($cname, $name);
 
-		$value = $this->get_array($content,$name);
+		$value = $this->get_array($content, $name);
 
 		$options = '';
-		if ($readonly = $cell['readonly'] && $readonlys[$name] !== false || 	// allow to overwrite readonly settings of a cell
+		if ($readonly = $cell['readonly'] && $readonlys[$name] !== false || // allow to overwrite readonly settings of a cell
 			@$readonlys[$name] && !is_array($readonlys[$name]) || $readonlys['__ALL__'] && (!is_string($name) || $readonlys[$name] !== false) ||
-			!empty($name) && is_string($name) && ($p = strrpos($name,'[')) !== false && ($parent=substr($name,0,$p)) && $readonlys[$parent])	// allow also set parent readonly (instead each child)
+			!empty($name) && is_string($name) && ($p = strrpos($name, '[')) !== false && ($parent = substr($name, 0, $p)) && $readonlys[$parent])	// allow also set parent readonly (instead each child)
 		{
 			$options .= ' readonly="readonly"';
 		}
-		if ((int) $cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
+		if ((int)$cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
 		if ($cell['accesskey']) $options .= ' accesskey="'.html::htmlspecialchars($cell['accesskey']).'"';
 
-		if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@'))	// expand cell['size'] for the button-disabled-check now
+		if (is_string($cell['size']) && (strchr($cell['size'], '$') || $cell['size'][0] == '@'))	// expand cell['size'] for the button-disabled-check now
 		{
-			$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$cell['size'] = $this->expand_name($cell['size'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
 		if ($cell['type'] == 'template' && !$this->check_disabled($cell['disabled'], $content))
 		{
 			// template is NOT disabled (eg. in editor)
 		}
-		elseif ($cell['disabled'] && $readonlys[$name] !== false || $readonly && in_array($cell['type'],array('button','buttononly','image','progress')) && strpos($cell['size'],',') === false)
+		elseif ($cell['disabled'] && $readonlys[$name] !== false || $readonly && in_array($cell['type'], array('button', 'buttononly', 'image', 'progress')) && strpos($cell['size'], ',') === false)
 		{
 			if ($this->rows == 1)
 			{
-				return '';	// if only one row omit cell
+				return ''; // if only one row omit cell
 			}
-			$cell = $this->empty_cell('label','',array('span' => $cell['span'])); // show nothing (keep the css class!)
+			$cell = $this->empty_cell('label', '', array('span' => $cell['span'])); // show nothing (keep the css class!)
 			$name = $value = '';
 		}
 		$extra_label = True;
 
-		if (strchr($cell['onchange'],'$') || $cell['onchange'][0] == '@')
+		if (strchr($cell['onchange'], '$') || $cell['onchange'][0] == '@')
 		{
-			$cell['onchange'] = $this->expand_name($cell['onchange'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$cell['onchange'] = $this->expand_name($cell['onchange'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
 		if ($cell['type'][0] == '@')
 		{
-			$cell['type'] = $this->expand_name($t=$cell['type'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$cell['type'] = $this->expand_name($t = $cell['type'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
 		// the while loop allows to build extensions from other extensions
 		// please note: only the first extension's post_process function is called !!!
-		list($type,$sub_type) = explode('-',$cell['type']);
-		while ((!self::$types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type,'pre_process'))
+		list($type, $sub_type) = explode('-', $cell['type']);
+		while ((!self::$types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type, 'pre_process'))
 		{
 			//echo "<p>pre_process($cell[name]/$cell[type])</p>\n";
-			if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@'))
+			if (is_string($cell['size']) && (strchr($cell['size'], '$') || $cell['size'][0] == '@'))
 			{
-				$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+				$cell['size'] = $this->expand_name($cell['size'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 			}
-			if (strchr($cell['onchange'],'$') || $cell['onchange'][0] == '@')
+			if (strchr($cell['onchange'], '$') || $cell['onchange'][0] == '@')
 			{
-				$cell['onchange'] = $this->expand_name($cell['onchange'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
+				$cell['onchange'] = $this->expand_name($cell['onchange'], $show_c, $show_row, $content['.c'], $content['.row'], $content);
 			}
 			if (!$ext_type) $ext_type = $type;
 			// if readonlys[__ALL__] is set, also set readonlys[$name] (extensions can mark themselfs as 'noReadonlysALL', eg. tab-widget!)
-			if ($readonlys['__ALL__'] && $readonlys[$name] !== false && !$this->haveExtension($type,'noReadonlysALL'))
+			if ($readonlys['__ALL__'] && $readonlys[$name] !== false && !$this->haveExtension($type, 'noReadonlysALL'))
 			{
 				$readonlys[$name] = true;
 			}
-			$extra_label = $this->extensionPreProcess($type,$form_name,$value,$cell,$readonlys[$name]);
+			$extra_label = $this->extensionPreProcess($type, $form_name, $value, $cell, $readonlys[$name]);
 
-			$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']);	// might be set or unset (===false) by extension
+			$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']); // might be set or unset (===false) by extension
 
-			self::set_array($content,$name,$value);
+			self::set_array($content, $name, $value);
 
-			if ($cell['type'] == $type.'-'.$sub_type) break;	// stop if no further type-change
+			if ($cell['type'] == $type.'-'.$sub_type) break; // stop if no further type-change
 
-			list($type,$sub_type) = explode('-',$cell['type']);
+			list($type, $sub_type) = explode('-', $cell['type']);
 		}
-		list(,$class) = explode(',',$cell['span']);	// might be set by extension
-		if (strchr($class,'$') || $class[0] == '@')
+		list(,$class) = explode(',', $cell['span']); // might be set by extension
+		if (strchr($class, '$') || $class[0] == '@')
 		{
-			$class = $this->expand_name($class,$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$class = $this->expand_name($class, $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
-		if ($cell['needed'] && !in_array($cell['type'],array('button','buttononly')))
+		if ($cell['needed'] && !in_array($cell['type'], array('button', 'buttononly')))
 		{
 			$class .= ' inputRequired';
 		}
 		$cell_options = $cell['size'];
-		if (strchr($cell_options,'$') || $cell_options[0] == '@')
+		if (strchr($cell_options, '$') || $cell_options[0] == '@')
 		{
-			$cell_options = $this->expand_name($cell_options,$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$cell_options = $this->expand_name($cell_options, $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
 		$label = $cell['label'];
-		if (strchr($label,'$') || $label[0] == '@')
+		if (strchr($label, '$') || $label[0] == '@')
 		{
-			$label = $this->expand_name($label,$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$label = $this->expand_name($label, $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
 		$help = $cell['help'];
-		if (strchr($help,'$') || $help[0] == '@')
+		if (strchr($help, '$') || $help[0] == '@')
 		{
 			$no_lang_on_help = true;
-			$help = $this->expand_name($help,$show_c,$show_row,$content['.c'],$content['.row'],$content);
+			$help = $this->expand_name($help, $show_c, $show_row, $content['.c'], $content['.row'], $content);
 		}
-		$blur = $cell['blur'][0] == '@' ? $this->get_array($content,substr($cell['blur'],1)) :
-			(strlen($cell['blur']) <= 1 ? $cell['blur'] : lang($cell['blur']));
+		$blur = $cell['blur'][0] == '@' ? $this->get_array($content, substr($cell['blur'], 1)) : (strlen($cell['blur']) <= 1 ? $cell['blur'] : lang($cell['blur']));
 
 		if ($blur)
 		{
@@ -1178,14 +1177,14 @@ 
 		{
 			if ((int)$cell['no_lang'] < 2 && !$no_lang_on_help)
 			{
-				if (($use_tooltip_for_help = $help[0] == '|')) $help = substr($help,1);
+				if (($use_tooltip_for_help = $help[0] == '|')) $help = substr($help, 1);
 				$help = lang($help);
 			}
-			if (substr($help,0,5) == 'call:')
+			if (substr($help, 0, 5) == 'call:')
 			{
-				$options .= ' onMouseOver="'.html::htmlspecialchars(substr($help,5)).'"';
+				$options .= ' onMouseOver="'.html::htmlspecialchars(substr($help, 5)).'"';
 			}
-			elseif (($use_tooltip_for_help = $use_tooltip_for_help || strpos($help,'<') !== false && strip_tags($help) != $help))	// helptext is html => use a tooltip
+			elseif (($use_tooltip_for_help = $use_tooltip_for_help || strpos($help, '<') !== false && strip_tags($help) != $help))	// helptext is html => use a tooltip
 			{
 				$options .= html::tooltip($help);
 			}
@@ -1193,7 +1192,7 @@ 
 			{
 				$onFocus .= "self.status='".addslashes(html::htmlspecialchars($help))."'; return true;";
 				$onBlur  .= "self.status=''; return true;";
-				if (in_array($cell['type'],array('button','buttononly','file')))	// for button additionally when mouse over button
+				if (in_array($cell['type'], array('button', 'buttononly', 'file')))	// for button additionally when mouse over button
 				{
 					$options .= " onMouseOver=\"self.status='".addslashes(html::htmlspecialchars($help))."'; return true;\"";
 					$options .= " onMouseOut=\"self.status=''; return true;\"";
@@ -1206,7 +1205,7 @@ 
 		}
 		if ($cell['onchange'] && !($cell['type'] == 'button' || $cell['type'] == 'buttononly'))
 		{
-			$onchange = $cell['onchange'] == '1' ? 'this.form.submit();' : $this->js_pseudo_funcs($cell['onchange'],$cname);
+			$onchange = $cell['onchange'] == '1' ? 'this.form.submit();' : $this->js_pseudo_funcs($cell['onchange'], $cname);
 			// rewriting onchange for checkboxes for IE to an onclick
 			if ($cell['type'] == 'checkbox' && html::$user_agent == 'msie')
 			{
@@ -1220,15 +1219,15 @@ 
 
 		if ($form_name != '')
 		{
-			$options = self::get_id($form_name,$cell['name'],$cell['id']).' '.$options;
+			$options = self::get_id($form_name, $cell['name'], $cell['id']).' '.$options;
 		}
 		switch ($type)
 		{
 			case 'label':	//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
 				if (is_array($value)) break;
-				if($cell_options)
+				if ($cell_options)
 				{
-					list($style,$extra_link,$activate_links,$label_for,$extra_link_target,$extra_link_popup,$extra_link_title) = self::csv_split($cell_options,7);
+					list($style, $extra_link, $activate_links, $label_for, $extra_link_target, $extra_link_popup, $extra_link_title) = self::csv_split($cell_options, 7);
 				}
 				else
 				{
@@ -1243,44 +1242,44 @@ 
 				$value = strlen($value) > 1 && !$cell['no_lang'] ? lang($value) : $value;
 				$value = nl2br(html::htmlspecialchars($value));
 				if ($activate_links) $value = html::activate_links($value);
-				if ($value != '' && $style && strpos($style,'b')!==false) $value = html::bold($value);
-				if ($value != '' && $style && strpos($style,'i')!==false) $value = html::italic($value);
+				if ($value != '' && $style && strpos($style, 'b') !== false) $value = html::bold($value);
+				if ($value != '' && $style && strpos($style, 'i') !== false) $value = html::italic($value);
 				// if the label has a name, use it as id in a span, to allow addressing it via javascript
-				$html .= ($name ? '<span id="'.($cell['id']?$cell['id']:$name).'">' : '').$value.($name ? '</span>' : '');
+				$html .= ($name ? '<span id="'.($cell['id'] ? $cell['id'] : $name).'">' : '').$value.($name ? '</span>' : '');
 				if ($help)
 				{
 					$class = array(
 						'class'       => $class,
 					);
-					list($class['onmouseover'],$class['onmouseout']) = html::tooltip($help, False, False,  true);
+					list($class['onmouseover'], $class['onmouseout']) = html::tooltip($help, False, False, true);
 				}
 				break;
 			case 'html':	//  size: [link],[link_target],[link_popup_size],[link_title],[activate_links]
-				list($extra_link,$extra_link_target,$extra_link_popup,$extra_link_title,$activate_links) = explode(',',$cell_options);
+				list($extra_link, $extra_link_target, $extra_link_popup, $extra_link_title, $activate_links) = explode(',', $cell_options);
 				if ($activate_links) $value = html::activate_links($value);
 				$html .= $value;
 				break;
 			case 'int':		// size: [min],[max],[len],[precision/sprint format],[step]
 			case 'integer':
 			case 'float':
-				list($min,$max,$cell_options,$pre,$step) = explode(',',$cell_options);
+				list($min, $max, $cell_options, $pre, $step) = explode(',', $cell_options);
 				// a few html5 options
 				if ((string)$min !== '') $options .= ' min="'.htmlspecialchars($min).'"';
 				if ((string)$max !== '') $options .= ' max="'.htmlspecialchars($max).'"';
 				//  default step="any" for float, as not setting it limits value to integer as step defaults to 1 in html5!
 				if (is_numeric($step) || $type == 'float')
 				{
-					$options .= ' step="'.(is_numeric($step)?$step:'any').'"';
+					$options .= ' step="'.(is_numeric($step) ? $step : 'any').'"';
 				}
 				if ($cell_options == '' && !$readonly)
 				{
 					$cell_options = $cell['type'] != 'float' ? 5 : 8;
 				}
 				// html5 input type=nummeric seems to ignore size, setting a width instead
-				$options .= ' style="width: '.(3+abs($cell_options)).'ex"';
+				$options .= ' style="width: '.(3 + abs($cell_options)).'ex"';
 				if (($type == 'float' || !is_numeric($pre)) && $value && $pre)
 				{
-					$value = is_numeric($pre) ? self::number_format($value,$pre,$readonly) : sprintf($pre,$value);
+					$value = is_numeric($pre) ? self::number_format($value, $pre, $readonly) : sprintf($pre, $value);
 				}
 				$cell_options .= ',,'.($cell['type'] != 'float' ? '/^-?[0-9]*$/' : '"/^-?[0-9]*[,.]?[0-9]*$/"').',number';
 				// fall-through
@@ -1288,16 +1287,16 @@ 
 			case 'passwd':
 			case 'text':		// size: [length][,maxLength[,preg[,html5type]]]
 			case 'textbox':
-				$cell_opts = $c = self::csv_split($cell_options);	// allows to enclose preg in quote to allow comma
+				$cell_opts = $c = self::csv_split($cell_options); // allows to enclose preg in quote to allow comma
 				// fix preg, in case it contains a comma (html5type is only letters and always last option!)
-				if (count($cell_opts) > 3 && ($cell_opts2 = explode(',',$cell_options)) && $cell_opts2[2][0] != '"')
+				if (count($cell_opts) > 3 && ($cell_opts2 = explode(',', $cell_options)) && $cell_opts2[2][0] != '"')
 				{
 					$html5type = array_pop($cell_opts);
-					$cell_opts = explode(',',$cell_options,3);
-					if (preg_match('/^[a-z]+$/i',$html5type))
+					$cell_opts = explode(',', $cell_options, 3);
+					if (preg_match('/^[a-z]+$/i', $html5type))
 					{
-						$cell_opts[2] = substr($cell_opts[2],0,-strlen($html5type)-1);
-						if ($cell_opts[2][0] == ',') $cell_opts[2] = '';	// happens in link-entry under some condition
+						$cell_opts[2] = substr($cell_opts[2], 0, -strlen($html5type) - 1);
+						if ($cell_opts[2][0] == ',') $cell_opts[2] = ''; // happens in link-entry under some condition
 						$cell_opts[] = $html5type;
 					}
 				}
@@ -1317,17 +1316,17 @@ 
 					{
 						$required = ' required';
 					}
-					$html .= html::input($form_name,$value,$type == 'passwd' ? 'password' : ($type == 'hidden' ? 'hidden' : $cell_opts[3]),
-						$options.html::formatOptions($cell_opts,'SIZE,MAXLENGTH').
-						$required.($type == 'passwd'?' autocomplete="off"':''));
+					$html .= html::input($form_name, $value, $type == 'passwd' ? 'password' : ($type == 'hidden' ? 'hidden' : $cell_opts[3]),
+						$options.html::formatOptions($cell_opts, 'SIZE,MAXLENGTH').
+						$required.($type == 'passwd' ? ' autocomplete="off"' : ''));
 
 					if (!$readonly)
 					{
-						self::$request->set_to_process($form_name,$cell['type'],array(
+						self::$request->set_to_process($form_name, $cell['type'], array(
 							'maxlength' => $cell_opts[1],
 							'needed'    => $cell['needed'],
 							'preg'      => $cell_opts[2],
-							'min'       => $min,	// int and float only
+							'min'       => $min, // int and float only
 							'max'       => $max,
 						));
 					}
@@ -1344,18 +1343,18 @@ 
 					// if textarea is readonly, but form_name is already used by an other widget, dont use it
 					// browser would only send the content of the readonly (and therefore unchanged) field
 					if ($readonly && self::$request->isset_to_process($form_name)) $form_name = '';
-					$html .= html::textarea($form_name,$value,
-						$options.html::formatOptions($cell_options,'ROWS,COLS').($cell['needed']?' required="required"':''));
+					$html .= html::textarea($form_name, $value,
+						$options.html::formatOptions($cell_options, 'ROWS,COLS').($cell['needed'] ? ' required="required"' : ''));
 				}
 				if (!$readonly)
 				{
-					self::$request->set_to_process($form_name,$cell['type'],array(
+					self::$request->set_to_process($form_name, $cell['type'], array(
 						'needed'    => $cell['needed'],
 					));
 				}
 				break;
 			case 'htmlarea':	// Multiline formatted Text Input, size: {simple|extended|advanced},height,width,toolbar-expanded,upload-path
-				list($mode,$height,$width,$toolbar,$baseref,$convertnl) = explode(',',$cell_options);
+				list($mode, $height, $width, $toolbar, $baseref, $convertnl) = explode(',', $cell_options);
 
 				if ($convertnl)
 				{
@@ -1369,33 +1368,33 @@ 
 						'toolbar_expanded' => $toolbar,
 					);
 					// html::fckEditor runs everything through html::purify
-					$html .= html::fckEditor($form_name,$value,$mode,$fckoptions,$height,$width,$baseref);
+					$html .= html::fckEditor($form_name, $value, $mode, $fckoptions, $height, $width, $baseref);
 
-					self::$request->set_to_process($form_name,$cell['type'],array(
+					self::$request->set_to_process($form_name, $cell['type'], array(
 						'needed'    => $cell['needed'],
-						'mode'      => $mode,	// need mode to not run purify for $mode=='ascii'
+						'mode'      => $mode, // need mode to not run purify for $mode=='ascii'
 					));
 				}
 				else
 				{
-					$html .= html::div(html::purify(html::activate_links($value)),'style="overflow: auto; width='. $width. '; height='. $height. '"');
+					$html .= html::div(html::purify(html::activate_links($value)), 'style="overflow: auto; width='.$width.'; height='.$height.'"');
 				}
 				break;
 			case 'checkbox':
 				$set_val = 1; $unset_val = 0;
 				if (!empty($cell_options))
 				{
-					list($set_val,$unset_val,$ro_true,$ro_false) = self::csv_split($cell_options);
+					list($set_val, $unset_val, $ro_true, $ro_false) = self::csv_split($cell_options);
 					if (!$set_val && !$unset_val) $set_val = 1;
 					$value = $value == $set_val;
 				}
-				if (($multiple = substr($cell['name'],-2) == '[]') && !$readonly)
+				if (($multiple = substr($cell['name'], -2) == '[]') && !$readonly)
 				{
-					$readonly = $readonlys[substr($cell['name'],0,-1).$set_val.']'];
+					$readonly = $readonlys[substr($cell['name'], 0, -1).$set_val.']'];
 				}
 				if ($readonly)
 				{
-					if (count(explode(',',$cell_options)) < 3)
+					if (count(explode(',', $cell_options)) < 3)
 					{
 						$ro_true = 'x';
 						$ro_false = '';
@@ -1412,27 +1411,27 @@ 
 					{
 						// add the set_val to the id to make it unique
 						$options = str_replace(self::get_id($form_name),
-							self::get_id(substr($form_name,0,-2)."[$set_val]"), $options);
+							self::get_id(substr($form_name, 0, -2)."[$set_val]"), $options);
 					}
-					$html .= html::input($form_name,$set_val,'checkbox',$options);
+					$html .= html::input($form_name, $set_val, 'checkbox', $options);
 
-					if ($multiple) $form_name = self::form_name($cname,substr($cell['name'],0,-2));
+					if ($multiple) $form_name = self::form_name($cname, substr($cell['name'], 0, -2));
 
 					if (!self::$request->isset_to_process($form_name))
 					{
-						self::$request->set_to_process($form_name,$cell['type'],array(
+						self::$request->set_to_process($form_name, $cell['type'], array(
 							'unset_value' => $unset_val,
 							'multiple'    => $multiple,
 							'needed'      => $cell['needed'],
 						));
 					}
-					self::$request->set_to_process_attribute($form_name,'values',$set_val,true);
-					if (!$multiple) unset($set_val);	// otherwise it will be added to the label
+					self::$request->set_to_process_attribute($form_name, 'values', $set_val, true);
+					if (!$multiple) unset($set_val); // otherwise it will be added to the label
 				}
 				break;
 			case 'radio':		// size: value if checked, readonly set, readonly unset
-				list($set_val,$ro_true,$ro_false) = self::csv_split($cell_options);
-				$set_val = $this->expand_name($set_val,$show_c,$show_row,$content['.c'],$content['.row'],$content);
+				list($set_val, $ro_true, $ro_false) = self::csv_split($cell_options);
+				$set_val = $this->expand_name($set_val, $show_c, $show_row, $content['.c'], $content['.row'], $content);
 
 				if ($value == $set_val)
 				{
@@ -1449,8 +1448,8 @@ 
 				}
 				else
 				{
-					$html .= html::input($form_name,$set_val,'RADIO',$options);
-					self::$request->set_to_process($form_name,$cell['type'],array(
+					$html .= html::input($form_name, $set_val, 'RADIO', $options);
+					self::$request->set_to_process($form_name, $cell['type'], array(
 						'needed' => $cell['needed'],
 					));
 				}
@@ -1458,34 +1457,34 @@ 
 			case 'button':
 			case 'buttononly':
 			case 'cancel':	// cancel button
-				if ($name == 'cancel' || stripos($name,'[cancel]') !== false) $type = 'cancel';
-				list($app) = explode('.',$this->name);
-				list($img,$ro_img) = explode(',',$cell_options);
-				if ($img[0] != '/' && strpos($img,'/') !== false && count($img_parts = explode('/',$img)) == 2)
+				if ($name == 'cancel' || stripos($name, '[cancel]') !== false) $type = 'cancel';
+				list($app) = explode('.', $this->name);
+				list($img, $ro_img) = explode(',', $cell_options);
+				if ($img[0] != '/' && strpos($img, '/') !== false && count($img_parts = explode('/', $img)) == 2)
 				{
-					list($app,$img) = $img_parts;	// allow to specify app in image name (eg. img='addressbook/navbar')
+					list($app, $img) = $img_parts; // allow to specify app in image name (eg. img='addressbook/navbar')
 				}
 				$title = strlen($label) <= 1 || $cell['no_lang'] ? $label : lang($label);
 				if ($cell['onclick'] &&
-					($onclick = $this->expand_name($cell['onclick'],$show_c,$show_row,$content['.c'],$content['.row'],$content)))
+					($onclick = $this->expand_name($cell['onclick'], $show_c, $show_row, $content['.c'], $content['.row'], $content)))
 				{
-					$onclick = $this->js_pseudo_funcs($onclick,$cname);
+					$onclick = $this->js_pseudo_funcs($onclick, $cname);
 				}
-				unset($cell['onclick']);	// otherwise the grid will handle it
+				unset($cell['onclick']); // otherwise the grid will handle it
 				if (($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button
 				{
-					$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').
+					$onclick = ($onclick ? preg_replace('/^return(.*);$/', 'if (\\1) ', $onclick) : '').
 						(((string)$cell['onchange'] === '1' || $img) ?
 						'return submitit('.self::$name_form.",'".$form_name."');" : $cell['onchange']).'; return false;';
 
-					if (!html::$netscape4 && substr($img,-1) == '%' && is_numeric($percent = substr($img,0,-1)))
+					if (!html::$netscape4 && substr($img, -1) == '%' && is_numeric($percent = substr($img, 0, -1)))
 					{
-						$html .= html::progressbar($percent,$title,'onclick="'.$onclick.'" '.$options);
+						$html .= html::progressbar($percent, $title, 'onclick="'.$onclick.'" '.$options);
 					}
 					else
 					{
-						$html .= '<a href="" onClick="'.$onclick.'" '.$options.'>' .
-							($img ? html::image($app,$img,$title,'border="0"') : $title) . '</a>';
+						$html .= '<a href="" onClick="'.$onclick.'" '.$options.'>'.
+							($img ? html::image($app, $img, $title, 'border="0"') : $title).'</a>';
 					}
 				}
 				else
@@ -1496,17 +1495,16 @@ 
 					}
 					if ($cell['onchange'] && $cell['onchange'] != 1)
 					{
-						$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').$cell['onchange'];
+						$onclick = ($onclick ? preg_replace('/^return(.*);$/', 'if (\\1) ', $onclick) : '').$cell['onchange'];
 					}
-					if ($type == 'cancel') $options .= ' novalidate="novalidate"';	// tell html5 form validation NOT to validate
-					$html .= !$readonly ? html::submit_button($form_name,$label,$onclick,
-						strlen($label) <= 1 || $cell['no_lang'],$options,$img,$app,$type == 'buttononly' ? 'button' : 'submit') :
-						html::image($app,$ro_img,'',$options);
+					if ($type == 'cancel') $options .= ' novalidate="novalidate"'; // tell html5 form validation NOT to validate
+					$html .= !$readonly ? html::submit_button($form_name, $label, $onclick,
+						strlen($label) <= 1 || $cell['no_lang'], $options, $img, $app, $type == 'buttononly' ? 'button' : 'submit') : html::image($app, $ro_img, '', $options);
 				}
 				$extra_label = False;
 				if (!$readonly && $type != 'buttononly')	// input button, are never submitted back!
 				{
-					self::$request->set_to_process($form_name,$type);
+					self::$request->set_to_process($form_name, $type);
 				}
 				break;
 			case 'hrule':
@@ -1520,9 +1518,9 @@ 
 				}
 				if ($name != '')
 				{
-					$cname .= $cname == '' ? $name : '['.str_replace('[','][',str_replace(']','',$name)).']';
+					$cname .= $cname == '' ? $name : '['.str_replace('[', '][', str_replace(']', '', $name)).']';
 				}
-				$html .= $this->show_grid($cell,$name ? $value : $content,$readonlys+(array)$readonlys[$name],$cname,$show_c,$show_row,$path);
+				$html .= $this->show_grid($cell, $name ? $value : $content, $readonlys + (array)$readonlys[$name], $cname, $show_c, $show_row, $path);
 				if ($set_readonlys_all) unset($readonlys['__ALL__']);
 				break;
 			case 'template':	// size: index in content-array (if not full content is past further on)
@@ -1538,44 +1536,44 @@ 
 				{
 					$obj = new etemplate();
 					$obj->init($cell['obj']);
-					$cell['obj'] =& $obj;
+					$cell['obj'] = & $obj;
 					unset($obj);
 				}
 				if (!is_object($cell['obj']))
 				{
 					if ($cell['name'][0] == '@')
 					{
-						$cell['obj'] = $this->get_array($content,substr($cell['name'],1));
+						$cell['obj'] = $this->get_array($content, substr($cell['name'], 1));
 						$obj_read = is_object($cell['obj']) ? 'obj from content' : 'obj read, obj-name from content';
 						if (!is_object($cell['obj']))
 						{
-							$cell['obj'] = new etemplate($cell['obj'],$this->as_array());
+							$cell['obj'] = new etemplate($cell['obj'], $this->as_array());
 						}
 					}
 					else
 					{  $obj_read = 'obj read';
-						$cell['obj'] = new etemplate($name,$this->as_array());
+						$cell['obj'] = new etemplate($name, $this->as_array());
 					}
 				}
 				if (is_int($this->debug) && $this->debug >= 3 || $this->debug == $cell['type'])
 				{
 					echo "<p>show_cell::template(tpl=$this->name,name=$cell[name]): $obj_read, readonly=$readonly</p>\n";
 				}
-				if ($this->autorepeat_idx($cell,$show_c,$show_row,$idx,$idx_cname,false,$content) || $cell_options != '')
+				if ($this->autorepeat_idx($cell, $show_c, $show_row, $idx, $idx_cname, false, $content) || $cell_options != '')
 				{
 					if ($span == '' && isset($content[$idx]['span']))
 					{	// this allows a colspan in autorepeated cells like the editor
-						list($span) = explode(',',$content[$idx]['span']);
+						list($span) = explode(',', $content[$idx]['span']);
 						if ($span == 'all')
 						{
 							$span = 1 + $content['cols'] - $show_c;
 						}
 					}
-					$readonlys = $this->get_array($readonlys,$idx);
-					$content = $this->get_array($content,$idx);
+					$readonlys = $this->get_array($readonlys, $idx);
+					$content = $this->get_array($content, $idx);
 					if ($idx_cname != '')
 					{
-						$cname .= $cname == '' ? $idx_cname : '['.str_replace('[','][',str_replace(']','',$idx_cname)).']';
+						$cname .= $cname == '' ? $idx_cname : '['.str_replace('[', '][', str_replace(']', '', $idx_cname)).']';
 					}
 					//echo "<p>show_cell-autorepeat($name,$show_c,$show_row,cname='$cname',idx='$idx',idx_cname='$idx_cname',span='$span'): content ="; _debug_array($content);
 				}
@@ -1593,21 +1591,21 @@ 
 				// propagate the CSS class to the template
 				if ($class)
 				{
-					$grid_size = array_pad(explode(',',$cell['obj']->size),4,'');
-					$grid_size[3] = ($grid_size[3] ? $grid_size[3].' ' : '') . $class;
-					$cell['obj']->size = implode(',',$grid_size);
+					$grid_size = array_pad(explode(',', $cell['obj']->size), 4, '');
+					$grid_size[3] = ($grid_size[3] ? $grid_size[3].' ' : '').$class;
+					$cell['obj']->size = implode(',', $grid_size);
 				}
-				$html = $cell['obj']->show($content,$this->sel_options,$readonlys,$cname,$show_c,$show_row);
+				$html = $cell['obj']->show($content, $this->sel_options, $readonlys, $cname, $show_c, $show_row);
 
 				if ($set_readonlys_all) unset($readonlys['__ALL__']);
 				break;
 			case 'select':	// size:[linesOnMultiselect|emptyLabel,extraStyleMulitselect, [<varies>,]{5} enhance]
 				$sels = array();
-				list($multiple,$extraStyleMultiselect) = explode(',',$cell_options,2);
+				list($multiple, $extraStyleMultiselect) = explode(',', $cell_options, 2);
 
 				// Allow widget to specify using enhanced select or not
-				$c_options = explode(',',$cell_options);
-				if(array_key_exists('enhance', $cell))
+				$c_options = explode(',', $cell_options);
+				if (array_key_exists('enhance', $cell))
 				{
 					$enhance = $cell['enhance'];
 				}
@@ -1617,21 +1615,21 @@ 
 					$enhance = ($c_options[7] == '1' || $c_options[7] == 'true');
 				}
 
-				if (!empty($multiple) && 0+$multiple <= 0)
+				if (!empty($multiple) && 0 + $multiple <= 0)
 				{
 					$sels[''] = $multiple < 0 ? 'all' : $multiple;
 					// extra-option: no_lang=0 gets translated later and no_lang=1 gets translated too (now), only no_lang>1 gets not translated
 					if ((int)$cell['no_lang'] == 1)
 					{
-						$sels[''] = substr($sels[''],-3) == '...' ? lang(substr($sels[''],0,-3)).'...' : lang($sels['']);
+						$sels[''] = substr($sels[''], -3) == '...' ? lang(substr($sels[''], 0, -3)).'...' : lang($sels['']);
 					}
 					$multiple = 0;
 				}
-				$sels += $this->_sel_options($cell,$name,$content);
-				if ($multiple && !is_array($value)) $value = explode(',',$value);
+				$sels += $this->_sel_options($cell, $name, $content);
+				if ($multiple && !is_array($value)) $value = explode(',', $value);
 				if ($readonly || $cell['noprint'])
 				{
-					foreach($multiple || is_array($value) ? $value : array($value) as $val)
+					foreach ($multiple || is_array($value) ? $value : array($value) as $val)
 					{
 						if (is_array($sels[$val]))
 						{
@@ -1640,7 +1638,7 @@ 
 						}
 						else
 						{
-							$option_label = ($sels[$val]?$sels[$val]:$val);
+							$option_label = ($sels[$val] ? $sels[$val] : $val);
 							$option_title = '';
 						}
 						if (!$cell['no_lang']) $option_label = lang($option_label);
@@ -1666,33 +1664,33 @@ 
 					}
 					if ($multiple && is_numeric($multiple))	// eg. "3+" would give a regular multiselectbox
 					{
-						$html .= html::checkbox_multiselect($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
-							$cell['no_lang'],$options,$multiple,$multiple[0]!=='0',
-							$extraStyleMultiselect,$enhance);
+						$html .= html::checkbox_multiselect($form_name.($multiple > 1 ? '[]' : ''), $value, $sels,
+							$cell['no_lang'], $options, $multiple, $multiple[0] !== '0',
+							$extraStyleMultiselect, $enhance);
 					}
 					else
 					{
-						$html .= html::select($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
-							$cell['no_lang'],$options,$multiple,$enhance);
+						$html .= html::select($form_name.($multiple > 1 ? '[]' : ''), $value, $sels,
+							$cell['no_lang'], $options, $multiple, $enhance);
 					}
 					if (!self::$request->isset_to_process($form_name))
 					{
 						// fix for optgroup's
-						$options=array();
-						foreach($sels as $key => $val)
+						$options = array();
+						foreach ($sels as $key => $val)
 						{
 							# we want the key anyway, even if this allowes more values than wanted (the name/key of the optgroup if there is one,
 							# the keys of the arrays in case you have key/value pair(s) as value for the value of your option ).
-							$options[$key]=$key;
+							$options[$key] = $key;
 							if (is_array($val))
 							{
-								foreach(array_keys($val) as $key2)
+								foreach (array_keys($val) as $key2)
 								{
-									$options[$key2]=$key2;
+									$options[$key2] = $key2;
 								}
 							}
 						}
-						self::$request->set_to_process($form_name,$cell['type'],array(
+						self::$request->set_to_process($form_name, $cell['type'], array(
 							'needed'  => $cell['needed'],
 							'allowed' => array_keys($options),
 							'multiple'=> $multiple,
@@ -1703,50 +1701,50 @@ 
 			case 'image':	// size: [link],[link_target],[imagemap],[link_popup],[id]
 			case 'progress':
 				if (is_string($value) && $value !== '' &&
-					($is_progress = substr($value,-1) == '%' && is_numeric(substr($value,0,-1))) !== ($type == 'progress'))
+					($is_progress = substr($value, -1) == '%' && is_numeric(substr($value, 0, -1))) !== ($type == 'progress'))
 				{
-					error_log("Please use correct widget-type '".($is_progress?'progress':'image')."' in eTemplate '$this->name'!");
+					error_log("Please use correct widget-type '".($is_progress ? 'progress' : 'image')."' in eTemplate '$this->name'!");
 				}
 				$image = $value != '' ? $value : $name;
-				if (is_string($image)) list($app,$img) = explode('/',$image,2);
-				if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
+				if (is_string($image)) list($app, $img) = explode('/', $image, 2);
+				if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img, '/') !== false)
 				{
 					$img = $image;
-					list($app) = explode('.',$this->name);
+					list($app) = explode('.', $this->name);
 				}
 				if (!$readonly)
 				{
-					list($extra_link,$extra_link_target,$imagemap,$extra_link_popup,$id) = self::csv_split($cell['size']);
+					list($extra_link, $extra_link_target, $imagemap, $extra_link_popup, $id) = self::csv_split($cell['size']);
 				}
-				$html .= html::image($app,$img,strlen($label) > 1 && !$cell['no_lang'] ? lang($label) : $label,
-					'border="0"'.($imagemap?' usemap="#'.html::htmlspecialchars($imagemap).'"':'').
-					($id || $value ? self::get_id($name,$cell['name'],$id) : ''));
+				$html .= html::image($app, $img, strlen($label) > 1 && !$cell['no_lang'] ? lang($label) : $label,
+					'border="0"'.($imagemap ? ' usemap="#'.html::htmlspecialchars($imagemap).'"' : '').
+					($id || $value ? self::get_id($name, $cell['name'], $id) : ''));
 				$extra_label = False;
 				break;
 			case 'file':	// size: size of the filename field
 				if (!$readonly)
 				{
-					if ((int) $cell_options) $options .= ' size="'.(int)$cell_options.'"';
-					if (substr($name,-2) == '[]')
+					if ((int)$cell_options) $options .= ' size="'.(int)$cell_options.'"';
+					if (substr($name, -2) == '[]')
 					{
 						self::$form_options .= ' enctype="multipart/form-data"';
-						if (strpos($options,'onChange="') !== false)
+						if (strpos($options, 'onChange="') !== false)
 						{
-							$options = preg_replace('/onChange="([^"]+)"/i','onChange="\\1; if (!this.multiple) add_upload(this);"',$options);
+							$options = preg_replace('/onChange="([^"]+)"/i', 'onChange="\\1; if (!this.multiple) add_upload(this);"', $options);
 						}
 						else
 						{
 							$options .= ' onChange="if (!this.multiple) add_upload(this);"';
 						}
-						$options .= ' multiple="multiple"';	// allow html5 browsers to select more then one file
+						$options .= ' multiple="multiple"'; // allow html5 browsers to select more then one file
 					}
 					else
 					{
-						$html .= html::input_hidden($path_name = str_replace($name,$name.'_path',$form_name),'.');
+						$html .= html::input_hidden($path_name = str_replace($name, $name.'_path', $form_name), '.');
 						self::$form_options = " enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
 					}
-					$html .= html::input($form_name,'','file',$options);
-					self::$request->set_to_process($form_name,$cell['type'],array(
+					$html .= html::input($form_name, '', 'file', $options);
+					self::$request->set_to_process($form_name, $cell['type'], array(
 						'needed' => $cell['needed'],
 					));
 				}
@@ -1762,12 +1760,12 @@ 
 				$box_row = 1;
 				$box_col = 'A';
 				$box_anz = 0;
-				list($num,$orient,,,$keep_empty) = explode(',',$cell_options);
+				list($num, $orient,,, $keep_empty) = explode(',', $cell_options);
 				if (!$orient) $orient = $type == 'hbox' ? 'horizontal' : ($type == 'box' ? false : 'vertical');
-				for ($n = 1; $n <= (int) $num; ++$n)
+				for ($n = 1; $n <= (int)$num; ++$n)
 				{
-					$child = $cell[$n];	// first param is a var_param now!
-					$h = $this->show_cell($child,$content,$readonlys,$cname,$show_c,$show_row,$nul,$cl,$path.'/'.$n);
+					$child = $cell[$n]; // first param is a var_param now!
+					$h = $this->show_cell($child, $content, $readonlys, $cname, $show_c, $show_row, $nul, $cl, $path.'/'.$n);
 					if ($h != '' && $h != '&nbsp;' || $keep_empty)
 					{
 						if ($orient != 'horizontal')
@@ -1780,7 +1778,7 @@ 
 						}
 						if (!$orient)
 						{
-							$html .= $cl ? html::div($h," class=\"$cl\"") : $h;
+							$html .= $cl ? html::div($h, " class=\"$cl\"") : $h;
 						}
 						else
 						{
@@ -1789,18 +1787,18 @@ 
 						$box_anz++;
 						if ($cell[$n]['align'])
 						{
-							$rows[$box_row]['.'.$box_col] = html::formatOptions($child['align'],'align');
+							$rows[$box_row]['.'.$box_col] = html::formatOptions($child['align'], 'align');
 							$sub_cell_has_align = true;
 						}
 						if (strlen($child['onclick']) > 1)
 						{
-							$rows[$box_row]['.'.$box_col] .= ' onclick="'.$this->js_pseudo_funcs($child['onclick'],$cname).'"'.
-								self::get_id('',$child['name'],$child['id']);
+							$rows[$box_row]['.'.$box_col] .= ' onclick="'.$this->js_pseudo_funcs($child['onclick'], $cname).'"'.
+								self::get_id('', $child['name'], $child['id']);
 						}
 						// allow to set further attributes in the tablecell, beside the class
 						if (is_array($cl))
 						{
-							foreach($cl as $attr => $val)
+							foreach ($cl as $attr => $val)
 							{
 								if ($attr != 'class' && $val)
 								{
@@ -1810,22 +1808,22 @@ 
 							$cl = $cl['class'];
 						}
 						$box_item_class = $this->expand_name(isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl,
-							$show_c,$show_row,$content['.c'],$content['.row'],$content);
-						$rows[$box_row]['.'.$box_col] .= html::formatOptions($box_item_class,'class');
+							$show_c, $show_row, $content['.c'], $content['.row'], $content);
+						$rows[$box_row]['.'.$box_col] .= html::formatOptions($box_item_class, 'class');
 					}
 				}
 				if ($box_anz > 1 && $orient)	// a single cell is NOT placed into a table
 				{
-					$html = html::table($rows,html::formatOptions($cell_options,',,cellpadding,cellspacing').
-						($type != 'groupbox' ? html::formatOptions($class,'class').
-							 ($cell['name'] ? self::get_id($form_name,$cell['name'],$cell['id']) : '') : '').
-						($cell['align'] && $orient != 'horizontal' || $sub_cell_has_align ? ' width="100%"' : ''));	// alignment only works if table has full width
-					if ($type != 'groupbox') $class = '';	// otherwise we create an extra div
+					$html = html::table($rows, html::formatOptions($cell_options, ',,cellpadding,cellspacing').
+						($type != 'groupbox' ? html::formatOptions($class, 'class').
+							 ($cell['name'] ? self::get_id($form_name, $cell['name'], $cell['id']) : '') : '').
+						($cell['align'] && $orient != 'horizontal' || $sub_cell_has_align ? ' width="100%"' : '')); // alignment only works if table has full width
+					if ($type != 'groupbox') $class = ''; // otherwise we create an extra div
 				}
 				// put the class of the box-cell, into the the class of this cell
 				elseif ($box_item_class && $box_anz == 1)
 				{
-					$class = ($class ? $class . ' ' : '') . $box_item_class;
+					$class = ($class ? $class.' ' : '').$box_item_class;
 					// if we have onclick or tooltip, add it to an extra div around single cell
 					if (!empty($rows[$box_row]['.'.$box_col])) $html = html::div($html, $rows[$box_row]['.'.$box_col]);
 				}
@@ -1835,19 +1833,19 @@ 
 					{
 						$label = lang($label);
 					}
-					$html = html::fieldset($html,$label,self::get_id($form_name,$cell['name'],$cell['id']).
+					$html = html::fieldset($html, $label, self::get_id($form_name, $cell['name'], $cell['id']).
 						($class ? ' class="'.$class.'"' : ''));
-					$class = '';	// otherwise we create an extra div
+					$class = ''; // otherwise we create an extra div
 				}
 				elseif (!$orient)
 				{
-					if (strpos($html,'class="'.$class)) $class = '';	// dont add class a 2. time
-					$html = html::div($html,html::formatOptions(array(
+					if (strpos($html, 'class="'.$class)) $class = ''; // dont add class a 2. time
+					$html = html::div($html, html::formatOptions(array(
 							$cell['height'],
 							$cell['width'],
 							$class,
-						),'height,width,class').self::get_id($form_name,$cell['name'],$cell['id'])). ($html ? '' : '</div>');
-					$class = '';	// otherwise we create an extra div
+						), 'height,width,class').self::get_id($form_name, $cell['name'], $cell['id'])).($html ? '' : '</div>');
+					$class = ''; // otherwise we create an extra div
 				}
 				if ($box_anz > 1)	// small docu in the html-source
 				{
@@ -1858,30 +1856,30 @@ 
 				$extra_label = False;
 				break;
 			case 'deck':
-				for ($n = 1; $n <= $cell_options && (empty($value) || $value != $cell[$n]['name']); ++$n) ;
+				for ($n = 1; $n <= $cell_options && (empty($value) || $value != $cell[$n]['name']); ++$n);
 				if ($n > $cell_options)
 				{
 					$value = $cell[1]['name'];
 				}
 				if ($s_width = $cell['width'])
 				{
-					$s_width = "width: $s_width".(substr($s_width,-1) != '%' ? 'px' : '').';';
+					$s_width = "width: $s_width".(substr($s_width, -1) != '%' ? 'px' : '').';';
 				}
 				if ($s_height = $cell['height'])
 				{
-					$s_height = "height: $s_height".(substr($s_height,-1) != '%' ? 'px' : '').';';
+					$s_height = "height: $s_height".(substr($s_height, -1) != '%' ? 'px' : '').';';
 				}
-				$html = html::input_hidden($form_name,$value);
-				self::$request->set_to_process($form_name,$cell['type']);
+				$html = html::input_hidden($form_name, $value);
+				self::$request->set_to_process($form_name, $cell['type']);
 
 				for ($n = 1; $n <= $cell_options; ++$n)
 				{
-					$child = $cell[$n];	// first param is a var_param now!
-					$html .= html::div($this->show_cell($child,$content,$readonlys,$cname,$show_c,
-						$show_row,$nul,$cl,$path.'/'.$n),html::formatOptions(array(
+					$child = $cell[$n]; // first param is a var_param now!
+					$html .= html::div($this->show_cell($child, $content, $readonlys, $cname, $show_c,
+						$show_row, $nul, $cl, $path.'/'.$n), html::formatOptions(array(
 						'display: '.($value == $child['name'] ? 'inline' : 'none').';',
 						$child['name']
-					),'style,id'));
+					), 'style,id'));
 				}
 				break;
 			case 'colorpicker':
@@ -1891,9 +1889,9 @@ 
 				}
 				else
 				{
-					$html = html::inputColor($form_name,$value,$cell['help']);
+					$html = html::inputColor($form_name, $value, $cell['help']);
 
-					self::$request->set_to_process($form_name,$cell['type'],array(
+					self::$request->set_to_process($form_name, $cell['type'], array(
 							'maxlength' => 7,
 							'needed'    => $cell['needed'],
 							'preg'      => '/^(#[0-9a-f]{6}|)$/i',
@@ -1901,9 +1899,9 @@ 
 				}
 				break;
 			default:
-				if ($ext_type && $this->haveExtension($ext_type,'render'))
+				if ($ext_type && $this->haveExtension($ext_type, 'render'))
 				{
-					$html .= $this->extensionRender($ext_type,$form_name,$value,$cell,$readonly);
+					$html .= $this->extensionRender($ext_type, $form_name, $value, $cell, $readonly);
 				}
 				else
 				{
@@ -1912,16 +1910,16 @@ 
 				break;
 		}
 		// extension-processing need to be after all other and only with diff. name
-		if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
+		if ($ext_type && !$readonly && $this->haveExtension($ext_type, 'post_process'))
 		{	// unset it first, if it is already set, to be after the other widgets of the ext.
 			$to_process = self::$request->get_to_process($form_name);
 			self::$request->unset_to_process($form_name);
-			self::$request->set_to_process($form_name,'ext-'.$ext_type,$to_process);
+			self::$request->set_to_process($form_name, 'ext-'.$ext_type, $to_process);
 		}
 		// save blur-value to strip it in process_exec
 		if (!empty($blur) && self::$request->isset_to_process($form_name))
 		{
-			self::$request->set_to_process_attribute($form_name,'blur',$blur);
+			self::$request->set_to_process_attribute($form_name, 'blur', $blur);
 		}
 		if ($extra_label && ($label != '' || $html == ''))
 		{
@@ -1930,52 +1928,52 @@ 
 				$label = lang($label);
 			}
 			$accesskey = false;
-			if (($accesskey = $label && strpos($label,'&')!==false) && $accesskey[1] != ' ' && $form_name != '' &&
-					(($pos = strpos($accesskey,';')) === false || $pos > 5))
+			if (($accesskey = $label && strpos($label, '&') !== false) && $accesskey[1] != ' ' && $form_name != '' &&
+					(($pos = strpos($accesskey, ';')) === false || $pos > 5))
 			{
-				$label = str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);
+				$label = str_replace('&'.$accesskey[1], '<u>'.$accesskey[1].'</u>', $label);
 				$accesskey = $accesskey[1];
 			}
 			if ($label && !$readonly && ($accesskey || $label_for || $type != 'label' && $cell['name']))
 			{
 				if ($label_for)		// if label_for starts with a '#', it is already an id - no need to create default id from it
 				{
-					$label_for = $label_for[0] == '#' ? substr($label_for,1) : self::form_name($cname,$label_for);
+					$label_for = $label_for[0] == '#' ? substr($label_for, 1) : self::form_name($cname, $label_for);
 				}
 				else
 				{
-					$label_for = $form_name.($set_val?"[$set_val]":'');
+					$label_for = $form_name.($set_val ? "[$set_val]" : '');
 				}
-				$label = html::label($label,$label_for,$accesskey);
+				$label = html::label($label, $label_for, $accesskey);
 			}
-			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label,'%s')!==false)	// default for radio is label after the button
+			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label, '%s') !== false)	// default for radio is label after the button
 			{
-				$html = strpos($label,'%s')!==false ? str_replace('%s',$html,$label) : $html.' '.$label;
+				$html = strpos($label, '%s') !== false ? str_replace('%s', $html, $label) : $html.' '.$label;
 			}
-			elseif (($html = $label . ' ' . $html) == ' ')
+			elseif (($html = $label.' '.$html) == ' ')
 			{
 				$html = '&nbsp;';
 			}
 		}
-		if ($extra_link && (($extra_link = $this->expand_name($extra_link,$show_c,$show_row,$content['.c'],$content['.row'],$content))))
+		if ($extra_link && (($extra_link = $this->expand_name($extra_link, $show_c, $show_row, $content['.c'], $content['.row'], $content))))
 		{
-			$options = $help ? ' onmouseover="self.status=\''.addslashes(html::htmlspecialchars($help)).'\'; return true;"' .
+			$options = $help ? ' onmouseover="self.status=\''.addslashes(html::htmlspecialchars($help)).'\'; return true;"'.
 				' onmouseout="self.status=\'\'; return true;"' : '';
 
-			if ($extra_link_target && (($extra_link_target = $this->expand_name($extra_link_target,$show_c,$show_row,$content['.c'],$content['.row'],$content))))
+			if ($extra_link_target && (($extra_link_target = $this->expand_name($extra_link_target, $show_c, $show_row, $content['.c'], $content['.row'], $content))))
 			{
 				$options .= ' target="'.addslashes($extra_link_target).'"';
 			}
-			if ($extra_link_popup && (($extra_link_popup = $this->expand_name($extra_link_popup,$show_c,$show_row,$content['.c'],$content['.row'],$content))))
+			if ($extra_link_popup && (($extra_link_popup = $this->expand_name($extra_link_popup, $show_c, $show_row, $content['.c'], $content['.row'], $content))))
 			{
-				list($w,$h) = explode('x',$extra_link_popup);
+				list($w, $h) = explode('x', $extra_link_popup);
 				$options .= ' onclick="egw(window).openPopup(this,'.(int)$w.','.(int)$h.',this.target); return false;"';
 			}
 			if ($extra_link_title)
 			{
 				$options .= ' title="'.addslashes($extra_link_title).'"';
 			}
-			return html::a_href($html,$extra_link,'',$options);
+			return html::a_href($html, $extra_link, '', $options);
 		}
 		// if necessary show validation-error behind field
 		if (isset(self::$validation_errors[$form_name]))
@@ -1986,13 +1984,13 @@ 
 		//echo "<p>$this->name($this->onclick_handler:$this->no_onclick:$this->onclick_proxy): $cell[type]/$cell[name]</p>\n";
 		if ($this->onclick_handler && !isset(self::$widgets_with_children[$cell['type']]))
 		{
-			$handler = str_replace('%p',$this->no_onclick ? $this->onclick_proxy : $this->name.':'.$this->version.':'.$path,
+			$handler = str_replace('%p', $this->no_onclick ? $this->onclick_proxy : $this->name.':'.$this->version.':'.$path,
 				$this->onclick_handler);
 			if ($type == 'button' || $type == 'buttononly' || !$label)	// add something to click on
 			{
-				$html = (substr($html,-1) == "\n" ? substr($html,0,-1) : $html).'&nbsp;';
+				$html = (substr($html, -1) == "\n" ? substr($html, 0, -1) : $html).'&nbsp;';
 			}
-			return html::div($html,' ondblclick="'.$handler.'"','clickWidgetToEdit');
+			return html::div($html, ' ondblclick="'.$handler.'"', 'clickWidgetToEdit');
 		}
 		return $html;
 	}
@@ -2013,13 +2011,13 @@ 
 	 * @param string $id=null
 	 * @return string ' id="..."' or '' if no id found
 	 */
-	static public function get_id($form_name,$name=null,$id=null)
+	static public function get_id($form_name, $name = null, $id = null)
 	{
 		if (empty($id))
 		{
 			if ($name[0] == '#')
 			{
-				$id = substr($name,1);
+				$id = substr($name, 1);
 			}
 			else
 			{
@@ -2042,9 +2040,9 @@ 
 	 * @param boolean $readonly=true
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$readonly=true)
+	static public function number_format($number, $num_decimal_places = 2, $readonly = true)
 	{
-		static $dec_separator,$thousands_separator;
+		static $dec_separator, $thousands_separator;
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
@@ -2053,9 +2051,9 @@ 
 		}
 		if ((string)$number === '') return '';
 
-		$ret = number_format(str_replace(' ','',$number), $num_decimal_places,
+		$ret = number_format(str_replace(' ', '', $number), $num_decimal_places,
 			// need to use '.' as decimal separator for all browser supporting html5 input type=number
-			$dec_sep_used=$readonly || !in_array(html::$user_agent, array('chrome', 'safari', 'opera')) ?
+			$dec_sep_used = $readonly || !in_array(html::$user_agent, array('chrome', 'safari', 'opera')) ?
 				$dec_separator : '.',
 			$readonly ? $thousands_separator : '');
 		//error_log(__METHOD__."($number, $num_decimal_places, $readonly) html::user_agent=".html::$user_agent.", dec_sep='$dec_separator' --> '$dec_sep_used', thousands_sep='$thousands_separator' returning '$ret'");
@@ -2070,7 +2068,7 @@ 
 	* @param array $content=array();
 	* @return array
 	*/
-	function _sel_options($cell,$name,$content=array())
+	function _sel_options($cell, $name, $content = array())
 	{
 		$sels = array();
 
@@ -2078,10 +2076,10 @@ 
 		{
 			if (!is_array($cell['sel_options']))
 			{
-				$opts = explode(',',$cell['sel_options']);
+				$opts = explode(',', $cell['sel_options']);
 				while (list(,$opt) = each($opts))
 				{
-					list($k,$v) = explode('=',$opt);
+					list($k, $v) = explode('=', $opt);
 					$sels[$k] = $v;
 				}
 			}
@@ -2094,7 +2092,7 @@ 
 		if (($options = $this->sel_options[$name]) && is_array($options) ||
 			($options = self::get_array($this->sel_options, $name)) && is_array($options))
 		{
-			if(count($options) == 2 && $options['label'] && $options['title'])
+			if (count($options) == 2 && $options['label'] && $options['title'])
 			{
 				// In too far - need to back up
 			}
@@ -2104,12 +2102,12 @@ 
 				$explode_needed = false;
 			}
 		}
-		if($explode_needed)
+		if ($explode_needed)
 		{
-			$name_parts = explode('[',str_replace(']','',$name));
+			$name_parts = explode('[', str_replace(']', '', $name));
 			if (count($name_parts))
 			{
-				$org_name = $name_parts[count($name_parts)-1];
+				$org_name = $name_parts[count($name_parts) - 1];
 				if (isset($this->sel_options[$org_name]) && is_array($this->sel_options[$org_name]))
 				{
 					$sels += $this->sel_options[$org_name];
@@ -2141,67 +2139,67 @@ 
 	* @param string $cname name-prefix / name-space
 	* @return string
 	*/
-	function js_pseudo_funcs($on,$cname)
+	function js_pseudo_funcs($on, $cname)
 	{
-		if (strpos($on,'::') !== false)	// avoid the expensive regular expresions, for performance reasons
+		if (strpos($on, '::') !== false)	// avoid the expensive regular expresions, for performance reasons
 		{
-			if (preg_match_all("/egw::link\\('([^']+)','(.+?)'(?:,'(.+?)')?\\)/",$on,$matches))	// the ? alters the expression to shortest match
+			if (preg_match_all("/egw::link\\('([^']+)','(.+?)'(?:,'(.+?)')?\\)/", $on, $matches))	// the ? alters the expression to shortest match
 			{
-				foreach(array_keys($matches[1]) as $n)                         	// this way we can correctly parse ' in the 2. argument
+				foreach (array_keys($matches[1]) as $n)                         	// this way we can correctly parse ' in the 2. argument
 				{
-					$url = $GLOBALS['egw']->link($matches[1][$n],$matches[2][$n],$matches[3][$n]);
-					$on = str_replace($matches[0][$n],'\''.addslashes($url).'\'',$on);
+					$url = $GLOBALS['egw']->link($matches[1][$n], $matches[2][$n], $matches[3][$n]);
+					$on = str_replace($matches[0][$n], '\''.addslashes($url).'\'', $on);
 				}
 			}
 
-			if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches))
+			if (preg_match_all("/form::name\\('([^']+)'\\)/", $on, $matches))
 			{
-				foreach($matches[1] as $n => $matche_name)
+				foreach ($matches[1] as $n => $matche_name)
 				{
-					$matches[1][$n] = '\''.self::form_name($cname,$matche_name).'\'';
+					$matches[1][$n] = '\''.self::form_name($cname, $matche_name).'\'';
 				}
-				$on = str_replace($matches[0],$matches[1],$on);
+				$on = str_replace($matches[0], $matches[1], $on);
 			}
 			// we need to search ungready (shortest possible match), to avoid catching to much
-			if (preg_match_all('/egw::lang\(["\']{1}(.*)["\']{1}\)/U',$on,$matches)) {
-				foreach($matches[1] as $n => $string) {
+			if (preg_match_all('/egw::lang\(["\']{1}(.*)["\']{1}\)/U', $on, $matches)) {
+				foreach ($matches[1] as $n => $string) {
 					$str = lang($string);
-					$on = str_replace($matches[0][$n],'\''.addslashes($str).'\'',$on);
+					$on = str_replace($matches[0][$n], '\''.addslashes($str).'\'', $on);
 				}
 			}
 
 			// inserts the styles of a named template
-			if (preg_match('/template::styles\(["\']{1}(.*)["\']{1}\)/U',$on,$matches))
+			if (preg_match('/template::styles\(["\']{1}(.*)["\']{1}\)/U', $on, $matches))
 			{
 				$tpl = $matches[1] == $this->name ? $this : new etemplate($matches[1]);
-				$on = str_replace($matches[0],"'<style>".str_replace(array("\n","\r"),'',$tpl->style)."</style>'",$on);
+				$on = str_replace($matches[0], "'<style>".str_replace(array("\n", "\r"), '', $tpl->style)."</style>'", $on);
 			}
 		}
 
 		// translate messages in confirm()
-		if (strpos($on,'confirm(') !== false && preg_match('/confirm\(["\']{1}(.*)["\']{1}\)/U',$on,$matches))
+		if (strpos($on, 'confirm(') !== false && preg_match('/confirm\(["\']{1}(.*)["\']{1}\)/U', $on, $matches))
 		{
-			$question = lang($matches[1]).(substr($matches[1],-1) != '?' ? '?' : '');	// add ? if not there, saves extra phrase
-			$on = str_replace($matches[0],'confirm(\''.str_replace("'","\\'",$question).'\')',$on);
+			$question = lang($matches[1]).(substr($matches[1], -1) != '?' ? '?' : ''); // add ? if not there, saves extra phrase
+			$on = str_replace($matches[0], 'confirm(\''.str_replace("'", "\\'", $question).'\')', $on);
 		}
 
 		// replace window.open() with EGw's egw(window).openPopup()
-		if (strpos($on,'window.open(') !== false && preg_match("/window.open\('(.*)','(.*)','dependent=yes,width=([^,]*),height=([^,]*),scrollbars=yes,status=(.*)'\)/",$on,$matches))
+		if (strpos($on, 'window.open(') !== false && preg_match("/window.open\('(.*)','(.*)','dependent=yes,width=([^,]*),height=([^,]*),scrollbars=yes,status=(.*)'\)/", $on, $matches))
 		{
 			$on = str_replace($matches[0], "egw(window).openPopup('$matches[1]', $matches[3], $matches[4], '$matches[2]', false, false, '$matches[5]')", $on);
 		}
 
 		// replace window.close() with EGw's egw.close()
-		if (strpos($on,'window.close(') !== false)
+		if (strpos($on, 'window.close(') !== false)
 		{
 			$on = str_replace('window.close(', 'egw(window).close(', $on);
 		}
 
 		// replace xajax calls to code in widgets, with the "etemplate" handler,
 		// this allows to call widgets with the current app, otherwise everyone would need etemplate run rights
-		if (strpos($on,"xajax_doXMLHTTP('etemplate.") !== false)
+		if (strpos($on, "xajax_doXMLHTTP('etemplate.") !== false)
 		{
-			$on = preg_replace("/^xajax_doXMLHTTP\('etemplate\.([a-z]+_widget\.[a-zA-Z0-9_]+)\'/",'xajax_doXMLHTTP(\''.$GLOBALS['egw_info']['flags']['currentapp'].'.\\1.etemplate\'',$on);
+			$on = preg_replace("/^xajax_doXMLHTTP\('etemplate\.([a-z]+_widget\.[a-zA-Z0-9_]+)\'/", 'xajax_doXMLHTTP(\''.$GLOBALS['egw_info']['flags']['currentapp'].'.\\1.etemplate\'', $on);
 		}
 
 		return $on;
@@ -2219,7 +2217,7 @@ 
 		{
 			return stripslashes($var);
 		}
-		foreach($var as $key => $val)
+		foreach ($var as $key => $val)
 		{
 			$var[$key] = is_array($val) ? self::array_stripslashes($val) : stripslashes($val);
 		}
@@ -2239,7 +2237,7 @@ 
 	* @param string $_type='regular' type of request
 	* @return array with validation errors
 	*/
-	function process_show(&$content,$to_process,$cname='',$_type='regular')
+	function process_show(&$content, $to_process, $cname = '', $_type = 'regular')
 	{
 		if (!isset($content) || !is_array($content) || !is_array($to_process))
 		{
@@ -2258,7 +2256,7 @@ 
 		self::$validation_errors = array();
 		$this->canceled = $this->button_pressed = False;
 
-		foreach($to_process as $form_name => $type)
+		foreach ($to_process as $form_name => $type)
 		{
 			if (is_array($type))
 			{
@@ -2269,45 +2267,45 @@ 
 			{
 				$attr = array();
 			}
-			$form_name = str_replace(array('&#x5B;','&#x5D;'), array('[',']'), $form_name);
-			$value = self::get_array($content_in,$form_name,True,$GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' ? false : true );
+			$form_name = str_replace(array('&#x5B;', '&#x5D;'), array('[', ']'), $form_name);
+			$value = self::get_array($content_in, $form_name, True, $GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' ? false : true);
 			// The comment below does only aplay to normal posts, not for xajax. Files are not supported anyway by xajax atm.
 			// not checked checboxes are not returned in HTML and file is in $_FILES and not in $content_in
-			if($value === false && $_type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/) continue;
+			if ($value === false && $_type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/) continue;
 
 			if (isset($attr['blur']) && $attr['blur'] == $value)
 			{
-				$value = '';	// blur-values is equal to emtpy
+				$value = ''; // blur-values is equal to emtpy
 			}
 			//echo "<p>process_show($this->name) loop was ".self::$loop.", $type: $form_name = ".array2string($value)."</p>\n";
-			if (is_string($type)) list($type,$sub) = explode('-',$type);
+			if (is_string($type)) list($type, $sub) = explode('-', $type);
 			switch ($type)
 			{
 				case 'ext':
-					$_cont = &self::get_array($content,$form_name,True);
-					if (!$this->extensionPostProcess($sub,$form_name,$_cont,$value))
+					$_cont = &self::get_array($content, $form_name, True);
+					if (!$this->extensionPostProcess($sub, $form_name, $_cont, $value))
 					{
 						//echo "\n<p><b>unsetting content[$form_name] !!!</b></p>\n";
-						$this->unset_array($content,$form_name);
+						$this->unset_array($content, $form_name);
 					}
 					// this else should NOT be unnecessary as $_cont is a reference to the index
 					// $form_name of $content, but under some circumstances a set/changed $_cont
 					// does not result in a change in $content -- RalfBecker 2004/09/18
 					// seems to depend on the number of (not existing) dimensions of the array -- -- RalfBecker 2005/04/06
-					elseif (!self::isset_array($content,$form_name))
+					elseif (!self::isset_array($content, $form_name))
 					{
 						//echo "<p>setting content[$form_name]='$_cont' because is was unset !!!</p>\n";
-						self::set_array($content,$form_name,$_cont);
+						self::set_array($content, $form_name, $_cont);
 					}
 					if ($_cont === '' && $attr['needed'] && !$attr['blur'])
 					{
-						self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+						self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 					}
 					break;
 				case 'htmlarea':
 					if ($attr['mode'] !== 'ascii')
 					{
-						self::set_array($content,$form_name,html::purify($value));
+						self::set_array($content, $form_name, html::purify($value));
 						break;
 					}
 					// fall-throught for mode 'ascii', which is identical to textarea
@@ -2322,25 +2320,25 @@ 
 				case 'colorpicker':
 					if ((string)$value === '' && $attr['needed'] && !$attr['blur'])
 					{
-						self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+						self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 					}
-					if ((int) $attr['maxlength'] > 0 && mb_strlen($value) > (int) $attr['maxlength'])
+					if ((int)$attr['maxlength'] > 0 && mb_strlen($value) > (int)$attr['maxlength'])
 					{
-						$value = mb_substr($value,0,(int) $attr['maxlength']);
+						$value = mb_substr($value, 0, (int)$attr['maxlength']);
 					}
-					if ($attr['preg'] && !preg_match($attr['preg'],$value))
+					if ($attr['preg'] && !preg_match($attr['preg'], $value))
 					{
-						switch($type)
+						switch ($type)
 						{
 							case 'int':
 							case 'integer':
-								self::set_validation_error($form_name,lang("'%1' is not a valid integer !!!",$value),'');
+								self::set_validation_error($form_name, lang("'%1' is not a valid integer !!!", $value), '');
 								break;
 							case 'float':
-								self::set_validation_error($form_name,lang("'%1' is not a valid floatingpoint number !!!",$value),'');
+								self::set_validation_error($form_name, lang("'%1' is not a valid floatingpoint number !!!", $value), '');
 								break;
 							default:
-								self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$attr[preg]', '$value')"*/,'');
+								self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$attr[preg]', '$value')"*/, '');
 								break;
 						}
 					}
@@ -2348,101 +2346,101 @@ 
 					{
 						if ((string)$value !== '' || $attr['needed'])	// empty values are Ok if needed is not set
 						{
-							$value = $type != 'float' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+							$value = $type != 'float' ? (int)$value : (float)str_replace(',', '.', $value); // allow for german (and maybe other) format
 
 							if (!empty($attr['min']) && $value < $attr['min'])
 							{
-								self::set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$attr['min']),'');
-								$value = $type != 'float' ? (int) $attr['min'] : (float) $attr['min'];
+								self::set_validation_error($form_name, lang("Value has to be at least '%1' !!!", $attr['min']), '');
+								$value = $type != 'float' ? (int)$attr['min'] : (float)$attr['min'];
 							}
 							if (!empty($attr['max']) && $value > $attr['max'])
 							{
-								self::set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$attr['max']),'');
-								$value = $type != 'float' ? (int) $attr['max'] : (float) $attr['max'];
+								self::set_validation_error($form_name, lang("Value has to be at maximum '%1' !!!", $attr['max']), '');
+								$value = $type != 'float' ? (int)$attr['max'] : (float)$attr['max'];
 							}
 						}
 					}
-					self::set_array($content,$form_name,$value);
+					self::set_array($content, $form_name, $value);
 					break;
 				case 'cancel':	// cancel button ==> dont care for validation errors
 					if ($value)
 					{
 						$this->canceled = True;
-						self::set_array($content,$form_name,$value);
+						self::set_array($content, $form_name, $value);
 					}
 					break;
 				case 'button':
 					if ($value)
 					{
 						$this->button_pressed = True;
-						self::set_array($content,$form_name,$value);
+						self::set_array($content, $form_name, $value);
 					}
 					break;
 				case 'select':
 					if ($attr['allowed'])	// only check for $value is allowed, if allowed values are set
 					{
-						foreach(is_array($value) ? $value : array($value) as $val)
+						foreach (is_array($value) ? $value : array($value) as $val)
 						{
-							if (!($attr['multiple'] && !$val) && !in_array($val,$attr['allowed']))
+							if (!($attr['multiple'] && !$val) && !in_array($val, $attr['allowed']))
 							{
-								self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",$attr['allowed'])),'');
+								self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", $attr['allowed'])), '');
 								$value = '';
 								break;
 							}
 						}
 					}
-					if (is_array($value)) $value = implode(',',$value);
+					if (is_array($value)) $value = implode(',', $value);
 					if ($value === '' && $attr['needed'])
 					{
-						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+						self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 					}
-					self::set_array($content,$form_name,$value);
+					self::set_array($content, $form_name, $value);
 					break;
 				case 'checkbox':
 					if (!$value && $attr['needed'])
 					{
-						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+						self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 					}
 					if ($value === false)
 					{
-						self::set_array($content,$form_name,$attr['multiple'] ? array() : $attr['unset_value']);	// need to be reported too
+						self::set_array($content, $form_name, $attr['multiple'] ? array() : $attr['unset_value']); // need to be reported too
 					}
 					else
 					{
-						$value = array_intersect(is_array($value) ? $value : array($value),$attr['values']); // return only allowed values
-						self::set_array($content,$form_name,$attr['multiple'] ? $value : $value[0]);
+						$value = array_intersect(is_array($value) ? $value : array($value), $attr['values']); // return only allowed values
+						self::set_array($content, $form_name, $attr['multiple'] ? $value : $value[0]);
 					}
 					break;
 				case 'file':
-					if (($multiple = substr($form_name,-2) == '[]'))
+					if (($multiple = substr($form_name, -2) == '[]'))
 					{
-						$form_name = substr($form_name,0,-2);
+						$form_name = substr($form_name, 0, -2);
 					}
-					$parts = explode('[',str_replace(']','',$form_name));
+					$parts = explode('[', str_replace(']', '', $form_name));
 					$name = array_shift($parts);
-					$index  = count($parts) ? '['.implode('][',$parts).']' : '';
+					$index = count($parts) ? '['.implode('][', $parts).']' : '';
 					$value = array();
-					for($i=0; $i < 100; ++$i)
+					for ($i = 0; $i < 100; ++$i)
 					{
 						$file = array();
-						foreach(array('tmp_name','type','size','name','error') as $part)
+						foreach (array('tmp_name', 'type', 'size', 'name', 'error') as $part)
 						{
-							if (!is_array($_FILES[$name])) break 2;	// happens eg. in forms set via xajax, which do not upload files
-							$file[$part] = $this->get_array($_FILES[$name],$part.$index.($multiple ? "[$i]" : ''));
+							if (!is_array($_FILES[$name])) break 2; // happens eg. in forms set via xajax, which do not upload files
+							$file[$part] = $this->get_array($_FILES[$name], $part.$index.($multiple ? "[$i]" : ''));
 						}
-						if (!$multiple) $file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
+						if (!$multiple) $file['path'] = $this->get_array($content_in, substr($form_name, 0, -1).'_path]');
 						$file['ip'] = $_SERVER['REMOTE_ADDR'];
 						// check if we have an upload error
 						if ($file['error'] && $file['name'] !== '' && !$file['size'])	// ignore empty upload boxes
 						{
-							self::set_validation_error($form_name.($multiple?'[]':''),
-								lang('Error uploading file!')."\n".self::max_upload_size_message(),'');
+							self::set_validation_error($form_name.($multiple ? '[]' : ''),
+								lang('Error uploading file!')."\n".self::max_upload_size_message(), '');
 						}
 						if ((string)$file['name'] === '' || $file['tmp_name'] && function_exists('is_uploaded_file') && !is_uploaded_file($file['tmp_name']))
 						{
 							if ($multiple && ($file['name'] === '' || $file['error']))
 							{
-								continue;	// ignore empty upload box
+								continue; // ignore empty upload box
 							}
 							break;
 						}
@@ -2458,9 +2456,9 @@ 
 				default:
 					if ($attr['needed'] && !$value)
 					{
-						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+						self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 					}
-					self::set_array($content,$form_name,$value);
+					self::set_array($content, $form_name, $value);
 					break;
 			}
 		}
@@ -2486,11 +2484,11 @@ 
 	* @param string|boolean $error error-message already translated or false to reset all existing error for given name
 	* @param string $cname=null set it to '', if the name is already a form-name, defaults to self::$name_vars
 	*/
-	static function set_validation_error($name,$error,$cname=null)
+	static function set_validation_error($name, $error, $cname = null)
 	{
 		if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>self::set_validation_error('$name','$error','$cname');</p>\n";
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname) $name = self::form_name($cname, $name);
 
 		if ($error === false)
 		{

Braces +417 added lines, -107 removed lines

@@ -243,7 +243,10 @@ 
 		self::$request->name_vars = self::$name_vars;
 
 		// tell html5 form validation NOT to validate
-		if ($ignore_validation) self::$form_options .= ' novalidate="novalidate"';
+		if ($ignore_validation)
+		{
+			self::$form_options .= ' novalidate="novalidate"';
+		}
 
 		if((int) $output_mode == 3)
 		{
@@ -279,7 +282,10 @@ 
 		self::$request->hooked = $hooked ? $hooked : self::$hook_content;
 		self::$request->hook_app = $hooked ? $GLOBALS['egw_info']['flags']['currentapp'] : self::$hook_app;
 		self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'];
-		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
+		if (self::$request->output_mode == -1)
+		{
+			self::$request->output_mode = 0;
+		}
 		self::$request->template = $this->as_array(2);
 
 		$html = html::form(html::input('etemplate_exec_id',self::$request->id(),'hidden',' id="etemplate_exec_id"').$html.
@@ -298,13 +304,19 @@ 
 		if (!$this->sitemgr)
 		{
 			// support the old global var, in case old apps like 1.6 infolog use it
-			if (isset($GLOBALS['egw_info']['etemplate']['hooked'])) self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked'];
+			if (isset($GLOBALS['egw_info']['etemplate']['hooked']))
+			{
+				self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked'];
+			}
 
-			if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1)	// not just returning the html
+			if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1)
+			{
+				// not just returning the html
 			{
 				if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
 				{
 					egw_framework::includeCSS('etemplate', 'app');
+			}
 				}
 			}
 			// saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook)
@@ -312,12 +324,15 @@ 
 		}
 		//echo '<p>'.__METHOD__."($method,...) after show: sitemgr=$this->sitemgr, hooked=".(int)$hooked.", output_mode=$output_mode</p>\n";
 
-		if (!$this->sitemgr && (int) $output_mode != 1 && (int) $output_mode != -1)	// NOT returning html
+		if (!$this->sitemgr && (int) $output_mode != 1 && (int) $output_mode != -1)
+		{
+			// NOT returning html
 		{
 			if (!@self::$hooked)
 			{
 				// let framework know, if we are a popup or not ('popup' not true, which is allways used by index.php!)
 				$GLOBALS['egw_info']['flags']['nonavbar'] = $output_mode == 2 ? 'popup' : false;
+		}
 				if((int) $output_mode != 2)
 				{
 					echo $GLOBALS['egw']->framework->navbar();
@@ -326,9 +341,12 @@ 
 				{
 					echo $GLOBALS['egw']->framework->header();
 					echo '<div id="popupMainDiv">'."\n";
-					if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
+					if ($GLOBALS['egw_info']['user']['apps']['manual'])
+					{
+						// adding a manual icon to every popup
 					{
 						$manual = new etemplate('etemplate.popup.manual');
+					}
 						echo $manual->show(array());
 						unset($manual);
 						echo '<style type="text/css">.ajax-loader { position: absolute; right: 27px; top: 24px; display: none; }</style>'."\n";
@@ -347,10 +365,13 @@ 
 				common::egw_footer();
 			}
 		}
-		if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1)	// return html
+		if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1)
+		{
+			// return html
 		{
 			return $html;
 		}
+		}
 	}
 
 	/**
@@ -362,9 +383,15 @@ 
 	*/
 	static function validation_errors($ignore_validation='',$cname=null)
 	{
-		if (is_null($cname)) $cname = self::$name_vars;
+		if (is_null($cname))
+		{
+			$cname = self::$name_vars;
+		}
 		//echo "<p>uiself::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
-		if (!$ignore_validation) return count(self::$validation_errors) > 0;
+		if (!$ignore_validation)
+		{
+			return count(self::$validation_errors) > 0;
+		}
 
 		foreach(self::$validation_errors as $name => $error)
 		{
@@ -388,8 +415,14 @@ 
 	 */
 	static function ignore_validation_match($form_name, $ignore_validation, $cname=null)
 	{
-		if (is_null($cname)) $cname = self::$name_vars;
-		if ($cname) $form_name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2', $form_name);
+		if (is_null($cname))
+		{
+			$cname = self::$name_vars;
+		}
+		if ($cname)
+		{
+			$form_name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2', $form_name);
+		}
 
 		return empty($ignore_validation) ||
 			$ignore_validation[0] == '/' && preg_match($ignore_validation, $form_name) ||
@@ -410,14 +443,26 @@ 
 	*/
 	function process_exec($etemplate_exec_id = null, $submit_button = null, $exec = null, $type = 'regular' )
 	{
-		if(!$etemplate_exec_id) $etemplate_exec_id = $_POST['etemplate_exec_id'];
-		if(!$submit_button) $submit_button = $_POST['submit_button'];
-		if(!$exec) $exec = $_POST;
+		if(!$etemplate_exec_id)
+		{
+			$etemplate_exec_id = $_POST['etemplate_exec_id'];
+		}
+		if(!$submit_button)
+		{
+			$submit_button = $_POST['submit_button'];
+		}
+		if(!$exec)
+		{
+			$exec = $_POST;
+		}
 
 		//echo "process_exec: _POST ="; _debug_array($_POST);
 		if (!$etemplate_exec_id || !(self::$request = etemplate_request::read($etemplate_exec_id)))
 		{
-			if ($this->sitemgr) return false;
+			if ($this->sitemgr)
+			{
+				return false;
+			}
 			//echo "uitemplate::process_exec() id='$_POST[etemplate_exec_id]' invalid session-data !!!"; _debug_array($_SESSION);
 			// this prevents an empty screen, if the sessiondata gets lost somehow
 			$redirect = array(
@@ -435,7 +480,9 @@ 
 					$redirect['failed_upload'] = 1;
 					$redirect['msg'] = lang('Error uploading file!')."\n".self::max_upload_size_message();
 				}
-			} else if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+			}
+			else if ($_SERVER['REQUEST_METHOD'] == 'GET')
+			{
 				// Pass along any parameters
 				$redirect = $_GET;
 			}
@@ -471,10 +518,16 @@ 
 				foreach($this->get_widgets_by_type('tab') as $widget)
 				{
 					$tab_name = $tabs = $widget['name'];
-					if (strpos($tabs,'=') !== false) list($tab_name,$tabs) = explode('=',$tabs,2);
+					if (strpos($tabs,'=') !== false)
+					{
+						list($tab_name,$tabs) = explode('=',$tabs,2);
+					}
 					foreach(explode('|',$tabs) as $tab)
 					{
-						if (strpos('.',$tab) === false) $tab = $this->name.'.'.$tab;
+						if (strpos('.',$tab) === false)
+						{
+							$tab = $this->name.'.'.$tab;
+						}
 						$tab_tpl = new etemplate($tab);
 						if ($tab_tpl->get_widget_by_name($name))
 						{
@@ -504,11 +557,14 @@ 
 		$content = self::complete_array_merge(self::$request->changes,$content);
 		//echo "process_exec($this->name) merge(changes,content) ="; _debug_array($content);
 
-		if (self::$loop && $type == 'regular')	// only loop for regular (not ajax_submit) requests
+		if (self::$loop && $type == 'regular')
+		{
+			// only loop for regular (not ajax_submit) requests
 		{
 			if (self::$request->hooked != '')	// set previous phpgw_body if we are called as hook
 			{
 				self::$hook_content = self::$request->hooked;
+		}
 				$GLOBALS['egw_info']['flags']['currentapp'] = self::$hook_app = self::$request->hook_app;
 
 				// Prevent previous content form names from being used again in exec()
@@ -518,7 +574,10 @@ 
 					self::$name_forms += $used[1];
 				}
 			}
-			if(self::$request->include_xajax) $GLOBALS['egw_info']['flags']['include_xajax'] = true;
+			if(self::$request->include_xajax)
+			{
+				$GLOBALS['egw_info']['flags']['include_xajax'] = true;
+			}
 
 			if (!empty(self::$request->app_header))
 			{
@@ -668,7 +727,11 @@ 
 		{
 			$readonlys = array();
 		}
-		if (++$this->already_showed > 1) return '';	// prefens infinit self-inclusion
+		if (++$this->already_showed > 1)
+		{
+			return '';
+		}
+		// prefens infinit self-inclusion
 
 		if (is_int($this->debug) && $this->debug >= 1 || $this->name && $this->debug == $this->name)
 		{
@@ -715,7 +778,10 @@ 
 		// ACL check
 		$cats = $GLOBALS['egw']->categories->check_list(EGW_ACL_READ,$cats);
 
-		if (!$cats) return null;
+		if (!$cats)
+		{
+			return null;
+		}
 
 		if (isset($cat2color[$cats]))
 		{
@@ -797,14 +863,18 @@ 
 		$max_cols = $grid['cols'];
 		for ($r = 0; $row = 1+$r /*list($row,$cols) = each($data)*/; ++$r)
 		{
-			if (!(list($r_key) = each($data)))	// no further row
+			if (!(list($r_key) = each($data)))
+			{
+				// no further row
 			{
 				if (!(($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname,false,$content) && $idx_cname) ||
 						(in_array($cols['A']['type'], array('vbox','hbox','box')) && $this->autorepeat_idx($cols['A'][1],0,$r,$idx,$idx_cname,false,$content) && $idx_cname) ||
 					($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname,false,$content) && $idx_cname)) ||
 					!$this->isset_array($content,$idx_cname))
 				{
-					break;                     	// no auto-row-repeat
+					break;
+			}
+			// no auto-row-repeat
 				}
 			}
 			else
@@ -818,7 +888,11 @@ 
 			{
 				continue;	// row is disabled
 			}
-			if ($part) $row = $part[0].$row;	// add part prefix
+			if ($part)
+			{
+				$row = $part[0].$row;
+			}
+			// add part prefix
 			$rows[".$row"] .= html::formatOptions($height,'height');
 			list($cl) = explode(',',$class);
 			if ($cl == '@' || $cl && strpos($cl,'$') !== false)
@@ -833,9 +907,13 @@ 
 					$cl = str_replace($matches[2],'row',$cl);
 				}
 			}
-			if ($cl == 'nmr' || substr($cl,0,3) == 'row')	// allow to have further classes behind row
+			if ($cl == 'nmr' || substr($cl,0,3) == 'row')
 			{
-				$cl = 'row_'.($nmr_alternate++ & 1 ? 'off' : 'on').substr($cl,3); // alternate color
+				// allow to have further classes behind row
+			{
+				$cl = 'row_'.($nmr_alternate++ & 1 ? 'off' : 'on').substr($cl,3);
+			}
+			// alternate color
 			}
 			$cl = isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl;
 			$rows[".$row"] .= html::formatOptions($cl,'class');
@@ -850,7 +928,9 @@ 
 			for ($c = 0; True /*list($col,$cell) = each($cols)*/; ++$c)
 			{
 				$col = $this->num2chrs($c);
-				if (!(list($c_key) = each($cols)))		// no further cols
+				if (!(list($c_key) = each($cols)))
+				{
+					// no further cols
 				{
 					// only check if the max. column-number reached so far is exeeded
 					// otherwise the rows have a differen number of cells and it saved a lot checks
@@ -859,7 +939,9 @@ 
 						if (!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True,$content) ||
 							!$this->isset_array($content,$idx))
 						{
-							break;	// no auto-col-repeat
+							break;
+				}
+				// no auto-col-repeat
 						}
 						$max_cols = $c+1;
 					}
@@ -869,13 +951,19 @@ 
 					$cell = $cols[$c_key];
 					list($col_width,$col_disabled) = explode(',',$opts[$col]);
 
-					if (!$cell['height'])	// if not set, cell-height = height of row
+					if (!$cell['height'])
+					{
+						// if not set, cell-height = height of row
 					{
 						$cell['height'] = $height;
 					}
-					if (!$cell['width'])	// if not set, cell-width = width of column or table
+					}
+					if (!$cell['width'])
+					{
+						// if not set, cell-width = width of column or table
 					{
 						list($col_span) = explode(',',$cell['span']);
+					}
 						if ($col_span == 'all' && !$c)
 						{
 							list($cell['width']) = explode(',',$this->size);
@@ -919,9 +1007,12 @@ 
 				else
 				{
 					list($width,$disable) = explode(',',$opts[$col]);
-					if ($width)		// width only once for a non colspan cell
+					if ($width)
+					{
+						// width only once for a non colspan cell
 					{
 						$row_data[".$col"] .= " width=\"$width\"";
+					}
 						$opts[$col] = "0,$disable";
 					}
 				}
@@ -948,7 +1039,10 @@ 
 			}
 			$rows[$row] = $row_data;
 		}
-		if (!$rows) return '';
+		if (!$rows)
+		{
+			return '';
+		}
 
 		list($width,$height,,,,,$overflow) = $options = explode(',',$grid['size']);
 		if ($overflow && $height)
@@ -961,9 +1055,19 @@ 
 
 		if (!empty($overflow))
 		{
-			if (is_numeric($height)) $height .= 'px';
-			if (is_numeric($width)) $width .= 'px';
-			if ($width == '100%') $overflow .= '; overflow-x: hidden';	// no horizontal scrollbar
+			if (is_numeric($height))
+			{
+				$height .= 'px';
+			}
+			if (is_numeric($width))
+			{
+				$width .= 'px';
+			}
+			if ($width == '100%')
+			{
+				$overflow .= '; overflow-x: hidden';
+			}
+			// no horizontal scrollbar
 			$div_style=' style="'.($width?"width: $width; ":'').($height ? "height: $height; ":'')."overflow: $overflow;\"";
 			$html = html::div($html,$div_style);
 		}
@@ -989,7 +1093,10 @@ 
 	*/
 	static function form_name($cname,$name)
 	{
-		if(is_object($name)) return '';
+		if(is_object($name))
+		{
+			return '';
+		}
 
 		$name_parts = explode('[',str_replace(']','',$name));
 		if (!empty($cname))
@@ -1020,7 +1127,10 @@ 
 
 		$name = array_shift($parts);
 
-		if ($parts) $name .= '['.implode('][',$parts).']';
+		if ($parts)
+		{
+			$name .= '['.implode('][',$parts).']';
+		}
 
 		return $name;
 	}
@@ -1073,17 +1183,29 @@ 
 		$options = '';
 		if ($readonly = $cell['readonly'] && $readonlys[$name] !== false || 	// allow to overwrite readonly settings of a cell
 			@$readonlys[$name] && !is_array($readonlys[$name]) || $readonlys['__ALL__'] && (!is_string($name) || $readonlys[$name] !== false) ||
-			!empty($name) && is_string($name) && ($p = strrpos($name,'[')) !== false && ($parent=substr($name,0,$p)) && $readonlys[$parent])	// allow also set parent readonly (instead each child)
+			!empty($name) && is_string($name) && ($p = strrpos($name,'[')) !== false && ($parent=substr($name,0,$p)) && $readonlys[$parent])
+		{
+			// allow also set parent readonly (instead each child)
 		{
 			$options .= ' readonly="readonly"';
 		}
-		if ((int) $cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
-		if ($cell['accesskey']) $options .= ' accesskey="'.html::htmlspecialchars($cell['accesskey']).'"';
+		}
+		if ((int) $cell['tabindex'])
+		{
+			$options .= ' tabindex="'.(int)$cell['tabindex'].'"';
+		}
+		if ($cell['accesskey'])
+		{
+			$options .= ' accesskey="'.html::htmlspecialchars($cell['accesskey']).'"';
+		}
 
-		if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@'))	// expand cell['size'] for the button-disabled-check now
+		if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@'))
+		{
+			// expand cell['size'] for the button-disabled-check now
 		{
 			$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 		}
+		}
 		if ($cell['type'] == 'template' && !$this->check_disabled($cell['disabled'], $content))
 		{
 			// template is NOT disabled (eg. in editor)
@@ -1121,7 +1243,10 @@ 
 			{
 				$cell['onchange'] = $this->expand_name($cell['onchange'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 			}
-			if (!$ext_type) $ext_type = $type;
+			if (!$ext_type)
+			{
+				$ext_type = $type;
+			}
 			// if readonlys[__ALL__] is set, also set readonlys[$name] (extensions can mark themselfs as 'noReadonlysALL', eg. tab-widget!)
 			if ($readonlys['__ALL__'] && $readonlys[$name] !== false && !$this->haveExtension($type,'noReadonlysALL'))
 			{
@@ -1133,7 +1258,11 @@ 
 
 			self::set_array($content,$name,$value);
 
-			if ($cell['type'] == $type.'-'.$sub_type) break;	// stop if no further type-change
+			if ($cell['type'] == $type.'-'.$sub_type)
+			{
+				break;
+			}
+			// stop if no further type-change
 
 			list($type,$sub_type) = explode('-',$cell['type']);
 		}
@@ -1178,24 +1307,33 @@ 
 		{
 			if ((int)$cell['no_lang'] < 2 && !$no_lang_on_help)
 			{
-				if (($use_tooltip_for_help = $help[0] == '|')) $help = substr($help,1);
+				if (($use_tooltip_for_help = $help[0] == '|'))
+				{
+					$help = substr($help,1);
+				}
 				$help = lang($help);
 			}
 			if (substr($help,0,5) == 'call:')
 			{
 				$options .= ' onMouseOver="'.html::htmlspecialchars(substr($help,5)).'"';
 			}
-			elseif (($use_tooltip_for_help = $use_tooltip_for_help || strpos($help,'<') !== false && strip_tags($help) != $help))	// helptext is html => use a tooltip
+			elseif (($use_tooltip_for_help = $use_tooltip_for_help || strpos($help,'<') !== false && strip_tags($help) != $help))
+			{
+				// helptext is html => use a tooltip
 			{
 				$options .= html::tooltip($help);
 			}
+			}
 			else	// "regular" help-text in the statusline
 			{
 				$onFocus .= "self.status='".addslashes(html::htmlspecialchars($help))."'; return true;";
 				$onBlur  .= "self.status=''; return true;";
-				if (in_array($cell['type'],array('button','buttononly','file')))	// for button additionally when mouse over button
+				if (in_array($cell['type'],array('button','buttononly','file')))
+				{
+					// for button additionally when mouse over button
 				{
 					$options .= " onMouseOver=\"self.status='".addslashes(html::htmlspecialchars($help))."'; return true;\"";
+				}
 					$options .= " onMouseOut=\"self.status=''; return true;\"";
 				}
 			}
@@ -1225,7 +1363,10 @@ 
 		switch ($type)
 		{
 			case 'label':	//  size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
-				if (is_array($value)) break;
+				if (is_array($value))
+				{
+					break;
+				}
 				if($cell_options)
 				{
 					list($style,$extra_link,$activate_links,$label_for,$extra_link_target,$extra_link_popup,$extra_link_title) = self::csv_split($cell_options,7);
@@ -1242,9 +1383,18 @@ 
 				}
 				$value = strlen($value) > 1 && !$cell['no_lang'] ? lang($value) : $value;
 				$value = nl2br(html::htmlspecialchars($value));
-				if ($activate_links) $value = html::activate_links($value);
-				if ($value != '' && $style && strpos($style,'b')!==false) $value = html::bold($value);
-				if ($value != '' && $style && strpos($style,'i')!==false) $value = html::italic($value);
+				if ($activate_links)
+				{
+					$value = html::activate_links($value);
+				}
+				if ($value != '' && $style && strpos($style,'b')!==false)
+				{
+					$value = html::bold($value);
+				}
+				if ($value != '' && $style && strpos($style,'i')!==false)
+				{
+					$value = html::italic($value);
+				}
 				// if the label has a name, use it as id in a span, to allow addressing it via javascript
 				$html .= ($name ? '<span id="'.($cell['id']?$cell['id']:$name).'">' : '').$value.($name ? '</span>' : '');
 				if ($help)
@@ -1257,7 +1407,10 @@ 
 				break;
 			case 'html':	//  size: [link],[link_target],[link_popup_size],[link_title],[activate_links]
 				list($extra_link,$extra_link_target,$extra_link_popup,$extra_link_title,$activate_links) = explode(',',$cell_options);
-				if ($activate_links) $value = html::activate_links($value);
+				if ($activate_links)
+				{
+					$value = html::activate_links($value);
+				}
 				$html .= $value;
 				break;
 			case 'int':		// size: [min],[max],[len],[precision/sprint format],[step]
@@ -1265,8 +1418,14 @@ 
 			case 'float':
 				list($min,$max,$cell_options,$pre,$step) = explode(',',$cell_options);
 				// a few html5 options
-				if ((string)$min !== '') $options .= ' min="'.htmlspecialchars($min).'"';
-				if ((string)$max !== '') $options .= ' max="'.htmlspecialchars($max).'"';
+				if ((string)$min !== '')
+				{
+					$options .= ' min="'.htmlspecialchars($min).'"';
+				}
+				if ((string)$max !== '')
+				{
+					$options .= ' max="'.htmlspecialchars($max).'"';
+				}
 				//  default step="any" for float, as not setting it limits value to integer as step defaults to 1 in html5!
 				if (is_numeric($step) || $type == 'float')
 				{
@@ -1297,7 +1456,11 @@ 
 					if (preg_match('/^[a-z]+$/i',$html5type))
 					{
 						$cell_opts[2] = substr($cell_opts[2],0,-strlen($html5type)-1);
-						if ($cell_opts[2][0] == ',') $cell_opts[2] = '';	// happens in link-entry under some condition
+						if ($cell_opts[2][0] == ',')
+						{
+							$cell_opts[2] = '';
+						}
+						// happens in link-entry under some condition
 						$cell_opts[] = $html5type;
 					}
 				}
@@ -1343,7 +1506,10 @@ 
 				{
 					// if textarea is readonly, but form_name is already used by an other widget, dont use it
 					// browser would only send the content of the readonly (and therefore unchanged) field
-					if ($readonly && self::$request->isset_to_process($form_name)) $form_name = '';
+					if ($readonly && self::$request->isset_to_process($form_name))
+					{
+						$form_name = '';
+					}
 					$html .= html::textarea($form_name,$value,
 						$options.html::formatOptions($cell_options,'ROWS,COLS').($cell['needed']?' required="required"':''));
 				}
@@ -1386,7 +1552,10 @@ 
 				if (!empty($cell_options))
 				{
 					list($set_val,$unset_val,$ro_true,$ro_false) = self::csv_split($cell_options);
-					if (!$set_val && !$unset_val) $set_val = 1;
+					if (!$set_val && !$unset_val)
+					{
+						$set_val = 1;
+					}
 					$value = $value == $set_val;
 				}
 				if (($multiple = substr($cell['name'],-2) == '[]') && !$readonly)
@@ -1400,13 +1569,19 @@ 
 						$ro_true = 'x';
 						$ro_false = '';
 					}
-					if (!$value && $ro_false == 'disable') return '';
+					if (!$value && $ro_false == 'disable')
+					{
+						return '';
+					}
 
 					$html .= $value ? html::bold($ro_true) : $ro_false;
 				}
 				else
 				{
-					if ($value) $options .= ' checked="checked"';
+					if ($value)
+					{
+						$options .= ' checked="checked"';
+					}
 
 					if ($multiple)
 					{
@@ -1416,7 +1591,10 @@ 
 					}
 					$html .= html::input($form_name,$set_val,'checkbox',$options);
 
-					if ($multiple) $form_name = self::form_name($cname,substr($cell['name'],0,-2));
+					if ($multiple)
+					{
+						$form_name = self::form_name($cname,substr($cell['name'],0,-2));
+					}
 
 					if (!self::$request->isset_to_process($form_name))
 					{
@@ -1427,7 +1605,11 @@ 
 						));
 					}
 					self::$request->set_to_process_attribute($form_name,'values',$set_val,true);
-					if (!$multiple) unset($set_val);	// otherwise it will be added to the label
+					if (!$multiple)
+					{
+						unset($set_val);
+					}
+					// otherwise it will be added to the label
 				}
 				break;
 			case 'radio':		// size: value if checked, readonly set, readonly unset
@@ -1444,7 +1626,10 @@ 
 
 				if ($readonly)
 				{
-					if (!$ro_true && !$ro_false) $ro_true = 'x';
+					if (!$ro_true && !$ro_false)
+					{
+						$ro_true = 'x';
+					}
 					$html .= $value == $set_val ? html::bold($ro_true) : $ro_false;
 				}
 				else
@@ -1458,7 +1643,10 @@ 
 			case 'button':
 			case 'buttononly':
 			case 'cancel':	// cancel button
-				if ($name == 'cancel' || stripos($name,'[cancel]') !== false) $type = 'cancel';
+				if ($name == 'cancel' || stripos($name,'[cancel]') !== false)
+				{
+					$type = 'cancel';
+				}
 				list($app) = explode('.',$this->name);
 				list($img,$ro_img) = explode(',',$cell_options);
 				if ($img[0] != '/' && strpos($img,'/') !== false && count($img_parts = explode('/',$img)) == 2)
@@ -1472,11 +1660,14 @@ 
 					$onclick = $this->js_pseudo_funcs($onclick,$cname);
 				}
 				unset($cell['onclick']);	// otherwise the grid will handle it
-				if (($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button
+				if (($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed'])
+				{
+					// use a link instead of a button
 				{
 					$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').
 						(((string)$cell['onchange'] === '1' || $img) ?
 						'return submitit('.self::$name_form.",'".$form_name."');" : $cell['onchange']).'; return false;';
+				}
 
 					if (!html::$netscape4 && substr($img,-1) == '%' && is_numeric($percent = substr($img,0,-1)))
 					{
@@ -1498,16 +1689,23 @@ 
 					{
 						$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').$cell['onchange'];
 					}
-					if ($type == 'cancel') $options .= ' novalidate="novalidate"';	// tell html5 form validation NOT to validate
+					if ($type == 'cancel')
+					{
+						$options .= ' novalidate="novalidate"';
+					}
+					// tell html5 form validation NOT to validate
 					$html .= !$readonly ? html::submit_button($form_name,$label,$onclick,
 						strlen($label) <= 1 || $cell['no_lang'],$options,$img,$app,$type == 'buttononly' ? 'button' : 'submit') :
 						html::image($app,$ro_img,'',$options);
 				}
 				$extra_label = False;
-				if (!$readonly && $type != 'buttononly')	// input button, are never submitted back!
+				if (!$readonly && $type != 'buttononly')
+				{
+					// input button, are never submitted back!
 				{
 					self::$request->set_to_process($form_name,$type);
 				}
+				}
 				break;
 			case 'hrule':
 				$html .= html::hr($cell_options);
@@ -1515,7 +1713,10 @@ 
 			case 'grid':
 				if ($readonly && !$readonlys['__ALL__'])
 				{
-					if (!is_array($readonlys)) $readonlys = array();
+					if (!is_array($readonlys))
+					{
+						$readonlys = array();
+					}
 					$set_readonlys_all = $readonlys['__ALL__'] = True;
 				}
 				if ($name != '')
@@ -1523,7 +1724,10 @@ 
 					$cname .= $cname == '' ? $name : '['.str_replace('[','][',str_replace(']','',$name)).']';
 				}
 				$html .= $this->show_grid($cell,$name ? $value : $content,$readonlys+(array)$readonlys[$name],$cname,$show_c,$show_row,$path);
-				if ($set_readonlys_all) unset($readonlys['__ALL__']);
+				if ($set_readonlys_all)
+				{
+					unset($readonlys['__ALL__']);
+				}
 				break;
 			case 'template':	// size: index in content-array (if not full content is past further on)
 				if (is_object($cell['name']))
@@ -1553,7 +1757,8 @@ 
 						}
 					}
 					else
-					{  $obj_read = 'obj read';
+					{
+$obj_read = 'obj read';
 						$cell['obj'] = new etemplate($name,$this->as_array());
 					}
 				}
@@ -1564,7 +1769,8 @@ 
 				if ($this->autorepeat_idx($cell,$show_c,$show_row,$idx,$idx_cname,false,$content) || $cell_options != '')
 				{
 					if ($span == '' && isset($content[$idx]['span']))
-					{	// this allows a colspan in autorepeated cells like the editor
+					{
+// this allows a colspan in autorepeated cells like the editor
 						list($span) = explode(',',$content[$idx]['span']);
 						if ($span == 'all')
 						{
@@ -1581,11 +1787,17 @@ 
 				}
 				if ($readonly && !$readonlys['__ALL__'])
 				{
-					if (!is_array($readonlys)) $readonlys = array();
+					if (!is_array($readonlys))
+					{
+						$readonlys = array();
+					}
 					$set_readonlys_all = $readonlys['__ALL__'] = True;
 				}
 				// propagate our onclick handler to embeded templates, if they dont have their own
-				if (!isset($cell['obj']->onclick_handler)) $cell['obj']->onclick_handler = $this->onclick_handler;
+				if (!isset($cell['obj']->onclick_handler))
+				{
+					$cell['obj']->onclick_handler = $this->onclick_handler;
+				}
 				if ($cell['obj']->no_onclick)
 				{
 					$cell['obj']->onclick_proxy = $this->onclick_proxy ? $this->onclick_proxy : $this->name.':'.$this->version.':'.$path;
@@ -1599,7 +1811,10 @@ 
 				}
 				$html = $cell['obj']->show($content,$this->sel_options,$readonlys,$cname,$show_c,$show_row);
 
-				if ($set_readonlys_all) unset($readonlys['__ALL__']);
+				if ($set_readonlys_all)
+				{
+					unset($readonlys['__ALL__']);
+				}
 				break;
 			case 'select':	// size:[linesOnMultiselect|emptyLabel,extraStyleMulitselect, [<varies>,]{5} enhance]
 				$sels = array();
@@ -1628,7 +1843,10 @@ 
 					$multiple = 0;
 				}
 				$sels += $this->_sel_options($cell,$name,$content);
-				if ($multiple && !is_array($value)) $value = explode(',',$value);
+				if ($multiple && !is_array($value))
+				{
+					$value = explode(',',$value);
+				}
 				if ($readonly || $cell['noprint'])
 				{
 					foreach($multiple || is_array($value) ? $value : array($value) as $val)
@@ -1643,9 +1861,15 @@ 
 							$option_label = ($sels[$val]?$sels[$val]:$val);
 							$option_title = '';
 						}
-						if (!$cell['no_lang']) $option_label = lang($option_label);
+						if (!$cell['no_lang'])
+						{
+							$option_label = lang($option_label);
+						}
 
-						if ($html) $html .= "<br>\n";
+						if ($html)
+						{
+							$html .= "<br>\n";
+						}
 
 						if ($option_title)
 						{
@@ -1664,12 +1888,15 @@ 
 						$html = '<span class="onlyPrint">'.$html.'</span>';
 						$options .= ' class="noPrint"';
 					}
-					if ($multiple && is_numeric($multiple))	// eg. "3+" would give a regular multiselectbox
+					if ($multiple && is_numeric($multiple))
+					{
+						// eg. "3+" would give a regular multiselectbox
 					{
 						$html .= html::checkbox_multiselect($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
 							$cell['no_lang'],$options,$multiple,$multiple[0]!=='0',
 							$extraStyleMultiselect,$enhance);
 					}
+					}
 					else
 					{
 						$html .= html::select($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
@@ -1708,7 +1935,10 @@ 
 					error_log("Please use correct widget-type '".($is_progress?'progress':'image')."' in eTemplate '$this->name'!");
 				}
 				$image = $value != '' ? $value : $name;
-				if (is_string($image)) list($app,$img) = explode('/',$image,2);
+				if (is_string($image))
+				{
+					list($app,$img) = explode('/',$image,2);
+				}
 				if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
 				{
 					$img = $image;
@@ -1726,7 +1956,10 @@ 
 			case 'file':	// size: size of the filename field
 				if (!$readonly)
 				{
-					if ((int) $cell_options) $options .= ' size="'.(int)$cell_options.'"';
+					if ((int) $cell_options)
+					{
+						$options .= ' size="'.(int)$cell_options.'"';
+					}
 					if (substr($name,-2) == '[]')
 					{
 						self::$form_options .= ' enctype="multipart/form-data"';
@@ -1763,7 +1996,10 @@ 
 				$box_col = 'A';
 				$box_anz = 0;
 				list($num,$orient,,,$keep_empty) = explode(',',$cell_options);
-				if (!$orient) $orient = $type == 'hbox' ? 'horizontal' : ($type == 'box' ? false : 'vertical');
+				if (!$orient)
+				{
+					$orient = $type == 'hbox' ? 'horizontal' : ($type == 'box' ? false : 'vertical');
+				}
 				for ($n = 1; $n <= (int) $num; ++$n)
 				{
 					$child = $cell[$n];	// first param is a var_param now!
@@ -1814,20 +2050,31 @@ 
 						$rows[$box_row]['.'.$box_col] .= html::formatOptions($box_item_class,'class');
 					}
 				}
-				if ($box_anz > 1 && $orient)	// a single cell is NOT placed into a table
+				if ($box_anz > 1 && $orient)
+				{
+					// a single cell is NOT placed into a table
 				{
 					$html = html::table($rows,html::formatOptions($cell_options,',,cellpadding,cellspacing').
 						($type != 'groupbox' ? html::formatOptions($class,'class').
 							 ($cell['name'] ? self::get_id($form_name,$cell['name'],$cell['id']) : '') : '').
-						($cell['align'] && $orient != 'horizontal' || $sub_cell_has_align ? ' width="100%"' : ''));	// alignment only works if table has full width
-					if ($type != 'groupbox') $class = '';	// otherwise we create an extra div
+						($cell['align'] && $orient != 'horizontal' || $sub_cell_has_align ? ' width="100%"' : ''));
+				}
+				// alignment only works if table has full width
+					if ($type != 'groupbox')
+					{
+						$class = '';
+					}
+					// otherwise we create an extra div
 				}
 				// put the class of the box-cell, into the the class of this cell
 				elseif ($box_item_class && $box_anz == 1)
 				{
 					$class = ($class ? $class . ' ' : '') . $box_item_class;
 					// if we have onclick or tooltip, add it to an extra div around single cell
-					if (!empty($rows[$box_row]['.'.$box_col])) $html = html::div($html, $rows[$box_row]['.'.$box_col]);
+					if (!empty($rows[$box_row]['.'.$box_col]))
+					{
+						$html = html::div($html, $rows[$box_row]['.'.$box_col]);
+					}
 				}
 				if ($type == 'groupbox')
 				{
@@ -1841,7 +2088,11 @@ 
 				}
 				elseif (!$orient)
 				{
-					if (strpos($html,'class="'.$class)) $class = '';	// dont add class a 2. time
+					if (strpos($html,'class="'.$class))
+					{
+						$class = '';
+					}
+					// dont add class a 2. time
 					$html = html::div($html,html::formatOptions(array(
 							$cell['height'],
 							$cell['width'],
@@ -1849,12 +2100,18 @@ 
 						),'height,width,class').self::get_id($form_name,$cell['name'],$cell['id'])). ($html ? '' : '</div>');
 					$class = '';	// otherwise we create an extra div
 				}
-				if ($box_anz > 1)	// small docu in the html-source
+				if ($box_anz > 1)
+				{
+					// small docu in the html-source
 				{
 					$html = "\n\n<!-- BEGIN $cell[type] -->\n\n".$html."\n\n<!-- END $cell[type] -->\n\n";
 				}
+				}
 				// we need noPrint on td
-				if (strpos($cell['span'], 'noPrint')) $class .= ' noPrint';
+				if (strpos($cell['span'], 'noPrint'))
+				{
+					$class .= ' noPrint';
+				}
 				$extra_label = False;
 				break;
 			case 'deck':
@@ -1913,7 +2170,8 @@ 
 		}
 		// extension-processing need to be after all other and only with diff. name
 		if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
-		{	// unset it first, if it is already set, to be after the other widgets of the ext.
+		{
+// unset it first, if it is already set, to be after the other widgets of the ext.
 			$to_process = self::$request->get_to_process($form_name);
 			self::$request->unset_to_process($form_name);
 			self::$request->set_to_process($form_name,'ext-'.$ext_type,$to_process);
@@ -1938,20 +2196,26 @@ 
 			}
 			if ($label && !$readonly && ($accesskey || $label_for || $type != 'label' && $cell['name']))
 			{
-				if ($label_for)		// if label_for starts with a '#', it is already an id - no need to create default id from it
+				if ($label_for)
+				{
+					// if label_for starts with a '#', it is already an id - no need to create default id from it
 				{
 					$label_for = $label_for[0] == '#' ? substr($label_for,1) : self::form_name($cname,$label_for);
 				}
+				}
 				else
 				{
 					$label_for = $form_name.($set_val?"[$set_val]":'');
 				}
 				$label = html::label($label,$label_for,$accesskey);
 			}
-			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label,'%s')!==false)	// default for radio is label after the button
+			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label,'%s')!==false)
+			{
+				// default for radio is label after the button
 			{
 				$html = strpos($label,'%s')!==false ? str_replace('%s',$html,$label) : $html.' '.$label;
 			}
+			}
 			elseif (($html = $label . ' ' . $html) == ' ')
 			{
 				$html = '&nbsp;';
@@ -1988,10 +2252,13 @@ 
 		{
 			$handler = str_replace('%p',$this->no_onclick ? $this->onclick_proxy : $this->name.':'.$this->version.':'.$path,
 				$this->onclick_handler);
-			if ($type == 'button' || $type == 'buttononly' || !$label)	// add something to click on
+			if ($type == 'button' || $type == 'buttononly' || !$label)
+			{
+				// add something to click on
 			{
 				$html = (substr($html,-1) == "\n" ? substr($html,0,-1) : $html).'&nbsp;';
 			}
+			}
 			return html::div($html,' ondblclick="'.$handler.'"','clickWidgetToEdit');
 		}
 		return $html;
@@ -2048,10 +2315,16 @@ 
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-			if (empty($dec_separator)) $dec_separator = '.';
+			if (empty($dec_separator))
+			{
+				$dec_separator = '.';
+			}
 			$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 		}
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 
 		$ret = number_format(str_replace(' ','',$number), $num_decimal_places,
 			// need to use '.' as decimal separator for all browser supporting html5 input type=number
@@ -2143,13 +2416,16 @@ 
 	*/
 	function js_pseudo_funcs($on,$cname)
 	{
-		if (strpos($on,'::') !== false)	// avoid the expensive regular expresions, for performance reasons
+		if (strpos($on,'::') !== false)
+		{
+			// avoid the expensive regular expresions, for performance reasons
 		{
 			if (preg_match_all("/egw::link\\('([^']+)','(.+?)'(?:,'(.+?)')?\\)/",$on,$matches))	// the ? alters the expression to shortest match
 			{
 				foreach(array_keys($matches[1]) as $n)                         	// this way we can correctly parse ' in the 2. argument
 				{
 					$url = $GLOBALS['egw']->link($matches[1][$n],$matches[2][$n],$matches[3][$n]);
+		}
 					$on = str_replace($matches[0][$n],'\''.addslashes($url).'\'',$on);
 				}
 			}
@@ -2163,8 +2439,10 @@ 
 				$on = str_replace($matches[0],$matches[1],$on);
 			}
 			// we need to search ungready (shortest possible match), to avoid catching to much
-			if (preg_match_all('/egw::lang\(["\']{1}(.*)["\']{1}\)/U',$on,$matches)) {
-				foreach($matches[1] as $n => $string) {
+			if (preg_match_all('/egw::lang\(["\']{1}(.*)["\']{1}\)/U',$on,$matches))
+			{
+				foreach($matches[1] as $n => $string)
+				{
 					$str = lang($string);
 					$on = str_replace($matches[0][$n],'\''.addslashes($str).'\'',$on);
 				}
@@ -2273,14 +2551,20 @@ 
 			$value = self::get_array($content_in,$form_name,True,$GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' ? false : true );
 			// The comment below does only aplay to normal posts, not for xajax. Files are not supported anyway by xajax atm.
 			// not checked checboxes are not returned in HTML and file is in $_FILES and not in $content_in
-			if($value === false && $_type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/) continue;
+			if($value === false && $_type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/)
+			{
+				continue;
+			}
 
 			if (isset($attr['blur']) && $attr['blur'] == $value)
 			{
 				$value = '';	// blur-values is equal to emtpy
 			}
 			//echo "<p>process_show($this->name) loop was ".self::$loop.", $type: $form_name = ".array2string($value)."</p>\n";
-			if (is_string($type)) list($type,$sub) = explode('-',$type);
+			if (is_string($type))
+			{
+				list($type,$sub) = explode('-',$type);
+			}
 			switch ($type)
 			{
 				case 'ext':
@@ -2344,11 +2628,15 @@ 
 								break;
 						}
 					}
-					elseif (in_array($type, array('int', 'integer', 'float')))	// cast int and float and check range
+					elseif (in_array($type, array('int', 'integer', 'float')))
+					{
+						// cast int and float and check range
 					{
 						if ((string)$value !== '' || $attr['needed'])	// empty values are Ok if needed is not set
 						{
-							$value = $type != 'float' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+							$value = $type != 'float' ? (int) $value : (float) str_replace(',','.',$value);
+					}
+					// allow for german (and maybe other) format
 
 							if (!empty($attr['min']) && $value < $attr['min'])
 							{
@@ -2379,19 +2667,25 @@ 
 					}
 					break;
 				case 'select':
-					if ($attr['allowed'])	// only check for $value is allowed, if allowed values are set
+					if ($attr['allowed'])
+					{
+						// only check for $value is allowed, if allowed values are set
 					{
 						foreach(is_array($value) ? $value : array($value) as $val)
 						{
 							if (!($attr['multiple'] && !$val) && !in_array($val,$attr['allowed']))
 							{
 								self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",$attr['allowed'])),'');
+					}
 								$value = '';
 								break;
 							}
 						}
 					}
-					if (is_array($value)) $value = implode(',',$value);
+					if (is_array($value))
+					{
+						$value = implode(',',$value);
+					}
 					if ($value === '' && $attr['needed'])
 					{
 						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
@@ -2427,17 +2721,27 @@ 
 						$file = array();
 						foreach(array('tmp_name','type','size','name','error') as $part)
 						{
-							if (!is_array($_FILES[$name])) break 2;	// happens eg. in forms set via xajax, which do not upload files
+							if (!is_array($_FILES[$name]))
+							{
+								break 2;
+							}
+							// happens eg. in forms set via xajax, which do not upload files
 							$file[$part] = $this->get_array($_FILES[$name],$part.$index.($multiple ? "[$i]" : ''));
 						}
-						if (!$multiple) $file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
+						if (!$multiple)
+						{
+							$file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
+						}
 						$file['ip'] = $_SERVER['REMOTE_ADDR'];
 						// check if we have an upload error
-						if ($file['error'] && $file['name'] !== '' && !$file['size'])	// ignore empty upload boxes
+						if ($file['error'] && $file['name'] !== '' && !$file['size'])
+						{
+							// ignore empty upload boxes
 						{
 							self::set_validation_error($form_name.($multiple?'[]':''),
 								lang('Error uploading file!')."\n".self::max_upload_size_message(),'');
 						}
+						}
 						if ((string)$file['name'] === '' || $file['tmp_name'] && function_exists('is_uploaded_file') && !is_uploaded_file($file['tmp_name']))
 						{
 							if ($multiple && ($file['name'] === '' || $file['error']))
@@ -2488,9 +2792,15 @@ 
 	*/
 	static function set_validation_error($name,$error,$cname=null)
 	{
-		if (is_null($cname)) $cname = self::$name_vars;
+		if (is_null($cname))
+		{
+			$cname = self::$name_vars;
+		}
 		//echo "<p>self::set_validation_error('$name','$error','$cname');</p>\n";
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname)
+		{
+			$name = self::form_name($cname,$name);
+		}
 
 		if ($error === false)
 		{

etemplate/inc/class.etemplate_new.inc.php

Doc Comments +6 added lines, -6 removed lines

@@ -493,7 +493,7 @@ 
 	 * Reads an eTemplate from filesystem or DB (not yet supported)
 	 *
 	 * @param string $name name of the eTemplate or array with the values for all keys
-	 * @param string $template_set=null default try template-set from user and if not found "default"
+	 * @param string $template_set default try template-set from user and if not found "default"
 	 * @param string $lang language, '' loads the pref. lang of the user, 'default' loads the default one '' in the db
 	 * @param int $group id of the (primary) group of the user or 0 for none, not used at the moment !!!
 	 * @param string $version version of the eTemplate
@@ -572,7 +572,7 @@ 
 	 *  disables all cells with name == $name
 	 *
 	 * @param sting $name cell-name
-	 * @param boolean $disabled=true disable or enable a cell, default true=disable
+	 * @param boolean $disabled disable or enable a cell, default true=disable
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
@@ -590,7 +590,7 @@ 
 	 *
 	 * @param array $old
 	 * @param array $new
-	 * @return array the merged array
+	 * @return string the merged array
 	 */
 	public static function complete_array_merge($old,$new)
 	{
@@ -618,7 +618,7 @@ 
 	/**
 	 * Debug callback just outputting content
 	 *
-	 * @param array $content=null
+	 * @param array $content
 	 */
 	public function debug(array $content=null)
 	{
@@ -650,8 +650,8 @@ 
 	 * Format a number according to user prefs with decimal and thousands separator (later only for readonly)
 	 *
 	 * @param int|float|string $number
-	 * @param int $num_decimal_places=2
-	 * @param boolean $readonly=true
+	 * @param int $num_decimal_places
+	 * @param boolean $readonly
 	 * @return string
 	 */
 	static public function number_format($number,$num_decimal_places=2,$readonly=true)

Spacing +69 added lines, -69 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @public boolean
 	 */
-	public $sitemgr=false;
+	public $sitemgr = false;
 
 	/**
 	 * Tell egw framework it's ok to call this
@@ -44,17 +44,17 @@ 
 	 * @param string $name of etemplate or array with name and other keys
 	 * @param string|array $load_via with keys of other etemplate to load in order to get $name
 	 */
-	function __construct($name='',$load_via='')
+	function __construct($name = '', $load_via = '')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false) parent::__construct($name); // satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name) $this->read($name, $template = 'default', 'default', 0, '', $load_via);
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = etemplate_request::read();
+		if (!isset(self::$request)) self::$request = etemplate_request::read();
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param string|array $params url or array with get-params incl. menuaction
 	 */
-	static function location($params='')
+	static function location($params = '')
 	{
 		egw::redirect_link(is_array($params) ? '/index.php' : $params,
 			is_array($params) ? $params : '');
@@ -100,7 +100,7 @@ 
 	 * @param array $changes change made in the last call if looping, only used internaly by process_exec
 	 * @return string html for $output_mode == 1, else nothing
 	 */
-	function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
+	function exec($method, array $content, array $sel_options = null, array $readonlys = null, array $preserv = null, $output_mode = 0, $ignore_validation = '', array $changes = null)
 	{
 		$hook_data = $GLOBALS['egw']->hooks->process(
 			array('hook_location'   => 'etemplate2_before_exec') +
@@ -109,10 +109,10 @@ 
 			$content
 		);
 
-		foreach($hook_data as $extras) {
+		foreach ($hook_data as $extras) {
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra) {
 				if ($extra['data'] && is_array($extra['data'])) {
 					$content = array_merge($content, $extra['data']);
 				}
@@ -138,7 +138,7 @@ 
 			$output_mode = 0;
 			self::$response = egw_json_response::get();
 		}
-		self::$request->output_mode = $output_mode;	// let extensions "know" they are run eg. in a popup
+		self::$request->output_mode = $output_mode; // let extensions "know" they are run eg. in a popup
 		self::$request->content = self::$cont = $content;
 		self::$request->changes = $changes;
 		self::$request->sel_options = is_array($sel_options) ? self::fix_sel_options($sel_options) : array();
@@ -162,15 +162,15 @@ 
 		// compile required translations translations
 		translation::add_app('etemplate');
 		$currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
-		$langRequire = array('common' => array(), 'etemplate' => array());	// keep that order
-		foreach(translation::$loaded_apps as $l_app => $lang)
+		$langRequire = array('common' => array(), 'etemplate' => array()); // keep that order
+		foreach (translation::$loaded_apps as $l_app => $lang)
 		{
 			if (!in_array($l_app, array($currentapp, 'custom')))
 			{
 				$langRequire[$l_app] = array('app' => $l_app, 'lang' => $lang, 'etag' => translation::etag($l_app, $lang));
 			}
 		}
-		foreach(array($currentapp, 'custom') as $l_app)
+		foreach (array($currentapp, 'custom') as $l_app)
 		{
 			if (isset(translation::$loaded_apps[$l_app]))
 			{
@@ -191,7 +191,7 @@ 
 		);
 
 		// Info required to load the etemplate client-side
-		$dom_id = str_replace('.','-',$this->dom_id);
+		$dom_id = str_replace('.', '-', $this->dom_id);
 		$load_array = array(
 			'name' => $this->name,
 			'url' => etemplate_widget_template::rel2url($this->rel_path),
@@ -201,8 +201,8 @@ 
 		if (self::$response)	// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
-			self::$response->generic('et2_load', $load_array+egw_framework::get_extra());
-			egw_framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+			self::$response->generic('et2_load', $load_array + egw_framework::get_extra());
+			egw_framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
 		{
@@ -216,10 +216,10 @@ 
 			egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
 
 			// check if application of template has a app.js file --> load it
-			list($app) = explode('.',$this->name);
+			list($app) = explode('.', $this->name);
 			if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
 			{
-				egw_framework::validate_file('.','app',$app,false);
+				egw_framework::validate_file('.', 'app', $app, false);
 			}
 			// Category styles
 			categories::css($app);
@@ -235,14 +235,14 @@ 
 				$content = '<form target="egw_iframe_autocomplete_helper" action="'.$form_action.'" id="'.$dom_id.'" class="et2_container"></form>'."\n".
 					'<iframe name="egw_iframe_autocomplete_helper" style="width:0;height:0;position: absolute;visibility:hidden;"></iframe>';
 				// add server-side page-generation times
-				if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+				if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 				{
 					$vars = $GLOBALS['egw']->framework->_get_footer();
 					$content .= "\n".$vars['page_generation_time'];
 				}
 				$GLOBALS['egw']->framework->response->generic("data", array($content));
-				$GLOBALS['egw']->framework->response->generic('et2_load',$load_array+egw_framework::get_extra());
-				egw_framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+				$GLOBALS['egw']->framework->response->generic('et2_load', $load_array + egw_framework::get_extra());
+				egw_framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 				self::$request = null;
 				return;
 			}
@@ -261,7 +261,7 @@ 
 				echo '<div id="popupMainDiv">'."\n";
 			}
 			// Send any accumulated json responses - after flush to avoid sending the buffer as a response
-			if(egw_json_response::isJSONResponse())
+			if (egw_json_response::isJSONResponse())
 			{
 				$load_array['response'] = egw_json_response::get()->returnResult();
 			}
@@ -286,10 +286,10 @@ 
 	 */
 	static protected function fix_sel_options(array $sel_options)
 	{
-		foreach($sel_options as &$options)
+		foreach ($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
-			foreach($options as $key => $value)
+			if (!is_array($options) || empty($options)) continue;
+			foreach ($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
 				{
@@ -325,9 +325,9 @@ 
 		}
 
 		// Set current app for validation
-		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
-		if($app)
+		list($app) = explode('.', self::$request->method);
+		if (!$app) list($app) = explode('::', self::$request->method);
+		if ($app)
 		{
 			translation::add_app($app);
 			$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -336,7 +336,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 
 		if ($no_validation)
 		{
@@ -359,10 +359,10 @@ 
 				self::complete_array_merge(self::$request->preserv, $validated)
 			);
 
-		foreach($hook_data as $extras) {
+		foreach ($hook_data as $extras) {
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra) {
 				if ($extra['data'] && is_array($extra['data'])) {
 					$validated = array_merge($validated, $extra['data']);
 				}
@@ -376,7 +376,7 @@ 
 
 		$tcontent = array();
 
-		if( is_array($content) ) {
+		if (is_array($content)) {
 			$tcontent = $content;
 		}
 		else {
@@ -394,11 +394,11 @@ 
 			);
 		unset($tcontent);
 
-		if( is_array($content) ) {
-			foreach($hook_data as $extras) {
+		if (is_array($content)) {
+			foreach ($hook_data as $extras) {
 				if (!$extras) continue;
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+				foreach (isset($extras[0]) ? $extras : array($extras) as $extra) {
 					if ($extra['data'] && is_array($extra['data'])) {
 						$content = array_merge($content, $extra['data']);
 					}
@@ -410,7 +410,7 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
 			self::$response->script($GLOBALS['egw_info']['flags']['java_script']);
 			//error_log($app .' added javascript to $GLOBALS[egw_info][flags][java_script] - use egw_json_response->script() instead.');
 		}
@@ -439,8 +439,8 @@ 
 	static public function process_exec()
 	{
 		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
-		$content = json_decode($_POST['value'],true);
-		if($content == null && $_POST['exec'])
+		$content = json_decode($_POST['value'], true);
+		if ($content == null && $_POST['exec'])
 		{
 			// Old etemplate submit
 			error_log("Old etemplate submitted");
@@ -459,7 +459,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 		if (self::validation_errors(self::$request->ignore_validation))
 		{
 			error_log(__METHOD__."(,".array2string($content).') validation_errors='.array2string(self::$validation_errors));
@@ -502,11 +502,11 @@ 
 	 *
 	 * @ToDo supported customized templates stored in DB
 	 */
-	public function read($name,$template_set=null,$lang='default',$group=0,$version='',$load_via='')
+	public function read($name, $template_set = null, $lang = 'default', $group = 0, $version = '', $load_via = '')
 	{
-		unset($lang); unset($group);	// not used, but in old signature
-		$this->rel_path = self::relPath($this->name=$name, $this->template_set=$template_set,
-			$this->version=$version, $this->laod_via = $load_via);
+		unset($lang); unset($group); // not used, but in old signature
+		$this->rel_path = self::relPath($this->name = $name, $this->template_set = $template_set,
+			$this->version = $version, $this->laod_via = $load_via);
 		//error_log(__METHOD__."('$name', '$template_set', '$lang', $group, '$version', '$load_via') rel_path=".array2string($this->rel_path));
 
 		$this->dom_id = $name;
@@ -549,7 +549,7 @@ 
 	 * @return mixed reference to attribute, usually NULL
 	 * @deprecated use getElementAttribute($name, $attr)
 	 */
-	public function &get_cell_attribute($name,$attr)
+	public function &get_cell_attribute($name, $attr)
 	{
 		return self::getElementAttribute($name, $attr);
 	}
@@ -563,7 +563,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */
-	public function &set_cell_attribute($name,$attr,$val)
+	public function &set_cell_attribute($name, $attr, $val)
 	{
 		return self::setElementAttribute($name, $attr, $val);
 	}
@@ -576,7 +576,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
-	public function disable_cells($name,$disabled=True)
+	public function disable_cells($name, $disabled = True)
 	{
 		return self::disableElement($name, $disabled);
 	}
@@ -592,23 +592,23 @@ 
 	 * @param array $new
 	 * @return array the merged array
 	 */
-	public static function complete_array_merge($old,$new)
+	public static function complete_array_merge($old, $new)
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old)) $old = (array)$old;
 
-			foreach($new as $k => $v)
+			foreach ($new as $k => $v)
 			{
-				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
-					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
+				if (!is_array($v) || !isset($old[$k]) || // no array or a new array
+					isset($v[0]) && !is_array($v[0]) && isset($v[count($v) - 1]) || // or no associative array, eg. selecting multiple accounts
 					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
 				else
 				{
-					$old[$k] = self::complete_array_merge($old[$k],$v);
+					$old[$k] = self::complete_array_merge($old[$k], $v);
 				}
 			}
 		}
@@ -620,7 +620,7 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	public function debug(array $content=null)
+	public function debug(array $content = null)
 	{
 		common::egw_header();
 		_debug_array($content);
@@ -636,11 +636,11 @@ 
 	 * @param int &$max_upload=null on return max. upload size in byte
 	 * @return string
 	 */
-	static function max_upload_size_message(&$max_upload=null)
+	static function max_upload_size_message(&$max_upload = null)
 	{
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$post_max_size = ini_get('post_max_size');
-		$max_upload = min(self::km2int($upload_max_filesize),self::km2int($post_max_size)-2800);
+		$max_upload = min(self::km2int($upload_max_filesize), self::km2int($post_max_size) - 2800);
 
 		return lang('Maximum size for uploads').': '.egw_vfs::hsize($max_upload).
 			" (php.ini: upload_max_filesize=$upload_max_filesize, post_max_size=$post_max_size)";
@@ -654,9 +654,9 @@ 
 	 * @param boolean $readonly=true
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$readonly=true)
+	static public function number_format($number, $num_decimal_places = 2, $readonly = true)
 	{
-		static $dec_separator=null,$thousands_separator=null;
+		static $dec_separator = null, $thousands_separator = null;
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
@@ -665,7 +665,7 @@ 
 		}
 		if ((string)$number === '') return '';
 
-		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
+		return number_format(str_replace(' ', '', $number), $num_decimal_places, $dec_separator, $readonly ? $thousands_separator : '');
 	}
 
 	/**
@@ -678,13 +678,13 @@ 
 	{
 		if (!is_numeric($size))
 		{
-			switch(strtolower(substr($size,-1)))
+			switch (strtolower(substr($size, -1)))
 			{
 				case 'm':
-					$size = 1024*1024*(int)$size;
+					$size = 1024 * 1024 * (int)$size;
 					break;
 				case 'k':
-					$size = 1024*(int)$size;
+					$size = 1024 * (int)$size;
 					break;
 			}
 		}
@@ -693,16 +693,16 @@ 
 }
 
 // Try to discover all widgets, as names don't always match tags (eg: listbox is in menupopup)
-$files = scandir(EGW_INCLUDE_ROOT . '/etemplate/inc');
-foreach($files as $filename)
+$files = scandir(EGW_INCLUDE_ROOT.'/etemplate/inc');
+foreach ($files as $filename)
 {
-	if(strpos($filename, 'class.etemplate_widget') === 0)
+	if (strpos($filename, 'class.etemplate_widget') === 0)
 	{
 		try
 		{
 			include_once($filename);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			error_log($e->getMessage());
 		}
@@ -711,17 +711,17 @@ 
 
 // Use hook to load custom widgets from other apps
 $widgets = $GLOBALS['egw']->hooks->process('etemplate2_register_widgets');
-foreach($widgets as $app => $list)
+foreach ($widgets as $app => $list)
 {
 	if (is_array($list))
 	{
-		foreach($list as $class)
+		foreach ($list as $class)
 		{
 			try
 			{
-				class_exists($class);	// trigger autoloader
+				class_exists($class); // trigger autoloader
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				error_log($e->getMessage());
 			}

Braces +105 added lines, -33 removed lines

@@ -47,14 +47,24 @@ 
 	function __construct($name='',$load_via='')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false)
+		{
+			parent::__construct ($name);
+		}
+		// satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name)
+		{
+			$this->read($name,$template='default','default',0,'',$load_via);
+		}
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = etemplate_request::read();
+		if(!isset(self::$request))
+		{
+			self::$request = etemplate_request::read();
+		}
 	}
 
 	/**
@@ -109,19 +119,27 @@ 
 			$content
 		);
 
-		foreach($hook_data as $extras) {
-			if (!$extras) continue;
+		foreach($hook_data as $extras)
+		{
+			if (!$extras)
+			{
+				continue;
+			}
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
-				if ($extra['data'] && is_array($extra['data'])) {
+			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			{
+				if ($extra['data'] && is_array($extra['data']))
+				{
 					$content = array_merge($content, $extra['data']);
 				}
 
-				if ($extra['preserve'] && is_array($extra['preserve'])) {
+				if ($extra['preserve'] && is_array($extra['preserve']))
+				{
 					$preserv = array_merge($preserv, $extra['preserve']);
 				}
 
-				if ($extra['readonlys'] && is_array($extra['readonlys'])) {
+				if ($extra['readonlys'] && is_array($extra['readonlys']))
+				{
 					$readonlys = array_merge($readonlys, $extra['readonlys']);
 				}
 			}
@@ -131,7 +149,10 @@ 
 		// Include the etemplate2 javascript code
 		egw_framework::validate_file('.', 'etemplate2', 'etemplate');
 
-		if (!$this->rel_path) throw new egw_exception_assertion_failed("No (valid) template '$this->name' found!");
+		if (!$this->rel_path)
+		{
+			throw new egw_exception_assertion_failed("No (valid) template '$this->name' found!");
+		}
 
 		if ($output_mode == 4)
 		{
@@ -146,14 +167,23 @@ 
 		self::$request->preserv = $preserv ? $preserv : array();
 		self::$request->method = $method;
 		self::$request->ignore_validation = $ignore_validation;
-		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
+		if (self::$request->output_mode == -1)
+		{
+			self::$request->output_mode = 0;
+		}
 		self::$request->template = $this->as_array();
 
-		if (empty($this->name)) throw new egw_exception_assertion_failed("Template  name is not set '$this->name' !");
+		if (empty($this->name))
+		{
+			throw new egw_exception_assertion_failed("Template  name is not set '$this->name' !");
+		}
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = etemplate_widget_template::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new egw_exception_assertion_failed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template)
+		{
+			throw new egw_exception_assertion_failed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		}
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 
 		// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings
@@ -198,10 +228,13 @@ 
 			'data' => $data,
 			'DOMNodeID' => $dom_id,
 		);
-		if (self::$response)	// call is within an ajax event / form submit
+		if (self::$response)
+		{
+			// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
 			self::$response->generic('et2_load', $load_array+egw_framework::get_extra());
+		}
 			egw_framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
@@ -227,7 +260,10 @@ 
 			// set action attribute for autocomplete form tag
 			// as firefox complains on about:balnk action, thus we have to literaly submit the form to a blank html
 			$form_action = "about:blank";
-			if (html::$user_agent == 'firefox') $form_action = $GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/empty.html';
+			if (html::$user_agent == 'firefox')
+			{
+				$form_action = $GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/empty.html';
+			}
 
 			// check if we are in an ajax-exec call from jdots template (or future other tabbed templates)
 			if (isset($GLOBALS['egw']->framework->response))
@@ -288,7 +324,10 @@ 
 	{
 		foreach($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
+			if (!is_array($options)||empty($options))
+			{
+				continue;
+			}
 			foreach($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
@@ -326,7 +365,10 @@ 
 
 		// Set current app for validation
 		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
+		if(!$app)
+		{
+			list($app) = explode('::',self::$request->method);
+		}
 		if($app)
 		{
 			translation::add_app($app);
@@ -359,11 +401,17 @@ 
 				self::complete_array_merge(self::$request->preserv, $validated)
 			);
 
-		foreach($hook_data as $extras) {
-			if (!$extras) continue;
+		foreach($hook_data as $extras)
+		{
+			if (!$extras)
+			{
+				continue;
+			}
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
-				if ($extra['data'] && is_array($extra['data'])) {
+			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			{
+				if ($extra['data'] && is_array($extra['data']))
+				{
 					$validated = array_merge($validated, $extra['data']);
 				}
 			}
@@ -376,10 +424,12 @@ 
 
 		$tcontent = array();
 
-		if( is_array($content) ) {
+		if( is_array($content) )
+		{
 			$tcontent = $content;
 		}
-		else {
+		else
+		{
 			$tcontent = self::complete_array_merge(
 				self::$request->preserv,
 				$validated
@@ -394,12 +444,19 @@ 
 			);
 		unset($tcontent);
 
-		if( is_array($content) ) {
-			foreach($hook_data as $extras) {
-				if (!$extras) continue;
+		if( is_array($content) )
+		{
+			foreach($hook_data as $extras)
+			{
+				if (!$extras)
+				{
+					continue;
+				}
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
-					if ($extra['data'] && is_array($extra['data'])) {
+				foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+				{
+					if ($extra['data'] && is_array($extra['data']))
+					{
 						$content = array_merge($content, $extra['data']);
 					}
 				}
@@ -438,7 +495,10 @@ 
 	 */
 	static public function process_exec()
 	{
-		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
+		if (get_magic_quotes_gpc())
+		{
+			$_POST['value'] = stripslashes($_POST['value']);
+		}
 		$content = json_decode($_POST['value'],true);
 		if($content == null && $_POST['exec'])
 		{
@@ -596,16 +656,22 @@ 
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old))
+			{
+				$old = (array) $old;
+			}
 
 			foreach($new as $k => $v)
 			{
 				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
 					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
-					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
+					is_array($v) && count($v) == 0)
+				{
+					// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
+				}
 				else
 				{
 					$old[$k] = self::complete_array_merge($old[$k],$v);
@@ -660,10 +726,16 @@ 
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-			if (empty($dec_separator)) $dec_separator = '.';
+			if (empty($dec_separator))
+			{
+				$dec_separator = '.';
+			}
 			$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 		}
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 
 		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
 	}

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

@@ -153,7 +153,7 @@
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = etemplate_widget_template::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new egw_exception_assertion_failed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template) throw new egw_exception_assertion_failed("template $this->name not instanciable! Maybe you forgot to rename template id.");
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 
 		// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings