EGroupware / egroupware

api/src/Html/htmLawed/htmLawedTest.php

Indentation +5 added lines, -5 removed lines

@@ -119,7 +119,7 @@ 
    $j = 0;
    // Add newline
    if ($i !== $len-1){
-    echo "\n";
+	echo "\n";
    }
   }
  }
@@ -544,12 +544,12 @@ 
   if(!empty($v[4])){ // + input text box
    echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'. $k]) && $_POST['h'. $k] == $j) or (!isset($_POST['h'. $k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    if(!is_array($v[4])){
-    echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    }
    else{
-    foreach($v[4] as $z){
-     echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
-    }
+	foreach($v[4] as $z){
+	 echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	}
    }
   }
  }

api/src/Html/htmLawed/htmLawed.php

Indentation +27 added lines, -27 removed lines

@@ -204,7 +204,7 @@ 
   elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
   elseif(strpos($x, "\x02\x04")){
    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
+	echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
   }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
  }
@@ -357,7 +357,7 @@ 
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
-    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
+	$p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
    $p = $m[1]. $p;
   }
@@ -471,20 +471,20 @@ 
  switch($mode){
   case 0: // Name
    if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
-    $nm = strtolower($m[0]);
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
+	$nm = strtolower($m[0]);
+	$w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
    if($a[0] == '='){ // =
-    $w = 1; $mode = 2; $a = ltrim($a, '= ');
+	$w = 1; $mode = 2; $a = ltrim($a, '= ');
    }else{ // No val
-    $w = 1; $mode = 0; $a = ltrim($a);
-    $aA[$nm] = '';
+	$w = 1; $mode = 0; $a = ltrim($a);
+	$aA[$nm] = '';
    }
   break; case 2: // Val
    if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
-    $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
+	$a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
+	$aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
    }
   break;
  }
@@ -507,8 +507,8 @@ 
   }
   if($k == 'style' && !$C['style_pass']){
    if(false !== strpos($v, '&#')){
-    static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
-    $v = strtr($v, $sC);
+	static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
+	$v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
@@ -516,20 +516,20 @@ 
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
    $v = hl_prot($v, $k);
    if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
+	if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+	 $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
+	}elseif($C['anti_link_spam']){
+	 $r1 = $C['anti_link_spam'][1];
+	 if(!empty($r1) && preg_match($r1, $v)){continue;}
+	 $r0 = $C['anti_link_spam'][0];
+	 if(!empty($r0) && preg_match($r0, $v)){
+	  if(isset($a['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
+	  }elseif(isset($aA['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
+	  }else{$a['rel'] = 'nofollow';}
+	 }
+	}
    }
   }
   if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
@@ -685,8 +685,8 @@ 
   $e = "<$e>";
   if(isset($d[$y])){
    if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+	if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
+	else{++$N; ob_end_clean(); continue 2;}
    }
    else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
    echo $r; continue;

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

setup/inc/class.setup.inc.php

Indentation +27 added lines, -27 removed lines

@@ -151,10 +151,10 @@ 
 	}
 
 	/**
-	* Set the domain used for cookies
-	*
-	* @return string domain
-	*/
+	 * Set the domain used for cookies
+	 *
+	 * @return string domain
+	 */
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
@@ -175,12 +175,12 @@ 
 	}
 
 	/**
-	* Set a cookie
-	*
-	* @param string $cookiename name of cookie to be set
-	* @param string $cookievalue value to be used, if unset cookie is cleared (optional)
-	* @param int $cookietime when cookie should expire, 0 for session only (optional)
-	*/
+	 * Set a cookie
+	 *
+	 * @param string $cookiename name of cookie to be set
+	 * @param string $cookievalue value to be used, if unset cookie is cleared (optional)
+	 * @param int $cookietime when cookie should expire, 0 for session only (optional)
+	 */
 	function set_cookie($cookiename,$cookievalue='',$cookietime=0)
 	{
 		if(!isset($this->cookie_domain))
@@ -344,19 +344,19 @@ 
 		return true;
 	}
 
-    /**
-    * check if username and password is valid
-    *
-    * this function compares the supplied and stored username and password
-	* as any of the passwords can be clear text or md5 we convert them to md5
-	* internal and compare always the md5 hashs
-    *
-    * @param string $user the user supplied username
-    * @param string $pw the user supplied password
-    * @param string $conf_user the configured username
-    * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
-    * @returns bool true on success
-    */
+	/**
+	 * check if username and password is valid
+	 *
+	 * this function compares the supplied and stored username and password
+	 * as any of the passwords can be clear text or md5 we convert them to md5
+	 * internal and compare always the md5 hashs
+	 *
+	 * @param string $user the user supplied username
+	 * @param string $pw the user supplied password
+	 * @param string $conf_user the configured username
+	 * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
+	 * @returns bool true on success
+	 */
 	static function check_auth($user, $pw, $conf_user, $hash)
 	{
 		if ($user !== $conf_user)
@@ -728,10 +728,10 @@ 
 	}
 
 	/**
-	  * call the hooks for a single application
-	  *
-	  * @param $location hook location - required
-	  * @param $appname application name - optional
+	 * call the hooks for a single application
+	 *
+	 * @param $location hook location - required
+	 * @param $appname application name - optional
 	 */
 	static function hook($location, $appname='')
 	{