From 8e44421788a0f3f098b04fdbc72b8f17eb3bcdd9 Mon Sep 17 00:00:00 2001 From: "Wahlstedt, Walter" Date: Tue, 17 Nov 2015 15:20:55 -0500 Subject: [PATCH] added Crypt class and set ldap_pword field to longText --- app/controllers/admin/SettingsController.php | 2 ++ app/controllers/admin/UsersController.php | 2 ++ .../2015_11_08_222305_add_ldap_fields_to_settings.php | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php index 222cf74b95..0069f187c8 100755 --- a/app/controllers/admin/SettingsController.php +++ b/app/controllers/admin/SettingsController.php @@ -14,6 +14,8 @@ use Image; use Config; use Response; use Artisan; +use Crypt; + class SettingsController extends AdminController { diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 91e1b8a955..207b128d5f 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -31,6 +31,8 @@ use Mail; use Accessory; use Symfony\Component\HttpFoundation\JsonResponse; use Illuminate\Support\Facades\Log; +use Crypt; + class UsersController extends AdminController { diff --git a/app/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php b/app/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php index 0a0eafad49..2f2d406d8c 100644 --- a/app/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php +++ b/app/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php @@ -40,9 +40,10 @@ class AddLdapFieldsToSettings extends Migration { { Schema::table('settings', function(Blueprint $table) { + $table->dropColumn('ldap_enabled'); $table->dropColumn('ldap_server'); $table->dropColumn('ldap_uname'); - $table->dropColumn('ldap_pword'); + $table->longText('ldap_pword'); $table->dropColumn('ldap_basedn'); $table->dropColumn('ldap_filter'); $table->dropColumn('ldap_username_field');