From c8ecddba549f14c0d2aba26ff9fe12e04ca48998 Mon Sep 17 00:00:00 2001
From: "Wahlstedt, Walter" <wwahlstedt@unionky.edu>
Date: Tue, 17 Nov 2015 10:47:59 -0500
Subject: [PATCH] Revert "Set required fields if ldap is enabled"

This reverts commit 2f69be03d3434db3a310940179b6abe1a7a06161.
---
 app/controllers/admin/SettingsController.php | 76 +++++++-------------
 app/views/backend/settings/edit.blade.php    | 16 ++---
 2 files changed, 33 insertions(+), 59 deletions(-)

diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
index 162ce6cdaa..a83c169fb8 100755
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -67,57 +67,31 @@ class SettingsController extends AdminController
 
         // Declare the rules for the form validation
 
-        if (Setting::getSettings()->ldap_enabled == 1){
-            $rules = array(
-                "brand"     => 'required|min:1|numeric',
-                "per_page"      => 'required|min:1|numeric',
-                "qr_text"       => 'min:1|max:31',
-                "logo"          => 'mimes:jpeg,bmp,png,gif',
-                "custom_css"   => 'alpha_space',
-                "alert_email"   => 'email',
-                "slack_endpoint"   => 'url',
-                "default_currency"   => 'required',
-                "slack_channel"   => 'regex:/(?<!\w)#\w+/',
-                "slack_botname"   => 'alpha_dash',
-                "ldap_server"   => 'required|url',
-                "ldap_uname"     => 'required|min:1',
-                "ldap_pword"     => 'required|min:1',
-                "ldap_basedn"     => 'required|min:1',
-                "ldap_filter"     => 'required|min:1',
-                "ldap_username_field"     => 'required|min:1',
-                "ldap_lname_field"     => 'required|min:1',
-                "ldap_auth_filter_query"     => 'required|min:1',
-                "ldap_version"     => 'required|min:1',
-                "ldap_active_flag"     => 'min:1',
-                "ldap_emp_num"     => 'min:1',
-                "ldap_email"     => 'min:1',
-                );
-        }else{
-            $rules = array(
-    	        "brand"     => 'required|min:1|numeric',
-                "per_page"   	=> 'required|min:1|numeric',
-    	        "qr_text"		=> 'min:1|max:31',
-    	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
-                "custom_css"   => 'alpha_space',
-    	        "alert_email"   => 'email',
-    	        "slack_endpoint"   => 'url',
-                "default_currency"   => 'required',
-    	        "slack_channel"   => 'regex:/(?<!\w)#\w+/',
-    	        "slack_botname"   => 'alpha_dash',
-                "ldap_server"   => 'url',
-                "ldap_uname"     => 'min:1',
-                "ldap_pword"     => 'min:1',
-                "ldap_basedn"     => 'min:1',
-                "ldap_filter"     => 'min:1',
-                "ldap_username_field"     => 'min:1',
-                "ldap_lname_field"     => 'min:1',
-                "ldap_auth_filter_query"     => 'min:1',
-                "ldap_version"     => 'min:1',
-                "ldap_active_flag"     => 'min:1',
-                "ldap_emp_num"     => 'min:1',
-                "ldap_email"     => 'min:1',
-    	        );
-        }
+        $rules = array(
+	        "brand"     => 'required|min:1|numeric',
+            "per_page"   	=> 'required|min:1|numeric',
+	        "qr_text"		=> 'min:1|max:31',
+	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
+            "custom_css"   => 'alpha_space',
+	        "alert_email"   => 'email',
+	        "slack_endpoint"   => 'url',
+            "default_currency"   => 'required',
+	        "slack_channel"   => 'regex:/(?<!\w)#\w+/',
+	        "slack_botname"   => 'alpha_dash',
+            "ldap_server"   => 'url',
+            "ldap_uname"     => 'min:1',
+            "ldap_pword"     => 'min:1',
+            "ldap_basedn"     => 'min:1',
+            "ldap_filter"     => 'min:1',
+            "ldap_username_field"     => 'min:1',
+            "ldap_lname_field"     => 'min:1',
+            "ldap_auth_filter_query"     => 'min:1',
+            "ldap_version"     => 'min:1',
+            "ldap_active_flag"     => 'min:1',
+            "ldap_emp_num"     => 'min:1',
+            "ldap_email"     => 'min:1',
+	        );
+
         if (Config::get('app.lock_passwords')==false) {
 	        $rules['site_name'] = 'required|min:3';
 
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index ce712aa7eb..13094559b1 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -275,14 +275,14 @@
           <hr><h4>@lang('admin/settings/general.ldap_settings') (@lang('admin/settings/general.optional'))</h4>
           
           <!-- Enable LDAP -->
-          <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
+          <div class="form-group {{ $errors->has('ldap_enable') ? 'error' : '' }}">
             <div class="col-md-3">
-              {{ Form::label('ldap_integration', Lang::get('admin/settings/general.ldap_integration')) }}
+              {{ Form::label('ldap_enable', Lang::get('admin/settings/general.ldap_enable')) }}
             </div>
             <div class="col-md-9">
               {{ Form::checkbox('ldap_enabled', '1', Input::old('ldap_enabled', $setting->ldap_enabled)) }}
               @Lang('admin/settings/general.ldap_enabled')
-              {{ $errors->first('ldap_enabled', '<br><span class="alert-msg">:message</span>') }}
+              {{ $errors->first('ldap_enable', '<br><span class="alert-msg">:message</span>') }}
             </div>
           </div>
 
@@ -432,7 +432,7 @@
                   {{ Form::text('ldap_auth_filter_query', Input::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), array('class' => 'form-control','placeholder' => '"uid="')) }}
                 @endif
 
-                {{ $errors->first('ldap_auth_filter_query', '<br><span class="alert-msg">:message</span>') }}
+                {{ $errors->first('ldap_server', '<br><span class="alert-msg">:message</span>') }}
               </div>
           </div>
 
@@ -448,7 +448,7 @@
                   {{ Form::text('ldap_version', Input::old('ldap_version', $setting->ldap_version), array('class' => 'form-control','placeholder' => '3')) }}
                 @endif
 
-                {{ $errors->first('ldap_version', '<br><span class="alert-msg">:message</span>') }}
+                {{ $errors->first('ldap_server', '<br><span class="alert-msg">:message</span>') }}
               </div>
           </div>
 
@@ -464,7 +464,7 @@
                   {{ Form::text('ldap_active_flag', Input::old('ldap_active_flag', $setting->ldap_active_flag), array('class' => 'form-control','placeholder' => '')) }}
                 @endif
 
-                {{ $errors->first('ldap_active_flag', '<br><span class="alert-msg">:message</span>') }}
+                {{ $errors->first('ldap_server', '<br><span class="alert-msg">:message</span>') }}
               </div>
           </div>
 
@@ -480,7 +480,7 @@
                   {{ Form::text('ldap_emp_num', Input::old('ldap_emp_num', $setting->ldap_emp_num), array('class' => 'form-control','placeholder' => '')) }}
                 @endif
 
-                {{ $errors->first('ldap_emp_num', '<br><span class="alert-msg">:message</span>') }}
+                {{ $errors->first('ldap_server', '<br><span class="alert-msg">:message</span>') }}
               </div>
           </div>
 
@@ -496,7 +496,7 @@
                   {{ Form::text('ldap_email', Input::old('ldap_email', $setting->ldap_email), array('class' => 'form-control','placeholder' => '')) }}
                 @endif
 
-                {{ $errors->first('ldap_email', '<br><span class="alert-msg">:message</span>') }}
+                {{ $errors->first('ldap_server', '<br><span class="alert-msg">:message</span>') }}
               </div>
           </div>