EGroupware / egroupware

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');

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
+		);
+	}
 }

api/src/Accounts/Ldap.php

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'));

api/src/Mail/Cache.php

Indentation +43 added lines, -43 removed lines

@@ -29,15 +29,15 @@ 
 	 */
 	const LEVEL = Api\Cache::INSTANCE;
 
-    /**
-     * Retrieve cached data.
-     *
-     * @param string $key        Object ID to query.
-     * @param integer $lifetime  Lifetime of the object in seconds.
-     *
-     * @return mixed  Cached data, or false if none was found.
-     */
-    public function get($key, $lifetime = 0)
+	/**
+	 * Retrieve cached data.
+	 *
+	 * @param string $key        Object ID to query.
+	 * @param integer $lifetime  Lifetime of the object in seconds.
+	 *
+	 * @return mixed  Cached data, or false if none was found.
+	 */
+	public function get($key, $lifetime = 0)
 	{
 		unset($lifetime);	// not (yet) used, but required by function signature
 
@@ -46,54 +46,54 @@ 
 		return !is_null($ret) ? $ret : false;
 	}
 
-    /**
-     * Store an object in the cache.
-     *
-     * @param string $key        Object ID used as the caching key.
-     * @param mixed $data        Data to store in the cache.
-     * @param integer $lifetime  Object lifetime - i.e. the time before the
-     *                           data becomes available for garbage
-     *                           collection. If 0 will not be GC'd.
-     */
-    public function set($key, $data, $lifetime = 0)
+	/**
+	 * Store an object in the cache.
+	 *
+	 * @param string $key        Object ID used as the caching key.
+	 * @param mixed $data        Data to store in the cache.
+	 * @param integer $lifetime  Object lifetime - i.e. the time before the
+	 *                           data becomes available for garbage
+	 *                           collection. If 0 will not be GC'd.
+	 */
+	public function set($key, $data, $lifetime = 0)
 	{
 		Api\Cache::setCache(self::LEVEL, 'mail', $key, $data, $lifetime);
 	}
 
-    /**
-     * Checks if a given key exists in the cache, valid for the given
-     * lifetime.
-     *
-     * @param string $key        Cache key to check.
-     * @param integer $lifetime  Lifetime of the key in seconds.
-     *
-     * @return boolean  Existence.
-     */
-    public function exists($key, $lifetime = 0)
+	/**
+	 * Checks if a given key exists in the cache, valid for the given
+	 * lifetime.
+	 *
+	 * @param string $key        Cache key to check.
+	 * @param integer $lifetime  Lifetime of the key in seconds.
+	 *
+	 * @return boolean  Existence.
+	 */
+	public function exists($key, $lifetime = 0)
 	{
 		unset($lifetime);	// not (yet) used, but required by function signature
 
 		return !is_null(Api\Cache::getCache(self::LEVEL, 'mail', $key));
 	}
 
-    /**
-     * Expire any existing data for the given key.
-     *
-     * @param string $key  Cache key to expire.
-     *
-     * @return boolean  Success or failure.
-     */
-    public function expire($key)
+	/**
+	 * Expire any existing data for the given key.
+	 *
+	 * @param string $key  Cache key to expire.
+	 *
+	 * @return boolean  Success or failure.
+	 */
+	public function expire($key)
 	{
 		Api\Cache::unsetCache(self::LEVEL, 'mail', $key);
 	}
 
-    /**
-     * Clears all data from the cache.
-     *
-     * @throws Horde_Cache_Exception
-     */
-    public function clear()
+	/**
+	 * Clears all data from the cache.
+	 *
+	 * @throws Horde_Cache_Exception
+	 */
+	public function clear()
 	{
 		Api\Cache::flush(self::LEVEL, self::APP);
 	}

api/src/Mail/Sieve.php

Indentation +14 added lines, -14 removed lines

@@ -37,28 +37,28 @@ 
 	var $icServer;
 
 	/**
-	* @var string name of active script queried from Sieve server
-	*/
+	 * @var string name of active script queried from Sieve server
+	 */
 	var $scriptName;
 
 	/**
-	* @var $rules containing the rules
-	*/
+	 * @var $rules containing the rules
+	 */
 	var $rules;
 
 	/**
-	* @var $vacation containing the vacation
-	*/
+	 * @var $vacation containing the vacation
+	 */
 	var $vacation;
 
 	/**
-	* @var $emailNotification containing the emailNotification
-	*/
+	 * @var $emailNotification containing the emailNotification
+	 */
 	var $emailNotification;
 
 	/**
-	* @var object $error the last PEAR error object
-	*/
+	 * @var object $error the last PEAR error object
+	 */
 	var $error;
 
 	/**
@@ -170,11 +170,11 @@ 
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{
 		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
-    		$_emailNotification['status'] = 'off';
-    		$_emailNotification['externalEmail'] = '';
-    	}
+			$_emailNotification['status'] = 'off';
+			$_emailNotification['externalEmail'] = '';
+		}
 
-    	$script = $this->retrieveRules($_scriptName);
+		$script = $this->retrieveRules($_scriptName);
    		$script->emailNotification = $_emailNotification;
 		$ret = $script->updateScript($this);
 		$this->error = $script->errstr;

api/src/Mail/Hooks.php

Indentation +21 added lines, -21 removed lines

@@ -32,14 +32,14 @@ 
 		}
 	}
 
-    /**
-     * Hook called before an account get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
-     */
+	/**
+	 * Hook called before an account get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
+	 */
 	static function deleteaccount(array $data)
 	{
 		self::run_plugin_hooks('deleteAccount', $data);
@@ -48,25 +48,25 @@ 
 		Account::delete(0, $data['account_id']);
 	}
 
-    /**
-     * Hook called before a group get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
-     */
+	/**
+	 * Hook called before a group get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_name'] account-name
+	 */
 	static function deletegroup(array $data)
 	{
 		Account::delete(0, $data['account_id']);
 	}
 
 	/**
-     * Hook called when an account get added or edited
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
+	 * Hook called when an account get added or edited
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{

api/src/Html.php

Indentation +29 added lines, -29 removed lines

@@ -425,20 +425,20 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for fckEditor to create some reuseable layouts
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param array  $_options (toolbar_expanded true/false)
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param string $_start_path ='' if passed activates the browser for image at absolute path passed
-	* @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for fckEditor to create some reuseable layouts
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param array  $_options (toolbar_expanded true/false)
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param string $_start_path ='' if passed activates the browser for image at absolute path passed
+	 * @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
 		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
 	{
@@ -509,21 +509,21 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for tinymce to create some reuseable layouts
-	*
-	* Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param boolean $_purify =true
-	* @param string $_border ='0px' NOT used for CKEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for tinymce to create some reuseable layouts
+	 *
+	 * Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param boolean $_purify =true
+	 * @param string $_border ='0px' NOT used for CKEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')

api/src/Ldap.php

Indentation +8 added lines, -8 removed lines

@@ -31,17 +31,17 @@
 class Ldap
 {
 	/**
-	* Holds the LDAP link identifier
-	*
-	* @var resource $ds
-	*/
+	 * Holds the LDAP link identifier
+	 *
+	 * @var resource $ds
+	 */
 	var $ds;
 
 	/**
-	* Holds the detected information about the connected ldap server
-	*
-	* @var Ldap\ServerInfo $ldapserverinfo
-	*/
+	 * Holds the detected information about the connected ldap server
+	 *
+	 * @var Ldap\ServerInfo $ldapserverinfo
+	 */
 	var $ldapserverinfo;
 
 	/**

api/src/Auth.php

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} */