ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/controllers/admin/UsersController.php
This commit is contained in:
snipe
2015-08-14 21:36:09 -07:00
parent ee46b223c9 23bde13665
commit 729795364b
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/UsersController.php
+3 -7
View File
@@ -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;
*/
}