BurningFlipside / CommonCode

Auth/class.LDAPAuthenticator.php

Spacing +47 added lines, -47 removed lines

@@ -14,7 +14,7 @@ 
 namespace Auth;
 
 /** We need the FlipsideSettings class to determine how to connect to the LDAP server */
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -33,18 +33,18 @@ 
 {
     $count = count($array);
     $keys  = array_keys($orderby);
-    for($i = 0; $i < $count; $i++)
+    for ($i = 0; $i < $count; $i++)
     {
-        for($j = $i; $j < $count; $j++)
+        for ($j = $i; $j < $count; $j++)
         {
             $d = strcasecmp($array[$i][$keys[0]][0], $array[$j][$keys[0]][0]);
-            switch($orderby[$keys[0]])
+            switch ($orderby[$keys[0]])
             {
                 case 1:
-                    if($d > 0) swap($array, $i, $j);
+                    if ($d > 0) swap($array, $i, $j);
                     break;
                 case 0:
-                    if($d < 0) swap($array, $i, $j);
+                    if ($d < 0) swap($array, $i, $j);
                     break;
             }
         }
@@ -92,7 +92,7 @@ 
         $this->host       = $this->getHostParam($params);
         $this->user_base  = $this->getParam($params, 'user_base');
         $this->group_base = $this->getParam($params, 'group_base');
-        $this->bind_dn    = $this->getParam($params, 'bind_dn',   '$ldap_auth', 'read_write_pass');
+        $this->bind_dn    = $this->getParam($params, 'bind_dn', '$ldap_auth', 'read_write_pass');
         $this->bind_pass  = $this->getParam($params, 'bind_pass', '$ldap_auth', 'read_write_user');
     }
 
@@ -107,11 +107,11 @@ 
      */
     private function getHostParam($params)
     {
-        if(isset($params['host']))
+        if (isset($params['host']))
         {
             return $params['host'];
         }
-        if(isset(\FlipsideSettings::$ldap['proto']))
+        if (isset(\FlipsideSettings::$ldap['proto']))
         {
             return \FlipsideSettings::$ldap['proto'].'://'.\FlipsideSettings::$ldap['host'];
         }
@@ -130,17 +130,17 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    private function getParam($params, $paramName, $settingsLocation='$ldap', $settingsName=false)
+    private function getParam($params, $paramName, $settingsLocation = '$ldap', $settingsName = false)
     {
-        if($settingsName === false)
+        if ($settingsName === false)
         {
             $settingsName = $paramName;
         }
-        if(isset($params[$paramName]))
+        if (isset($params[$paramName]))
         {
             return $params[$paramName];
         }
-        if($settingsLocation === '$ldap')
+        if ($settingsLocation === '$ldap')
         {
             return \FlipsideSettings::$ldap[$settingsName];
         }
@@ -156,13 +156,13 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    public function get_and_bind_server($bind_write=false)
+    public function get_and_bind_server($bind_write = false)
     {
         $server = \LDAP\LDAPServer::getInstance();
         $server->user_base = $this->user_base;
         $server->group_base = $this->group_base;
         $server->connect($this->host);
-        if($bind_write === false)
+        if ($bind_write === false)
         {
             $ret = $server->bind();
         }
@@ -170,7 +170,7 @@ 
         {
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
         }
-        if($ret === false)
+        if ($ret === false)
         {
             return false;
         }
@@ -188,20 +188,20 @@ 
     public function login($username, $password)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
         $filter = new \Data\Filter("uid eq $username or mail eq $username");
         $user = $server->read($this->user_base, $filter);
-        if($user === false || count($user) === 0)
+        if ($user === false || count($user) === 0)
         {
             return false;
         }
         $user = $user[0];
         $server->unbind();
         $ret = $server->bind($user->dn, $password);
-        if($ret !== false)
+        if ($ret !== false)
         {
             return array('res'=>true, 'extended'=>$user); 
         }
@@ -217,7 +217,7 @@ 
      */
     public function isLoggedIn($data)
     {
-        if(isset($data['res']))
+        if (isset($data['res']))
         {
             return $data['res'];
         }
@@ -239,35 +239,35 @@ 
     public function getGroupByName($name)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
         return LDAPGroup::from_name($name, $server);
     }
 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
-        if($filter === false)
+        if ($filter === false)
         {
             $filter = new \Data\Filter('cn eq *');
         }
         $groups = $server->read($this->group_base, $filter);
-        if($groups === false)
+        if ($groups === false)
         {
             return false;
         }
         $this->processFilteringParams($groups, $select, $top, $skip, $orderby);
         $count = count($groups);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $groups[$i] = new LDAPGroup($groups[$i]);
-            if($select !== false)
+            if ($select !== false)
             {
                 $groups[$i] = json_decode(json_encode($groups[$i]), true);
                 $groups[$i] = array_intersect_key($groups[$i], array_flip($select));
@@ -279,7 +279,7 @@ 
     public function getActiveUserCount()
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
@@ -288,50 +288,50 @@ 
 
     private function processFilteringParams(&$data, &$select, $top, $skip, $orderby)
     {
-        if($orderby !== false)
+        if ($orderby !== false)
         {
             sort_array($data, $orderby);
         }
-        if($select !== false)
+        if ($select !== false)
         {
             $select = array_flip($select);
         }
-        if($skip !== false && $top !== false)
+        if ($skip !== false && $top !== false)
         {
             $data = array_slice($data, $skip, $top);
         }
-        else if($top !== false)
+        else if ($top !== false)
         {
             $data = array_slice($data, 0, $top);
         }
-        else if($skip !== false)
+        else if ($skip !== false)
         {
             $data = array_slice($data, $skip);
         }
     }
 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
-        if($filter === false)
+        if ($filter === false)
         {
             $filter = new \Data\Filter('cn eq *');
         }
         $users = $server->read($this->user_base, $filter, false, $select);
-        if($users === false)
+        if ($users === false)
         {
             return false;
         }
         $this->processFilteringParams($users, $select, $top, $skip, $orderby);
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $tmp = new LDAPUser($users[$i]);
-            if($select !== false)
+            if ($select !== false)
             {
                 $tmp = $tmp->jsonSerialize();
                 $tmp = array_intersect_key($tmp, $select);
@@ -349,36 +349,36 @@ 
         $email = $user->getEmail();
         $new_user->setEmail($email);
         $pass = $user->getPassword();
-        if($pass !== false)
+        if ($pass !== false)
         {
             $new_user->setPass($pass);
         }
         $sn = $user->getLastName();
-        if($sn !== false)
+        if ($sn !== false)
         {
             $new_user->setLastName($sn);
         }
         $givenName = $user->getGivenName();
-        if($givenName !== false)
+        if ($givenName !== false)
         {
             $new_user->setGivenName($givenName);
         }
         $hosts = $user->getLoginProviders();
-        if($hosts !== false)
+        if ($hosts !== false)
         {
             $count = count($hosts);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $new_user->addLoginProvider($hosts[$i]);
             }
         }
         $ret = $new_user->flushUser();
-        if($ret)
+        if ($ret)
         {
             $user->delete();
         }
         $users = $this->getUsersByFilter(new \Data\Filter('mail eq '.$email));
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             throw new \Exception('Error creating user!');
         }
@@ -388,7 +388,7 @@ 
     public function getUserByResetHash($hash)
     {
         $users = $this->getUsersByFilter(new \Data\Filter("uniqueIdentifier eq $hash"));
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             return false;
         }

Braces +10 added lines, -10 removed lines

@@ -17,8 +17,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -41,10 +40,14 @@ 
             switch($orderby[$keys[0]])
             {
                 case 1:
-                    if($d > 0) swap($array, $i, $j);
+                    if($d > 0) {
+                        swap($array, $i, $j);
+                    }
                     break;
                 case 0:
-                    if($d < 0) swap($array, $i, $j);
+                    if($d < 0) {
+                        swap($array, $i, $j);
+                    }
                     break;
             }
         }
@@ -165,8 +168,7 @@ 
         if($bind_write === false)
         {
             $ret = $server->bind();
-        }
-        else
+        } else
         {
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
         }
@@ -299,12 +301,10 @@ 
         if($skip !== false && $top !== false)
         {
             $data = array_slice($data, $skip, $top);
-        }
-        else if($top !== false)
+        } else if($top !== false)
         {
             $data = array_slice($data, 0, $top);
-        }
-        else if($skip !== false)
+        } else if($skip !== false)
         {
             $data = array_slice($data, $skip);
         }