EGroupware / egroupware

api/src/Auth/Fallback.php

Spacing +18 added lines, -18 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param string $primary ='ldap'
 	 * @param string $fallback ='sql'
 	 */
-	function __construct($primary='ldap',$fallback='sql')
+	function __construct($primary = 'ldap', $fallback = 'sql')
 	{
 		$this->primary_backend = Api\Auth::backend(str_replace('auth_', '', $primary));
 
@@ -55,26 +55,26 @@ 
 	 * @param string $passwd corresponding password
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		if ($this->primary_backend->authenticate($username, $passwd, $passwd_type))
 		{
-			Api\Cache::setInstance(__CLASS__,'backend_used-'.$username,'primary');
+			Api\Cache::setInstance(__CLASS__, 'backend_used-'.$username, 'primary');
 			// check if fallback has correct password, if not update it
 			if (($account_id = $GLOBALS['egw']->accounts->name2id($username)) &&
-				!$this->fallback_backend->authenticate($username,$passwd, $passwd_type))
+				!$this->fallback_backend->authenticate($username, $passwd, $passwd_type))
 			{
 				$backup_currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
-				$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';	// otherwise
+				$GLOBALS['egw_info']['flags']['currentapp'] = 'admin'; // otherwise
 				$this->fallback_backend->change_password('', $passwd, $account_id);
 				$GLOBALS['egw_info']['flags']['currentapp'] = $backup_currentapp;
 				//error_log(__METHOD__."('$username', \$passwd) updated password for #$account_id on fallback ".($ret ? 'successfull' : 'failed!'));
 			}
 			return true;
 		}
-		if ($this->fallback_backend->authenticate($username,$passwd, $passwd_type))
+		if ($this->fallback_backend->authenticate($username, $passwd, $passwd_type))
 		{
-			Api\Cache::setInstance(__CLASS__,'backend_used-'.$username,'fallback');
+			Api\Cache::setInstance(__CLASS__, 'backend_used-'.$username, 'fallback');
 			return true;
 		}
 		return false;
@@ -91,9 +91,9 @@ 
 	 * @param int $account_id account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -102,7 +102,7 @@ 
 		{
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
 			if (($ret = $this->primary_backend->change_password($old_passwd, $new_passwd, $account_id)))
 			{
@@ -126,14 +126,14 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
-			if (method_exists($this->primary_backend,'getLastPwdChange'))
+			if (method_exists($this->primary_backend, 'getLastPwdChange'))
 			{
 				return $this->primary_backend->getLastPwdChange($username);
 			}
 		}
-		if (method_exists($this->fallback_backend,'getLastPwdChange'))
+		if (method_exists($this->fallback_backend, 'getLastPwdChange'))
 		{
 			return $this->fallback_backend->getLastPwdChange($username);
 		}
@@ -148,9 +148,9 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -159,14 +159,14 @@ 
 		{
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
-			if (method_exists($this->primary_backend,'setLastPwdChange'))
+			if (method_exists($this->primary_backend, 'setLastPwdChange'))
 			{
 				return $this->primary_backend->setLastPwdChange($username);
 			}
 		}
-		if (method_exists($this->fallback_backend,'setLastPwdChange'))
+		if (method_exists($this->fallback_backend, 'setLastPwdChange'))
 		{
 			return $this->fallback_backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
 		}

api/src/Auth/Sqlssl.php

Spacing +8 added lines, -8 removed lines

@@ -29,21 +29,21 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		$local_debug = False;
 
-		if($local_debug)
+		if ($local_debug)
 		{
 			echo "<b>Debug SQL: uid - $username passwd - $passwd</b>";
 		}
-		if (!($row = $this->db->select($this->table,'account_lid,account_pwd',array(
+		if (!($row = $this->db->select($this->table, 'account_lid,account_pwd', array(
 			'account_lid' => $username,
 			'account_status' => 'A',
 			'account_type'   => 'u',
-		),__LINE__,__FILE__)->fetch()) || $GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
+		), __LINE__, __FILE__)->fetch()) || $GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 		{
 			return false;
 		}
@@ -51,7 +51,7 @@ 
 		# Apache + mod_ssl provide the data in the environment
 		# Certificate (chain) verification occurs inside mod_ssl
 		# see http://www.modssl.org/docs/2.8/ssl_howto.html#ToC6
-		if(!isset($_SERVER['SSL_CLIENT_S_DN']))
+		if (!isset($_SERVER['SSL_CLIENT_S_DN']))
 		{
 			# if we're not doing SSL authentication, behave like auth_sql
 			return Api\Auth::compare_password($passwd, $row['account_pwd'], 'md5', strtolower($username));
@@ -67,9 +67,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// deny password changes.
 		return False;

api/src/Auth/Pam.php

Spacing +7 added lines, -7 removed lines

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

api/src/Auth/Mail.php

Spacing +10 added lines, -10 removed lines

@@ -34,14 +34,14 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by function signature
+		unset($passwd_type); // not used but required by function signature
 
 		switch ($GLOBALS['egw_info']['server']['mail_login_type'])
 		{
 			case 'vmailmgr':
-				$username = $username . '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+				$username = $username.'@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 				break;
 			case 'email':
 				$username = $GLOBALS['egw']->accounts->id2name($username, 'account_email');
@@ -68,7 +68,7 @@ 
 				$mailauth = true;
 				$imap->logout();
 			}
-			catch(Horde_Imap_Client_Exception $e) {
+			catch (Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
 				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
 
@@ -85,19 +85,19 @@ 
 				case 'imap':
 				default:
 					if (!isset($port)) $port = 143;
-					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username, $passwd);
 					break;
 				case 'imaps':
 					if (!isset($port)) $port = 993;
-					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3':
 					if (!isset($port)) $port = 110;
-					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3s':
 					if (!isset($port)) $port = 995;
-					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 			}
 			if ($mailauth) imap_close($mailauth);
@@ -113,9 +113,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by function sigature
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by function sigature
 
 		return False;
 	}

Braces +24 added lines, -6 removed lines

@@ -70,7 +70,10 @@ 
 			}
 			catch(Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
-				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
+				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED)
+				{
+					throw $e;
+				}
 
 				$mailauth = false;
 			}
@@ -84,23 +87,38 @@ 
 			{
 				case 'imap':
 				default:
-					if (!isset($port)) $port = 143;
+					if (!isset($port))
+					{
+						$port = 143;
+					}
 					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
 					break;
 				case 'imaps':
-					if (!isset($port)) $port = 993;
+					if (!isset($port))
+					{
+						$port = 993;
+					}
 					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3':
-					if (!isset($port)) $port = 110;
+					if (!isset($port))
+					{
+						$port = 110;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3s':
-					if (!isset($port)) $port = 995;
+					if (!isset($port))
+					{
+						$port = 995;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 			}
-			if ($mailauth) imap_close($mailauth);
+			if ($mailauth)
+			{
+				imap_close($mailauth);
+			}
 		}
 		return !!$mailauth;
 	}

api/src/Auth/Backend.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text');
+	function authenticate($username, $passwd, $passwd_type = 'text');
 
 	/**
 	 * changes password in sql datababse
@@ -36,5 +36,5 @@ 
 	 * @throws Exception to give a verbose error, why changing password failed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0);
+	function change_password($old_passwd, $new_passwd, $account_id = 0);
 }

api/src/Auth/Cas.php

Spacing +6 added lines, -6 removed lines

@@ -29,18 +29,18 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
 			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
 		{
-			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
+			if (!($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
-				foreach(array(
+				foreach (array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',
 					'uidnumber' => 'id',
@@ -48,11 +48,11 @@ 
 					'gidnumber' => 'primary_group',
 					) as $ldap_name => $acct_name)
 				{
-					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 				}
 				return True;
 			}
-			return $id && $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A' && phpCAS::checkAuthentication();
+			return $id && $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A' && phpCAS::checkAuthentication();
 		}
 		return phpCAS::checkAuthentication();
 	}
@@ -65,7 +65,7 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		/* Not allowed */
 		return false;

Braces +4 added lines, -1 removed lines

@@ -33,13 +33,16 @@
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
-			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
+			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq')
+		{
+			/* For anonymous LDAP connection */
 		{
 			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
+		}
 				foreach(array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',

api/src/Auth/Ldap.php

Spacing +38 added lines, -38 removed lines

@@ -43,29 +43,29 @@ 
 	 * @param string $_passwd corresponding password
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($_username, $_passwd, $passwd_type='text')
+	function authenticate($_username, $_passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used by required by function signature
+		unset($passwd_type); // not used by required by function signature
 
 		// allow non-ascii in username & password
-		$username = Api\Translation::convert($_username,Api\Translation::charset(),'utf-8');
+		$username = Api\Translation::convert($_username, Api\Translation::charset(), 'utf-8');
 		// harden ldap auth, by removing \000 bytes, causing passwords to be not empty by php, but empty to c libaries
-		$passwd = str_replace("\000", '', Api\Translation::convert($_passwd,Api\Translation::charset(),'utf-8'));
+		$passwd = str_replace("\000", '', Api\Translation::convert($_passwd, Api\Translation::charset(), 'utf-8'));
 
 		// Login with the LDAP Admin. User to find the User DN.
 		try {
 			$ldap = Api\Ldap::factory();
 		}
-		catch(Api\Exception\NoPermission $e)
+		catch (Api\Exception\NoPermission $e)
 		{
 			unset($e);
 			if ($this->debug) error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
 			return False;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
-		$attributes	= array('uid','dn','givenName','sn','mail','uidNumber','shadowExpire','homeDirectory');
+		$attributes = array('uid', 'dn', 'givenName', 'sn', 'mail', 'uidNumber', 'shadowExpire', 'homeDirectory');
 
-		$filter = str_replace(array('%user','%domain'),array(Api\Ldap::quote($username),$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array(Api\Ldap::quote($username), $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap')
@@ -84,10 +84,10 @@ 
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
-				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
+				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0] * 24 * 3600 < time())
 			{
 				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
-				return false;	// account is expired
+				return false; // account is expired
 			}
 			$userDN = $allValues[0]['dn'];
 
@@ -103,13 +103,13 @@ 
 					{
 						$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'][0];
 					}
-					if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
+					if (!($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')))
 					{
 						// account does NOT exist, check if we should create it
 						if ($GLOBALS['egw_info']['server']['auto_create_acct'])
 						{
 							// create a global array with all availible info about that account
-							foreach(array(
+							foreach (array(
 								'givenname' => 'firstname',
 								'sn'        => 'lastname',
 								'uidnumber' => 'account_id',
@@ -117,7 +117,7 @@ 
 							) as $ldap_name => $acct_name)
 							{
 								$GLOBALS['auto_create_acct'][$acct_name] =
-									Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+									Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 							}
 							$ret = true;
 						}
@@ -130,7 +130,7 @@ 
 					// account exists, check if it is acctive
 					else
 					{
-						$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
+						$ret = $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A';
 
 						if ($this->debug && !$ret) error_log(__METHOD__."('$username',\$password) account NOT active!");
 					}
@@ -141,12 +141,12 @@ 
 				{
 					$matches = null;
 					// try to query password from ldap server (might fail because of ACL) and check if we need to migrate the hash
-					if (($sri = ldap_search($ldap, $userDN,"(objectclass=*)", array('userPassword'))) &&
+					if (($sri = ldap_search($ldap, $userDN, "(objectclass=*)", array('userPassword'))) &&
 						($values = ldap_get_entries($ldap, $sri)) && isset($values[0]['userpassword'][0]) &&
-						($type = preg_match('/^{(.+)}/',$values[0]['userpassword'][0],$matches) ? strtolower($matches[1]) : 'plain') &&
+						($type = preg_match('/^{(.+)}/', $values[0]['userpassword'][0], $matches) ? strtolower($matches[1]) : 'plain') &&
 						// for crypt use Api\Auth::crypt_compare to detect correct sub-type, strlen("{crypt}")=7
 						($type != 'crypt' || Api\Auth::crypt_compare($passwd, substr($values[0]['userpassword'][0], 7), $type)) &&
-						in_array($type, explode(',',strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
+						in_array($type, explode(',', strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
 					{
 						$this->change_password($passwd, $passwd, $allValues[0]['uidnumber'][0], false);
 					}
@@ -168,7 +168,7 @@ 
 	function getLastPwdChange($_username)
 	{
 		// allow non-ascii in username & password
-		$username = Api\Translation::convert($_username,Api\Translation::charset(),'utf-8');
+		$username = Api\Translation::convert($_username, Api\Translation::charset(), 'utf-8');
 
 		// Login with the LDAP Admin. User to find the User DN.
 		try {
@@ -180,9 +180,9 @@ 
 			return false;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
-		$attributes	= array('uid','dn','shadowexpire','shadowlastchange');
+		$attributes = array('uid', 'dn', 'shadowexpire', 'shadowlastchange');
 
-		$filter = str_replace(array('%user','%domain'),array(Api\Ldap::quote($username),$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array(Api\Ldap::quote($username), $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap')
@@ -206,12 +206,12 @@ 
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
-				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
+				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0] * 24 * 3600 < time())
 			{
 				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
-				return false;	// account is expired
+				return false; // account is expired
 			}
-			return $allValues[0]['shadowlastchange'][0]*24*3600;
+			return $allValues[0]['shadowlastchange'][0] * 24 * 3600;
 		}
 		if ($this->debug) error_log(__METHOD__."('$username') dn not found or password wrong!");
 		// dn not found or password wrong
@@ -226,11 +226,11 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$admin = False;
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -238,22 +238,22 @@ 
 		else
 		{
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
-				Api\Translation::charset(),'utf-8');
+				Api\Translation::charset(), 'utf-8');
 		}
 		//echo "<p>auth_Api\Ldap::change_password('$old_passwd','$new_passwd',$account_id) username='$username'</p>\n";
 
-		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array($username, $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		$ds = Api\Ldap::factory();
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter);
 		$allValues = ldap_get_entries($ds, $sri);
 
-		$entry['shadowlastchange'] = (is_null($lastpwdchange) || $lastpwdchange<0 ? round((time()-date('Z')) / (24*3600)):$lastpwdchange);
+		$entry['shadowlastchange'] = (is_null($lastpwdchange) || $lastpwdchange < 0 ? round((time() - date('Z')) / (24 * 3600)) : $lastpwdchange);
 
 		$dn = $allValues[0]['dn'];
 
-		if(!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if (!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			$ds = Api\Ldap::factory('', $dn, $passwd);
 		}
@@ -262,7 +262,7 @@ 
 			return false;
 		}
 		// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-		if (!$admin) Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		if (!$admin) Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', (is_null($lastpwdchange) || $lastpwdchange < 0 ? time() : $lastpwdchange));
 		return true;
 	}
 
@@ -278,7 +278,7 @@ 
 	 * @param boolean $update_lastchange =true
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0, $update_lastchange=true)
+	function change_password($old_passwd, $new_passwd, $account_id = 0, $update_lastchange = true)
 	{
 		if (!$account_id)
 		{
@@ -287,11 +287,11 @@ 
 		else
 		{
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
-				Api\Translation::charset(),'utf-8');
+				Api\Translation::charset(), 'utf-8');
 		}
 		if ($this->debug) error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
 
-		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array($username, $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		$ds = $ds_admin = Api\Ldap::factory();
@@ -301,19 +301,19 @@ 
 		$entry['userpassword'] = Api\Auth::encrypt_password($new_passwd);
 		if ($update_lastchange)
 		{
-			$entry['shadowlastchange'] = round((time()-date('Z')) / (24*3600));
+			$entry['shadowlastchange'] = round((time() - date('Z')) / (24 * 3600));
 		}
 
 		$dn = $allValues[0]['dn'];
 
-		if($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if ($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			try {
-				$ds = Api\Ldap\factory('',$dn,$old_passwd);
+				$ds = Api\Ldap\factory('', $dn, $old_passwd);
 			}
 			catch (Api\Exception\NoPermission $e) {
 				unset($e);
-				return false;	// wrong old user password
+				return false; // wrong old user password
 			}
 		}
 		// try changing password bind as user or as admin, to cater for all sorts of ldap configuration
@@ -322,10 +322,10 @@ 
 		{
 			return false;
 		}
-		if($old_passwd)	// if old password given (not called by admin) update the password in the session
+		if ($old_passwd)	// if old password given (not called by admin) update the password in the session
 		{
 			// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',time());
+			Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', time());
 		}
 		return $entry['userpassword'];
 	}

Braces +64 added lines, -16 removed lines

@@ -59,7 +59,10 @@ 
 		catch(Api\Exception\NoPermission $e)
 		{
 			unset($e);
-			if ($this->debug) error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
+			}
 			return False;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
@@ -80,13 +83,19 @@ 
 			if ($GLOBALS['egw_info']['server']['case_sensitive_username'] == true &&
 				$allValues[0]['uid'][0] != $username)
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) wrong case in username!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) wrong case in username!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) account is expired!");
+				}
 				return false;	// account is expired
 			}
 			$userDN = $allValues[0]['dn'];
@@ -124,7 +133,10 @@ 
 						else
 						{
 							$ret = false;
-							if ($this->debug) error_log(__METHOD__."('$username',\$password) bind as user failed!");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."('$username',\$password) bind as user failed!");
+							}
 						}
 					}
 					// account exists, check if it is acctive
@@ -132,7 +144,10 @@ 
 					{
 						$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
 
-						if ($this->debug && !$ret) error_log(__METHOD__."('$username',\$password) account NOT active!");
+						if ($this->debug && !$ret)
+						{
+							error_log(__METHOD__."('$username',\$password) account NOT active!");
+						}
 					}
 				}
 				// account-repository is ldap --> check if passwd hash migration is enabled
@@ -154,7 +169,10 @@ 
 				return $ret;
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_username', '$_passwd') dn not found or password wrong!");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_username', '$_passwd') dn not found or password wrong!");
+		}
 		// dn not found or password wrong
 		return False;
 	}
@@ -176,7 +194,10 @@ 
 		}
 		catch (Api\Exception\NoPermission $ex) {
 			unset($ex);
-			if ($this->debug) error_log(__METHOD__."('$username') can NOT bind with ldap_root_dn to search!");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."('$username') can NOT bind with ldap_root_dn to search!");
+			}
 			return false;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
@@ -196,24 +217,36 @@ 
 		{
 			if (!isset($allValues[0]['shadowlastchange']))
 			{
-				if ($this->debug) error_log(__METHOD__."('$username') no shadowlastchange attribute!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username') no shadowlastchange attribute!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['case_sensitive_username'] == true &&
 				$allValues[0]['uid'][0] != $username)
 			{
-				if ($this->debug) error_log(__METHOD__."('$username') wrong case in username!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username') wrong case in username!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) account is expired!");
+				}
 				return false;	// account is expired
 			}
 			return $allValues[0]['shadowlastchange'][0]*24*3600;
 		}
-		if ($this->debug) error_log(__METHOD__."('$username') dn not found or password wrong!");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$username') dn not found or password wrong!");
+		}
 		// dn not found or password wrong
 		return false;
 	}
@@ -253,16 +286,22 @@ 
 
 		$dn = $allValues[0]['dn'];
 
-		if(!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if(!$admin && $passwd)
+		{
+			// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			$ds = Api\Ldap::factory('', $dn, $passwd);
 		}
+		}
 		if (!@ldap_modify($ds, $dn, $entry))
 		{
 			return false;
 		}
 		// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-		if (!$admin) Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		if (!$admin)
+		{
+			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		}
 		return true;
 	}
 
@@ -289,7 +328,10 @@ 
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
 				Api\Translation::charset(),'utf-8');
 		}
-		if ($this->debug) error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
+		}
 
 		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
@@ -306,10 +348,13 @@ 
 
 		$dn = $allValues[0]['dn'];
 
-		if($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if($old_passwd)
+		{
+			// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			try {
 				$ds = Api\Ldap\factory('',$dn,$old_passwd);
+		}
 			}
 			catch (Api\Exception\NoPermission $e) {
 				unset($e);
@@ -322,11 +367,14 @@ 
 		{
 			return false;
 		}
-		if($old_passwd)	// if old password given (not called by admin) update the password in the session
+		if($old_passwd)
+		{
+			// if old password given (not called by admin) update the password in the session
 		{
 			// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
 			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',time());
 		}
+		}
 		return $entry['userpassword'];
 	}
 }

api/src/Auth/Sql.php

Spacing +34 added lines, -34 removed lines

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

Braces +24 added lines, -6 removed lines

@@ -60,9 +60,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if($passwd_type == 'text')
@@ -96,7 +99,10 @@ 
 						$this->_update_passwd($encrypted_passwd,$passwd,$row['account_id'],false,true);
 					}
 				}
-				if (!$match) return false;
+				if (!$match)
+				{
+					return false;
+				}
 			}
 		}
 		/* Auth via crypted password. NOTE: mail needs cleartext password to authenticate against mailserver! */
@@ -129,9 +135,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if (!($row = $this->db->select($this->table,'account_lid,account_lastpwd_change',$where,__LINE__,__FILE__)->fetch()) ||
@@ -188,8 +197,14 @@ 
 			'account_id' => $account_id,
 		),__LINE__,__FILE__);
 
-		if(!$this->db->affected_rows()) return false;
-		if (!$admin) Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
+		if(!$this->db->affected_rows())
+		{
+			return false;
+		}
+		if (!$admin)
+		{
+			Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
+		}
 		return true;
 	}
 
@@ -248,7 +263,10 @@ 
 		unset($new_passwd);	// not used, but required by function signature
 
 		$update = array('account_pwd' => $encrypted_passwd);
-		if ($update_lastpw_change) $update['account_lastpwd_change'] = time();
+		if ($update_lastpw_change)
+		{
+			$update['account_lastpwd_change'] = time();
+		}
 
 		if (!$this->db->update($this->table,$update,array(
 			'account_id' => $account_id,

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"' : ''), ' />';
+	}
    }
   }
  }

Spacing +61 added lines, -61 removed lines

@@ -22,7 +22,7 @@ 
 $_slife = 30; // session life in min.
 
 // errors
-error_reporting(E_ALL | (defined('E_STRICT') ? E_STRICT : 0));
+error_reporting(E_ALL|(defined('E_STRICT') ? E_STRICT : 0));
 ini_set('display_errors', $_errs);
 
 // session
@@ -33,60 +33,60 @@ 
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_lifetime', 0);
 session_start();
-if(!isset($_SESSION['token'])){
+if (!isset($_SESSION['token'])) {
  $_SESSION['token'] = md5(uniqid(rand(), 1));
 }
 
 // slashes
-if(get_magic_quotes_gpc()){
- foreach($_POST as $k => $v){
+if (get_magic_quotes_gpc()) {
+ foreach ($_POST as $k => $v) {
   $_POST[$k] = stripslashes($v);
  }
  ini_set('magic_quotes_gpc', 0);
 }
-if(get_magic_quotes_runtime()){
+if (get_magic_quotes_runtime()) {
  set_magic_quotes_runtime(0);
 }
 
 $_POST['enc'] = (isset($_POST['enc']) and preg_match('`^[-\w]+$`', $_POST['enc'])) ? $_POST['enc'] : 'utf-8';
 
 // token for anti-CSRF
-if(count($_POST)){
- if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())){
+if (count($_POST)) {
+ if ((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())) {
   $_POST = array('enc'=>'utf-8');
  }
 }
-if(empty($_GET['pre'])){
+if (empty($_GET['pre'])) {
  $_SESSION['token'] = md5(uniqid(rand(), 1));
  $token = $_SESSION['token'];
  session_regenerate_id(1);
 }
 
 // compress
-if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')){
+if (function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')) {
  ob_start('ob_gzhandler');
 }
 
 // HTM for unprocessed
-if(isset($_POST['inputH'])){
+if (isset($_POST['inputH'])) {
  echo '<html><head><title>htmLawed test: HTML view of unprocessed input</title></head><body style="margin:0; padding: 0;"><p style="background-color: black; color: white; padding: 2px;">&nbsp; Rendering of unprocessed input without an HTML doctype or charset declaration &nbsp; &nbsp; <small><a style="color: white; text-decoration: none;" href="1" onclick="javascript:window.close(this); return false;">close window</a> | <a style="color: white; text-decoration: none;" href="htmLawedTest.php" onclick="javascript: window.open(\'htmLawedTest.php\', \'hlmain\'); window.close(this); return false;">htmLawed test page</a></small></p><div>', $_POST['inputH'], '</div></body></html>';
  exit;
 }
 
 // main
-$_POST['text'] = isset($_POST['text']) ? $_POST['text'] : 'text to process; < '. $_limit. ' characters'. ($_hlimit ? ' (for binary hexdump view, < '. $_hlimit. ')' : '');
+$_POST['text'] = isset($_POST['text']) ? $_POST['text'] : 'text to process; < '.$_limit.' characters'.($_hlimit ? ' (for binary hexdump view, < '.$_hlimit.')' : '');
 $do = (!empty($_POST[$_sid]) && isset($_POST['text'][0]) && !isset($_POST['text'][$_limit])) ? 1 : 0;
 $limit_exceeded = isset($_POST['text'][$_limit]) ? 1 : 0;
 $pre_mem = memory_get_usage();
 $validation = (!empty($_POST[$_sid]) and isset($_POST['w3c_validate'][0])) ? 1 : 0;
 include './htmLawed.php';
 
-function format($t){
- $t = "\n". str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
+function format($t) {
+ $t = "\n".str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
  return str_replace(array('<br />', "\n ", '  '), array("\n<br />\n", "\n&nbsp;", ' &nbsp;'), $t);
 }
 
-function hexdump($d){
+function hexdump($d) {
 // Mainly by Aidan Lister <aidan@php.net>, Peter Waller <iridum@php.net>
  $hexi = '';
  $ascii = '';
@@ -94,23 +94,23 @@ 
  echo '<pre>';
  $offset = 0;
  $len = strlen($d);
- for($i=$j=0; $i<$len; $i++)
+ for ($i = $j = 0; $i < $len; $i++)
  {
   // Convert to hexidecimal
   $hexi .= sprintf("%02X ", ord($d[$i]));
   // Replace non-viewable bytes with '.'
-  if(ord($d[$i]) >= 32){
+  if (ord($d[$i]) >= 32) {
    $ascii .= htmlspecialchars($d[$i]);
-  }else{
+  } else {
    $ascii .= '.';
   }
   // Add extra column spacing
-  if($j == 7){
+  if ($j == 7) {
    $hexi .= ' ';
    $ascii .= '  ';
   }
   // Add row
-  if(++$j == 16 || $i == $len-1){
+  if (++$j == 16 || $i == $len - 1) {
    // Join the hexi / ascii output
    echo sprintf("%04X   %-49s   %s", $offset, $hexi, $ascii);
    // Reset vars
@@ -118,7 +118,7 @@ 
    $offset += 16;
    $j = 0;
    // Add newline
-   if ($i !== $len-1){
+   if ($i !== $len - 1) {
     echo "\n";
    }
   }
@@ -135,7 +135,7 @@ 
 <html lang="en" xml:lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="description" content="htmLawed <?php echo hl_version();?> test page" />
+<meta name="description" content="htmLawed <?php echo hl_version(); ?> test page" />
 <style type="text/css"><!--/*--><![CDATA[/*><!--*/
 a, a.resizer{text-decoration:none;}
 a:hover, a.resizer:hover{color:red;}
@@ -169,7 +169,7 @@ 
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 window.name = 'hlmain';
 function hl(i){
- <?php if(!$_hilite){echo 'return;'; }?>
+ <?php if (!$_hilite) {echo 'return;'; }?>
  var e = document.getElementById(i);
  if(!e){return;}
  run(e, '</[a-z1-6]+>', 'ctag');
@@ -432,27 +432,27 @@ 
 var dmp = new diff_match_patch(); function diffLaunch(){var text1 = document.getElementById('text').value; var text2 = document.getElementById('text2').value; dmp.Diff_Timeout = 0; dmp.Diff_EditCost = 4; var d = dmp.diff_main(text1, text2); var ds = dmp.diff_prettyHtml(d); document.getElementById('diff').innerHTML = ds;
 }
 //--><!]]></script>
-<title>htmLawed (<?php echo hl_version();?>) test</title>
+<title>htmLawed (<?php echo hl_version(); ?>) test</title>
 </head>
 <body>
 <div id="topmost">
 
-<h5 style="float: left; display: inline; margin-top: 0; margin-bottom: 5px;"><a href="http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/index.php" title="htmLawed home">HTM<big><big>L</big></big>AWED</a> <?php echo hl_version();?> <a href="htmLawedTest.php" title="test home">TEST</a></h5>
+<h5 style="float: left; display: inline; margin-top: 0; margin-bottom: 5px;"><a href="http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/index.php" title="htmLawed home">HTM<big><big>L</big></big>AWED</a> <?php echo hl_version(); ?> <a href="htmLawedTest.php" title="test home">TEST</a></h5>
 <span style="float: right;" class="help"><a href="htmLawed_README.htm"><span class="notice">htm</span></a> / <a href="htmLawed_README.txt"><span class="notice">txt</span></a> documentation</span><br style="clear:both;" />
 
-<a href="htmLawedTest.php" title="[toggle visibility] type or copy-paste" onclick="javascript:toggle('inputF'); return false;"><span class="notice">Input &raquo;</span> <span class="help" title="limit lower with multibyte characters<?php echo (($_hlimit < $_limit && $_hlimit)? '; limit is '. $_hlimit. ' for viewing binaries' : ''); ?>"><small>(max. <?php echo htmlspecialchars($_limit);?> chars)</small></span></a>
+<a href="htmLawedTest.php" title="[toggle visibility] type or copy-paste" onclick="javascript:toggle('inputF'); return false;"><span class="notice">Input &raquo;</span> <span class="help" title="limit lower with multibyte characters<?php echo (($_hlimit < $_limit && $_hlimit) ? '; limit is '.$_hlimit.' for viewing binaries' : ''); ?>"><small>(max. <?php echo htmlspecialchars($_limit); ?> chars)</small></span></a>
 
 <form id="testform" name="testform" action="htmLawedTest.php" method="post" accept-charset="<?php echo htmlspecialchars($_POST['enc']); ?>" style="padding:0; margin: 0; display:inline;">
 
 <div id="inputF" style="display: block;">
 
 <input type="hidden" name="token" id="token" value="<?php echo $token; ?>" />
-<div><textarea id="text" class="textarea" name="text" rows="5" cols="100" style="width: 100%;"><?php echo htmlspecialchars($_POST['text']);?></textarea></div>
+<div><textarea id="text" class="textarea" name="text" rows="5" cols="100" style="width: 100%;"><?php echo htmlspecialchars($_POST['text']); ?></textarea></div>
 <input type="submit" id="submitF" name="submitF" value="Process" style="float:left;" title="filter using htmLawed" onclick="javascript: sndProc(); return false;" onkeypress="javascript: sndProc(); return false;" />
 
 <?php
-if($do){
- if($validation){
+if ($do) {
+ if ($validation) {
   echo '<input type="hidden" value="1" name="w3c_validate" id="w3c_validate" />';
  }
 ?>
@@ -461,7 +461,7 @@ 
 <button type="button" onclick="javascript:document.getElementById('text').focus();document.getElementById('text').select()" title="select all to copy" style="float:right;">Select all</button>
 
 <?php
-if($_w3c_validate && $validation){
+if ($_w3c_validate && $validation) {
 ?>
 
 <button type="button" title="HTML 4.01 W3C online validation" style="float: right;" onclick="javascript: sndValidn('text', 'html401'); return false;" onkeypress="javascript: sndValidn('text', 'html401'); return false;">Check HTML</button>
@@ -470,8 +470,8 @@ 
 <?php
  }
 }
-else{
- if($_w3c_validate){
+else {
+ if ($_w3c_validate) {
   echo '<span style="float: right;" class="help" title="for direct submission of input or output code to W3C validator for (X)HTML validation"><span style="font-size: 85%;">&nbsp;Validator tools: </span><input type="checkbox" value="1" name="w3c_validate" id="w3c_validate" style="vertical-align: middle;"', ($validation ? ' checked="checked"' : ''), ' /></span>';
  }
 }
@@ -483,7 +483,7 @@ 
 <br style="clear:both;" />
 
 <?php
-if($limit_exceeded){
+if ($limit_exceeded) {
  echo '<br /><strong>Input text is too long!</strong><br />';
 }
 ?>
@@ -531,32 +531,32 @@ 
 'valid_xhtml'=>array('2', 'nil', 'auto-set various parameters for most valid XHTML', 'nil'),
 'xml:lang'=>array('3', 'nil', 'auto-add <em>xml:lang</em> attribute', '0'),
 );
-foreach($cfg as $k=>$v){
+foreach ($cfg as $k=>$v) {
  echo '<li>', $k, ': ';
- if(!empty($v[0])){ // input radio
+ if (!empty($v[0])) { // input radio
   $j = $v[3];
-  for($i = $j-1; ++$i < $v[0]+$v[3];++$j){
-   echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'. $k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'. $k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
+  for ($i = $j - 1; ++$i < $v[0] + $v[3]; ++$j) {
+   echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'.$k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'.$k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
   }
-  if($v[1] == 'nil'){
-   echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'. $k]) or $_POST['h'. $k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
+  if ($v[1] == 'nil') {
+   echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'.$k]) or $_POST['h'.$k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
   }
-  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"' : ''), ' />';
+  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"' : ''), ' />';
    }
-   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"' : ''), ' />';
+   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"' : ''), ' />';
     }
    }
   }
  }
- elseif(ctype_digit($v[3])){ // input text
-  echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'. $k][0]) ? $_POST['h'. $k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+ elseif (ctype_digit($v[3])) { // input text
+  echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'.$k][0]) ? $_POST['h'.$k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
  }
- else{} // text-area
+ else {} // text-area
  echo ' <span class="help">', $v[2], '</span></li>';
 }
 echo '</ul></td></tr><tr><td><span style="vertical-align: top;" class="help" title="$spec argument: element-specific attribute rules">Spec:</span></td><td><textarea name="spec" id="spec" cols="70" rows="3" style="width:80%;">', htmlspecialchars((isset($_POST['spec']) ? $_POST['spec'] : '')), '</textarea></td></tr></table>';
@@ -566,31 +566,31 @@ 
 </form>
 
 <?php
-if($do){
+if ($do) {
  $cfg = array();
- foreach($_POST as $k=>$v){
-  if($k[0] == 'h' && $v != 'nil'){
+ foreach ($_POST as $k=>$v) {
+  if ($k[0] == 'h' && $v != 'nil') {
    $cfg[substr($k, 1)] = $v;
   }
  }
 
- if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))){
+ if (isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))) {
   $cfg['anti_link_spam'] = array($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
  }
  unset($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
- if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1){
+ if (isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1) {
   $cfg['anti_mail_spam'] = isset($cfg['anti_mail_spam1'][0]) ? $cfg['anti_mail_spam1'] : 0;
  }
  unset($cfg['anti_mail_spam11']);
- if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1){
+ if (isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1) {
   $cfg['deny_attribute'] = isset($cfg['deny_attribute1'][0]) ? $cfg['deny_attribute1'] : 0;
  }
  unset($cfg['deny_attribute1']);
- if(isset($cfg['tidy']) && $cfg['tidy'] == 2){
+ if (isset($cfg['tidy']) && $cfg['tidy'] == 2) {
   $cfg['tidy'] = isset($cfg['tidy2'][0]) ? $cfg['tidy2'] : 0;
  }
  unset($cfg['tidy2']);
- if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2){
+ if (isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2) {
   $cfg['unique_ids'] = isset($cfg['unique_ids2'][0]) ? $cfg['unique_ids2'] : 1;
  }
  unset($cfg['unique_ids2']);
@@ -600,8 +600,8 @@ 
  $st = microtime();
  $out = htmLawed($_POST['text'], $cfg, $_POST['spec']);
  $et = microtime();
- echo '<br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'inputR\'); return false;"><span class="notice">Input code &raquo;</span></a> <span class="help" title="tags estimated as half of total &gt; and &lt; chars; values may be inaccurate for non-ASCII text"><small><big>', strlen($_POST['text']), '</big> chars, ~<big>', ($tag = round((substr_count($_POST['text'], '>') + substr_count($_POST['text'], '<'))/2)), '</big> tag', ($tag > 1 ? 's' : ''), '</small>&nbsp;</span><div id="inputR" style="display: none;">', format($_POST['text']), '</div><script type="text/javascript">hl(\'inputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'inputD\'); return false;"><span class="notice">Input binary &raquo;&nbsp;</span></a><div id="inputD" style="display: none;">'. hexdump($_POST['text']). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] finalized internal settings as interpreted by htmLawed; for developers" onclick="javascript:toggle(\'settingF\'); return false;"><span class="notice">Finalized internal settings &raquo;&nbsp;</span></a> <div id="settingF" style="display: none;">$config: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['config'], true)))), '<br />$spec: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['spec'], true)))), '</div><script type="text/javascript">hl(\'settingF\');</script>', '<br /><a href="htmLawedTest.php" title="[toggle visibility] suitable for copy-paste" onclick="javascript:toggle(\'outputF\'); return false;"><span class="notice">Output &raquo;</span></a> <span class="help" title="approx., server-specific value excluding the \'include()\' call"><small>htmLawed processing time <big>', number_format(((substr($et,0,9)) + (substr($et,-10)) - (substr($st,0,9)) - (substr($st,-10))),4), '</big> s</small></span>', (($mem = memory_get_peak_usage()) !== false ? '<span class="help"><small>, peak memory usage <big>'. round(($mem-$pre_mem)/1048576, 2). '</big> <small>MB</small>' : ''), '</small></span><div id="outputF"  style="display: block;"><div><textarea id="text2" class="textarea" name="text2" rows="5" cols="100" style="width: 100%;">', htmlspecialchars($out), '</textarea></div><button type="button" onclick="javascript:document.getElementById(\'text2\').focus();document.getElementById(\'text2\').select()" title="select all to copy" style="float:right;">Select all</button>';
- if($_w3c_validate && $validation)
+ echo '<br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'inputR\'); return false;"><span class="notice">Input code &raquo;</span></a> <span class="help" title="tags estimated as half of total &gt; and &lt; chars; values may be inaccurate for non-ASCII text"><small><big>', strlen($_POST['text']), '</big> chars, ~<big>', ($tag = round((substr_count($_POST['text'], '>') + substr_count($_POST['text'], '<')) / 2)), '</big> tag', ($tag > 1 ? 's' : ''), '</small>&nbsp;</span><div id="inputR" style="display: none;">', format($_POST['text']), '</div><script type="text/javascript">hl(\'inputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'inputD\'); return false;"><span class="notice">Input binary &raquo;&nbsp;</span></a><div id="inputD" style="display: none;">'.hexdump($_POST['text']).'</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] finalized internal settings as interpreted by htmLawed; for developers" onclick="javascript:toggle(\'settingF\'); return false;"><span class="notice">Finalized internal settings &raquo;&nbsp;</span></a> <div id="settingF" style="display: none;">$config: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['config'], true)))), '<br />$spec: ', str_replace(array('    ', "\t", '  '), array('  ', '&nbsp;  ', '&nbsp; '), nl2br(htmlspecialchars(print_r($GLOBALS['hlcfg']['spec'], true)))), '</div><script type="text/javascript">hl(\'settingF\');</script>', '<br /><a href="htmLawedTest.php" title="[toggle visibility] suitable for copy-paste" onclick="javascript:toggle(\'outputF\'); return false;"><span class="notice">Output &raquo;</span></a> <span class="help" title="approx., server-specific value excluding the \'include()\' call"><small>htmLawed processing time <big>', number_format(((substr($et, 0, 9)) + (substr($et, -10)) - (substr($st, 0, 9)) - (substr($st, -10))), 4), '</big> s</small></span>', (($mem = memory_get_peak_usage()) !== false ? '<span class="help"><small>, peak memory usage <big>'.round(($mem - $pre_mem) / 1048576, 2).'</big> <small>MB</small>' : ''), '</small></span><div id="outputF"  style="display: block;"><div><textarea id="text2" class="textarea" name="text2" rows="5" cols="100" style="width: 100%;">', htmlspecialchars($out), '</textarea></div><button type="button" onclick="javascript:document.getElementById(\'text2\').focus();document.getElementById(\'text2\').select()" title="select all to copy" style="float:right;">Select all</button>';
+ if ($_w3c_validate && $validation)
  {
 ?>
 
@@ -610,9 +610,9 @@ 
 
 <?php
  }
- echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'. hexdump($out). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
+ echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'.hexdump($out).'</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
 }
-else{
+else {
 ?>
 
 <br />
@@ -630,7 +630,7 @@ 
 <br /><br />Hovering the mouse over some of the text can provide additional information in some browsers.</small>
 
 <?php
-if($_w3c_validate){
+if ($_w3c_validate) {
 ?>
 
 <small><br /><br />Because of character-encoding issues, the W3C validator (anyway not perfect) may reject validation requests or invalidate otherwise-valid code, esp. if text was copy-pasted in the input box. Local applications like the <em>HTML Validator</em> Firefox browser add-on may be useful in such cases.</small>

Braces +92 added lines, -43 removed lines

@@ -33,42 +33,51 @@ 
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_lifetime', 0);
 session_start();
-if(!isset($_SESSION['token'])){
+if(!isset($_SESSION['token']))
+{
  $_SESSION['token'] = md5(uniqid(rand(), 1));
 }
 
 // slashes
-if(get_magic_quotes_gpc()){
- foreach($_POST as $k => $v){
+if(get_magic_quotes_gpc())
+{
+ foreach($_POST as $k => $v)
+ {
   $_POST[$k] = stripslashes($v);
  }
  ini_set('magic_quotes_gpc', 0);
 }
-if(get_magic_quotes_runtime()){
+if(get_magic_quotes_runtime())
+{
  set_magic_quotes_runtime(0);
 }
 
 $_POST['enc'] = (isset($_POST['enc']) and preg_match('`^[-\w]+$`', $_POST['enc'])) ? $_POST['enc'] : 'utf-8';
 
 // token for anti-CSRF
-if(count($_POST)){
- if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id())){
+if(count($_POST))
+{
+ if((empty($_GET['pre']) and ((!empty($_POST['token']) and !empty($_SESSION['token']) and $_POST['token'] != $_SESSION['token']) or empty($_POST[$_sid]) or $_POST[$_sid] != session_id() or empty($_COOKIE[$_sid]) or $_COOKIE[$_sid] != session_id())) or ($_POST[$_sid] != session_id()))
+ {
   $_POST = array('enc'=>'utf-8');
  }
 }
-if(empty($_GET['pre'])){
+if(empty($_GET['pre']))
+{
  $_SESSION['token'] = md5(uniqid(rand(), 1));
  $token = $_SESSION['token'];
  session_regenerate_id(1);
 }
 
 // compress
-if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression')){
+if(function_exists('gzencode') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('`gzip|deflate`i', $_SERVER['HTTP_ACCEPT_ENCODING']) && !ini_get('zlib.output_compression'))
+{
  ob_start('ob_gzhandler');
 }
 
 // HTM for unprocessed
-if(isset($_POST['inputH'])){
+if(isset($_POST['inputH']))
+{
  echo '<html><head><title>htmLawed test: HTML view of unprocessed input</title></head><body style="margin:0; padding: 0;"><p style="background-color: black; color: white; padding: 2px;">&nbsp; Rendering of unprocessed input without an HTML doctype or charset declaration &nbsp; &nbsp; <small><a style="color: white; text-decoration: none;" href="1" onclick="javascript:window.close(this); return false;">close window</a> | <a style="color: white; text-decoration: none;" href="htmLawedTest.php" onclick="javascript: window.open(\'htmLawedTest.php\', \'hlmain\'); window.close(this); return false;">htmLawed test page</a></small></p><div>', $_POST['inputH'], '</div></body></html>';
  exit;
 }
@@ -81,12 +90,14 @@ 
 $validation = (!empty($_POST[$_sid]) and isset($_POST['w3c_validate'][0])) ? 1 : 0;
 include './htmLawed.php';
 
-function format($t){
+function format($t)
+{
  $t = "\n". str_replace(array("\t", "\r\n", "\r", '&', '<', '>', "\n"), array('    ', "\n", "\n", '&amp;', '&lt;', '&gt;', "<span class=\"newline\">&#172;</span><br />\n"), $t);
  return str_replace(array('<br />', "\n ", '  '), array("\n<br />\n", "\n&nbsp;", ' &nbsp;'), $t);
 }
 
-function hexdump($d){
+function hexdump($d)
+{
 // Mainly by Aidan Lister <aidan@php.net>, Peter Waller <iridum@php.net>
  $hexi = '';
  $ascii = '';
@@ -99,18 +110,23 @@ 
   // Convert to hexidecimal
   $hexi .= sprintf("%02X ", ord($d[$i]));
   // Replace non-viewable bytes with '.'
-  if(ord($d[$i]) >= 32){
+  if(ord($d[$i]) >= 32)
+  {
    $ascii .= htmlspecialchars($d[$i]);
-  }else{
+  }
+  else
+  {
    $ascii .= '.';
   }
   // Add extra column spacing
-  if($j == 7){
+  if($j == 7)
+  {
    $hexi .= ' ';
    $ascii .= '  ';
   }
   // Add row
-  if(++$j == 16 || $i == $len-1){
+  if(++$j == 16 || $i == $len-1)
+  {
    // Join the hexi / ascii output
    echo sprintf("%04X   %-49s   %s", $offset, $hexi, $ascii);
    // Reset vars
@@ -118,7 +134,8 @@ 
    $offset += 16;
    $j = 0;
    // Add newline
-   if ($i !== $len-1){
+   if ($i !== $len-1)
+   {
     echo "\n";
    }
   }
@@ -169,7 +186,9 @@ 
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 window.name = 'hlmain';
 function hl(i){
- <?php if(!$_hilite){echo 'return;'; }?>
+ <?php if(!$_hilite)
+{
+echo 'return;'; }?>
  var e = document.getElementById(i);
  if(!e){return;}
  run(e, '</[a-z1-6]+>', 'ctag');
@@ -451,8 +470,10 @@ 
 <input type="submit" id="submitF" name="submitF" value="Process" style="float:left;" title="filter using htmLawed" onclick="javascript: sndProc(); return false;" onkeypress="javascript: sndProc(); return false;" />
 
 <?php
-if($do){
- if($validation){
+if($do)
+{
+ if($validation)
+ {
   echo '<input type="hidden" value="1" name="w3c_validate" id="w3c_validate" />';
  }
 ?>
@@ -461,7 +482,8 @@ 
 <button type="button" onclick="javascript:document.getElementById('text').focus();document.getElementById('text').select()" title="select all to copy" style="float:right;">Select all</button>
 
 <?php
-if($_w3c_validate && $validation){
+if($_w3c_validate && $validation)
+{
 ?>
 
 <button type="button" title="HTML 4.01 W3C online validation" style="float: right;" onclick="javascript: sndValidn('text', 'html401'); return false;" onkeypress="javascript: sndValidn('text', 'html401'); return false;">Check HTML</button>
@@ -470,8 +492,10 @@ 
 <?php
  }
 }
-else{
- if($_w3c_validate){
+else
+{
+ if($_w3c_validate)
+ {
   echo '<span style="float: right;" class="help" title="for direct submission of input or output code to W3C validator for (X)HTML validation"><span style="font-size: 85%;">&nbsp;Validator tools: </span><input type="checkbox" value="1" name="w3c_validate" id="w3c_validate" style="vertical-align: middle;"', ($validation ? ' checked="checked"' : ''), ' /></span>';
  }
 }
@@ -483,7 +507,8 @@ 
 <br style="clear:both;" />
 
 <?php
-if($limit_exceeded){
+if($limit_exceeded)
+{
  echo '<br /><strong>Input text is too long!</strong><br />';
 }
 ?>
@@ -531,32 +556,46 @@ 
 'valid_xhtml'=>array('2', 'nil', 'auto-set various parameters for most valid XHTML', 'nil'),
 'xml:lang'=>array('3', 'nil', 'auto-add <em>xml:lang</em> attribute', '0'),
 );
-foreach($cfg as $k=>$v){
+foreach($cfg as $k=>$v)
+{
  echo '<li>', $k, ': ';
- if(!empty($v[0])){ // input radio
+ if(!empty($v[0]))
+ {
+// input radio
   $j = $v[3];
-  for($i = $j-1; ++$i < $v[0]+$v[3];++$j){
+  for($i = $j-1; ++$i < $v[0]+$v[3];++$j)
+  {
    echo '<input type="radio" name="h', $k, '" value="', $i, '"', (!isset($_POST['h'. $k]) ? ($v[1] == $i ? ' checked="checked"' : '') : ($_POST['h'. $k] == $i ? ' checked="checked"' : '')), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />', $i, ' ';
   }
-  if($v[1] == 'nil'){
+  if($v[1] == 'nil')
+  {
    echo '<input type="radio" name="h', $k, '" value="nil"', ((!isset($_POST['h'. $k]) or $_POST['h'. $k] == 'nil') ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />not set ';
   }
-  if(!empty($v[4])){ // + input text box
+  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])){
+   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"' : ''), ' />';
    }
-   else{
-    foreach($v[4] as $z){
+   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"' : ''), ' />';
     }
    }
   }
  }
- elseif(ctype_digit($v[3])){ // input text
+ elseif(ctype_digit($v[3]))
+ {
+// input text
   echo '<input type="text" size="', $v[3], '" name="h', $k, '" value="', htmlspecialchars(isset($_POST['h'. $k][0]) ? $_POST['h'. $k] : $v[1]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
  }
- else{} // text-area
+ else
+ {
+} // text-area
  echo ' <span class="help">', $v[2], '</span></li>';
 }
 echo '</ul></td></tr><tr><td><span style="vertical-align: top;" class="help" title="$spec argument: element-specific attribute rules">Spec:</span></td><td><textarea name="spec" id="spec" cols="70" rows="3" style="width:80%;">', htmlspecialchars((isset($_POST['spec']) ? $_POST['spec'] : '')), '</textarea></td></tr></table>';
@@ -566,31 +605,39 @@ 
 </form>
 
 <?php
-if($do){
+if($do)
+{
  $cfg = array();
- foreach($_POST as $k=>$v){
-  if($k[0] == 'h' && $v != 'nil'){
+ foreach($_POST as $k=>$v)
+ {
+  if($k[0] == 'h' && $v != 'nil')
+  {
    $cfg[substr($k, 1)] = $v;
   }
  }
 
- if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12']))){
+ if(isset($cfg['anti_link_spam']) && $cfg['anti_link_spam'] && (!empty($cfg['anti_link_spam11']) or !empty($cfg['anti_link_spam12'])))
+ {
   $cfg['anti_link_spam'] = array($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
  }
  unset($cfg['anti_link_spam11'], $cfg['anti_link_spam12']);
- if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1){
+ if(isset($cfg['anti_mail_spam']) && $cfg['anti_mail_spam'] == 1)
+ {
   $cfg['anti_mail_spam'] = isset($cfg['anti_mail_spam1'][0]) ? $cfg['anti_mail_spam1'] : 0;
  }
  unset($cfg['anti_mail_spam11']);
- if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1){
+ if(isset($cfg['deny_attribute']) && $cfg['deny_attribute'] == 1)
+ {
   $cfg['deny_attribute'] = isset($cfg['deny_attribute1'][0]) ? $cfg['deny_attribute1'] : 0;
  }
  unset($cfg['deny_attribute1']);
- if(isset($cfg['tidy']) && $cfg['tidy'] == 2){
+ if(isset($cfg['tidy']) && $cfg['tidy'] == 2)
+ {
   $cfg['tidy'] = isset($cfg['tidy2'][0]) ? $cfg['tidy2'] : 0;
  }
  unset($cfg['tidy2']);
- if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2){
+ if(isset($cfg['unique_ids']) && $cfg['unique_ids'] == 2)
+ {
   $cfg['unique_ids'] = isset($cfg['unique_ids2'][0]) ? $cfg['unique_ids2'] : 1;
  }
  unset($cfg['unique_ids2']);
@@ -612,7 +659,8 @@ 
  }
  echo '</div><br /><a href="htmLawedTest.php" title="[toggle visibility] syntax-highlighted" onclick="javascript:toggle(\'outputR\'); return false;"><span class="notice">Output code &raquo;</span></a><div id="outputR" style="display: block;">', format($out), '</div><script type="text/javascript">hl(\'outputR\');</script>', (!isset($_POST['text'][$_hlimit]) ? ' <a href="htmLawedTest.php" title="[toggle visibility] hexdump; non-viewable characters like line-returns are shown as dots" onclick="javascript:toggle(\'outputD\'); return false;"><span class="notice">Output binary &raquo;</span></a><div id="outputD" style="display: none;">'. hexdump($out). '</div>' : ''), ' <a href="htmLawedTest.php" title="[toggle visibility] inline output-input diff; might not be perfectly accurate, semantically or otherwise " onclick="javascript:toggle(\'diff\'); diffLaunch(); return false;"><span class="notice">Diff &raquo;</span></a> <div id="diff" style="display: none;"></div><br /><a href="htmLawedTest.php" title="[toggle visibility] XHTML 1 Transitional doctype" onclick="javascript:toggle(\'outputH\'); return false;"><span class="notice">Output rendered &raquo;</span></a><div id="outputH" style="display: block;">', $out, '</div>';
 }
-else{
+else
+{
 ?>
 
 <br />
@@ -630,7 +678,8 @@ 
 <br /><br />Hovering the mouse over some of the text can provide additional information in some browsers.</small>
 
 <?php
-if($_w3c_validate){
+if($_w3c_validate)
+{
 ?>
 
 <small><br /><br />Because of character-encoding issues, the W3C validator (anyway not perfect) may reject validation requests or invalidate otherwise-valid code, esp. if text was copy-pasted in the input box. Local applications like the <em>HTML Validator</em> Firefox browser add-on may be useful in such cases.</small>