EGroupware / egroupware

api/src/Framework/Bundle.php

Braces +22 added lines, -5 removed lines

@@ -74,7 +74,11 @@ 
 		$query = null;
 		foreach($js_includes as $file)
 		{
-			if ($file == '/api/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($file == '/api/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// loaded via own tag, and we must not load it twice!
 
 			if (!isset($to_include[$file]))
 			{
@@ -133,17 +137,27 @@ 
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
-		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null;
+		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl))
+		{
+			$minurl = null;
+		}
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
 		foreach($js_includes as $path)
 		{
-			if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
+			if ($path == '/api/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// Leave egw.js out of bundle
 			unset($query);
 			list($path,$query) = explode('?',$path,2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
-			if ($mod > $max_modified) $max_modified = $mod;
+			if ($mod > $max_modified)
+			{
+				$max_modified = $mod;
+			}
 
 			// ckeditor must be included before bundled files, as they depend on it!
 			if (strpos($path,'/ckeditor/ckeditor.js') !== false)
@@ -182,7 +196,10 @@ 
 			// need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
 			array_unshift($to_include, $path);
 		}
-		if ($to_include_first) $to_include = array_merge($to_include_first, $to_include);
+		if ($to_include_first)
+		{
+			$to_include = array_merge($to_include_first, $to_include);
+		}
 		//error_log(__METHOD__."("./*array2string($js_includes).*/", $max_modified, $minurl) returning ".array2string($to_include));
 		return $to_include;
 	}

api/src/Framework/Extra.php

Braces +4 added lines, -1 removed lines

@@ -164,9 +164,12 @@
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
 		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
-			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
+			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))
+		{
+			// app/id given
 		{
 			$links = Link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
+		}
 			$apps = array();
 			foreach($links as $link)
 			{

api/src/Framework/Ajax.php

Braces +56 added lines, -14 removed lines

@@ -104,7 +104,9 @@ 
 
 		//Width may not be smaller than MIN_SIDEBAR_WIDTH
 		if ($width < self::MIN_SIDEBAR_WIDTH)
-			$width = self::MIN_SIDEBAR_WIDTH;
+		{
+					$width = self::MIN_SIDEBAR_WIDTH;
+		}
 
 		return $width;
 	}
@@ -156,7 +158,10 @@ 
 	 */
 	static function link($url = '', $extravars = '', $link_app=null)
 	{
-		if (is_null($link_app)) $link_app = self::$link_app;
+		if (is_null($link_app))
+		{
+			$link_app = self::$link_app;
+		}
 		$link = parent::link($url, $extravars);
 
 		// $link_app === true --> detect application, otherwise use given application
@@ -185,7 +190,10 @@ 
 		$srcs = array();
 		foreach(Api\Hooks::process('csp-frame-src') as $src)
 		{
-			if ($src) $srcs = array_merge($srcs, $src);
+			if ($src)
+			{
+				$srcs = array_merge($srcs, $src);
+			}
 		}
 		return $srcs;
 	}
@@ -199,7 +207,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		$this->send_headers();
@@ -266,7 +277,10 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script']))
+				{
+					$GLOBALS['egw_info']['flags']['java_script']='';
+				}
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
@@ -539,7 +553,10 @@ 
 	 */
 	public function sidebox($appname,$menu_title,$file,$type=null)
 	{
-		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		if (!isset($file['menuOpened']))
+		{
+			$file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		}
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
 		$this->sidebox_menu_opened = false;
 
@@ -666,7 +683,10 @@ 
 		foreach($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
-			if ($data['active']) $active = $data['appName'];
+			if ($data['active'])
+			{
+				$active = $data['appName'];
+			}
 		}
 		// send app a notification, that it's tab got closed
 		// used eg. in phpFreeChat to leave the chat
@@ -790,10 +810,22 @@ 
 		}
 
 		unset($apps['logout']);	// never display it
-		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
-		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
-		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
-		if (isset($apps['home'])) $apps['home']['noNavbar'] = true;
+		if (isset($apps['about']))
+		{
+			$apps['about']['noNavbar'] = true;
+		}
+		if (isset($apps['preferences']))
+		{
+			$apps['preferences']['noNavbar'] = true;
+		}
+		if (isset($apps['manual']))
+		{
+			$apps['manual']['noNavbar'] = true;
+		}
+		if (isset($apps['home']))
+		{
+			$apps['home']['noNavbar'] = true;
+		}
 
 		// no need for website icon, if we have sitemgr
 		if (isset($apps['sitemgr']) && isset($apps['sitemgr-link']))
@@ -862,7 +894,10 @@ 
 		else
 		{
 			$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
-			if (!$active_tab) $active_tab = $default_app;
+			if (!$active_tab)
+			{
+				$active_tab = $default_app;
+			}
 		}
 		// if we have the open tabs in the session, use it instead the maybe forced common prefs open_tabs
 		if (!($open_tabs = Api\Cache::getSession(__CLASS__, 'open_tabs')))
@@ -887,9 +922,12 @@ 
 		// Restore Tabs
 		foreach($open_tabs as $n => $app)
 		{
-			if (isset($apps[$app]))		// user might no longer have app rights
+			if (isset($apps[$app]))
+			{
+				// user might no longer have app rights
 			{
 				$apps[$app]['opened'] = $n;
+			}
 				if ($app == $active_tab)
 				{
 					$apps[$app]['active'] = true;
@@ -915,7 +953,11 @@ 
 	function footer($no_framework=true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done)
+		{
+			return;
+		}
+		// prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])

api/src/Framework/Minimal.php

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		// js stuff is not needed by login page or in popups
@@ -135,7 +138,11 @@ 
 	function footer()
 	{
 		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		if ($footer_done++)
+		{
+			return;
+		}
+		// prevent multiple footers, not sure we still need this (RalfBecker)
 
 		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
 	}

api/src/Framework/Updates.php

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 			if (($remote = file_get_contents(self::CURRENT_VERSION_URL, false, Api\Framework::proxy_context())))
 			{
 				list($current, $security) = explode("\n", $remote);
-				if (empty($security)) $security = $current;
+				if (empty($security))
+				{
+					$security = $current;
+				}
 				$versions = array(
 					'current'  => $current,		// last maintenance update
 					'security' => $security,	// last security update
@@ -114,7 +117,10 @@ 
 	protected static function update_older($version, $days)
 	{
 		list(,,$date) = explode('.', $version);
-		if ($date < 20140000) return false;
+		if ($date < 20140000)
+		{
+			return false;
+		}
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
 		return (time() - $version_timestamp) / 86400 > $days;

api/src/autoload.php

Braces +9 added lines, -2 removed lines

@@ -37,7 +37,11 @@ 
 spl_autoload_register(function($class)
 {
 	$parts = explode('\\', $class);
-	if (array_shift($parts) != 'EGroupware') return;	// not our prefix
+	if (array_shift($parts) != 'EGroupware')
+	{
+		return;
+	}
+	// not our prefix
 
 	$app = lcfirst(array_shift($parts));
 	$base = EGW_INCLUDE_ROOT.'/'.$app.'/src/';
@@ -63,7 +67,10 @@ 
 spl_autoload_register(function($class)
 {
 	// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
-	if (strlen($class) > 64 || strpos($class, '.') !== false) return;
+	if (strlen($class) > 64 || strpos($class, '.') !== false)
+	{
+		return;
+	}
 
 	$components = explode('_',$class);
 	$app = array_shift($components);

api/src/Ldap/ServerInfo.php

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
 					{
 						if(($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
+							if($info[0]['objectclasses'])
+							{
 								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;

api/src/Preferences.php

Braces +81 added lines, -20 removed lines

@@ -196,7 +196,10 @@ 
 		foreach((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
-			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
+			if (!isset($prefs[$id]) && !is_array($prefs[$id]))
+			{
+				$db_read[] = $id;
+			}
 		}
 		if ($db_read)
 		{
@@ -209,7 +212,10 @@ 
 			}
 			foreach($db_read as $id)
 			{
-				if (!isset($prefs[$id])) $prefs[$id] = array();
+				if (!isset($prefs[$id]))
+				{
+					$prefs[$id] = array();
+				}
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
 			}
 		}
@@ -237,7 +243,10 @@ 
 		$replace = $with = array();
 		foreach($vals as $key => $val)
 		{
-			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			if ($this->debug)
+			{
+				error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			}
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
@@ -275,7 +284,10 @@ 
 	 */
 	function standard_substitutes()
 	{
-		if ($this->debug) error_log(__METHOD__." is called ");
+		if ($this->debug)
+		{
+			error_log(__METHOD__." is called ");
+		}
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
 			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
@@ -301,12 +313,18 @@ 
 			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
 			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.print_r($this->vars,true));
+		}
 		// do the substituetion in the effective prefs (data)
 		//
 		foreach($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
+			if(!is_array($data))
+			{
+				continue;
+			}
 			foreach($data as $key => $val)
 			{
 				if (!is_array($val) && strpos($val,'$$') !== False)
@@ -401,7 +419,11 @@ 
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
 			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group)
+				{
+					$to_read[] = $gid + self::DEFAULT_ID;
+				}
+				// need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
@@ -508,9 +530,15 @@ 
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
 
-		if ($app) $default = $default[$app];
+		if ($app)
+		{
+			$default = $default[$app];
+		}
 
-		if ($name && is_array($default)) $default = $default[$name];
+		if ($name && is_array($default))
+		{
+			$default = $default[$name];
+		}
 
 		return $default;
 	}
@@ -588,9 +616,13 @@ 
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
 					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+					{
+						// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache();
+					}
+					// in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -646,9 +678,12 @@ 
 		}
 		$pref = &$this->$type;
 
-		if (($all = empty($var))) // to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
+		if (($all = empty($var)))
+		{
+			// to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
 		{
 			unset($pref[$app_name]);
+		}
 			unset($this->data[$app_name]);
 		}
 		else
@@ -727,7 +762,10 @@ 
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
-		if ($app) $where['preference_app'] = $app;
+		if ($app)
+		{
+			$where['preference_app'] = $app;
+		}
 
 		switch($type)
 		{
@@ -747,7 +785,11 @@ 
 		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs))
+			{
+				$prefs = array();
+			}
+			// would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -764,10 +806,16 @@ 
 			$updated = false;
 			foreach($attrs as $attr)
 			{
-				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
+				if (isset($old_value) && $prefs[$attr] != $old_value)
+				{
+					continue;
+				}
 
 				$val = is_callable($value) ? call_user_func($value, $attr, $prefs[$attr], $row['preference_owner']) : $value;
-				if ($val === $prefs[$attr]) continue;
+				if ($val === $prefs[$attr])
+				{
+					continue;
+				}
 
 				$updated = true;
 				if ((string)$val !== '')
@@ -832,7 +880,11 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs)
+			{
+				continue;
+			}
+			// nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -898,9 +950,15 @@ 
 			foreach($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
-				if ($old_prefs && $old_prefs[$app] == $value) continue;
+				if ($old_prefs && $old_prefs[$app] == $value)
+				{
+					continue;
+				}
 
-				if (!$changed++) $this->db->transaction_begin();
+				if (!$changed++)
+				{
+					$this->db->transaction_begin();
+				}
 
 				if (!is_array($value) || !$value)
 				{
@@ -986,7 +1044,10 @@ 
 			list($lang,$lang2) = explode('-',$lang);
 			$country_from_lang = strtoupper($lang2);
 		}
-		if (is_null($charset)) $charset = Translation::charset();
+		if (is_null($charset))
+		{
+			$charset = Translation::charset();
+		}
 
 		foreach(array(
 			$lang.'_'.$country,

api/src/Storage.php

Braces +64 added lines, -15 removed lines

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