diff --git a/app/config/production/ldap.example.php b/app/config/production/ldap.example.php index 071561b9ae..5442823891 100644 --- a/app/config/production/ldap.example.php +++ b/app/config/production/ldap.example.php @@ -75,6 +75,12 @@ return array( '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' => "", /* diff --git a/app/config/version.php b/app/config/version.php index 8d35744ce1..7b077a1cf6 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-pre', - 'hash_version' => 'v2.0-pre-beta-383-g80fb7a4', + 'hash_version' => 'v2.0-pre-beta-384-ge7d7cc6', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index cc0d0d1559..0b68384e3f 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -1068,7 +1068,7 @@ class UsersController extends AdminController { /** * LDAP form processing. * - * @Auther Aladin Alaily + * @author Aldin Alaily * @return Redirect */ public function postLDAP() { @@ -1119,7 +1119,7 @@ class UsersController extends AdminController { $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 @@ class UsersController extends AdminController { array_push($summary, $item); } - /* Easy break in the loop */ - /* - if ($i >= 1) - break; - */ + }