Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust the logic of sn and demoUser.

Browse Source
This commit is contained in:
wangchunsheng
2013-01-10 05:09:59 +00:00
parent fed918ab79
commit c8498e86d0
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/user/control.php
View File

@@ -539,17 +539,16 @@ class user extends control
}
else
{
$demoUsers = $this->user->getPairs('nodeleted, noletter');
array_shift($demoUsers);
array_shift($demoUsers);
array_pop($demoUsers);
$this->view->showDemoUsers = $this->dao->select('value')->from(TABLE_CONFIG)->where('`key`')->eq('showDemoUsers')->fetch();
$this->view->demoUsers = $demoUsers;
if(!empty($this->config->global->showDemoUsers))
{
$demoUsers = $this->user->getPairs('nodeleted, noletter, noempty, noclosed');
$this->view->demoUsers = $demoUsers;
}
$header['title'] = $this->lang->user->login;
$this->view->header = $header;
$this->view->referer = $this->referer;
$this->view->s = $this->loadModel('setting')->getItem('system', 'common', 'global', 'sn', 0);
$this->view->s = $this->config->global->sn;
$this->view->keepLogin = $this->cookie->keepLogin ? $this->cookie->keepLogin : 'off';
$this->display();
}

23
module/user/view/login.html.php
View File

@@ -37,24 +37,27 @@ include '../../common/view/colorbox.html.php';
</td>
</tr>
</table>
<?php if($showDemoUsers):?>
<?php if(isset($demoUsers)):?>
<div id='demoUsers'>
<?php
echo "<span>" . $lang->user->loginWithDemoUser . "</span>";
$sign = $config->requestType == 'GET' ? '&' : '?';
if(isset($demoUsers['productManager'])) echo html::a(inlink('login') . $sign . "account=productManager&password=123456", $demoUsers['productManager'], 'hiddenwin');
if(isset($demoUsers['projectManager'])) echo html::a(inlink('login') . $sign . "account=projectManager&password=123456", $demoUsers['projectManager'], 'hiddenwin');
if(isset($demoUsers['testManager'])) echo html::a(inlink('login') . $sign . "account=testManager&password=123456", $demoUsers['testManager'], 'hiddenwin');
if(isset($demoUsers['dev1'])) echo html::a(inlink('login') . $sign . "account=dev1&password=123456", $demoUsers['dev1'], 'hiddenwin');
if(isset($demoUsers['tester1'])) echo html::a(inlink('login') . $sign . "account=tester1&password=123456", $demoUsers['tester1'], 'hiddenwin');
?>
<?php
echo "<span>" . $lang->user->loginWithDemoUser . "</span>";
$sign = $config->requestType == 'GET' ? '&' : '?';
if(isset($demoUsers['productManager'])) echo html::a(inlink('login') . $sign . "account=productManager&password=123456", $demoUsers['productManager'], 'hiddenwin');
if(isset($demoUsers['projectManager'])) echo html::a(inlink('login') . $sign . "account=projectManager&password=123456", $demoUsers['projectManager'], 'hiddenwin');
if(isset($demoUsers['testManager'])) echo html::a(inlink('login') . $sign . "account=testManager&password=123456", $demoUsers['testManager'], 'hiddenwin');
if(isset($demoUsers['dev1'])) echo html::a(inlink('login') . $sign . "account=dev1&password=123456", $demoUsers['dev1'], 'hiddenwin');
if(isset($demoUsers['tester1'])) echo html::a(inlink('login') . $sign . "account=tester1&password=123456", $demoUsers['tester1'], 'hiddenwin');
?>
</div>
<?php endif;?>
<div id='poweredby'>
powered by <a href='http://www.zentao.net' target='_blank'>ZenTaoPMS</a>(<?php echo $config->version;?>)
<?php echo $lang->donate;?>
<br />
<iframe id='updater' class='hidden' frameborder='0' scrolling='no' allowtransparency='true' src="http://www.zentao.net/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html"></iframe>
</div>
</form>
<?php include '../../common/view/footer.lite.html.php';?>