EGroupware / egroupware

api/src/Mail/Smime/PassphraseMissing.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class PassphraseMissing extends Api\Exception\AssertionFailed { }
+class PassphraseMissing extends Api\Exception\AssertionFailed
+{
+}

api/src/Cache.php

Spacing +71 added lines, -73 removed lines

@@ -82,7 +82,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $default_provider;	// = array('EGroupware\Api\Cache\Files');// array('EGroupware\Api\Cache\Memcache','localhost');
+	static $default_provider; // = array('EGroupware\Api\Cache\Files');// array('EGroupware\Api\Cache\Memcache','localhost');
 
 	/**
 	 * Maximum expiration time, if set unlimited expiration (=0) or bigger expiration times are replaced with that time
@@ -108,10 +108,10 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise incl. key already existed
 	 */
-	static public function addCache($level,$app,$location,$data,$expiration=0)
+	static public function addCache($level, $app, $location, $data, $expiration = 0)
 	{
 		//error_log(__METHOD__."('$level','$app','$location',".array2string($data).",$expiration)");
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
@@ -129,7 +129,7 @@ 
 				{
 					$expiration = self::$max_expiration;
 				}
-				return $provider->add(self::keys($level,$app,$location),$data,$expiration);
+				return $provider->add(self::keys($level, $app, $location), $data, $expiration);
 		}
 		throw new Exception\WrongParameter(__METHOD__."() unknown level '$level'!");
 	}
@@ -144,14 +144,14 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setCache($level,$app,$location,$data,$expiration=0)
+	static public function setCache($level, $app, $location, $data, $expiration = 0)
 	{
 		//error_log(__METHOD__."('$level','$app','$location',".array2string($data).",$expiration)");
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				return call_user_func(array(__CLASS__,'set'.$level),$app,$location,$data,$expiration);
+				return call_user_func(array(__CLASS__, 'set'.$level), $app, $location, $data, $expiration);
 
 			case self::INSTANCE:
 			case self::TREE:
@@ -165,7 +165,7 @@ 
 				{
 					$expiration = self::$max_expiration;
 				}
-				return $provider->set(self::keys($level,$app,$location),$data,$expiration);
+				return $provider->set(self::keys($level, $app, $location), $data, $expiration);
 		}
 		throw new Exception\WrongParameter(__METHOD__."() unknown level '$level'!");
 	}
@@ -182,15 +182,15 @@ 
 	 * @return mixed NULL if data not found in cache (and no callback specified) or
 	 * 	if $location is an array: location => data pairs for existing location-data, non-existing is not returned
 	 */
-	static public function getCache($level,$app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getCache($level, $app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				foreach((array)$location as $l)
+				foreach ((array)$location as $l)
 				{
-					$data[$l] = call_user_func(array(__CLASS__,'get'.$level),$app,$l,$callback,$callback_params,$expiration);
+					$data[$l] = call_user_func(array(__CLASS__, 'get'.$level), $app, $l, $callback, $callback_params, $expiration);
 				}
 				return is_array($location) ? $data : $data[$l];
 
@@ -210,34 +210,34 @@ 
 						}
 						if (is_a($provider, 'EGroupware\Api\Cache\ProviderMultiple'))
 						{
-							$data = $provider->mget($keys=self::keys($level,$app,$location));
+							$data = $provider->mget($keys = self::keys($level, $app, $location));
 						}
 						else	// default implementation calls get multiple times
 						{
 							$data = array();
-							foreach($location as $l)
+							foreach ($location as $l)
 							{
-								$data[$l] = $provider->get($keys=self::keys($level,$app,$l));
+								$data[$l] = $provider->get($keys = self::keys($level, $app, $l));
 								if (!isset($data[$l])) unset($data[$l]);
 							}
 						}
 					}
 					else
 					{
-						$data = $provider->get($keys=self::keys($level,$app,$location));
+						$data = $provider->get($keys = self::keys($level, $app, $location));
 						if (is_null($data) && !is_null($callback))
 						{
-							$data = call_user_func_array($callback,$callback_params);
+							$data = call_user_func_array($callback, $callback_params);
 							// limit expiration to configured maximum time
 							if (isset(self::$max_expiration) && (!$expiration || $expiration > self::$max_expiration))
 							{
 								$expiration = self::$max_expiration;
 							}
-							$provider->set($keys,$data,$expiration);
+							$provider->set($keys, $data, $expiration);
 						}
 					}
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					unset($e);
 					$data = null;
 				}
@@ -254,13 +254,13 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetCache($level,$app,$location)
+	static public function unsetCache($level, $app, $location)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case self::SESSION:
 			case self::REQUEST:
-				return call_user_func(array(__CLASS__,'unset'.$level),$app,$location);
+				return call_user_func(array(__CLASS__, 'unset'.$level), $app, $location);
 
 			case self::INSTANCE:
 			case self::TREE:
@@ -269,7 +269,7 @@ 
 				{
 					return false;
 				}
-				return $provider->delete(self::keys($level,$app,$location));
+				return $provider->delete(self::keys($level, $app, $location));
 		}
 		throw new Exception\WrongParameter(__METHOD__."() unknown level '$level'!");
 	}
@@ -283,10 +283,10 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setTree($app,$location,$data,$expiration=0)
+	static public function setTree($app, $location, $data, $expiration = 0)
 	{
 		//error_log(__METHOD__."('$app','$location',".array2string($data).",$expiration)");
-		return self::setCache(self::TREE,$app,$location,$data,$expiration);
+		return self::setCache(self::TREE, $app, $location, $data, $expiration);
 	}
 
 	/**
@@ -299,9 +299,9 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getTree($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getTree($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		return self::getCache(self::TREE,$app,$location,$callback,$callback_params,$expiration);
+		return self::getCache(self::TREE, $app, $location, $callback, $callback_params, $expiration);
 	}
 
 	/**
@@ -311,9 +311,9 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetTree($app,$location)
+	static public function unsetTree($app, $location)
 	{
-		return self::unsetCache(self::TREE,$app,$location);
+		return self::unsetCache(self::TREE, $app, $location);
 	}
 
 	/**
@@ -325,9 +325,9 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setInstance($app,$location,$data,$expiration=0)
+	static public function setInstance($app, $location, $data, $expiration = 0)
 	{
-		return self::setCache(self::INSTANCE,$app,$location,$data,$expiration);
+		return self::setCache(self::INSTANCE, $app, $location, $data, $expiration);
 	}
 
 	/**
@@ -340,9 +340,9 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getInstance($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getInstance($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		return self::getCache(self::INSTANCE,$app,$location,$callback,$callback_params,$expiration);
+		return self::getCache(self::INSTANCE, $app, $location, $callback, $callback_params, $expiration);
 	}
 
 	/**
@@ -352,9 +352,9 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetInstance($app,$location)
+	static public function unsetInstance($app, $location)
 	{
-		return self::unsetCache(self::INSTANCE,$app,$location);
+		return self::unsetCache(self::INSTANCE, $app, $location);
 	}
 
 	/**
@@ -371,18 +371,18 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setSession($app,$location,$data,$expiration=0)
+	static public function setSession($app, $location, $data, $expiration = 0)
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return false;	// can no longer store something in the session, eg. because commit_session() was called
+			return false; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		$_SESSION[Session::EGW_APPSESSION_VAR][$app][$location] = $data;
 
 		if ($expiration > 0)
 		{
-			$_SESSION[Session::EGW_APPSESSION_VAR][self::SESSION_EXPIRATION_PREFIX.$app][$location] = time()+$expiration;
+			$_SESSION[Session::EGW_APPSESSION_VAR][self::SESSION_EXPIRATION_PREFIX.$app][$location] = time() + $expiration;
 		}
 
 		return true;
@@ -400,12 +400,12 @@ 
 	 * @param int $expiration =0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function &getSession($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function &getSession($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return null;	// can no longer store something in the session, eg. because commit_session() was called
+			return null; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		// check if entry is expired and clean it up in that case
 		if (isset($_SESSION[Session::EGW_APPSESSION_VAR][self::SESSION_EXPIRATION_PREFIX.$app][$location]) &&
@@ -416,7 +416,7 @@ 
 		}
 		if (!isset($_SESSION[Session::EGW_APPSESSION_VAR][$app][$location]) && !is_null($callback))
 		{
-			$_SESSION[Session::EGW_APPSESSION_VAR][$app][$location] = call_user_func_array($callback,$callback_params);
+			$_SESSION[Session::EGW_APPSESSION_VAR][$app][$location] = call_user_func_array($callback, $callback_params);
 		}
 		return $_SESSION[Session::EGW_APPSESSION_VAR][$app][$location];
 	}
@@ -428,12 +428,12 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetSession($app,$location)
+	static public function unsetSession($app, $location)
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
 			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
-			return false;	// can no longer store something in the session, eg. because commit_session() was called
+			return false; // can no longer store something in the session, eg. because commit_session() was called
 		}
 		// check if entry is expired and clean it up in that case
 		if (isset($_SESSION[Session::EGW_APPSESSION_VAR][self::SESSION_EXPIRATION_PREFIX.$app][$location]) &&
@@ -467,9 +467,9 @@ 
 	 * @param int $expiration =0 expiration time is NOT used for REQUEST!
 	 * @return boolean true if data could be stored, false otherwise
 	 */
-	static public function setRequest($app,$location,$data,$expiration=0)
+	static public function setRequest($app, $location, $data, $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		self::$request_cache[$app][$location] = $data;
 
 		return true;
@@ -485,12 +485,12 @@ 
 	 * @param int $expiration =0 expiration time is NOT used for REQUEST!
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getRequest($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
+	static public function getRequest($app, $location, $callback = null, array $callback_params = array(), $expiration = 0)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		if (!isset(self::$request_cache[$app][$location]) && !is_null($callback))
 		{
-			self::$request_cache[$app][$location] = call_user_func_array($callback,$callback_params);
+			self::$request_cache[$app][$location] = call_user_func_array($callback, $callback_params);
 		}
 		return self::$request_cache[$app][$location];
 	}
@@ -502,7 +502,7 @@ 
 	 * @param string $location location name for data
 	 * @return boolean true if data was set, false if not (like isset())
 	 */
-	static public function unsetRequest($app,$location)
+	static public function unsetRequest($app, $location)
 	{
 		if (!isset(self::$request_cache[$app][$location]))
 		{
@@ -522,7 +522,7 @@ 
 	 * @param boolean $log_not_found =true false do not log if no provider found, used eg. to supress error via unsetCache during installation
 	 * @return Api\Cache\Provider
 	 */
-	static protected function get_provider($level, $log_not_found=true)
+	static protected function get_provider($level, $log_not_found = true)
 	{
 		static $providers = array();
 
@@ -543,13 +543,13 @@ 
 				}
 				else
 				{
-					$providers[$level] = false;	// no provider specified
+					$providers[$level] = false; // no provider specified
 					$reason = 'no provider specified';
 				}
 			}
 			elseif (!$params)
 			{
-					$providers[$level] = false;	// cache for $level disabled
+					$providers[$level] = false; // cache for $level disabled
 					$reason = "cache for $level disabled";
 			}
 			else
@@ -559,7 +559,7 @@ 
 				$class = array_shift($params);
 				if (!class_exists($class))
 				{
-					$providers[$level] = false;	// provider class not found
+					$providers[$level] = false; // provider class not found
 					$reason = "provider $class not found";
 				}
 				else
@@ -568,9 +568,9 @@ 
 					{
 						$providers[$level] = new $class($params);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
-						$providers[$level] = false;	// eg. could not open connection to backend
+						$providers[$level] = false; // eg. could not open connection to backend
 						$reason = "error instanciating provider $class: ".$e->getMessage();
 					}
 				}
@@ -587,7 +587,7 @@ 
 	 * @param string $level
 	 * @return string class-name of provider
 	 */
-	public static function getProvider($level=self::INSTANCE)
+	public static function getProvider($level = self::INSTANCE)
 	{
 		$provider = self::get_provider($level);
 
@@ -601,35 +601,35 @@ 
 	 * @param boolean $throw =true throw an exception, if we can't retriev the value
 	 * @return string|boolean string with config or false if not found and !$throw
 	 */
-	static public function get_system_config($name,$throw=true)
+	static public function get_system_config($name, $throw = true)
 	{
-		if(!isset($GLOBALS['egw_info']['server'][$name]))
+		if (!isset($GLOBALS['egw_info']['server'][$name]))
 		{
 			if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db) || $GLOBALS['egw']->db)
 			{
 				$db = $GLOBALS['egw']->db ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
 
 				try {
-					if (($rs = $db->select(Config::TABLE,'config_value',array(
+					if (($rs = $db->select(Config::TABLE, 'config_value', array(
 						'config_app'	=> 'phpgwapi',
 						'config_name'	=> $name,
-					),__LINE__,__FILE__)))
+					), __LINE__, __FILE__)))
 					{
 						$GLOBALS['egw_info']['server'][$name] = $rs->fetchColumn();
 					}
 					else
 					{
-						error_log(__METHOD__."('$name', $throw) config value NOT found!");//.function_backtrace());
+						error_log(__METHOD__."('$name', $throw) config value NOT found!"); //.function_backtrace());
 					}
 				}
-				catch(Db\Exception $e)
+				catch (Db\Exception $e)
 				{
-					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());//.function_backtrace());
+					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage()); //.function_backtrace());
 				}
 			}
 			if (!$GLOBALS['egw_info']['server'][$name] && $throw)
 			{
-				throw new Exception (__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
+				throw new Exception(__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
 			}
 		}
 		return $GLOBALS['egw_info']['server'][$name];
@@ -641,7 +641,7 @@ 
 	 * @param string $level =self::INSTANCE
 	 * @param string $app =null app-name or "all" to empty complete cache
 	 */
-	static public function flush($level=self::INSTANCE, $app=null)
+	static public function flush($level = self::INSTANCE, $app = null)
 	{
 		$ret = true;
 		if (!($provider = self::get_provider($level)))
@@ -688,7 +688,7 @@ 
 	 * @param string $install_id =null default use install_id of current instance
 	 * @return string new key also stored in self::$instance_key
 	 */
-	static public function generate_instance_key($install_id=null)
+	static public function generate_instance_key($install_id = null)
 	{
 		if (!isset($install_id))
 		{
@@ -710,18 +710,18 @@ 
 	 * @param string $location =null
 	 * @return array
 	 */
-	static public function keys($level, $app=null, $location=null)
+	static public function keys($level, $app = null, $location = null)
 	{
 		static $tree_key = null;
 
-		switch($level)
+		switch ($level)
 		{
 			case self::TREE:
 				if (!isset($tree_key))
 				{
-					$tree_key = $level.'-'.str_replace(array(':','/','\\'),'-', self::$egw_server_root);
+					$tree_key = $level.'-'.str_replace(array(':', '/', '\\'), '-', self::$egw_server_root);
 					// add charset to key, if not utf-8 (as everything we store depends on charset!)
-					if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8')
+					if (($charset = self::get_system_config('system_charset', false)) && $charset != 'utf-8')
 					{
 						$tree_key .= '-'.$charset;
 					}
@@ -769,9 +769,7 @@ 
 if (is_null(Cache::$default_provider))
 {
 	Cache::$default_provider =
-		function_exists('apcu_fetch') && Cache\Apcu::available() ? 'EGroupware\Api\Cache\Apcu' :
-			(function_exists('apc_fetch') && Cache\Apc::available() ? 'EGroupware\Api\Cache\Apc' :
-				'EGroupware\Api\Cache\Files');
+		function_exists('apcu_fetch') && Cache\Apcu::available() ? 'EGroupware\Api\Cache\Apcu' : (function_exists('apc_fetch') && Cache\Apc::available() ? 'EGroupware\Api\Cache\Apc' : 'EGroupware\Api\Cache\Files');
 }
 
 //error_log('Cache::$default_provider='.array2string(Cache::$default_provider));

Braces +49 added lines, -12 removed lines

@@ -218,7 +218,10 @@ 
 							foreach($location as $l)
 							{
 								$data[$l] = $provider->get($keys=self::keys($level,$app,$l));
-								if (!isset($data[$l])) unset($data[$l]);
+								if (!isset($data[$l]))
+								{
+									unset($data[$l]);
+								}
 							}
 						}
 					}
@@ -375,7 +378,10 @@ 
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (Session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		$_SESSION[Session::EGW_APPSESSION_VAR][$app][$location] = $data;
@@ -404,7 +410,10 @@ 
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (Session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return null;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		// check if entry is expired and clean it up in that case
@@ -432,7 +441,10 @@ 
 	{
 		if (isset($_SESSION[Session::EGW_SESSION_ENCRYPTED]))
 		{
-			if (Session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (Session::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			}
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		// check if entry is expired and clean it up in that case
@@ -526,7 +538,10 @@ 
 	{
 		static $providers = array();
 
-		if ($level != self::TREE) $level = self::INSTANCE;
+		if ($level != self::TREE)
+		{
+			$level = self::INSTANCE;
+		}
 
 		if (!isset($providers[$level]))
 		{
@@ -537,10 +552,13 @@ 
 			}
 			if (!isset($params))
 			{
-				if ($level == self::TREE)	// if no tree level provider use the instance level one
+				if ($level == self::TREE)
+				{
+					// if no tree level provider use the instance level one
 				{
 					$providers[$level] = self::get_provider(self::INSTANCE);
 				}
+				}
 				else
 				{
 					$providers[$level] = false;	// no provider specified
@@ -554,7 +572,10 @@ 
 			}
 			else
 			{
-				if (!is_array($params)) $params = (array)$params;
+				if (!is_array($params))
+				{
+					$params = (array)$params;
+				}
 
 				$class = array_shift($params);
 				if (!class_exists($class))
@@ -575,7 +596,10 @@ 
 					}
 				}
 			}
-			if (!$providers[$level] && $log_not_found) error_log(__METHOD__."($level) no provider found ($reason)!".function_backtrace());
+			if (!$providers[$level] && $log_not_found)
+			{
+				error_log(__METHOD__."($level) no provider found ($reason)!".function_backtrace());
+			}
 		}
 		//error_log(__METHOD__."($level) = ".array2string($providers[$level]).', cache_provider='.array2string($GLOBALS['egw_info']['server']['cache_provider_'.strtolower($level)]));
 		return $providers[$level];
@@ -624,7 +648,11 @@ 
 				}
 				catch(Db\Exception $e)
 				{
-					if ($throw) error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());//.function_backtrace());
+					if ($throw)
+					{
+						error_log(__METHOD__."('$name', $throw) cound NOT query value: ".$e->getMessage());
+					}
+					//.function_backtrace());
 				}
 			}
 			if (!$GLOBALS['egw_info']['server'][$name] && $throw)
@@ -732,7 +760,10 @@ 
 				if ($level !== $GLOBALS['egw_info']['server']['install_id'])
 				{
 					$level_key = self::getTree(__CLASS__, $level);
-					if (!isset($level_key)) $level_key = self::generate_instance_key($level);
+					if (!isset($level_key))
+					{
+						$level_key = self::generate_instance_key($level);
+					}
 					break;
 				}
 				// fall-through for current instance
@@ -741,7 +772,10 @@ 
 				{
 					self::$instance_key = self::getTree(__CLASS__, self::get_system_config('install_id'));
 					//error_log(__METHOD__."('$level',...) instance_key read from tree-cache=".array2string(self::$instance_key));
-					if (!isset(self::$instance_key)) self::$instance_key = self::generate_instance_key();
+					if (!isset(self::$instance_key))
+					{
+						self::$instance_key = self::generate_instance_key();
+					}
 				}
 				$level_key = self::$instance_key;
 				break;
@@ -750,7 +784,10 @@ 
 		if (isset($app))
 		{
 			$keys[] = $app;
-			if (isset($location)) $keys[] = $location;
+			if (isset($location))
+			{
+				$keys[] = $location;
+			}
 		}
 		return $keys;
 	}

doc/phpunit_bootstrap.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 // backward compatibility with PHPunit 5.7
 if (!class_exists('\PHPUnit\Framework\TestCase') && class_exists('\PHPUnit_Framework_TestCase'))
 {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-    class_alias('\PHPUnit_Framework_ExpectationFailedException', '\PHPUnit\Framework\ExpectationFailedException');
+	class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+	class_alias('\PHPUnit_Framework_ExpectationFailedException', '\PHPUnit\Framework\ExpectationFailedException');
 }
 
 // Needed to let Cache work

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 $GLOBALS['egw_info']['server']['install_id'] = 'PHPUnit test';
 
 // Symlink api/src/fixtures/apps/* to root
-foreach(scandir($path=__DIR__.'/../api/tests/fixtures/apps') as $app)
+foreach (scandir($path = __DIR__.'/../api/tests/fixtures/apps') as $app)
 {
 	if (is_dir($path.'/'.$app) && @file_exists($path.'/'.$app.'/setup/setup.inc.php')/* &&
 		readlink(__DIR__.'/../'.$app) !== 'api/tests/fixtures/apps/'.$app*/)

api/src/Etemplate.php

Braces +81 added lines, -21 removed lines

@@ -47,14 +47,24 @@ 
 	function __construct($name='',$load_via='')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false)
+		{
+			parent::__construct ($name);
+		}
+		// satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name)
+		{
+			$this->read($name,$template='default','default',0,'',$load_via);
+		}
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = Etemplate\Request::read();
+		if(!isset(self::$request))
+		{
+			self::$request = Etemplate\Request::read();
+		}
 	}
 
 	/**
@@ -111,7 +121,10 @@ 
 
 		foreach($hook_data as $extras)
 		{
-			if (!$extras) continue;
+			if (!$extras)
+			{
+				continue;
+			}
 
 			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
@@ -136,7 +149,10 @@ 
 		// Include the etemplate2 javascript code
 		Framework::includeJS('etemplate', 'etemplate2', 'api');
 
-		if (!$this->rel_path) throw new Exception\AssertionFailed("No (valid) template '$this->name' found!");
+		if (!$this->rel_path)
+		{
+			throw new Exception\AssertionFailed("No (valid) template '$this->name' found!");
+		}
 
 		if ($output_mode == 4)
 		{
@@ -151,14 +167,23 @@ 
 		self::$request->preserv = $preserv ? $preserv : array();
 		self::$request->method = $method;
 		self::$request->ignore_validation = $ignore_validation;
-		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
+		if (self::$request->output_mode == -1)
+		{
+			self::$request->output_mode = 0;
+		}
 		self::$request->template = $this->as_array();
 
-		if (empty($this->name)) throw new Exception\AssertionFailed("Template  name is not set '$this->name' !");
+		if (empty($this->name))
+		{
+			throw new Exception\AssertionFailed("Template  name is not set '$this->name' !");
+		}
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = self::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template)
+		{
+			throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		}
 		$this->children = array($template);
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 
@@ -203,10 +228,13 @@ 
 			'data' => $data,
 			'DOMNodeID' => $dom_id,
 		);
-		if (self::$response)	// call is within an ajax event / form submit
+		if (self::$response)
+		{
+			// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
 			self::$response->generic('et2_load', $load_array+Framework::get_extra());
+		}
 			Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
@@ -269,7 +297,10 @@ 
 				echo $GLOBALS['egw']->framework->footer();
 			}
 			ob_flush();
-			if ($output_mode == 1)	return $form;
+			if ($output_mode == 1)
+			{
+				return $form;
+			}
 		}
 		self::$request = null;
 	}
@@ -284,7 +315,10 @@ 
 	{
 		foreach($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
+			if (!is_array($options)||empty($options))
+			{
+				continue;
+			}
 			foreach($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
@@ -325,7 +359,10 @@ 
 
 		// Set current app for validation
 		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
+		if(!$app)
+		{
+			list($app) = explode('::',self::$request->method);
+		}
 		if($app)
 		{
 			Translation::add_app($app);
@@ -356,7 +393,10 @@ 
 			'location_name'   => $template->id,
 		) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras)
 		{
-			if (!$extras) continue;
+			if (!$extras)
+			{
+				continue;
+			}
 
 			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
@@ -394,10 +434,15 @@ 
 		{
 			foreach($hook_data as $extras)
 			{
-				if (!$extras) continue;
+				if (!$extras)
+				{
+					continue;
+				}
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
-					if ($extra['data'] && is_array($extra['data'])) {
+				foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+				{
+					if ($extra['data'] && is_array($extra['data']))
+					{
 						$content = array_merge($content, $extra['data']);
 					}
 				}
@@ -436,7 +481,10 @@ 
 	 */
 	static public function process_exec()
 	{
-		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
+		if (get_magic_quotes_gpc())
+		{
+			$_POST['value'] = stripslashes($_POST['value']);
+		}
 		$content = json_decode($_POST['value'],true);
 		//error_log(__METHOD__."(".array2string($content).")");
 
@@ -599,16 +647,22 @@ 
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old))
+			{
+				$old = (array) $old;
+			}
 
 			foreach($new as $k => $v)
 			{
 				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
 					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
-					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
+					is_array($v) && count($v) == 0)
+				{
+					// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
+				}
 				else
 				{
 					$old[$k] = self::complete_array_merge($old[$k],$v);
@@ -661,10 +715,16 @@ 
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-			if (empty($dec_separator)) $dec_separator = '.';
+			if (empty($dec_separator))
+			{
+				$dec_separator = '.';
+			}
 			$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 		}
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 
 		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
 	}

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

@@ -158,7 +158,7 @@
 		// instanciate template to fill self::$request->sel_options for select-* widgets
 		// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
 		$template = self::instance($this->name, $this->template_set, $this->version, $this->laod_via);
-		if (!$template) throw new Exception\AssertionFailed("Template $this->name not instanciable! Maybe you forgot to rename template id.");
+		if (!$template) throw new Exception\AssertionFailed("template $this->name not instanciable! Maybe you forgot to rename template id.");
 		$this->children = array($template);
 		$template->run('beforeSendToClient', array('', array('cont'=>$content)));
 

Doc Comments +1 added lines, -2 removed lines

@@ -579,7 +579,7 @@ 
 	 *
 	 * @param string $name cell-name
 	 * @param string $attr attribute-name
-	 * @param mixed $val if not NULL sets attribute else returns it
+	 * @param boolean|string $val if not NULL sets attribute else returns it
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */
@@ -638,7 +638,6 @@ 
 	/**
 	 * Deep copy array to make sure there are no references
 	 *
-	 * @param Array $array
 	 * @return Array
 	 */
 	public static function deep_copy($source)

Spacing +62 added lines, -63 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @public boolean
 	 */
-	public $sitemgr=false;
+	public $sitemgr = false;
 
 	/**
 	 * Tell egw framework it's ok to call this
@@ -44,17 +44,17 @@ 
 	 * @param string $name of etemplate or array with name and other keys
 	 * @param string|array $load_via with keys of other etemplate to load in order to get $name
 	 */
-	function __construct($name='',$load_via='')
+	function __construct($name = '', $load_via = '')
 	{
 		// we do NOT call parent consturctor, as we only want to enherit it's (static) methods
-		if (false) parent::__construct ($name);	// satisfy IDE, as we dont call parent constructor
+		if (false) parent::__construct($name); // satisfy IDE, as we dont call parent constructor
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
-		if ($name) $this->read($name,$template='default','default',0,'',$load_via);
+		if ($name) $this->read($name, $template = 'default', 'default', 0, '', $load_via);
 
 		// generate new etemplate request object, if not already existing
-		if(!isset(self::$request)) self::$request = Etemplate\Request::read();
+		if (!isset(self::$request)) self::$request = Etemplate\Request::read();
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param string|array $params url or array with get-params incl. menuaction
 	 */
-	static function location($params='')
+	static function location($params = '')
 	{
 		Framework::redirect_link(is_array($params) ? '/index.php' : $params,
 			is_array($params) ? $params : '');
@@ -100,7 +100,7 @@ 
 	 * @param array $changes change made in the last call if looping, only used internaly by process_exec
 	 * @return string html for $output_mode == 1, else nothing
 	 */
-	function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
+	function exec($method, array $content, array $sel_options = null, array $readonlys = null, array $preserv = null, $output_mode = 0, $ignore_validation = '', array $changes = null)
 	{
 		$hook_data = Hooks::process(
 			array('hook_location'   => 'etemplate2_before_exec') +
@@ -109,11 +109,11 @@ 
 			$content
 		);
 
-		foreach($hook_data as $extras)
+		foreach ($hook_data as $extras)
 		{
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
 				if ($extra['data'] && is_array($extra['data']))
 				{
@@ -148,7 +148,7 @@ 
 			$output_mode = 0;
 			self::$response = Json\Response::get();
 		}
-		self::$request->output_mode = $output_mode;	// let extensions "know" they are run eg. in a popup
+		self::$request->output_mode = $output_mode; // let extensions "know" they are run eg. in a popup
 		self::$request->content = self::$cont = $content;
 		self::$request->changes = $changes;
 		self::$request->sel_options = is_array($sel_options) ? self::fix_sel_options($sel_options) : array();
@@ -172,15 +172,15 @@ 
 
 		// compile required translations translations
 		$currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
-		$langRequire = array('common' => array(), 'etemplate' => array());	// keep that order
-		foreach(Translation::$loaded_apps as $l_app => $lang)
+		$langRequire = array('common' => array(), 'etemplate' => array()); // keep that order
+		foreach (Translation::$loaded_apps as $l_app => $lang)
 		{
 			if (!in_array($l_app, array($currentapp, 'custom')))
 			{
 				$langRequire[$l_app] = array('app' => $l_app, 'lang' => $lang, 'etag' => Translation::etag($l_app, $lang));
 			}
 		}
-		foreach(array($currentapp, 'custom') as $l_app)
+		foreach (array($currentapp, 'custom') as $l_app)
 		{
 			if (isset(Translation::$loaded_apps[$l_app]))
 			{
@@ -200,7 +200,7 @@ 
 			'currentapp' => $currentapp,
 		);
 
-		if($data['content']['nm']['rows'] && is_array($data['content']['nm']['rows']))
+		if ($data['content']['nm']['rows'] && is_array($data['content']['nm']['rows']))
 		{
 			// Deep copy rows so we don't lose them when request is set to null
 			// (some content by reference)
@@ -208,7 +208,7 @@ 
 		}
 
 		// Info required to load the etemplate client-side
-		$dom_id = str_replace('.','-',$this->dom_id);
+		$dom_id = str_replace('.', '-', $this->dom_id);
 		$load_array = array(
 			'name' => $this->name,
 			'url' => self::rel2url($this->rel_path),
@@ -218,16 +218,16 @@ 
 		if (self::$response)	// call is within an ajax event / form submit
 		{
 			//error_log("Ajax " . __LINE__);
-			self::$response->generic('et2_load', $load_array+Framework::get_extra());
-			Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+			self::$response->generic('et2_load', $load_array + Framework::get_extra());
+			Framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 		}
 		else	// first call
 		{
 			// check if application of template has a app.js file --> load it
-			list($app) = explode('.',$this->name);
+			list($app) = explode('.', $this->name);
 			if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
 			{
-				Framework::includeJS('.','app',$app,true);
+				Framework::includeJS('.', 'app', $app, true);
 			}
 			// Category styles
 			Categories::css($app);
@@ -245,12 +245,12 @@ 
 				$content = '<form target="egw_iframe_autocomplete_helper" action="'.$form_action.'" id="'.$dom_id.'" class="et2_container"></form>'."\n".
 					'<iframe name="egw_iframe_autocomplete_helper" style="width:0;height:0;position: absolute;visibility:hidden;"></iframe>';
 				$GLOBALS['egw']->framework->response->generic("data", array($content));
-				$GLOBALS['egw']->framework->response->generic('et2_load',$load_array+Framework::get_extra());
-				Framework::clear_extra();	// to not send/set it twice for multiple etemplates (eg. CRM view)
+				$GLOBALS['egw']->framework->response->generic('et2_load', $load_array + Framework::get_extra());
+				Framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
 
 				// Really important to run this or weird things happen
 				// See https://help.egroupware.org/t/nextmatch-wert-im-header-ausgeben/73412/11
-				self::$request=null;
+				self::$request = null;
 				return;
 			}
 			// let framework know, if we are a popup or not ('popup' not true, which is allways used by index.php!)
@@ -268,7 +268,7 @@ 
 				echo '<div id="popupMainDiv" class="popupMainDiv">'."\n";
 			}
 			// Send any accumulated json responses - after flush to avoid sending the buffer as a response
-			if(Json\Response::isJSONResponse())
+			if (Json\Response::isJSONResponse())
 			{
 				$load_array['response'] = Json\Response::get()->returnResult();
 			}
@@ -297,10 +297,10 @@ 
 	 */
 	static protected function fix_sel_options(array $sel_options)
 	{
-		foreach($sel_options as &$options)
+		foreach ($sel_options as &$options)
 		{
-			if (!is_array($options)||empty($options)) continue;
-			foreach($options as $key => $value)
+			if (!is_array($options) || empty($options)) continue;
+			foreach ($options as $key => $value)
 			{
 				if (is_numeric($key) && (!is_array($value) || !isset($value['value'])))
 				{
@@ -339,9 +339,9 @@ 
 		$GLOBALS['egw']->session->set_action('Etemplate: '.self::$request->method);
 
 		// Set current app for validation
-		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
-		if($app)
+		list($app) = explode('.', self::$request->method);
+		if (!$app) list($app) = explode('::', self::$request->method);
+		if ($app)
 		{
 			Translation::add_app($app);
 			$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -350,7 +350,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $_content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $_content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 
 		if ($no_validation)
 		{
@@ -366,14 +366,14 @@ 
 		// tell request call to remove request, if it is not modified eg. by call to exec in callback
 		self::$request->remove_if_not_modified();
 
-		foreach(Hooks::process(array(
+		foreach (Hooks::process(array(
 			'hook_location'   => 'etemplate2_before_process',
 			'location_name'   => $template->id,
 		) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras)
 		{
 			if (!$extras) continue;
 
-			foreach(isset($extras[0]) ? $extras : array($extras) as $extra)
+			foreach (isset($extras[0]) ? $extras : array($extras) as $extra)
 			{
 				if ($extra['data'] && is_array($extra['data']))
 				{
@@ -384,9 +384,9 @@ 
 
 		//error_log(__METHOD__."(,".array2string($content).')');
 		//error_log(' validated='.array2string($validated));
-		if(is_callable(self::$request->method))
+		if (is_callable(self::$request->method))
 		{
-			call_user_func(self::$request->method,self::complete_array_merge(self::$request->preserv, $validated));
+			call_user_func(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
 		}
 		else
 		{
@@ -394,8 +394,7 @@ 
 			$content = ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
 		}
 
-		$tcontent = is_array($content) ? $content :
-			self::complete_array_merge(self::$request->preserv, $validated);
+		$tcontent = is_array($content) ? $content : self::complete_array_merge(self::$request->preserv, $validated);
 
 		$hook_data = Hooks::process(
 			array(
@@ -407,11 +406,11 @@ 
 
 		if (is_array($content))
 		{
-			foreach($hook_data as $extras)
+			foreach ($hook_data as $extras)
 			{
 				if (!$extras) continue;
 
-				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+				foreach (isset($extras[0]) ? $extras : array($extras) as $extra) {
 					if ($extra['data'] && is_array($extra['data'])) {
 						$content = array_merge($content, $extra['data']);
 					}
@@ -423,7 +422,7 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
 			self::$response->script($GLOBALS['egw_info']['flags']['java_script']);
 			//error_log($app .' added javascript to $GLOBALS[egw_info][flags][java_script] - use Json\Response->script() instead.');
 		}
@@ -452,7 +451,7 @@ 
 	static public function process_exec()
 	{
 		if (get_magic_quotes_gpc()) $_POST['value'] = stripslashes($_POST['value']);
-		$content = json_decode($_POST['value'],true);
+		$content = json_decode($_POST['value'], true);
 		//error_log(__METHOD__."(".array2string($content).")");
 
 		self::$request = Etemplate\Request::read($_POST['etemplate_exec_id']);
@@ -466,7 +465,7 @@ 
 		$expand = array(
 			'cont' => &self::$request->content,
 		);
-		$template->run('validate', array('', $expand, $content, &$validated), true);	// $respect_disabled=true: do NOT validate disabled widgets and children
+		$template->run('validate', array('', $expand, $content, &$validated), true); // $respect_disabled=true: do NOT validate disabled widgets and children
 		if (self::validation_errors(self::$request->ignore_validation))
 		{
 			error_log(__METHOD__."(,".array2string($content).') validation_errors='.array2string(self::$validation_errors));
@@ -502,7 +501,7 @@ 
 	 *
 	 * @ToDo supported customized templates stored in DB
 	 */
-	public function read($name,$template_set=null,$lang='default',$group=0,$version='',$load_via='')
+	public function read($name, $template_set = null, $lang = 'default', $group = 0, $version = '', $load_via = '')
 	{
 
 		// For mobile experience try to load custom mobile templates
@@ -511,9 +510,9 @@ 
 			$template_set = "mobile";
 		}
 
-		unset($lang); unset($group);	// not used, but in old signature
-		$this->rel_path = self::relPath($this->name=$name, $this->template_set=$template_set,
-			$this->version=$version, $this->laod_via = $load_via);
+		unset($lang); unset($group); // not used, but in old signature
+		$this->rel_path = self::relPath($this->name = $name, $this->template_set = $template_set,
+			$this->version = $version, $this->laod_via = $load_via);
 		//error_log(__METHOD__."('$name', '$template_set', '$lang', $group, '$version', '$load_via') rel_path=".array2string($this->rel_path));
 
 		$this->dom_id = $name;
@@ -568,7 +567,7 @@ 
 	 * @return mixed reference to attribute, usually NULL
 	 * @deprecated use getElementAttribute($name, $attr)
 	 */
-	public function &get_cell_attribute($name,$attr)
+	public function &get_cell_attribute($name, $attr)
 	{
 		return self::getElementAttribute($name, $attr);
 	}
@@ -582,7 +581,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use setElementAttribute($name, $attr, $val)
 	 */
-	public function &set_cell_attribute($name,$attr,$val)
+	public function &set_cell_attribute($name, $attr, $val)
 	{
 		return self::setElementAttribute($name, $attr, $val);
 	}
@@ -595,7 +594,7 @@ 
 	 * @return reference to attribute
 	 * @deprecated use disableElement($name, $disabled=true)
 	 */
-	public function disable_cells($name,$disabled=True)
+	public function disable_cells($name, $disabled = True)
 	{
 		return self::disableElement($name, $disabled);
 	}
@@ -611,23 +610,23 @@ 
 	 * @param array $new
 	 * @return array the merged array
 	 */
-	public static function complete_array_merge($old,$new)
+	public static function complete_array_merge($old, $new)
 	{
 		if (is_array($new))
 		{
-			if (!is_array($old)) $old = (array) $old;
+			if (!is_array($old)) $old = (array)$old;
 
-			foreach($new as $k => $v)
+			foreach ($new as $k => $v)
 			{
-				if (!is_array($v) || !isset($old[$k]) || 	// no array or a new array
-					isset($v[0]) && !is_array($v[0]) && isset($v[count($v)-1])	|| // or no associative array, eg. selecting multiple accounts
+				if (!is_array($v) || !isset($old[$k]) || // no array or a new array
+					isset($v[0]) && !is_array($v[0]) && isset($v[count($v) - 1]) || // or no associative array, eg. selecting multiple accounts
 					is_array($v) && count($v) == 0)			// Empty array replacing non-empty
 				{
 					$old[$k] = $v;
 				}
 				else
 				{
-					$old[$k] = self::complete_array_merge($old[$k],$v);
+					$old[$k] = self::complete_array_merge($old[$k], $v);
 				}
 			}
 		}
@@ -669,7 +668,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	public function debug(array $content=null)
+	public function debug(array $content = null)
 	{
 		$GLOBALS['egw']->framework->render(print_r($content, true));
 	}
@@ -683,11 +682,11 @@ 
 	 * @param int &$max_upload=null on return max. upload size in byte
 	 * @return string
 	 */
-	static function max_upload_size_message(&$max_upload=null)
+	static function max_upload_size_message(&$max_upload = null)
 	{
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$post_max_size = ini_get('post_max_size');
-		$max_upload = min(self::km2int($upload_max_filesize),self::km2int($post_max_size)-2800);
+		$max_upload = min(self::km2int($upload_max_filesize), self::km2int($post_max_size) - 2800);
 
 		return lang('Maximum size for uploads').': '.Vfs::hsize($max_upload).
 			" (php.ini: upload_max_filesize=$upload_max_filesize, post_max_size=$post_max_size)";
@@ -701,9 +700,9 @@ 
 	 * @param boolean $readonly =true
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$readonly=true)
+	static public function number_format($number, $num_decimal_places = 2, $readonly = true)
 	{
-		static $dec_separator=null,$thousands_separator=null;
+		static $dec_separator = null, $thousands_separator = null;
 		if (is_null($dec_separator))
 		{
 			$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
@@ -712,7 +711,7 @@ 
 		}
 		if ((string)$number === '') return '';
 
-		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
+		return number_format(str_replace(' ', '', $number), $num_decimal_places, $dec_separator, $readonly ? $thousands_separator : '');
 	}
 
 	/**
@@ -725,13 +724,13 @@ 
 	{
 		if (!is_numeric($size))
 		{
-			switch(strtolower(substr($size,-1)))
+			switch (strtolower(substr($size, -1)))
 			{
 				case 'm':
-					$size = 1024*1024*(int)$size;
+					$size = 1024 * 1024 * (int)$size;
 					break;
 				case 'k':
-					$size = 1024*(int)$size;
+					$size = 1024 * (int)$size;
 					break;
 			}
 		}

admin/inc/class.admin_egw_acl_record.inc.php

Braces +31 added lines, -15 removed lines

@@ -35,11 +35,15 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['id'];
 			$this->set_record($_identifier);
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 			//$GLOBALS['egw']->acl->read($this->identifier);
 		}
@@ -50,7 +54,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -60,7 +65,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
@@ -72,7 +78,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -81,7 +88,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -91,7 +99,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record) {
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -100,7 +109,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -110,7 +120,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'access';
 	}
 
@@ -119,7 +130,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -129,7 +141,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -140,7 +153,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -148,7 +162,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -156,7 +171,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->record);
 	}
 }

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 	static $types = array(
 		'select' => array('acl_appname'),
 		'select-account' => array('acl_account', 'acl_location'),
-		'select-bool' => array('acl_run', 'acl1', 'acl2','acl4','acl8','acl16','acl64','acl128','acl256'),
+		'select-bool' => array('acl_run', 'acl1', 'acl2', 'acl4', 'acl8', 'acl16', 'acl64', 'acl128', 'acl256'),
 	);
 
 	/**
@@ -35,8 +35,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['id'];
 			$this->set_record($_identifier);
 		} else {
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -140,15 +140,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

admin/inc/class.admin_export_acl_csv.inc.php

Braces +4 added lines, -1 removed lines

@@ -99,7 +99,10 @@
 				// Implode arrays, so they don't say 'Array'
 				foreach($record->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $record->$key = implode(',', $value);
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$record->all_acls = implode(',', $all_acls);

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition)
+	public function export($_stream, importexport_definition $_definition)
 	{
 		$options = $_definition->plugin_options;
 
@@ -36,13 +36,13 @@ 
 				'location' => 'acl_rights'
 			))
 		);
-		if($_definition->filter['acl_location'])
+		if ($_definition->filter['acl_location'])
 		{
 			$query['col_filter']['acl_location'] = $_definition->filter['acl_location'];
 		}
 
 		// ACL queries only go by one account at a time, so we collect for all
-		if($_definition->filter['acl_account'])
+		if ($_definition->filter['acl_account'])
 		{
 			$accounts = array_flip($_definition->filter['acl_account']);
 		}
@@ -54,7 +54,7 @@ 
 			);
 			$accounts = $GLOBALS['egw']->accounts->search($account_query);
 		}
-		foreach($accounts as $account_id => $account_data)
+		foreach ($accounts as $account_id => $account_data)
 		{
 			$this->get_account_acl($account_id, $options['mapping']['acl_run'], $query, $selection);
 		}
@@ -66,7 +66,7 @@ 
 		$lookups = array(
 			'acl_appname' => Select::app_options('installed')
 		);
-		if($selection['sel_options'])
+		if ($selection['sel_options'])
 		{
 			$lookups += $selection['sel_options'];
 			unset($selection['sel_options']);
@@ -79,24 +79,24 @@ 
 			$record = new admin_egw_acl_record($_record);
 			// Add in field for all ACLs
 			$all_acls = array();
-			foreach($record->get_record_array() as $key => $value)
+			foreach ($record->get_record_array() as $key => $value)
 			{
-				if(strpos($key, '_') === FALSE && !in_array($key, array('id')))
+				if (strpos($key, '_') === FALSE && !in_array($key, array('id')))
 				{
 					$all_acls[] = $value;
 				}
 			}
 
-			if($options['convert'])
+			if ($options['convert'])
 			{
 				importexport_export_csv::convert($record, admin_egw_acl_record::$types, 'admin', $lookups);
 			}
 			else
 			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value)
+				foreach ($record->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $record->$key = implode(',', $value);
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$record->all_acls = implode(',', $all_acls);
@@ -124,11 +124,11 @@ 
 		$selection = array_merge($selection, $account_acl);
 
 		$run = array();
-		if($run_rights)
+		if ($run_rights)
 		{
 			$query['filter'] = 'run';
 			admin_acl::get_rows($query, $run);
-			foreach($run as &$run_row)
+			foreach ($run as &$run_row)
 			{
 				$run_row['acl_run'] = true;
 				unset($run_row['acl_location']);

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition)
 	{
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param $definition Specific definition
 	 *
-	 * @return array (
+	 * @return boolean (
 	 * 		name 		=> string,
 	 * 		content		=> array,
 	 * 		sel_options	=> array,

admin/inc/class.admin_wizard_export_acl_csv.inc.php

Braces +2 added lines, -1 removed lines

@@ -14,7 +14,8 @@
 
 class admin_wizard_export_acl_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping

Spacing +5 added lines, -5 removed lines

@@ -28,9 +28,9 @@ 
 			'acl4'              => lang('Edit'),
 			'acl8'              => lang('Delete'),
 			'acl16'             => lang('Private'),
-			'acl64'             => lang('Custom') .' 1',
-			'acl128'            => lang('Custom') .' 2',
-			'acl256'            => lang('Custom') .' 3',
+			'acl64'             => lang('Custom').' 1',
+			'acl128'            => lang('Custom').' 2',
+			'acl256'            => lang('Custom').' 3',
 		);
 
 		// Custom fields - not possible for ACL
@@ -45,9 +45,9 @@ 
 	{
 		$result = parent::wizard_step30($content, $sel_options, $readonlys, $preserv);
 		unset($this->export_fields['all_custom_fields']);
-		foreach($content['fields'] as $field_id => $field)
+		foreach ($content['fields'] as $field_id => $field)
 		{
-			if($field['field'] == 'all_custom_fields')
+			if ($field['field'] == 'all_custom_fields')
 			{
 				unset($content['fields'][$field_id]);
 			}

api/src/Contacts/Storage.php

Doc Comments +1 added lines, -10 removed lines

@@ -625,7 +625,7 @@ 
 	 * @param array|string $criteria array of key and data cols, OR string to search over all standard search fields
 	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. comma seperated list of keys to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
@@ -833,13 +833,6 @@ 
 	 * Find contacts that appear to be duplicates
 	 *
 	 * @param Array $param
-	 * @param string $param[org_view] 'org_name', 'org_name,adr_one_location', 'org_name,org_unit' how to group
-	 * @param int $param[owner] addressbook to search
-	 * @param string $param[search] search pattern for org_name
-	 * @param string $param[searchletter] letter the org_name need to start with
-	 * @param int $param[start]
-	 * @param int $param[num_rows]
-	 * @param string $param[sort] ASC or DESC
 	 *
 	 * @return array of arrays
 	 */
@@ -932,8 +925,6 @@ 
 	 * delete / move all contacts of an addressbook
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] owner to change
-	 * @param int $data['new_owner']  new owner or 0 for delete
 	 */
 	function deleteaccount($data)
 	{

Indentation +37 added lines, -37 removed lines

@@ -44,23 +44,23 @@ 
 	var $extra_table = 'egw_addressbook_extra';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_id = 'contact_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_owner = 'contact_owner';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_key = 'contact_name';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_value = 'contact_value';
 
 	/**
@@ -71,23 +71,23 @@ 
 	var $distributionlist_view ='(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
 	var $distributionlist_tabledef = array();
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_id = 'contact_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_owner = 'list_owner';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_key = 'list_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_value = 'list_name';
 
 	/**
@@ -193,10 +193,10 @@ 
 	);
 
 	/**
-	* Special content type to indicate a deleted addressbook
-	*
-	* @var String;
-	*/
+	 * Special content type to indicate a deleted addressbook
+	 *
+	 * @var String;
+	 */
 	const DELETED_TYPE = 'D';
 
 	/**
@@ -301,7 +301,7 @@ 
 			$this->distributionlist_tabledef = array('fd' => array(
 					$this->distri_id => $tda2list['fd'][$this->distri_id],
 					$this->distri_owner => $tdlists['fd'][$this->distri_owner],
-        	    	$this->distri_key => $tdlists['fd'][$this->distri_key],
+					$this->distri_key => $tdlists['fd'][$this->distri_key],
 					$this->distri_value => $tdlists['fd'][$this->distri_value],
 				), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
 			);
@@ -502,12 +502,12 @@ 
 	}
 
 	/**
-	* deletes contact entry including custom fields
-	*
-	* @param mixed $contact array with id or just the id
-	* @param int $check_etag =null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact entry including custom fields
+	 *
+	 * @param mixed $contact array with id or just the id
+	 * @param int $check_etag =null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$check_etag=null)
 	{
 		if (is_array($contact)) $contact = $contact['id'];
@@ -543,11 +543,11 @@ 
 	}
 
 	/**
-	* saves contact data including custom fields
-	*
-	* @param array &$contact contact data from etemplate::exec
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves contact data including custom fields
+	 *
+	 * @param array &$contact contact data from etemplate::exec
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save(&$contact)
 	{
 		// save mainfields
@@ -600,7 +600,7 @@ 
 	 *
 	 * @param int|string $contact_id contact_id or 'a'.account_id
 	 * @return array|boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (empty($contact_id))
@@ -930,10 +930,10 @@ 
 	}
 
  	/**
-	 * gets all contact fields from database
-	 *
-	 * @return array of (internal) field-names
-	 */
+ 	 * gets all contact fields from database
+ 	 *
+ 	 * @return array of (internal) field-names
+ 	 */
 	function get_contact_columns()
 	{
 		$fields = $this->get_fields('all');

Spacing +145 added lines, -146 removed lines

@@ -68,7 +68,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $distributionlist_view ='(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
+	var $distributionlist_view = '(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
 	var $distributionlist_tabledef = array();
 	/**
 	* @var string
@@ -122,10 +122,10 @@ 
 	 * In SQL we can search all columns, though a view make on real sense
 	 */
 	var $sql_cols_not_to_search = array(
-		'jpegphoto','owner','tid','private','cat_id','etag',
-		'modified','modifier','creator','created','tz','account_id',
-		'uid','carddav_name','freebusy_uri','calendar_uri',
-		'geo','pubkey',
+		'jpegphoto', 'owner', 'tid', 'private', 'cat_id', 'etag',
+		'modified', 'modifier', 'creator', 'created', 'tz', 'account_id',
+		'uid', 'carddav_name', 'freebusy_uri', 'calendar_uri',
+		'geo', 'pubkey',
 	);
 	/**
 	 * columns to search, if we search for a single pattern
@@ -165,7 +165,7 @@ 
 	const FILES_DIRECTORY = '.files';
 	const FILES_PHOTO = '.files/photo.jpeg';
 	const FILES_PGP_PUBKEY = '.files/pgp-pubkey.asc';
-	const FILES_SMIME_PUBKEY =  '.files/smime-pubkey.crt';
+	const FILES_SMIME_PUBKEY = '.files/smime-pubkey.crt';
 
 	/**
 	 * Constant for bit-field "contact_files" storing what files are available
@@ -238,12 +238,12 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Api\Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Api\Db $db=null)
+	function __construct($contact_app = 'addressbook', Api\Db $db = null)
 	{
-		$this->db     = is_null($db) ? $GLOBALS['egw']->db : $db;
+		$this->db = is_null($db) ? $GLOBALS['egw']->db : $db;
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
-		$this->memberships = $GLOBALS['egw']->accounts->memberships($this->user,true);
+		$this->memberships = $GLOBALS['egw']->accounts->memberships($this->user, true);
 
 		// account backend used
 		if ($GLOBALS['egw_info']['server']['account_repository'])
@@ -256,7 +256,7 @@ 
 		}
 		$this->customfields = Api\Storage\Customfields::get('addressbook');
 		// contacts backend (contacts in LDAP require accounts in LDAP!)
-		if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+		if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
 		{
 			$this->contact_repository = 'ldap';
 			$this->somain = new Ldap();
@@ -271,11 +271,11 @@ 
 			$this->somain = new Sql($db);
 
 			// remove some columns, absolutly not necessary to search in sql
-			$this->columns_to_search = array_diff(array_values($this->somain->db_cols),$this->sql_cols_not_to_search);
+			$this->columns_to_search = array_diff(array_values($this->somain->db_cols), $this->sql_cols_not_to_search);
 		}
 		if ($this->user)
 		{
-			$this->grants = $this->get_grants($this->user,$contact_app);
+			$this->grants = $this->get_grants($this->user, $contact_app);
 		}
 		if ($this->account_repository != 'sql' && $this->contact_repository == 'sql')
 		{
@@ -292,8 +292,8 @@ 
 		}
 		if ($this->contact_repository == 'sql' || $this->contact_repository == 'sql-ldap')
 		{
-			$tda2list = $this->db->get_table_definitions('api','egw_addressbook2list');
-			$tdlists = $this->db->get_table_definitions('api','egw_addressbook_lists');
+			$tda2list = $this->db->get_table_definitions('api', 'egw_addressbook2list');
+			$tdlists = $this->db->get_table_definitions('api', 'egw_addressbook_lists');
 			$this->distributionlist_tabledef = array('fd' => array(
 					$this->distri_id => $tda2list['fd'][$this->distri_id],
 					$this->distri_owner => $tdlists['fd'][$this->distri_owner],
@@ -303,11 +303,11 @@ 
 			);
 		}
 		// ToDo: it should be the other way arround, the backend should set the grants it uses
-		$this->somain->grants =& $this->grants;
+		$this->somain->grants = & $this->grants;
 
-		if($this->somain instanceof Sql)
+		if ($this->somain instanceof Sql)
 		{
-			$this->soextra =& $this->somain;
+			$this->soextra = & $this->somain;
 		}
 		else
 		{
@@ -327,7 +327,7 @@ 
 
 		// Add in deleted type, if holding deleted contacts
 		$config = Api\Config::read('phpgwapi');
-		if($config['history'])
+		if ($config['history'])
 		{
 			$this->content_types[self::DELETED_TYPE] = array(
 				'name'	=>	lang('Deleted'),
@@ -346,18 +346,18 @@ 
 	 * @param string $contact_app ='addressbook'
 	 * @return array
 	 */
-	function get_grants($user, $contact_app='addressbook', $preferences=null)
+	function get_grants($user, $contact_app = 'addressbook', $preferences = null)
 	{
 		if (!isset($preferences)) $preferences = $GLOBALS['egw_info']['user']['preferences'];
 
 		if ($user)
 		{
 			// contacts backend (contacts in LDAP require accounts in LDAP!)
-			if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+			if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
 			{
 				// static grants from ldap: all rights for the own personal addressbook and the group ones of the meberships
 				$grants = array($user => ~0);
-				foreach($GLOBALS['egw']->accounts->memberships($user,true) as $gid)
+				foreach ($GLOBALS['egw']->accounts->memberships($user, true) as $gid)
 				{
 					$grants[$gid] = ~0;
 				}
@@ -366,22 +366,22 @@ 
 			{
 				// group grants are now grants for the group addressbook and NOT grants for all its members,
 				// therefor the param false!
-				$grants = $GLOBALS['egw']->acl->get_grants($contact_app,false,$user);
+				$grants = $GLOBALS['egw']->acl->get_grants($contact_app, false, $user);
 			}
 			// add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access,
 			// if he has not set the hide_accounts preference
 			// ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers
-			if (!in_array($preferences['common']['account_selection'], array('none','groupmembers')))
+			if (!in_array($preferences['common']['account_selection'], array('none', 'groupmembers')))
 			{
 				$grants[0] = Api\Acl::READ;
 			}
 			// add account grants for admins (only for current user!)
 			if ($user == $this->user && $this->is_admin())	// admin rights can be limited by ACL!
 			{
-				$grants[0] = Api\Acl::READ;	// admins always have read-access
-				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin')) $grants[0] |= Api\Acl::EDIT;
-				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))  $grants[0] |= Api\Acl::ADD;
-				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin')) $grants[0] |= Api\Acl::DELETE;
+				$grants[0] = Api\Acl::READ; // admins always have read-access
+				if (!$GLOBALS['egw']->acl->check('account_access', 16, 'admin')) $grants[0] |= Api\Acl::EDIT;
+				if (!$GLOBALS['egw']->acl->check('account_access', 4, 'admin'))  $grants[0] |= Api\Acl::ADD;
+				if (!$GLOBALS['egw']->acl->check('account_access', 32, 'admin')) $grants[0] |= Api\Acl::DELETE;
 			}
 			// allow certain groups to edit contact-data of accounts
 			if (self::allow_account_edit($user))
@@ -405,11 +405,11 @@ 
 	 * @param array $contact =null for future use, where admins might not be admins for all accounts
 	 * @return boolean
 	 */
-	function is_admin($contact=null)
+	function is_admin($contact = null)
 	{
-		unset($contact);	// not (yet) used
+		unset($contact); // not (yet) used
 
-		return isset($GLOBALS['egw_info']['user']['apps']['admin']) && !$GLOBALS['egw']->acl->check('account_access',16,'admin');
+		return isset($GLOBALS['egw_info']['user']['apps']['admin']) && !$GLOBALS['egw']->acl->check('account_access', 16, 'admin');
 	}
 
 	/**
@@ -418,7 +418,7 @@ 
 	 * @param int $user =null default $this->user
 	 * @return boolean
 	 */
-	function allow_account_edit($user=null)
+	function allow_account_edit($user = null)
 	{
 		return $GLOBALS['egw_info']['server']['allow_account_edit'] &&
 			array_intersect($GLOBALS['egw_info']['server']['allow_account_edit'],
@@ -432,9 +432,9 @@ 
 	 * @param array $field_names =null custom fields to read, default all
 	 * @return array id => name => value
 	 */
-	function read_customfields($ids,$field_names=null)
+	function read_customfields($ids, $field_names = null)
 	{
-		return $this->soextra->read_customfields($ids,$field_names);
+		return $this->soextra->read_customfields($ids, $field_names);
 	}
 
 	/**
@@ -443,26 +443,26 @@ 
 	 * @param int|array $ids
 	 * @return array id => name => value
 	 */
-	function read_distributionlist($ids, $dl_allowed=array())
+	function read_distributionlist($ids, $dl_allowed = array())
 	{
 		if ($this->contact_repository == 'ldap')
 		{
-			return array();	// ldap does not support distributionlists
+			return array(); // ldap does not support distributionlists
 		}
-		foreach($ids as $key => $id)
+		foreach ($ids as $key => $id)
 		{
 			if (!is_numeric($id)) unset($ids[$key]);
 		}
-		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
+		if (!$ids) return array(); // nothing to do, eg. all these contacts are in ldap
 		$fields = array();
-		$filter[$this->distri_id]=$ids;
-		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
-		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
+		$filter[$this->distri_id] = $ids;
+		if (count($dl_allowed)) $filter[$this->distri_key] = $dl_allowed;
+		$distri_view = str_replace(') d_view', ' and '.$this->distri_id.' in ('.implode(',', $ids).')) d_view', $this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
-		foreach($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
+		foreach ($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
 			false, 'ORDER BY '.$this->distri_id, false, 0, '', $this->distributionlist_tabledef) as $row)
 		{
-			if ((isset($row[$this->distri_id])&&strlen($row[$this->distri_value])>0))
+			if ((isset($row[$this->distri_id]) && strlen($row[$this->distri_value]) > 0))
 			{
 				$fields[$row[$this->distri_id]][$row[$this->distri_key]] = $row[$this->distri_value].' ('.
 					Api\Accounts::username($row[$this->distri_owner]).')';
@@ -504,7 +504,7 @@ 
 	* @param int $check_etag =null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$check_etag=null)
+	function delete($contact, $check_etag = null)
 	{
 		if (is_array($contact)) $contact = $contact['id'];
 
@@ -515,7 +515,7 @@ 
 		if ($this->somain->delete($where))
 		{
 			// delete customfields, can return 0 if there are no customfields
-			if(!($this->somain instanceof Sql))
+			if (!($this->somain instanceof Sql))
 			{
 				$this->soextra->delete_customfields(array($this->extra_id => $contact));
 			}
@@ -535,7 +535,7 @@ 
 			}
 			return true;
 		}
-		return $check_etag ? 0 : false;		// if etag given, we return 0 on failure, thought it could also mean the whole contact does not exist
+		return $check_etag ? 0 : false; // if etag given, we return 0 on failure, thought it could also mean the whole contact does not exist
 	}
 
 	/**
@@ -586,9 +586,9 @@ 
 				}
 			}
 		}
-		if($error_nr) return $error_nr;
+		if ($error_nr) return $error_nr;
 
-		return false;	// no error
+		return false; // no error
 	}
 
 	/**
@@ -601,20 +601,20 @@ 
 	{
 		if (empty($contact_id))
 		{
-			return false;	// no need to pass to backend, will fail anyway
+			return false; // no need to pass to backend, will fail anyway
 		}
-		if (!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
+		if (!is_array($contact_id) && substr($contact_id, 0, 8) == 'account:')
 		{
-			$contact_id = array('account_id' => (int) substr($contact_id,8));
+			$contact_id = array('account_id' => (int)substr($contact_id, 8));
 		}
 		// read main data
-		$backend =& $this->get_backend($contact_id);
+		$backend = & $this->get_backend($contact_id);
 		if (!($contact = $backend->read($contact_id)))
 		{
 			return $contact;
 		}
-		$dl_list=$this->read_distributionlist(array($contact['id']));
-		if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		$dl_list = $this->read_distributionlist(array($contact['id']));
+		if (count($dl_list)) $contact['distrib_lists'] = implode("\n", $dl_list[$contact['id']]);
 		return $this->db2data($contact);
 	}
 
@@ -637,18 +637,18 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='', $ignore_acl=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $ignore_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',".array2string($start).','.array2string($filter,true).",'$join')");
 
 		// Handle 'None' country option
-		if(is_array($filter) && $filter['adr_one_countrycode'] == '-custom-')
+		if (is_array($filter) && $filter['adr_one_countrycode'] == '-custom-')
 		{
 			$filter[] = 'adr_one_countrycode IS NULL';
 			unset($filter['adr_one_countrycode']);
 		}
 		// Hide deleted items unless type is specifically deleted
-		if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
+		if (!is_array($filter)) $filter = $filter ? (array)$filter : array();
 
 		if (isset($filter['cols_to_search']))
 		{
@@ -657,22 +657,22 @@ 
 		}
 
 		// if no tid set or tid==='' do NOT return deleted entries ($tid === null returns all entries incl. deleted)
-		if(!array_key_exists('tid', $filter) || $filter['tid'] === '')
+		if (!array_key_exists('tid', $filter) || $filter['tid'] === '')
 		{
-			if ($join && strpos($join,'RIGHT JOIN') !== false)	// used eg. to search for groups
+			if ($join && strpos($join, 'RIGHT JOIN') !== false)	// used eg. to search for groups
 			{
-				$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
+				$filter[] = '(contact_tid != \''.self::DELETED_TYPE.'\' OR contact_tid IS NULL)';
 			}
 			else
 			{
-				$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
+				$filter[] = 'contact_tid != \''.self::DELETED_TYPE.'\'';
 			}
 		}
-		elseif(is_null($filter['tid']))
+		elseif (is_null($filter['tid']))
 		{
-			unset($filter['tid']);	// return all entries incl. deleted
+			unset($filter['tid']); // return all entries incl. deleted
 		}
-		$backend = $this->get_backend(null,$filter['owner']);
+		$backend = $this->get_backend(null, $filter['owner']);
 		// single string to search for --> create so_sql conformant search criterial for the standard search columns
 		if ($criteria && !is_array($criteria))
 		{
@@ -693,34 +693,34 @@ 
 			{
 				$cols = $this->account_cols_to_search;
 			}
-			if($backend instanceof Sql)
+			if ($backend instanceof Sql)
 			{
 				// Keep a string, let the parent handle it
 				$criteria = $search;
 
-				foreach($cols as $key => &$col)
+				foreach ($cols as $key => &$col)
 				{
-					if($col != Sql::EXTRA_VALUE &&
+					if ($col != Sql::EXTRA_VALUE &&
 						$col != Sql::EXTRA_TABLE.'.'.Sql::EXTRA_VALUE &&
 						!array_key_exists($col, $backend->db_cols))
 					{
-						if(!($col = array_search($col, $backend->db_cols)))
+						if (!($col = array_search($col, $backend->db_cols)))
 						{
 							// Can't search this column, it will error if we try
 							unset($cols[$key]);
 						}
 					}
-					if ($col=='contact_id') $col='egw_addressbook.contact_id';
+					if ($col == 'contact_id') $col = 'egw_addressbook.contact_id';
 				}
 
 				$backend->columns_to_search = $cols;
 			}
 			else
 			{
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					// remove from LDAP backend not understood use-AND-syntax
-					$criteria[$col] = str_replace(' +',' ',$search);
+					$criteria[$col] = str_replace(' +', ' ', $search);
 				}
 			}
 		}
@@ -744,7 +744,7 @@ 
 
 		if ($rows)
 		{
-			foreach($rows as $n => $row)
+			foreach ($rows as $n => $row)
 			{
 				$rows[$n] = $this->db2data($row);
 			}
@@ -767,7 +767,7 @@ 
 	 */
 	function organisations($param)
 	{
-		if (!method_exists($this->somain,'organisations'))
+		if (!method_exists($this->somain, 'organisations'))
 		{
 			$this->total = 0;
 			return false;
@@ -776,16 +776,16 @@ 
 		{
 			$search = $param['search'];
 			$param['search'] = array();
-			if($this->somain instanceof Sql)
+			if ($this->somain instanceof Sql)
 			{
 				// Keep the string, let the parent deal with it
 				$param['search'] = $search;
 			}
 			else
 			{
-				foreach($this->columns_to_search as $col)
+				foreach ($this->columns_to_search as $col)
 				{
-					if ($col != 'contact_value') $param['search'][$col] = $search;	// we dont search the customfields
+					if ($col != 'contact_value') $param['search'][$col] = $search; // we dont search the customfields
 				}
 			}
 		}
@@ -793,13 +793,13 @@ 
 		{
 			$param['search'] = $this->data2db($param['search']);
 		}
-		if(!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
+		if (!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
 		{
-			$param['col_filter'][] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
+			$param['col_filter'][] = 'contact_tid != \''.self::DELETED_TYPE.'\'';
 		}
-		elseif(is_null($param['col_filter']['tid']))
+		elseif (is_null($param['col_filter']['tid']))
 		{
-			unset($param['col_filter']['tid']);	// return all entries incl. deleted
+			unset($param['col_filter']['tid']); // return all entries incl. deleted
 		}
 
 		$rows = $this->somain->organisations($param);
@@ -807,11 +807,11 @@ 
 
 		if (!$rows) return array();
 
-		foreach($rows as $n => $row)
+		foreach ($rows as $n => $row)
 		{
-			if (strpos($row['org_name'],'&')!==false) $row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			if (strpos($row['org_name'], '&') !== false) $row['org_name'] = str_replace('&', '*AND*', $row['org_name']);
 			$rows[$n]['id'] = 'org_name:'.$row['org_name'];
-			foreach(array(
+			foreach (array(
 				'org_unit' => lang('departments'),
 				'adr_one_locality' => lang('locations'),
 			) as $by => $by_label)
@@ -822,7 +822,7 @@ 
 				}
 				else
 				{
-					if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+					if (strpos($row[$by], '&') !== false) $row[$by] = str_replace('&', '*AND*', $row[$by]);
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
 			}
@@ -846,7 +846,7 @@ 
 	 */
 	public function duplicates($param)
 	{
-		if (!method_exists($this->somain,'duplicates'))
+		if (!method_exists($this->somain, 'duplicates'))
 		{
 			$this->total = 0;
 			return false;
@@ -855,14 +855,14 @@ 
 		{
 			$search = $param['search'];
 			$param['search'] = array();
-			if($this->somain instanceof Sql)
+			if ($this->somain instanceof Sql)
 			{
 				// Keep the string, let the parent deal with it
 				$param['search'] = $search;
 			}
 			else
 			{
-				foreach($this->columns_to_search as $col)
+				foreach ($this->columns_to_search as $col)
 				{
 					// we don't search the customfields
 					if ($col != 'contact_value') $param['search'][$col] = $search;
@@ -873,21 +873,21 @@ 
 		{
 			$param['search'] = $this->data2db($param['search']);
 		}
-		if(!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
+		if (!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
 		{
-			$param['col_filter'][] = $this->somain->table_name.'.contact_tid != \'' . self::DELETED_TYPE . '\'';
+			$param['col_filter'][] = $this->somain->table_name.'.contact_tid != \''.self::DELETED_TYPE.'\'';
 		}
-		elseif(is_null($param['col_filter']['tid']))
+		elseif (is_null($param['col_filter']['tid']))
 		{
 			// return all entries including deleted
 			unset($param['col_filter']['tid']);
 		}
-		if(array_key_exists('filter', $param) && $param['filter'] != '')
+		if (array_key_exists('filter', $param) && $param['filter'] != '')
 		{
 			$param['owner'] = $param['filter'];
 			unset($param['filter']);
 		}
-		if(array_key_exists('owner', $param['col_filter']) && $param['col_filter']['owner'] != '')
+		if (array_key_exists('owner', $param['col_filter']) && $param['col_filter']['owner'] != '')
 		{
 			$param['owner'] = $param['col_filter']['owner'];
 			unset($param['col_filter']['owner']);
@@ -899,13 +899,13 @@ 
 
 		if (!$rows) return array();
 
-		foreach($rows as $n => $row)
+		foreach ($rows as $n => $row)
 		{
 			$rows[$n]['id'] = 'duplicate:';
-			foreach(array_keys(static::$duplicate_fields) as $by)
+			foreach (array_keys(static::$duplicate_fields) as $by)
 			{
-				if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
-				if($row[$by])
+				if (strpos($row[$by], '&') !== false) $row[$by] = str_replace('&', '*AND*', $row[$by]);
+				if ($row[$by])
 				{
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
@@ -939,11 +939,11 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
-			$this->somain->delete(array('owner' => $account_id));	// so_sql_cf::delete() takes care of cfs too
+			$this->somain->delete(array('owner' => $account_id)); // so_sql_cf::delete() takes care of cfs too
 
 			if (method_exists($this->somain, 'get_lists') &&
 				($lists = $this->somain->get_lists($account_id)))
@@ -953,7 +953,7 @@ 
 		}
 		else
 		{
-			$this->somain->change_owner($account_id,$new_owner);
+			$this->somain->change_owner($account_id, $new_owner);
 		}
 	}
 
@@ -964,16 +964,15 @@ 
 	 * @param int $owner =null account_id of owner or 0 for accounts
 	 * @return Sql|Ldap|Ads|Univention
 	 */
-	function get_backend($keys=null,$owner=null)
+	function get_backend($keys = null, $owner = null)
 	{
 		if ($owner === '') $owner = null;
 
-		$contact_id = !is_array($keys) ? $keys :
-			(isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
+		$contact_id = !is_array($keys) ? $keys : (isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
 
 		if ($this->contact_repository != $this->account_repository && is_object($this->so_accounts) &&
 			(!is_null($owner) && !$owner || is_array($keys) && $keys['account_id'] || !is_null($contact_id) &&
-			($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id) )||
+			($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id)) ||
 			 $this->contact_repository == 'ldap' && is_numeric($contact_id))))
 		{
 			return $this->so_accounts;
@@ -989,20 +988,20 @@ 
 	 * @param int $owner =null account_id of owner or 0 for accounts
 	 * @return array with eGW contact field names
 	 */
-	function get_fields($type='all',$contact_id=null,$owner=null)
+	function get_fields($type = 'all', $contact_id = null, $owner = null)
 	{
-		$def = $this->db->get_table_definitions('api','egw_addressbook');
+		$def = $this->db->get_table_definitions('api', 'egw_addressbook');
 
 		$all_fields = array();
-		foreach(array_keys($def['fd']) as $field)
+		foreach (array_keys($def['fd']) as $field)
 		{
-			$all_fields[] = substr($field,0,8) == 'contact_' ? substr($field,8) : $field;
+			$all_fields[] = substr($field, 0, 8) == 'contact_' ? substr($field, 8) : $field;
 		}
 		if ($type == 'all')
 		{
 			return $all_fields;
 		}
-		$backend = $this->get_backend($contact_id,$owner);
+		$backend = $this->get_backend($contact_id, $owner);
 
 		$supported_fields = method_exists($backend, 'supported_fields') ? $backend->supported_fields() : $all_fields;
 
@@ -1010,7 +1009,7 @@ 
 		{
 			return $supported_fields;
 		}
-		return array_diff($all_fields,$supported_fields);
+		return array_diff($all_fields, $supported_fields);
 	}
 
 	/**
@@ -1026,7 +1025,7 @@ 
 	function migrate2ldap($type)
 	{
 		//error_log(__METHOD__."(".array2string($type).")");
-		$sql_contacts  = new Sql();
+		$sql_contacts = new Sql();
 		if ($type == 'accounts-back-ads')
 		{
 			$ldap_contacts = new Ads();
@@ -1049,10 +1048,10 @@ 
 			$filter = count($do) == 2 ? null :
 				array($do[0] == 'contacts' ? 'contact_owner != 0' : 'contact_owner = 0');
 
-			while (($contacts = $sql_contacts->search(false,false,'n_family,n_given','','',false,'AND',
-				array($start,$num),$filter)))
+			while (($contacts = $sql_contacts->search(false, false, 'n_family,n_given', '', '', false, 'AND',
+				array($start, $num), $filter)))
 			{
-				foreach($contacts as $contact)
+				foreach ($contacts as $contact)
 				{
 					if ($contact['account_id']) $contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
 
@@ -1073,12 +1072,12 @@ 
 			}
 		}
 		// direction LDAP --> SQL: either "sql" (contacts and accounts) or "accounts-back" (only accounts)
-		if (($do = array_intersect(array('accounts-back','sql'), $type)))
+		if (($do = array_intersect(array('accounts-back', 'sql'), $type)))
 		{
 			//error_log(__METHOD__."(".array2string($type).") do=".array2string($type));
 			$filter = in_array('sql', $do) ? null : array('owner' => 0);
 
-			foreach($ldap_contacts->search(false,false,'n_family,n_given','','',false,'AND',
+			foreach ($ldap_contacts->search(false, false, 'n_family,n_given', '', '', false, 'AND',
 				false, $filter) as $contact)
 			{
 				//error_log(__METHOD__."(".array2string($type).") do=".array2string($type)." migrating ".array2string($contact));
@@ -1087,7 +1086,7 @@ 
 					$contact = $ldap_contacts->read($contact['id']);
 				}
 				$old_contact_id = $contact['id'];
-				unset($contact['id']);	// ldap uid/account_lid
+				unset($contact['id']); // ldap uid/account_lid
 				if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
 				{
 					$contact['id'] = $old['id'];
@@ -1099,24 +1098,24 @@ 
 				{
 					echo '<p style="margin: 0px;">'.$n.': '.$contact['n_fn'].
 						($contact['org_name'] ? ' ('.$contact['org_name'].')' : '')." --> SQL (".
-						($contact['owner']?lang('User'):lang('Contact')).")<br>\n";
+						($contact['owner'] ?lang('User') : lang('Contact')).")<br>\n";
 
 					$new_contact_id = $sql_contacts->data['id'];
-					echo "&nbsp;&nbsp;&nbsp;&nbsp;" . $old_contact_id . " --> " . $new_contact_id . " / ";
+					echo "&nbsp;&nbsp;&nbsp;&nbsp;".$old_contact_id." --> ".$new_contact_id." / ";
 
-					$this->db->update('egw_links',array(
+					$this->db->update('egw_links', array(
 						'link_id1' => $new_contact_id,
-					),array(
+					), array(
 						'link_app1' => 'addressbook',
 						'link_id1' => $old_contact_id
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
-					$this->db->update('egw_links',array(
+					$this->db->update('egw_links', array(
 						'link_id2' => $new_contact_id,
-					),array(
+					), array(
 						'link_app2' => 'addressbook',
 						'link_id2' => $old_contact_id
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 					echo "</p>\n";
 				}
 				else
@@ -1136,25 +1135,25 @@ 
 	 * @param string $extra_labels =null first labels if given (already translated)
 	 * @return array with id => label pairs or false if backend does not support lists
 	 */
-	function get_lists($required=Api\Acl::READ,$extra_labels=null)
+	function get_lists($required = Api\Acl::READ, $extra_labels = null)
 	{
 		$lists = is_array($extra_labels) ? $extra_labels : array();
 
-		if (method_exists($this->somain,'get_lists'))
+		if (method_exists($this->somain, 'get_lists'))
 		{
 			$uids = array();
-			foreach($this->grants as $uid => $rights)
+			foreach ($this->grants as $uid => $rights)
 			{
 				// only requests groups / list in accounts addressbook for read
 				if (!$uid && $required != Api\Acl::READ) continue;
 
-				if (($rights & $required) == $required)
+				if (($rights&$required) == $required)
 				{
 					$uids[] = $uid;
 				}
 			}
 
-			foreach($this->somain->get_lists($uids) as $list_id => $data)
+			foreach ($this->somain->get_lists($uids) as $list_id => $data)
 			{
 				$lists[$list_id] = $data['list_name'];
 				if ($data['list_owner'] != $this->user)
@@ -1169,7 +1168,7 @@ 
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== '1' &&
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_groups_as_lists'] == '0')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups'
 			)) as $account_id => $group)
 			{
@@ -1188,12 +1187,12 @@ 
 	 * @param boolean $limit_in_ab =false if true only return members from the same owners addressbook
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function read_lists($keys,$member_attr=null,$limit_in_ab=false)
+	function read_lists($keys, $member_attr = null, $limit_in_ab = false)
 	{
 		$backend = (string)$limit_in_ab === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
 		if (!method_exists($backend, 'get_lists')) return false;
 
-		return $backend->get_lists($keys,null,$member_attr,$limit_in_ab);
+		return $backend->get_lists($keys, null, $member_attr, $limit_in_ab);
 	}
 
 	/**
@@ -1205,12 +1204,12 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		$backend = (string)$owner === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
 		if (!method_exists($backend, 'add_list')) return false;
 
-		return $backend->add_list($keys,$owner,$contacts,$data);
+		return $backend->add_list($keys, $owner, $contacts, $data);
 	}
 
 	/**
@@ -1221,11 +1220,11 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
-		if (!method_exists($this->somain,'add2list')) return false;
+		if (!method_exists($this->somain, 'add2list')) return false;
 
-		return $this->somain->add2list($contact,$list,$existing);
+		return $this->somain->add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -1235,11 +1234,11 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if (!method_exists($this->somain,'remove_from_list')) return false;
+		if (!method_exists($this->somain, 'remove_from_list')) return false;
 
-		return $this->somain->remove_from_list($contact,$list);
+		return $this->somain->remove_from_list($contact, $list);
 	}
 
 	/**
@@ -1250,7 +1249,7 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!method_exists($this->somain,'delete_list')) return false;
+		if (!method_exists($this->somain, 'delete_list')) return false;
 
 		return $this->somain->delete_list($list);
 	}
@@ -1263,7 +1262,7 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!method_exists($this->somain,'read_list')) return false;
+		if (!method_exists($this->somain, 'read_list')) return false;
 
 		return $this->somain->read_list($list);
 	}
@@ -1274,11 +1273,11 @@ 
 	 * @param int|string $owner ='' addressbook (eg. 0 = accounts), default '' = "all" addressbook (uses the main backend)
 	 * @return boolean
 	 */
-	function lists_available($owner='')
+	function lists_available($owner = '')
 	{
-		$backend =& $this->get_backend(null,$owner);
+		$backend = & $this->get_backend(null, $owner);
 
-		return method_exists($backend,'read_list');
+		return method_exists($backend, 'read_list');
 	}
 
 	/**
@@ -1287,9 +1286,9 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
-		if (!method_exists($this->somain,'lists_ctag')) return 0;
+		if (!method_exists($this->somain, 'lists_ctag')) return 0;
 
 		return $this->somain->lists_ctag($owner);
 	}

Braces +140 added lines, -35 removed lines

@@ -348,7 +348,10 @@ 
 	 */
 	function get_grants($user, $contact_app='addressbook', $preferences=null)
 	{
-		if (!isset($preferences)) $preferences = $GLOBALS['egw_info']['user']['preferences'];
+		if (!isset($preferences))
+		{
+			$preferences = $GLOBALS['egw_info']['user']['preferences'];
+		}
 
 		if ($user)
 		{
@@ -376,12 +379,25 @@ 
 				$grants[0] = Api\Acl::READ;
 			}
 			// add account grants for admins (only for current user!)
-			if ($user == $this->user && $this->is_admin())	// admin rights can be limited by ACL!
+			if ($user == $this->user && $this->is_admin())
+			{
+				// admin rights can be limited by ACL!
 			{
-				$grants[0] = Api\Acl::READ;	// admins always have read-access
-				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin')) $grants[0] |= Api\Acl::EDIT;
-				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))  $grants[0] |= Api\Acl::ADD;
-				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin')) $grants[0] |= Api\Acl::DELETE;
+				$grants[0] = Api\Acl::READ;
+			}
+			// admins always have read-access
+				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin'))
+				{
+					$grants[0] |= Api\Acl::EDIT;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))
+				{
+					$grants[0] |= Api\Acl::ADD;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin'))
+				{
+					$grants[0] |= Api\Acl::DELETE;
+				}
 			}
 			// allow certain groups to edit contact-data of accounts
 			if (self::allow_account_edit($user))
@@ -451,12 +467,22 @@ 
 		}
 		foreach($ids as $key => $id)
 		{
-			if (!is_numeric($id)) unset($ids[$key]);
+			if (!is_numeric($id))
+			{
+				unset($ids[$key]);
+			}
+		}
+		if (!$ids)
+		{
+			return array();
 		}
-		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
+		// nothing to do, eg. all these contacts are in ldap
 		$fields = array();
 		$filter[$this->distri_id]=$ids;
-		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
+		if (count($dl_allowed))
+		{
+			$filter[$this->distri_key]=$dl_allowed;
+		}
 		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
 		foreach($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
@@ -506,10 +532,16 @@ 
 	*/
 	function delete($contact,$check_etag=null)
 	{
-		if (is_array($contact)) $contact = $contact['id'];
+		if (is_array($contact))
+		{
+			$contact = $contact['id'];
+		}
 
 		$where = array('id' => $contact);
-		if ($check_etag) $where['etag'] = $check_etag;
+		if ($check_etag)
+		{
+			$where['etag'] = $check_etag;
+		}
 
 		// delete mainfields
 		if ($this->somain->delete($where))
@@ -586,7 +618,10 @@ 
 				}
 			}
 		}
-		if($error_nr) return $error_nr;
+		if($error_nr)
+		{
+			return $error_nr;
+		}
 
 		return false;	// no error
 	}
@@ -614,7 +649,10 @@ 
 			return $contact;
 		}
 		$dl_list=$this->read_distributionlist(array($contact['id']));
-		if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		if (count($dl_list))
+		{
+			$contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		}
 		return $this->db2data($contact);
 	}
 
@@ -648,7 +686,10 @@ 
 			unset($filter['adr_one_countrycode']);
 		}
 		// Hide deleted items unless type is specifically deleted
-		if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
+		if(!is_array($filter))
+		{
+			$filter = $filter ? (array) $filter : array();
+		}
 
 		if (isset($filter['cols_to_search']))
 		{
@@ -659,10 +700,13 @@ 
 		// if no tid set or tid==='' do NOT return deleted entries ($tid === null returns all entries incl. deleted)
 		if(!array_key_exists('tid', $filter) || $filter['tid'] === '')
 		{
-			if ($join && strpos($join,'RIGHT JOIN') !== false)	// used eg. to search for groups
+			if ($join && strpos($join,'RIGHT JOIN') !== false)
+			{
+				// used eg. to search for groups
 			{
 				$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
 			}
+			}
 			else
 			{
 				$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
@@ -710,7 +754,10 @@ 
 							unset($cols[$key]);
 						}
 					}
-					if ($col=='contact_id') $col='egw_addressbook.contact_id';
+					if ($col=='contact_id')
+					{
+						$col='egw_addressbook.contact_id';
+					}
 				}
 
 				$backend->columns_to_search = $cols;
@@ -785,7 +832,11 @@ 
 			{
 				foreach($this->columns_to_search as $col)
 				{
-					if ($col != 'contact_value') $param['search'][$col] = $search;	// we dont search the customfields
+					if ($col != 'contact_value')
+					{
+						$param['search'][$col] = $search;
+					}
+					// we dont search the customfields
 				}
 			}
 		}
@@ -805,11 +856,17 @@ 
 		$rows = $this->somain->organisations($param);
 		$this->total = $this->somain->total;
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as $n => $row)
 		{
-			if (strpos($row['org_name'],'&')!==false) $row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			if (strpos($row['org_name'],'&')!==false)
+			{
+				$row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			}
 			$rows[$n]['id'] = 'org_name:'.$row['org_name'];
 			foreach(array(
 				'org_unit' => lang('departments'),
@@ -822,7 +879,10 @@ 
 				}
 				else
 				{
-					if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+					if (strpos($row[$by],'&')!==false)
+					{
+						$row[$by] = str_replace('&','*AND*',$row[$by]);
+					}
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
 			}
@@ -865,7 +925,10 @@ 
 				foreach($this->columns_to_search as $col)
 				{
 					// we don't search the customfields
-					if ($col != 'contact_value') $param['search'][$col] = $search;
+					if ($col != 'contact_value')
+					{
+						$param['search'][$col] = $search;
+					}
 				}
 			}
 		}
@@ -897,14 +960,20 @@ 
 		$rows = $this->somain->duplicates($param);
 		$this->total = $this->somain->total;
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as $n => $row)
 		{
 			$rows[$n]['id'] = 'duplicate:';
 			foreach(array_keys(static::$duplicate_fields) as $by)
 			{
-				if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+				if (strpos($row[$by],'&')!==false)
+				{
+					$row[$by] = str_replace('&','*AND*',$row[$by]);
+				}
 				if($row[$by])
 				{
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
@@ -966,7 +1035,10 @@ 
 	 */
 	function get_backend($keys=null,$owner=null)
 	{
-		if ($owner === '') $owner = null;
+		if ($owner === '')
+		{
+			$owner = null;
+		}
 
 		$contact_id = !is_array($keys) ? $keys :
 			(isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
@@ -1038,7 +1110,10 @@ 
 			$ldap_contacts = new Ldap(null, $ds);
 		}
 
-		if (!is_array($type)) $type = explode(',', $type);
+		if (!is_array($type))
+		{
+			$type = explode(',', $type);
+		}
 
 		$start = $n = 0;
 		$num = 100;
@@ -1054,7 +1129,10 @@ 
 			{
 				foreach($contacts as $contact)
 				{
-					if ($contact['account_id']) $contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					if ($contact['account_id'])
+					{
+						$contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					}
 
 					$ldap_contacts->data = $contact;
 					$n++;
@@ -1082,10 +1160,13 @@ 
 				false, $filter) as $contact)
 			{
 				//error_log(__METHOD__."(".array2string($type).") do=".array2string($type)." migrating ".array2string($contact));
-				if ($contact['jpegphoto'])	// photo is NOT read by LDAP backend on search, need to do an extra read
+				if ($contact['jpegphoto'])
+				{
+					// photo is NOT read by LDAP backend on search, need to do an extra read
 				{
 					$contact = $ldap_contacts->read($contact['id']);
 				}
+				}
 				$old_contact_id = $contact['id'];
 				unset($contact['id']);	// ldap uid/account_lid
 				if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
@@ -1146,7 +1227,10 @@ 
 			foreach($this->grants as $uid => $rights)
 			{
 				// only requests groups / list in accounts addressbook for read
-				if (!$uid && $required != Api\Acl::READ) continue;
+				if (!$uid && $required != Api\Acl::READ)
+				{
+					continue;
+				}
 
 				if (($rights & $required) == $required)
 				{
@@ -1191,7 +1275,10 @@ 
 	function read_lists($keys,$member_attr=null,$limit_in_ab=false)
 	{
 		$backend = (string)$limit_in_ab === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'get_lists')) return false;
+		if (!method_exists($backend, 'get_lists'))
+		{
+			return false;
+		}
 
 		return $backend->get_lists($keys,null,$member_attr,$limit_in_ab);
 	}
@@ -1208,7 +1295,10 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		$backend = (string)$owner === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'add_list')) return false;
+		if (!method_exists($backend, 'add_list'))
+		{
+			return false;
+		}
 
 		return $backend->add_list($keys,$owner,$contacts,$data);
 	}
@@ -1223,7 +1313,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!method_exists($this->somain,'add2list')) return false;
+		if (!method_exists($this->somain,'add2list'))
+		{
+			return false;
+		}
 
 		return $this->somain->add2list($contact,$list,$existing);
 	}
@@ -1237,7 +1330,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!method_exists($this->somain,'remove_from_list')) return false;
+		if (!method_exists($this->somain,'remove_from_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->remove_from_list($contact,$list);
 	}
@@ -1250,7 +1346,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!method_exists($this->somain,'delete_list')) return false;
+		if (!method_exists($this->somain,'delete_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->delete_list($list);
 	}
@@ -1263,7 +1362,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!method_exists($this->somain,'read_list')) return false;
+		if (!method_exists($this->somain,'read_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->read_list($list);
 	}
@@ -1289,7 +1391,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (!method_exists($this->somain,'lists_ctag')) return 0;
+		if (!method_exists($this->somain,'lists_ctag'))
+		{
+			return 0;
+		}
 
 		return $this->somain->lists_ctag($owner);
 	}

addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php

Braces +18 added lines, -8 removed lines

@@ -46,11 +46,13 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if(count($cat_list) > 0)
+		{
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach($bocontacts->customfields as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
@@ -75,7 +77,8 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if($content['field_mapping'][0] == lang('Categories'))
+		{
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
@@ -86,7 +89,10 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -108,13 +114,16 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options'])
+			{
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
@@ -124,7 +133,8 @@ 
 			{
 				$sel_options['contact_owner'][$content['contact_owner']] = lang("'%1' is not allowed ('%2')!", $content['contact_owner'], implode(',',array_keys($sel_options['contact_owner'])));
 			}
-			if(!in_array('owner', $content['field_mapping'])) {
+			if(!in_array('owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}
 

Spacing +18 added lines, -18 removed lines

@@ -31,11 +31,11 @@ 
 		$bocontacts = new Api\Contacts();
 		$this->mapping_fields = $bocontacts->contact_fields;
 
-		$categories = new Api\Categories('','addressbook');
+		$categories = new Api\Categories('', 'addressbook');
 		$cat_list = array();
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true,0,true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true, 0, true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if (Api\Categories::is_global($cat))
 			{
@@ -46,14 +46,14 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if (count($cat_list) > 0) {
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach ($bocontacts->customfields as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
-		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
+		unset($this->mapping_fields['jpegphoto']); // can't cvs import that
 
 		// Add in special handled fields
 		$this->mapping_fields[lang('Special')] = addressbook_import_contacts_csv::$special_fields;
@@ -75,18 +75,18 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if ($content['field_mapping'][0] == lang('Categories')) {
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" . lang('Contact ID cannot be changed by import');
+		$content['msg'] .= "\n*".lang('Contact ID cannot be changed by import');
 
 		return $result;
 	}
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if ($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -94,13 +94,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -108,23 +108,23 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if (!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
 			$bocontacts = new Api\Contacts();
 			$sel_options['contact_owner'] = array('personal' => lang("Importer's personal")) + $bocontacts->get_addressbooks(Acl::ADD);
-			if(!array_key_exists($content['contact_owner'], $sel_options['contact_owner']))
+			if (!array_key_exists($content['contact_owner'], $sel_options['contact_owner']))
 			{
-				$sel_options['contact_owner'][$content['contact_owner']] = lang("'%1' is not allowed ('%2')!", $content['contact_owner'], implode(',',array_keys($sel_options['contact_owner'])));
+				$sel_options['contact_owner'][$content['contact_owner']] = lang("'%1' is not allowed ('%2')!", $content['contact_owner'], implode(',', array_keys($sel_options['contact_owner'])));
 			}
-			if(!in_array('owner', $content['field_mapping'])) {
+			if (!in_array('owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}