diff --git a/module/common/control.php b/module/common/control.php index cb469e0e1b..32958d52b1 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -65,8 +65,9 @@ class common extends control { $this->app->loadLang('upgrade'); echo ""; + echo "
"; printf($this->lang->upgrade->setStatusFile, $statusFile, $statusFile, $statusFile); - die(''); + die('
'); } } diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index a4b5dc9b96..464edf7240 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -24,10 +24,11 @@ EOT; -$lang->upgrade->setStatusFile = "For security reason, we will check file %s
+$lang->upgrade->setStatusFile = "

For security reason, we will check file %s
But this file doesn't exist or out of date. You can use the flowing command to create(update)it
For linux:touch %s;
- For windows:echo ok > %s"; + For windows:echo ok > %s

+ I have done this work, continue upgrade"; $lang->upgrade->selectVersion = 'Select version'; $lang->upgrade->noteVersion = "Must select the correct version"; $lang->upgrade->fromVersion = 'From version'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 76e1601440..58ab12b9a7 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -24,10 +24,11 @@ $lang->upgrade->warnningContent = << 比如： mysqldump -u root -p zentao >zentao.bak EOT; -$lang->upgrade->setStatusFile = '基于安全考虑，升级之间需要检查这个文件：%s
+$lang->upgrade->setStatusFile = '

基于安全考虑，升级之间需要检查这个文件：%s
该文件不存在或者已经过期，请用下面的命令来创建或者更新它。
linux下面的命令：touch %s;
- windows下面的命令：echo ok > %s'; + windows下面的命令：echo ok > %s

+ 我已经完成上面的工作，继续更新'; $lang->upgrade->selectVersion = '选择版本'; $lang->upgrade->noteVersion = "务必选择正确的版本，否则会造成数据丢失。"; $lang->upgrade->fromVersion = '原来的版本'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 6a63a28d5e..f4728d9f0e 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -45,6 +45,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '0_4beta') { @@ -60,6 +61,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '0_5beta') { @@ -74,6 +76,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '0_6beta') { @@ -87,6 +90,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_0beta') { @@ -99,6 +103,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_0rc1') { @@ -110,6 +115,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_0rc2') { @@ -120,6 +126,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_0') { @@ -129,6 +136,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_0_1') { @@ -137,6 +145,7 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_1') { @@ -144,21 +153,25 @@ class upgradeModel extends model $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_2') { $this->upgradeFrom1_2To1_3(); $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_3') { $this->upgradeFrom1_3To1_4(); $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_4') { $this->upgradeFrom1_4To1_5(); + $this->upgradeFrom1_5To2_0(); } elseif($fromVersion == '1_5') {