SimpleMachines / SMF2.1

Sources/Subs-Ldap.php

Spacing +21 added lines, -21 removed lines

@@ -22,14 +22,14 @@ 
 		return 'retry';
 	}
 
-	if(empty($ldapSettings['port'])) {
+	if (empty($ldapSettings['port'])) {
 		$ldapConn = ldap_connect($ldapSettings['host']);
 	} 
 	else {
-		$ldapConn = ldap_connect($ldapSettings['host'] , (int)$ldapSettings['port']);
+		$ldapConn = ldap_connect($ldapSettings['host'], (int) $ldapSettings['port']);
 	}
 
-	if($ldapConn === FALSE) {
+	if ($ldapConn === FALSE) {
 		require_once($sourcedir . '/Errors.php');
 		$error = 'ldap connection failed';
 		log_error($error, 'general', __FILE__, __LINE__);
@@ -39,22 +39,22 @@ 
 	ldap_set_option($ldapConn, LDAP_OPT_PROTOCOL_VERSION, 3);
 	ldap_set_option($ldapConn, LDAP_OPT_REFERRALS, 0);
 
-	if($ldapConn) {
+	if ($ldapConn) {
 		$ldapbind = ldap_bind($ldapConn, $ldapSettings['rdn'], $ldapSettings['pass']); 
 
 		if ($ldapbind) {
-			$filter			= "(uid=$user)";
-			$ldapSearch	= ldap_search($ldapConn, $ldapSettings['dn'], $filter);
+			$filter = "(uid=$user)";
+			$ldapSearch = ldap_search($ldapConn, $ldapSettings['dn'], $filter);
 
-			if(ldap_count_entries($ldapConn, $ldapSearch) > 0 ) { 
-				$ldapEntry 		= ldap_first_entry($ldapConn,$ldapSearch);
+			if (ldap_count_entries($ldapConn, $ldapSearch) > 0) { 
+				$ldapEntry = ldap_first_entry($ldapConn, $ldapSearch);
 				do // Loop through them until we find the one we want 
 				{ 
-					if($ldapEntry === false) break; 
-					$userDn		= ldap_get_dn($ldapConn,$ldapEntry);
-					$ldapbind	= @ldap_bind($ldapConn, $userDn, $password);
-					if($ldapbind) {
-						$ldapattrs	= ldap_get_attributes($ldapConn,$ldapEntry);
+					if ($ldapEntry === false) break; 
+					$userDn = ldap_get_dn($ldapConn, $ldapEntry);
+					$ldapbind = @ldap_bind($ldapConn, $userDn, $password);
+					if ($ldapbind) {
+						$ldapattrs = ldap_get_attributes($ldapConn, $ldapEntry);
 
 						// verify user exists in forum user database
 						$request = $smcFunc['db_query']('', '
@@ -70,15 +70,15 @@ 
 						if ($smcFunc['db_num_rows']($request) == 0) { 
 							$smcFunc['db_free_result']($request);
 
-							if(isset($ldapattrs['givenName'][0])) {
+							if (isset($ldapattrs['givenName'][0])) {
 								$realName			= $ldapattrs['givenName'][0];
 							} 
 							else {
 								$realName			= $user;
 							}
 
-							if(isset($ldapattrs['mail'][0])) { 
-								$emailAddress	= $ldapattrs['mail'][0];
+							if (isset($ldapattrs['mail'][0])) { 
+								$emailAddress = $ldapattrs['mail'][0];
 							}
 							else {
 								return 'please create a valid email address';
@@ -86,12 +86,12 @@ 
 
 							// User does not exist in SMF database - create it
 							require_once($sourcedir . '/Subs-Members.php');
-							$regOptions = array (
+							$regOptions = array(
 									'username' => $user,
 									'email' => $emailAddress,
-									'password' => $password ,
+									'password' => $password,
 									'password_check' => $password,
-									'password_salt' => substr(md5(mt_rand()), 0, 4) ,
+									'password_salt' => substr(md5(mt_rand()), 0, 4),
 									'posts' => 0,
 									'check_password_strength' => false,
 									'check_email_ban' => false,
@@ -102,7 +102,7 @@ 
 									'member_ip' => '',
 									'is_activated' => 1,
 									'validation_code' => '',
-									'extra_register_vars' => array (
+									'extra_register_vars' => array(
 										'real_name' => $realName,
 									),
 							);
@@ -127,7 +127,7 @@ 
 							return 'success';
 						}
 					}
-				} while ( $ldapEntry = ldap_next_entry($ldapConn,$ldapEntry) );
+				} while ($ldapEntry = ldap_next_entry($ldapConn, $ldapEntry));
 				ldap_free_result($ldapSearch);
 			}
 		}