DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-02 03:45:17 -07:00
parent bc3482b281 3b247ba31f
commit bfac25d445
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1149,7 +1149,6 @@ class UsersController extends Controller
protected $ldapValidationRules = array( protected $ldapValidationRules = array(
'firstname' => 'required|string|min:2', 'firstname' => 'required|string|min:2',
'lastname' => 'required|string|min:2',
'employee_number' => 'string', 'employee_number' => 'string',
'username' => 'required|min:2|unique:users,username', 'username' => 'required|min:2|unique:users,username',
'email' => 'email|unique:users,email', 'email' => 'email|unique:users,email',
@ -1162,7 +1161,7 @@ class UsersController extends Controller
* @since [v1.8] * @since [v1.8]
* @return Redirect * @return Redirect
*/ */
public function postLDAP() public function postLDAP(Request $request)
{ {
ini_set('max_execution_time', 600); //600 seconds = 10 minutes ini_set('max_execution_time', 600); //600 seconds = 10 minutes
ini_set('memory_limit', '500M'); ini_set('memory_limit', '500M');
@ -1175,9 +1174,6 @@ class UsersController extends Controller
$ldap_result_emp_num = Setting::getSettings()->ldap_emp_num; $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
$ldap_result_email = Setting::getSettings()->ldap_email; $ldap_result_email = Setting::getSettings()->ldap_email;
$location_id = e(Input::get('location_id'));
try { try {
$ldapconn = Ldap::connectToLdap(); $ldapconn = Ldap::connectToLdap();
} catch (\Exception $e) { } catch (\Exception $e) {
@ -1225,7 +1221,9 @@ class UsersController extends Controller
$user->email = e($item["email"]); $user->email = e($item["email"]);
$user->employee_num = e($item["employee_number"]); $user->employee_num = e($item["employee_number"]);
$user->activated = 1; $user->activated = 1;
$user->location_id = e($location_id); if ($request->has('location_id')) {
$user->location_id = e($request->input('location_id'));
}
$user->notes = 'Imported from LDAP'; $user->notes = 'Imported from LDAP';
$user->ldap_import = 1; $user->ldap_import = 1;