lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Applied updates from PR for LDAP pagination

Browse source
This commit is contained in:
snipe 2016-03-25 01:38:10 -07:00
parent bd334076ca
commit aff133b5f1
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/Http/Controllers/UsersController.php
View file

@ -1149,17 +1149,43 @@ class UsersController extends Controller
return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_bind').ldap_error($ldapconn)); return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_bind').ldap_error($ldapconn));
} }
// Perform the search // Set up LDAP pagination for very large databases
$search_results = @ldap_search($ldapconn, $base_dn, '('.$filter.')'); // @author Richard Hofman
if (!$search_results) { $page_size = 500;
return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn)); $cookie = '';
} $result_set = array();
$global_count = 0;
// Get results // Perform the search
$results = @ldap_get_entries($ldapconn, $search_results); do {
if (!$results) { // Paginate (non-critical, if not supported by server)
return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_get_entries').ldap_error($ldapconn)); ldap_control_paged_result($ldapconn, $page_size, false, $cookie);
}
$search_results = ldap_search($ldapconn, $base_dn, '('.$filter.')');
if (!$search_results) {
return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn));
}
// Get results from page
$results = ldap_get_entries($ldapconn, $search_results);
if (!$results) {
return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_get_entries').ldap_error($ldapconn));
}
// Add results to result set
$global_count += $results['count'];
$result_set = array_merge($result_set, $results);
ldap_control_paged_result_response($ldapconn, $search_results, $cookie);
} while ($cookie !== null && $cookie != '');
// Clean up after search
$result_set['count'] = $global_count;
$results = $result_set;
ldap_control_paged_result($ldapconn, 0);
$summary = array(); $summary = array();
@ -1173,7 +1199,7 @@ class UsersController extends Controller
$item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : ""; $item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : "";
$item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ; $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ;
// User exists // User exists
$item["createorupdate"] = 'updated'; $item["createorupdate"] = 'updated';
if (!$user = \App\Models\User::where('username', $item["username"])->first()) { if (!$user = \App\Models\User::where('username', $item["username"])->first()) {
$user = new \App\Models\User; $user = new \App\Models\User;