From 2d47b0e75562f8d5425741c0d79de01cc7adfa41 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Mon, 5 Jul 2021 11:45:02 +0800
Subject: [PATCH]  * finish task #39793.

---
 module/common/model.php                          | 3 ++-
 module/project/lang/en.php                       | 2 --
 module/project/lang/zh-cn.php                    | 2 --
 xuanxuan/module/user/ext/lang/en/xuanxuan.php    | 2 ++
 xuanxuan/module/user/ext/lang/zh-cn/xuanxuan.php | 2 ++
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 xuanxuan/module/user/ext/lang/en/xuanxuan.php
 create mode 100644 xuanxuan/module/user/ext/lang/zh-cn/xuanxuan.php

diff --git a/module/common/model.php b/module/common/model.php
index dfb9a1e919..8949166efb 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1736,7 +1736,8 @@ EOD;
             if(!defined('IN_UPGRADE') and $inProject)
             {
                 /* Check program priv. */
-                if($this->session->project and strpos(",{$this->app->user->view->projects},", ",{$this->session->project},") === false and !$this->app->user->admin) $this->loadModel('project')->accessDenied();
+                $viewProjects = trim($this->app->user->view->projects, ',');
+                if($this->session->project and $viewProjects and strpos(",{$viewProjects},", ",{$this->session->project},") === false and !$this->app->user->admin) $this->loadModel('project')->accessDenied();
                 $this->resetProgramPriv($module, $method);
                 if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method, false);
             }
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 0cc3c43396..b8545817d1 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -189,8 +189,6 @@ $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
 $lang->project->empty                  = 'No project.';
-$lang->project->accessDenied           = 'Access denied!';
-$lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 15222d4003..55a16519e7 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -189,8 +189,6 @@ $lang->project->endList[365] = '一年';
 $lang->project->endList[999] = '长期';
 
 $lang->project->empty                  = '暂时没有项目';
-$lang->project->accessDenied           = '您无权访问该项目！';
-$lang->project->chooseProgramType      = '选中项目管理模型';
 $lang->project->nextStep               = '下一步';
 $lang->project->hoursUnit              = '%s 工时';
 $lang->project->membersUnit            = '%s人';
diff --git a/xuanxuan/module/user/ext/lang/en/xuanxuan.php b/xuanxuan/module/user/ext/lang/en/xuanxuan.php
new file mode 100644
index 0000000000..fe03c8f2f7
--- /dev/null
+++ b/xuanxuan/module/user/ext/lang/en/xuanxuan.php
@@ -0,0 +1,2 @@
+<?php
+$lang->user->tokenInvalid  = "Token denied, please login with password.";
diff --git a/xuanxuan/module/user/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/user/ext/lang/zh-cn/xuanxuan.php
new file mode 100644
index 0000000000..c4e2aa9b49
--- /dev/null
+++ b/xuanxuan/module/user/ext/lang/zh-cn/xuanxuan.php
@@ -0,0 +1,2 @@
+<?php
+$lang->user->tokenInvalid  = "Token 认证失败，请尝试使用密码登录。";