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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-01-25 09:21:06 +08:00
parent 93701f583a d81a106fad
commit 69413ff785
6 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -1
View File
@@ -53,7 +53,7 @@ zentaoxx:
cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip
mv $(XUANPATH)/xuan.zip .
unzip xuan.zip
cp xuan/ranzhi/config/ext/xuanxuan.php zentaoxx/config/ext/x.php
cp xuan/ranzhi/config/ext/xuanxuan.php zentaoxx/config/ext/
cp -r xuan/ranzhi/lib/phpaes zentaoxx/lib/
cp -r xuan/ranzhi/framework/xuanxuan.class.php zentaoxx/framework/
cp -r xuan/ranzhi/db/*.sql zentaoxx/db/
@@ -63,6 +63,7 @@ zentaoxx:
cp -r xuanxuan/config/* zentaoxx/config/
cp -r xuanxuan/module/* zentaoxx/module/
cp -r xuanxuan/www/* zentaoxx/www/
mv zentaoxx/www/xuanxuan.php zentaoxx/www/x.php
sed -i 's/site,//' zentaoxx/module/chat/model.php
sed -i 's/admin, g/g/' zentaoxx/module/chat/model.php
sed -i '/password = md5/d' zentaoxx/module/chat/control.php
module/story/control.php
+2 -1
View File
@@ -1324,7 +1324,8 @@ class story extends control
$storyInfo['moduleID'] = $story->module;
$storyInfo['estimate'] = $story->estimate;
$storyInfo['pri'] = $story->pri;
$storyInfo['spec'] = $story->spec;
$storyInfo['spec'] = html_entity_decode($story->spec);
echo json_encode($storyInfo);
}
module/user/lang/en.php
-1
View File
@@ -146,7 +146,6 @@ $lang->user->error->accountDupl = "ID %s，account has been used.";
$lang->user->error->realname = "ID %s，must be real name";
$lang->user->error->password = "ID %s，password must be 6 characters at least.";
$lang->user->error->mail = "ID %s，please enter valid Email address";
$lang->user->error->role = "ID %s，role cannot be null.";
$lang->user->error->reserved = "ID %s，account is reserved.";
$lang->user->error->verifyPassword = "Verification failed. Please enter your Login Password.";
module/user/lang/zh-cn.php
-1
View File
@@ -146,7 +146,6 @@ $lang->user->error->accountDupl = "【ID %s】的用户名已经存在";
$lang->user->error->realname = "【ID %s】的真实姓名必须填写";
$lang->user->error->password = "【ID %s】的密码必须为六位以上";
$lang->user->error->mail = "【ID %s】的邮箱地址不正确";
$lang->user->error->role = "【ID %s】的职位不能为空";
$lang->user->error->reserved = "【ID %s】的用户名已被系统预留";
$lang->user->error->verifyPassword = "验证失败，请检查您的系统登录密码是否正确";
module/user/lang/zh-tw.php
-1
View File
@@ -146,7 +146,6 @@ $lang->user->error->accountDupl = "【ID %s】的用戶名已經存在";
$lang->user->error->realname = "【ID %s】的真實姓名必須填寫";
$lang->user->error->password = "【ID %s】的密碼必須為六位以上";
$lang->user->error->mail = "【ID %s】的郵箱地址不正確";
$lang->user->error->role = "【ID %s】的職位不能為空";
$lang->user->error->reserved = "【ID %s】的用戶名已被系統預留";
$lang->user->error->verifyPassword = "驗證失敗，請檢查您的系統登錄密碼是否正確";
module/user/model.php
-1
View File
@@ -500,7 +500,6 @@ class userModel extends model
if(!validater::checkAccount($users[$id]['account'])) die(js::error(sprintf($this->lang->user->error->account, $id)));
if($users[$id]['realname'] == '') die(js::error(sprintf($this->lang->user->error->realname, $id)));
if($users[$id]['email'] and !validater::checkEmail($users[$id]['email'])) die(js::error(sprintf($this->lang->user->error->mail, $id)));
if(empty($users[$id]['role'])) die(js::error(sprintf($this->lang->user->error->role, $id)));
$accounts[$id] = $account;
$prev['dept'] = $users[$id]['dept'];