From 1ee3f29d2eb2181444cb131ce6ef4eeea656e4fe Mon Sep 17 00:00:00 2001
From: Walter <merid14@gmail.com>
Date: Sun, 22 Nov 2015 11:02:19 -0500
Subject: [PATCH] Revert "working on ldap import button"

This reverts commit 113dfc9c24ad5144e65fb3b1576f4558c73f8b9f.
---
 app/controllers/admin/SettingsController.php | 2 +-
 app/routes.php                               | 1 -
 app/views/backend/settings/edit.blade.php    | 5 +----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
index d30c4e6048..94e734b0b3 100755
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -182,7 +182,7 @@ class SettingsController extends AdminController
      * @param  int  $settingId
      * @return Redirect
      */
-    public function getLDAP()
+    public function postLDAP()
     {
         if (Config::get('ldap.url')=='') {
             Lang('admin/users/message.ldap_not_configured');
diff --git a/app/routes.php b/app/routes.php
index e70c7b063b..b9b87e1cb5 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -331,7 +331,6 @@
             Route::group( [ 'prefix' => 'app' ], function () {
 
                 Route::get( '/', [ 'as' => 'app', 'uses' => 'SettingsController@getIndex' ] );
-                Route::get( 'edit', [ 'as' => 'edit/settings', 'uses' => 'SettingsController@getLDAP' ] );
                 Route::get( 'edit', [ 'as' => 'edit/settings', 'uses' => 'SettingsController@getEdit' ] );
                 Route::post( 'edit', 'SettingsController@postEdit' );
             } );
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 7bb35c728a..4b090048ce 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -285,12 +285,9 @@
               {{ $errors->first('ldap_enabled', '<br><span class="alert-msg">:message</span>') }}
             </div>
             <div class="col-md-3">
-              {{ Form::open(['method' => 'GET', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-
-              {{ Form::button('Import LDAP') }}
+              {{ Form::button('ldap_import', '1', Input::old('ldap_import', $setting->ldap_import)) }}
               @Lang('admin/settings/general.ldap_import')
               {{ $errors->first('ldap_import', '<br><span class="alert-msg">:message</span>') }}
-              {{ Form::close() }}
             </div>
           </div>