From 11f7edc0646757ebefac032df8e69463e0a48bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 25 Aug 2021 09:55:44 +0800
Subject: [PATCH]  * finish task #41753.

---
 module/user/control.php         |  8 --------
 module/user/model.php           |  5 +++--
 module/user/view/login.html.php | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index 0a458ba7ab..e16397c027 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -942,14 +942,6 @@ class user extends control
         }
         else
         {
-            if(!empty($this->config->global->showDemoUsers))
-            {
-                $demoUsers = 'productManager,projectManager,dev1,dev2,dev3,tester1,tester2,tester3,testManager';
-                if($this->app->getClientLang() == 'en') $demoUsers = 'thePO,pm1,pm2,pg1,pg2,pg3,thePM,qa1,theQS';
-                $demoUsers = $this->dao->select('account,password,realname')->from(TABLE_USER)->where('account')->in($demoUsers)->andWhere('deleted')->eq(0)->fetchAll('account');
-                $this->view->demoUsers = $demoUsers;
-            }
-
             $this->loadModel('misc');
             $this->view->noGDLib     = sprintf($this->lang->misc->noGDLib, common::getSysURL() . $this->config->webRoot, '', false, true);
             $this->view->title       = $this->lang->user->login;
diff --git a/module/user/model.php b/module/user/model.php
index 09a7ebb857..6d9067d178 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1615,8 +1615,9 @@ class userModel extends model
             }
 
             /* Compute parent stakeholders. */
-            $programStakeholderGroup = $this->loadModel('stakeholder')->getParentStakeholderGroup(array_keys($allPrograms)); 
-            $projectStakeholderGroup = $this->loadModel('stakeholder')->getParentStakeholderGroup(array_keys($allProjects)); 
+            $this->loadModel('stakeholder');
+            $programStakeholderGroup = $this->stakeholder->getParentStakeholderGroup(array_keys($allPrograms));
+            $projectStakeholderGroup = $this->stakeholder->getParentStakeholderGroup(array_keys($allProjects));
 
             list($productTeams, $productStakeholders) = $this->getProductMembers($allProducts);
 
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 28bbbb71fb..b39efc1e0d 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -72,17 +72,23 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
           </form>
         </div>
       </div>
-      <?php if(isset($demoUsers)):?>
+      <?php if(!empty($this->config->global->showDemoUsers)):?>
+      <?php
+      $demoPassword = '123456';
+      $md5Password  = md5('123456');
+      $demoUsers    = 'productManager,projectManager,dev1,dev2,dev3,tester1,tester2,tester3,testManager';
+      if($this->app->getClientLang() == 'en') $demoUsers = 'thePO,pm1,pm2,pg1,pg2,pg3,thePM,qa1,theQS';
+      $demoUsers = $this->dao->select('account,password,realname')->from(TABLE_USER)->where('account')->in($demoUsers)->andWhere('deleted')->eq(0)->andWhere('password')->eq($md5Password)->fetchAll('account');
+      ?>
       <footer>
         <span><?php echo $lang->user->loginWithDemoUser;?></span>
         <?php
-        $password = md5('123456');
-        $link     = inlink('login');
-        $link    .= strpos($link, '?') !== false ? '&' : '?';
+        $link  = inlink('login');
+        $link .= strpos($link, '?') !== false ? '&' : '?';
         foreach($demoUsers as $demoAccount => $demoUser)
         {
-            if($demoUser->password != $password) continue;
-            echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname);
+            if($demoUser->password != $md5Password) continue;
+            echo html::a($link . "account={$demoAccount}&password=" . md5($md5Password . $this->session->rand), $demoUser->realname);
         }
         ?>
       </footer>