* Adjust code.
This commit is contained in:
@@ -22,7 +22,6 @@ class sso extends control
|
||||
{
|
||||
$referer = empty($_GET['referer']) ? '' : $this->get->referer;
|
||||
$locate = empty($referer) ? getWebRoot() : base64_decode($referer);
|
||||
if($this->loadModel('user')->isLogon()) die($this->locate($locate));
|
||||
|
||||
$this->app->loadConfig('sso');
|
||||
if(!$this->config->sso->turnon) die($this->locate($locate));
|
||||
@@ -40,9 +39,9 @@ class sso extends control
|
||||
if(strpos($location, '&') !== false)
|
||||
{
|
||||
$location = rtrim($location, '&') . "&token=$token&auth=$auth&userIP=$userIP&callback=$callback&referer=$referer";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
$location = rtrim($location, '?') . "?token=$token&auth=$auth&userIP=$userIP&callback=$callback&referer=$referer";
|
||||
}
|
||||
$this->locate($location);
|
||||
@@ -63,6 +62,11 @@ class sso extends control
|
||||
$this->locate($this->createLink('sso', 'bind', "referer=" . helper::safe64Encode($locate)));
|
||||
}
|
||||
|
||||
if($this->loadModel('user')->isLogon())
|
||||
{
|
||||
if($this->session->user && $this->session->user->account == $user->account) die($this->locate($locate));
|
||||
}
|
||||
|
||||
$this->user->cleanLocked($user->account);
|
||||
/* Authorize him and save to session. */
|
||||
$user->rights = $this->user->authorize($user->account);
|
||||
|
||||
Reference in New Issue
Block a user