Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop

# Conflicts:
#	app/controllers/admin/UsersController.php

Author: snipe

app/config/production/ldap.example.php

@@ -75,6 +75,12 @@
     'result.last.name'  => "",
     'result.first.name' => "",
     'result.email' => "",
+    
+    /*
+    | This field is optional as not all LDAP directories will have it.  If yours
+    | does not have it, just leave this field blank and the extra check will
+    | be omitted.
+    */
     'result.active.flag' => "",
 
     /*

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta-383-g80fb7a4',
+  'hash_version' => 'v2.0-pre-beta-384-ge7d7cc6',
 );

app/controllers/admin/UsersController.php

@@ -1068,7 +1068,7 @@ public function getLDAP() {
     /**
      * LDAP form processing.
      *
-     * @Auther Aladin Alaily
+     * @author Aldin Alaily
      * @return Redirect
      */
     public function postLDAP() {
@@ -1119,7 +1119,7 @@ public function postLDAP() {
 
         $summary = array();
         for ($i = 0; $i < $results["count"]; $i++) {
-            if ($results[$i][$ldap_result_active_flag][0] == "TRUE") {
+            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
 
                 $item = array();
                 $item["username"] = isset( $results[$i][$ldap_result_username][0] ) ? $results[$i][$ldap_result_username][0] : "";
@@ -1173,11 +1173,7 @@ public function postLDAP() {
 
                 array_push($summary, $item);
             }
-            /* Easy break in the loop */
-            /*
-            if ($i >= 1)
-                break;
-            */
+
         }