diff --git a/module/common/model.php b/module/common/model.php index f65dcd7d10..6692db43d6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1117,33 +1117,6 @@ class commonModel extends model return (!is_file($statusFile) or (time() - filemtime($statusFile)) > $this->config->safeFileTimeout) ? $statusFile : false; } - /** - * 检查升级验证文件是否创建，给出升级的提示。 - * Check upgrade's status file is ok or not. - * - * @access public - * @return bool - */ - public function checkUpgradeStatus() - { - $statusFile = $this->checkSafeFile(); - if($statusFile) - { - $this->app->loadLang('upgrade'); - $cmd = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? $this->lang->upgrade->createFileWinCMD : $this->lang->upgrade->createFileLinuxCMD; - $cmd = sprintf($cmd, $statusFile); - - echo ""; - echo "
"; - printf($this->lang->upgrade->setStatusFile, $cmd, $statusFile); - echo '
'; - - return false; - } - - return true; - } - /** * 检查系统是否处于维护状态，如果处于维护状态则给非管理员用户输出提示。 * Check whether system in maintenance status and show message for non-admin user. diff --git a/module/upgrade/control.php b/module/upgrade/control.php index b73cafd74b..526bd49a93 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -11,6 +11,19 @@ */ class upgrade extends control { + public function __construct(string $moduleName = '', string $methodName = '', string $appName = '') + { + parent::__construct($moduleName, $methodName, $appName); + + $statusFile = $this->loadModel('common')->checkSafeFile(); + if($statusFile) + { + $this->view->title = $this->lang->upgrade->common; + $this->view->statusFile = $statusFile; + $this->display('upgrade', 'setStatusFile'); + } + } + /** * The index page. * diff --git a/module/upgrade/js/setstatusfile.ui.js b/module/upgrade/js/setstatusfile.ui.js new file mode 100644 index 0000000000..88169749e2 --- /dev/null +++ b/module/upgrade/js/setstatusfile.ui.js @@ -0,0 +1,11 @@ +function confirmStatusFile(event) +{ + if($(event.target).prop('checked')) + { + $('#confirm').removeClass('disabled').attr('href', $.createLink('upgrade', 'index')); + } + else + { + $('#confirm').addClass('disabled').removeAttr('href'); + } +} diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 36753bf743..06b1feb1b7 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -54,14 +54,11 @@ if($config->db->driver == 'dm') EOT; } -$lang->upgrade->createFileWinCMD = 'Open command line and execute echo > %s'; -$lang->upgrade->createFileLinuxCMD = 'Execute command line: touch %s'; -$lang->upgrade->setStatusFile = '

Please complete the following actions

- -

I have read and done as instructed above. Continue upgrading.

'; +$lang->upgrade->setStatusFileTitle = 'Please complete the following actions'; +$lang->upgrade->createWinFile = 'Open command line and execute echo > %s'; +$lang->upgrade->createLinuxFile = 'Execute touch %s in the command line'; +$lang->upgrade->deleteStatusFile = 'Or delete %s and create ok.txt and leave it blank.'; +$lang->upgrade->confirmStatusFile = 'I have read and done as instructed above.'; $lang->upgrade->selectVersion = 'Version'; $lang->upgrade->copyCommand = 'Copy'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 9d9fc239d9..b74ebc2849 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -54,20 +54,17 @@ if($config->db->driver == 'dm') EOT; } -$lang->upgrade->createFileWinCMD = '打开命令行，执行echo > %s'; -$lang->upgrade->createFileLinuxCMD = '在命令行执行: touch %s'; -$lang->upgrade->setStatusFile = '

升级之前请先完成下面的操作：

- -

我已经仔细阅读上面提示且完成上述工作，继续更新

'; +$lang->upgrade->setStatusFileTitle = '升级之前请先完成下面的操作'; +$lang->upgrade->createWinFile = '打开命令行，执行 echo > %s'; +$lang->upgrade->createLinuxFile = '在命令行执行 touch %s'; +$lang->upgrade->deleteStatusFile = '或者删除 %s 这个文件，重新创建一个 ok.txt 文件，不需要内容。'; +$lang->upgrade->confirmStatusFile = '我已经仔细阅读上面提示且完成上述工作'; $lang->upgrade->selectVersion = '选择版本'; $lang->upgrade->copyCommand = '复制命令'; $lang->upgrade->copySuccess = '复制成功'; $lang->upgrade->copyFail = '浏览器不支持复制功能，请手动复制'; -$lang->upgrade->continue = '继续'; +$lang->upgrade->continue = '继续升级'; $lang->upgrade->noteVersion = "务必选择正确的版本，否则会造成数据丢失。"; $lang->upgrade->fromVersion = '原来的版本'; $lang->upgrade->toVersion = '升级到'; diff --git a/module/upgrade/ui/setstatusfile.html.php b/module/upgrade/ui/setstatusfile.html.php new file mode 100644 index 0000000000..d7db6c6cd7 --- /dev/null +++ b/module/upgrade/ui/setstatusfile.html.php @@ -0,0 +1,56 @@ + + * @package upgrade + * @link https://www.zentao.net + */ +namespace zin; + +set::zui(true); + +$cmd = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? $lang->upgrade->createWinFile : $lang->upgrade->createLinuxFile; + +div +( + setStyle(['padding' => '3rem 4rem', 'height' => '100vh']), + col + ( + setClass('rounded-md bg-white gap-5 m-auto'), + setStyle(['padding' => '1.5rem 2rem', 'width' => '50rem']), + div + ( + setClass('text-xl font-medium'), + $lang->upgrade->setStatusFileTitle + ), + div + ( + setClass('pre rounded-md bg-gray-100 px-8 py-6'), + ul + ( + li(html(sprintf($cmd, $statusFile))), + li(html(sprintf($lang->upgrade->deleteStatusFile, $statusFile))) + ) + ), + checkbox + ( + on::change('confirmStatusFile'), + $lang->upgrade->confirmStatusFile + ), + div + ( + setClass('center'), + a + ( + setID('confirm'), + setClass('btn primary w-24 disabled'), + $lang->upgrade->continue + ) + ) + ) +); + +render('pagebase'); diff --git a/www/upgrade.php.tmp b/www/upgrade.php.tmp index 3fbd48f794..3e75888fbd 100644 --- a/www/upgrade.php.tmp +++ b/www/upgrade.php.tmp @@ -93,7 +93,7 @@ try { /* Run it. */ $app->parseRequest(); - if($common->checkUpgradeStatus()) $app->loadModule(); + $app->loadModule(); } catch (EndResponseException $endResponseException) {