From b41605a13a402eeaa857dfe632772925bcbbd5dd Mon Sep 17 00:00:00 2001
From: Tyler Christiansen <code@tylerc.me>
Date: Tue, 7 Apr 2015 12:30:02 -0700
Subject: [PATCH] clean up code and add more detection

---
 html/includes/authentication/ldap.inc.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/html/includes/authentication/ldap.inc.php b/html/includes/authentication/ldap.inc.php
index ab2f100ac..ef122771b 100644
--- a/html/includes/authentication/ldap.inc.php
+++ b/html/includes/authentication/ldap.inc.php
@@ -32,8 +32,11 @@ function authenticate($username,$password)
       {
         $ldap_groups = get_group_list();
         foreach($ldap_groups as $ldap_group) {
-          if (ldap_compare($ds, $ldap_group, $config['auth_ldap_groupmemberattr'], get_membername($username))===true)
-          {
+          $ldap_comparison = ldap_compare($ds,
+                                          $ldap_group, 
+                                          $config['auth_ldap_groupmemberattr'],
+                                          get_membername($username));
+          if($ldap_comparison === true) {
             return 1;
           }
         }
@@ -158,8 +161,11 @@ function get_userlist()
       $user_id  = $entry['uidnumber'][0];
       $ldap_groups = get_group_list();
       foreach($ldap_groups as $ldap_group) {
-        if (!isset($config['auth_ldap_group']) || ldap_compare($ds, $ldap_group, $config['auth_ldap_groupmemberattr'], get_membername($username))===true)
-        {
+        $ldap_comparison = ldap_compare($ds,
+                                        $ldap_group, 
+                                        $config['auth_ldap_groupmemberattr'],
+                                        get_membername($username));
+        if (!isset($config['auth_ldap_group']) || ldap_compare($ldap_comparison === true)) {
           $userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id);
         }
       }
@@ -206,8 +212,10 @@ function get_group_list() {
 
   $ldap_groups = array();
   $default_group = 'cn=groupname,ou=groups,dc=example,dc=com';
-  if($config['auth_ldap_group'] !== $default_group) {
-    array_push($ldap_groups, $config['auth_ldap_group']);
+  if(isset($config['auth_ldap_group'])) {
+    if($config['auth_ldap_group'] !== $default_group) {
+      array_push($ldap_groups, $config['auth_ldap_group']);
+    }
   }
   foreach($config['auth_ldap_groups'] as $key => $value) {
     $dn = "cn=$key," . $config['auth_ldap_groupbase'];