diff --git a/module/editor/control.php b/module/editor/control.php index 764be8515e..f774a85ef3 100644 --- a/module/editor/control.php +++ b/module/editor/control.php @@ -137,7 +137,7 @@ class editor extends control $statusFile = $this->loadModel('upgrade')->checkSafeFile(); if($statusFile) { - die(js::alert(sprintf($this->lang->editor->noticeOkFile, $statusFile, $statusFile, $statusFile))); + die(js::alert(sprintf($this->lang->editor->noticeOkFile, $statusFile))); } if($filePath and $_POST) { diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index 93ac1ec684..4e0b1e7040 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -30,7 +30,7 @@ $lang->editor->deleteConfirm = 'Are you sure?'; $lang->editor->extendConfirm = 'Would you reuse the code.'; $lang->editor->repeatFile = 'File name repeat'; $lang->editor->repeatPage = 'This page has extisted. Is override?'; -$lang->editor->noticeOkFile = 'The ok file does not exist or has expired\nFor safe, please re create the ok file\nYou can perform the following commands on the server: \nFor windows:echo ok > %s\nFor linux:touch %s;'; +$lang->editor->noticeOkFile = 'For security reason, system need to confirm you\'re administrator of zentao system.\n Please login into the zentao host and create the %s file.\n Note:\n 1. Keep the ok.txt content empty.\n 2. If the file exists already, remove and recreate it again.'; $lang->editor->notWritable = "Can not writable, maybe no power. please try chmod 777 -R "; $lang->editor->notDelete = "Can not delete, please check power!"; diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php index 2f05eaae31..948dc1721b 100644 --- a/module/editor/lang/zh-cn.php +++ b/module/editor/lang/zh-cn.php @@ -30,7 +30,7 @@ $lang->editor->deleteConfirm = '是否要删除?'; $lang->editor->extendConfirm = '是否要重用原来代码?'; $lang->editor->repeatFile = '文件名重复'; $lang->editor->repeatPage = '已经有此页面。是否覆盖?'; -$lang->editor->noticeOkFile = 'ok文件不存在或文件已过期\n为了系统的安全,请重新创建ok文件\n您可在服务器执行下面相应的命令:\nwindows: 打开命令行,执行 echo ok > %s\nlinux: touch %s;\n或者删掉 %s 这个文件 ,重新创建一个ok.txt文件,不需要内容。'; +$lang->editor->noticeOkFile = '为了安全起见,系统需要确认您的管理员身份。\n 请登录禅道所在的服务器,创建%s文件。\n 注意:\n 1. 文件内容为空。\n 2. 如果之前文件存在,删除之后重新创建。'; $lang->editor->notWritable = "无法写入,可能没有权限。请尝试执行 chmod 777 -R "; $lang->editor->notDelete = '无法删除,请检查权限!'; diff --git a/module/extension/control.php b/module/extension/control.php index 859927940d..787d31f185 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -124,7 +124,7 @@ class extension extends control $statusFile = $this->loadModel('upgrade')->checkSafeFile(); if($statusFile) { - $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile, $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile); die($this->display()); } /* Get the package file name. */ diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index 24ea514998..dae0152c88 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -81,14 +81,13 @@ $lang->extension->viewInstalled = 'View installed extensions.'; $lang->extension->viewAvailable = 'View available extensions'; $lang->extension->viewDeactivated = 'View deactivated extensions'; $lang->extension->backDBFile = 'Plug-related data has been backed up to %s file!'; -$lang->extension->noticeOkFile = '

The ok file does not exist or has expired

-

For safe, please re create the ok file

-

You can perform the following commands on the server:

- '; - +$lang->extension->noticeOkFile = "
For security reason, system need to confirm you're administrator of zentao system.
+
Please login into the zentao host and create the %s file.
+

Note:

+
    +
  1. Keep the ok.txt content empty.
  2. +
  3. If the file exists already, remove and recreate it again.
  4. + '; $lang->extension->upgradeExt = '升级'; $lang->extension->installExt = '安装';