Merge pull request #120 from Leantime/hotfixes-2.0.11

fixed multiple reset email issue
Leantime · Feb 24, 2020 · 8a3f540 · 8a3f540
2 parents d8dccd0 + 01d13fd
commit 8a3f540
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/public/index.php b/public/index.php
@@ -18,7 +18,7 @@
 	ob_start();
 }
 
-$application = new leantime\core\application();
+$application = new leantime\core\application($login);
 $application->start();
 
 if(ob_get_length() > 0) {

diff --git a/src/core/class.application.php b/src/core/class.application.php
@@ -19,11 +19,11 @@ class application
     private $frontController;
     private $projectService;
 
-    public function __construct()
+    public function __construct(login $login)
     {
         $this->config = new config();// Used in template
         $this->settings = new settings(); //Used in templates to show app version
-        $this->login = new login(session::getSID());
+        $this->login = $login;
         $this->frontController = frontcontroller::getInstance(ROOT);
 
     }

diff --git a/src/domain/general/controllers/class.header.php b/src/domain/general/controllers/class.header.php
@@ -13,10 +13,6 @@ public function run()
 
             $tpl = new core\template();
 
-            $login = new core\login(core\session::getSID());
-
-            $tpl->assign('login', $login);
-
             $tpl->displayPartial('general.header');
         }
     }

diff --git a/src/resetPassword.php b/src/resetPassword.php
@@ -30,11 +30,11 @@
 <script type="text/javascript">
     jQuery(document).ready(function(){
 
-        if(jQuery('.login-alert .alert').text() != ''){
-            jQuery('.login-alert').fadeIn();
+        if(jQuery('.login-alert .alert-error').text() != ''){
+            jQuery('.login-error').fadeIn();
         }
 
-        if(jQuery('.login-success .alert').text() != ''){
+        if(jQuery('.login-alert .alert-success').text() != ''){
             jQuery('.login-success').fadeIn();
         }
 
@@ -82,11 +82,10 @@
 
                     <form id="resetPassword" action="" method="post">
 
-                        <div class="inputwrapper login-alert">
+                        <div class="inputwrapper login-alert login-error">
                             <div class="alert alert-error"><?php echo $login->error;?></div>
                         </div>
-
-                        <div class="inputwrapper login-success">
+                        <div class="inputwrapper login-alert login-success">
                             <div class="alert alert-success"><?php echo $login->success;?></div>
                         </div>