From 960be7c5ae71b8db461b60fcf77aaf4792ea8c7c Mon Sep 17 00:00:00 2001
From: Aladin Alaily <aladin@aladin.ca>
Date: Fri, 21 Aug 2015 10:40:18 -0400
Subject: [PATCH] Replace hardcoded location with a user selection.

---
 app/controllers/admin/UsersController.php | 29 ++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 68f341613d..111beecbf6 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -1043,12 +1043,17 @@ class UsersController extends AdminController {
         // Selected permissions
         $selectedPermissions = Input::old('permissions', array('superuser' => -1));
         $this->encodePermissions($selectedPermissions);
+        
+        $location_list = locationsList();
+                        
         // Show the page
-        return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'));
+        return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'))
+                        ->with('location_list', $location_list);
+        
     }
 
     /**
-     * Declare the rules for the form validation
+     * Declare the rules for the ldap fields validation.
      *
      * @var array
      */
@@ -1059,6 +1064,15 @@ class UsersController extends AdminController {
         'username' => 'required|min:2|unique:users,username',
         'email' => 'email|unique:users,email',
     );
+    
+    /**
+     * Declare the rules for the form validation.
+     *
+     * @var array
+     */
+    protected $ldapFormInputValidationRules = array(
+        'location_id' => 'required|numeric'
+    );
 
     /**
      * LDAP form processing.
@@ -1068,6 +1082,15 @@ class UsersController extends AdminController {
      */
     public function postLDAP() {
 
+        $location_id = Input::get('location_id');
+        
+        $formValidator = Validator::make(Input::all(), $this->ldapFormInputValidationRules);
+        // If validation fails, we'll exit the operation now.
+        if ($formValidator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($formValidator);
+        }
+        
         $ldap_version = Config::get('ldap.version');
         $url = Config::get('ldap.url');
         $username = Config::get('ldap.username');
@@ -1159,7 +1182,7 @@ class UsersController extends AdminController {
                             'employee_num' => $item["employee_number"],
                             'password' => $pass,
                             'activated' => 1,
-                            'location_id' => 1,
+                            'location_id' => $location_id,
                             'permissions' => '{"user":1}',
                             'notes' => 'Imported from LDAP'
                         );