EGroupware / egroupware

api/src/Etemplate/Widget/HtmlArea.php

Spacing +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@ 
 		$form_name = self::form_name($cname, $this->id);
 
 		$config = Api\Html\CkEditorConfig::get_ckeditor_config_array($this->attrs['mode'], $this->attrs['height'],
-			$this->attrs['expand_toolbar'],$this->attrs['base_href']
+			$this->attrs['expand_toolbar'], $this->attrs['base_href']
 		);
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 		$font_span = '<span style="width: 100%; display: inline; '.
-			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
+			($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').
 			'">&#8203;</span>';
 		if (empty($font) && empty($font_size)) $font_span = '';
-		if($font_span)
+		if ($font_span)
 		{
 			$config['preference_style'] = $font_span;
 		}
@@ -65,7 +65,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -77,7 +77,7 @@ 
 			{
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @return boolean true if no validation error, false otherwise
+	 * @return boolean|null true if no validation error, false otherwise
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Braces +8 added lines, -2 removed lines

@@ -46,7 +46,10 @@ 
 		$font_span = '<span style="width: 100%; display: inline; '.
 			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
 			'">&#8203;</span>';
-		if (empty($font) && empty($font_size)) $font_span = '';
+		if (empty($font) && empty($font_size))
+		{
+			$font_span = '';
+		}
 		if($font_span)
 		{
 			$config['preference_style'] = $font_span;
@@ -78,7 +81,10 @@ 
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

api/src/Etemplate/Widget/ItemPicker.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -40,7 +40,7 @@ 
 	 * Find items that match the given parameters
 	 * using the egw_link class
 	 */
-	public static function ajax_item_search($app, $type, $pattern, $options=array())
+	public static function ajax_item_search($app, $type, $pattern, $options = array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
 		$items = Api\Link::query($app, $pattern, $options);

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}

api/src/Etemplate/Widget/HistoryLog.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->id);

Spacing +8 added lines, -8 removed lines

@@ -38,19 +38,19 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id);
 
-		if(is_array(self::$request->content[$form_name]['status-widgets']))
+		if (is_array(self::$request->content[$form_name]['status-widgets']))
 		{
-			foreach(self::$request->content[$form_name]['status-widgets'] as $key => $type)
+			foreach (self::$request->content[$form_name]['status-widgets'] as $key => $type)
 			{
-				if(!is_array($type))
+				if (!is_array($type))
 				{
-					list($basetype) = explode('-',$type);
+					list($basetype) = explode('-', $type);
 					$widget = @self::factory($basetype, '<?xml version="1.0"?><'.$type.' type="'.$type.'"/>', $key);
 					$widget->id = $key;
 					$widget->attrs['type'] = $type;
 					$widget->type = $type;
 
-					if(method_exists($widget, 'beforeSendToClient'))
+					if (method_exists($widget, 'beforeSendToClient'))
 					{
 						// need to use $form_name as $cname see comment in header
 						$widget->beforeSendToClient($form_name, array());
@@ -59,7 +59,7 @@ 
 				else
 				{
 					// need to use self::form_name($form_name, $key) as index into sel_options see comment in header
-					$options =& self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
+					$options = & self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
 					if (!is_array($options)) $options = array();
 					$options += $type;
 				}
@@ -82,11 +82,11 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 		if (true) $valid = $value;
 		return true;
 	}

Braces +8 added lines, -2 removed lines

@@ -60,7 +60,10 @@ 
 				{
 					// need to use self::form_name($form_name, $key) as index into sel_options see comment in header
 					$options =& self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
-					if (!is_array($options)) $options = array();
+					if (!is_array($options))
+					{
+						$options = array();
+					}
 					$options += $type;
 				}
 
@@ -87,7 +90,10 @@ 
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = self::get_array($content, $form_name);
 		$valid =& self::get_array($validated, $form_name, true);
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 		return true;
 	}
 }

api/src/Etemplate/Widget/Toolbar.php

Spacing +2 added lines, -2 removed lines

@@ -29,14 +29,14 @@
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @return boolean true if no validation error, false otherwise
+	 * @return boolean|null true if no validation error, false otherwise
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Braces +4 added lines, -1 removed lines

@@ -37,7 +37,10 @@
 		{
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

api/src/Etemplate/Widget/Image.php

Spacing +6 added lines, -6 removed lines

@@ -29,21 +29,21 @@
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name);
+		$value = & self::get_array(self::$request->content, $form_name);
 
 		$image = $value != '' ? $value : $this->attrs['src'];
 
-		if (is_string($image)) list($app,$img) = explode('/',$image,2);
-		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
+		if (is_string($image)) list($app, $img) = explode('/', $image, 2);
+		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img, '/') !== false)
 		{
 			$img = $image;
-			list($app) = explode('.',$form_name);
+			list($app) = explode('.', $form_name);
 		}
 		$src = Api\Image::find($app, $img);
-		if(!$this->id)
+		if (!$this->id)
 		{
 //			self::setElementAttribute($this->attrs['src'], 'id', $this->attrs['src']);
 		}

Braces +4 added lines, -1 removed lines

@@ -36,7 +36,10 @@
 
 		$image = $value != '' ? $value : $this->attrs['src'];
 
-		if (is_string($image)) list($app,$img) = explode('/',$image,2);
+		if (is_string($image))
+		{
+			list($app,$img) = explode('/',$image,2);
+		}
 		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
 		{
 			$img = $image;

api/src/Etemplate/WidgetBrowser.php

Indentation +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

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

api/src/MimeMagic.php

Spacing +9 added lines, -9 removed lines

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

Braces +4 added lines, -1 removed lines

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

api/src/Exception.php

Spacing +1 added lines, -1 removed lines

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

api/src/Accounts/Ads.php

Indentation +174 added lines, -174 removed lines

@@ -807,11 +807,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;
@@ -1263,10 +1263,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')
@@ -1294,29 +1294,29 @@ 
 		return $this->userClass;
 	}
 
-    /**
-    * Get the group class interface
-    *
-    * @return adLDAPGroups
-    */
-    public function group() {
-        if (!$this->groupClass) {
-            $this->groupClass = new adLDAPGroups($this);
-        }
-        return $this->groupClass;
-    }
-
-    /**
-    * Get the utils class interface
-    *
-    * @return adLDAPUtils
-    */
-    public function utilities() {
-        if (!$this->utilClass) {
-            $this->utilClass = new adLDAPUtils($this);
-        }
-        return $this->utilClass;
-    }
+	/**
+	 * Get the group class interface
+	 *
+	 * @return adLDAPGroups
+	 */
+	public function group() {
+		if (!$this->groupClass) {
+			$this->groupClass = new adLDAPGroups($this);
+		}
+		return $this->groupClass;
+	}
+
+	/**
+	 * Get the utils class interface
+	 *
+	 * @return adLDAPUtils
+	 */
+	public function utilities() {
+		if (!$this->utilClass) {
+			$this->utilClass = new adLDAPUtils($this);
+		}
+		return $this->utilClass;
+	}
 }
 
 /**
@@ -1405,45 +1405,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
@@ -1457,30 +1457,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);
@@ -1502,76 +1502,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;
 		}
@@ -1636,23 +1636,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
+		);
+	}
 }

Braces +234 added lines, -78 removed lines

@@ -136,12 +136,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 Api\Exception("Required ADS host name(s) missing!");
-			if (empty($config['ads_domain'])) throw new Api\Exception("Required ADS domain missing!");
+			if (empty($config['ads_host']))
+			{
+				throw new Api\Exception("Required ADS host name(s) missing!");
+			}
+			if (empty($config['ads_domain']))
+			{
+				throw new Api\Exception("Required ADS domain missing!");
+			}
 
 			$base_dn_parts = array();
 			foreach(explode('.', $config['ads_domain']) as $dc)
@@ -160,7 +169,10 @@ 
 				'charset' => Api\Translation::charset(),
 			);
 			$adldap[$config['ads_domain']] = new adLDAP($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']];
@@ -241,7 +253,10 @@ 
 			throw new Api\Exception\WrongUserinput("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;
 	}
 
@@ -334,10 +349,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;
 	}
 
@@ -370,7 +391,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;
 	}
 
@@ -400,7 +424,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;
 	}
 
@@ -562,11 +589,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 = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
-		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
+		if (Api\DateTime::$server_timezone)
+		{
+			$datetime->setTimezone(Api\DateTime::$server_timezone);
+		}
 
 		return $datetime->getTimestamp();
 	}
@@ -583,12 +616,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)
 			{
@@ -668,7 +704,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',
@@ -679,6 +717,7 @@ 
 				'account_passwd'    => 'password',
 				'account_status'    => 'enabled',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -687,7 +726,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();
@@ -773,7 +815,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':
@@ -853,8 +899,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);
@@ -1051,7 +1103,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);
 		}
@@ -1060,7 +1115,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))
@@ -1078,7 +1136,10 @@ 
 					$attrs ? $data : Api\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;
@@ -1115,7 +1176,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;
 	}
 
@@ -1157,7 +1221,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'];
 	}
@@ -1172,7 +1239,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'];
 	}
@@ -1186,7 +1256,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;
@@ -1203,7 +1276,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;
 	}
 
@@ -1216,7 +1292,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;
@@ -1233,7 +1312,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;
 	}
 }
@@ -1287,8 +1369,10 @@ 
 	 *
 	 * @return adLDAPUsers
 	 */
-	public function user() {
-		if (!$this->userClass) {
+	public function user()
+	{
+		if (!$this->userClass)
+		{
 			$this->userClass = new adLDAPUsers($this);
 		}
 		return $this->userClass;
@@ -1299,8 +1383,10 @@ 
     *
     * @return adLDAPGroups
     */
-    public function group() {
-        if (!$this->groupClass) {
+    public function group()
+    {
+        if (!$this->groupClass)
+        {
             $this->groupClass = new adLDAPGroups($this);
         }
         return $this->groupClass;
@@ -1311,8 +1397,10 @@ 
     *
     * @return adLDAPUtils
     */
-    public function utilities() {
-        if (!$this->utilClass) {
+    public function utilities()
+    {
+        if (!$this->utilClass)
+        {
             $this->utilClass = new adLDAPUtils($this);
         }
         return $this->utilClass;
@@ -1340,18 +1428,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"];
 		}
 
@@ -1373,7 +1475,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"]);
 		}
@@ -1382,7 +1485,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;
 		}
@@ -1390,7 +1494,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"])
@@ -1398,7 +1505,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));
+				}
 			}
 		}
 
@@ -1421,7 +1531,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;
     }
 
@@ -1441,7 +1553,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;
     }
 
@@ -1468,26 +1583,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",
@@ -1502,16 +1627,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;
             }
         }
@@ -1529,14 +1658,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;
         }
 
@@ -1544,16 +1677,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);
@@ -1565,14 +1702,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;
@@ -1594,10 +1735,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";
@@ -1607,16 +1756,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;
@@ -1646,10 +1800,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

Doc Comments +8 added lines, -8 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
 	 */
@@ -308,7 +308,7 @@ 
 	 * Convert binary GUID to string
 	 *
 	 * @param string $objectguid
-	 * @return int
+	 * @return string
 	 */
 	public function objectguid2str($objectguid)
 	{
@@ -319,7 +319,7 @@ 
 	 * Convert a string GUID to hex string used in filter
 	 *
 	 * @param string $strGUID
-	 * @return int
+	 * @return string
 	 */
 	public function objectguid2hex($strGUID)
 	{
@@ -378,7 +378,7 @@ 
 	 * Delete one account, deletes also all acl-entries for that account
 	 *
 	 * @param int $account_id numeric account_id
-	 * @return boolean true on success, false otherwise
+	 * @return string|boolean true on success, false otherwise
 	 */
 	function delete($account_id)
 	{
@@ -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)
 	{

Spacing +109 added lines, -114 removed lines

@@ -133,10 +133,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']]))
 		{
@@ -144,7 +144,7 @@ 
 			if (empty($config['ads_domain'])) throw new Api\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;
 			}
@@ -172,7 +172,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))
@@ -207,14 +207,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);
-				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
+				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT] = $dn, 'phpgwapi');
 			}
 			else
 			{
@@ -251,7 +251,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 ...
@@ -415,8 +415,7 @@ 
 		$data = Api\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(
@@ -453,7 +452,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));
 
@@ -476,8 +475,7 @@ 
 		$data = Api\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(
@@ -493,11 +491,9 @@ 
 			'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_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 :
@@ -508,7 +504,7 @@ 
 		{
 			$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;
 	}
@@ -538,7 +534,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));
 
@@ -561,10 +557,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 = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
 		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
 
@@ -579,7 +575,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).')');
 
@@ -590,7 +586,7 @@ 
 				'account_description' => 'description',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				$attributes[$adldap] = (string)$data[$egw];
 			}
@@ -627,11 +623,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();
@@ -644,7 +640,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;
@@ -660,7 +656,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']))
@@ -680,12 +676,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];
 			}
@@ -722,7 +718,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',
@@ -735,7 +731,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_')
 				{
@@ -743,22 +739,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]);
@@ -769,11 +765,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':
@@ -795,7 +790,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;
@@ -868,11 +863,11 @@ 
 			$query = Api\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:
@@ -903,14 +898,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'] = Api\Accounts::format_username($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+					$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $account['account_id']);
 					$accounts[$account_id] = $account;
 				}
 			}
@@ -919,9 +914,9 @@ 
 				$query = Api\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:
@@ -935,23 +930,23 @@ 
 					}
 					$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);
 		}
 		// 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;
@@ -982,19 +977,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;
 			}
@@ -1013,9 +1008,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.')';
@@ -1040,25 +1035,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;
 
@@ -1072,7 +1067,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 : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
@@ -1096,7 +1091,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',
@@ -1108,7 +1103,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;
@@ -1128,9 +1123,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);
 	}
 
 	/**
@@ -1142,9 +1137,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
 	}
 
 	/**
@@ -1184,21 +1179,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;
 			}
@@ -1220,15 +1215,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;
 			}
@@ -1253,7 +1248,7 @@ 
 	 */
 	public $charset = 'iso-8859-1';
 
-	function __construct(array $options=array())
+	function __construct(array $options = array())
 	{
 		if (isset($options['charset']))
 		{
@@ -1340,19 +1335,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
@@ -1375,20 +1370,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;
 
@@ -1415,13 +1410,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;
     }
 
@@ -1438,7 +1433,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));
@@ -1466,7 +1461,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; }
@@ -1480,7 +1475,7 @@ 
             return false;
         }
 
-        $add=array();
+        $add = array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1502,11 +1497,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);
@@ -1544,13 +1539,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 {
@@ -1564,14 +1559,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;
 		}
@@ -1594,10 +1589,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";
@@ -1613,9 +1608,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;
 		}
@@ -1646,10 +1641,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