(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 2d4ca71390735d8ce2a2b1d3c8ebd71290536a66..433def2cf428ffb48ba80d5d5656a121b1dd774d 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -50,6 +50,7 @@ class extranetCore extends cubeCore {
        {\r
                // On regarde si user_email et user_password ont été postées\r
                // Si c'est le cas, on les copie dans la session\r
+               $_SESSION['errorLogin']=false;\r
                if (isset($_POST['user_email'])) {\r
                        $_SESSION['user_email'] = $_POST['user_email'];\r
                }\r
@@ -69,6 +70,11 @@ class extranetCore extends cubeCore {
                // Utilisateur connecté à l'interface\r
                $dao = new extranetDAOUtilisateur($this->con);\r
                $this->user = $dao->selectByLoginPassword($_SESSION['user_email'], $_SESSION['user_password']);\r
+               if($this->user==false){\r
+                       $_SESSION['errorLogin']=true;\r
+                       return;\r
+\r
+               }\r
                if ($this->user->grade == 0) {\r
                        $daoClient = new extranetDAOClient($this->con);\r
                        $this->user->collegues = $daoClient->getColleguesList($this->user->utilisateur_id);\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 840dfa5379e338695dcf85f119fc4f80c1f3c205..c86ffc5f50f2524b87e16fb1080626f83551b71a 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -38,11 +38,12 @@ class extranetUrl {
        {\r
                global $core;\r
 \r
-               if ($tentative = isset($_SESSION['tentative'])) {\r
-                       unset($_SESSION['tentative']);\r
+               $tentative = isset($_SESSION['errorLogin']) && $_SESSION['errorLogin'];\r
+               if($tentative){\r
+                       $_SESSION['errorLogin']=false;\r
                }\r
 \r
-               $message = $tentative?'<p class="message">' . __('E-mail /  mot de passe incorrects') . '</p>':'';\r
+               $message = $tentative?'<p class="message"><br />' . __('Identifiants incorrects') . '</p>':'';\r
 \r
                $res = extranetPage::barre();\r
                $res .= extranetPage::tMain();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
index 13ba94abe26a56d6f67362c45d83029c7fb05917..37dc303ea45c99459052e0f3740bc33d546f05ce 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php
+++ b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
@@ -90,8 +90,9 @@ class extranetDAOUtilisateur extends extranetDAO {
 \r
        public function selectByLoginPassword($login, $password)\r
        {\r
-               $r = $this->con->select('SELECT * FROM utilisateurs WHERE (email=\'' . $this->con->escape($login) . '\' OR  login=\'' . $this->con->escape($login) . '\') AND (password=\'' . $this->con->escape($password) . '\' OR ws_password=\'' . $this->con->escape($password) . '\') LIMIT 1');\r
-               if (!$r->count()) {\r
+               $sql = 'SELECT * FROM utilisateurs WHERE (email=\'' . $this->con->escape($login) . '\' OR  login=\'' . $this->con->escape($login) . '\') AND (password=\'' . $this->con->escape($password) . '\' OR ws_password=\'' . $this->con->escape($password) . '\') LIMIT 1';\r
+               $r = $this->con->select($sql);\r
+               if ($r->count() == 0) {\r
                        return false;\r
                }\r
                $utilisateur = $this->singleton($r);\r