From bcc82e154ddf3f54493b1625a0a27faedc80b944 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Fri, 17 Feb 2012 07:25:56 +0000
Subject: [PATCH]  * finish the upgrade.

---
 VERSION                       |  2 +-
 config/config.php             |  2 +-
 module/upgrade/lang/en.php    |  1 +
 module/upgrade/lang/zh-cn.php |  1 +
 module/upgrade/model.php      | 57 +++++++++++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index f51eee321c..9f55b2ccb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.beta1
+3.0
diff --git a/config/config.php b/config/config.php
index dd1a5cee83..ffb446e755 100644
--- a/config/config.php
+++ b/config/config.php
@@ -12,7 +12,7 @@
  * @link        http://www.zentao.net
  */
 /* Basic settings. */
-$config->version     = '3.0.beta1';       // The version of zentaopms. Don't change it.
+$config->version     = '3.0';       // The version of zentaopms. Don't change it.
 $config->encoding    = 'UTF-8';           // The encoding of znetaopms.
 $config->cookieLife  = time() + 2592000;  // The cookie life time.
 $config->timezone    = 'Asia/Shanghai';   // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 1cf1cbe7fc..56fd63c99f 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -58,3 +58,4 @@ $lang->upgrade->fromVersions['2_1']       = '2.1';
 $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
+$lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 90ab80f233..512b681a6d 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -58,3 +58,4 @@ $lang->upgrade->fromVersions['2_1']       = '2.1';
 $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
+$lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 4d83c004f3..f0218d4337 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -51,6 +51,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -72,6 +73,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -91,6 +93,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -109,6 +112,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -127,6 +131,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -144,6 +149,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_0rc2')
         {
@@ -160,6 +166,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_0')
         {
@@ -175,6 +182,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_0_1')
         {
@@ -189,6 +197,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_1')
         {
@@ -202,6 +211,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_2')
         {
@@ -214,6 +224,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_3')
         {
@@ -225,6 +236,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_4')
         {
@@ -235,6 +247,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '1_5')
         {
@@ -244,6 +257,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '2_0')
         {
@@ -252,6 +266,7 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '2_1')
         {
@@ -259,21 +274,29 @@ class upgradeModel extends model
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '2_2')
         {
             $this->upgradeFrom2_2To2_3();
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '2_3')
         {
             $this->upgradeFrom2_3To2_4();
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
         }
         elseif($fromVersion == '2_4')
         {
             $this->upgradeFrom2_4To3_0_beta1();
+            $this->upgradeFrom3_0_beta1To3_0();
+        }
+        elseif($fromVersion == '3_0_beta1')
+        {
+            $this->upgradeFrom3_0_beta1To3_0();
         }
 
         $this->deletePatch();
@@ -309,6 +332,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -328,6 +352,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -346,6 +371,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -363,6 +389,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -379,6 +406,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -394,6 +422,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
         {
@@ -408,6 +437,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_1')
         {
@@ -421,6 +451,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_2')
         {
@@ -433,6 +464,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_3')
         {
@@ -444,6 +476,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_4')
         {
@@ -454,6 +487,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '1_5')
         {
@@ -463,6 +497,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '2_0')
         {
@@ -471,6 +506,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '2_1')
         {
@@ -478,21 +514,29 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '2_2')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '2_3')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
         elseif($fromVersion == '2_4')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+        }
+        elseif($fromVersion == '3_0_beta1')
+        {
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
         }
 
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -731,6 +775,19 @@ class upgradeModel extends model
         if(!$this->isError()) $this->setting->updateVersion('3.0.beta1');
     }
 
+    /**
+     * Upgrade from 3_0_beta1To3_0 
+     * 
+     * @access public
+     * @return void
+     */
+    public function upgradeFrom3_0_beta1To3_0()
+    {
+        $this->execSQL($this->getUpgradeFile('3.0.beta1'));
+        $this->updateTableAction();
+        if(!$this->isError()) $this->setting->updateVersion('3.0');
+    }
+
     /**
      * Update company field.
      *