From d71a02982d84cac66cabe5bda5134726faef014f Mon Sep 17 00:00:00 2001
From: root <root@crdtkam01.cordeos.com>
Date: Tue, 5 Aug 2014 13:36:47 +0900
Subject: [PATCH] Changes: set new user create to active YES as default Changed
 user password validation to 6-12 characters Licenses controller removed
 asset_id from the INSERT column list

---
 app/controllers/admin/LicensesController.php | 2 +-
 app/controllers/admin/UsersController.php    | 4 ++--
 app/views/backend/users/edit.blade.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index 9299780021..86ab9205bb 100755
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -82,7 +82,7 @@ class LicensesController extends AdminController
             $license->purchase_date 	= e(Input::get('purchase_date'));
             $license->purchase_cost 	= e(Input::get('purchase_cost'));
             $license->depreciation_id 	= e(Input::get('depreciation_id'));
-            $license->asset_id 			= e(Input::get('asset_id'));
+            //$license->asset_id 			= e(Input::get('asset_id'));
             $license->user_id 			= Sentry::getId();
 
             if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 1b443e9e2e..8c92709b97 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -33,8 +33,8 @@ class UsersController extends AdminController
         'first_name'       => 'required|alpha_space|min:2',
         'last_name'        => 'required|alpha_space|min:2',
         'email'            => 'required|email|unique:users,email',
-        'password'         => 'required|between:10,32',
-        'password_confirm' => 'required|between:10,32|same:password',
+        'password'         => 'required|between:6,12',
+        'password_confirm' => 'required|between:6,12|same:password',
     );
 
     /**
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php
index f7cfaf0630..f60f3dd944 100755
--- a/app/views/backend/users/edit.blade.php
+++ b/app/views/backend/users/edit.blade.php
@@ -161,7 +161,7 @@
                         <option value="0"{{ ( ! $user->isActivated() ? ' selected="selected"' : '') }}>@lang('general.no')</option>
                     @else
                     	<option value="1"{{ (Input::old('activated') == 1 ? ' selected="selected"' : '') }}>@lang('general.yes')</option>
-                        <option value="0"{{ (Input::old('activated') == 0 ? ' selected="selected"' : '') }}>@lang('general.no')</option>
+                        <option value="0">@lang('general.no')</option>
                     @endif
 
                     </select>