From a3ffb7022b8c2ba8d9d9fdb5cb14314cd48ce693 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 10 Mar 2011 07:16:13 +0000
Subject: [PATCH]  * fix for up

---
 module/upgrade/model.php | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8bf98d813a..b7c688ab6e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -44,6 +44,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -58,6 +59,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -71,6 +73,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -83,6 +86,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -94,6 +98,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -104,6 +109,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_0rc2')
         {
@@ -113,6 +119,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_0')
         {
@@ -121,6 +128,7 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_0_1')
         {
@@ -128,21 +136,29 @@ class upgradeModel extends model
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_1')
         {
             $this->upgradeFrom1_1To1_2();
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_2')
         {
             $this->upgradeFrom1_2To1_3();
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
         }
         elseif($fromVersion == '1_3')
         {
             $this->upgradeFrom1_3To1_4();
+            $this->upgradeFrom1_4To1_5();
+        }
+        elseif($fromVersion == '1_4')
+        {
+            $this->upgradeFrom1_4To1_5();
         }
 
         $this->setting->setSN();
@@ -182,6 +198,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -193,6 +210,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -203,6 +221,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -212,6 +231,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -220,6 +240,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
         {
@@ -227,22 +248,31 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_1')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.1'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_2')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
         elseif($fromVersion == '1_3')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
         }
+        elseif($fromVersion == '1_4')
+        {
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+        }
+
 
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -393,6 +423,17 @@ class upgradeModel extends model
         $this->updateTasks();
         if(!$this->isError()) $this->setting->updateVersion('1.4');
     }
+    /**
+     * Upgrade from 1.4 to 1.5.
+     * 
+     * @access private
+     * @return void
+     */
+    private function upgradeFrom1_4To1_5()
+    {
+        $this->execSQL($this->getUpgradeFile('1.4'));
+        if(!$this->isError()) $this->setting->updateVersion('1.5');
+    }
 
     /**
      * Update company field.