change name middleware auth

disabled multiple clics on button save
omatech · Jul 3, 2019 · 8b0b289 · 8b0b289
1 parent 1545395
commit 8b0b289
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/src/EditoraServiceProvider.php b/src/EditoraServiceProvider.php
@@ -3,7 +3,7 @@
 namespace Omatech\Editora;
 
 use Illuminate\Support\ServiceProvider;
-use Omatech\Editora\Admin\Middleware\Auth;
+use Omatech\Editora\Admin\Middleware\EditoraAuth;
 use Omatech\Editora\Admin\Providers\HelperServiceProvider;
 
 class EditoraServiceProvider extends ServiceProvider
@@ -34,7 +34,7 @@ public function boot()
     public function register()
     {
         $this->app->register(HelperServiceProvider::class);
-        $this->app['router']->aliasMiddleware('auth', Auth::class);
+        $this->app['router']->aliasMiddleware('editoraAuth', EditoraAuth::class);
 
         $this->mergeConfigFrom(
             __DIR__.'/config/config.php',

diff --git a/src/admin/accions/AuthController.php b/src/admin/accions/AuthController.php
@@ -2,7 +2,7 @@
 
 namespace Omatech\Editora\Admin\Accions;
 
-use Omatech\Editora\Admin\Middleware\Auth;
+use Omatech\Editora\Admin\Middleware\EditoraAuth;
 use Omatech\Editora\Admin\Models\layout;
 
 
@@ -11,7 +11,7 @@ class AuthController extends BaseController
     public function __construct()
     {
         $this->middleware([
-            Auth::class
+            EditoraAuth::class
         ]);
     }
 

diff --git a/src/admin/accions/admin_login.php b/src/admin/accions/admin_login.php
@@ -10,7 +10,7 @@ class AdminLogin extends BaseController
     public function render()
     {
         $security = new Security();
-        if ($security->login($_REQUEST['p_username'], $_REQUEST['p_password'])==1) {
+        if ($security->login($_REQUEST['p_username'], $_REQUEST['p_password'], $_REQUEST['u_lang'])==1) {
             if (isset($_SESSION['last_page']) && $_SESSION['last_page']!='') {
                 redirect_action($_SESSION['last_page']);
             } else {

diff --git a/src/admin/middleware/Auth.php → src/admin/middleware/EditoraAuth.php b/src/admin/middleware/Auth.php → src/admin/middleware/EditoraAuth.php
@@ -5,7 +5,7 @@
 use Closure;
 use Omatech\Editora\Admin\Models\Security;
 
-class Auth
+class EditoraAuth
 {
     /**
      * Handle an incoming request.

diff --git a/src/admin/models/Security.php b/src/admin/models/Security.php
@@ -6,7 +6,7 @@
 
 class Security extends Model
 {
-    public function login($p_username, $p_password)
+    public function login($p_username, $p_password, $u_lang=null)
     {
         $hasher = new BcryptHasher();
 
@@ -30,7 +30,7 @@ public function login($p_username, $p_password)
         $_SESSION['rol_nom'] = $user['r_nom'];
         $_SESSION['user_type'] = $user['tipus'];
         $_SESSION['user_language'] = $user['language'];
-
+        
         $this->cacheClasses($user['id']);
         $this->cleanUserInstances($user['id']);
 

diff --git a/src/admin/utils/omputils.php b/src/admin/utils/omputils.php
@@ -291,13 +291,16 @@ function getRolName ($rol_id) {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 function getDefaultLanguage() {
-	if (isset($_REQUEST['u_lang'])) $lg=control_idioma($_REQUEST['u_lang']);
-	elseif (isset($_COOKIE['u_language'])) $lg=control_idioma($_COOKIE['u_language']);
-	else $lg=control_idioma('');
+    if (isset($_REQUEST['u_lang'])) {
+        $lg=control_idioma($_REQUEST['u_lang']);
+    }elseif (isset($_COOKIE['u_language'])) {
+		$lg=control_idioma($_COOKIE['u_language']);
+	}else{
+		$lg=control_idioma('');
+	}
 	setcookie('u_language', control_idioma($lg), -1 , '/', DOMAIN_SERVER);
 	$_SESSION['u_lang']=$lg;
-
-
+
 	return $lg;
 }
 

diff --git a/src/admin/views/pages/instance.blade.php b/src/admin/views/pages/instance.blade.php
@@ -43,7 +43,7 @@
 				@if($p_mode=='V')
 					<a href="{{route('editora.action', 'edit_instance/?p_pagina=1&p_class_id='.$instance['class_id'].'&p_inst_id='.$instance['id'])}}" class="btn clr-secondary"><span class="btn-text">Editar</span></a>
 				@elseif($p_mode=='U' || $p_mode=='I')
-					<a onclick="document.getElementById('Form1').submit();" class="btn clr-secondary"><span class="btn-text">Guardar</span></a>
+					<a onclick="document.getElementById('Form1').submit(); $(this).attr('disabled','disabled');" class="btn clr-secondary"><span class="btn-text">Guardar</span></a>
 				@endif
 			</div>
 		</div>