diff --git a/config/config.php b/config/config.php index 6d81f7f32e..960bb20ecf 100644 --- a/config/config.php +++ b/config/config.php @@ -22,7 +22,7 @@ * @link http://www.zentaoms.com */ /* 基本参数设定。*/ -$config->version = '1.0.1'; // 版本号,切勿修改。 +$config->version = '1.1'; // 版本号,切勿修改。 $config->encoding = 'UTF-8'; // 网站的编码。 $config->cookiePath = '/'; // cookie的有效路径。 $config->cookieLife = time() + 2592000; // cookie的生命周期。 diff --git a/db/update1.0.1.sql b/db/update1.0.1.sql new file mode 100644 index 0000000000..1760c89efc --- /dev/null +++ b/db/update1.0.1.sql @@ -0,0 +1,2 @@ +-- 2010-07-01 task table. +ALTER TABLE `zt_task` ADD `mailto` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' AFTER `status` diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 09e08a6c24..d36aeb2bb0 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -43,10 +43,12 @@ $lang->upgrade->toVersion = '鍗囩骇鍒'; $lang->upgrade->confirm = '纭瑕佹墽琛岀殑SQL璇彞'; $lang->upgrade->sureExecute = '纭鎵ц'; -$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; -$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; -$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; -$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; +$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; +$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; +$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; +$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; +$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; +$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; +$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; +$lang->upgrade->fromVersions['1_0stable'] = '1.0 STABLE'; +$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index b20fb9642e..99f2a2c2fe 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -39,6 +39,8 @@ class upgradeModel extends model $this->upgradeFrom1_0betaTo1_0rc1(); $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '0_4beta') { @@ -48,6 +50,8 @@ class upgradeModel extends model $this->upgradeFrom1_0betaTo1_0rc1(); $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '0_5beta') { @@ -56,6 +60,8 @@ class upgradeModel extends model $this->upgradeFrom1_0betaTo1_0rc1(); $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '0_6beta') { @@ -63,21 +69,38 @@ class upgradeModel extends model $this->upgradeFrom1_0betaTo1_0rc1(); $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '1_0beta') { $this->upgradeFrom1_0betaTo1_0rc1(); $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '1_0rc1') { $this->upgradeFrom1_0rc1To1_0rc2(); $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); } elseif($fromVersion == '1_0rc2') { $this->upgradeFrom1_0rc2To1_0stable(); + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); + } + elseif($fromVersion == '1_0stable') + { + $this->upgradeFrom1_0stableTo1_0_1(); + $this->upgradeFrom1_0_1To1_1(); + } + elseif($fromVersion == '1_0_1') + { + $this->upgradeFrom1_0_1To1_1(); } } @@ -93,6 +116,7 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } elseif($fromVersion == '0_4beta') { @@ -101,6 +125,7 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } elseif($fromVersion == '0_5beta') { @@ -108,23 +133,31 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } elseif($fromVersion == '0_6beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } elseif($fromVersion == '1_0beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } elseif($fromVersion == '1_0rc1') { $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } - + elseif($fromVersion == '1_0stable' || $fromVersion == '1_0_1') + { + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); + } + return str_replace('zt_', $this->config->db->prefix, $confirmContent); } @@ -178,6 +211,19 @@ class upgradeModel extends model $this->updateVersion('1.0'); } + /* 浠1.0stable鐗堟湰鍗囩骇鍒1.0.1鐗堟湰銆*/ + private function upgradeFrom1_0stableTo1_0_1() + { + $this->updateVersion('1.0'); + } + + /* 浠1.0.1鐗堟湰鍗囩骇鍒1.1鐗堟湰銆*/ + private function upgradeFrom1_0_1To1_1() + { + $this->execSQL($this->getUpgradeFile('1.0.1')); + if(!$this->isError()) $this->updateVersion('1.1'); + } + /* 鏇存柊姣忎釜琛ㄧ殑company瀛楁銆*/ private function updateCompany() {