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

* fix the login error.

Browse Source 
+ add favicon.ico.
This commit is contained in:
wangchunsheng
2010-04-17 02:50:45 +00:00
parent 39fb8a1e87
commit dcce5c685d
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/module/common/control.php
View File

@@ -87,7 +87,8 @@ EOT;
}
else
{
$this->locate($this->createLink('user', 'login'));
$referer = helper::safe64Encode($this->app->getURI(true));
$this->locate($this->createLink('user', 'login', "referer=$referer&from=zentao"));
}
}

13
trunk/module/user/control.php
View File

@@ -271,7 +271,7 @@ class user extends control
* @access public
* @return void
*/
public function login($referer = '')
public function login($referer = '', $from = '')
{
$this->setReferer($referer);
@@ -308,12 +308,11 @@ class user extends control
/* <20><>¼<EFBFBD><C2BC>¼<EFBFBD><C2BC>¼<EFBFBD><C2BC>*/
$this->loadModel('action')->create('user', $user->id, 'login');
/* POST<53><54><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>referer<65><72>Ϣ<EFBFBD><CFA2><EFBFBD>ҷ<EFBFBD>user/login.html, <20><>user/deny.html<6D><6C><EFBFBD><EFBFBD><EFBFBD>Ұ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
if(isset($_POST['referer']) and
!empty($_POST['referer']) and
strpos($_POST['referer'], $loginLink) === false and
strpos($_POST['referer'], $denyLink) === false and
strpos($_POST['referer'], $this->app->company->pms) !== false
/* POST<53><54><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>referer<65><72>Ϣ<EFBFBD><CFA2><EFBFBD>ҷ<EFBFBD>user/login.html, <20><>user/deny.html<6D><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>zentaoϵͳ<EFBFBD><EFBFBD>*/
if($this->post->referer != false and
strpos($this->post->referer, $loginLink) === false and
strpos($this->post->referer, $denyLink) === false and
$from == 'zentao'
)
{
die(js::locate($_POST['referer'], 'parent'));

2
trunk/module/user/view/login.html.php
View File

@@ -40,6 +40,8 @@ $themeRoot = $webRoot . "theme/";
<script src="<?php echo $jsRoot;?>my.js" type="text/javascript"></script>
<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
<link rel='icon' href='<?php echo $webRoot;?>favicon.ico' type="image/x-icon" />
<link rel='shortcut icon' href='<?php echo $webRoot;?>favicon.ico' type='image/x-icon' />
<script language='Javascript'>loadFixedCSS();</script>
<style>#debugbar, .helplink {display:none}</style>
<body onload="document.getElementById('account').focus();">