EGroupware / egroupware

api/src/Framework.php

Indentation +63 added lines, -63 removed lines

@@ -62,16 +62,16 @@ 
 	var $template_dirs = array();
 
 	/**
-	* true if $this->header() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->header() was called
+	 *
+	 * @var boolean
+	 */
 	static $header_done = false;
 	/**
-	* true if $this->navbar() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->navbar() was called
+	 *
+	 * @var boolean
+	 */
 	static $navbar_done = false;
 
 	/**
@@ -1044,13 +1044,13 @@ 
 	}
 
 	/**
-	* Compile entries for topmenu:
-	* - regular items: links
-	* - info items
-	*
-	* @param array $vars
-	* @param array $apps
-	*/
+	 * Compile entries for topmenu:
+	 * - regular items: links
+	 * - info items
+	 *
+	 * @param array $vars
+	 * @param array $apps
+	 */
 	function topmenu(array $vars,array $apps)
 	{
 		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
@@ -1154,39 +1154,39 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content Html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content Html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_info_item($content, $id=null);
 
 	static $top_menu_extra = array();
 
 	/**
-	* Called by hooks to add an entry in the topmenu location.
-	* Extra entries will be added just before Logout.
-	*
-	* @param string $id unique element id
-	* @param string $url Address for the entry to link to
-	* @param string $title Text displayed for the entry
-	* @param string $target Optional, so the entry can open in a new page or popup
-	* @access public
-	* @return void
-	*/
+	 * Called by hooks to add an entry in the topmenu location.
+	 * Extra entries will be added just before Logout.
+	 *
+	 * @param string $id unique element id
+	 * @param string $url Address for the entry to link to
+	 * @param string $title Text displayed for the entry
+	 * @param string $target Optional, so the entry can open in a new page or popup
+	 * @access public
+	 * @return void
+	 */
 	public static function add_topmenu_item($id,$url,$title,$target = '')
 	{
 		$entry['name'] = $id;
@@ -1198,16 +1198,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
 
 	/**
@@ -1242,19 +1242,19 @@ 
 	protected static $js_include_mgr;
 
 	/**
-	* Checks to make sure a valid package and file name is provided
-	*
-	* Example call syntax:
-	* a) Api\Framework::includeJS('jscalendar','calendar')
-	*    --> /phpgwapi/js/jscalendar/calendar.js
-	* b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
-	*    --> /phpgwapi/inc/calendar-setup.js?lang=de
-	*
-	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
-	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
-	*/
+	 * Checks to make sure a valid package and file name is provided
+	 *
+	 * Example call syntax:
+	 * a) Api\Framework::includeJS('jscalendar','calendar')
+	 *    --> /phpgwapi/js/jscalendar/calendar.js
+	 * b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
+	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
+	 *
+	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
+	 * @param string|array $file =null file to be included - no ".js" on the end or array with get params
+	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
+	 * @param boolean $append =true should the file be added
+	 */
 	static function includeJS($package, $file=null, $app='phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);

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

@@ -354,7 +354,7 @@ 
 	 */
 	public function _get_footer()
 	{
-		$var = Array(
+		$var = array(
 			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
@@ -763,7 +763,7 @@ 
 
 				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,array($icon,'nonav'),'',$svg);
 			}
 		}
 
@@ -796,13 +796,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',array('about','nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',array('logout','nonav'));
 
 		return $apps;
 	}

Doc Comments +3 added lines, -9 removed lines

@@ -78,6 +78,7 @@ 
 	 * Constructor
 	 *
 	 * The constructor instanciates the class in $GLOBALS['egw']->framework, from where it should be used
+	 * @param string $template
 	 */
 	function __construct($template)
 	{
@@ -564,7 +565,7 @@ 
 	/**
 	 * Returns Html with user and time
 	 *
-	 * @return void
+	 * @return string
 	 */
 	protected static function _user_time_info()
 	{
@@ -993,7 +994,6 @@ 
 	 *
 	 * Themes are css file in the template directory
 	 *
-	 * @param string $themes_dir ='css'
 	 */
 	function list_themes()
 	{
@@ -1184,11 +1184,6 @@ 
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
@@ -1281,7 +1276,6 @@ 
 	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
 	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
 	*/
 	static function includeJS($package, $file=null, $app='phpgwapi')
 	{
@@ -1442,7 +1436,7 @@ 
 	 * @param string $action "add" or "delete"
 	 * @param boolean|int|string $group ID of the group to create the favorite for, or 'all' for all users
 	 * @param array $filters =array() key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function ajax_set_favorite($app, $name, $action, $group, $filters = array())
 	{

Braces +54 added lines, -15 removed lines

@@ -222,7 +222,10 @@ 
 		}
 
 		// commit session (if existing), to fix timing problems sometimes preventing session creation ("Your session can not be verified")
-		if (isset($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+		if (isset($GLOBALS['egw']->session))
+		{
+			$GLOBALS['egw']->session->commit_session();
+		}
 
 		exit;
 	}
@@ -252,8 +255,14 @@ 
 	 */
 	function render($content,$app_header=null,$navbar=null)
 	{
-		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
-		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		if (!is_null($app_header))
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = $app_header;
+		}
+		if (!is_null($navbar))
+		{
+			$GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		}
 
 		echo $this->header();
 
@@ -450,7 +459,10 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki')
+		{
+			$robots ='<meta name="robots" content="none" />';
+		}
 
 		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
 		{
@@ -692,13 +704,19 @@ 
 		$ind_b = isset($arr[$b['name']]) ? $arr[$b['name']] : null;
 
 		if ($ind_a == $ind_b)
-			return 0;
+		{
+					return 0;
+		}
 
 		if ($ind_a == null)
-			return -1;
+		{
+					return -1;
+		}
 
 		if ($ind_b == null)
-			return 1;
+		{
+					return 1;
+		}
 
 		return $ind_a > $ind_b ? 1 : -1;
 	}
@@ -787,9 +805,12 @@ 
 			$app_title = $GLOBALS['egw_info']['apps'][$app]['title'];
 		}
 
-		if ($GLOBALS['egw_info']['user']['apps']['preferences'])	// Preferences last
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			// Preferences last
 		{
 			$prefs = $apps['preferences'];
+		}
 			unset($apps['preferences']);
 			$apps['preferences'] = $prefs;
 		}
@@ -839,7 +860,10 @@ 
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
 			foreach($themes_to_check as $theme_css)
 			{
-				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
+				if (file_exists(EGW_SERVER_ROOT.$theme_css))
+				{
+					break;
+				}
 			}
 			$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 			if (!$debug_minify && file_exists(EGW_SERVER_ROOT.($theme_min_css = str_replace('.css', '.min.css', $theme_css))))
@@ -929,7 +953,9 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str)
+		{
+return substr($str,1);}, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -941,7 +967,10 @@ 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
 		foreach($extra+self::$extra as $name => $value)
 		{
-			if (is_array($value)) $value = json_encode($value);
+			if (is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
 			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
 		}
@@ -991,7 +1020,10 @@ 
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
 					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					if (!isset($list[$name]))
+					{
+						$list[$name] = ucfirst ($name);
+					}
 				}
 			}
 			closedir($dh);
@@ -1070,7 +1102,8 @@ 
 
 		Hooks::process('topmenu_info',array(),true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach(self::$top_menu_extra as $extra_item)
+		{
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1095,7 +1128,10 @@ 
 	protected function add_preferences_topmenu($type='prefs')
 	{
 		static $memberships=null;
-		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		if (!isset($memberships))
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		}
 		static $types = array(
 			'prefs' => array(
 				'title' => 'Preferences',
@@ -1123,7 +1159,10 @@ 
 			// as all apps answer, we need to remove none-true responses
 			foreach($apps as $app => $val)
 			{
-				if (!$val) unset($apps[$app]);
+				if (!$val)
+				{
+					unset($apps[$app]);
+				}
 			}
 		}
 		else

Spacing +114 added lines, -115 removed lines

@@ -116,7 +116,7 @@ 
 			$GLOBALS['egw_info']['server']['template_set'] = 'jdots';
 		}
 		// eg. "default" is only used for login at the moment
-		if (!class_exists($class=$GLOBALS['egw_info']['server']['template_set'].'_framework'))
+		if (!class_exists($class = $GLOBALS['egw_info']['server']['template_set'].'_framework'))
 		{
 			$class = __CLASS__.'\\Minimal';
 		}
@@ -134,7 +134,7 @@ 
 		Header\ContentSecurityPolicy::send();
 
 		// allow client-side to detect first load aka just logged in
-		$reload_count =& Cache::getSession(__CLASS__, 'framework-reload');
+		$reload_count = & Cache::getSession(__CLASS__, 'framework-reload');
 		self::$extra['framework-reload'] = (int)(bool)$reload_count++;
 	}
 
@@ -164,9 +164,9 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
-		unset($link_app);	// not used by required by function signature
+		unset($link_app); // not used by required by function signature
 		return $GLOBALS['egw']->session->link($url, $extravars);
 	}
 
@@ -178,7 +178,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		// Determines whether the current output buffer should be flushed
 		$do_flush = true;
@@ -200,7 +200,7 @@ 
 		else
 		{
 			$file = $line = null;
-			if (headers_sent($file,$line))
+			if (headers_sent($file, $line))
 			{
 				throw new Exception\AssertionFailed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!");
 			}
@@ -235,7 +235,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		self::redirect(self::link($url, $extravars), $link_app);
 	}
@@ -250,7 +250,7 @@ 
 	 * @param string $navbar =null show the navigation, default !$GLOBALS['egw_info']['flags']['nonavbar'], false gives a typical popu
 	 *
 	 */
-	function render($content,$app_header=null,$navbar=null)
+	function render($content, $app_header = null, $navbar = null)
 	{
 		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
 		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
@@ -271,7 +271,7 @@ 
 	 *
 	 * @return string with Html
 	 */
-	abstract function header(array $extra=array());
+	abstract function header(array $extra = array());
 
 	/**
 	 * Returns the Html from the body-tag til the main application area (incl. opening div tag)
@@ -291,7 +291,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	abstract function isTop($consider_navbar_not_yet_called_as_true=true);
+	abstract function isTop($consider_navbar_not_yet_called_as_true = true);
 
 	/**
 	 * Returns the content of one sidebox
@@ -301,7 +301,7 @@ 
 	 * @param array $file
 	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
 	 */
-	abstract function sidebox($appname,$menu_title,$file,$type=null);
+	abstract function sidebox($appname, $menu_title, $file, $type = null);
 
 	/**
 	 * Returns the Html from the closing div of the main application area to the closing html-tag
@@ -316,7 +316,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		(new Framework\Login($this))->screen($extra_vars, $change_passwd);
 	}
@@ -354,11 +354,11 @@ 
 	public function _get_footer()
 	{
 		$var = Array(
-			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
+			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
 		$var['page_generation_time'] = '';
-		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 		{
 			$times = self::get_page_generation_time();
 
@@ -398,16 +398,16 @@ 
 	static public function _get_body_attribs()
 	{
 		$js = '';
-		foreach(self::$body_tags as $what => $data)
+		foreach (self::$body_tags as $what => $data)
 		{
 			if (!empty($data))
 			{
-				if($what == 'onLoad')
+				if ($what == 'onLoad')
 				{
-					$js .= 'onLoad="egw_LAB.wait(function() {'. htmlspecialchars($data).'})"';
+					$js .= 'onLoad="egw_LAB.wait(function() {'.htmlspecialchars($data).'})"';
 					continue;
 				}
-				$js .= ' '.$what.'="' . htmlspecialchars($data) . '"';
+				$js .= ' '.$what.'="'.htmlspecialchars($data).'"';
 			}
 		}
 		return $js;
@@ -419,7 +419,7 @@ 
 	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	 * @return array
 	 */
-	protected function _get_header(array $extra=array())
+	protected function _get_header(array $extra = array())
 	{
 		// display password expires in N days message once per session
 		$message = null;
@@ -430,7 +430,7 @@ 
 		}
 
 		// get used language code (with a little xss check, if someone tries to sneak something in)
-		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$GLOBALS['egw_info']['user']['preferences']['common']['lang']))
+		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
 			$lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		}
@@ -450,9 +450,9 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots = '<meta name="robots" content="none" />';
 
-		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
+		if (substr($GLOBALS['egw_info']['server']['favicon_file'], 0, 4) == 'http')
 		{
 			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
 		}
@@ -468,7 +468,7 @@ 
 			$include_wz_tooltip = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].
 				$wz_tooltip.'?'.filemtime(EGW_SERVER_ROOT.$wz_tooltip).'" type="text/javascript"></script>';
 		}
-		return $this->_get_css()+array(
+		return $this->_get_css() + array(
 			'img_icon'			=> $var['favicon_file'],
 			'img_shortcut'		=> $var['favicon_file'],
 			'pngfix'        	=> $pngfix,
@@ -492,15 +492,15 @@ 
 	 */
 	protected function _get_navbar($apps)
 	{
-		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images';
+		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$this->template.'/images';
 
-		if(isset($GLOBALS['egw_info']['flags']['app_header']))
+		if (isset($GLOBALS['egw_info']['flags']['app_header']))
 		{
 			$var['current_app_title'] = $GLOBALS['egw_info']['flags']['app_header'];
 		}
 		else
 		{
-			$var['current_app_title']=$apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
+			$var['current_app_title'] = $apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
 		}
 		$var['currentapp'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -512,32 +512,32 @@ 
 
 		$var['user_info'] = $this->_user_time_info();
 
-		if($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
+		if ($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
 		{
 			$api_messages = lang('You are required to change your password during your first login').'<br />'.
-				lang('Click this image on the navbar: %1','<img src="'.Image::find('preferences','navbar.gif').'">');
+				lang('Click this image on the navbar: %1', '<img src="'.Image::find('preferences', 'navbar.gif').'">');
 		}
-		elseif($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400*$GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
+		elseif ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400 * $GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
 		{
-			$api_messages = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+			$api_messages = lang('it has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 		}
 
-		if (substr($GLOBALS['egw_info']['server']['login_logo_file'],0,4) == 'http' ||
+		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
 		{
 			$var['logo_file'] = $GLOBALS['egw_info']['server']['login_logo_file'];
 		}
 		else
 		{
-			$var['logo_file'] = Image::find('phpgwapi',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = Image::find('phpgwapi', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.eGroupWare.org';
 
-		if (substr($var['logo_url'],0,4) != 'http')
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 
 		return $var;
 	}
@@ -550,14 +550,14 @@ 
 	protected static function _user_time_info()
 	{
 		$now = new DateTime();
-		$user_info = '<b>'.Accounts::format_username() .'</b>'. ' - ' . lang($now->format('l')) . ' ' . $now->format(true);
+		$user_info = '<b>'.Accounts::format_username().'</b>'.' - '.lang($now->format('l')).' '.$now->format(true);
 
 		$user_tzs = DateTime::getUserTimezones();
 		if (count($user_tzs) > 1)
 		{
 			$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-			$user_info .= Html::form(Html::select('tz',$tz,$user_tzs,true),array(),
-				'/index.php','','tz_selection',' style="display: inline;"','GET');
+			$user_info .= Html::form(Html::select('tz', $tz, $user_tzs, true), array(),
+				'/index.php', '', 'tz_selection', ' style="display: inline;"', 'GET');
 		}
 		return $user_info;
 	}
@@ -569,10 +569,10 @@ 
 	 */
 	protected static function _current_users()
 	{
-	   if( $GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
+	   if ($GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
 	   {
-		  $current_users = '<a href="' . self::link('/index.php','menuaction=admin.admin_accesslog.sessions') . '">' .
-		  	lang('Current users') . ': <span id="currentusers">' . $GLOBALS['egw']->session->session_count() . '</span></a>';
+		  $current_users = '<a href="'.self::link('/index.php', 'menuaction=admin.admin_accesslog.sessions').'">'.
+		  	lang('Current users').': <span id="currentusers">'.$GLOBALS['egw']->session->session_count().'</span></a>';
 		  return $current_users;
 	   }
 	}
@@ -606,14 +606,14 @@ 
 	 * @param array $opts =array() further params for http(s) context, eg. array('timeout' => 123)
 	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
 	 */
-	public static function proxy_context($username=null, $password=null, array $opts = array())
+	public static function proxy_context($username = null, $password = null, array $opts = array())
 	{
 		$opts += array(
 			'method' => 'GET',
 		);
 		if (!empty($GLOBALS['egw_info']['server']['httpproxy_server']))
 		{
-			$opts += array (
+			$opts += array(
 				'proxy'  => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
 					($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
 				'request_fulluri' => true,
@@ -642,7 +642,7 @@ 
 	 * @param string &$changelog on return path to changelog
 	 * @return string
 	 */
-	public static function api_version(&$changelog=null)
+	public static function api_version(&$changelog = null)
 	{
 		return Framework\Updates::api_version($changelog);
 	}
@@ -655,7 +655,7 @@ 
 	 */
 	public static function index($app)
 	{
-		$data =& $GLOBALS['egw_info']['user']['apps'][$app];
+		$data = & $GLOBALS['egw_info']['user']['apps'][$app];
 		if (!isset($data))
 		{
 			throw new Exception\WrongParameter("'$app' not a valid app for this user!");
@@ -672,7 +672,7 @@ 
 				$index = '/index.php?menuaction='.$data['index'];
 			}
 		}
-		return self::link($index,$GLOBALS['egw_info']['flags']['params'][$app]);
+		return self::link($index, $GLOBALS['egw_info']['flags']['params'][$app]);
 	}
 
 	/**
@@ -713,15 +713,15 @@ 
 	 *	true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable()
 	 * @return array
 	 */
-	protected static function _get_navbar_apps($svg=false)
+	protected static function _get_navbar_apps($svg = false)
 	{
 		list($first) = each($GLOBALS['egw_info']['user']['apps']);
-		if(is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
+		if (is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
 		{
 			$newarray['admin'] = $GLOBALS['egw_info']['user']['apps']['admin'];
-			foreach($GLOBALS['egw_info']['user']['apps'] as $index => $value)
+			foreach ($GLOBALS['egw_info']['user']['apps'] as $index => $value)
 			{
-				if($index != 'admin')
+				if ($index != 'admin')
 				{
 					$newarray[$index] = $value;
 				}
@@ -734,7 +734,7 @@ 
 		unset($newarray);
 
 		$apps = array();
-		foreach($GLOBALS['egw_info']['user']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['user']['apps'] as $app => $data)
 		{
 			if (is_long($app))
 			{
@@ -751,21 +751,21 @@ 
 				if ($data['status'] == 4)
 				{
 					$apps[$app]['target'] = ' target="'.$app.'" onClick="'."if (this != '') { window.open(this+'".
-						(strpos($apps[$app]['url'],'?') !== false ? '&' : '?').
+						(strpos($apps[$app]['url'], '?') !== false ? '&' : '?').
 						"referer='+encodeURIComponent(location),this.target,'width=800,height=600,scrollbars=yes,resizable=yes'); return false; } else { return true; }".'"';
 				}
-				elseif(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
+				elseif (isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 				{
-					$apps[$app]['target'] = 'target="' . $GLOBALS['egw_info']['flags']['navbar_target'] . '"';
+					$apps[$app]['target'] = 'target="'.$GLOBALS['egw_info']['flags']['navbar_target'].'"';
 				}
 				else
 				{
 					$apps[$app]['target'] = '';
 				}
 
-				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
+				$icon = isset($data['icon']) ? $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon'] = $apps[$app]['icon_hover'] = Image::find($icon_app, Array($icon, 'nonav'), '', $svg);
 			}
 		}
 
@@ -798,13 +798,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api', Array('about', 'nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api', Array('logout', 'nonav'));
 
 		return $apps;
 	}
@@ -838,7 +838,7 @@ 
 			}
 			$themes_to_check[] = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
-			foreach($themes_to_check as $theme_css)
+			foreach ($themes_to_check as $theme_css)
 			{
 				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
 			}
@@ -872,7 +872,7 @@ 
 
 				// sending print css last, so it can overwrite anything
 				$print_css = $this->template_dir.'/print.css';
-				if(!file_exists(EGW_SERVER_ROOT.$print_css))
+				if (!file_exists(EGW_SERVER_ROOT.$print_css))
 				{
 					$print_css = '/api/templates/default/print.css';
 				}
@@ -898,7 +898,7 @@ 
 	 * @param array $extra =array() extra data to pass to egw.js as data-parameter
 	 * @return string the javascript to be included
 	 */
-	public static function _get_js(array $extra=array())
+	public static function _get_js(array $extra = array())
 	{
 		$java_script = '';
 
@@ -906,7 +906,7 @@ 
 		Think of conf vars etc...  (pim@lingewoud.nl) */
 		if (isset($GLOBALS['egw_info']['flags']['java_script_thirst']))
 		{
-			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst'] . "\n";
+			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst']."\n";
 		}
 		// add configuration, link-registry, images, user-data and -perferences for non-popup windows
 		// specifying etag in url to force reload, as we send expires header
@@ -918,7 +918,7 @@ 
 			self::includeJS('/api/images.php', array(
 				'template' => $GLOBALS['egw_info']['server']['template_set'],
 				'etag' => md5(json_encode(Image::map($GLOBALS['egw_info']['server']['template_set']))),
-				'svg' => Header\UserAgent::mobile(),	// always load non-svg image map, ATM we use svg icons only for mobile theme
+				'svg' => Header\UserAgent::mobile(), // always load non-svg image map, ATM we use svg icons only for mobile theme
 			));
 			self::includeJS('/api/user.php', array(
 				'user' => $GLOBALS['egw_info']['user']['account_lid'],
@@ -930,7 +930,7 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str) {return substr($str, 1); }, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -940,18 +940,18 @@ 
 				'/api/js/jsapi/egw.js?'.filemtime(EGW_SERVER_ROOT.'/api/js/jsapi/egw.js').'" id="egw_script_id"';
 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
-		foreach($extra+self::$extra as $name => $value)
+		foreach ($extra + self::$extra as $name => $value)
 		{
 			if (is_array($value)) $value = json_encode($value);
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
-			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
+			$java_script .= ' data-'.$name."=\"".Html::htmlspecialchars($value, true)."\"";
 		}
 		$java_script .= "></script>\n";
 
-		if(@isset($_GET['menuaction']))
+		if (@isset($_GET['menuaction']))
 		{
-			list(, $class) = explode('.',$_GET['menuaction']);
-			if(is_array($GLOBALS[$class]->public_functions) &&
+			list(, $class) = explode('.', $_GET['menuaction']);
+			if (is_array($GLOBALS[$class]->public_functions) &&
 				$GLOBALS[$class]->public_functions['java_script'])
 			{
 				$java_script .= $GLOBALS[$class]->java_script();
@@ -960,10 +960,10 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags, this needs to be executed as anonymous function
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
-			if(trim($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']);
+			if (trim($GLOBALS['egw_info']['flags']['java_script']) != '')
 			{
-				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
+				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script']."});</script>\n";
 			}
 		}
 
@@ -980,7 +980,7 @@ 
 	function list_themes()
 	{
 		$list = array();
-		if (file_exists($file=EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
+		if (file_exists($file = EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
 			(include $file) && isset($GLOBALS['egw_info']['template'][$this->template]['themes']))
 		{
 			$list = $GLOBALS['egw_info']['template'][$this->template]['themes'];
@@ -991,8 +991,8 @@ 
 			{
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
-					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					list($name) = explode('.', $file);
+					if (!isset($list[$name])) $list[$name] = ucfirst($name);
 				}
 			}
 			closedir($dh);
@@ -1006,21 +1006,20 @@ 
 	 * @param boolean $full_data =false true: value is array with values for keys 'name', 'title', ...
 	 * @returns array alphabetically sorted list of templates
 	 */
-	static function list_templates($full_data=false)
+	static function list_templates($full_data = false)
 	{
 		$list = array('pixelegg'=>null);
 		// templates packaged like apps in own directories (containing as setup/setup.inc.php file!)
 		$dr = dir(EGW_SERVER_ROOT);
-		while (($entry=$dr->read()))
+		while (($entry = $dr->read()))
 		{
 			if ($entry != '..' && !isset($GLOBALS['egw_info']['apps'][$entry]) && is_dir(EGW_SERVER_ROOT.'/'.$entry) &&
-				file_exists($f = EGW_SERVER_ROOT . '/' . $entry .'/setup/setup.inc.php'))
+				file_exists($f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php'))
 			{
 				include($f);
 				if (isset($GLOBALS['egw_info']['template'][$entry]))
 				{
-					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] :
-						$GLOBALS['egw_info']['template'][$entry]['title'];
+					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] : $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 			}
 		}
@@ -1037,14 +1036,14 @@ 
 	* @param array $vars
 	* @param array $apps
 	*/
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
+		if ($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
 		{
 			$this->_add_topmenu_item($apps['home']);
 		}
 
-		if($GLOBALS['egw_info']['user']['apps']['preferences'])
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$this->add_preferences_topmenu('prefs');
 			$this->add_preferences_topmenu('acl');
@@ -1069,9 +1068,9 @@ 
 			$this->_add_topmenu_item(array_merge($apps['manual'],array('title' => lang('Help'))));
 		}*/
 
-		Hooks::process('topmenu_info',array(),true);
+		Hooks::process('topmenu_info', array(), true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach (self::$top_menu_extra as $extra_item) {
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1081,7 +1080,7 @@ 
 		{
 			$this->_add_topmenu_info_item($update, 'update');
 		}
-		if($GLOBALS['egw_info']['user']['apps']['notifications'])
+		if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 		{
 			$this->_add_topmenu_info_item(self::_get_notification_bell(), 'notifications');
 		}
@@ -1093,9 +1092,9 @@ 
 	/**
 	 * Add Preferences link to topmenu using settings-hook to know if an app supports Preferences
 	 */
-	protected function add_preferences_topmenu($type='prefs')
+	protected function add_preferences_topmenu($type = 'prefs')
 	{
-		static $memberships=null;
+		static $memberships = null;
 		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 		static $types = array(
 			'prefs' => array(
@@ -1109,20 +1108,20 @@ 
 			'cats' => array(
 				'title' => 'Categories',
 				'hook' => 'categories',
-				'run_hook' => true,	// acturally run hook, not just look it's implemented
+				'run_hook' => true, // acturally run hook, not just look it's implemented
 			),
 		);
 		if (!$GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['server']['deny_'.$type] &&
 			array_intersect($memberships, (array)$GLOBALS['egw_info']['server']['deny_'.$type]) &&
 			!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			return;	// user has no access to Preferences app
+			return; // user has no access to Preferences app
 		}
 		if (isset($types[$type]['run_hook']))
 		{
 			$apps = Hooks::process($types[$type]['hook']);
 			// as all apps answer, we need to remove none-true responses
-			foreach($apps as $app => $val)
+			foreach ($apps as $app => $val)
 			{
 				if (!$val) unset($apps[$app]);
 			}
@@ -1148,7 +1147,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
+	abstract function _add_topmenu_item(array $app_data, $alt_label = null);
 
 	/**
 	* Add info items to the topmenu template class to be displayed
@@ -1158,7 +1157,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_info_item($content, $id=null);
+	abstract function _add_topmenu_info_item($content, $id = null);
 
 	static $top_menu_extra = array();
 
@@ -1173,7 +1172,7 @@ 
 	* @access public
 	* @return void
 	*/
-	public static function add_topmenu_item($id,$url,$title,$target = '')
+	public static function add_topmenu_item($id, $url, $title, $target = '')
 	{
 		$entry['name'] = $id;
 		$entry['url'] = $url;
@@ -1194,7 +1193,7 @@ 
 	* @access public
 	* @return void
 	*/
-	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
+	abstract function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null);
 
 	/**
 	 * Call and return content of 'after_navbar' hook
@@ -1204,7 +1203,7 @@ 
 	protected function _get_after_navbar()
 	{
 		ob_start();
-		Hooks::process('after_navbar',null,true);
+		Hooks::process('after_navbar', null, true);
 		$content = ob_get_contents();
 		ob_end_clean();
 
@@ -1241,7 +1240,7 @@ 
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
 	* @param boolean $append =true should the file be added
 	*/
-	static function includeJS($package, $file=null, $app='phpgwapi')
+	static function includeJS($package, $file = null, $app = 'phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);
 	}
@@ -1253,7 +1252,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return array with pathes relative to EGW_SERVER_ROOT
 	 */
-	static function js_files(array $files=null, $clear_files=false)
+	static function js_files(array $files = null, $clear_files = false)
 	{
 		if (isset($files) && is_array($files))
 		{
@@ -1272,7 +1271,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return string|array see $return_pathes parameter
 	 */
-	static public function get_script_links($return_pathes=false, $clear_files=false)
+	static public function get_script_links($return_pathes = false, $clear_files = false)
 	{
 		$to_include = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files($clear_files));
 
@@ -1280,7 +1279,7 @@ 
 		{
 			return $to_include;
 		}
-		$start = '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url'];
+		$start = '<script type="text/javascript" src="'.$GLOBALS['egw_info']['server']['webserver_url'];
 		$end = '">'."</script>\n";
 		return "\n".$start.implode($end.$start, $to_include).$end;
 	}
@@ -1300,7 +1299,7 @@ 
 	 * @param boolean $no_default_css =false true do NOT load any default css, only what app explicitly includes
 	 * @return boolean false: css file not found, true: file found
 	 */
-	public static function includeCSS($app, $name=null, $append=true, $no_default_css=false)
+	public static function includeCSS($app, $name = null, $append = true, $no_default_css = false)
 	{
 		if ($no_default_css)
 		{
@@ -1320,16 +1319,16 @@ 
 
 		// try to add app specific css file
 		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			self::includeCSS($app,'app');
+			self::includeCSS($app, 'app');
 
 		// add all css files from Framework::includeCSS()
 		$query = null;
 		//error_log(__METHOD__."() Framework\CssIncludes::get()=".array2string(Framework\CssIncludes::get()));
-		foreach(Framework\CssIncludes::get() as $path)
+		foreach (Framework\CssIncludes::get() as $path)
 		{
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
-			$path .= '?'. ($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
+			list($path, $query) = explode('?', $path, 2);
+			$path .= '?'.($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
 			$response->includeCSS($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
 
@@ -1338,7 +1337,7 @@ 
 
 		// add all js files from Framework::includeJS()
 		$files = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files());
-		foreach($files as $path)
+		foreach ($files as $path)
 		{
 			$response->includeScript($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
@@ -1414,17 +1413,17 @@ 
 	 */
 	public static function ajax_user_list()
 	{
-		$list = array('accounts' => array(),'groups' => array(), 'owngroups' => array());
-		if($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
+		$list = array('accounts' => array(), 'groups' => array(), 'owngroups' => array());
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
 		{
 			$list['accounts']['filter']['group'] = $GLOBALS['egw_info']['user']['account_primary_group'];
 		}
-		foreach($list as $type => &$accounts)
+		foreach ($list as $type => &$accounts)
 		{
 			$options = array('account_type' => $type) + $accounts;
-			$key_pair = Accounts::link_query('',$options);
+			$key_pair = Accounts::link_query('', $options);
 			$accounts = array();
-			foreach($key_pair as $account_id => $name)
+			foreach ($key_pair as $account_id => $name)
 			{
 				$accounts[] = array('value' => $account_id, 'label' => $name);
 			}
@@ -1442,16 +1441,16 @@ 
 	 * @param boolean $_resolve_groups =false true: return attribute for all members, false return attribute for group itself
 	 * @return array account_id => data pairs
 	 */
-	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups=false)
+	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups = false)
 	{
 		$list = array();
-		foreach((array)$_account_ids as $account_id)
+		foreach ((array)$_account_ids as $account_id)
 		{
-			foreach($account_id < 0 && $_resolve_groups ?
+			foreach ($account_id < 0 && $_resolve_groups ?
 				$GLOBALS['egw']->accounts->members($account_id, true) : array($account_id) as $account_id)
 			{
 				// Make sure name is formatted according to preference
-				if($_field == 'account_fullname')
+				if ($_field == 'account_fullname')
 				{
 					$list[$account_id] = Accounts::format_username(
 						$GLOBALS['egw']->accounts->id2name($account_id, 'account_lid'),

api/src/Storage/Db2DataIterator.php

Spacing +8 added lines, -8 removed lines

@@ -46,13 +46,13 @@ 
 	 * @param Base $storage
 	 * @param \Traversable $rs
 	 */
-	public function __construct(Base $storage, \Traversable $rs=null)
+	public function __construct(Base $storage, \Traversable $rs = null)
 	{
 		$this->storage = $storage;
 
 		$this->total = $storage->total;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$data = $this->rs->current();
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->key();
 		}
@@ -97,7 +97,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -108,7 +108,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -119,9 +119,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Storage/Base.php

Indentation +8 added lines, -8 removed lines

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

Braces +193 added lines, -51 removed lines

@@ -182,7 +182,10 @@ 
 	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($no_clone)
 		{
@@ -198,9 +201,15 @@ 
 		{
 			$this->app = $app;
 
-			if (!$no_clone) $this->db->set_app($app);
+			if (!$no_clone)
+			{
+				$this->db->set_app($app);
+			}
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table)
+			{
+				$this->setup_table($app,$table,$column_prefix);
+			}
 		}
 		$this->init();
 
@@ -221,7 +230,10 @@ 
 	 */
 	public function set_times($timestamp_type=false)
 	{
-		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
+		if ($timestamp_type !== false)
+		{
+			$this->timestamp_type = $timestamp_type;
+		}
 
 		// set current time
 		switch($this->timestamp_type)
@@ -279,7 +291,10 @@ 
 			{
 				$this->autoinc_id = $col;
 			}
-			if ($def['type'] == 'bool') $this->has_bools = true;
+			if ($def['type'] == 'bool')
+			{
+				$this->has_bools = true;
+			}
 
 			foreach($this->table_def['uc'] as $k => $uni_index)
 			{
@@ -318,7 +333,10 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		}
 
 		if (!is_array($new) || !count($new))
 		{
@@ -342,7 +360,10 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int) $this->debug >= 4)
+		{
+			_debug_array($this->data);
+		}
 	}
 
 	/**
@@ -486,7 +507,10 @@ 
 		if (!is_array($keys))
 		{
 			$pk = array_values($this->db_key_cols);
-			if ($pk) $keys = array($pk[0] => $keys);
+			if ($pk)
+			{
+				$keys = array($pk[0] => $keys);
+			}
 		}
 
 		$this->init($keys);
@@ -500,13 +524,16 @@ 
 				$query[$db_col] = $this->data[$col];
 			}
 		}
-		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
+		if (!$query)
+		{
+			// no primary key in keys, lets try the data_cols for a unique key
 		{
 			foreach($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 				elseif(is_array($col))
 				{
@@ -520,31 +547,43 @@ 
 						}
 						$q[$db_c] = $this->data[$c];
 					}
-					if ($q) $query += $q;
+					if ($q)
+					{
+						$query += $q;
+					}
 				}
 			}
 		}
-		if (!$query)	// no unique key in keys, lets try everything else
+		if (!$query)
+		{
+			// no unique key in keys, lets try everything else
 		{
 			foreach($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 			}
 		}
-		if (!$query)	// keys has no cols
+		if (!$query)
+		{
+			// keys has no cols
 		{
 			$this->db2data();
+		}
 
 			return False;
 		}
-		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
+		if ($join)
+		{
+			// Prefix the columns with the table-name, as they might exist in the join
 		{
 			foreach($query as $col => $val)
 			{
 				if (is_int($col) || strpos($join,$col) === false) continue;
+		}
 				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
 				unset($query[$col]);
 			}
@@ -553,11 +592,14 @@ 
 			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
 		{
 			$cols = $this->db_cols;
-			if ($extra_cols)	// extra columns to report
+			if ($extra_cols)
+			{
+				// extra columns to report
 			{
 				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
 					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+			}
 					$cols[$col] = $col;
 				}
 			}
@@ -580,7 +622,10 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "nothing found !!!</p>\n";
+		}
 
 		$this->db2data();
 
@@ -596,7 +641,10 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		// check if data contains user timezone during read AND user changed timezone since then
 		// --> load old timezone for the rest of this request
@@ -613,9 +661,13 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int) $this->debug >= 4)
+		{
+echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
-		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
+		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])
+		{
+			// insert with auto id
 		{
 			foreach($this->db_cols as $db_col => $col)
 			{
@@ -625,7 +677,9 @@ 
 						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue;
+		}
+		// no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
@@ -656,9 +710,13 @@ 
 				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
 					($this->autoinc_id ||			// update of table with auto id or
 					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
-					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
+					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))
 				{
-					continue;	// no need to write that (unset) column
+					// column is nullable
+				{
+					continue;
+				}
+				// no need to write that (unset) column
 				}
 				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
@@ -675,9 +733,12 @@ 
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
-			if (!$data && !$this->autoinc_id)	// happens if all columns are in the primary key
+			if (!$data && !$this->autoinc_id)
+			{
+				// happens if all columns are in the primary key
 			{
 				$data = $keys;
+			}
 				$keys = False;
 			}
 			if ($this->autoinc_id)
@@ -708,7 +769,10 @@ 
 	 */
 	function update($_fields,$merge=true)
 	{
-		if ($merge) $this->data_merge($_fields);
+		if ($merge)
+		{
+			$this->data_merge($_fields);
+		}
 
 		$fields = $this->data2db($_fields);
 
@@ -761,9 +825,12 @@ 
 		{
 			$keys = array($this->autoinc_id => $keys);
 		}
-		if (!is_array($keys) || !count($keys))	// use internal data
+		if (!is_array($keys) || !count($keys))
+		{
+			// use internal data
 		{
 			$data = $this->data;
+		}
 			$keys = $this->db_key_cols;
 		}
 		else	// data and keys are supplied in $keys
@@ -783,7 +850,10 @@ 
 		{
 			$query[$db_col] = $data[$col];
 		}
-		if ($only_return_query) return $query;
+		if ($only_return_query)
+		{
+			return $query;
+		}
 
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
@@ -816,7 +886,10 @@ 
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		}
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
@@ -880,9 +953,12 @@ 
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col,'.') !== false)
+					{
+						// we have a table-name specified
 					{
 						list($table,$only_col) = explode('.',$db_col);
+					}
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -907,13 +983,17 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND')
+			{
+				$query = $this->db->column_data_implode(' '.$op.' ',$query);
+			}
 		}
 		if (is_array($filter))
 		{
 			$db_filter = array();
 			$data2db_filter = $this->data2db($filter);
-			if (!is_array($data2db_filter)) {
+			if (!is_array($data2db_filter))
+			{
 				echo function_backtrace()."<br/>\n";
 				echo "filter=";_debug_array($filter);
 				echo "data2db(filter)=";_debug_array($data2db_filter);
@@ -1009,7 +1089,10 @@ 
 			}
 		}
 		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		if (is_array($start))
+		{
+			list($start,$num_rows) = $start;
+		}
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
 		if ($order_by && stripos($order_by,'GROUP BY') !== false)
@@ -1037,18 +1120,24 @@ 
 					'append' => $order_by,
 					'join'   => $join,
 				);
-				if (!$union_cols)	// union used the colum-names of the first query
+				if (!$union_cols)
+				{
+					// union used the colum-names of the first query
 				{
 					$union_cols = $this->_get_columns($only_keys,$extra_cols);
 				}
+				}
 				return true;	// waiting for further calls, before running the union-query
 			}
 			// running the union query now
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
+			}
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -1056,18 +1145,24 @@ 
 				}
 			}
 			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 
 			$cols = $union_cols;
 			$union = $union_cols = array();
 		}
 		else	// no UNION
 		{
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
+			}
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
@@ -1080,10 +1175,16 @@ 
 			}
 			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
 				$start,$order_by,$this->app,$num_rows,$join);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 			$cols = $this->_get_columns($only_keys,$extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		}
 
 		if ($mysql_calc_rows)
 		{
@@ -1096,9 +1197,12 @@ 
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs)
+		{
+			foreach($rs as $row)
 		{
 			$data = array();
+		}
 			foreach($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
@@ -1166,9 +1270,15 @@ 
 					$col = substr($col, $pos+9);
 				}
 				$alias = $col;
-				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
+				if (stripos($col, ' AS '))
+				{
+					list($col, $alias) = preg_split('/ +AS +/i', $col);
+				}
 				// do NOT group by constant expressions
-				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col)) continue;
+				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col))
+				{
+					continue;
+				}
 				if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
 				{
 					// instead of aliased primary key, we have to use original column incl. table-name as alias is ambigues
@@ -1201,7 +1311,10 @@ 
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
-		if (empty($pattern) || is_array($pattern)) return $pattern;
+		if (empty($pattern) || is_array($pattern))
+		{
+			return $pattern;
+		}
 		if(strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
@@ -1271,7 +1384,7 @@ 
 			{
 				$token = substr($token, 1,strlen($token));
  				if(substr($token, -1) != '"')
-				{
+ 				{
 					$token .= ' '.strtok('"');
 				}
 				else
@@ -1387,7 +1500,8 @@ 
 			foreach($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols)))
+				{
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
@@ -1421,10 +1535,13 @@ 
 	function _get_columns($only_keys,$extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
-		if ($only_keys === true)	// only primary key
+		if ($only_keys === true)
+		{
+			// only primary key
 		{
 			$cols = $this->db_key_cols;
 		}
+		}
 		else
 		{
 			$cols = array();
@@ -1433,18 +1550,27 @@ 
 			{
 				if (!$distinct_checked)
 				{
-					if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
+					if (stripos($col, 'DISTINCT ') === 0)
+					{
+						$col = substr($col, 9);
+					}
 					$distinct_checked = true;
 				}
-				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
+				if (!$col || $col == '*' || $col == $this->table_name.'.*')
+				{
+					// all columns
 				{
 					$cols = array_merge($cols,$this->db_cols);
 				}
+				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col,'as'))
+					{
+						// if there's already an explicit naming of the column, just use it
 					{
 						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+					}
 						$cols[$col] = $col;
 						continue;
 					}
@@ -1459,11 +1585,14 @@ 
 				}
 			}
 		}
-		if ($extra_cols)	// extra columns to report
+		if ($extra_cols)
+		{
+			// extra columns to report
 		{
 			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
 			{
 				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+		}
 				if (($db_col = array_search($col,$this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
@@ -1508,7 +1637,11 @@ 
 			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows)
+		{
+			$rows = array();
+		}
+		// otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1587,7 +1720,10 @@ 
 		{
 			return $cache[$cache_key];
 		}
-		if (!is_array($value_col)) $value_col = array($value_col);
+		if (!is_array($value_col))
+		{
+			$value_col = array($value_col);
+		}
 
 		$cols = $ret = array();
 		foreach($value_col as $key => $col)
@@ -1595,7 +1731,10 @@ 
 			$matches = null;
 			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
 		}
-		if (!$order) $order = current($cols);
+		if (!$order)
+		{
+			$order = current($cols);
+		}
 
 		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
 		{
@@ -1621,7 +1760,10 @@ 
 				{
 					$data = $row[current($cols)];
 				}
-				if ($data) $ret[$row[$key_col]] = $data;
+				if ($data)
+				{
+					$ret[$row[$key_col]] = $data;
+				}
 			}
 		}
 		return $cache[$cache_key] =& $ret;

Doc Comments +1 added lines, -1 removed lines

@@ -1194,7 +1194,7 @@
 	 * @param string &$wildcard ='' on return wildcard char to use, if pattern does not already contain wildcards!
 	 * @param string &$op ='AND' on return boolean operation to use, if pattern does not start with ! we use OR else AND
 	 * @param string $extra_col =null extra column to search
-	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
+	 * @param string[] $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
 	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())

Spacing +219 added lines, -219 removed lines

@@ -179,7 +179,7 @@ 
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps,
 	 * 	'object' use Api\DateTime objects or 'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false, $timestamp_type = null)
 	{
 		// ease the transition to api
 		if ($app == 'phpgwapi') $app = 'api';
@@ -200,11 +200,11 @@ 
 
 			if (!$no_clone) $this->db->set_app($app);
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table) $this->setup_table($app, $table, $column_prefix);
 		}
 		$this->init();
 
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
 			echo "<p>".__METHOD__."('$app','$table')</p>\n";
 			_debug_array($this);
@@ -219,21 +219,21 @@ 
 	 * 	null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use Api\DateTime objects,
 	 *  'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	public function set_times($timestamp_type=false)
+	public function set_times($timestamp_type = false)
 	{
 		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
 
 		// set current time
-		switch($this->timestamp_type)
+		switch ($this->timestamp_type)
 		{
 			case 'object':
 				$this->now = new Api\DateTime('now');
 				break;
 			case 'string':
-				$this->now = Api\DateTime::to('now',Api\DateTime::DATABASE);
+				$this->now = Api\DateTime::to('now', Api\DateTime::DATABASE);
 				break;
 			default:
-				$this->now = Api\DateTime::to('now','ts');
+				$this->now = Api\DateTime::to('now', 'ts');
 		}
 		$this->tz_offset_s = Api\DateTime::tz_offset_s();
 	}
@@ -247,10 +247,10 @@ 
 	 * @param string $table table-name
 	 * @param string $colum_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
 	 */
-	function setup_table($app,$table,$colum_prefix='')
+	function setup_table($app, $table, $colum_prefix = '')
 	{
 		$this->table_name = $table;
-		$this->table_def = $this->db->get_table_definitions($app,$table);
+		$this->table_def = $this->db->get_table_definitions($app, $table);
 		if (!$this->table_def || !is_array($this->table_def['fd']))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$app','$table'): No table definition for '$table' found !!!");
@@ -258,14 +258,14 @@ 
 		$this->db_key_cols = $this->db_data_cols = $this->db_cols = array();
 		$this->autoinc_id = '';
 		$len_prefix = strlen($colum_prefix);
-		foreach($this->table_def['fd'] as $col => $def)
+		foreach ($this->table_def['fd'] as $col => $def)
 		{
 			$name = $col;
-			if ($len_prefix && substr($name,0,$len_prefix) == $colum_prefix)
+			if ($len_prefix && substr($name, 0, $len_prefix) == $colum_prefix)
 			{
-				$name = substr($col,$len_prefix);
+				$name = substr($col, $len_prefix);
 			}
-			if (in_array($col,$this->table_def['pk']))
+			if (in_array($col, $this->table_def['pk']))
 			{
 				$this->db_key_cols[$col] = $name;
 			}
@@ -281,13 +281,13 @@ 
 			}
 			if ($def['type'] == 'bool') $this->has_bools = true;
 
-			foreach($this->table_def['uc'] as $k => $uni_index)
+			foreach ($this->table_def['uc'] as $k => $uni_index)
 			{
-				if (is_array($uni_index) && in_array($name,$uni_index))
+				if (is_array($uni_index) && in_array($name, $uni_index))
 				{
 					$this->db_uni_cols[$k][$col] = $name;
 				}
-				elseif($name === $uni_index)
+				elseif ($name === $uni_index)
 				{
 					$this->db_uni_cols[$col] = $name;
 				}
@@ -302,9 +302,9 @@ 
 	function convert_all_timestamps()
 	{
 		$check_already_included = !empty($this->timestamps);
-		foreach($this->table_def['fd'] as $name => $data)
+		foreach ($this->table_def['fd'] as $name => $data)
 		{
-			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name,$this->timestamps)))
+			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name, $this->timestamps)))
 			{
 				$this->timestamps[] = $name;
 			}
@@ -318,22 +318,22 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new, true).")</p>\n";
 
 		if (!is_array($new) || !count($new))
 		{
 			return;
 		}
-		foreach($this->db_cols as $db_col => $col)
+		foreach ($this->db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
 		}
-		foreach($this->non_db_cols as $db_col => $col)
+		foreach ($this->non_db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
@@ -342,7 +342,7 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int)$this->debug >= 4) _debug_array($this->data);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -374,7 +374,7 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
@@ -384,7 +384,7 @@ 
 					}
 					else
 					{
-						$data[$name] = Api\DateTime::server2user($data[$name],$this->timestamp_type);
+						$data[$name] = Api\DateTime::server2user($data[$name], $this->timestamp_type);
 					}
 				}
 			}
@@ -400,7 +400,7 @@ 
 					throw new Api\Exception\WrongParameter(__METHOD__."(): No table definition for '$this->table' found !!!");
 				}
 			}
-			foreach($this->table_def['fd'] as $col => $def)
+			foreach ($this->table_def['fd'] as $col => $def)
 			{
 				if ($def['type'] == 'bool' && isset($data[$col]))
 				{
@@ -432,7 +432,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -440,11 +440,11 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
-					$data[$name] = Api\DateTime::user2server($data[$name],$this->timestamp_type);
+					$data[$name] = Api\DateTime::user2server($data[$name], $this->timestamp_type);
 				}
 			}
 		}
@@ -457,7 +457,7 @@ 
 	 * @param array $keys =array() array with keys in form internalName => value
 	 * @return array internal data after init
 	 */
-	function init($keys=array())
+	function init($keys = array())
 	{
 		$this->data = array();
 
@@ -481,7 +481,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (!is_array($keys))
 		{
@@ -502,16 +502,16 @@ 
 		}
 		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
 		{
-			foreach($this->db_uni_cols as $db_col => $col)
+			foreach ($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
 				}
-				elseif(is_array($col))
+				elseif (is_array($col))
 				{
 					$q = array();
-					foreach($col as $db_c => $c)
+					foreach ($col as $db_c => $c)
 					{
 						if ($this->data[$col] == '')
 						{
@@ -526,7 +526,7 @@ 
 		}
 		if (!$query)	// no unique key in keys, lets try everything else
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
@@ -542,27 +542,27 @@ 
 		}
 		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
 		{
-			foreach($query as $col => $val)
+			foreach ($query as $col => $val)
 			{
-				if (is_int($col) || strpos($join,$col) === false) continue;
-				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
+				if (is_int($col) || strpos($join, $col) === false) continue;
+				$query[] = $this->db->expression($this->table_name, $this->table_name.'.', array($col=>$val));
 				unset($query[$col]);
 			}
 		}
 		// copy direct SQL parts from $keys
-		for($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
+		for ($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
 		{
 			$query[] = $keys[$i];
 		}
-		foreach($this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''),
-			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
+		foreach ($this->db->select($this->table_name, '*'.($extra_cols ? ','.(is_array($extra_cols) ?implode(',', $extra_cols) : $extra_cols) : ''),
+			$query, __LINE__, __FILE__, False, '', $this->app, 0, $join) as $row)
 		{
 			$cols = $this->db_cols;
 			if ($extra_cols)	// extra columns to report
 			{
-				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
+				foreach (is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
-					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+					if (FALSE !== stripos($col, ' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i', '\\1', $col);
 					$cols[$col] = $col;
 				}
 			}
@@ -575,7 +575,7 @@ 
 			// store user timezone used for reading
 			$this->data[self::USER_TIMEZONE_READ] = Api\DateTime::$user_timezone->getName();
 
-			if ((int) $this->debug >= 4)
+			if ((int)$this->debug >= 4)
 			{
 				echo "data =\n"; _debug_array($this->data);
 			}
@@ -585,7 +585,7 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int)$this->debug >= 4) echo "nothing found !!!</p>\n";
 
 		$this->db2data();
 
@@ -599,7 +599,7 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
@@ -618,65 +618,65 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int)$this->debug >= 4) { echo "so_sql::save(".print_r($keys, true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
 		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (!$this->autoinc_id || $db_col != $this->autoinc_id)	// not write auto-inc-id
 				{
-					if (!array_key_exists($col,$this->data) && 	// handling of unset columns in $this->data
-						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
+					if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+						(isset($this->table_def['fd'][$db_col]['default']) || // we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue; // no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
 					{
 						// truncate the field to mamimum length, if upper layers didn't care
-						$data[$db_col] = substr($this->data[$col],0,$this->table_def['fd'][$db_col]['precision']);
+						$data[$db_col] = substr($this->data[$col], 0, $this->table_def['fd'][$db_col]['precision']);
 					}
 					else
 					{
-						$data[$db_col] = (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+						$data[$db_col] = (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 					}
 				}
 			}
-			$this->db->insert($this->table_name,$data,false,__LINE__,__FILE__,$this->app);
+			$this->db->insert($this->table_name, $data, false, __LINE__, __FILE__, $this->app);
 
 			if ($this->autoinc_id)
 			{
-				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name,$this->autoinc_id);
+				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name, $this->autoinc_id);
 			}
 		}
 		else // insert in table without auto id or update of existing row, dont write colums unset in $this->data
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				// we need to update columns set to null: after a $this->data[$col]=null:
 				// - array_key_exits($col,$this->data) === true
 				// - isset($this->data[$col]) === false
-				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
-					($this->autoinc_id ||			// update of table with auto id or
-					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
+				if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+					($this->autoinc_id || // update of table with auto id or
+					 isset($this->table_def['fd'][$db_col]['default']) || // we have a default value or
 					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 				{
-					continue;	// no need to write that (unset) column
+					continue; // no need to write that (unset) column
 				}
-				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+				$data[$db_col] = !is_object($this->data[$col]) && (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
 			// allow to add direct sql updates, eg. "etag=etag+1" with int keys
 			if (is_array($keys) && isset($keys[0]))
 			{
-				for($n=0; isset($keys[$n]); ++$n)
+				for ($n = 0; isset($keys[$n]); ++$n)
 				{
 					$data[] = $keys[$n];
 				}
 			}
 			$keys = $extra_where;
-			foreach($this->db_key_cols as $db_col => $col)
+			foreach ($this->db_key_cols as $db_col => $col)
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
@@ -687,16 +687,16 @@ 
 			}
 			if ($this->autoinc_id)
 			{
-				$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 				if (($nothing_affected = !$this->db->Errno && !$this->db->affected_rows()) && $extra_where)
 				{
-					return true;	// extra_where not met, eg. etag wrong
+					return true; // extra_where not met, eg. etag wrong
 				}
 			}
 			// always try an insert if we have no autoinc_id, as we dont know if the data exists
 			if (!$this->autoinc_id || $nothing_affected)
 			{
-				$this->db->insert($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->insert($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 			}
 		}
 		$this->db2data();
@@ -711,7 +711,7 @@ 
 	 * @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function update($_fields,$merge=true)
+	function update($_fields, $merge = true)
 	{
 		if ($merge) $this->data_merge($_fields);
 
@@ -719,23 +719,23 @@ 
 
 		// extract the keys from $fields or - if not set there - from $this->data
 		$keys = array();
-		foreach($this->db_key_cols as $col => $name)
+		foreach ($this->db_key_cols as $col => $name)
 		{
 			$keys[$col] = isset($fields[$name]) ? $fields[$name] : $this->data[$name];
 			unset($fields[$name]);
 		}
 		// extract the data from $fields
 		$data = array();
-		foreach($this->db_data_cols as $col => $name)
+		foreach ($this->db_data_cols as $col => $name)
 		{
-			if (array_key_exists($name,$fields))
+			if (array_key_exists($name, $fields))
 			{
 				$data[$col] = $fields[$name];
 				unset($fields[$name]);
 			}
 		}
 		// add direct sql like 'etag=etag+1' (it has integer keys)
-		foreach($fields as $key => $value)
+		foreach ($fields as $key => $value)
 		{
 			if (is_int($key))
 			{
@@ -744,9 +744,9 @@ 
 		}
 		if (!$data)
 		{
-			return 0;	// nothing to update
+			return 0; // nothing to update
 		}
-		if (!$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app))
+		if (!$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app))
 		{
 			return $this->db->Errno;
 		}
@@ -760,7 +760,7 @@ 
 	 * @param boolean $only_return_query =false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_query=false)
+	function delete($keys = null, $only_return_query = false)
 	{
 		if ($this->autoinc_id && $keys && !is_array($keys))
 		{
@@ -774,7 +774,7 @@ 
 		else	// data and keys are supplied in $keys
 		{
 			$data = $keys; $keys = array();
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (isset($data[$col]))
 				{
@@ -784,13 +784,13 @@ 
 		}
 		$data = $this->data2db($data);
 
-		foreach($keys as $db_col => $col)
+		foreach ($keys as $db_col => $col)
 		{
 			$query[$db_col] = $data[$col];
 		}
 		if ($only_return_query) return $query;
 
-		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
+		$this->db->delete($this->table_name, $query, __LINE__, __FILE__, $this->app);
 
 		return $this->db->affected_rows();
 	}
@@ -818,15 +818,15 @@ 
 	 * @todo return an interator instead of an array
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria, true).",'$only_keys','$order_by',".print_r($extra_cols, true).",'$wildcard','$empty','$op','$start',".print_r($filter, true).",'$join')</p>\n";
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
 		{
-			$search = $this->search2criteria($criteria,$wildcard,$op);
+			$search = $this->search2criteria($criteria, $wildcard, $op);
 			$criteria = array($search);
 		}
 		if (!is_array($criteria))
@@ -836,7 +836,7 @@ 
 		else
 		{
 			$criteria = $this->data2db($criteria);
-			foreach($criteria as $col => $val)
+			foreach ($criteria as $col => $val)
 			{
 				if (is_int($col))
 				{
@@ -844,7 +844,7 @@ 
 				}
 				elseif ($empty || $val != '')
 				{
-					if (!($db_col = array_search($col,$this->db_cols)))
+					if (!($db_col = array_search($col, $this->db_cols)))
 					{
 						$db_col = $col;
 					}
@@ -855,7 +855,7 @@ 
 							$this->table_def['fd'][$db_col]['nullable'] !== false)
 						{
 							unset($criteria[$col]);
-							$query[] =  '(' . $db_col . ' IS NULL OR ' . $db_col . " = '')";
+							$query[] = '('.$db_col.' IS NULL OR '.$db_col." = '')";
 						}
 						else
 						{
@@ -863,10 +863,10 @@ 
 						}
 					}
 					elseif ($wildcard || $criteria[$col][0] == '!' ||
-						is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 					{
 						// if search pattern alread contains a wildcard, do NOT add further ones automatic
-						if (is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						if (is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 						{
 							$wildcard = '';
 						}
@@ -875,19 +875,19 @@ 
 						if ($criteria[$col][0] == '!')
 						{
 							$cmp_op = ' NOT'.$cmp_op;
-							$criteria[$col] = substr($criteria[$col],1);
+							$criteria[$col] = substr($criteria[$col], 1);
 							$negate = true;
 						}
-						foreach(explode(' ',$criteria[$col]) as $crit)
+						foreach (explode(' ', $criteria[$col]) as $crit)
 						{
 							$query[] = ($negate ? ' ('.$db_col.' IS NULL OR ' : '').$db_col.$cmp_op.
-								$this->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$crit).$wildcard).
+								$this->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $crit).$wildcard).
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col, '.') !== false)	// we have a table-name specified
 					{
-						list($table,$only_col) = explode('.',$db_col);
+						list($table, $only_col) = explode('.', $db_col);
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -895,15 +895,15 @@ 
 						}
 						if (is_array($val) && count($val) > 1)
 						{
-							foreach($val as &$v)
+							foreach ($val as &$v)
 							{
 								$v = $this->db->quote($v, $type);
 							}
-							$query[] = $sql = $db_col.' IN (' .implode(',',$val).')';
+							$query[] = $sql = $db_col.' IN ('.implode(',', $val).')';
 						}
 						else
 						{
-							$query[] = $db_col.'='.$this->db->quote(is_array($val)?array_shift($val):$val,$type);
+							$query[] = $db_col.'='.$this->db->quote(is_array($val) ?array_shift($val) : $val, $type);
 						}
 					}
 					else
@@ -912,7 +912,7 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ', $query);
 		}
 		if (is_array($filter))
 		{
@@ -920,19 +920,19 @@ 
 			$data2db_filter = $this->data2db($filter);
 			if (!is_array($data2db_filter)) {
 				echo function_backtrace()."<br/>\n";
-				echo "filter=";_debug_array($filter);
-				echo "data2db(filter)=";_debug_array($data2db_filter);
+				echo "filter="; _debug_array($filter);
+				echo "data2db(filter)="; _debug_array($data2db_filter);
 			}
-			foreach($data2db_filter as $col => $val)
+			foreach ($data2db_filter as $col => $val)
 			{
 				if ($val !== '')
 				{
 					// check if a db-internal name conversation necessary
-					if (!is_int($col) && ($c = array_search($col,$this->db_cols)))
+					if (!is_int($col) && ($c = array_search($col, $this->db_cols)))
 					{
-						$col = $this->table_name . '.' . $c;
+						$col = $this->table_name.'.'.$c;
 					}
-					if(is_int($col))
+					if (is_int($col))
 					{
 						$db_filter[] = $val;
 					}
@@ -950,35 +950,35 @@ 
 			{
 				if ($op != 'AND')
 				{
-					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ',$query).')';
+					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ', $query).')';
 				}
 				else
 				{
-					$db_filter = array_merge($db_filter,$query);
+					$db_filter = array_merge($db_filter, $query);
 				}
 			}
 			$query = $db_filter;
 		}
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter,true).") query=".print_r($query,true).", total='$this->total'</p>\n";
+			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter, true).") query=".print_r($query, true).", total='$this->total'</p>\n";
 			echo "<br>criteria = "; _debug_array($criteria);
 		}
 		if ($only_keys === true)
 		{
 			$colums = array_keys($this->db_key_cols);
-			foreach($colums as &$column)
+			foreach ($colums as &$column)
 			{
-				$column = $this->table_name . '.' . $column;
+				$column = $this->table_name.'.'.$column;
 			}
 		}
 		elseif (is_array($only_keys))
 		{
 			$colums = array();
-			foreach($only_keys as $key => $col)
+			foreach ($only_keys as $key => $col)
 			{
 				//Convert ambiguous columns to prefixed tablename.column name
-				$colums[] = ($db_col = array_search($col,$this->db_cols)) ?  $this->table_name .'.'.$db_col.' AS '.$col :$col;
+				$colums[] = ($db_col = array_search($col, $this->db_cols)) ? $this->table_name.'.'.$db_col.' AS '.$col : $col;
 			}
 		}
 		elseif (!$only_keys)
@@ -1008,20 +1008,20 @@ 
 			{
 				$colums[$key] = $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id;
 			}
-			elseif (!is_array($colums) && strpos($colums,$this->autoinc_id) !== false)
+			elseif (!is_array($colums) && strpos($colums, $this->autoinc_id) !== false)
 			{
-				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/','\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2',$colums);
+				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/', '\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2', $colums);
 			}
 		}
-		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		$num_rows = 0; // as spec. in max_matches in the user-prefs
+		if (is_array($start)) list($start, $num_rows) = $start;
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
-		if ($order_by && stripos($order_by,'GROUP BY') !== false)
+		if ($order_by && stripos($order_by, 'GROUP BY') !== false)
 		{
 			$order_by = $this->fix_group_by_columns($order_by, $colums, $this->table_name, $this->autoinc_id);
 		}
-		elseif ($order_by && stripos($order_by,'ORDER BY')===false && stripos($order_by,'GROUP BY')===false && stripos($order_by,'HAVING')===false)
+		elseif ($order_by && stripos($order_by, 'ORDER BY') === false && stripos($order_by, 'GROUP BY') === false && stripos($order_by, 'HAVING') === false)
 		{
 			$order_by = 'ORDER BY '.$order_by;
 		}
@@ -1044,9 +1044,9 @@ 
 				);
 				if (!$union_cols)	// union used the colum-names of the first query
 				{
-					$union_cols = $this->_get_columns($only_keys,$extra_cols);
+					$union_cols = $this->_get_columns($only_keys, $extra_cols);
 				}
-				return true;	// waiting for further calls, before running the union-query
+				return true; // waiting for further calls, before running the union-query
 			}
 			// running the union query now
 			if ($start !== false)	// need to get the total too, saved in $this->total
@@ -1057,10 +1057,10 @@ 
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->union($union,__LINE__,__FILE__)->NumRows();
+					$this->total = $this->db->union($union, __LINE__, __FILE__)->NumRows();
 				}
 			}
-			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
+			$rs = $this->db->union($union, __LINE__, __FILE__, $order_by, $start, $num_rows);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
 
 			$cols = $union_cols;
@@ -1074,21 +1074,21 @@ 
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
 				}
-				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
+				elseif (!$need_full_no_count && (!$join || stripos($join, 'LEFT JOIN') !== false))
 				{
-					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchColumn();
+					$this->total = $this->db->select($this->table_name, 'COUNT(*)', $query, __LINE__, __FILE__, false, '', $this->app, 0, $join)->fetchColumn();
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->select($this->table_name,$colums,$query,__LINE__,__FILE__,false,$order_by,false,0,$join)->NumRows();
+					$this->total = $this->db->select($this->table_name, $colums, $query, __LINE__, __FILE__, false, $order_by, false, 0, $join)->NumRows();
 				}
 			}
-			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
-				$start,$order_by,$this->app,$num_rows,$join);
+			$rs = $this->db->select($this->table_name, $mysql_calc_rows.$colums, $query, __LINE__, __FILE__,
+				$start, $order_by, $this->app, $num_rows, $join);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
-			$cols = $this->_get_columns($only_keys,$extra_cols);
+			$cols = $this->_get_columns($only_keys, $extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
 
 		if ($mysql_calc_rows)
 		{
@@ -1097,14 +1097,14 @@ 
 		// ToDo: Implement that as an iterator, as $rs is also an interator and we could return one instead of an array
 		if ($this->search_return_iterator)
 		{
-			return new Db2DataIterator($this,$rs);
+			return new Db2DataIterator($this, $rs);
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs) foreach ($rs as $row)
 		{
 			$data = array();
-			foreach($cols as $db_col => $col)
+			foreach ($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
 			}
@@ -1134,7 +1134,7 @@ 
 		$matches = null;
 		if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
 		{
-			return $group_by;	// nothing to do
+			return $group_by; // nothing to do
 		}
 		$changes = 0;
 		$group_by_cols = preg_split('/, */', trim(substr($matches[1], 9)));
@@ -1144,9 +1144,9 @@ 
 			$columns = preg_split('/, */', $columns);
 
 			// fix columns containing commas as part of function calls
-			for($n = 0; $n < count($columns); ++$n)
+			for ($n = 0; $n < count($columns); ++$n)
 			{
-				$col =& $columns[$n];
+				$col = & $columns[$n];
 				while (substr_count($col, '(') > substr_count($col, ')') && ++$n < count($columns))
 				{
 					$col .= ','.$columns[$n];
@@ -1155,7 +1155,7 @@ 
 			}
 			unset($col);
 		}
-		foreach($columns as $n => $col)
+		foreach ($columns as $n => $col)
 		{
 			if ($col == '*')
 			{
@@ -1168,7 +1168,7 @@ 
 			{
 				if (($pos = stripos($col, 'DISTINCT ')) !== false)
 				{
-					$col = substr($col, $pos+9);
+					$col = substr($col, $pos + 9);
 				}
 				$alias = $col;
 				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
@@ -1186,7 +1186,7 @@ 
 		$ret = $group_by;
 		if ($changes)
 		{
-			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ',  $group_by);
+			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ', $group_by);
 			//error_log(__METHOD__."('$group_by', ".array2string($columns).") group_by_cols=".array2string($group_by_cols)." changed to $ret");
 		}
 		return $ret;
@@ -1206,12 +1206,12 @@ 
 	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
-	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())
+	public function search2criteria($_pattern, &$wildcard = '', &$op = 'AND', $extra_col = null, $search_cols = array())
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
 		if (empty($pattern) || is_array($pattern)) return $pattern;
-		if(strpos($pattern, 'CAST(COALESCE(') !== false)
+		if (strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
 		}
@@ -1228,24 +1228,24 @@ 
 		$numeric_columns = array();
 
 		// Special handling for an ID search, #<int>
-		if(strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
+		if (strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
 		{
-			return array('(' . $this->table_name.'.'. $this->autoinc_id . '=' . (int)substr($_pattern,1) . ')');
+			return array('('.$this->table_name.'.'.$this->autoinc_id.'='.(int)substr($_pattern, 1).')');
 		}
-		if(!$search_cols)
+		if (!$search_cols)
 		{
 			$search_cols = $this->get_default_search_columns();
 		}
 		// Concat all fields to be searched together, so the conditions operate across the whole record
-		foreach($search_cols as $col)
+		foreach ($search_cols as $col)
 		{
 			$col_name = $col;
 			$table = $this->table_name;
-			if (strpos($col,'.') !== false)
+			if (strpos($col, '.') !== false)
 			{
-				list($table,$col_name) = explode('.',$col);
+				list($table, $col_name) = explode('.', $col);
 			}
-			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true,$table);
+			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true, $table);
 			if ($table_def['fd'][$col_name] && in_array($table_def['fd'][$col_name]['type'], $numeric_types))
 			{
 				$numeric_columns[] = $col;
@@ -1253,11 +1253,11 @@ 
 			}
 			if ($this->db->Type == 'mysql' && $table_def['fd'][$col_name]['type'] === 'ascii' && preg_match('/[\x80-\xFF]/', $_pattern))
 			{
-				continue;	// will only give sql error
+				continue; // will only give sql error
 			}
-			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR],"COALESCE($col,'')");
+			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR], "COALESCE($col,'')");
 		}
-		if(!$columns)
+		if (!$columns)
 		{
 			return array();
 		}
@@ -1266,9 +1266,9 @@ 
 		$break = ' ';
 		$token = strtok($pattern, $break);
 
-		while($token)
+		while ($token)
 		{
-			if($token == strtoupper(lang('AND')) || $token == 'AND')
+			if ($token == strtoupper(lang('AND')) || $token == 'AND')
 			{
 				$token = '+'.strtok($break);
 			}
@@ -1281,10 +1281,10 @@ 
 			{
 				$token = '-'.strtok($break);
 			}
-			if ($token[0]=='"')
+			if ($token[0] == '"')
 			{
-				$token = substr($token, 1,strlen($token));
- 				if(substr($token, -1) != '"')
+				$token = substr($token, 1, strlen($token));
+ 				if (substr($token, -1) != '"')
 				{
 					$token .= ' '.strtok('"');
 				}
@@ -1295,16 +1295,16 @@ 
 			}
 
 			// prepend and append extra wildcard %, if pattern does NOT already contain wildcards
-			if (strpos($token,'*') === false && strpos($token,'?') === false)
+			if (strpos($token, '*') === false && strpos($token, '?') === false)
 			{
-				$wildcard = '%';	// if pattern contains no wildcards, add them before AND after the pattern
+				$wildcard = '%'; // if pattern contains no wildcards, add them before AND after the pattern
 			}
 			else
 			{
-				$wildcard = '';		// no extra wildcard, if pattern already contains some
+				$wildcard = ''; // no extra wildcard, if pattern already contains some
 			}
 
-			switch($token[0])
+			switch ($token[0])
 			{
 				case '+':
 					$op = 'AND';
@@ -1319,32 +1319,32 @@ 
 					$op = 'OR';
 					break;
 			}
-			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns).' '.
-				$this->db->capabilities['case_insensitive_like'] . ' ' .
-				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard);
+			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db, 'concat'), $columns).' '.
+				$this->db->capabilities['case_insensitive_like'].' '.
+				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $token).$wildcard);
 
 			// Compare numeric token as equality for numeric columns
 			// skip user-wildcards (*,?) in is_numeric test, but not SQL wildcards, which get escaped and give sql-error
-			if (is_numeric(str_replace(array('*','?'), '', $token)))
+			if (is_numeric(str_replace(array('*', '?'), '', $token)))
 			{
 				$numeric_filter = array();
-				foreach($numeric_columns as $col)
+				foreach ($numeric_columns as $col)
 				{
-					if($wildcard == '')
+					if ($wildcard == '')
 					{
 						// Token has a wildcard from user, use LIKE
-						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) " .
-							$this->db->capabilities['case_insensitive_like'] . ' ' .
-							$GLOBALS['egw']->db->quote(str_replace(array('*','?'), array('%','_'), $token)) . ')';
+						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) ".
+							$this->db->capabilities['case_insensitive_like'].' '.
+							$GLOBALS['egw']->db->quote(str_replace(array('*', '?'), array('%', '_'), $token)).')';
 					}
 					else
 					{
 						$numeric_filter[] = "($col IS NOT NULL AND $col = $token)";
 					}
 				}
-				if(count($numeric_filter) > 0)
+				if (count($numeric_filter) > 0)
 				{
-					$token_filter = '(' . $token_filter . ' OR ' . implode(' OR ', $numeric_filter) . ')';
+					$token_filter = '('.$token_filter.' OR '.implode(' OR ', $numeric_filter).')';
 				}
 			}
 			$criteria[$op][] = $token_filter;
@@ -1352,32 +1352,32 @@ 
 			$token = strtok($break);
 		}
 
-		if($criteria['NOT'])
+		if ($criteria['NOT'])
 		{
-			$filter[] = 'NOT (' . implode(' OR ', $criteria['NOT']) . ') ';
+			$filter[] = 'NOT ('.implode(' OR ', $criteria['NOT']).') ';
 		}
-		if($criteria['AND'])
+		if ($criteria['AND'])
 		{
-			$filter[] = implode(' AND ', $criteria['AND']) . ' ';
+			$filter[] = implode(' AND ', $criteria['AND']).' ';
 		}
-		if($criteria['OR'])
+		if ($criteria['OR'])
 		{
-			$filter[] = '(' . implode(' OR ', $criteria['OR']) . ') ';
+			$filter[] = '('.implode(' OR ', $criteria['OR']).') ';
 		}
 
-		if(count($filter))
+		if (count($filter))
 		{
-			$result = '(' . implode(' AND ', $filter) . ')';
+			$result = '('.implode(' AND ', $filter).')';
 		}
 
 		// OR extra column on the end so a null or blank won't block a hit in the main columns
 		if ($extra_col)
 		{
-			$result .= (strlen($result) ? ' OR ' : ' ') . "$extra_col = " . $GLOBALS['egw']->db->quote($pattern);
+			$result .= (strlen($result) ? ' OR ' : ' ')."$extra_col = ".$GLOBALS['egw']->db->quote($pattern);
 		}
 
 		$op = 'OR';
-		return array('(' . $result . ')');
+		return array('('.$result.')');
 	}
 
 	/**
@@ -1396,21 +1396,21 @@ 
 		$numeric_types = array('auto', 'int', 'float', 'double');
 
 		// Skip some numeric columns that don't make sense to search if we have to default to all columns
-		if(is_null($this->columns_to_search))
+		if (is_null($this->columns_to_search))
 		{
-			foreach($search_cols as $key => &$col)
+			foreach ($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if (!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
 				}
-				if(in_array($this->table_def['fd'][$col]['type'], $numeric_types))
+				if (in_array($this->table_def['fd'][$col]['type'], $numeric_types))
 				{
-					foreach($skip_columns_with as $bad)
+					foreach ($skip_columns_with as $bad)
 					{
-						if(strpos($col, $bad) !== false)
+						if (strpos($col, $bad) !== false)
 						{
 							unset($search_cols[$key]);
 							continue 2;
@@ -1432,7 +1432,7 @@ 
 	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @return array with columns as db-name => internal-name pairs
 	 */
-	function _get_columns($only_keys,$extra_cols)
+	function _get_columns($only_keys, $extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
 		if ($only_keys === true)	// only primary key
@@ -1443,7 +1443,7 @@ 
 		{
 			$cols = array();
 			$distinct_checked = false;
-			foreach(is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
+			foreach (is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
 			{
 				if (!$distinct_checked)
 				{
@@ -1452,17 +1452,17 @@ 
 				}
 				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
 				{
-					$cols = array_merge($cols,$this->db_cols);
+					$cols = array_merge($cols, $this->db_cols);
 				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col, 'as'))	// if there's already an explicit naming of the column, just use it
 					{
-						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
 						$cols[$col] = $col;
 						continue;
 					}
-					if (($db_col = array_search($col,$this->db_cols)) !== false)
+					if (($db_col = array_search($col, $this->db_cols)) !== false)
 					{
 						$cols[$db_col] = $col;
 					}
@@ -1475,10 +1475,10 @@ 
 		}
 		if ($extra_cols)	// extra columns to report
 		{
-			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
+			foreach (is_array($extra_cols) ? $extra_cols : explode(',', $extra_cols) as $col)
 			{
-				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
-				if (($db_col = array_search($col,$this->db_cols)) !== false)
+				if (stripos($col, 'as ') !== false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
+				if (($db_col = array_search($col, $this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
 				}
@@ -1505,12 +1505,12 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		unset($readonlys);	// required by function signature, but not used in this default implementation
-		if ((int) $this->debug >= 4)
+		unset($readonlys); // required by function signature, but not used in this default implementation
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::get_rows(".print_r($query,true).",,)</p>\n";
+			echo "<p>so_sql::get_rows(".print_r($query, true).",,)</p>\n";
 		}
 		$criteria = array();
 		$op = 'AND';
@@ -1518,11 +1518,11 @@ 
 		{
 			$criteria = $query['search'];
 		}
-		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
-			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
-			$query['col_filter'],$join,$need_full_no_count);
+		$rows = $this->search($criteria, $only_keys, $query['order'] ? $query['order'].' '.$query['sort'] : '', $extra_cols,
+			'', false, $op, $query['num_rows'] ? array((int)$query['start'], $query['num_rows']) : (int)$query['start'],
+			$query['col_filter'], $join, $need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1533,7 +1533,7 @@ 
 	 * @param array $data =null data-set to check, defaults to $this->data
 	 * @return int 0: all keys are unique, 1: first key not unique, 2: ...
 	 */
-	function not_unique($data=null)
+	function not_unique($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -1546,12 +1546,12 @@ 
 		{
 			$uni_keys[] = $this->db_key_cols;
 		}
-		foreach($uni_keys as $db_col => $col)
+		foreach ($uni_keys as $db_col => $col)
 		{
 			if (is_array($col))
 			{
 				$query = array();
-				foreach($col as $db_c => $c)
+				foreach ($col as $db_c => $c)
 				{
 					$query[$db_c] = $data[$c];
 				}
@@ -1560,17 +1560,17 @@ 
 			{
 				$query = array($db_col => $data[$col]);
 			}
-			foreach($this->db->select($this->table_name,$this->db_key_cols,$query,__LINE__,__FILE__,false,'',$this->app) as $other)
+			foreach ($this->db->select($this->table_name, $this->db_key_cols, $query, __LINE__, __FILE__, false, '', $this->app) as $other)
 			{
-				foreach($this->db_key_cols as $key_col)
+				foreach ($this->db_key_cols as $key_col)
 				{
 					if ($data[$key_col] != $other[$key_col])
 					{
-						if ((int) $this->debug >= 4)
+						if ((int)$this->debug >= 4)
 						{
 							echo "<p>not_unique in ".array2string($col)." as for '$key_col': '${data[$key_col]}' != '${other[$key_col]}'</p>\n";
 						}
-						return $n;	// different entry => $n not unique
+						return $n; // different entry => $n not unique
 					}
 				}
 			}
@@ -1591,7 +1591,7 @@ 
 	 * @param string $order ='' order, default '' = same as (first) $value_col
 	 * @return array with key_col => value_col pairs or array if more then one value_col given (keys as in value_col)
 	 */
-	function query_list($value_col,$key_col='',$filter=array(),$order='')
+	function query_list($value_col, $key_col = '', $filter = array(), $order = '')
 	{
 		static $cache = array();
 
@@ -1604,16 +1604,16 @@ 
 		if (!is_array($value_col)) $value_col = array($value_col);
 
 		$cols = $ret = array();
-		foreach($value_col as $key => $col)
+		foreach ($value_col as $key => $col)
 		{
 			$matches = null;
-			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
+			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i', $col, $matches) ? $matches[1] : $col;
 		}
 		if (!$order) $order = current($cols);
 
-		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
+		if (($search = & $this->search(array(), ($key_col ? $key_col.',' : 'DISTINCT ').implode(',', $value_col), $order, '', '', false, 'AND', false, $filter)))
 		{
-			if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches))
+			if (preg_match('/AS ([a-z_0-9]+)$/i', $key_col, $matches))
 			{
 				$key_col = $matches[1];
 			}
@@ -1621,12 +1621,12 @@ 
 			{
 				$key_col = current($cols);
 			}
-			foreach($search as $row)
+			foreach ($search as $row)
 			{
 				if (count($cols) > 1)
 				{
 					$data = array();
-					foreach($cols as $key => $col)
+					foreach ($cols as $key => $col)
 					{
 						$data[$key] = $row[$col];
 					}
@@ -1638,7 +1638,7 @@ 
 				if ($data) $ret[$row[$key_col]] = $data;
 			}
 		}
-		return $cache[$cache_key] =& $ret;
+		return $cache[$cache_key] = & $ret;
 	}
 
 	/**
@@ -1647,13 +1647,13 @@ 
 	 * @param string $column =null name of column or null for all (default)
 	 * @return array|string array with internal-name => comment pairs, or string with comment, if $column given
 	 */
-	public function get_comments($column=null)
+	public function get_comments($column = null)
 	{
-		static $comments=null;
+		static $comments = null;
 
 		if (is_null($comments))
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				$comments[$col] = $this->table_def['fd'][$db_col]['comment'];
 			}

api/src/Storage/Base2.php

Spacing +7 added lines, -7 removed lines

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

api/src/Exception/NoPermission/App.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  */
 class App extends Exception\NoPermission
 {
-	function __construct($msg=null,$code=101)
+	function __construct($msg = null, $code = 101)
 	{
 		if (isset($GLOBALS['egw_info']['apps'][$msg]))
 		{
@@ -39,6 +39,6 @@ 
 						'"'.$app.'"');
 			}
 		}
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

api/src/Exception/NotFound.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -28,7 +28,10 @@
 	 */
 	function __construct($msg=null,$code=2)
 	{
-		if (is_null($msg)) $msg = lang('Entry not found!');
+		if (is_null($msg))
+		{
+			$msg = lang('Entry not found!');
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Exception/Redirect.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string $msg
 	 * @param int $code
 	 */
-	function __construct($url,$app=null,$msg=null,$code=301)
+	function __construct($url, $app = null, $msg = null, $code = 301)
 	{
 		$this->url = $url;
 		$this->app = $app;

api/src/Exception/NoPermission.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Permission denied!"
 	 * @param int $code =100 numerical code, default 100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Permisson denied!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -29,7 +29,10 @@
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Permisson denied!');
+		if (is_null($msg))
+		{
+			$msg = lang('Permisson denied!');
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Db/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @param string $msg =null message, default "Database error!"
 	 * @param int $code =100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Database error!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -29,7 +29,10 @@
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Database error!');
+		if (is_null($msg))
+		{
+			$msg = lang('Database error!');
+		}
 
 		parent::__construct($msg,$code);
 	}