EGroupware / egroupware

phpgwapi/inc/class.accounts_ads.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -129,7 +129,7 @@ 
 	/**
 	 * Factory method and singelton to get adLDAP object for given configuration or default server config
 	 *
-	 * @param array $config=null values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
+	 * @param array $config values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
@@ -1138,7 +1138,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1335,7 +1335,7 @@ 
 	 * - activate user
 	 *
 	 * @param array $attributes The attributes to set to the user account
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{
@@ -1525,7 +1525,7 @@ 
     * @param string $username The username to query
     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
     * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
+    * @return string|boolean
     */
     public function modify($username, $attributes, $isGUID = false)
     {
@@ -1590,7 +1590,7 @@ 
 	 * Extended to allow to specify $attribute["container"] as string, because array hardcodes "OU=", while Samba4 and win2008r2 uses "CN=Users"
 	 *
 	 * @param array $attributes Default attributes of the group
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{

Indentation +174 added lines, -174 removed lines

@@ -803,11 +803,11 @@ 
 	}
 
 	/**
-	* Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
-	*
-	* @param long $unixTime
-	* @return long windowsTime
-	*/
+	 * Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
+	 *
+	 * @param long $unixTime
+	 * @return long windowsTime
+	 */
 	public static function convertUnixTimeToWindowsTime($unixTime)
 	{
 		return ($unixTime + 11644477200) * 10000000;
@@ -1260,10 +1260,10 @@ 
 	}
 
 	/**
-    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
-    *
-    * Extended to use mbstring to convert from arbitrary charset to utf-8
-	*/
+	 * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to utf-8
+	 */
 	protected function encode8Bit(&$item, $key)
 	{
 		if ($this->charset != 'utf-8' && $key != 'password')
@@ -1291,29 +1291,29 @@ 
 		return $this->userClass;
 	}
 
-    /**
-    * Get the group class interface
-    *
-    * @return adLDAPGroups
-    */
-    public function group() {
-        if (!$this->groupClass) {
-            $this->groupClass = new adLDAPGroups_egw($this);
-        }
-        return $this->groupClass;
-    }
-
-    /**
-    * Get the utils class interface
-    *
-    * @return adLDAPUtils
-    */
-    public function utilities() {
-        if (!$this->utilClass) {
-            $this->utilClass = new adLDAPUtils_egw($this);
-        }
-        return $this->utilClass;
-    }
+	/**
+	 * Get the group class interface
+	 *
+	 * @return adLDAPGroups
+	 */
+	public function group() {
+		if (!$this->groupClass) {
+			$this->groupClass = new adLDAPGroups_egw($this);
+		}
+		return $this->groupClass;
+	}
+
+	/**
+	 * Get the utils class interface
+	 *
+	 * @return adLDAPUtils
+	 */
+	public function utilities() {
+		if (!$this->utilClass) {
+			$this->utilClass = new adLDAPUtils_egw($this);
+		}
+		return $this->utilClass;
+	}
 }
 
 /**
@@ -1402,45 +1402,45 @@ 
 		return true;
 	}
 
-    /**
-    * Encode a password for transmission over LDAP
-    *
-    * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
-    *
-    * @param string $password The password to encode
-    * @return string
-    */
-    public function encodePassword($password)
-    {
-        $password="\"".$password."\"";
-        if (function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
-        }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
-        return $encoded;
-    }
-
-    /**
-     * Set a password
-     *
-     * Requires "Reset password" priviledges from bind user!
-     *
+	/**
+	 * Encode a password for transmission over LDAP
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
+	 *
+	 * @param string $password The password to encode
+	 * @return string
+	 */
+	public function encodePassword($password)
+	{
+		$password="\"".$password."\"";
+		if (function_exists('mb_convert_encoding'))
+		{
+			return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
+		}
+		$encoded="";
+		for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+		return $encoded;
+	}
+
+	/**
+	 * Set a password
+	 *
+	 * Requires "Reset password" priviledges from bind user!
+	 *
 	 * We can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2!
 	 *
-     * @param string $dn
-     * @param string $password
-     * @return boolean
-     */
-    public function setPassword($dn, $password)
-    {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
-    		'unicodePwd' => $this->encodePassword($password),
-    	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
-    	return $result;
-    }
+	 * @param string $dn
+	 * @param string $password
+	 * @return boolean
+	 */
+	public function setPassword($dn, $password)
+	{
+		$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+			'unicodePwd' => $this->encodePassword($password),
+		));
+		if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+		return $result;
+	}
 
 	/**
 	 * Check if we can to a real password change, not just a password reset
@@ -1454,30 +1454,30 @@ 
 		return function_exists('ldap_modify_batch');
 	}
 
-    /**
-    * Set the password of a user - This must be performed over SSL
-    *
-    * @param string $username The username to modify
-    * @param string $password The new password
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-	* @param string $old_password old password for password change, if supported
-    * @return bool
-    */
-    public function password($username, $password, $isGUID = false, $old_password=null)
-    {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        $add=array();
+	/**
+	 * Set the password of a user - This must be performed over SSL
+	 *
+	 * @param string $username The username to modify
+	 * @param string $password The new password
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @param string $old_password old password for password change, if supported
+	 * @return bool
+	 */
+	public function password($username, $password, $isGUID = false, $old_password=null)
+	{
+		if ($username === NULL) { return false; }
+		if ($password === NULL) { return false; }
+		if (!$this->adldap->getLdapBind()) { return false; }
+		if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		$add=array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1499,76 +1499,76 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
-            $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
-                    $msg .= ' Your password might not match the password policy.';
-                }
-                throw new adLDAPException($msg);
-            }
-            else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Modify a user
-    *
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
-    */
-    public function modify($username, $attributes, $isGUID = false)
-    {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        // Find the dn of the user
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        // Translate the update to the LDAP schema
-        $mod = $this->adldap->adldap_schema($attributes);
-
-        // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
-            return false;
-        }
-
-        // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
-                $controlOptions = array("NORMAL_ACCOUNT");
-            }
-            else {
-                $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
-            }
-            $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
-        }
+		if ($result === false){
+			$err = ldap_errno($this->adldap->getLdapConnection());
+			if ($err) {
+				$msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
+				if($err == 53) {
+					$msg .= ' Your password might not match the password policy.';
+				}
+				throw new adLDAPException($msg);
+			}
+			else {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Modify a user
+	 *
+	 * @param string $username The username to query
+	 * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @return bool
+	 */
+	public function modify($username, $attributes, $isGUID = false)
+	{
+		if ($username === NULL) { return "Missing compulsory field [username]"; }
+		if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		// Find the dn of the user
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		// Translate the update to the LDAP schema
+		$mod = $this->adldap->adldap_schema($attributes);
+
+		// Check to see if this is an enabled status update
+		if (!$mod && !array_key_exists("enabled", $attributes)){
+			return false;
+		}
+
+		// Set the account control attribute (only if specified)
+		if (array_key_exists("enabled", $attributes)){
+			if ($attributes["enabled"]){
+				$controlOptions = array("NORMAL_ACCOUNT");
+			}
+			else {
+				$controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
+			}
+			$mod["userAccountControl"][0] = $this->accountControl($controlOptions);
+		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($mod['unicodePwd']);
 
 		if ($mod)
 		{
-	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
+			// Do the update
+			$result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+			if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
-	        	return false;
-	        }
+				return false;
+			}
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+		if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1633,23 +1633,23 @@ 
 		return $this->adldap->encode8bit($item, $key);
 	}
 
-    /**
-    * Escape strings for the use in LDAP filters
-    *
-    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
-    * Ported from Perl's Net::LDAP::Util escape_filter_value
-    *
-    * @param string $str The string the parse
-    * @author Port by Andreas Gohr <andi@splitbrain.org>
-    * @return string
-    */
-    public function ldapSlashes($str){
-        return preg_replace_callback(
-      		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
-            	return "\\".join("", unpack("H2", $matches[1]));
-        	},
-        	$str
-    	);
-    }
+	/**
+	 * Escape strings for the use in LDAP filters
+	 *
+	 * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+	 * Ported from Perl's Net::LDAP::Util escape_filter_value
+	 *
+	 * @param string $str The string the parse
+	 * @author Port by Andreas Gohr <andi@splitbrain.org>
+	 * @return string
+	 */
+	public function ldapSlashes($str){
+		return preg_replace_callback(
+	  		'/([\x00-\x1F\*\(\)\\\\])/',
+			function ($matches) {
+				return "\\".join("", unpack("H2", $matches[1]));
+			},
+			$str
+		);
+	}
 }

Spacing +113 added lines, -122 removed lines

@@ -129,10 +129,10 @@ 
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
-	public static function get_adldap(array &$config=null)
+	public static function get_adldap(array &$config = null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config) $config = & $GLOBALS['egw_info']['server'];
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
@@ -140,7 +140,7 @@ 
 			if (empty($config['ads_domain'])) throw new Exception("Required ADS domain missing!");
 
 			$base_dn_parts = array();
-			foreach(explode('.', $config['ads_domain']) as $dc)
+			foreach (explode('.', $config['ads_domain']) as $dc)
 			{
 				$base_dn_parts[] = 'DC='.$dc;
 			}
@@ -168,7 +168,7 @@ 
 	 * @param int $account_id
 	 * @return string|NULL
 	 */
-	protected function get_sid($account_id=null)
+	protected function get_sid($account_id = null)
 	{
 		static $domain_sid = null;
 		if (!isset($domain_sid))
@@ -203,14 +203,14 @@ 
 	 * @param boolean $set_if_empty =false true set from DN of "Domain Users" group #
 	 * @return string
 	 */
-	public function ads_context($set_if_empty=false)
+	public function ads_context($set_if_empty = false)
 	{
 		if (empty($this->frontend->config[self::ADS_CONTEXT]))
 		{
 			if ($set_if_empty && ($dn = $this->id2name(-self::DOMAIN_USERS_GROUP, 'account_dn')))
 			{
 				$dn = preg_replace('/^CN=.*?,(CN|OU)=/i', '$1=', $dn);
-				config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
+				config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT] = $dn, 'phpgwapi');
 			}
 			else
 			{
@@ -247,7 +247,7 @@ 
 	 * @param boolean $reconnect =false true: reconnect even if already connected
 	 * @return resource
 	 */
-	public function ldap_connection($reconnect=false)
+	public function ldap_connection($reconnect = false)
 	{
 		if (($reconnect || !($ds = $this->adldap->getLdapConnection())) &&
 			// call connect, thought I dont know how it can be not connected ...
@@ -411,8 +411,7 @@ 
 		$data = translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = -self::sid2account_id($sid);
 
 		$group = array(
@@ -426,10 +425,8 @@ 
 			'account_lastname'  => lang('Group'),
 			'account_fullname'  => lang('Group').' '.$data['samaccountname'][0],
 			'account_email'     => $data['mail'][0],
-			'account_created'   => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified'  => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_created'   => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified'  => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 			'account_description' => $data['description'][0],
 			'mailAllowed'       => true,
 		);
@@ -449,7 +446,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'g', self::$group_attributes)))
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
 		$group = $this->_ldap2group(array_shift($data));
 
@@ -472,8 +469,7 @@ 
 		$data = translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = self::sid2account_id($sid);
 
 		$user = array(
@@ -489,22 +485,18 @@ 
 			'account_email'     => $data['mail'][0],
 			'account_fullname'  => $data['displayname'][0],
 			'account_phone'     => $data['telephonenumber'][0],
-			'account_status'    => $data['useraccountcontrol'][0] & 2 ? false : 'A',
-			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
-			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
-			'account_created' => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified' => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_status'    => $data['useraccountcontrol'][0]&2 ? false : 'A',
+			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
+			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
+			'account_created' => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified' => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 		);
 		// expired accounts are NOT active
 		if ($user['account_expires'] !== -1 && $user['account_expires'] < time())
 		{
 			$user['account_status'] = false;
 		}
-		$user['person_id'] = $user['account_guid'];	// id of contact
+		$user['person_id'] = $user['account_guid']; // id of contact
 		//error_log(__METHOD__."(".array2string($data).") returning ".array2string($user));
 		return $user;
 	}
@@ -534,7 +526,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'u', self::$user_attributes)))
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
 		$user = $this->_ldap2user(array_shift($data));
 
@@ -557,10 +549,10 @@ 
 	 */
 	protected static function _when2ts($_when)
 	{
-		static $utc=null;
+		static $utc = null;
 		if (!isset($utc)) $utc = new DateTimeZone('UTC');
 
-		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
+		list($when) = explode('.', $_when); // remove .0Z not understood by createFromFormat
 		$datetime = egw_time::createFromFormat(self::WHEN_FORMAT, $when, $utc);
 		if (egw_time::$server_timezone) $datetime->setTimezone(egw_time::$server_timezone);
 
@@ -575,7 +567,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_group(array &$data, array $old=null)
+	protected function _save_group(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
@@ -586,7 +578,7 @@ 
 				'account_description' => 'description',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				$attributes[$adldap] = (string)$data[$egw];
 			}
@@ -623,11 +615,11 @@ 
 			'account_description' => 'description',
 		);
 		$ldap = array();
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_description':
 						$ldap[$adldap] = !empty($data[$egw]) ? $data[$egw] : array();
@@ -640,7 +632,7 @@ 
 			}
 		}
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret));
 			return false;
@@ -656,7 +648,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_user(array &$data, array $old=null)
+	protected function _save_user(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 		if (!isset($data['account_fullname']) && !empty($data['account_firstname']) && !empty($data['account_lastname']))
@@ -676,12 +668,12 @@ 
 				'account_status'    => 'enabled',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				if ($egw == 'account_passwd' && (empty($data[$egw]) ||
 					!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
 				{
-					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
+					continue; // do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
 				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
 			}
@@ -718,7 +710,7 @@ 
 			'account_firstname' => 'firstname',
 			'account_lastname'  => 'surname',
 			'account_email'     => 'email',
-			'account_fullname'  => 'display_name',	// handeled currently in rename above, as not supported by adLDAP
+			'account_fullname'  => 'display_name', // handeled currently in rename above, as not supported by adLDAP
 			'account_passwd'    => 'password',
 			'account_status'    => 'enabled',
 			'account_primary_group' => 'primarygroupid',
@@ -731,7 +723,7 @@ 
 		// for a new entry set certain values (eg. profilePath) to in setup configured value
 		if ($new_entry)
 		{
-			foreach($this->frontend->config as $name => $value)
+			foreach ($this->frontend->config as $name => $value)
 			{
 				if (substr($name, 0, 8) == 'ads_new_')
 				{
@@ -739,22 +731,22 @@ 
 				}
 			}
 		}
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_passwd':
 						if (!empty($data[$egw]) && ($this->adldap->getUseSSL() || $this->adldap->getUseTLS()))
 						{
-							$attributes[$adldap] = $data[$egw];	// only try to set password, if no SSL or TLS
+							$attributes[$adldap] = $data[$egw]; // only try to set password, if no SSL or TLS
 						}
 						break;
 					case 'account_primary_group':
 						// setting a primary group seems to fail, if user is no member of that group
 						if (isset($old['memberships'][$data[$egw]]) ||
-							$this->adldap->group()->addUser($group=$this->id2name($data[$egw]), $data['account_id']))
+							$this->adldap->group()->addUser($group = $this->id2name($data[$egw]), $data['account_id']))
 						{
 							$old['memberships'][$data[$egw]] = $group;
 							$ldap[$adldap] = abs($data[$egw]);
@@ -765,11 +757,10 @@ 
 						$ldap['userPrincipalName'] = $data[$egw].'@'.$this->frontend->config['ads_domain'];
 						break;
 					case 'account_expires':
-						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER :
-							self::convertUnixTimeToWindowsTime($data[$egw]);
+						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER : self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd'])) continue; // cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -791,7 +782,7 @@ 
 		}
 		//elseif ($attributes) error_log(__METHOD__."(".array2string($data).") adldap->user()->modify('$data[account_lid]', ".array2string($attributes).') returned '.array2string($ret).' '.function_backtrace());
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret).' ('.ldap_error($ds).') '.function_backtrace());
 			return false;
@@ -864,11 +855,11 @@ 
 			$query = ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] !== 'groups')
+			if ($param['type'] !== 'groups')
 			{
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -899,14 +890,14 @@ 
 					$membership_filter = '(|(memberOf='.$this->id2name((int)$param['type'], 'account_dn').')(PrimaryGroupId='.abs($param['type']).'))';
 					$filter = $filter ? "(&$membership_filter$filter)" : $membership_filter;
 				}
-				foreach($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
 				{
 					$account = $this->_ldap2user($data);
 					if ($param['active'] && !$this->frontend->is_active($account))
 					{
 						continue;
 					}
-					$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+					$account['account_fullname'] = common::display_fullname($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $account['account_id']);
 					$accounts[$account_id] = $account;
 				}
 			}
@@ -915,9 +906,9 @@ 
 				$query = ldap::quote(strtolower($param['query']));
 
 				$filter = null;
-				if(!empty($query) && $query != '*')
+				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -931,16 +922,16 @@ 
 					}
 					$filter = "(|(cn=$query)(description=$query))";
 				}
-				foreach($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
 				{
 					$accounts[$account_id] = $this->_ldap2group($data);
 				}
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$account_search[$unl_serial]['data'] = $sortedAccounts;
 
 			$account_search[$unl_serial]['total'] = $this->total = count($accounts);
@@ -948,7 +939,7 @@ 
 		//echo "<p>accounts_ldap::search() found $this->total: ".microtime()."</p>\n";
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['data'] = array_slice($sortedAccounts, $start, $offset);
 			$account_search[$serial]['total'] = $this->total;
@@ -979,19 +970,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	protected function _sort_callback($a,$b)
+	protected function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -1010,9 +1001,9 @@ 
 	 * @param array $accounts =array() array to add filtered accounts too, default empty array
 	 * @return array account_id => account_lid or values for $attrs pairs
 	 */
-	protected function filter($attr_filter, $account_type=null, array $attrs=null, array $accounts=array())
+	protected function filter($attr_filter, $account_type = null, array $attrs = null, array $accounts = array())
 	{
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'u':
 				$type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')';
@@ -1037,25 +1028,25 @@ 
 			}
 			else
 			{
-				foreach($attr_filter as $attr => $value)
+				foreach ($attr_filter as $attr => $value)
 				{
 					$filter .= '('.$attr.'='.$this->adldap->utilities()->ldapSlashes($value).')';
 				}
 			}
 			$filter .= $type_filter.')';
 		}
-		$sri = ldap_search($ds=$this->ldap_connection(), $context=$this->ads_context(), $filter,
+		$sri = ldap_search($ds = $this->ldap_connection(), $context = $this->ads_context(), $filter,
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
 			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
-			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
+			$sri = ldap_search($ds = $this->ldap_connection(true), $context = $this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
 
 		if ($sri && ($allValues = ldap_get_entries($ds, $sri)))
 		{
-			foreach($allValues as $key => $data)
+			foreach ($allValues as $key => $data)
 			{
 				if ($key === 'count') continue;
 
@@ -1069,7 +1060,7 @@ 
 
 				if ($data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT && $rid < self::MIN_ACCOUNT_ID)
 				{
-					continue;	// ignore system accounts incl. "Administrator"
+					continue; // ignore system accounts incl. "Administrator"
 				}
 				$accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP ? '-' : '').$rid] =
 					$attrs ? $data : translation::convert($data['samaccountname'][0], 'utf-8');
@@ -1093,7 +1084,7 @@ 
 	 * @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)
 	 */
-	public function name2id($name, $which='account_lid', $account_type=null)
+	public function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		static $to_ldap = array(
 			'account_lid'   => 'samaccountname',
@@ -1105,7 +1096,7 @@ 
 		$ret = false;
 		if (isset($to_ldap[$which]))
 		{
-			foreach($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
+			foreach ($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
 			{
 				unset($account_lid);
 				$ret = $account_id;
@@ -1125,9 +1116,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)
 	 */
-	public function id2name($account_id, $which='account_lid')
+	public function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1139,9 +1130,9 @@ 
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
-		unset($_account_id, $ip);	// not used, but required by function signature
+		unset($_account_id, $ip); // not used, but required by function signature
 
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1181,21 +1172,21 @@ 
 	 * @param int $account_id uidnumber
 	 * @return int number of added or removed memberships
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!($account = $this->id2name($account_id))) return;
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($groups, $current),		// add account to all groups he is currently not in
-			'remove' => array_diff($current, $groups),	// remove account from all groups he is only currently in
+		foreach (array(
+			'add' => array_diff($groups, $current), // add account to all groups he is currently not in
+			'remove' => array_diff($current, $groups), // remove account from all groups he is only currently in
 		) as $op => $memberships)
 		{
 			$func = $op.($account_id > 0 ? 'User' : 'Group');
-			foreach($memberships as $gid)
+			foreach ($memberships as $gid)
 			{
-				$ok = $this->adldap->group()->$func($group=$this->id2name($gid), $account);
+				$ok = $this->adldap->group()->$func($group = $this->id2name($gid), $account);
 				//error_log(__METHOD__.'('.array2string($groups).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1217,15 +1208,15 @@ 
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($users, $current),	// add members currently not in
-			'remove' => array_diff($current, $users),	// remove members only currently in
+		foreach (array(
+			'add' => array_diff($users, $current), // add members currently not in
+			'remove' => array_diff($current, $users), // remove members only currently in
 		) as $op => $members)
 		{
-			foreach($members as $account_id)
+			foreach ($members as $account_id)
 			{
 				$func = $op.($account_id > 0 ? 'User' : 'Group');
-				$ok = $this->adldap->group()->$func($group, $account=$this->id2name($account_id));
+				$ok = $this->adldap->group()->$func($group, $account = $this->id2name($account_id));
 				//error_log(__METHOD__.'('.array2string($users).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1250,7 +1241,7 @@ 
 	 */
 	public $charset = 'iso-8859-1';
 
-	function __construct(array $options=array())
+	function __construct(array $options = array())
 	{
 		if (isset($options['charset']))
 		{
@@ -1337,19 +1328,19 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes)) { return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes)) { return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes)) { return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password", $attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())) {
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
 		if (!array_key_exists("display_name", $attributes)) {
-			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
+			$attributes["display_name"] = $attributes["firstname"]." ".$attributes["surname"];
 		}
 
 		// Translate the schema
@@ -1372,20 +1363,20 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($add['unicodePwd']);
 
 		// Add the entry
-		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($ds = $this->adldap->getLdapConnection(), $dn = "CN=".$add["cn"][0].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
 
 		// now password can be added to still disabled account
-		if (array_key_exists("password",$attributes))
+		if (array_key_exists("password", $attributes))
 		{
 			if (!$this->setPassword($dn, $attributes['password'])) return false;
 
@@ -1412,13 +1403,13 @@ 
     */
     public function encodePassword($password)
     {
-        $password="\"".$password."\"";
+        $password = "\"".$password."\"";
         if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        $encoded = "";
+        for ($i = 0; $i < strlen($password); $i++) { $encoded .= "{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1435,7 +1426,7 @@ 
      */
     public function setPassword($dn, $password)
     {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+    	$result = ldap_mod_replace($ds = $this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
     	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
@@ -1463,7 +1454,7 @@ 
 	* @param string $old_password old password for password change, if supported
     * @return bool
     */
-    public function password($username, $password, $isGUID = false, $old_password=null)
+    public function password($username, $password, $isGUID = false, $old_password = null)
     {
         if ($username === NULL) { return false; }
         if ($password === NULL) { return false; }
@@ -1477,7 +1468,7 @@ 
             return false;
         }
 
-        $add=array();
+        $add = array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1499,11 +1490,11 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false) {
             $err = ldap_errno($this->adldap->getLdapConnection());
             if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                $msg = 'Error '.$err.': '.ldap_err2str($err).'.';
+                if ($err == 53) {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
@@ -1541,13 +1532,13 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes)) {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes)) {
+            if ($attributes["enabled"]) {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
             else {
@@ -1561,14 +1552,14 @@ 
 		if ($mod)
 		{
 	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+	        $result = @ldap_modify($ds = $this->adldap->getLdapConnection(), $userDn, $mod);
 	        if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+        if (array_key_exists("password", $attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1591,10 +1582,10 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes)) { return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1610,9 +1601,9 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
-		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($this->adldap->getLdapConnection(), "CN=".$add["cn"].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			return false;
 		}
@@ -1643,10 +1634,10 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str) {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function($matches) {
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

Braces +234 added lines, -78 removed lines

@@ -132,12 +132,21 @@ 
 	public static function get_adldap(array &$config=null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config)
+		{
+			$config =& $GLOBALS['egw_info']['server'];
+		}
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
-			if (empty($config['ads_host'])) throw new Exception("Required ADS host name(s) missing!");
-			if (empty($config['ads_domain'])) throw new Exception("Required ADS domain missing!");
+			if (empty($config['ads_host']))
+			{
+				throw new Exception("Required ADS host name(s) missing!");
+			}
+			if (empty($config['ads_domain']))
+			{
+				throw new Exception("Required ADS domain missing!");
+			}
 
 			$base_dn_parts = array();
 			foreach(explode('.', $config['ads_domain']) as $dc)
@@ -156,7 +165,10 @@ 
 				'charset' => translation::charset(),
 			);
 			$adldap[$config['ads_domain']] = new adLDAP_egw($options);
-			if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			}
 		}
 		//else error_log(__METHOD__."() returning cached adLDAP ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
 		return $adldap[$config['ads_domain']];
@@ -237,7 +249,10 @@ 
 			throw new egw_exception_wrong_userinput("Wrong or not configured ADS context '$context' (baseDN='$base')!");
 		}
 		$container = $matches[1];
-		if (self::$debug) error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		}
 		return $container;
 	}
 
@@ -330,10 +345,16 @@ 
 	 */
 	public function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$ret = $account_id < 0 ? $this->_read_group($account_id) : $this->_read_user($account_id);
-		if (self::$debug) error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -366,7 +387,10 @@ 
 		}
 		$ret = $is_group ? $this->_save_group($data, $old) : $this->_save_user($data, $old);
 
-		if (self::$debug) error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -396,7 +420,10 @@ 
 		{
 			$ret = $this->adldap->user()->delete($account_lid);
 		}
-		if (self::$debug) error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -558,11 +585,17 @@ 
 	protected static function _when2ts($_when)
 	{
 		static $utc=null;
-		if (!isset($utc)) $utc = new DateTimeZone('UTC');
+		if (!isset($utc))
+		{
+			$utc = new DateTimeZone('UTC');
+		}
 
 		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
 		$datetime = egw_time::createFromFormat(self::WHEN_FORMAT, $when, $utc);
-		if (egw_time::$server_timezone) $datetime->setTimezone(egw_time::$server_timezone);
+		if (egw_time::$server_timezone)
+		{
+			$datetime->setTimezone(egw_time::$server_timezone);
+		}
 
 		return $datetime->getTimestamp();
 	}
@@ -579,12 +612,15 @@ 
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
-		if (!$old)	// new entry
+		if (!$old)
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'group_name',
 				'account_description' => 'description',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -664,7 +700,9 @@ 
 			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
 		}
 
-		if (($new_entry = !$old))	// new entry
+		if (($new_entry = !$old))
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'username',
@@ -675,6 +713,7 @@ 
 				'account_passwd'    => 'password',
 				'account_status'    => 'enabled',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -683,7 +722,10 @@ 
 				{
 					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
-				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
+				if (isset($data[$egw]))
+				{
+					$attributes[$adldap] = $data[$egw];
+				}
 			}
 			$attributes['enabled'] = !isset($data['account_status']) || $data['account_status'] === 'A';
 			$attributes['container'] = $this->_get_container();
@@ -769,7 +811,11 @@ 
 							self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd']))
+						{
+							continue;
+						}
+						// cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -849,8 +895,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -1048,7 +1100,10 @@ 
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
-			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			if (self::$debug)
+			{
+				error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			}
 			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
@@ -1057,7 +1112,10 @@ 
 		{
 			foreach($allValues as $key => $data)
 			{
-				if ($key === 'count') continue;
+				if ($key === 'count')
+				{
+					continue;
+				}
 
 				if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ||
 					$account_type == 'g' && $data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP))
@@ -1075,7 +1133,10 @@ 
 					$attrs ? $data : translation::convert($data['samaccountname'][0], 'utf-8');
 			}
 		}
-		else if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		else if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		}
 
 		//error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returning ".array2string($accounts).' '.function_backtrace());
 		return $accounts;
@@ -1112,7 +1173,10 @@ 
 				break;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1154,7 +1218,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0) return false;
+		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0)
+		{
+			return false;
+		}
 
 		return $data['memberships'];
 	}
@@ -1169,7 +1236,10 @@ 
 	 */
 	function members($gid)
 	{
-		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0) return false;
+		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0)
+		{
+			return false;
+		}
 
 		return $data['members'];
 	}
@@ -1183,7 +1253,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!($account = $this->id2name($account_id))) return;
+		if (!($account = $this->id2name($account_id)))
+		{
+			return;
+		}
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
@@ -1200,7 +1273,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 
@@ -1213,7 +1289,10 @@ 
 	 */
 	function set_members($users, $gid)
 	{
-		if (!($group = $this->id2name($gid))) return;
+		if (!($group = $this->id2name($gid)))
+		{
+			return;
+		}
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
@@ -1230,7 +1309,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 }
@@ -1284,8 +1366,10 @@ 
 	 *
 	 * @return adLDAPUsers
 	 */
-	public function user() {
-		if (!$this->userClass) {
+	public function user()
+	{
+		if (!$this->userClass)
+		{
 			$this->userClass = new adLDAPUsers_egw($this);
 		}
 		return $this->userClass;
@@ -1296,8 +1380,10 @@ 
     *
     * @return adLDAPGroups
     */
-    public function group() {
-        if (!$this->groupClass) {
+    public function group()
+    {
+        if (!$this->groupClass)
+        {
             $this->groupClass = new adLDAPGroups_egw($this);
         }
         return $this->groupClass;
@@ -1308,8 +1394,10 @@ 
     *
     * @return adLDAPUtils
     */
-    public function utilities() {
-        if (!$this->utilClass) {
+    public function utilities()
+    {
+        if (!$this->utilClass)
+        {
             $this->utilClass = new adLDAPUtils_egw($this);
         }
         return $this->utilClass;
@@ -1337,18 +1425,32 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes))
+		{
+return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes))
+		{
+return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes))
+		{
+return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes))
+		{
+return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
+		{
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
-		if (!array_key_exists("display_name", $attributes)) {
+		if (!array_key_exists("display_name", $attributes))
+		{
 			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
 		}
 
@@ -1370,7 +1472,8 @@ 
 		$add["userAccountControl"][0] = $this->accountControl($control_options);
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
@@ -1379,7 +1482,8 @@ 
 
 		// Add the entry
 		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
@@ -1387,7 +1491,10 @@ 
 		// now password can be added to still disabled account
 		if (array_key_exists("password",$attributes))
 		{
-			if (!$this->setPassword($dn, $attributes['password'])) return false;
+			if (!$this->setPassword($dn, $attributes['password']))
+			{
+				return false;
+			}
 
 			// now account can be enabled
 			if ($attributes["enabled"])
@@ -1395,7 +1502,10 @@ 
 				$control_options = array("NORMAL_ACCOUNT");
 				$mod = array("userAccountControl" => $this->accountControl($control_options));
 				$result = ldap_modify($ds, $dn, $mod);
-				if (!$result) error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				if (!$result)
+				{
+					error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				}
 			}
 		}
 
@@ -1418,7 +1528,9 @@ 
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
         $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        for ($i=0; $i <strlen($password); $i++)
+        {
+$encoded.="{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1438,7 +1550,10 @@ 
     	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	if (!$result)
+    	{
+    		error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	}
     	return $result;
     }
 
@@ -1465,26 +1580,36 @@ 
     */
     public function password($username, $password, $isGUID = false, $old_password=null)
     {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return false; }
+        if ($password === NULL)
+        {
+return false; }
+        if (!$this->adldap->getLdapBind())
+        {
+return false; }
+        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
         $add=array();
 
-		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
+		if (empty($old_password) || !function_exists('ldap_modify_batch'))
+		{
 			$add["unicodePwd"][0] = $this->encodePassword($password);
 
 			$result = @ldap_mod_replace($this->adldap->getLdapConnection(), $userDn, $add);
 		}
-		else {
+		else
+		{
 			$mods = array(
 				array(
 					"attrib"  => "unicodePwd",
@@ -1499,16 +1624,20 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false)
+        {
             $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
+            if ($err)
+            {
                 $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                if($err == 53)
+                {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
             }
-            else {
+            else
+            {
                 return false;
             }
         }
@@ -1526,14 +1655,18 @@ 
     */
     public function modify($username, $attributes, $isGUID = false)
     {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return "Missing compulsory field [username]"; }
+        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         // Find the dn of the user
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
@@ -1541,16 +1674,20 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes))
+        {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes))
+        {
+            if ($attributes["enabled"])
+            {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
-            else {
+            else
+            {
                 $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
             }
             $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
@@ -1562,14 +1699,18 @@ 
 		{
 	        // Do the update
 	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
-				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
+	        if ($result == false)
+	        {
+				if (isset($mod['unicodePwd']))
+				{
+					$mod['unicodePwd'] = '***';
+				}
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
         if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
-		{
+        {
 			return false;
 		}
 		return true;
@@ -1591,10 +1732,18 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes))
+		{
+return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes))
+		{
+return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1604,16 +1753,21 @@ 
 		$add["cn"] = $attributes["group_name"];
 		$add["samaccountname"] = $attributes["group_name"];
 		$add["objectClass"] = "Group";
-		if (!empty($attributes["description"])) $add["description"] = $attributes["description"];
+		if (!empty($attributes["description"]))
+		{
+			$add["description"] = $attributes["description"];
+		}
 		//$add["member"] = $member_array; UNTESTED
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
 		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			return false;
 		}
 		return true;
@@ -1643,10 +1797,12 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str)
+    {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function ($matches)
+        	{
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

phpgwapi/inc/class.accounts_ldap.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{
@@ -995,7 +995,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1097,7 +1097,6 @@ 
 	 * @param int $gid gidnumber of group to set
 	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
-	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

Spacing +132 added lines, -135 removed lines

@@ -84,14 +84,14 @@ 
 	 */
 	var $requiredObjectClasses = array(
 		'user' => array(
-			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
+			'top', 'person', 'organizationalperson', 'inetorgperson', 'posixaccount', 'shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
 			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
 			'univentionperson', 'univentionmail', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
-			'top','posixgroup','groupofnames'
+			'top', 'posixgroup', 'groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
 			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
@@ -110,8 +110,8 @@ 
 	 */
 	var $group_mail_classes = array(
 		'dbmailforwardingaddress' => 'mailforwardingaddress',
-		'dbmailuser' => array('mailforwardingaddress','uid'),
-		'qmailuser' => array('mailforwardingaddress','uid'),
+		'dbmailuser' => array('mailforwardingaddress', 'uid'),
+		'qmailuser' => array('mailforwardingaddress', 'uid'),
 		'mailaccount' => 'mailalias',
 		'univentiongroup' => array(false, false, true),
 	);
@@ -155,7 +155,7 @@ 
 
 		$this->ldap = new ldap(true);
 		$this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 
 		$this->user_context  = $this->frontend->config['ldap_context'];
 		$this->account_filter = $this->frontend->config['ldap_search_filter'];
@@ -192,7 +192,7 @@ 
 	{
 		$is_group = $data['account_id'] < 0 || $data['account_type'] === 'g';
 
-		$data_utf8 = translation::convert($data,translation::charset(),'utf-8');
+		$data_utf8 = translation::convert($data, translation::charset(), 'utf-8');
 		$members = $data['account_members'];
 
 		if (!is_object($this->ldapServerInfo))
@@ -204,8 +204,7 @@ 
 		if ($data_utf8['account_id'] && $data_utf8['account_lid'])
 		{
 			// read the entry first, to check if the dn (account_lid) has changed
-			$sri = $is_group ? ldap_search($this->ds,$this->group_context,'gidnumber='.abs($data['account_id'])) :
-				ldap_search($this->ds,$this->user_context,'uidnumber='.$data['account_id']);
+			$sri = $is_group ? ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($data['account_id'])) : ldap_search($this->ds, $this->user_context, 'uidnumber='.$data['account_id']);
 			$old = ldap_get_entries($this->ds, $sri);
 
 			if (!$old['count'])
@@ -217,9 +216,9 @@ 
 				$old = ldap::result2array($old[0]);
 				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
-				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
-					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
-					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'],0,4) != 'uid='))
+				if ($is_group && ($key = array_search('namedobject', $old['objectclass'])) !== false ||
+					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 3) != 'cn=') ||
+					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 4) != 'uid='))
 				{
 					// query the memberships to set them again later
 					if (!$is_group)
@@ -248,7 +247,7 @@ 
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
-		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'],$old['objectclass']))
+		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'], $old['objectclass']))
 		{
 			// additional objectclasse might be already set in $to_write or $old
 			if (!is_array($to_write['objectclass']))
@@ -257,7 +256,7 @@ 
 			}
 			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
+				foreach ($this->requiredObjectClasses[$is_group ? 'group-if-supported' : 'user-if-supported'] as $additional)
 				{
 					$add = array();
 					if (is_array($additional))
@@ -279,8 +278,7 @@ 
 		{
 			if (!$data['account_lid']) return false;
 
-			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
-				'uid='.$data_utf8['account_lid'].','.$this->user_context;
+			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context : 'uid='.$data_utf8['account_lid'].','.$this->user_context;
 		}
 		// now we merge the user or group data
 		if ($is_group)
@@ -289,23 +287,23 @@ 
 			$data['account_type'] = 'g';
 
 			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
-			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
+			if ($members || !$old && array_intersect(array('groupofnames', 'groupofuniquenames', 'univentiongroup'), $objectclass))
 			{
 				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
-			foreach($this->group_mail_classes as $objectclass => $forward)
+			foreach ($this->group_mail_classes as $objectclass => $forward)
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward)) list($forward, $extra_attr, $keep_objectclass) = $forward;
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
+					($old && in_array($objectclass, $old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
 					if ($data_utf8['account_email'])	// setting an email
 					{
-						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
+						if (!in_array($objectclass, $old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
 							$to_write['objectclass'][] = $objectclass;
@@ -319,19 +317,19 @@ 
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
-								if (($email = $this->id2name($member,'account_email')))
+								if (($email = $this->id2name($member, 'account_email')))
 								{
 									$to_write[$forward][] = $email;
 								}
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif ($old)	// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
 						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass, $old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -345,7 +343,7 @@ 
 		}
 		else
 		{
-			$to_write = $this->_merge_user($to_write,$data_utf8,!$old);
+			$to_write = $this->_merge_user($to_write, $data_utf8, !$old);
 			// make sure multiple email-addresses in the mail attribute "survive"
 			if (isset($to_write[static::MAIL_ATTR]) && count($old[static::MAIL_ATTR]) > 1)
 			{
@@ -364,22 +362,22 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if (!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
 			unset($to_write['memberuid']);
 		}
 		//echo "<p>ldap_".($old ? 'modify' : 'add')."(,$dn,".print_r($to_write,true).")</p>\n";
 		// modifying or adding the entry
-		if ($old && !@ldap_modify($this->ds,$dn,$to_write) ||
-			!$old && !@ldap_add($this->ds,$dn,$to_write))
+		if ($old && !@ldap_modify($this->ds, $dn, $to_write) ||
+			!$old && !@ldap_add($this->ds, $dn, $to_write))
 		{
 			$err = true;
-			if ($is_group && ($key = array_search('groupofnames',$to_write['objectclass'])) !== false)
+			if ($is_group && ($key = array_search('groupofnames', $to_write['objectclass'])) !== false)
 			{
 				// try again with removed groupOfNames stuff, as I cant detect if posixGroup is a structural object
 				unset($to_write['objectclass'][$key]);
 				$to_write['objectclass'] = array_values($to_write['objectclass']);
 				unset($to_write['member']);
-				$err = $old ? !ldap_modify($this->ds,$dn,$to_write) : !ldap_add($this->ds,$dn,$to_write);
+				$err = $old ? !ldap_modify($this->ds, $dn, $to_write) : !ldap_add($this->ds, $dn, $to_write);
 			}
 			if ($err)
 			{
@@ -389,7 +387,7 @@ 
 		}
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		return $data['account_id'];
 	}
@@ -406,14 +404,14 @@ 
 
 		if ($account_id < 0)
 		{
-			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber=' . abs($account_id));
+			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($account_id));
 		}
 		else
 		{
 			// remove the user's memberships
-			$this->set_memberships(array(),$account_id);
+			$this->set_memberships(array(), $account_id);
 
-			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
+			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber='.$account_id);
 		}
 		if (!$sri) return false;
 
@@ -437,7 +435,7 @@ 
 		{
 			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
 		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
+		foreach (array_keys($this->group_mail_classes) as $objectclass)
 		{
 			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
@@ -445,15 +443,15 @@ 
 				break;
 			}
 		}
-		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(gidnumber='.abs($account_id).'))',
 			array('dn', 'gidnumber', 'cn', 'objectclass', static::MAIL_ATTR, 'memberuid', 'description'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
-		$data = translation::convert($ldap_data[0],'utf-8');
+		$data = translation::convert($ldap_data[0], 'utf-8');
 		unset($data['objectclass']['count']);
 
 		$group += array(
@@ -474,7 +472,7 @@ 
 		{
 			unset($data['memberuid']['count']);
 
-			foreach($data['memberuid'] as $lid)
+			foreach ($data['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -495,16 +493,16 @@ 
 	 */
 	protected function _read_user($account_id)
 	{
-		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber=' . (int)$account_id.'))',
-			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn',static::MAIL_ATTR,'userpassword','telephonenumber',
-				'shadowexpire','shadowlastchange','homedirectory','loginshell','createtimestamp','modifytimestamp'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber='.(int)$account_id.'))',
+			array('dn', 'uidnumber', 'uid', 'gidnumber', 'givenname', 'sn', 'cn', static::MAIL_ATTR, 'userpassword', 'telephonenumber',
+				'shadowexpire', 'shadowlastchange', 'homedirectory', 'loginshell', 'createtimestamp', 'modifytimestamp'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
-		$data = translation::convert($ldap_data[0],'utf-8');
+		$data = translation::convert($ldap_data[0], 'utf-8');
 
 		$utc_diff = date('Z');
 		$user = array(
@@ -524,13 +522,13 @@ 
 			// - if it's set to 0, the account is disabled
 			// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
-			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+($data['shadowlastchange'][0]!=0?$utc_diff:0) : null,
+			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0] * 24 * 3600 + $utc_diff < time() ? false : 'A',
+			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
+			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0] * 24 * 3600 + ($data['shadowlastchange'][0] != 0 ? $utc_diff : 0) : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
-			'person_id'         => $data['uid'][0],	// id of associated contact
+			'person_id'         => $data['uid'][0], // id of associated contact
 			'account_created' => isset($data['createtimestamp'][0]) ? self::accounts_ldap2ts($data['createtimestamp'][0]) : null,
 			'account_modified' => isset($data['modifytimestamp'][0]) ? self::accounts_ldap2ts($data['modifytimestamp'][0]) : null,
 		);
@@ -551,7 +549,7 @@ 
 	 * @param array $data array with account-data in utf-8
 	 * @return array merged data
 	 */
-	protected function _merge_group($to_write,$data,$old=null)
+	protected function _merge_group($to_write, $data, $old = null)
 	{
 		$to_write['gidnumber'] = abs($data['account_id']);
 		$to_write['cn'] = $data['account_lid'];
@@ -571,7 +569,7 @@ 
 	 * @param boolean $new_entry
 	 * @return array merged data
 	 */
-	protected function _merge_user($to_write,$data,$new_entry)
+	protected function _merge_user($to_write, $data, $new_entry)
 	{
 		//echo "<p>accounts_ldap::_merge_user(".print_r($to_write,true).','.print_r($data,true).",$new_entry)</p>\n";
 
@@ -582,12 +580,12 @@ 
 		{
 			$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
 		}
-		$to_write['sn']        = $data['account_lastname'];
+		$to_write['sn'] = $data['account_lastname'];
 		if (!$new_entry || $data['account_email'])
 		{
-			$to_write[static::MAIL_ATTR]  = $data['account_email'] ? $data['account_email'] : array();
+			$to_write[static::MAIL_ATTR] = $data['account_email'] ? $data['account_email'] : array();
 		}
-		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
+		$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
@@ -596,47 +594,46 @@ 
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']))	// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
+			$to_write['shadowlastchange'] = round((time() - $utc_diff) / (24 * 3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
+		$shadowexpire = ($data['account_expires'] - $utc_diff) / (24 * 3600);
 		//echo "<p align=right>account_expires=".date('Y-m-d H:i',$data['account_expires'])." --> $shadowexpire --> ".date('Y-m-d H:i',$account_expire)."</p>\n";
 		$to_write['shadowexpire'] = !$data['account_status'] ?
-			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) :
-			($data['account_expires'] != -1 ? round($shadowexpire) : array());	// array() = unset value
+			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) : ($data['account_expires'] != -1 ? round($shadowexpire) : array()); // array() = unset value
 
 		if ($new_entry && is_array($to_write['shadowexpire']) && !count($to_write['shadowexpire']))
 		{
-			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
+			unset($to_write['shadowexpire']); // gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change'] - $utc_diff) / (24 * 3600));
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change'] == 0) $to_write['shadowlastchange'] = 0;
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
+			if (isset($data['homedirectory'])) $to_write['homedirectory'] = $data['homedirectory'];
 			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
-			$to_write['homedirectory']  = '/dev/null';	// is a required attribute of posixAccount
+			$to_write['homedirectory'] = '/dev/null'; // is a required attribute of posixAccount
 		}
 		if ($new_entry && empty($to_write['loginshell']))
 		{
-			unset($to_write['loginshell']);	// setting array() for new entry gives "Protocol error", must not set it
+			unset($to_write['loginshell']); // setting array() for new entry gives "Protocol error", must not set it
 		}
 		return $to_write;
 	}
@@ -664,7 +661,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__."(".array2string($param).")");
-		$account_search =& accounts::$cache['account_search'];
+		$account_search = & accounts::$cache['account_search'];
 
 		// check if the query is cached
 		$serial = serialize($param);
@@ -690,12 +687,12 @@ 
 			$query = ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] != 'groups')
+			if ($param['type'] != 'groups')
 			{
 				$filter = "(&(objectclass=posixaccount)";
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -722,7 +719,7 @@ 
 					}
 				}
 				// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
-				$filter .= str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$this->account_filter);
+				$filter .= str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $this->account_filter);
 				$filter .= ')';
 
 				if ($param['type'] != 'both')
@@ -741,9 +738,9 @@ 
 						'account_fullname'  => 'cn',
 						'account_primary_group' => 'gidnumber',
 					);
-					$orders = explode(',',$param['order']);
+					$orders = explode(',', $param['order']);
 					$order = isset($propertyMap[$orders[0]]) ? $propertyMap[$orders[0]] : 'uid';
-					$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid', $order));
+					$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', $order));
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
@@ -753,7 +750,7 @@ 
 					if (is_numeric($param['type'])) // return only group-members
 					{
 						$relevantAccounts = array();
-						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
+						$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=".abs($param['type'])."))", array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
 					}
@@ -762,27 +759,27 @@ 
 					$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
 					$sortFn($fullSet);
 					$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
-					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter.')';
-					$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
+					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=', $relevantAccounts).'))'.$this->account_filter.')';
+					$filter = str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $filter);
 				}
-				$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn',static::MAIL_ATTR,'shadowExpire','createtimestamp','modifytimestamp','objectclass','gidNumber'));
+				$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', 'uidNumber', 'givenname', 'sn', static::MAIL_ATTR, 'shadowExpire', 'createtimestamp', 'modifytimestamp', 'objectclass', 'gidNumber'));
 				//echo "<p>ldap_search(,$this->user_context,'$filter',) ".($sri ? '' : ldap_error($this->ds)).microtime()."</p>\n";
 
 				$utc_diff = date('Z');
-				foreach(ldap_get_entries($this->ds, $sri) as $allVals)
+				foreach (ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
 						$account = Array(
 							'account_id'        => $allVals['uidnumber'][0],
-							'account_lid'       => translation::convert($allVals['uid'][0],'utf-8'),
+							'account_lid'       => translation::convert($allVals['uid'][0], 'utf-8'),
 							'account_type'      => 'u',
-							'account_firstname' => translation::convert($allVals['givenname'][0],'utf-8'),
-							'account_lastname'  => translation::convert($allVals['sn'][0],'utf-8'),
-							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0]*24*3600-$utc_diff < time() ? false : 'A',
-							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
+							'account_firstname' => translation::convert($allVals['givenname'][0], 'utf-8'),
+							'account_lastname'  => translation::convert($allVals['sn'][0], 'utf-8'),
+							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0] * 24 * 3600 - $utc_diff < time() ? false : 'A',
+							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
 							'account_email'     => $allVals[static::MAIL_ATTR][0],
 							'account_created' => isset($allVals['createtimestamp'][0]) ? self::accounts_ldap2ts($allVals['createtimestamp'][0]) : null,
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
@@ -794,7 +791,7 @@ 
 							if (isset($totalcount)) --$totalcount;
 							continue;
 						}
-						$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$allVals['uidnumber'][0]);
+						$account['account_fullname'] = common::display_fullname($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $allVals['uidnumber'][0]);
 						// return objectclass(es)
 						if ($param['objectclass'])
 						{
@@ -807,13 +804,13 @@ 
 			}
 			if ($param['type'] == 'groups' || $param['type'] == 'both')
 			{
-				if(empty($query) || $query == '*')
+				if (empty($query) || $query == '*')
 				{
 					$filter = '(objectclass=posixgroup)';
 				}
 				else
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -827,21 +824,21 @@ 
 					}
 					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
-				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
-				foreach((array)ldap_get_entries($this->ds, $sri) as $allVals)
+				$sri = ldap_search($this->ds, $this->group_context, $filter, array('cn', 'gidNumber'));
+				foreach ((array)ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
 						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
 							'account_id'        => -$allVals['gidnumber'][0],
-							'account_lid'       => translation::convert($allVals['cn'][0],'utf-8'),
+							'account_lid'       => translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_type'      => 'g',
-							'account_firstname' => translation::convert($allVals['cn'][0],'utf-8'),
+							'account_firstname' => translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_lastname'  => lang('Group'),
 							'account_status'    => 'A',
-							'account_fullname'  => translation::convert($allVals['cn'][0],'utf-8'),
+							'account_fullname'  => translation::convert($allVals['cn'][0], 'utf-8'),
 						);
 						if (isset($totalcount)) ++$totalcount;
 					}
@@ -849,9 +846,9 @@ 
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$this->total = isset($totalcount) ? $totalcount : count($accounts);
 
 			// if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
@@ -864,7 +861,7 @@ 
 		//echo "<p>accounts_ldap::search() found $this->total: ".microtime()."</p>\n";
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['total'] = $this->total;
 			return $account_search[$serial]['data'] = isset($totalcount) ? $sortedAccounts : array_slice($sortedAccounts, $start, $offset);
@@ -892,19 +889,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function _sort_callback($a,$b)
+	function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -923,8 +920,8 @@ 
 	{
 		if (!empty($date))
 		{
-			return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-				substr($date,4,2),substr($date,6,2),substr($date,0,4));
+			return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+				substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 		}
 		return NULL;
 	}
@@ -941,14 +938,14 @@ 
 	 * @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)
 	{
-		$name = ldap::quote(translation::convert($_name,translation::charset(),'utf-8'));
+		$name = ldap::quote(translation::convert($_name, translation::charset(), 'utf-8'));
 
 		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
 		{
 
-			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+			$sri = ldap_search($this->ds, $this->group_context, '(&(cn='.$name.')(objectclass=posixgroup))', array('gidNumber'));
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -965,7 +962,7 @@ 
 		    return False;
 		}
 
-		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'='.$name.')(objectclass=posixaccount))', array('uidNumber'));
 
 		$allValues = ldap_get_entries($this->ds, $sri);
 
@@ -985,9 +982,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);
 	}
 
 	/**
@@ -1000,7 +997,7 @@ 
 	function update_lastlogin($_account_id, $ip)
 	{
 		unset($_account_id, $ip);
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1011,11 +1008,11 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int)$account_id || !($account_lid = $this->id2name($account_id))) return false;
 
-		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.ldap::quote($account_lid).'))',array('cn','gidnumber'));
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(memberuid='.ldap::quote($account_lid).'))', array('cn', 'gidnumber'));
 		$memberships = array();
-		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
+		foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
 			if ($key === 'count') continue;
 
@@ -1036,13 +1033,13 @@ 
 		if (!is_numeric($_gid))
 		{
 			// try to recover
-			$_gid = $this->name2id($_gid,'account_lid','g');
+			$_gid = $this->name2id($_gid, 'account_lid', 'g');
 			if (!is_numeric($_gid)) return false;
 		}
 
-		$gid = abs($_gid);	// our gid is negative!
+		$gid = abs($_gid); // our gid is negative!
 
-		$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=$gid))",array('memberuid'));
+		$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=$gid))", array('memberuid'));
 		$group = ldap_get_entries($this->ds, $sri);
 
 		$members = array();
@@ -1050,7 +1047,7 @@ 
 		{
 			unset($group[0]['memberuid']['count']);
 
-			foreach($group[0]['memberuid'] as $lid)
+			foreach ($group[0]['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -1068,7 +1065,7 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		//echo "<p>accounts_ldap::set_memberships(".print_r($groups,true).",$account_id)</p>\n";
 
@@ -1076,21 +1073,21 @@ 
 		if (($old_memberships = $this->memberships($account_id)))
 		{
 			$old_memberships = array_keys($old_memberships);
-			foreach(array_diff($old_memberships,$groups) as $gid)
+			foreach (array_diff($old_memberships, $groups) as $gid)
 			{
 				if (($members = $this->members($gid)))
 				{
 					unset($members[$account_id]);
-					$this->set_members($members,$gid);
+					$this->set_members($members, $gid);
 				}
 			}
 		}
 		// adding new memberships
-		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
+		foreach ($old_memberships ? array_diff($groups, $old_memberships) : $groups as $gid)
 		{
 			$members = $this->members($gid);
 			$members[$account_id] = $this->id2name($account_id);
-			$this->set_members($members,$gid);
+			$this->set_members($members, $gid);
 		}
 	}
 
@@ -1104,16 +1101,16 @@ 
 	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
+	function set_members($members, $gid, array $objectclass = null, $use_cn = null)
 	{
 		//echo "<p>accounts_ldap::set_members(".print_r($members,true).",$gid)</p>\n";
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid, 'objectclass');
 
 		$to_write = array('memberuid' => array());
-		foreach((array)$members as $key => $member)
+		foreach ((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
@@ -1125,7 +1122,7 @@ 
 				{
 					$to_write['member'][] = $member_dn;
 				}
-				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass))
 				{
 					$to_write['uniquemember'][] = $member_dn;
 				}
@@ -1136,31 +1133,31 @@ 
 		{
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass) && !$to_write['uniquemember'])
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
-		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
+		if ($this->id2name($gid, 'account_email') && ($objectclass = $this->id2name($gid, 'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if (is_array($forward)) list($forward, $extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
-				foreach($members as $key => $member)
+				foreach ($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member, 'account_email')))	$to_write[$forward][] = $email;
 				}
 			}
 		}
-		if (!ldap_modify($this->ds,'cn='.ldap::quote($cn).','.$this->group_context,$to_write))
+		if (!ldap_modify($this->ds, 'cn='.ldap::quote($cn).','.$this->group_context, $to_write))
 		{
-			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write,true)."))\n";
+			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write, true)."))\n";
 			return false;
 		}
 		return true;
@@ -1173,7 +1170,7 @@ 
 	 * @param string $account_type ='u' (optional, default to 'u')
 	 * @return int|boolean integer account_id (negative for groups) or false if none is free anymore
 	 */
-	protected function _get_nextid($account_type='u')
+	protected function _get_nextid($account_type = 'u')
 	{
 		$min = $this->frontend->config['account_min_id'] ? $this->frontend->config['account_min_id'] : 0;
 		$max = $this->frontend->config['account_max_id'] ? $this->frontend->config['account_max_id'] : 0;
@@ -1195,15 +1192,15 @@ 
 		/* Loop until we find a free id */
 		do
 		{
-			$account_id = (int) common::next_id($type,$min,$max);
+			$account_id = (int)common::next_id($type, $min, $max);
 		}
-		while ($account_id && ($this->frontend->exists($sign * $account_id) ||	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || // check need to include the sign!
 			$this->frontend->exists(-1 * $sign * $account_id) ||
 			// if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number
 			// to ease migration to AD or Samba4
 			$GLOBALS['egw_info']['apps']['sambaadmin'] && ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id)));
 
-		if	(!$account_id || $max && $account_id > $max)
+		if (!$account_id || $max && $account_id > $max)
 		{
 			return False;
 		}
@@ -1216,6 +1213,6 @@ 
 	function __wakeup()
 	{
 		$this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 	}
 }

Braces +164 added lines, -42 removed lines

@@ -171,7 +171,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -234,17 +237,23 @@ 
 					$this->delete($data['account_id']);
 					unset($old['dn']);
 					// removing the namedObject object-class, if it's included
-					if ($key !== false) unset($old['objectclass'][$key]);
+					if ($key !== false)
+					{
+						unset($old['objectclass'][$key]);
+					}
 					$to_write = $old;
 					unset($old);
 				}
 			}
 		}
-		if (!$data['account_id'])	// new account
+		if (!$data['account_id'])
+		{
+			// new account
 		{
 			if (!($data['account_id'] = $data_utf8['account_id'] = $this->_get_nextid($is_group ? 'g' : 'u')))
 			{
 				return false;
+		}
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
@@ -255,11 +264,14 @@ 
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)
+			{
+				// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					$add = array();
+			}
 					if (is_array($additional))
 					{
 						$add = $additional;
@@ -268,7 +280,10 @@ 
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
-						if ($add) $to_write += $add;
+						if ($add)
+						{
+							$to_write += $add;
+						}
 					}
 				}
 			}
@@ -277,7 +292,10 @@ 
 		}
 		if (!($dn = $old['dn']))
 		{
-			if (!$data['account_lid']) return false;
+			if (!$data['account_lid'])
+			{
+				return false;
+			}
 
 			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
 				'uid='.$data_utf8['account_lid'].','.$this->user_context;
@@ -298,24 +316,36 @@ 
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward))
+				{
+					list($forward,$extra_attr,$keep_objectclass) = $forward;
+				}
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
-					if ($data_utf8['account_email'])	// setting an email
+					if ($data_utf8['account_email'])
+					{
+						// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
+					}
 							$to_write['objectclass'][] = $objectclass;
 						}
-						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = $data_utf8['account_lid'];
+						}
 						$to_write[static::MAIL_ATTR] = $data_utf8['account_email'];
 
 						if ($forward)
 						{
-							if (!$members) $members = $this->members($data['account_id']);
+							if (!$members)
+							{
+								$members = $this->members($data['account_id']);
+							}
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
@@ -326,11 +356,20 @@ 
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif($old)
+					{
+						// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
-						if ($forward) $to_write[$forward] = array();
-						if ($extra_attr) $to_write[$extra_attr] = array();
+					}
+						if ($forward)
+						{
+							$to_write[$forward] = array();
+						}
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = array();
+						}
 						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
@@ -364,7 +403,8 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid']))
+		{
 			unset($to_write['memberuid']);
 		}
 		//echo "<p>ldap_".($old ? 'modify' : 'add')."(,$dn,".print_r($to_write,true).")</p>\n";
@@ -402,7 +442,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -415,10 +458,16 @@ 
 
 			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
 		}
-		if (!$sri) return false;
+		if (!$sri)
+		{
+			return false;
+		}
 
 		$allValues = ldap_get_entries($this->ds, $sri);
-		if (!$allValues['count']) return false;
+		if (!$allValues['count'])
+		{
+			return false;
+		}
 
 		return ldap_delete($this->ds, $allValues[0]['dn']);
 	}
@@ -592,14 +641,20 @@ 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
-			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))	// md5 --> ldap md5
+			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))
+			{
+				// md5 --> ldap md5
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			}
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))
+			{
+				// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = auth::encrypt_ldap($data['account_passwd']);
 			}
+			}
 			$to_write['userpassword'] = $data['account_passwd'];
 			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
 		}
@@ -619,16 +674,28 @@ 
 			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change'])
+		{
+			$to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
+		}
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0)
+		{
+			$to_write['shadowlastchange'] = 0;
+		}
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
-			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			if (isset($data['homedirectory']))
+			{
+				$to_write['homedirectory']  = $data['homedirectory'];
+			}
+			if (isset($data['loginshell']))
+			{
+				$to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			}
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
@@ -675,8 +742,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -747,12 +820,18 @@ 
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
-						if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
+						if ($key !== 'count')
+						{
+							$fullSet[$entry['uid'][0]] = $entry[$order][0];
+						}
 					}
 
-					if (is_numeric($param['type'])) // return only group-members
+					if (is_numeric($param['type']))
+					{
+						// return only group-members
 					{
 						$relevantAccounts = array();
+					}
 						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
@@ -791,7 +870,10 @@ 
 						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
-							if (isset($totalcount)) --$totalcount;
+							if (isset($totalcount))
+							{
+								--$totalcount;
+							}
 							continue;
 						}
 						$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$allVals['uidnumber'][0]);
@@ -843,7 +925,10 @@ 
 							'account_status'    => 'A',
 							'account_fullname'  => translation::convert($allVals['cn'][0],'utf-8'),
 						);
-						if (isset($totalcount)) ++$totalcount;
+						if (isset($totalcount))
+						{
+							++$totalcount;
+						}
 					}
 				}
 			}
@@ -945,10 +1030,13 @@ 
 	{
 		$name = ldap::quote(translation::convert($_name,translation::charset(),'utf-8'));
 
-		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
+		if ($which == 'account_lid' && $account_type !== 'u')
+		{
+			// groups only support account_lid
 		{
 
 			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+		}
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -961,7 +1049,8 @@ 
 			'account_email' => static::MAIL_ATTR,
 			'account_fullname' => 'cn',
 		);
-		if (!isset($to_ldap[$which]) || $account_type === 'g') {
+		if (!isset($to_ldap[$which]) || $account_type === 'g')
+		{
 		    return False;
 		}
 
@@ -1011,13 +1100,19 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int) $account_id || !($account_lid = $this->id2name($account_id)))
+		{
+			return false;
+		}
 
 		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.ldap::quote($account_lid).'))',array('cn','gidnumber'));
 		$memberships = array();
 		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$memberships[(string) -$data['gidnumber'][0]] = $data['cn'][0];
 		}
@@ -1037,7 +1132,10 @@ 
 		{
 			// try to recover
 			$_gid = $this->name2id($_gid,'account_lid','g');
-			if (!is_numeric($_gid)) return false;
+			if (!is_numeric($_gid))
+			{
+				return false;
+			}
 		}
 
 		$gid = abs($_gid);	// our gid is negative!
@@ -1107,16 +1205,25 @@ 
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
 		//echo "<p>accounts_ldap::set_members(".print_r($members,true).",$gid)</p>\n";
-		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
+		if (!($cn = $use_cn) && !($cn = $this->id2name($gid)))
+		{
+			return false;
+		}
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass))
+		{
+			$objectclass = $this->id2name($gid,'objectclass');
+		}
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
-			if (is_numeric($member)) $member = $this->id2name($member);
+			if (is_numeric($member))
+			{
+				$member = $this->id2name($member);
+			}
 
 			if ($member)
 			{
@@ -1140,21 +1247,33 @@ 
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if ($use_cn) return $to_write;
+		if ($use_cn)
+		{
+			return $to_write;
+		}
 
 		// set the member email addresses as forwards
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
-			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
+			if (is_array($forward))
+			{
+				list($forward,$extra_attr) = $forward;
+			}
+			if ($extra_attr && ($uid = $this->id2name($gid)))
+			{
+				$to_write[$extra_attr] = $uid;
+			}
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
 				foreach($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member,'account_email')))
+					{
+						$to_write[$forward][] = $email;
+					}
 				}
 			}
 		}
@@ -1180,7 +1299,10 @@ 
 
 		// prefer ids above 1000 (below reserved for system users under AD or Linux),
 		// if that's possible within what is configured, or nothing is configured
-		if ($min < 1000 && (!$max || $max > 1000)) $min = 1000;
+		if ($min < 1000 && (!$max || $max > 1000))
+		{
+			$min = 1000;
+		}
 
 		if ($account_type == 'g')
 		{

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

@@ -775,7 +775,7 @@ 
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
-						$account = Array(
+						$account = array(
 							'account_id'        => $allVals['uidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
 							'account_type'      => 'u',
@@ -835,7 +835,7 @@ 
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
-						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
+						$accounts[(string)-$allVals['gidnumber'][0]] = array(
 							'account_id'        => -$allVals['gidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 							'account_type'      => 'g',

phpgwapi/inc/class.accounts_sql.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -639,7 +639,7 @@
 	 *
 	 * @param int $account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return string|boolean lastlogin time
 	 */
 	function update_lastlogin($account_id, $ip)
 	{

Spacing +54 added lines, -54 removed lines

@@ -192,38 +192,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'] = $GLOBALS['egw']->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;
 			}
@@ -272,15 +272,15 @@ 
 	{
 		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)
 		{
-			$GLOBALS['egw']->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
+			$GLOBALS['egw']->contacts->delete($contact_id, false); // false = allow to delete accounts (!)
 		}
 		return true;
 	}
@@ -296,11 +296,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);
 			}
 		}
 		//echo "accounts::memberships($account_id)"; _debug_array($memberships);
@@ -313,17 +313,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 =& CreateObject('phpgwapi.acl',$account_id);
+		$acl = & CreateObject('phpgwapi.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();
 	}
@@ -339,7 +339,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(acl::TABLE, array(
 				'acl_appname'  => 'phpgw_group',
 				'acl_location' => $account_id,
@@ -359,16 +359,16 @@ 
 	 * @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)
 	{
 		//echo "<p align=right>accounts::set_members(".print_r($members,true).",$gid)</p>\n";
-		$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);
 			}
 		}
 	}
@@ -403,20 +403,20 @@ 
 		);
 
 		// fetch order of account_fullname from common::display_fullname
-		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('[',']'),'',
-				common::display_fullname('account_lid','account_firstname','account_lastname'))), $param['order']);
+			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/', ',', str_replace(array('[', ']'), '',
+				common::display_fullname('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');
 
@@ -432,7 +432,7 @@ 
 		}
 
 		$filter = array();
-		switch($param['type'])
+		switch ($param['type'])
 		{
 			case 'accounts':
 				$filter['owner'] = 0;
@@ -447,9 +447,9 @@ 
 			case 'groupmembers':
 			case 'groupmembers+memberships':
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true)));
+					$members = array_unique(array_merge($members, (array)$this->members($grp, true)));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
 				}
 				$filter['account_id'] = $members;
@@ -481,13 +481,13 @@ 
 		}
 		if ($param['active'])
 		{
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),addressbook_sql::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), addressbook_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 .= '*';
@@ -495,7 +495,7 @@ 
 				case 'all':
 				default:
 				case 'exact':
-					foreach($search_cols as $col)
+					foreach ($search_cols as $col)
 					{
 						$criteria[$col] = $query;
 					}
@@ -516,7 +516,7 @@ 
 				case 'email':
 					$criteria['email'] = $query;
 					// Group email
-					if(in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
+					if (in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
 					{
 						$criteria[emailadmin_smtp_sql::TABLE.'.mail_value'] = $query;
 					}
@@ -526,12 +526,12 @@ 
 		if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
 
 		$accounts = array();
-		foreach((array) $GLOBALS['egw']->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)$GLOBALS['egw']->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)
 			{
@@ -571,13 +571,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;
@@ -608,11 +608,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;
@@ -629,9 +629,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);
 	}
 
 	/**
@@ -643,14 +643,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 +90 added lines, -22 removed lines

@@ -114,7 +114,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id > 0)
 		{
@@ -144,11 +147,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;
@@ -158,7 +164,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';
@@ -169,7 +178,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'];
+		}
 
 		//echo "accounts_sql::read($account_id)"; _debug_array($data);
 		return $data;
@@ -193,31 +205,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'] = $GLOBALS['egw']->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
@@ -270,7 +308,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');
 
@@ -293,7 +334,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)))
@@ -315,7 +359,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!(int)$account_id) return;
+		if (!(int)$account_id)
+		{
+			return;
+		}
 
 		$acl =& CreateObject('phpgwapi.acl',$account_id);
 		$acl->read_repository();
@@ -336,7 +383,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',
@@ -414,7 +464,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;
@@ -450,7 +503,10 @@ 
 				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
 					$members = array_unique(array_merge($members, (array)$this->members($grp,true)));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = abs($grp);
+					}
 				}
 				$filter['account_id'] = $members;
 				break;
@@ -469,9 +525,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(
@@ -523,7 +582,10 @@ 
 					break;
 			}
 		}
-		if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
+		if (!is_object($GLOBALS['egw']->contacts))
+		{
+			throw new exception('No $GLOBALS[egw]->contacts!');
+		}
 
 		$accounts = array();
 		foreach((array) $GLOBALS['egw']->contacts->search($criteria,
@@ -573,7 +635,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';
@@ -596,9 +661,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[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($where['account_lid']);
+				}
 					unset($where['account_lid']);
 				}
 		}

phpgwapi/inc/class.accounts_univention.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{

Spacing +6 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 			if (!$data['account_id'] && $data['account_type'] !== 'g')
 			{
 				$params = array(
-					'users/user','create',
+					'users/user', 'create',
 					'--binddn', $config['ldap_root_dn'],
 					'--bindpwd', 5=>$config['ldap_root_pw'],
 					'--position', $config['ldap_context'],
@@ -87,7 +87,7 @@ 
 						}
 						$hostname = $account->acc_imap_host;
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						unset($e);
 					}
 					if (empty($hostname)) $hostname = trim(system('hostname -f'));
@@ -99,14 +99,14 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
 				$data['account_dn'] = $matches[1];
 				$data['account_id'] = $this->name2id($data['account_lid'], 'account_lid', 'u');
 			}
-			elseif($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
+			elseif ($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
 				$data['account_lid'] != $data['old_loginid'] &&
 				($data['account_dn'] = $this->id2name($data['account_id'], 'account_dn')))
 			{
@@ -123,12 +123,11 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object modified: ((uid|cn)=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
-				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] :
-					// duno why but directory-manager returns old dn for groups ...
+				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] : // duno why but directory-manager returns old dn for groups ...
 					preg_replace('/^cn=[^,]+,/', 'cn='.$data['account_lid'].',', $data['account_dn']);
 			}
 		}

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 					catch(Exception $e) {
 						unset($e);
 					}
-					if (empty($hostname)) $hostname = trim(system('hostname -f'));
+					if (empty($hostname))
+					{
+						$hostname = trim(system('hostname -f'));
+					}
 					$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 				}
 				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));

phpgwapi/inc/class.asyncservice.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 	 * cancels a timer
 	 *
 	 * @param string $id has to be the one used to set it.
-	 * @return boolean True if the timer exists and is not expired.
+	 * @return integer True if the timer exists and is not expired.
 	 */
 	function cancel_timer($id)
 	{
@@ -470,7 +470,7 @@ 
 	/**
 	 * reads all matching db-rows / jobs
 	 *
-	 * @param string $id =0 reads all expired rows / jobs ready to run\
+	 * @param integer $id =0 reads all expired rows / jobs ready to run\
 	 * 	!= 0 reads all rows/jobs matching $id (sql-wildcards '%' and '_' can be used)
 	 * @param array|string $cols ='*' string or array of column-names / select-expressions
 	 * @param int|bool $offset =False offset for a limited query or False (default)
@@ -558,7 +558,7 @@ 
 	/**
 	 * delete db-row / job with $id
 	 *
-	 * @return boolean False if $id not found else True
+	 * @return integer False if $id not found else True
 	 */
 	function delete($id)
 	{

Spacing +74 added lines, -76 removed lines

@@ -49,9 +49,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/phpgwapi/cron/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/phpgwapi/cron/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -158,7 +158,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -176,24 +176,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -210,7 +210,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -302,12 +301,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -339,7 +338,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -361,7 +360,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -377,7 +376,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists) $where = array('async_next=0 OR async_next<'.(time() - 600));
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -386,20 +385,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -408,7 +407,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					egw_link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -420,7 +419,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -435,12 +434,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -478,7 +476,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'egw_db')) return false;
 
@@ -486,7 +484,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -500,21 +498,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(egw_db::strip_array_keys($row,'async_'), true);
+				$this->write(egw_db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = egw_db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = egw_db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -531,7 +529,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'egw_db')) return 0;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -587,38 +585,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -665,10 +663,10 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False)
+				elseif (strpos($line, $this->cronline) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -699,29 +697,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->other_cronlines as $cronline)
 				{
-					fwrite($crontab,$cronline);		// preserv the other lines on install
+					fwrite($crontab, $cronline); // preserv the other lines on install
 				}
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

Braces +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists)
+			{
+				$where = array('async_next=0 OR async_next<'.(time()-600));
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -388,7 +432,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -410,7 +457,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -480,7 +530,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'egw_db')) return false;
+		if (!is_a($this->db, 'egw_db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -533,9 +586,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'egw_db')) return 0;
+		if (!is_a($this->db, 'egw_db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -600,9 +659,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -622,10 +684,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5{0} == '/')	// we found a php5 binary
+			if ($this->php5{0} == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -696,7 +765,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines

phpgwapi/inc/class.auth.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -59,8 +59,8 @@ 
 	 * check if users are supposed to change their password every x sdays, then check if password is of old age
 	 * or the devil-admin reset the users password and forced the user to change his password on next login.
 	 *
-	 * @param string& $message =null on return false: message why password needs to be changed
-	 * @return boolean true: all good, false: password change required, null: password expires in N days
+	 * @param string $message =null on return false: message why password needs to be changed
+	 * @return boolean|null true: all good, false: password change required, null: password expires in N days
 	 */
 	static function check_password_change(&$message=null)
 	{
@@ -386,6 +386,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
+	 * @param string $type
 	 * @return boolean	 True on successful comparison
 	*/
 	static function crypt_compare($form_val, $db_val, &$type)
@@ -598,7 +599,7 @@ 
 	 * @param string $forbid_name =null if "yes" username or full-name split by delimiters AND longer then 3 chars are
 	 *  forbidden to be included in password, default to whatever set in config for "passwd_forbid_name"
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
-	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
+	 * @return string|false false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{

Indentation +4 added lines, -4 removed lines

@@ -407,7 +407,7 @@ 
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function crypt_compare($form_val, $db_val, &$type)
 	{
 		// detect type of hash by salt part of $db_val
@@ -706,7 +706,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function smd5_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SMD5} */
@@ -728,7 +728,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function sha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SHA} */
@@ -745,7 +745,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function ssha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SSHA} */

Spacing +94 added lines, -94 removed lines

@@ -18,7 +18,7 @@ 
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = $GLOBALS['egw_info']['server']['auth_type_'.$GLOBALS['egw_info']['flags']['currentapp']];
 }
-if(empty($GLOBALS['egw_info']['server']['auth_type']))
+if (empty($GLOBALS['egw_info']['server']['auth_type']))
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = 'sql';
 }
@@ -62,22 +62,22 @@ 
 	 * @param string& $message =null on return false: message why password needs to be changed
 	 * @return boolean true: all good, false: password change required, null: password expires in N days
 	 */
-	static function check_password_change(&$message=null)
+	static function check_password_change(&$message = null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
 		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
-		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& egw_cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		static $UserKnowsAboutPwdChange = null;
+		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange = & egw_cache::getSession('phpgwapi', 'auth_UserKnowsAboutPwdChange');
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
-		static $alpwchange_val=null;
-		static $pwdTsChecked=null;
+		static $alpwchange_val = null;
+		static $pwdTsChecked = null;
 		if (is_null($pwdTsChecked) && is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 		{
-			$alpwchange_val =& egw_cache::getSession('phpgwapi','auth_alpwchange_val'); // set that one with the session stored value
+			$alpwchange_val = & egw_cache::getSession('phpgwapi', 'auth_alpwchange_val'); // set that one with the session stored value
 			// initalize statics - better readability of conditions
 			if (is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 			{
@@ -85,7 +85,7 @@ 
 				$backend = new $backend_class;
 				// this may change behavior, as it should detect forced PasswordChanges from your Authentication System too.
 				// on the other side, if your auth system does not require an forcedPasswordChange, you will not be asked.
-				if (method_exists($backend,'getLastPwdChange'))
+				if (method_exists($backend, 'getLastPwdChange'))
 				{
 					$alpwchange_val = $backend->getLastPwdChange($GLOBALS['egw']->session->account_lid);
 					$pwdTsChecked = true;
@@ -99,8 +99,8 @@ 
 				//error_log(__METHOD__.__LINE__.'#'.$alpwchange_val.'# is null:'.is_null($alpwchange_val).'# is empty:'.empty($alpwchange_val).'# is set:'.isset($alpwchange_val));
 			}
 		}
-		static $passwordAgeBorder=null;
-		static $daysLeftUntilChangeReq=null;
+		static $passwordAgeBorder = null;
+		static $daysLeftUntilChangeReq = null;
 
 		// if neither timestamp isset return true, nothing to do (exept this means the password is too old)
 		if (is_null($alpwchange_val) &&
@@ -110,15 +110,15 @@ 
 		}
 		if (is_null($passwordAgeBorder) && $GLOBALS['egw_info']['server']['change_pwd_every_x_days'])
 		{
-			$passwordAgeBorder = (egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400));
+			$passwordAgeBorder = (egw_time::to('now', 'ts') - ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] * 86400));
 		}
 		if (is_null($daysLeftUntilChangeReq) && $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'])
 		{
 			// maxage - passwordage = days left until change is required
-			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((egw_time::to('now','ts')-($alpwchange_val?$alpwchange_val:0))/86400));
+			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((egw_time::to('now', 'ts') - ($alpwchange_val ? $alpwchange_val : 0)) / 86400));
 		}
-		if ($alpwchange_val == 0 ||	// admin requested password change
-			$passwordAgeBorder > $alpwchange_val ||	// change password every N days policy requests change
+		if ($alpwchange_val == 0 || // admin requested password change
+			$passwordAgeBorder > $alpwchange_val || // change password every N days policy requests change
 			// user should be warned N days in advance about change and is not yet
 			$GLOBALS['egw_info']['server']['change_pwd_every_x_days'] &&
 			$GLOBALS['egw_info']['user']['apps']['preferences'] &&
@@ -135,7 +135,7 @@ 
 				error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array(
 					'ts'=> $alpwchange_val,
 					'date'=>egw_time::to($alpwchange_val))));
-				$message = lang('It has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+				$message = lang('It has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 			}
 			else
 			{
@@ -146,7 +146,7 @@ 
 				{
 					$UserKnowsAboutPwdChange = true;
 				}
-				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
+				$message = lang('Your password is about to expire in %1 days, you may change your password now', round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
 				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
 				return null;
@@ -163,7 +163,7 @@ 
 	 */
 	static function check_password_age()
 	{
-		return true;	// no change
+		return true; // no change
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (method_exists($this->backend,'getLastPwdChange')) return $this->backend->getLastPwdChange($username);
+		if (method_exists($this->backend, 'getLastPwdChange')) return $this->backend->getLastPwdChange($username);
 		return false;
 	}
 
@@ -186,9 +186,9 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
-		if (method_exists($this->backend,'setLastPwdChange')) return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
+		if (method_exists($this->backend, 'setLastPwdChange')) return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
 		return false;
 	}
 
@@ -200,7 +200,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		return $this->backend->authenticate($username, $passwd, $passwd_type);
 	}
@@ -215,9 +215,9 @@ 
 	 * @throws Exception from backends having extra requirements
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		if (($err = self::crackcheck($new_passwd,null,null,null,$account_id)))
+		if (($err = self::crackcheck($new_passwd, null, null, null, $account_id)))
 		{
 			throw new egw_exception_wrong_userinput($err);
 		}
@@ -228,7 +228,7 @@ 
 				// need to change current users password in session
 				egw_cache::setSession('phpgwapi', 'password', base64_encode($new_passwd));
 				$GLOBALS['egw_info']['user']['passwd'] = $new_passwd;
-				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = egw_time::to('now','ts');
+				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = egw_time::to('now', 'ts');
 				// invalidate EGroupware session, as password is stored in egw_info in session
 				egw::invalidate_session_cache();
 			}
@@ -240,9 +240,9 @@ 
 				'old_passwd'  => $old_passwd,
 				'new_passwd'  => $new_passwd,
 			);
-			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
+			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'] + array(
 				'location' => 'changepassword'
-			),False,True);	// called for every app now, not only enabled ones)
+			), False, True); // called for every app now, not only enabled ones)
 		}
 		return $ret;
 	}
@@ -255,16 +255,16 @@ 
 	static function randomstring($size)
 	{
 		static $random_char = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 		);
 
 		$s = '';
-		for ($i=0; $i<$size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$s .= $random_char[mt_rand(1,61)];
+			$s .= $random_char[mt_rand(1, 61)];
 		}
 		return $s;
 	}
@@ -276,9 +276,9 @@ 
 	 *
 	 * @param $password password to encrypt
 	 */
-	static function encrypt_password($password,$sql=False)
+	static function encrypt_password($password, $sql = False)
 	{
-		if($sql)
+		if ($sql)
 		{
 			return self::encrypt_sql($password);
 		}
@@ -297,21 +297,21 @@ 
 	 * @param string &$type =null on return detected type of hash
 	 * @return boolean
 	 */
-	static function compare_password($cleartext, $encrypted, $type_in, $username='', &$type=null)
+	static function compare_password($cleartext, $encrypted, $type_in, $username = '', &$type = null)
 	{
 		// allow to specify the hash type to prefix the hash, to easy migrate passwords from ldap
 		$type = $type_in;
 		$saved_enc = $encrypted;
 		$matches = null;
-		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i',$encrypted,$matches))
+		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i', $encrypted, $matches))
 		{
 			$type = strtolower($matches[1]);
 			$encrypted = $matches[2];
 
-			switch($type)	// some hashs are specially "packed" in ldap
+			switch ($type)	// some hashs are specially "packed" in ldap
 			{
 				case 'md5':
-					$encrypted = implode('',unpack('H*',base64_decode($encrypted)));
+					$encrypted = implode('', unpack('H*', base64_decode($encrypted)));
 					break;
 				case 'plain':
 				case 'crypt':
@@ -322,24 +322,24 @@ 
 					break;
 			}
 		}
-		elseif($encrypted[0] == '$')
+		elseif ($encrypted[0] == '$')
 		{
 			$type = 'crypt';
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				$ret = $cleartext === $encrypted;
 				break;
 			case 'smd5':
-				$ret = self::smd5_compare($cleartext,$encrypted);
+				$ret = self::smd5_compare($cleartext, $encrypted);
 				break;
 			case 'sha':
-				$ret = self::sha_compare($cleartext,$encrypted);
+				$ret = self::sha_compare($cleartext, $encrypted);
 				break;
 			case 'ssha':
-				$ret = self::ssha_compare($cleartext,$encrypted);
+				$ret = self::ssha_compare($cleartext, $encrypted);
 				break;
 			case 'crypt':
 			case 'des':
@@ -352,7 +352,7 @@ 
 				$ret = self::crypt_compare($cleartext, $encrypted, $type);
 				break;
 			case 'md5_hmac':
-				$ret = self::md5_hmac_compare($cleartext,$encrypted,$username);
+				$ret = self::md5_hmac_compare($cleartext, $encrypted, $username);
 				break;
 			default:
 				$type = 'md5';
@@ -375,9 +375,9 @@ 
 		'ext_crypt' => array('CRYPT_EXT_DES', '_J9..', 4, ''),
 		'md5_crypt' => array('CRYPT_MD5', '$1$', 8, '$'),
 		//'old_blowfish_crypt' => array('CRYPT_BLOWFISH', '$2$', 13, ''),	// old blowfish hash not in line with php.net docu, but could be in use
-		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''),	// $2a$12$ = 2^12 = 4096 rounds
-		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
-		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
+		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''), // $2a$12$ = 2^12 = 4096 rounds
+		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'), // no "round=N$" --> default of 5000 rounds
+		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'), // no "round=N$" --> default of 5000 rounds
 	);
 
 	/**
@@ -392,17 +392,17 @@ 
 	{
 		// detect type of hash by salt part of $db_val
 		list($first, $dollar, $salt, $salt2) = explode('$', $db_val);
-		foreach(self::$crypt_params as $type => $params)
+		foreach (self::$crypt_params as $type => $params)
 		{
 			list(,$prefix, $random, $postfix) = $params;
 			list(,$d) = explode('$', $prefix);
 			if ($dollar === $d || !$dollar && ($first[0] === $prefix[0] || $first[0] !== '_' && !$prefix))
 			{
-				$len = !$postfix ? strlen($prefix)+$random : strlen($prefix.$salt.$postfix);
+				$len = !$postfix ? strlen($prefix) + $random : strlen($prefix.$salt.$postfix);
 				// sha(256|512) might contain options, explicit $rounds=N$ prefix in salt
 				if (($type == 'sha256_crypt' || $type == 'sha512_crypt') && substr($salt, 0, 7) === 'rounds=')
 				{
-					$len += strlen($salt2)+1;
+					$len += strlen($salt2) + 1;
 				}
 				break;
 			}
@@ -424,12 +424,12 @@ 
 	 * @param string $type =null default to $GLOBALS['egw_info']['server']['ldap_encryption_type']
 	 * @return string
 	 */
-	static function encrypt_ldap($password, $type=null)
+	static function encrypt_ldap($password, $type = null)
 	{
 		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
 
 		$salt = '';
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			default:	// eg. setup >> config never saved
 			case 'des':
@@ -443,7 +443,7 @@ 
 			case 'md5_crypt':
 			case 'ext_crypt':
 				list($const, $prefix, $len, $postfix) = self::$crypt_params[$type];
-				if(defined($const) && constant($const) == 1)
+				if (defined($const) && constant($const) == 1)
 				{
 					$salt = $prefix.self::randomstring($len).$postfix;
 					$e_password = '{crypt}'.crypt($password, $salt);
@@ -456,20 +456,20 @@ 
 				/* New method taken from the openldap-software list as recommended by
 				 * Kervin L. Pierre" <kervin@blueprint-tech.com>
 				 */
-				$e_password = '{md5}' . base64_encode(pack("H*",md5($password)));
+				$e_password = '{md5}'.base64_encode(pack("H*", md5($password)));
 				break;
 			case 'smd5':
 				$salt = self::randomstring(16);
-				$hash = md5($password . $salt, true);
-				$e_password = '{SMD5}' . base64_encode($hash . $salt);
+				$hash = md5($password.$salt, true);
+				$e_password = '{SMD5}'.base64_encode($hash.$salt);
 				break;
 			case 'sha':
-				$e_password = '{SHA}' . base64_encode(sha1($password,true));
+				$e_password = '{SHA}'.base64_encode(sha1($password, true));
 				break;
 			case 'ssha':
 				$salt = self::randomstring(16);
-				$hash = sha1($password . $salt, true);
-				$e_password = '{SSHA}' . base64_encode($hash . $salt);
+				$hash = sha1($password.$salt, true);
+				$e_password = '{SSHA}'.base64_encode($hash.$salt);
 				break;
 			case 'plain':
 				// if plain no type is prepended
@@ -487,7 +487,7 @@ 
 	 * @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type']
 	 * @return string hash
 	 */
-	static function encrypt_sql($password, $type=null)
+	static function encrypt_sql($password, $type = null)
 	{
 		/* Grab configured type, or default to md5() (old method) */
 		if (is_null($type))
@@ -495,7 +495,7 @@ 
 			$type = @$GLOBALS['egw_info']['server']['sql_encryption_type'] ?
 				strtolower($GLOBALS['egw_info']['server']['sql_encryption_type']) : 'md5';
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				// since md5 is the default, type plain must be prepended, for eGroupware to understand
@@ -537,28 +537,28 @@ 
 	 * @param string &$securest =null on return securest available hash
 	 * @return array hash => label
 	 */
-	public static function passwdhashes(&$securest=null)
+	public static function passwdhashes(&$securest = null)
 	{
 		$hashes = array();
 
 		/* Check for available crypt methods based on what is defined by php */
-		if(defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
+		if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
 		{
 			$hashes['blowfish_crypt'] = 'blowfish_crypt';
 		}
-		if(defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
+		if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
 		{
 			$hashes['sha512_crypt'] = 'sha512_crypt';
 		}
-		if(defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
+		if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
 		{
 			$hashes['sha256_crypt'] = 'sha256_crypt';
 		}
-		if(defined('CRYPT_MD5') && CRYPT_MD5 == 1)
+		if (defined('CRYPT_MD5') && CRYPT_MD5 == 1)
 		{
 			$hashes['md5_crypt'] = 'md5_crypt';
 		}
-		if(defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
+		if (defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
 		{
 			$hashes['ext_crypt'] = 'ext_crypt';
 		}
@@ -567,7 +567,7 @@ 
 			'smd5' => 'smd5',
 			'sha'  => 'sha',
 		);
-		if(@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
+		if (@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
 		{
 			$hashes['crypt'] = 'crypt';
 		}
@@ -600,7 +600,7 @@ 
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
 	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
-	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
+	static function crackcheck($passwd, $reqstrength = null, $minlength = null, $forbid_name = null, $account = null)
 	{
 		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
 		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
@@ -614,11 +614,11 @@ 
 		{
 			if (!isset($reqstrength) || $reqstrength == 5)
 			{
-				config::save_value('force_pwd_strength', $reqstrength=4, 'phpgwapi');
+				config::save_value('force_pwd_strength', $reqstrength = 4, 'phpgwapi');
 			}
 			if (!isset($minlength))
 			{
-				config::save_value('force_pwd_length', $minlength=7, 'phpgwapi');
+				config::save_value('force_pwd_length', $minlength = 7, 'phpgwapi');
 			}
 			config::save_value('check_save_passwd', null, 'phpgwapi');
 		}
@@ -637,7 +637,7 @@ 
 				throw new egw_exception_wrong_parameter('crackcheck(..., forbid_name=true, account) requires account-data!');
 			}
 			$parts = preg_split("/[,._ \t0-9-]+/", $account['account_fullname'].','.$account['account_lid']);
-			foreach($parts as $part)
+			foreach ($parts as $part)
 			{
 				if (strlen($part) > 2 && stripos($passwd, $part) !== false)
 				{
@@ -650,15 +650,15 @@ 
 		if ($reqstrength)
 		{
 			$missing = array();
-			if (!preg_match('/(.*\d.*){'. ($non=1). ',}/',$passwd))
+			if (!preg_match('/(.*\d.*){'.($non = 1).',}/', $passwd))
 			{
 				$missing[] = lang('numbers');
 			}
-			if (!preg_match('/(.*[[:upper:]].*){'. ($nou=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:upper:]].*){'.($nou = 1).',}/', $passwd))
 			{
 				$missing[] = lang('uppercase letters');
 			}
-			if (!preg_match('/(.*[[:lower:]].*){'. ($nol=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:lower:]].*){'.($nol = 1).',}/', $passwd))
 			{
 				$missing[] = lang('lowercase letters');
 			}
@@ -669,7 +669,7 @@ 
 			if (4 - count($missing) < $reqstrength)
 			{
 				$errors[] = lang('password contains only %1 of required %2 character classes: no %3',
-					4-count($missing), $reqstrength, implode(', ', $missing));
+					4 - count($missing), $reqstrength, implode(', ', $missing));
 			}
 		}
 		if ($errors)
@@ -687,19 +687,19 @@ 
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function smd5_compare($form_val,$db_val)
+	static function smd5_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SMD5} */
-		$hash = base64_decode(substr($db_val,6));
+		$hash = base64_decode(substr($db_val, 6));
 
 		/* SMD5 hashes are 16 bytes long */
-		$orig_hash = cut_bytes($hash, 0, 16);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 16); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 16);
 
-		$new_hash = md5($form_val . $salt,true);
+		$new_hash = md5($form_val.$salt, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -709,14 +709,14 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function sha_compare($form_val,$db_val)
+	static function sha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SHA} */
-		$hash = base64_decode(substr($db_val,5));
-		$new_hash = sha1($form_val,true);
+		$hash = base64_decode(substr($db_val, 5));
+		$new_hash = sha1($form_val, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($hash,$new_hash) == 0;
+		return strcmp($hash, $new_hash) == 0;
 	}
 
 	/**
@@ -726,18 +726,18 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
 	*/
-	static function ssha_compare($form_val,$db_val)
+	static function ssha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SSHA} */
 		$hash = base64_decode(substr($db_val, 6));
 
 		// SHA-1 hashes are 160 bits long
-		$orig_hash = cut_bytes($hash, 0, 20);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 20); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 20);
-		$new_hash = sha1($form_val . $salt,true);
+		$new_hash = sha1($form_val.$salt, true);
 
 		//error_log(__METHOD__."('$form_val', '$db_val') hash='$hash', orig_hash='$orig_hash', salt='$salt', new_hash='$new_hash' returning ".array2string(strcmp($orig_hash,$new_hash) == 0));
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -748,12 +748,12 @@ 
 	 * @param string $_key       key for md5_hmac-encryption (username for imported smf users)
 	 * @return boolean	 True on successful comparison
 	 */
-	static function md5_hmac_compare($form_val,$db_val,$_key)
+	static function md5_hmac_compare($form_val, $db_val, $_key)
 	{
 		$key = str_pad(strlen($_key) <= 64 ? $_key : pack('H*', md5($_key)), 64, chr(0x00));
-		$md5_hmac = md5(($key ^ str_repeat(chr(0x5c), 64)) . pack('H*', md5(($key ^ str_repeat(chr(0x36), 64)). $form_val)));
+		$md5_hmac = md5(($key^str_repeat(chr(0x5c), 64)).pack('H*', md5(($key^str_repeat(chr(0x36), 64)).$form_val)));
 
-		return strcmp($md5_hmac,$db_val) == 0;
+		return strcmp($md5_hmac, $db_val) == 0;
 	}
 }
 
@@ -770,7 +770,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text');
+	function authenticate($username, $passwd, $passwd_type = 'text');
 
 	/**
 	 * changes password in sql datababse
@@ -781,5 +781,5 @@ 
 	 * @throws Exception to give a verbose error, why changing password failed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0);
+	function change_password($old_passwd, $new_passwd, $account_id = 0);
 }

Braces +36 added lines, -9 removed lines

@@ -65,12 +65,18 @@ 
 	static function check_password_change(&$message=null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
-		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
+		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A')
+		{
+			return true;
+		}
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
 		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& egw_cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		if (is_null($UserKnowsAboutPwdChange))
+		{
+			$UserKnowsAboutPwdChange =& egw_cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		}
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
 		static $alpwchange_val=null;
@@ -148,7 +154,10 @@ 
 				}
 				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
-				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
+				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences'))
+				{
+					return true;
+				}
 				return null;
 			}
 			return false;
@@ -174,7 +183,10 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (method_exists($this->backend,'getLastPwdChange')) return $this->backend->getLastPwdChange($username);
+		if (method_exists($this->backend,'getLastPwdChange'))
+		{
+			return $this->backend->getLastPwdChange($username);
+		}
 		return false;
 	}
 
@@ -188,7 +200,10 @@ 
 	 */
 	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
 	{
-		if (method_exists($this->backend,'setLastPwdChange')) return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
+		if (method_exists($this->backend,'setLastPwdChange'))
+		{
+			return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
+		}
 		return false;
 	}
 
@@ -426,7 +441,10 @@ 
 	 */
 	static function encrypt_ldap($password, $type=null)
 	{
-		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		if (is_null($type))
+		{
+			$type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		}
 
 		$salt = '';
 		switch(strtolower($type))
@@ -602,9 +620,18 @@ 
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{
-		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
-		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
-		if (!isset($forbid_name)) $forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		if (!isset($reqstrength))
+		{
+			$reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
+		}
+		if (!isset($minlength))
+		{
+			$minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
+		}
+		if (!isset($forbid_name))
+		{
+			$forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		}
 
 		// load preferences translations, as changepassword get's called from admin too
 		translation::add_app('preferences');

phpgwapi/inc/class.auth_pam.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 *
 	 * @param string $old_passwd must be cleartext or empty to not to be checked
 	 * @param string $new_passwd must be cleartext
-	 * @param int $account_id=0 account id of user whose passwd should be changed
+	 * @param int $account_id account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
 	function change_password($old_passwd, $new_passwd, $account_id=0)

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param string $passwd_type='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		if (pam_auth($username, get_magic_quotes_gpc() ? stripslashes($passwd) : $passwd))
 		{
@@ -34,12 +34,12 @@ 
 			if (!$GLOBALS['egw']->accounts->name2id($username) &&
 				function_exists('posix_getpwnam') && ($data = posix_getpwnam($username)))
 			{
-				list($fullname) = explode(',',$data['gecos']);
-				$parts = explode(' ',$fullname);
+				list($fullname) = explode(',', $data['gecos']);
+				$parts = explode(' ', $fullname);
 				if (count($parts) > 1)
 				{
 					$lastname = array_pop($parts);
-					$firstname = implode(' ',$parts);
+					$firstname = implode(' ', $parts);
 					$email = common::email_address($firstname, $lastname, $username);
 
 					$GLOBALS['auto_create_acct'] = array(
@@ -63,7 +63,7 @@ 
 	 * @param int $account_id=0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		// deny password changes.
 		return False;

phpgwapi/inc/class.auth_sql.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -234,8 +234,7 @@
 	 * @param string $encrypted_passwd
 	 * @param string $new_passwd cleartext
 	 * @param int $account_id account id of user whose passwd should be changed
-	 * @param boolean $admin=false called by admin, if not update password in the session
-	 * @param boolean $update_lastpw_change=true
+	 * @param boolean $update_lastpw_change
 	 * @return boolean true if password successful changed, false otherwise
 	 */
 	private function _update_passwd($encrypted_passwd,$new_passwd,$account_id,$admin=false,$update_lastpw_change=true)

Spacing +35 added lines, -35 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param string $passwd_type='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		/* normal web form login */
 		$where = array(
@@ -61,25 +61,25 @@ 
 			$where[] = 'account_lid '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
 			unset($where['account_lid']);
 		}
-		if($passwd_type == 'text')
+		if ($passwd_type == 'text')
 		{
-			if (!($row = $this->db->select($this->table,'account_lid,account_pwd,account_lastlogin,account_id',$where,__LINE__,__FILE__)->fetch()) ||
+			if (!($row = $this->db->select($this->table, 'account_lid,account_pwd,account_lastlogin,account_id', $where, __LINE__, __FILE__)->fetch()) ||
 				empty($row['account_pwd']) ||
 				$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 			{
 				return false;
 			}
-			if(!($match = auth::compare_password($passwd, $row['account_pwd'], $this->type, strtolower($username), $type)) ||
-				$type != $this->type && in_array($type, explode(',',strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
+			if (!($match = auth::compare_password($passwd, $row['account_pwd'], $this->type, strtolower($username), $type)) ||
+				$type != $this->type && in_array($type, explode(',', strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
 			{
 				// do we have to migrate an old password ?
-				if($GLOBALS['egw_info']['server']['pwd_migration_allowed'] && !empty($GLOBALS['egw_info']['server']['pwd_migration_types']))
+				if ($GLOBALS['egw_info']['server']['pwd_migration_allowed'] && !empty($GLOBALS['egw_info']['server']['pwd_migration_types']))
 				{
 					if (!$match)
 					{
-						foreach(explode(',', $GLOBALS['egw_info']['server']['pwd_migration_types']) as $type)
+						foreach (explode(',', $GLOBALS['egw_info']['server']['pwd_migration_types']) as $type)
 						{
-							if(($match = auth::compare_password($passwd,$row['account_pwd'],$type,strtolower($username))))
+							if (($match = auth::compare_password($passwd, $row['account_pwd'], $type, strtolower($username))))
 							{
 								break;
 							}
@@ -88,7 +88,7 @@ 
 					if ($match)
 					{
 						$encrypted_passwd = auth::encrypt_sql($passwd);
-						$this->_update_passwd($encrypted_passwd,$passwd,$row['account_id'],false,true);
+						$this->_update_passwd($encrypted_passwd, $passwd, $row['account_id'], false, true);
 					}
 				}
 				if (!$match) return false;
@@ -98,7 +98,7 @@ 
 		else
 		{
 			$where['account_pwd'] = $passwd;
-			if (!($row = $this->db->select($this->table,'account_lid,account_lastlogin',$where,__LINE__,__FILE__)->fetch()) ||
+			if (!($row = $this->db->select($this->table, 'account_lid,account_lastlogin', $where, __LINE__, __FILE__)->fetch()) ||
 				$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 			{
 				return false;
@@ -129,7 +129,7 @@ 
 			$where[] = 'account_lid '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
 			unset($where['account_lid']);
 		}
-		if (!($row = $this->db->select($this->table,'account_lid,account_lastpwd_change',$where,__LINE__,__FILE__)->fetch()) ||
+		if (!($row = $this->db->select($this->table, 'account_lid,account_lastpwd_change', $where, __LINE__, __FILE__)->fetch()) ||
 			$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 		{
 			return false;
@@ -148,11 +148,11 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$admin = False;
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -163,28 +163,28 @@ 
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
 
-		if (($pw = $this->db->select($this->table,'account_pwd',array(
+		if (($pw = $this->db->select($this->table, 'account_pwd', array(
 			'account_id'     => $account_id,
 			'account_type'   => 'u',
 			'account_status' => 'A',
-		),__LINE__,__FILE__)->fetchColumn()) === false)
+		), __LINE__, __FILE__)->fetchColumn()) === false)
 		{
-			return false;	// account not found
+			return false; // account not found
 		}
 		// Check the passwd to make sure this is legal
-		if(!$admin && !auth::compare_password($passwd,$pw,$this->type,strtolower($username)))
+		if (!$admin && !auth::compare_password($passwd, $pw, $this->type, strtolower($username)))
 		{
 			return false;
 		}
-		$lastpwdchange = (is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange);
-		$this->db->update($this->table,array(
+		$lastpwdchange = (is_null($lastpwdchange) || $lastpwdchange < 0 ? time() : $lastpwdchange);
+		$this->db->update($this->table, array(
 			'account_lastpwd_change' => $lastpwdchange,
-		),array(
+		), array(
 			'account_id' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		if(!$this->db->affected_rows()) return false;
-		if (!$admin) egw_cache::setSession('phpgwapi','auth_alpwchange_val',$lastpwdchange);
+		if (!$this->db->affected_rows()) return false;
+		if (!$admin) egw_cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
 		return true;
 	}
 
@@ -196,11 +196,11 @@ 
 	 * @param int $account_id account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id)
+		if (!$account_id)
 		{
 			$admin = False;
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -211,21 +211,21 @@ 
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
 
-		if (($pw = $this->db->select($this->table,'account_pwd',array(
+		if (($pw = $this->db->select($this->table, 'account_pwd', array(
 			'account_id'     => $account_id,
 			'account_type'   => 'u',
-		),__LINE__,__FILE__)->fetchColumn()) === false)
+		), __LINE__, __FILE__)->fetchColumn()) === false)
 		{
-			return false;	// account not found
+			return false; // account not found
 		}
 		// Check the old_passwd to make sure this is legal
-		if(!$admin && !auth::compare_password($old_passwd,$pw,$this->type,strtolower($username)))
+		if (!$admin && !auth::compare_password($old_passwd, $pw, $this->type, strtolower($username)))
 		{
 			return false;
 		}
 
 		// old password ok, or admin called the function from the admin application (no old passwd available).
-		return $this->_update_passwd(auth::encrypt_sql($new_passwd),$new_passwd,$account_id,$admin);
+		return $this->_update_passwd(auth::encrypt_sql($new_passwd), $new_passwd, $account_id, $admin);
 	}
 
 	/**
@@ -238,21 +238,21 @@ 
 	 * @param boolean $update_lastpw_change=true
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	private function _update_passwd($encrypted_passwd,$new_passwd,$account_id,$admin=false,$update_lastpw_change=true)
+	private function _update_passwd($encrypted_passwd, $new_passwd, $account_id, $admin = false, $update_lastpw_change = true)
 	{
 		$update = array('account_pwd' => $encrypted_passwd);
 		if ($update_lastpw_change) $update['account_lastpwd_change'] = time();
 
-		if (!$this->db->update($this->table,$update,array(
+		if (!$this->db->update($this->table, $update, array(
 			'account_id' => $account_id,
-		),__LINE__,__FILE__))
+		), __LINE__, __FILE__))
 		{
 			return false;
 		}
 
-		if(!$admin)
+		if (!$admin)
 		{
-			egw_cache::setSession('phpgwapi','auth_alpwchange_val',$update['account_lastpwd_change']);
+			egw_cache::setSession('phpgwapi', 'auth_alpwchange_val', $update['account_lastpwd_change']);
 		}
 		return true;
 	}

Braces +24 added lines, -6 removed lines

@@ -56,9 +56,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if($passwd_type == 'text')
@@ -91,7 +94,10 @@ 
 						$this->_update_passwd($encrypted_passwd,$passwd,$row['account_id'],false,true);
 					}
 				}
-				if (!$match) return false;
+				if (!$match)
+				{
+					return false;
+				}
 			}
 		}
 		/* Auth via crypted password. NOTE: mail needs cleartext password to authenticate against mailserver! */
@@ -124,9 +130,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if (!($row = $this->db->select($this->table,'account_lid,account_lastpwd_change',$where,__LINE__,__FILE__)->fetch()) ||
@@ -183,8 +192,14 @@ 
 			'account_id' => $account_id,
 		),__LINE__,__FILE__);
 
-		if(!$this->db->affected_rows()) return false;
-		if (!$admin) egw_cache::setSession('phpgwapi','auth_alpwchange_val',$lastpwdchange);
+		if(!$this->db->affected_rows())
+		{
+			return false;
+		}
+		if (!$admin)
+		{
+			egw_cache::setSession('phpgwapi','auth_alpwchange_val',$lastpwdchange);
+		}
 		return true;
 	}
 
@@ -241,7 +256,10 @@ 
 	private function _update_passwd($encrypted_passwd,$new_passwd,$account_id,$admin=false,$update_lastpw_change=true)
 	{
 		$update = array('account_pwd' => $encrypted_passwd);
-		if ($update_lastpw_change) $update['account_lastpwd_change'] = time();
+		if ($update_lastpw_change)
+		{
+			$update['account_lastpwd_change'] = time();
+		}
 
 		if (!$this->db->update($this->table,$update,array(
 			'account_id' => $account_id,

phpgwapi/inc/class.categories.inc.php

Doc Comments +20 added lines, -28 removed lines

@@ -178,18 +178,16 @@ 
 	/**
 	 * return an array populated with categories
 	 *
-	 * @param string $type='all' 'subs','mains','appandmains','appandsubs','noglobal','noglobalapp', defaults to 'all'
-	 * @param int $start=0 see $limit
+	 * @param int $start see $limit
 	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query='' query-pattern
-	 * @param string $sort='ASC' sort order, defaults to 'ASC'
 	 * @param string $order='' order by, default cat_main, cat_level, cat_name ASC
 	 * @param boolean|string $globals includes the global egroupware categories or not,
 	 * 	'all_no_acl' to return global and all non-private user categories independent of ACL
-	 * @param array|int $parent_id=null return only subcats of $parent_id(s)
+	 * @param array|int $parent_id return only subcats of $parent_id(s)
 	 * @param int $lastmod = -1 if > 0 return only cats modified since then
 	 * @param string $column='' if column-name given only that column is returned, not the full array with all cat-data
-	 * @param array $filter=null array with column-name (without cat_-prefix) => value pairs (! negates the value)
+	 * @param array $filter array with column-name (without cat_-prefix) => value pairs (! negates the value)
 	 * @return array of cat-arrays or $column values
 	 */
 	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
@@ -324,15 +322,13 @@ 
 	/**
 	 * return a sorted array populated with categories (main sorting criteria is hierachy!)
 	 *
-	 * @param int $start=0 see $limit
-	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
+	 * @param int $start see $limit
+	 * @param boolean $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query='' query-pattern
-	 * @param string $sort='ASC' sort order, either defaults to 'ASC'
-	 * @param string $order='cat_name' order by
 	 * @param boolean|string $globals includes the global egroupware categories or not,
 	 * 	'all_no_acl' to return global and all non-private user categories independent of ACL
-	 * @param array|int $parent_id=0 return only subcats of $parent_id(s)
-	 * @param boolean $unserialize_data=true return $cat['data'] as array (not serialized array)
+	 * @param array|int $parent_id return only subcats of $parent_id(s)
+	 * @param boolean $unserialize_data return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
@@ -429,7 +425,7 @@ 
 	 *
 	 * Owner and appname are set from the values used to instanciate the class!
 	 *
-	 * @param array $value cat-data
+	 * @param array $values cat-data
 	 * @return int new cat-id
 	 */
 	function add($values)
@@ -508,9 +504,9 @@ 
 	 *
 	 * @param int $needed necessary ACL right: EGW_ACL_{READ|EDIT|DELETE}
 	 * @param mixed $category category as array or the category_id
-	 * @param boolean $no_acl_check=false if true, grants are NOT checked, gives access to all non-private categories of all users
+	 * @param boolean $no_acl_check if true, grants are NOT checked, gives access to all non-private categories of all users
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
-	 * @return boolean true permission granted, false for permission denied, null for category does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for category does not exist
 	 */
 	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
 	{
@@ -570,8 +566,8 @@ 
 	 * delete a category
 	 *
 	 * @param int $cat_id category id
-	 * @param boolean $drop_subs=false if true delete sub-cats too
-	 * @param boolean $modify_subs=false if true make the subs owned by the parent of $cat_id
+	 * @param boolean $drop_subs if true delete sub-cats too
+	 * @param boolean $modify_subs if true make the subs owned by the parent of $cat_id
 	 */
 	function delete($cat_id, $drop_subs = False, $modify_subs = False)
 	{
@@ -769,7 +765,6 @@ 
 	 * - cat's of other user
 	 *
 	 * @param string $cat_name cat-name
-	 * @param boolean|string $strip=false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
 	function name2id($cat_name, $strip=false)
@@ -821,8 +816,8 @@ 
 	 * Check if category is global (owner <= 0 || appname == 'phpgw')
 	 *
 	 * @param int|array $cat
-	 * @param boolean $application_global=false true check for application global categories only (appname == 'phpgw')
-	 * @return boolean
+	 * @param boolean $application_global true check for application global categories only (appname == 'phpgw')
+	 * @return null|boolean
 	 */
 	static function is_global($cat,$application_global=false)
 	{
@@ -842,8 +837,7 @@ 
 	 * We use a shared cache together with read
 	 * $item == 'data' is returned as array (not serialized array)!
 	 *
-	 * @param int $cat_id=0 cat-id
-	 * @param string $item='name' requested information, 'path' = / delimited path of category names (incl. parents)
+	 * @param int $cat_id cat-id
 	 * @return string information or '--' if not found or !$cat_id
 	 */
 	static function id2name($cat_id=0, $item='name')
@@ -883,8 +877,8 @@ 
 	 *
 	 * @param string $type subs or mains
 	 * @param string $cat_name='' category name
-	 * @param int $cat_id=0 category id
-	 * @param int $parent=0 category id of parent
+	 * @param int $cat_id category id
+	 * @param int $parent category id of parent
 	 * @return int/boolean cat_id or false if cat not exists
 	 */
 	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
@@ -914,8 +908,6 @@ 
 	 * Change the owner of all cats owned by $owner to $to OR deletes them if !$to
 	 *
 	 * @param int $owner owner or the cats to delete or change
-	 * @param int $to=0 new owner or 0 to delete the cats
-	 * @param string $app='' if given only cats matching $app are modifed/deleted
 	 */
 	function change_owner($owner,$to=0,$app='')
 	{
@@ -1030,7 +1022,7 @@ 
 	 *
 	 * @param string appname
 	 *
-	 * @return Returns the URL, but you do not need to do anything with it.
+	 * @return string the URL, but you do not need to do anything with it.
 	 */
 	public static function css($appname)
 	{
@@ -1047,7 +1039,7 @@ 
 	 * Delete categories belonging to a given account, when account got deleted
 	 *
 	 * @param int $account_id
-	 * @param int $new_owner=null for users data can be transfered to new owner
+	 * @param int $new_owner for users data can be transfered to new owner
 	 * @return int number of deleted or modified categories
 	 */
 	public static function delete_account($account_id, $new_owner=null)
@@ -1138,7 +1130,7 @@ 
 	/**
 	 * return into a select box, list or other formats
 	 *
-	 * @param string/array $format string 'select' or 'list', or array with all params
+	 * @param string $format string 'select' or 'list', or array with all params
 	 * @param string $type='' subs or mains
 	 * @param int/array $selected - cat_id or array with cat_id values
 	 * @param boolean $globals True or False, includes the global egroupware categories or not

Spacing +151 added lines, -151 removed lines

@@ -118,23 +118,23 @@ 
 	 * @param int|string $accountid='' account id or lid, default to current user
 	 * @param string $app_name='' app name defaults to current app
 	 */
-	function __construct($accountid='',$app_name = '')
+	function __construct($accountid = '', $app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
 		{
-			$this->account_id = (int) $accountid;
+			$this->account_id = (int)$accountid;
 		}
 		else
 		{
-			$this->account_id	= (int) get_account_id($accountid);
+			$this->account_id = (int)get_account_id($accountid);
 			$this->global_owners = $this->account_id ? $GLOBALS['egw']->accounts->memberships($this->account_id, true) : array();
 			$this->global_owners[] = self::GLOBAL_ACCOUNT;
 		}
-		$this->app_name		= $app_name;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->app_name = $app_name;
+		$this->db = $GLOBALS['egw']->db;
 
 		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
 		{
@@ -151,9 +151,9 @@ 
 	 *
 	 * @deprecated
 	 */
-	function categories($accountid='',$app_name='')
+	function categories($accountid = '', $app_name = '')
 	{
-		self::__construct($accountid,$app_name);
+		self::__construct($accountid, $app_name);
 	}
 
 	/**
@@ -164,12 +164,12 @@ 
 	 */
 	function return_all_children($cat_id)
 	{
-		$all_children = (array) $cat_id;
+		$all_children = (array)$cat_id;
 
-		$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
+		$children = $this->return_array('subs', 0, False, '', '', '', True, $cat_id, -1, 'id');
 		if (is_array($children) && count($children))
 		{
-			$all_children = array_merge($all_children,$this->return_all_children($children));
+			$all_children = array_merge($all_children, $this->return_all_children($children));
 		}
 		//echo "<p>categories::return_all_children($cat_id)=(".implode(',',$all_children).")</p>\n";
 		return $all_children;
@@ -192,24 +192,24 @@ 
 	 * @param array $filter=null array with column-name (without cat_-prefix) => value pairs (! negates the value)
 	 * @return array of cat-arrays or $column values
 	 */
-	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
+	function return_array($type = 'all', $start = 0, $limit = true, $query = '', $sort = 'ASC', $order = '', $globals = false, $parent_id = null, $lastmod = -1, $column = '', $filter = null)
 	{
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,globals=$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).") account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 		$cats = array();
-		foreach(self::$cache as $cat)
+		foreach (self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter) foreach ($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1) || trim($cat[$col]) == substr($val, 1)) continue 2;
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1)) continue 2;
 					}
 				}
 				elseif (is_array($val))
@@ -217,11 +217,11 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col], $val) && !in_array(trim($cat[$col]), $val)) continue 2;
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col], $val)) continue 2;
 					}
 				}
 				else
@@ -238,7 +238,7 @@ 
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'], (array)$parent_id)) continue;
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -247,7 +247,7 @@ 
 			}
 
 			// check for read permission
-			if(!$this->check_perms(EGW_ACL_READ, $cat, $globals === 'all_no_acl'))
+			if (!$this->check_perms(EGW_ACL_READ, $cat, $globals === 'all_no_acl'))
 			{
 				continue;
 			}
@@ -256,7 +256,7 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent']) continue 2; // 2 for switch AND foreach!
 					break;
 				case 'mains':
 					if ($cat['parent']) continue 2;
@@ -276,7 +276,7 @@ 
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'], $query) === false && stristr($cat['description'], $query) === false) continue;
 
 			// check if last modified since
 			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
@@ -293,31 +293,31 @@ 
 		if (!$sort) $sort = 'ASC';
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
-			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
+			preg_match('/^[a-zA-Z_(), ]+$/', $order) && preg_match('/^(ASC|DESC|asc|desc)$/', $sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order, 'cat_data') !== false) $order = 'cat_data'; // sitemgr orders by round(cat_data)!
+			if (substr($order, 0, 4) == 'cat_') $order = substr($order, 4);
 			$sign = strtoupper($sort) == 'DESC' ? '-' : '';
-			usort($cats,create_function('$a,$b',$func=(in_array($order,array('name','description','appname','app_name')) ?
+			usort($cats, create_function('$a,$b', $func = (in_array($order, array('name', 'description', 'appname', 'app_name')) ?
 				"return ${sign}strcasecmp(\$a['$order'],\$b['$order']);" : "return $sign(int)\$a['$order'] - $sign(int)\$b['$order'];")));
 		}
 		// limit the number of returned rows
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
 		// return only a certain column (why not return is as value?)
 		if ($column)
 		{
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k] = $cat[$column];
 			}
 		}
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).",$unserialize_data) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
 
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -335,7 +335,7 @@ 
 	 * @param boolean $unserialize_data=true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
-	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
+	function return_sorted_array($start = 0, $limit = True, $query = '', $sort = 'ASC', $order = 'cat_name', $globals = False, $parent_id = 0, $unserialize_data = true, $filter = null)
 	{
 		if (!$sort)  $sort = 'ASC';
 		if (!$order) $order = 'cat_name';
@@ -345,27 +345,27 @@ 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
-		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
+		if ($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if (!($cats = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parent_id, -1, '', $filter, $unserialize_data)))
 		{
 			$cats = array();
 		}
-		foreach($cats as $cat)
+		foreach ($cats as $cat)
 		{
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if ($parent_id || !$cats) // Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
 			{
-				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
+				if (!($subs = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parents, -1, '', $filter, $unserialize_data)))
 				{
 					break;
 				}
 				$parents = $children = array();
-				foreach($subs as $cat)
+				foreach ($subs as $cat)
 				{
 					$parents[] = $cat['id'];
 					$children[$cat['parent']][] = $cat;
@@ -375,12 +375,12 @@ 
 				{
 					$cats2 = $cats;
 					$cats = array();
-					foreach($cats2 as $cat)
+					foreach ($cats2 as $cat)
 					{
 						$cats[] = $cat;
 						if (isset($children[$cat['id']]))
 						{
-							foreach($children[$cat['id']] as $child)
+							foreach ($children[$cat['id']] as $child)
 							{
 								$cats[] = $child;
 							}
@@ -395,9 +395,9 @@ 
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -418,7 +418,7 @@ 
 		if (!isset(self::$cache[$id])) return false;
 
 		$cat = self::$cache[$id];
-		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
+		$cat['data'] = $cat['data'] ? ((($arr = json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
 			$arr : $cat['data']) : array();
 
 		return $cat;
@@ -436,31 +436,31 @@ 
 	{
 		if ((int)$values['parent'] > 0)
 		{
-			$values['level'] = $this->id2name($values['parent'],'level')+1;
-			$values['main'] = $this->id2name($values['parent'],'main');
+			$values['level'] = $this->id2name($values['parent'], 'level') + 1;
+			$values['main'] = $this->id2name($values['parent'], 'main');
 		}
 		else
 		{
 			$values['level'] = 0;
 		}
-		$this->db->insert(self::TABLE,$cat=array(
+		$this->db->insert(self::TABLE, $cat = array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner' => isset($values['owner']) ? $values['owner'] : $this->account_id,
 			'cat_access'  => isset($values['access']) ? $values['access'] : 'public',
 			'cat_appname' => $this->app_name,
 			'cat_name'    => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from returned one
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from returned one
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_main'    => $values['main'],
 			'cat_level'   => $values['level'],
 			'last_mod'    => time(),
-		),(int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(),__LINE__,__FILE__);
+		), (int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(), __LINE__, __FILE__);
 
-		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
+		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE, 'cat_id');
 
 		if (!(int)$values['parent'] && $id != $values['main'])
 		{
-			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_main' => $id), array('cat_id' => $id), __LINE__, __FILE__);
 			$cat['cat_main'] = $id;
 		}
 		// update cache accordingly
@@ -482,20 +482,20 @@ 
 		if (empty($cat_list)) return $cat_list;
 		if (is_array($cat_list))
 		{
-			$cat_list = implode(',',$cat_list);
+			$cat_list = implode(',', $cat_list);
 			//error_log(__METHOD__.__LINE__.' string expected, array found for cat_list. Converted to:'.$cat_list);
 		}
-		$cat_arr = explode(',',$cat_list);
+		$cat_arr = explode(',', $cat_list);
 		if (!empty($cat_arr) && is_array($cat_arr) && count($cat_arr) > 0)
 		{
-			foreach($cat_arr as $id=>$cat_id)
+			foreach ($cat_arr as $id=>$cat_id)
 			{
 				if (!$this->check_perms($needed, $cat_id, false, $needed == EGW_ACL_READ))	// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
 			}
-			$cat_list = implode(',',$cat_arr);
+			$cat_list = implode(',', $cat_arr);
 		}
 
 		return $cat_list;
@@ -512,7 +512,7 @@ 
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
 	 * @return boolean true permission granted, false for permission denied, null for category does not exist
 	 */
-	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
+	public function check_perms($needed, $category, $no_acl_check = false, $allow_global_read = false)
 	{
 		if (!is_array($category) && !($category = self::read($category)))
 		{
@@ -528,8 +528,8 @@ 
 		}
 
 		// Read access to global categories
-		if ($needed == EGW_ACL_READ && (($is_global=array_intersect(explode(',',$category['owner']),$this->global_owners)) ||
-			$no_acl_check && $category['access'] == 'public') &&	// no_acl_check only means public cats
+		if ($needed == EGW_ACL_READ && (($is_global = array_intersect(explode(',', $category['owner']), $this->global_owners)) ||
+			$no_acl_check && $category['access'] == 'public') && // no_acl_check only means public cats
 			($category['appname'] == self::GLOBAL_APPNAME || $category['appname'] == $this->app_name ||
 			$is_global && $allow_global_read))
 		{
@@ -552,16 +552,16 @@ 
 		// Load the application grants
 		if ($category['appname'] == $this->app_name && is_null($this->grants))
 		{
-			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name,true);
+			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name, true);
 		}
 
 		// Check for ACL granted access, the self::GLOBAL_ACCOUNT user must not get access by ACL to keep old behaviour
 		$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && $category['appname'] == $this->app_name;
 		$owner_grant = false;
-		foreach(explode(',',$category['owner']) as $owner)
+		foreach (explode(',', $category['owner']) as $owner)
 		{
-			$owner_grant = $owner_grant || (($this->grants[$owner] & $needed) &&
-				($category['access'] == 'public' ||  ($this->grants[$owner] & EGW_ACL_PRIVATE)));
+			$owner_grant = $owner_grant || (($this->grants[$owner]&$needed) &&
+				($category['access'] == 'public' || ($this->grants[$owner]&EGW_ACL_PRIVATE)));
 		}
 		return $acl_grant && $owner_grant;
 	}
@@ -578,35 +578,35 @@ 
 		//error_log(__METHOD__."(".array2string($cat_id).', drop_subs='.array2string($drop_subs).', modify_subs='.array2string($modify_subs).') '.function_backtrace());
 		if ($modify_subs)
 		{
-			$new_parent = $this->id2name($cat_id,'parent');
+			$new_parent = $this->id2name($cat_id, 'parent');
 
-			foreach ((array) $this->return_sorted_array('',False,'','','',False, $cat_id) as $cat)
+			foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $cat_id) as $cat)
 			{
 				if ($cat['level'] == 1)
 				{
-					$this->db->update(self::TABLE,array(
+					$this->db->update(self::TABLE, array(
 						'cat_level'  => 0,
 						'cat_parent' => 0,
 						'cat_main'   => $cat['id'],
-					),array(
+					), array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
 					$new_main = $cat['id'];
 				}
 				else
 				{
-					$update = array('cat_level' => $cat['level']-1);
+					$update = array('cat_level' => $cat['level'] - 1);
 
 					if ($new_main) $update['cat_main'] = $new_main;
 
 					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
 
-					$this->db->update(self::TABLE,$update,array(
+					$this->db->update(self::TABLE, $update, array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 		}
@@ -627,16 +627,16 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if ($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'], False, True); // called for every app now, not only enabled ones)
 		}
 		else
 		{
-			$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'], self::id2name($cat_id,'appname'));
+			$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'], self::id2name($cat_id, 'appname'));
 		}
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		// update cache accordingly
 		self::invalidate_cache($modify_subs ? null : $where['cat_id']);
@@ -652,17 +652,17 @@ 
 	 */
 	function adapt_level_in_subtree($values)
 	{
-		foreach ((array) $this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['parent'] == $values['id'])
 			{
-				$this->db->update(self::TABLE,array(
-					'cat_level' => $values['level']+1,
+				$this->db->update(self::TABLE, array(
+					'cat_level' => $values['level'] + 1,
 					'last_mod' => time(),
-				),array(
+				), array(
 					'cat_id' => $cat['id'],
 					'cat_appname' => $this->app_name,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				$cat['level'] = $values['level'] + 1;
 				self::invalidate_cache($cat['id']);
 				$this->adapt_level_in_subtree($cat);
@@ -683,14 +683,14 @@ 
 	function check_consistency4update($values)
 	{
 		// check if we try to move an element down its own subtree, which will fail
-		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ($this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent'] == $values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent'] > 0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
 		return true;
 	}
 
@@ -709,7 +709,7 @@ 
 			$ret = $this->check_consistency4update($values);
 			if ($ret !== true) throw new egw_exception_wrong_userinput($ret);
 			// everything seems in order -> proceed
-			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
+			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'], 'level') + 1 : 0);
 			$this->adapt_level_in_subtree($values);
 
 			return $this->add($values);
@@ -723,8 +723,8 @@ 
 				if ($ret !== true) throw new egw_exception_wrong_userinput($ret);
 
 				// everything seems in order -> proceed
-				$values['main']  = $this->id2name($values['parent'],'main');
-				$values['level'] = $this->id2name($values['parent'],'level') + 1;
+				$values['main']  = $this->id2name($values['parent'], 'main');
+				$values['level'] = $this->id2name($values['parent'], 'level') + 1;
 			}
 			else
 			{
@@ -735,9 +735,9 @@ 
 			// adapt the level info in each child
 			$this->adapt_level_in_subtree($values);
 		}
-		$this->db->update(self::TABLE,$cat=array(
+		$this->db->update(self::TABLE, $cat = array(
 			'cat_name' => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from the one read
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from the one read
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_parent' => $values['parent'],
 			'cat_access' => $values['access'],
@@ -745,10 +745,10 @@ 
 			'cat_main' => $values['main'],
 			'cat_level' => $values['level'],
 			'last_mod' => time(),
-		),array(
+		), array(
 			'cat_id' => $values['id'],
 			'cat_appname' => $this->app_name,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$cat['cat_id'] = $values['id'];
 		$cat['cat_appname'] = $this->app_name;
@@ -772,9 +772,9 @@ 
 	 * @param boolean|string $strip=false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
-	function name2id($cat_name, $strip=false)
+	function name2id($cat_name, $strip = false)
 	{
-		static $cache = array();	// a litle bit of caching
+		static $cache = array(); // a litle bit of caching
 
 		if (isset($cache[$cat_name])) return $cache[$cat_name];
 
@@ -795,26 +795,26 @@ 
 			$cats[] = $stripped_cat_name;
 		}
 
-		if (!($cats = $this->return_array('all',0,false,'','','',true,null,-1,'',array(
+		if (!($cats = $this->return_array('all', 0, false, '', '', '', true, null, -1, '', array(
 			'name' => $cats,
 			'appname' => array($this->app_name, self::GLOBAL_APPNAME),
 		))))
 		{
-			return 0;	// cat not found, dont cache it, as it might be created in this request
+			return 0; // cat not found, dont cache it, as it might be created in this request
 		}
 		if (count($cats) > 1)
 		{
 			// if more the one cat matches we weight them by: exact name match; own, global, other users cat; appplication cats
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k]['weight'] = 100 * ($cat['name'] == $cat_name) +
 					10 * ($cat['owner'] == $this->account_id ? 3 : ($cat['owner'] <= self::GLOBAL_ACCOUNT ? 2 : 1)) +
 					($cat['appname'] != self::GLOBAL_APPNAME);
 			}
 			// sort heighest weight to the top
-			usort($cats,create_function('$a,$b',"return \$b['weight'] - \$a['weight'];"));
+			usort($cats, create_function('$a,$b', "return \$b['weight'] - \$a['weight'];"));
 		}
-		return $cache[$cat['cat_name']] = (int) $cats[0]['id'];
+		return $cache[$cat['cat_name']] = (int)$cats[0]['id'];
 	}
 
 	/**
@@ -824,12 +824,12 @@ 
 	 * @param boolean $application_global=false true check for application global categories only (appname == 'phpgw')
 	 * @return boolean
 	 */
-	static function is_global($cat,$application_global=false)
+	static function is_global($cat, $application_global = false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat))) return null; // cat not found
 
 		$global_owner = false;
-		foreach(explode(',',$cat['owner']) as $owner)
+		foreach (explode(',', $cat['owner']) as $owner)
 		{
 			$global_owner = $global_owner || $owner <= self::GLOBAL_ACCOUNT;
 		}
@@ -846,9 +846,9 @@ 
 	 * @param string $item='name' requested information, 'path' = / delimited path of category names (incl. parents)
 	 * @return string information or '--' if not found or !$cat_id
 	 */
-	static function id2name($cat_id=0, $item='name')
+	static function id2name($cat_id = 0, $item = 'name')
 	{
-		if(!$cat_id) return '--';
+		if (!$cat_id) return '--';
 		if (!$item) $item = 'parent';
 
 		if (is_null(self::$cache)) self::init_cache();
@@ -858,7 +858,7 @@ 
 		{
 			if ($cat['parent'])
 			{
-				return self::id2name($cat['parent'],'path').' / '.$cat['name'];
+				return self::id2name($cat['parent'], 'path').' / '.$cat['name'];
 			}
 			$item = 'name';
 		}
@@ -887,7 +887,7 @@ 
 	 * @param int $parent=0 category id of parent
 	 * @return int/boolean cat_id or false if cat not exists
 	 */
-	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
+	function exists($type, $cat_name = '', $cat_id = 0, $parent = 0)
 	{
 		if ($cat_name)
 		{
@@ -898,7 +898,7 @@ 
 		{
 			$filter['id'] = $cat_id;
 		}
-		if (!($cats = $this->return_array($type,0,false,'','','',true,$parent,-1,'id',$filter)))
+		if (!($cats = $this->return_array($type, 0, false, '', '', '', true, $parent, -1, 'id', $filter)))
 		{
 			$ret = false;
 		}
@@ -917,7 +917,7 @@ 
 	 * @param int $to=0 new owner or 0 to delete the cats
 	 * @param string $app='' if given only cats matching $app are modifed/deleted
 	 */
-	function change_owner($owner,$to=0,$app='')
+	function change_owner($owner, $to = 0, $app = '')
 	{
 		$where = array('cat_owner' => $owner);
 
@@ -925,11 +925,11 @@ 
 
 		if ((int)$to)
 		{
-			$this->db->update(self::TABLE,array('cat_owner' => $to),$where,__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_owner' => $to), $where, __LINE__, __FILE__);
 		}
 		else
 		{
-			$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+			$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 		}
 		// update cache accordingly
 		self::invalidate_cache();
@@ -947,10 +947,10 @@ 
 		if (is_null(self::$cache))
 		{
 			// check if we are already updated to global owner == 0, if not do it now
-			if (!$GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',array('cat_owner'=>'0'),__LINE__,__FILE__)->fetchColumn())
+			if (!$GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', array('cat_owner'=>'0'), __LINE__, __FILE__)->fetchColumn())
 			{
-				$GLOBALS['egw']->db->update(self::TABLE,array('cat_owner'=>'0'),"(cat_owner='-1' OR cat_appname='phpgw')",__LINE__,__FILE__);
-				$GLOBALS['egw']->db->insert(self::TABLE,array(
+				$GLOBALS['egw']->db->update(self::TABLE, array('cat_owner'=>'0'), "(cat_owner='-1' OR cat_appname='phpgw')", __LINE__, __FILE__);
+				$GLOBALS['egw']->db->insert(self::TABLE, array(
 					'cat_main'    => 0,
 					'cat_parent'  => 0,
 					'cat_level'   => 0,
@@ -959,15 +959,15 @@ 
 					'cat_name'    => 'global=0',
 					'cat_description' => 'global=0',
 					'last_mod'    => time(),
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 			self::$cache = array();
 			// read all cats (cant use $this->db!)
-			foreach($GLOBALS['egw']->db->select(self::TABLE,'*',false,__LINE__,__FILE__,
-				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
+			foreach ($GLOBALS['egw']->db->select(self::TABLE, '*', false, __LINE__, __FILE__,
+				false, 'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
-				$cat = egw_db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				$cat = egw_db::strip_array_keys($cat, 'cat_');
+				if ($cat['appname'] == '*update*') continue; // --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -977,7 +977,7 @@ 
 				if (isset(self::$cache[$cat['id']]))
 				{
 					$cat['children'] = self::$cache[$cat['id']]['children'];
-					unset(self::$cache[$cat['id']]);	// otherwise the order gets messed up!
+					unset(self::$cache[$cat['id']]); // otherwise the order gets messed up!
 				}
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @param int|array $cat concerned id(s) or array with cat-data or null for all cats
 	 */
-	public static function invalidate_cache($cat=null)
+	public static function invalidate_cache($cat = null)
 	{
 		//error_log(__METHOD__."(".array2string($cat).') '.function_backtrace());
 
@@ -1006,12 +1006,12 @@ 
 		{
 			if (!is_array($cat) || isset($cat[0]))
 			{
-				foreach((array)$cat as $cat_id)
+				foreach ((array)$cat as $cat_id)
 				{
 					unset(self::$cache[$cat_id]);
 				}
 			}
-			elseif($cat['id'])
+			elseif ($cat['id'])
 			{
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -1034,8 +1034,8 @@ 
 	 */
 	public static function css($appname)
 	{
-		$cats = new categories('',$appname);
-		$last_mod = $cats->return_array('all',0,1,'','DESC','last_mod', $appname == self::GLOBAL_APPNAME);
+		$cats = new categories('', $appname);
+		$last_mod = $cats->return_array('all', 0, 1, '', 'DESC', 'last_mod', $appname == self::GLOBAL_APPNAME);
 		$time = count($last_mod) ? $last_mod[0]['last_mod'] : time();
 		$path = '/phpgwapi/categories.php?app='.$appname.'&'.$time;
 		egw_framework::includeCSS($path);
@@ -1050,13 +1050,13 @@ 
 	 * @param int $new_owner=null for users data can be transfered to new owner
 	 * @return int number of deleted or modified categories
 	 */
-	public static function delete_account($account_id, $new_owner=null)
+	public static function delete_account($account_id, $new_owner = null)
 	{
 		if (is_null(self::$cache)) self::init_cache();
 
 		$deleted = 0;
 		$cat = null;
-		foreach(self::$cache as $cat_id => $data)
+		foreach (self::$cache as $cat_id => $data)
 		{
 			if ($data['owner'] && ($owners = explode(',', $data['owner'])) && ($owner_key = array_search($account_id, $owners)) !== false)
 			{
@@ -1098,9 +1098,9 @@ 
 
 		$checked = array();
 		$deleted = 0;
-		foreach(self::$cache as $data)
+		foreach (self::$cache as $data)
 		{
-			foreach(explode(',', $data['owner']) as $owner)
+			foreach (explode(',', $data['owner']) as $owner)
 			{
 				if ($owner && !in_array($owner, $checked))
 				{
@@ -1145,37 +1145,37 @@ 
 	 * @deprecated use html class to create selectboxes
 	 * @return string populated with categories
 	 */
-	function formatted_list($format,$type='',$selected = '',$globals = False,$site_link = 'site')
+	function formatted_list($format, $type = '', $selected = '', $globals = False, $site_link = 'site')
 	{
-		if(is_array($format))
+		if (is_array($format))
 		{
-			$type = ($format['type']?$format['type']:'all');
-			$selected = (isset($format['selected'])?$format['selected']:'');
-			$self = (isset($format['self'])?$format['self']:'');
-			$globals = (isset($format['globals'])?$format['globals']:True);
-			$site_link = (isset($format['site_link'])?$format['site_link']:'site');
+			$type = ($format['type'] ? $format['type'] : 'all');
+			$selected = (isset($format['selected']) ? $format['selected'] : '');
+			$self = (isset($format['self']) ? $format['self'] : '');
+			$globals = (isset($format['globals']) ? $format['globals'] : True);
+			$site_link = (isset($format['site_link']) ? $format['site_link'] : 'site');
 			$format = $format['format'] ? $format['format'] : 'select';
 		}
 
 		if (!is_array($selected))
 		{
-			$selected = explode(',',$selected);
+			$selected = explode(',', $selected);
 		}
 
 		if ($type != 'all')
 		{
-			$cats = $this->return_array($type,0,False,'','','',$globals);
+			$cats = $this->return_array($type, 0, False, '', '', '', $globals);
 		}
 		else
 		{
-			$cats = $this->return_sorted_array(0,False,'','','',$globals);
+			$cats = $this->return_sorted_array(0, False, '', '', '', $globals);
 		}
 
 		if (!$cats) return '';
 
-		if($self)
+		if ($self)
 		{
-			foreach($cats as $key => $cat)
+			foreach ($cats as $key => $cat)
 			{
 				if ($cat['id'] == $self)
 				{
@@ -1187,50 +1187,50 @@ 
 		switch ($format)
 		{
 			case 'select':
-				foreach($cats as $cat)
+				foreach ($cats as $cat)
 				{
-					$s .= '<option value="' . $cat['id'] . '"';
-					if (in_array($cat['id'],$selected))
+					$s .= '<option value="'.$cat['id'].'"';
+					if (in_array($cat['id'], $selected))
 					{
 						$s .= ' selected="selected"';
 					}
-					$s .= '>'.str_repeat('&nbsp;',$cat['level']);
+					$s .= '>'.str_repeat('&nbsp;', $cat['level']);
 					$s .= $GLOBALS['egw']->strip_html($cat['name']);
 					if (self::is_global($cat))
 					{
 						$s .= self::$global_marker;
 					}
-					$s .= '</option>' . "\n";
+					$s .= '</option>'."\n";
 				}
 				break;
 
 			case 'list':
 				$space = '&nbsp;&nbsp;';
 
-				$s  = '<table border="0" cellpadding="2" cellspacing="2">' . "\n";
+				$s = '<table border="0" cellpadding="2" cellspacing="2">'."\n";
 
-				foreach($cats as $cat)
+				foreach ($cats as $cat)
 				{
 					$image_set = '&nbsp;';
 
-					if (in_array($cat['id'],$selected))
+					if (in_array($cat['id'], $selected))
 					{
-						$image_set = '<img src="' . EGW_IMAGES_DIR . '/roter_pfeil.gif">';
+						$image_set = '<img src="'.EGW_IMAGES_DIR.'/roter_pfeil.gif">';
 					}
-					if (($cat['level'] == 0) && !in_array($cat['id'],$selected))
+					if (($cat['level'] == 0) && !in_array($cat['id'], $selected))
 					{
-						$image_set = '<img src="' . EGW_IMAGES_DIR . '/grauer_pfeil.gif">';
+						$image_set = '<img src="'.EGW_IMAGES_DIR.'/grauer_pfeil.gif">';
 					}
-					$space_set = str_repeat($space,$cat['level']);
+					$space_set = str_repeat($space, $cat['level']);
 
-					$s .= '<tr>' . "\n";
-					$s .= '<td width="8">' . $image_set . '</td>' . "\n";
-					$s .= '<td>' . $space_set . '<a href="' . $GLOBALS['egw']->link($site_link,'cat_id=' . $cat['id']) . '">'
+					$s .= '<tr>'."\n";
+					$s .= '<td width="8">'.$image_set.'</td>'."\n";
+					$s .= '<td>'.$space_set.'<a href="'.$GLOBALS['egw']->link($site_link, 'cat_id='.$cat['id']).'">'
 						. $GLOBALS['egw']->strip_html($cat['name'])
-						. '</a></td>' . "\n"
-						. '</tr>' . "\n";
+						. '</a></td>'."\n"
+						. '</tr>'."\n";
 				}
-				$s .= '</table>' . "\n";
+				$s .= '</table>'."\n";
 				break;
 		}
 		return $s;

Braces +212 added lines, -53 removed lines

@@ -120,7 +120,10 @@ 
 	 */
 	function __construct($accountid='',$app_name = '')
 	{
-		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app_name)
+		{
+			$app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
@@ -136,10 +139,13 @@ 
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
 
-		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
+		if (is_null(self::$cache))
+		{
+			// should not be necessary, as cache is load and restored by egw object
 		{
 			self::init_cache();
 		}
+		}
 		if (is_null(self::$global_marker))
 		{
 			// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
@@ -198,7 +204,9 @@ 
 		$cats = array();
 		foreach(self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter)
+			{
+				foreach($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
@@ -206,10 +214,14 @@ 
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
 						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+			}
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val,1))
+						{
+							continue 2;
+						}
 					}
 				}
 				elseif (is_array($val))
@@ -217,11 +229,17 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val))
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col],$val))
+						{
+							continue 2;
+						}
 					}
 				}
 				else
@@ -229,16 +247,25 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] != $val && trim($cat[$col]) != $val) continue 2;
+						if ($cat[$col] != $val && trim($cat[$col]) != $val)
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if ($cat[$col] != $val) continue 2;
+						if ($cat[$col] != $val)
+						{
+							continue 2;
+						}
 					}
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id))
+			{
+				continue;
+			}
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -256,30 +283,55 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent'])
+					{
+						continue 2;
+					}
+					// 2 for switch AND foreach!
 					break;
 				case 'mains':
-					if ($cat['parent']) continue 2;
+					if ($cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandmains':
-					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandsubs':
-					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || !$cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobal':
-					if ($cat['appname'] == $this->app_name) continue 2;
+					if ($cat['appname'] == $this->app_name)
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobalapp':
-					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id)
+					{
+						continue 2;
+					}
 					break;
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false)
+			{
+				continue;
+			}
 
 			// check if last modified since
-			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod)
+			{
+				continue;
+			}
 
 			$cat['data'] = $cat['data'] ? json_php_unserialize($cat['data'], true) : array();
 
@@ -290,13 +342,23 @@ 
 			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
 			return array();
 		}
-		if (!$sort) $sort = 'ASC';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
 			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order,'cat_data') !== false)
+			{
+				$order = 'cat_data';
+			}
+			// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_')
+			{
+				$order = substr($order,4);
+			}
 			$sign = strtoupper($sort) == 'DESC' ? '-' : '';
 			usort($cats,create_function('$a,$b',$func=(in_array($order,array('name','description','appname','app_name')) ?
 				"return ${sign}strcasecmp(\$a['$order'],\$b['$order']);" : "return $sign(int)\$a['$order'] - $sign(int)\$b['$order'];")));
@@ -304,7 +366,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		// return only a certain column (why not return is as value?)
@@ -337,15 +402,24 @@ 
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
 	{
-		if (!$sort)  $sort = 'ASC';
-		if (!$order) $order = 'cat_name';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
+		if (!$order)
+		{
+			$order = 'cat_name';
+		}
 
 		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if($parent_id !== false && $parent_id !== null)
+		{
+			$parent_id = (array)$parent_id;
+		}
 		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
 		{
 			$cats = array();
@@ -355,7 +429,9 @@ 
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if($parent_id || !$cats)
+		{
+			// Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
@@ -363,6 +439,7 @@ 
 				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
 				{
 					break;
+		}
 				}
 				$parents = $children = array();
 				foreach($subs as $cat)
@@ -394,7 +471,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
@@ -413,9 +493,15 @@ 
 	 */
 	static function read($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
-		if (!isset(self::$cache[$id])) return false;
+		if (!isset(self::$cache[$id]))
+		{
+			return false;
+		}
 
 		$cat = self::$cache[$id];
 		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
@@ -478,8 +564,11 @@ 
 	 * @return string truncated commaseparated list of category ids
 	 */
 	function check_list($needed, $cat_list)
- 	{
-		if (empty($cat_list)) return $cat_list;
+	{
+		if (empty($cat_list))
+		{
+			return $cat_list;
+		}
 		if (is_array($cat_list))
 		{
 			$cat_list = implode(',',$cat_list);
@@ -490,10 +579,13 @@ 
 		{
 			foreach($cat_arr as $id=>$cat_id)
 			{
-				if (!$this->check_perms($needed, $cat_id, false, $needed == EGW_ACL_READ))	// allow reading all global cats
+				if (!$this->check_perms($needed, $cat_id, false, $needed == EGW_ACL_READ))
+				{
+					// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
+				}
 			}
 			$cat_list = implode(',',$cat_arr);
 		}
@@ -599,9 +691,15 @@ 
 				{
 					$update = array('cat_level' => $cat['level']-1);
 
-					if ($new_main) $update['cat_main'] = $new_main;
+					if ($new_main)
+					{
+						$update['cat_main'] = $new_main;
+					}
 
-					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
+					if ($cat['parent'] == $cat_id)
+					{
+						$update['cat_parent'] = $new_parent;
+					}
 
 					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
@@ -627,9 +725,13 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if($this->is_global($cat_id, true))
+		{
+			// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'],False,True);
+		}
+		// called for every app now, not only enabled ones)
 		}
 		else
 		{
@@ -685,12 +787,22 @@ 
 		// check if we try to move an element down its own subtree, which will fail
 		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
 		{
-			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			if ($cat['id'] == $values['parent'])
+			{
+				return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			}
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent']==$values['id'])
+		{
+			return lang('Cannot set this cat as its own parent!');
+		}
+		// deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent']>0 && !$this->read($values['parent']))
+		{
+			return lang('Chosen parent category no longer exists');
+		}
 		return true;
 	}
 
@@ -707,7 +819,10 @@ 
 		if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
 		{
 			$ret = $this->check_consistency4update($values);
-			if ($ret !== true) throw new egw_exception_wrong_userinput($ret);
+			if ($ret !== true)
+			{
+				throw new egw_exception_wrong_userinput($ret);
+			}
 			// everything seems in order -> proceed
 			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
 			$this->adapt_level_in_subtree($values);
@@ -720,7 +835,10 @@ 
 			if ($values['parent'] > 0)
 			{
 				$ret = $this->check_consistency4update($values);
-				if ($ret !== true) throw new egw_exception_wrong_userinput($ret);
+				if ($ret !== true)
+				{
+					throw new egw_exception_wrong_userinput($ret);
+				}
 
 				// everything seems in order -> proceed
 				$values['main']  = $this->id2name($values['parent'],'main');
@@ -776,7 +894,10 @@ 
 	{
 		static $cache = array();	// a litle bit of caching
 
-		if (isset($cache[$cat_name])) return $cache[$cat_name];
+		if (isset($cache[$cat_name]))
+		{
+			return $cache[$cat_name];
+		}
 
 		if ($strip === true)
 		{
@@ -826,7 +947,11 @@ 
 	 */
 	static function is_global($cat,$application_global=false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat)))
+		{
+			return null;
+		}
+		// cat not found
 
 		$global_owner = false;
 		foreach(explode(',',$cat['owner']) as $owner)
@@ -848,10 +973,19 @@ 
 	 */
 	static function id2name($cat_id=0, $item='name')
 	{
-		if(!$cat_id) return '--';
-		if (!$item) $item = 'parent';
+		if(!$cat_id)
+		{
+			return '--';
+		}
+		if (!$item)
+		{
+			$item = 'parent';
+		}
 
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
@@ -892,7 +1026,10 @@ 
 		if ($cat_name)
 		{
 			$filter['name'] = $cat_name;
-			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
+			if ($cat_id)
+			{
+				$filter['id'] = '!'.(int)$cat_id;
+			}
 		}
 		elseif ($cat_id)
 		{
@@ -921,7 +1058,10 @@ 
 	{
 		$where = array('cat_owner' => $owner);
 
-		if ($app) $where['cat_appname'] = $app;
+		if ($app)
+		{
+			$where['cat_appname'] = $app;
+		}
 
 		if ((int)$to)
 		{
@@ -967,7 +1107,11 @@ 
 				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
 				$cat = egw_db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				if ($cat['appname'] == '*update*')
+				{
+					continue;
+				}
+				// --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -1052,7 +1196,10 @@ 
 	 */
 	public static function delete_account($account_id, $new_owner=null)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$deleted = 0;
 		$cat = null;
@@ -1072,7 +1219,10 @@ 
 				else
 				{
 					unset($owners[$owner_key]);
-					if ($new_owner && $account_id > 0) $owners[] = $new_owner;
+					if ($new_owner && $account_id > 0)
+					{
+						$owners[] = $new_owner;
+					}
 					$data['owner'] = implode(',', $owners);
 					// app_name have to match cat to update!
 					if (!isset($cat) || $cat->app_name != $data['appname'])
@@ -1094,7 +1244,10 @@ 
 	 */
 	public static function delete_orphans()
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$checked = array();
 		$deleted = 0;
@@ -1130,7 +1283,10 @@ 
 	 */
 	static function return_single($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		return isset(self::$cache[$id]) ? array(self::$cache[$id]) : false;
 	}
@@ -1171,7 +1327,10 @@ 
 			$cats = $this->return_sorted_array(0,False,'','','',$globals);
 		}
 
-		if (!$cats) return '';
+		if (!$cats)
+		{
+			return '';
+		}
 
 		if($self)
 		{