From 169da7b72675b39520581b3087dd2b09f115c42c Mon Sep 17 00:00:00 2001
From: SofianeLasri <alasri250@gmail.com>
Date: Thu, 23 Sep 2021 08:40:09 +0200
Subject: [PATCH] Updated login page
---
vbcms-admin/login.php | 29 +++++++++++------------------
vbcms-core/adminHandler.php | 2 +-
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/vbcms-admin/login.php b/vbcms-admin/login.php
index a5db7ca..9d57ec0 100644
--- a/vbcms-admin/login.php
+++ b/vbcms-admin/login.php
@@ -81,30 +81,23 @@ if (isset($_POST['login'])) { // Ne s'éxécute que si le formulaire de connexio
</div>
<div class="align-self-center text-center mt-3">
<p>Veuillez vous connecter pour accéder à l'administration</p>
- <a id="connectToVBcmsLink" class="btn btn-brown" href="https://api.vbcms.net/auth.php?login&from=<?=$redirect?>">Connexion</a>
- <a href="#" id="showLogin" class="text-brown">Utiliser un compte local</a>
- <div id="loginDiv" class="mt-3" style="display: none;">
+ <!--<a id="connectToVBcmsLink" class="btn btn-brown" href="https://api.vbcms.net/auth.php?login&from=<?=$redirect?>">Connexion</a>-->
+
<?php
if(isset($error) && !empty($error)){
echo '<div class="alert alert-danger mt-2" role="alert">'.$error.'</div>';
}
?>
- <form id="form" method="post" action="login.php?from=<?=$redirect?>">
- <div class="form-group mt">
- <input class="form-control" type="text" name="username" placeholder="Nom d'utilisateur/Email" required>
- </div>
- <div class="form-group">
- <input class="form-control" type="password" name="password" placeholder="Mot de passe" required>
- </div>
- <button type="submit" name="login" class="btn btn-brown">Se connecter</button>
- </form>
- </div>
+ <form id="form" method="post" action="login.php?from=<?=$redirect?>">
+ <div class="form-group mt">
+ <input class="form-control" type="text" name="username" placeholder="Nom d'utilisateur/Email" required>
+ </div>
+ <div class="form-group">
+ <input class="form-control" type="password" name="password" placeholder="Mot de passe" required>
+ </div>
+ <button type="submit" name="login" class="btn btn-brown"><?=translate('connect')?></button>
+ </form>
</div>
</div>
- <script type="text/javascript">
- $("#showLogin").on("click", function(){
- $("#loginDiv").css("display","block");
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/vbcms-core/adminHandler.php b/vbcms-core/adminHandler.php
index bd0c352..3ffb512 100644
--- a/vbcms-core/adminHandler.php
+++ b/vbcms-core/adminHandler.php
@@ -8,7 +8,7 @@ if (!isset($_SESSION["user_id"]) && $urlPath[2]!="login") { // Si l'utilisateur
if (basename($_SERVER['PHP_SELF'])!="login.php" && !isset($sessionData) && !isset($sessionData['error'])) {
// On le renvoie vers la page de connexion
//header("Location: https://vbcms.net/manager/login?from=".urlencode("$http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])); // Gestionnaire de licence vbcms.net
- header("Location: ".$url["scheme"]."://".$url["host"]."/vbcms-admin/login");
+ header("Location: ".$url["scheme"]."://".$url["host"]."/vbcms-admin/login?from=".urlencode("$http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']));
}
} elseif(!isset($_SESSION["user_id"]) && $urlPath[2]=="login"){ // Redirection vers la page de connexion
include $GLOBALS['vbcmsRootPath']."/vbcms-admin/login.php";
--
GitLab