From 8e8b464f48d566aeb25bed8a2bb94013950a415a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 20 Sep 2018 14:39:36 +0800
Subject: [PATCH]  * code for task #4874.

---
 module/block/control.php | 3 +++
 module/sso/control.php   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/block/control.php b/module/block/control.php
index e87ca4efe7..59b58101fb 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -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;
diff --git a/module/sso/control.php b/module/sso/control.php
index bf89541177..cbeb8ddd77 100644
--- a/module/sso/control.php
+++ b/module/sso/control.php
@@ -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))