EGroupware / egroupware

api/src/Etemplate/Request.php

Spacing +22 added lines, -22 removed lines

@@ -91,19 +91,19 @@ 
 	 *
 	 * @var array
 	 */
-	protected $data=array();
+	protected $data = array();
 	/**
 	 * Flag if data has been modified and therefor need to be stored again in the session
 	 *
 	 * @var boolean
 	 */
-	protected $data_modified=false;
+	protected $data_modified = false;
 	/**
 	 * Flag that stored data should be removed by destructor, if not modified.
 	 *
 	 * @var boolean
 	 */
-	protected $remove_if_not_modified=false;
+	protected $remove_if_not_modified = false;
 	/**
 	 * mcrypt resource
 	 *
@@ -141,7 +141,7 @@ 
 	 * @param string $id =null
 	 * @return Request
 	 */
-	public static function read($id=null)
+	public static function read($id = null)
 	{
 		if (is_null(self::$request_class))
 		{
@@ -167,7 +167,7 @@ 
 				// decrypt the data if available
 				if (self::init_crypt())
 				{
-					$id = mdecrypt_generic(self::$mcrypt,$id);
+					$id = mdecrypt_generic(self::$mcrypt, $id);
 				}
 				// uncompress the data if available
 				if (self::$compression_level && function_exists('gzcompress'))
@@ -220,7 +220,7 @@ 
 	 *
 	 * @param string $id =null
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		unset($id);
 	}
@@ -263,7 +263,7 @@ 
 	 * @param string $type etemplate type
 	 * @param array $data =array() optional extra data
 	 */
-	public function set_to_process($_form_name, $type, $data=array())
+	public function set_to_process($_form_name, $type, $data = array())
 	{
 		if (!$_form_name || !$type) return;
 
@@ -271,7 +271,7 @@ 
 		$data['type'] = $type;
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
-		$form_name = str_replace(array('\\\'','"'), array('\'','"'), $_form_name);
+		$form_name = str_replace(array('\\\'', '"'), array('\'', '"'), $_form_name);
 
 		$this->data['to_process'][$form_name] = $data;
 		$this->data_modified = true;
@@ -285,13 +285,13 @@ 
 	 * @param array $value
 	 * @param boolean $add_to_array =false should $value be added to the attribute array
 	 */
-	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array=false)
+	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array = false)
 	{
 		//echo '<p>'.__METHOD__."($form_name,$attribute,$value,$add_to_array)</p>\n";
 		if (!$_form_name) return;
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
-		$form_name = str_replace(array('\\\'','&quot;'), array('\'','"'), $_form_name);
+		$form_name = str_replace(array('\\\'', '&quot;'), array('\'', '"'), $_form_name);
 
 		if ($add_to_array)
 		{
@@ -322,7 +322,7 @@ 
 	 * @param string $form_name =null
 	 * @return array
 	 */
-	public function get_to_process($form_name=null)
+	public function get_to_process($form_name = null)
 	{
 		//echo '<p>'.__METHOD__."($form_name)</p>\n";
 		return $form_name ? $this->data['to_process'][$form_name] : $this->data['to_process'];
@@ -346,7 +346,7 @@ 
 	 * @param string $var
 	 * @param mixed $val
 	 */
-	public function __set($var,$val)
+	public function __set($var, $val)
 	{
 		if ($this->data[$var] !== $val)
 		{
@@ -397,23 +397,23 @@ 
 	 * @param double $min_share minimum share to be reported (in percent of the whole request)
 	 * @param double $dump_share minimum share from which on a variable get output
 	 */
-	public function debug($min_share=1.0,$dump_share=25.0)
+	public function debug($min_share = 1.0, $dump_share = 25.0)
 	{
-		echo "<p><b>total size request data = ".($total=strlen(serialize($this->data)))."</b></p>\n";
+		echo "<p><b>total size request data = ".($total = strlen(serialize($this->data)))."</b></p>\n";
 		echo "<p>shares bigger then $min_share% percent of it:</p>\n";
-		foreach($this->data as $key => $val)
+		foreach ($this->data as $key => $val)
 		{
 			$len = strlen(is_array($val) ? serialize($val) : $val);
-			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
+			$len .= ' ('.sprintf('%2.1lf', ($percent = 100.0 * $len / $total)).'%)';
 			if ($percent < $min_share) continue;
 			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
 			if ($percent >= $dump_share) _debug_array($val);
 			if (is_array($val) && $len > 2000)
 			{
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$l = strlen(is_array($v) ? serialize($v) : $v);
-					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
+					$l .= ' ('.sprintf('%2.1lf', ($p = 100.0 * $l / $total)).'%)';
 					if ($p < $min_share) continue;
 					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
 				}
@@ -428,7 +428,7 @@ 
 	 * @param string $mode ='ecb'
 	 * @return boolean true if encryption is used, false otherwise
 	 */
-	static public function init_crypt($algo='tripledes',$mode='ecb')
+	static public function init_crypt($algo = 'tripledes', $mode = 'ecb')
 	{
 		if (is_null(self::$mcrypt))
 		{
@@ -452,12 +452,12 @@ 
 			}
 			$iv_size = mcrypt_enc_get_iv_size(self::$mcrypt);
 			$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+				mcrypt_create_iv($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
 			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
-			if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+			if (bytes($key) > $key_size) $key = cut_bytes($key, 0, $key_size - 1);
 
-			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
+			if (mcrypt_generic_init(self::$mcrypt, $key, $iv) < 0)
 			{
 				error_log(__METHOD__."() could not initialise mcrypt, sessions get NOT encrypted!");
 				return self::$mcrypt = false;

Braces +32 added lines, -8 removed lines

@@ -189,9 +189,12 @@ 
 				//error_log(__METHOD__."() size of request = ".bytes($id));
 			}
 		}
-		if (!$request)	// eT2 request/session expired
+		if (!$request)
+		{
+			// eT2 request/session expired
 		{
 			list($app) = explode('.', $_GET['menuaction']);
+		}
 			$index_url = isset($GLOBALS['egw_info']['apps'][$app]['index']) ?
 				'/index.php?menuaction='.$GLOBALS['egw_info']['apps'][$app]['index'] : '/'.$app.'/index.php';
 			// add a unique token to redirect to avoid client-side framework tries refreshing via nextmatch
@@ -265,7 +268,10 @@ 
 	 */
 	public function set_to_process($_form_name, $type, $data=array())
 	{
-		if (!$_form_name || !$type) return;
+		if (!$_form_name || !$type)
+		{
+			return;
+		}
 
 		//echo '<p>'.__METHOD__."($form_name,$type,".array2string($data).")</p>\n";
 		$data['type'] = $type;
@@ -288,7 +294,10 @@ 
 	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array=false)
 	{
 		//echo '<p>'.__METHOD__."($form_name,$attribute,$value,$add_to_array)</p>\n";
-		if (!$_form_name) return;
+		if (!$_form_name)
+		{
+			return;
+		}
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
 		$form_name = str_replace(array('\\\'','&quot;'), array('\'','"'), $_form_name);
@@ -364,7 +373,10 @@ 
 	 */
 	public function &__get($var)
 	{
-		if ($var == 'data_modified') return $this->data_modified;
+		if ($var == 'data_modified')
+		{
+			return $this->data_modified;
+		}
 
 		return $this->data[$var];
 	}
@@ -405,16 +417,25 @@ 
 		{
 			$len = strlen(is_array($val) ? serialize($val) : $val);
 			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
-			if ($percent < $min_share) continue;
+			if ($percent < $min_share)
+			{
+				continue;
+			}
 			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
-			if ($percent >= $dump_share) _debug_array($val);
+			if ($percent >= $dump_share)
+			{
+				_debug_array($val);
+			}
 			if (is_array($val) && $len > 2000)
 			{
 				foreach($val as $k => $v)
 				{
 					$l = strlen(is_array($v) ? serialize($v) : $v);
 					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
-					if ($p < $min_share) continue;
+					if ($p < $min_share)
+					{
+						continue;
+					}
 					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
 				}
 			}
@@ -455,7 +476,10 @@ 
 				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
 
 			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
-			if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+			if (bytes($key) > $key_size)
+			{
+				$key = cut_bytes($key,0,$key_size-1);
+			}
 
 			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
 			{

api/src/Etemplate/WidgetBrowser.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	{
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'etemplate';
 		$GLOBALS['egw_info']['flags']['app_header'] = 'et2 Widgets';
-                //'js_link_registry'      => True,
+				//'js_link_registry'      => True,
 
 		// Widget browser code
 		Api\Framework::includeJS('/api/js/etemplate/widget_browser.js');

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 		Api\Framework::includeCSS('/api/templates/default/etemplate2.css');
 
-		Api\Framework::includeCSS('api','widget_browser',false);
+		Api\Framework::includeCSS('api', 'widget_browser', false);
 
 		// load translations
 		Api\Translation::add_app('etemplate');

api/src/Etemplate/Request/Session.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
 	 *
 	 * @param array $id
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		if (!$id) $id = self::request_id();
 
@@ -88,7 +88,7 @@ 
 	 * @param string $id =null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Session($id);
 
@@ -96,7 +96,7 @@ 
 		{
 			if (!($data = Api\Cache::getSession('etemplate', $id)))
 			{
-				return false;	// request not found
+				return false; // request not found
 			}
 			$request->data = $data;
 		}
@@ -111,8 +111,8 @@ 
 	 */
 	static function request_id()
 	{
-		$time = (int) (100 * microtime(true));	// gives precision of 1/100 sec
-		$id = $GLOBALS['egw_info']['flags']['currentapp'] .':'. $time;
+		$time = (int)(100 * microtime(true)); // gives precision of 1/100 sec
+		$id = $GLOBALS['egw_info']['flags']['currentapp'].':'.$time;
 
 		return $id;
 	}
@@ -152,30 +152,30 @@ 
 	protected function _php4_request_garbage_collection()
 	{
 		// now we are on php4 sessions and do a bit of garbage collection
-		$appsessions =& $_SESSION[Api\Session::EGW_APPSESSION_VAR]['etemplate'];
-		$session_used =& $appsessions['session_used'];
+		$appsessions = & $_SESSION[Api\Session::EGW_APPSESSION_VAR]['etemplate'];
+		$session_used = & $appsessions['session_used'];
 
 		if ($this->id)
 		{
 			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
-			++$session_used[$this->id];	// count the number of times a session got used
+			++$session_used[$this->id]; // count the number of times a session got used
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20) return; // we dont need to care
 
-		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
+		$now = (int)(100 * microtime(true)); // gives precision of 1/100 sec
 
-		foreach(array_keys($appsessions) as $id)
+		foreach (array_keys($appsessions) as $id)
 		{
-			list(,$time) = explode(':',$id);
+			list(,$time) = explode(':', $id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time) continue; // other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
-			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+			if ($session_used[$id] == 1 && $time < $now - 10 * 6000 || // session used and older then 10min
+				$time < $now - 30 * 6000)	// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);

Braces +22 added lines, -5 removed lines

@@ -63,12 +63,18 @@ 
 	 */
 	private function __construct($id=null)
 	{
-		if (!$id) $id = self::request_id();
+		if (!$id)
+		{
+			$id = self::request_id();
+		}
 
 		$this->id = $id;
 
 		// hack to quiten IDE Warning for not calling parent::__construct, which we can not!
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 	}
 
 	/**
@@ -162,7 +168,11 @@ 
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20)
+		{
+			return;
+		}
+		// we dont need to care
 
 		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
 
@@ -170,15 +180,22 @@ 
 		{
 			list(,$time) = explode(':',$id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time)
+			{
+				continue;
+			}
+			// other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
 			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+				$time < $now - 30*6000)
+			{
+				// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);
+			}
 				unset($session_used[$id]);
 			}
 		}

api/src/Etemplate/Request/Files.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @param array $id
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		if (is_null(self::$directory))
 		{
@@ -102,7 +102,7 @@ 
 	 * @param string $id =null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Files($id);
 
@@ -129,7 +129,7 @@ 
 	{
 		do
 		{
-			$id = uniqid('etemplate_'.$GLOBALS['egw_info']['flags']['currentapp'].'_',true);
+			$id = uniqid('etemplate_'.$GLOBALS['egw_info']['flags']['currentapp'].'_', true);
 		}
 		while (file_exists(self::$directory.'/'.$id));
 
@@ -152,7 +152,7 @@ 
 			@unlink(self::$directory.'/'.$this->id);
 		}
 		elseif (!$this->destroyed && $this->data_modified &&
-			!file_put_contents($filename = self::$directory.'/'.$this->id,serialize($this->data)))
+			!file_put_contents($filename = self::$directory.'/'.$this->id, serialize($this->data)))
 		{
 			error_log("Error opening '$filename' to store the etemplate request data!");
 		}

Braces +12 added lines, -3 removed lines

@@ -77,12 +77,18 @@ 
 		{
 			self::$directory = $GLOBALS['egw_info']['server']['temp_dir'];
 		}
-		if (!$id) $id = self::request_id();
+		if (!$id)
+		{
+			$id = self::request_id();
+		}
 
 		$this->id = $id;
 
 		// hack to quiten IDE Warning for not calling parent::__construct, which we can not!
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 	}
 
 	/**
@@ -114,7 +120,10 @@ 
 				return false;
 			}
 			$request->data = unserialize(file_get_contents($filename));
-			if ($request->data === false) error_log("Error unserializing '$filename' to read the etemplate request data!");
+			if ($request->data === false)
+			{
+				error_log("Error unserializing '$filename' to read the etemplate request data!");
+			}
 		}
 		//error_log(__METHOD__."(id=$id");
 		return $request;

api/src/Etemplate/Request/Cache.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @param string $_id
 	 */
-	private function __construct($_id=null)
+	private function __construct($_id = null)
 	{
 		$this->id = $_id ? $_id : self::request_id();
 		//error_log(__METHOD__."($_id) this->id=$this->id");
@@ -98,7 +98,7 @@ 
 	 * @param string $id =null
 	 * @return Request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new Cache($id);
 
@@ -124,7 +124,7 @@ 
 	{
 		// As we replace spaces with + for those account ids which contain spaces, therefore we need to do the same for getting request id too.
 		$userID = str_replace(' ', '+', rawurldecode($GLOBALS['egw_info']['user']['account_lid']));
-		return uniqid($GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_',true);
+		return uniqid($GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_', true);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 		}
 		elseif (($this->data_modified ||
 			// if half of expiration time is over, save it anyway, to restart expiration time
-			isset($this->data['last_saved']) && (time()-$this->data['last_saved']) > self::EXPIRATION/2))
+			isset($this->data['last_saved']) && (time() - $this->data['last_saved']) > self::EXPIRATION / 2))
 		{
 			//error_log(__METHOD__."() saving $this->id".($this->data_modified?'':' data NOT modified, just keeping session alife'));
 			$this->data['last_saved'] = time();

Braces +4 added lines, -1 removed lines

@@ -51,7 +51,10 @@
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		// Process dropped data into something useable
 		if($context['dropped_data'])

api/src/MimeMagic.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 		{
 			return $mime;
 		}
-		return lang('%1 file',strtoupper($ext)).' ('.$mime.')';
+		return lang('%1 file', strtoupper($ext)).' ('.$mime.')';
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	{
 		if (empty($_ext))
 		{
-			return 'text/plain';//assume no extension is a text file
+			return 'text/plain'; //assume no extension is a text file
 		}
 		$ext = strtolower($_ext);
 		if (!array_key_exists($ext, self::$mime_extension_map))
@@ -188,24 +188,24 @@ 
 	 */
 	public static function analyze_data($data)
 	{
-		if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
+		if (!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
 		{
 			//nothing we can do but bail out
 			return false;
 		}
 
 		mt_srand(time());
-		$filename = $GLOBALS['egw_info']['server']['temp_dir'] . '/'
-			. md5( time() + mt_rand() ) . '.tmp';
+		$filename = $GLOBALS['egw_info']['server']['temp_dir'].'/'
+			. md5(time() + mt_rand()).'.tmp';
 
 		$fp = @fopen($filename, 'ab');
-		if(!$fp || !$data)
+		if (!$fp || !$data)
 		{
 			//houston we have a problem - bail out
 			return false;
 		}
 
-		if(!fwrite($fp, $data))
+		if (!fwrite($fp, $data))
 		{
 			//bail out again
 			return false;
@@ -215,7 +215,7 @@ 
 
 		$mime = self::analyze_file($filename);
 
-		unlink($filename);//remove the temp file
+		unlink($filename); //remove the temp file
 
 		return $mime;
 	}
@@ -233,7 +233,7 @@ 
 	 * @var array of extenstion to mime mappings
 	 */
 	static $mime_extension_map = array(
-		'txt'				=> 'text/plain',	// should be first, so text/plain maps back to .txt
+		'txt'				=> 'text/plain', // should be first, so text/plain maps back to .txt
 		'3dml'              => 'text/vnd.in3d.3dml',
 		'3ds'               => 'image/x-3ds',
 		'3g2'               => 'video/3gpp2',

Braces +4 added lines, -1 removed lines

@@ -106,7 +106,10 @@
 	public static function mime2ext($_type)
 	{
 		$type = strtolower($_type);
-		if (isset(self::$mime_alias_map[$type])) $type = self::$mime_alias_map[$type];
+		if (isset(self::$mime_alias_map[$type]))
+		{
+			$type = self::$mime_alias_map[$type];
+		}
 		$key = array_search($type, self::$mime_extension_map);
 		if (empty($type) || $key === false)
 		{

api/src/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 class Exception extends \Exception
 {
 	// nothing fancy yet
-	function __construct($msg=null,$code=100,\Exception $previous=null)
+	function __construct($msg = null, $code = 100, \Exception $previous = null)
 	{
 		return parent::__construct($msg, $code, $previous);
 	}

api/src/Cache.php

Spacing +70 added lines, -70 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);
 	}
 
 	/**
@@ -366,13 +366,13 @@ 
 	 * @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)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		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;
 
@@ -391,17 +391,17 @@ 
 	 * @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)
 	{
-		unset($expiration);	// not used, but required by function signature
+		unset($expiration); // not used, but required by function signature
 		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
 		}
 		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];
 	}
@@ -413,12 +413,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
 		}
 		if (!isset($_SESSION[Session::EGW_APPSESSION_VAR][$app][$location]))
 		{
@@ -445,9 +445,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;
@@ -463,12 +463,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];
 	}
@@ -480,7 +480,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]))
 		{
@@ -500,7 +500,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();
 
@@ -521,13 +521,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
@@ -537,7 +537,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
@@ -546,9 +546,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();
 					}
 				}
@@ -566,35 +566,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];
@@ -606,7 +606,7 @@ 
 	 * @param string $level =self::INSTANCE
 	 * @param string $app =null
 	 */
-	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)))
@@ -653,7 +653,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))
 		{
@@ -675,18 +675,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;
 					}

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]);
+								}
 							}
 						}
 					}
@@ -371,7 +374,10 @@ 
 		unset($expiration);	// not used, but required by function signature
 		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;
@@ -396,7 +402,10 @@ 
 		unset($expiration);	// not used, but required by function signature
 		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
 		}
 		if (!isset($_SESSION[Session::EGW_APPSESSION_VAR][$app][$location]) && !is_null($callback))
@@ -417,7 +426,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
 		}
 		if (!isset($_SESSION[Session::EGW_APPSESSION_VAR][$app][$location]))
@@ -504,7 +516,10 @@ 
 	{
 		static $providers = array();
 
-		if ($level != self::TREE) $level = self::INSTANCE;
+		if ($level != self::TREE)
+		{
+			$level = self::INSTANCE;
+		}
 
 		if (!isset($providers[$level]))
 		{
@@ -515,10 +530,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
@@ -532,7 +550,10 @@ 
 			}
 			else
 			{
-				if (!is_array($params)) $params = (array)$params;
+				if (!is_array($params))
+				{
+					$params = (array)$params;
+				}
 
 				$class = array_shift($params);
 				if (!class_exists($class))
@@ -553,7 +574,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];
@@ -589,7 +613,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)
@@ -697,7 +725,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
@@ -706,7 +737,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;
@@ -715,7 +749,10 @@ 
 		if (isset($app))
 		{
 			$keys[] = $app;
-			if (isset($location)) $keys[] = $location;
+			if (isset($location))
+			{
+				$keys[] = $location;
+			}
 		}
 		return $keys;
 	}

api/src/Accounts/Sql.php

Spacing +52 added lines, -52 removed lines

@@ -198,38 +198,38 @@ 
 		if ($data['account_passwd'])
 		{
 			// if password it's not already entcrypted, do so now
-			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']) &&
+				!preg_match('/^[0-9a-f]{32}$/', $data['account_passwd']))	// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change'] = 0;
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
 			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = ''; // is NOT NULL!
+			if (!isset($to_write['account_status'])) $to_write['account_status'] = ''; // is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
 			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
 
-			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+			if (!in_array($to_write['account_type'], array('u', 'g')) ||
+				!$this->db->insert($this->table, $to_write, false, __LINE__, __FILE__)) return false;
 
 			if (!(int)$data['account_id'])
 			{
-				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
+				$data['account_id'] = $this->db->get_last_insert_id($this->table, 'account_id');
 				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
 			}
 		}
 		else	// update of existing account
 		{
 			unset($to_write['account_id']);
-			if (!$this->db->update($this->table,$to_write,array('account_id' => abs($data['account_id'])),__LINE__,__FILE__))
+			if (!$this->db->update($this->table, $to_write, array('account_id' => abs($data['account_id'])), __LINE__, __FILE__))
 			{
 				return false;
 			}
@@ -278,16 +278,16 @@ 
 	{
 		if (!(int)$account_id) return false;
 
-		$contact_id = $this->id2name($account_id,'person_id');
+		$contact_id = $this->id2name($account_id, 'person_id');
 
-		if (!$this->db->delete($this->table,array('account_id' => abs($account_id)),__LINE__,__FILE__))
+		if (!$this->db->delete($this->table, array('account_id' => abs($account_id)), __LINE__, __FILE__))
 		{
 			return false;
 		}
 		if ($contact_id)
 		{
 			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
-			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
+			$this->contacts->delete($contact_id, false); // false = allow to delete accounts (!)
 		}
 		return true;
 	}
@@ -303,11 +303,11 @@ 
 		if (!(int)$account_id) return false;
 
 		$memberships = array();
-		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
+		if (($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
 		{
-			foreach($gids as $gid)
+			foreach ($gids as $gid)
 			{
-				$memberships[(string) $gid] = $this->id2name($gid);
+				$memberships[(string)$gid] = $this->id2name($gid);
 			}
 		}
 		return $memberships;
@@ -319,17 +319,17 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id numerical account-id
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!(int)$account_id) return;
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
-		$acl->delete('phpgw_group',false);
+		$acl->delete('phpgw_group', false);
 
-		foreach($groups as $group)
+		foreach ($groups as $group)
 		{
-			$acl->add('phpgw_group',$group,1);
+			$acl->add('phpgw_group', $group, 1);
 		}
 		$acl->save_repository();
 	}
@@ -345,7 +345,7 @@ 
 		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
 
 		$members = array();
-		foreach($this->db->select($this->table, 'account_id,account_lid',
+		foreach ($this->db->select($this->table, 'account_id,account_lid',
 			$this->db->expression(Api\Acl::TABLE, array(
 				'acl_appname'  => 'phpgw_group',
 				'acl_location' => $account_id,
@@ -364,15 +364,15 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
-		$GLOBALS['egw']->acl->delete_repository('phpgw_group',$gid,false);
+		$GLOBALS['egw']->acl->delete_repository('phpgw_group', $gid, false);
 
 		if (is_array($members))
 		{
-			foreach($members as $id)
+			foreach ($members as $id)
 			{
-				$GLOBALS['egw']->acl->add_repository('phpgw_group',$gid,$id,1);
+				$GLOBALS['egw']->acl->add_repository('phpgw_group', $gid, $id, 1);
 			}
 		}
 	}
@@ -407,20 +407,20 @@ 
 		);
 
 		// fetch order of account_fullname from Api\Accounts::format_username
-		if (strpos($param['order'],'account_fullname') !== false)
+		if (strpos($param['order'], 'account_fullname') !== false)
 		{
-			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/',',',str_replace(array('[',']'),'',
-				Api\Accounts::format_username('account_lid','account_firstname','account_lastname'))), $param['order']);
+			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/', ',', str_replace(array('[', ']'), '',
+				Api\Accounts::format_username('account_lid', 'account_firstname', 'account_lastname'))), $param['order']);
 		}
-		$order = str_replace(array_keys($order2contact),array_values($order2contact),$param['order']);
+		$order = str_replace(array_keys($order2contact), array_values($order2contact), $param['order']);
 		// allways add 'account_lid', as it is only valid one for groups
 		if (strpos($order, 'account_lid') === false)
 		{
-			$order .= ($order?',':'').'account_lid';
+			$order .= ($order ? ',' : '').'account_lid';
 		}
 		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
 
-		$search_cols = array('account_lid','n_family','n_given','email');
+		$search_cols = array('account_lid', 'n_family', 'n_given', 'email');
 		$join = $this->contacts_join;
 		$email_cols = array('email');
 
@@ -436,7 +436,7 @@ 
 		}
 
 		$filter = array();
-		switch($param['type'])
+		switch ($param['type'])
 		{
 			case 'accounts':
 				$filter['owner'] = 0;
@@ -451,7 +451,7 @@ 
 			case 'groupmembers':
 			case 'groupmembers+memberships':
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
@@ -486,13 +486,13 @@ 
 		}
 		if ($param['active'])
 		{
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
 		}
 		$criteria = array();
 		$wildcard = $param['query_type'] == 'start' || $param['query_type'] == 'exact' ? '' : '%';
 		if (($query = $param['query']))
 		{
-			switch($param['query_type'])
+			switch ($param['query_type'])
 			{
 				case 'start':
 					$query .= '*';
@@ -500,7 +500,7 @@ 
 				case 'all':
 				default:
 				case 'exact':
-					foreach($search_cols as $col)
+					foreach ($search_cols as $col)
 					{
 						$criteria[$col] = $query;
 					}
@@ -521,7 +521,7 @@ 
 				case 'email':
 					$criteria['email'] = $query;
 					// Group email
-					if(in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
+					if (in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
 					{
 						$criteria[Api\Mail\Smtp\Sql::TABLE.'.mail_value'] = $query;
 					}
@@ -531,12 +531,12 @@ 
 		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
 
 		$accounts = array();
-		foreach((array) $this->contacts->search($criteria,
-			array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
-			$order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
-			$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
+		foreach ((array)$this->contacts->search($criteria,
+			array_merge(array(1, 'n_given', 'n_family', 'id', 'created', 'modified', $this->table.'.account_id AS account_id'), $email_cols),
+			$order, "account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
+			$wildcard, false, $query[0] == '!' ? 'AND' : 'OR',
 			$param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']),
-			$filter,$join) as $contact)
+			$filter, $join) as $contact)
 		{
 			if ($contact)
 			{
@@ -576,13 +576,13 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int/false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		if ($account_type === 'g' && $which != 'account_lid') return false;
 
 		$where = array();
 		$cols = 'account_id';
-		switch($which)
+		switch ($which)
 		{
 			case 'account_fullname':
 				$table = $this->contacts_table;
@@ -613,11 +613,11 @@ 
 		}
 		else
 		{
-			$where[] = 'account_id IS NOT NULL'.	// otherwise contacts with eg. the same email hide the accounts!
-				($table == $this->contacts_table ? " AND contact_tid != 'D'" : '');	// ignore deleted accounts contact-data
+			$where[] = 'account_id IS NOT NULL'.// otherwise contacts with eg. the same email hide the accounts!
+				($table == $this->contacts_table ? " AND contact_tid != 'D'" : ''); // ignore deleted accounts contact-data
 
 		}
-		if (!($rs = $this->db->select($table,$cols,$where,__LINE__,__FILE__)) || !($row = $rs->fetch()))
+		if (!($rs = $this->db->select($table, $cols, $where, __LINE__, __FILE__)) || !($row = $rs->fetch()))
 		{
 			//error_log(__METHOD__."('$name', '$which', ".array2string($account_type).") db->select('$table', '$cols', ".array2string($where).") returned ".array2string($rs).' '.function_backtrace());
 			return false;
@@ -634,9 +634,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -648,14 +648,14 @@ 
 	 */
 	function update_lastlogin($account_id, $ip)
 	{
-		$previous_login = $this->db->select($this->table,'account_lastlogin',array('account_id'=>abs($account_id)),__LINE__,__FILE__)->fetchColumn();
+		$previous_login = $this->db->select($this->table, 'account_lastlogin', array('account_id'=>abs($account_id)), __LINE__, __FILE__)->fetchColumn();
 
-		$this->db->update($this->table,array(
+		$this->db->update($this->table, array(
 			'account_lastloginfrom' => $ip,
 			'account_lastlogin'     => time(),
-		),array(
+		), array(
 			'account_id' => abs($account_id),
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		return $previous_login;
 	}

Braces +94 added lines, -23 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id > 0)
 		{
@@ -152,11 +155,14 @@ 
 			unset($e);
 		}
 
-		if (!$rs)	// handle not (yet) existing mailaccounts table
+		if (!$rs)
+		{
+			// handle not (yet) existing mailaccounts table
 		{
 			$rs = $this->db->select($this->table, $this->table.'.*',
 				$this->table.'.account_id='.abs($account_id), __LINE__, __FILE__);
 		}
+		}
 		if (!$rs || !($data = $rs->fetch()))
 		{
 			return false;
@@ -166,7 +172,10 @@ 
 			$data['account_id'] = -$data['account_id'];
 			$data['mailAllowed'] = true;
 		}
-		if (!$data['account_firstname']) $data['account_firstname'] = $data['account_lid'];
+		if (!$data['account_firstname'])
+		{
+			$data['account_firstname'] = $data['account_lid'];
+		}
 		if (!$data['account_lastname'])
 		{
 			$data['account_lastname'] = $data['account_type'] == 'g' ? 'Group' : 'User';
@@ -177,7 +186,10 @@ 
 				$data['account_lastname'] = lang($data['account_lastname']);
 			}
 		}
-		if (!$data['account_fullname']) $data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		if (!$data['account_fullname'])
+		{
+			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		}
 
 		return $data;
 	}
@@ -199,31 +211,57 @@ 
 		{
 			// if password it's not already entcrypted, do so now
 			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))
+			{
+				// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
+			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1)
+		{
+			$to_write['account_lastpwd_change']=0;
+		}
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
-			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
+			if ($to_write['account_id'] < 0)
+			{
+				$to_write['account_id'] *= -1;
+			}
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd']))
+			{
+				$to_write['account_pwd'] = '';
+			}
+			// is NOT NULL!
+			if (!isset($to_write['account_status']))
+			{
+				$to_write['account_status'] = '';
+			}
+			// is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
-			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
+			if (isset($to_write['account_id']) && !$to_write['account_id'])
+			{
+				unset($to_write['account_id']);
+			}
 
 			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__))
+			{
+				return false;
+			}
 
 			if (!(int)$data['account_id'])
 			{
 				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
-				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
+				if ($data['account_type'] == 'g')
+				{
+					$data['account_id'] *= -1;
+				}
 			}
 		}
 		else	// update of existing account
@@ -276,7 +314,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$contact_id = $this->id2name($account_id,'person_id');
 
@@ -286,7 +327,10 @@ 
 		}
 		if ($contact_id)
 		{
-			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+			if (!isset($this->contacts))
+			{
+				$this->contacts = new Api\Contacts();
+			}
 			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
 		}
 		return true;
@@ -300,7 +344,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$memberships = array();
 		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
@@ -321,7 +368,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!(int)$account_id) return;
+		if (!(int)$account_id)
+		{
+			return;
+		}
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
@@ -342,7 +392,10 @@ 
 	 */
 	function members($account_id)
 	{
-		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
+		if (!is_numeric($account_id))
+		{
+			$account_id = $this->name2id($account_id);
+		}
 
 		$members = array();
 		foreach($this->db->select($this->table, 'account_id,account_lid',
@@ -418,7 +471,10 @@ 
 		{
 			$order .= ($order?',':'').'account_lid';
 		}
-		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		if ($param['sort'])
+		{
+			$order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		}
 
 		$search_cols = array('account_lid','n_family','n_given','email');
 		$join = $this->contacts_join;
@@ -455,7 +511,10 @@ 
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = abs($grp);
+					}
 				}
 				$filter['account_id'] = $members;
 				break;
@@ -474,9 +533,12 @@ 
 		// fix ambigous account_id (used in accounts and contacts table)
 		if (array_key_exists('account_id', $filter))
 		{
-			if (!$filter['account_id'])	// eg. group without members (would give SQL error)
+			if (!$filter['account_id'])
+			{
+				// eg. group without members (would give SQL error)
 			{
 				$this->total = 0;
+			}
 				return array();
 			}
 			$filter[] = $this->db->expression($this->table, $this->table.'.', array(
@@ -528,7 +590,10 @@ 
 					break;
 			}
 		}
-		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+		if (!isset($this->contacts))
+		{
+			$this->contacts = new Api\Contacts();
+		}
 
 		$accounts = array();
 		foreach((array) $this->contacts->search($criteria,
@@ -578,7 +643,10 @@ 
 	 */
 	function name2id($name,$which='account_lid',$account_type=null)
 	{
-		if ($account_type === 'g' && $which != 'account_lid') return false;
+		if ($account_type === 'g' && $which != 'account_lid')
+		{
+			return false;
+		}
 
 		$where = array();
 		$cols = 'account_id';
@@ -601,9 +669,12 @@ 
 				$cols .= ',account_type';
 				$where[$which] = $name;
 				// check if we need to treat username case-insensitive
-				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])
+				{
+					// = is case sensitiv eg. on postgres, but not on mysql!
 				{
 					$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($where['account_lid']);
+				}
 					unset($where['account_lid']);
 				}
 		}