fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit c9ca3e3089ea5d68ea6c0fb2eba13a2acc2ab95a 2 parents c96fc5f3 afc922cb

Merge branch 'gray'

Inline Side-by-side
Showing 1 changed file with 3 additions and 6 deletions
... ... @@ -354,7 +354,6 @@ class AbstractAction extends Controller_Abstract
$useSession = false;
}
//$useSession = false;
if (!$this->_uid) {
$cookie = $this->getCookie('_UID');
// 兼容老的
... ... @@ -363,11 +362,9 @@ class AbstractAction extends Controller_Abstract
$cookieList[1] = intval(Encryption::decrypt($cookieList[1]));
if (isset($cookieList[1]) && $cookieList[1]) {
if ($useSession) {
$token = $this->getSession('_TOKEN');
if (empty($token)) {
$token = $this->getCookie('_TOKEN');
}
if ($token === Helpers::makeToken($cookieList[1])) {
$token = $this->getCookie('_TOKEN');
$salt = substr($token, -8);
if ($cookieList[3] === Helpers::makeToken($cookieList[1] . $salt)) {
$this->_uid = $cookieList[1];
}
} else {
... ...