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

* code for task #4874.

Browse Source
This commit is contained in:
wangyidong
2018-09-20 14:39:36 +08:00
parent f3e026d2da
commit 8e8b464f48
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+3
View File
@@ -435,7 +435,10 @@ class block extends control
$this->app->user = new stdclass();
$this->app->user->account = 'guest';
}
$this->app->user->admin = strpos($this->app->company->admins, ",{$this->app->user->account},") !== false;
$this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
$this->app->user->groups = $this->user->getGroups($this->app->user->account);
$this->app->user->view = $this->user->grantUserView($this->app->user->account, $this->app->user->rights['acls']);
$sso = base64_decode($this->get->sso);
$this->view->sso = $sso;
module/sso/control.php
+2 -1
View File
@@ -74,11 +74,12 @@ class sso extends control
$this->user->cleanLocked($user->account);
/* Authorize him and save to session. */
$user->admin = strpos($this->app->company->admins, ",{$user->account},") !== false;
$user->rights = $this->user->authorize($user->account);
$user->groups = $this->user->getGroups($user->account);
$user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
$user->last = date(DT_DATETIME1, $last);
$user->lastTime = $user->last;
$user->admin = strpos($this->app->company->admins, ",{$user->account},") !== false;
$user->modifyPassword = ($user->visits == 0 and !empty($this->config->safe->modifyPasswordFirstLogin));
if($user->modifyPassword) $user->modifyPasswordReason = 'modifyPasswordFirstLogin';
if(!$user->modifyPassword and !empty($this->config->safe->changeWeak))