From 9a3513a15c33072e562b1916b0e241b93eb384fe Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 12 Aug 2022 16:11:35 +0800
Subject: [PATCH]  * change for change table engine.

---
 module/admin/control.php               | 80 ++++++++++++++++++++++
 module/admin/lang/de.php               | 10 +++
 module/admin/lang/en.php               | 10 +++
 module/admin/lang/fr.php               | 10 +++
 module/admin/lang/zh-cn.php            | 10 +++
 module/admin/view/tableengine.html.php | 94 ++++++++++++++++++++++++++
 module/common/lang/de.php              | 11 +--
 module/common/lang/en.php              | 11 +--
 module/common/lang/fr.php              | 11 +--
 module/common/lang/menu.php            |  1 +
 module/common/lang/zh-cn.php           | 11 +--
 module/group/lang/resource.php         |  2 +
 module/misc/model.php                  | 15 ++++
 module/upgrade/control.php             | 77 ---------------------
 module/upgrade/lang/de.php             |  5 +-
 module/upgrade/lang/en.php             |  5 +-
 module/upgrade/lang/fr.php             |  5 +-
 module/upgrade/lang/zh-cn.php          |  5 +-
 module/upgrade/model.php               | 39 +++++++++--
 module/upgrade/view/afterexec.html.php | 52 +++-----------
 20 files changed, 302 insertions(+), 162 deletions(-)
 create mode 100644 module/admin/view/tableengine.html.php

diff --git a/module/admin/control.php b/module/admin/control.php
index 0ed2c37aad..7061b75c1c 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -373,4 +373,84 @@ class admin extends control
         $this->view->title = $this->lang->admin->resetPWDSetting;
         $this->display();
     }
+
+    /**
+     * Show table engine.
+     *
+     * @access public
+     * @return void
+     */
+    public function tableEngine()
+    {
+        $this->view->title = $this->lang->admin->tableEngine;
+        $this->view->tableEngines = $this->loadModel('misc')->getTableEngines();
+        $this->display();
+    }
+
+    /**
+     * Ajax change table engine.
+     *
+     * @access public
+     * @return void
+     */
+    public function ajaxChangeTableEngine($tableName)
+    {
+        $response = array();
+        $response['result']  = 'success';
+        $response['message'] = '';
+
+        $tableEngines = $this->loadModel('misc')->getTableEngines();
+        if(!isset($tableEngines[$tableName]))
+        {
+            $response['result'] = 'fail';
+            return print(json_encode($response));
+        }
+
+        if($tableEngines[$tableName] == 'InnoDB')
+        {
+            $response['message'] = sprintf($this->lang->admin->changeSuccess, $tableName);
+            return print(json_encode($response));
+        }
+
+        try
+        {
+            /* Check process this table or not. */
+            $dbProcesses = $this->dao->query("SHOW PROCESSLIST")->fetchAll();
+            foreach($dbProcesses as $dbProcess)
+            {
+                if($dbProcess->db != $this->config->db->name) continue;
+                if(strpos($dbProcess->Info, " {$tableName} ") !== false)
+                {
+                    $response['message'] = sprintf($this->lang->upgrade->changingTable, $tableName);
+                    return print(json_encode($response));
+                }
+            }
+        }
+        catch(PDOException $e){}
+
+        if(stripos($tableName, 'searchindex') !== false)
+        {
+            $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
+            if($mysqlVersion < 5.6)
+            {
+                $response['result']  = 'fail';
+                $response['message'] = $this->lang->admin->errorInnodb;
+                return print(json_encode($response));
+            }
+        }
+
+        try
+        {
+            $sql = "ALTER TABLE `$tableName` ENGINE='InnoDB'";
+            $this->dao->exec($sql);
+            $response['message'] = sprintf($this->lang->admin->changeSuccess, $tableName);
+        }
+        catch(PDOException $e)
+        {
+            $response['result']  = 'fail';
+            $response['message'] = sprintf($this->lang->admin->changeFail, $tableName, htmlspecialchars($e->getMessage()));
+        }
+
+        return print(json_encode($response));
+    }
 }
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index f3647127a2..b498651993 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -22,6 +22,7 @@ $lang->admin->captcha         = 'Bestätigungscode';
 $lang->admin->getCaptcha      = 'Bestätigungscode anfordern';
 $lang->admin->register        = 'Register';
 $lang->admin->resetPWDSetting = 'Reset password Setting';
+$lang->admin->tableEngine     = 'Table Engine';
 
 $lang->admin->api            = 'API';
 $lang->admin->log            = 'Log';
@@ -29,6 +30,15 @@ $lang->admin->setting        = 'Einstellungen';
 $lang->admin->days           = 'Gültige Tage';
 $lang->admin->resetPWDByMail = 'Reset the password via the email';
 
+$lang->admin->changeEngine   = "Change to InnoDB";
+$lang->admin->changingTable  = 'Replacing data table %s engine...';
+$lang->admin->changeSuccess  = 'The data table %s engine has been changed to InnoDB.';
+$lang->admin->changeFail     = "Failed to replace table %s engine. Reason: <span class='text-red'>%s</span>。";
+$lang->admin->errorInnodb    = 'Your MySQL does not support InnoDB data table engine.';
+$lang->admin->engineInfo     = "The <strong>%s</strong> table engine is <strong>%s</strong>.";
+$lang->admin->engineSummary['hasMyISAM'] = "There are %s tables that are not InnoDB engines";
+$lang->admin->engineSummary['allInnoDB'] = "All tables are InnoDB engines";
+
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Aktuelle Version ist %s. ';
 $lang->admin->info->links   = 'You can visit links below';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index ae785bc4f2..c850026926 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -22,6 +22,7 @@ $lang->admin->captcha         = 'Verification Code';
 $lang->admin->getCaptcha      = 'Send Verification Code';
 $lang->admin->register        = 'Register';
 $lang->admin->resetPWDSetting = 'Reset password Setting';
+$lang->admin->tableEngine     = 'Table Engine';
 
 $lang->admin->api            = 'API';
 $lang->admin->log            = 'Log';
@@ -29,6 +30,15 @@ $lang->admin->setting        = 'Setting';
 $lang->admin->days           = 'Valid Day';
 $lang->admin->resetPWDByMail = 'Reset the password via the email';
 
+$lang->admin->changeEngine   = "Change to InnoDB";
+$lang->admin->changingTable  = 'Replacing data table %s engine...';
+$lang->admin->changeSuccess  = 'The data table %s engine has been changed to InnoDB.';
+$lang->admin->changeFail     = "Failed to replace table %s engine. Reason: <span class='text-red'>%s</span>。";
+$lang->admin->errorInnodb    = 'Your MySQL does not support InnoDB data table engine.';
+$lang->admin->engineInfo     = "The <strong>%s</strong> table engine is <strong>%s</strong>.";
+$lang->admin->engineSummary['hasMyISAM'] = "There are %s tables that are not InnoDB engines";
+$lang->admin->engineSummary['allInnoDB'] = "All tables are InnoDB engines";
+
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Current Version is %s. ';
 $lang->admin->info->links   = 'You can visit links below';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index f3bb4993ad..a7749f2a4b 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -22,6 +22,7 @@ $lang->admin->captcha         = 'Code de vérification';
 $lang->admin->getCaptcha      = 'Obtenir le Code de vérification';
 $lang->admin->register        = 'Register';
 $lang->admin->resetPWDSetting = 'Reset password Setting';
+$lang->admin->tableEngine     = 'Table Engine';
 
 $lang->admin->api            = 'API';
 $lang->admin->log            = 'Log';
@@ -29,6 +30,15 @@ $lang->admin->setting        = 'Paramétrage';
 $lang->admin->days           = 'Durée de conservation';
 $lang->admin->resetPWDByMail = 'Reset the password via the email';
 
+$lang->admin->changeEngine   = "Change to InnoDB";
+$lang->admin->changingTable  = 'Replacing data table %s engine...';
+$lang->admin->changeSuccess  = 'The data table %s engine has been changed to InnoDB.';
+$lang->admin->changeFail     = "Failed to replace table %s engine. Reason: <span class='text-red'>%s</span>。";
+$lang->admin->errorInnodb    = 'Your MySQL does not support InnoDB data table engine.';
+$lang->admin->engineInfo     = "The <strong>%s</strong> table engine is <strong>%s</strong>.";
+$lang->admin->engineSummary['hasMyISAM'] = "There are %s tables that are not InnoDB engines";
+$lang->admin->engineSummary['allInnoDB'] = "All tables are InnoDB engines";
+
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'La version actuelle est %s customisée. ';
 $lang->admin->info->links   = 'Vous pouvez visiter les liens ci-dessous';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index f07908c47e..10d8a111a6 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -22,6 +22,7 @@ $lang->admin->captcha         = '验证码';
 $lang->admin->getCaptcha      = '获取验证码';
 $lang->admin->register        = '登记';
 $lang->admin->resetPWDSetting = '重置密码设置';
+$lang->admin->tableEngine     = '表引擎';
 
 $lang->admin->api            = '接口';
 $lang->admin->log            = '日志';
@@ -29,6 +30,15 @@ $lang->admin->setting        = '设置';
 $lang->admin->days           = '日志保存天数';
 $lang->admin->resetPWDByMail = '通过邮箱重置密码';
 
+$lang->admin->changeEngine   = "更换到InnoDB";
+$lang->admin->changingTable  = '正在更换数据表%s引擎...';
+$lang->admin->changeSuccess  = '已经更换数据表%s引擎为InnoDB。';
+$lang->admin->changeFail     = "更换数据表%s引擎失败，原因：<span class='text-red'>%s</span>。";
+$lang->admin->errorInnodb    = '您当前的数据库不支持使用InnoDB数据表引擎。';
+$lang->admin->engineInfo     = "表<strong>%s</strong>的引擎是<strong>%s</strong>。";
+$lang->admin->engineSummary['hasMyISAM'] = "有%s个表不是InnoDB引擎";
+$lang->admin->engineSummary['allInnoDB'] = "所有的表都是InnoDB引擎了";
+
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = '当前系统的版本是%s，';
 $lang->admin->info->links   = '您可以访问以下链接：';
diff --git a/module/admin/view/tableengine.html.php b/module/admin/view/tableengine.html.php
new file mode 100644
index 0000000000..d89eb2f93b
--- /dev/null
+++ b/module/admin/view/tableengine.html.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * The tableEngine view file of admin module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     admin
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <?php
+    $MyISAMCount    = 0;
+    $engineListHtml = '';
+    foreach($tableEngines as $tableName => $engine)
+    {
+        if($engine != 'InnoDB') $MyISAMCount ++;
+        $engineListHtml .= "<li data-table='$tableName'>" . sprintf($lang->admin->engineInfo, $tableName, $engine) . "</li>\n";
+    }
+    ?>
+    <h2>
+    <?php if($MyISAMCount > 0):?>
+    <?php printf($lang->admin->engineSummary['hasMyISAM'], $MyISAMCount);?>
+    <?php echo html::a('###', $lang->admin->changeEngine, '', "class='btn btn-sm changeEngine btn-primary' onclick='changeAllEngines()'");?>
+    <?php else:?>
+    <?php print($lang->admin->engineSummary['allInnoDB']);?>
+    <?php endif;?>
+    </h2>
+  </div>
+  <div>
+    <ul id='engineBox'><?php echo $engineListHtml?></ul>
+  </div>
+</div>
+<?php js::set('changingTable', $lang->admin->changingTable);?>
+<script>
+/**
+ * Change all table engines.
+ *
+ * @access public
+ * @return void
+ */
+function changeAllEngines()
+{
+    var tables = [];
+    var $engineBox = $('#engineBox');
+    $engineBox.find('li').each(function()
+    {
+        tables.push($(this).attr('data-table'));
+    });
+
+    $('.btn.changeEngine').hide();
+    $engineBox.empty();
+    for(i in tables);
+    $.each(tables, function(_, table)
+    {
+        changeEngine(table);
+    });
+    $engineBox.append("<div><a href='javascript:location.reload();' class='btn'>{$lang->refresh}</a>"?></div>");
+}
+
+/**
+ * Change one engine.
+ *
+ * @param  string $table
+ * @access public
+ * @return void
+ */
+function changeEngine(table)
+{
+    var $engineBox = $('#engineBox');
+    var link = createLink('admin', 'ajaxChangeTableEngine', 'table=' + table);
+
+    if($engineBox.find('[data-table=' + table + ']').length == 0) $engineBox.append("<div data-table='" + table + "'>" + changingTable.replace('%s', table) + "</div>");
+    $.ajax(
+    {
+        type: "GET",
+        url: link,
+        success: function(response)
+        {
+            response = JSON.parse(response);
+            $engineBox.find('[data-table=' + table + ']').html(response.message).addClass('text-success');
+        },
+        error: function()
+        {
+            changeEngine(table);
+        }
+    })
+}
+</script>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 9cd57439b5..d2113a3e89 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -288,11 +288,12 @@ $lang->devops->rules    = 'Rule';
 $lang->devops->settings = 'Setting Merge Request';
 $lang->devops->set      = 'Set';
 
-$lang->admin->system     = 'System';
-$lang->admin->entry      = 'Application';
-$lang->admin->data       = 'Data';
-$lang->admin->cron       = 'Cron';
-$lang->admin->buildIndex = 'Full Text Search';
+$lang->admin->system      = 'System';
+$lang->admin->entry       = 'Application';
+$lang->admin->data        = 'Data';
+$lang->admin->cron        = 'Cron';
+$lang->admin->buildIndex  = 'Full Text Search';
+$lang->admin->tableEngine = 'Table Engine';
 
 $lang->convert->importJira = 'Import Jira';
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index e8022f9f17..d8390243ce 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -288,11 +288,12 @@ $lang->devops->rules    = 'Rule';
 $lang->devops->settings = 'Setting Merge Request';
 $lang->devops->set      = 'Set';
 
-$lang->admin->system     = 'System';
-$lang->admin->entry      = 'Application';
-$lang->admin->data       = 'Data';
-$lang->admin->cron       = 'Cron';
-$lang->admin->buildIndex = 'Full Text Search';
+$lang->admin->system      = 'System';
+$lang->admin->entry       = 'Application';
+$lang->admin->data        = 'Data';
+$lang->admin->cron        = 'Cron';
+$lang->admin->buildIndex  = 'Full Text Search';
+$lang->admin->tableEngine = 'Table Engine';
 
 $lang->convert->importJira = 'Import Jira';
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index d291be8c95..67caf6b5fd 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -288,11 +288,12 @@ $lang->devops->rules    = 'Rule';
 $lang->devops->settings = 'Setting Merge Request';
 $lang->devops->set      = 'Set';
 
-$lang->admin->system     = 'System';
-$lang->admin->entry      = 'Application';
-$lang->admin->data       = 'Data';
-$lang->admin->cron       = 'Cron';
-$lang->admin->buildIndex = 'Full Text Search';
+$lang->admin->system      = 'System';
+$lang->admin->entry       = 'Application';
+$lang->admin->data        = 'Data';
+$lang->admin->cron        = 'Cron';
+$lang->admin->buildIndex  = 'Full Text Search';
+$lang->admin->tableEngine = 'Table Engine';
 
 $lang->convert->importJira = 'Import Jira';
 
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index f4da4b6005..1327985178 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -568,6 +568,7 @@ $lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->sec
 $lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
 $lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
 $lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
+$lang->admin->menu->system['subMenu']->tableEngine = array('link' => "{$lang->admin->tableEngine}|admin|tableengine|");
 if(version_compare(phpversion(), 5.6) > 0) $lang->admin->menu->system['subMenu']->convertJira = array('link' => "{$lang->convert->importJira}|convert|convertjira|", 'subModule' => 'convert');
 
 $lang->admin->dividerMenu = ',company,message,system,';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index eb4cc5bf63..a27488d59e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -288,11 +288,12 @@ $lang->devops->rules    = '指令';
 $lang->devops->settings = '合并请求设置';
 $lang->devops->set      = '设置';
 
-$lang->admin->system     = '系统';
-$lang->admin->entry      = '应用';
-$lang->admin->data       = '数据';
-$lang->admin->cron       = '定时';
-$lang->admin->buildIndex = '重建索引';
+$lang->admin->system      = '系统';
+$lang->admin->entry       = '应用';
+$lang->admin->data        = '数据';
+$lang->admin->cron        = '定时';
+$lang->admin->buildIndex  = '重建索引';
+$lang->admin->tableEngine = '表引擎';
 
 $lang->convert->importJira = '导入Jira数据';
 
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 333ecfee8e..56080b05d5 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1632,6 +1632,7 @@ $lang->resource->admin->sso             = 'ssoAction';
 $lang->resource->admin->register        = 'register';
 $lang->resource->admin->ztCompany       = 'ztCompany';
 $lang->resource->admin->resetPWDSetting = 'resetPWDSetting';
+$lang->resource->admin->tableEngine     = 'tableEngine';
 
 $lang->admin->methodOrder[0]  = 'index';
 $lang->admin->methodOrder[5]  = 'checkDB';
@@ -1641,6 +1642,7 @@ $lang->admin->methodOrder[20] = 'sso';
 $lang->admin->methodOrder[25] = 'register';
 $lang->admin->methodOrder[30] = 'ztCompany';
 $lang->admin->methodOrder[35] = 'resetPWDSetting';
+$lang->admin->methodOrder[40] = 'tableEngine';
 
 /* Extension. */
 $lang->resource->extension = new stdclass();
diff --git a/module/misc/model.php b/module/misc/model.php
index 68ab08a1bc..739ab197e3 100644
--- a/module/misc/model.php
+++ b/module/misc/model.php
@@ -143,4 +143,19 @@ class miscModel extends model
 
         return $weakSites;
     }
+
+    /**
+     * Get table and engine pairs.
+     *
+     * @access public
+     * @return array
+     */
+    public function getTableEngines()
+    {
+        $tableEngines = array();
+        $stmt = $this->dao->query("SHOW TABLE STATUS WHERE `Engine` is not null");
+        while($table = $stmt->fetch()) $tableEngines[$table->Name] = $table->Engine;
+
+        return $tableEngines;
+    }
 }
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index d2fb523a88..fe176ea746 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -906,83 +906,6 @@ class upgrade extends control
         echo $this->dao->select('status')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch('status');
     }
 
-    /**
-     * Ajax change table engine.
-     *
-     * @access public
-     * @return void
-     */
-    public function ajaxChangeTableEngine()
-    {
-        $response = array();
-        $response['result']      = 'continue';
-        $response['message']     = '';
-        $response['nextMessage'] = '';
-
-        $stmt  = $this->dao->query("SHOW TABLE STATUS WHERE `Engine` is not null AND `Engine` = 'MyISAM'");
-        $table = $stmt->fetch();
-        if(empty($table))
-        {
-            $response['result']  = 'finished';
-            $response['message'] = $this->lang->upgrade->finishedChange;
-            return print(json_encode($response));
-        }
-
-        $nextTable = $stmt->fetch();
-        if($nextTable and stripos($nextTable->Name, 'searchindex') !== false)
-        {
-            $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
-            if($mysqlVersion < 5.6) $nextTable = $stmt->fetch();
-        }
-
-        $tableName = $table->Name;
-
-        $response['table'] = $tableName;
-
-        /* Check process this table or not. */
-        $dbProcesses = $this->dao->query("SHOW PROCESSLIST")->fetchAll();
-        foreach($dbProcesses as $dbProcess)
-        {
-            if($dbProcess->db != $this->config->db->name) continue;
-            if(strpos($dbProcess->Info, " `{$tableName}` "))
-            {
-                $response['message'] = sprintf($this->lang->upgrade->changingTable, $response['table']);
-                return print(json_encode($response));
-            }
-        }
-
-        if($nextTable)
-        {
-            $response['next'] = $nextTable->Name;
-            if($response['next']) $response['nextMessage'] = sprintf($this->lang->upgrade->changingTable, $response['next']);
-        }
-
-        if(stripos($tableName, 'searchindex') !== false)
-        {
-            /* Change fulltext index. */
-            $stmt    = $this->dao->query("show index from `$tableName`");
-            $indexes = array();
-            while($index = $stmt->fetch())
-            {
-                if($index->Index_type != 'FULLTEXT') continue;
-                $indexes[$index->Key_name] = $index->Key_name;
-            }
-
-            if(!isset($indexes['title_content'])) $this->dao->exec( "ALTER TABLE `{$tableName}` ADD FULLTEXT `title_content` (`title`, `content`)");
-            if(isset($indexes['title'])) $this->dao->exec( "ALTER TABLE `{$tableName}` DROP INDEX `title`");
-            if(isset($indexes['content'])) $this->dao->exec( "ALTER TABLE `{$tableName}` DROP INDEX `content`");
-
-            $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
-            if($mysqlVersion < 5.6) return print(json_encode($response));
-        }
-
-        $sql = "ALTER TABLE `$tableName` ENGINE='InnoDB'";
-        $this->dao->exec($sql);
-
-        $response['message'] = sprintf($this->lang->upgrade->finishedTable, $tableName);
-        return print(json_encode($response));
-    }
-
     /**
      * Move Extent files.
      *
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 9512aea5d9..dfd5dffaf6 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -51,10 +51,6 @@ $lang->upgrade->sureExecute    = 'Ausführen';
 $lang->upgrade->upgradingTips  = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
 $lang->upgrade->forbiddenExt   = 'Die Erweiterung ist nicht kompatibel mit der Upgradeversion. Sie wurde deaktiviert:';
 $lang->upgrade->updateFile     = 'Updateinformation wurden hinzugefügt.';
-$lang->upgrade->changeEngine   = 'The database engine needs to be modified.';
-$lang->upgrade->changingTable  = 'Replacing data table %s engine...';
-$lang->upgrade->finishedTable  = 'The data table %s engine has been changed to InnoDB.';
-$lang->upgrade->finishedChange = 'The replacement of the database engine is completed.';
 $lang->upgrade->noticeSQL      = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
 $lang->upgrade->afterDeleted   = 'File is not deleted. Please refresh after you delete it.';
 $lang->upgrade->mergeProgram   = 'Data Merge';
@@ -134,6 +130,7 @@ $lang->upgrade->mergeByProject     = "Independent {$lang->projectCommon}: You ca
 $lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 $lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrad. Please create an index.';
+$lang->upgrade->needChangeEngine   = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.';
 $lang->upgrade->errorEngineInnodb  = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.';
 $lang->upgrade->duplicateProject   = "Project name in the same program cannot be duplicate. Please adjust the duplicate names.";
 $lang->upgrade->upgradeTips        = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware.";
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 8d9c1b413b..ed38f78dd2 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -51,10 +51,6 @@ $lang->upgrade->sureExecute    = 'Execute';
 $lang->upgrade->upgradingTips  = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
 $lang->upgrade->forbiddenExt   = 'The extension is incompatible with the version. It has been deactivated:';
 $lang->upgrade->updateFile     = 'File information has to be updated.';
-$lang->upgrade->changeEngine   = 'The database engine needs to be modified.';
-$lang->upgrade->changingTable  = 'Replacing data table %s engine...';
-$lang->upgrade->finishedTable  = 'The data table %s engine has been changed to InnoDB.';
-$lang->upgrade->finishedChange = 'The replacement of the database engine is completed.';
 $lang->upgrade->noticeSQL      = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
 $lang->upgrade->afterDeleted   = 'Please execute commands to delete the files. Please refresh after you delete them.';
 $lang->upgrade->mergeProgram   = 'Data Merge';
@@ -134,6 +130,7 @@ $lang->upgrade->mergeByProject     = "Independent {$lang->projectCommon}: You ca
 $lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 $lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
+$lang->upgrade->needChangeEngine   = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.';
 $lang->upgrade->errorEngineInnodb  = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.';
 $lang->upgrade->duplicateProject   = "Project name in the same program cannot be duplicate. Please adjust the duplicate names.";
 $lang->upgrade->upgradeTips        = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware.";
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 815df01348..ac63434bce 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -51,10 +51,6 @@ $lang->upgrade->sureExecute    = 'Executez';
 $lang->upgrade->upgradingTips  = 'La mise à jour est en cours, veuillez être patient. Ne pas actualiser la page ou éteindre votre ordinateur!';
 $lang->upgrade->forbiddenExt   = 'Cette extension est incompatible avec la version. Elle a été désactivée :';
 $lang->upgrade->updateFile     = "Le fichier information a besoin d'une mise à jour.";
-$lang->upgrade->changeEngine   = 'The database engine needs to be modified.';
-$lang->upgrade->changingTable  = 'Replacing data table %s engine...';
-$lang->upgrade->finishedTable  = 'The data table %s engine has been changed to InnoDB.';
-$lang->upgrade->finishedChange = 'The replacement of the database engine is completed.';
 $lang->upgrade->noticeSQL      = 'Votre base de donnée est inconsistente avec le standard et il y a eu un échec pour la corriger. Exécutez la commande SQL suivante et rafraichissez.';
 $lang->upgrade->afterDeleted   = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé.";
 $lang->upgrade->mergeProgram   = 'Data Merge';
@@ -134,6 +130,7 @@ $lang->upgrade->mergeByProject     = "Independent {$lang->projectCommon}: You ca
 $lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 $lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
+$lang->upgrade->needChangeEngine   = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.';
 $lang->upgrade->errorEngineInnodb  = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.';
 $lang->upgrade->duplicateProject   = "Project name in the same program cannot be duplicate. Please adjust the duplicate names.";
 $lang->upgrade->upgradeTips        = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware.";
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 4378626dcd..97450262e1 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -51,10 +51,6 @@ $lang->upgrade->sureExecute    = '确认执行';
 $lang->upgrade->upgradingTips  = '正在升级中，请耐心等待，切勿刷新页面、断电、关机！';
 $lang->upgrade->forbiddenExt   = '以下插件与新版本不兼容，已经自动禁用：';
 $lang->upgrade->updateFile     = '需要更新附件信息。';
-$lang->upgrade->changeEngine   = '需要修改数据库引擎。';
-$lang->upgrade->changingTable  = '正在更换数据表%s引擎...';
-$lang->upgrade->finishedTable  = '已经更换数据表%s引擎为InnoDB。';
-$lang->upgrade->finishedChange = '更换数据库引擎结束。';
 $lang->upgrade->noticeSQL      = '检查到你的数据库跟标准不一致，尝试修复失败。请执行以下SQL语句，再刷新页面检查。';
 $lang->upgrade->afterDeleted   = '请执行上面命令删除文件， 删除后刷新！';
 $lang->upgrade->mergeProgram   = '数据迁移';
@@ -134,6 +130,7 @@ $lang->upgrade->mergeByProject     = "独立的{$lang->projectCommon}：可以
 $lang->upgrade->mergeByMoreLink    = "关联多个{$lang->productCommon}的{$lang->projectCommon}：选择一个或多个{$lang->projectCommon}归并到一个项目集和项目中。";
 $lang->upgrade->mergeRepoTips      = "将选中的版本库归并到所选产品下。";
 $lang->upgrade->needBuild4Add      = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
+$lang->upgrade->needChangeEngine   = '本次升级需要更换表引擎， [后台->系统->表引擎] 页面更换引擎。';
 $lang->upgrade->errorEngineInnodb  = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。';
 $lang->upgrade->duplicateProject   = "同一个项目集内项目名称不能重复，请调整重名的项目名称";
 $lang->upgrade->upgradeTips        = "历史删除数据不参与升级，升级后将不支持还原，请知悉";
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d58fe72362..5cbc662961 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -531,6 +531,7 @@ class upgradeModel extends model
                 $this->processBugLinkBug();
                 break;
             case '17_4':
+                $this->rebuildFULLTEXT();
                 $this->updateSearchIndex();
                 break;
         }
@@ -3198,25 +3199,25 @@ class upgradeModel extends model
     {
         $fromVersion = $this->config->installedVersion;
         $needProcess = array();
-        if(strpos($fromVersion, 'max') === false and strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true;
+        if(strpos($fromVersion, 'max') === false and strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = 'process';
         if(strpos($fromVersion, 'max') === false and $this->config->systemMode == 'new')
         {
             if(strpos($fromVersion, 'pro') !== false)
             {
-                if(version_compare($fromVersion, 'pro10.0', '<')) $needProcess['search'] = true;
+                if(version_compare($fromVersion, 'pro10.0', '<')) $needProcess['search'] = 'notice';
             }
             elseif(strpos($fromVersion, 'biz') !== false)
             {
-                if(version_compare($fromVersion, 'biz5.0', '<')) $needProcess['search'] = true;
+                if(version_compare($fromVersion, 'biz5.0', '<')) $needProcess['search'] = 'notice';
             }
             elseif(version_compare($fromVersion, '15.0.rc1', '<'))
             {
-                $needProcess['search'] = true;
+                $needProcess['search'] = 'notice';
             }
         }
 
         $openVersion = $this->getOpenVersion($fromVersion);
-        if(version_compare($openVersion, '17_4', '<=')) $needProcess['changeEngine'] = true;
+        if(version_compare($openVersion, '17_4', '<=')) $needProcess['changeEngine'] = 'notice';
 
         return $needProcess;
     }
@@ -7036,4 +7037,32 @@ class upgradeModel extends model
 
         return !dao::isError();
     }
+
+    /**
+     * Change FULLTEXT index for searchindex table.
+     *
+     * @access public
+     * @return void
+     */
+    public function rebuildFULLTEXT()
+    {
+        try
+        {
+            $table   = TABLE_SEARCHINDEX;
+            $stmt    = $this->dao->query("show index from $table");
+            $indexes = array();
+            while($index = $stmt->fetch())
+            {
+                if($index->Index_type != 'FULLTEXT') continue;
+                $indexes[$index->Key_name] = $index->Key_name;
+            }
+
+            if(!isset($indexes['title_content'])) $this->dao->exec( "ALTER TABLE {$table} ADD FULLTEXT `title_content` (`title`, `content`)");
+            if(isset($indexes['title'])) $this->dao->exec( "ALTER TABLE {$table} DROP INDEX `title`");
+            if(isset($indexes['content'])) $this->dao->exec( "ALTER TABLE {$table} DROP INDEX `content`");
+        }
+        catch(PDOException $e){}
+
+        return true;
+    }
 }
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index f3b82cd10c..3d240b4430 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -35,10 +35,10 @@ $(function()
     finishedShow();
 })
 <?php
-foreach($needProcess as $processKey => $value)
+foreach($needProcess as $processKey => $processType)
 {
-    $value = $processKey == 'search' ? 'true' : 'false';
-    echo 'var ' . $processKey . "Finish = $value;\n";
+    if($processType == 'notice') continue;
+    echo 'var ' . $processKey . "Finish = false;\n";
 }
 ?>
 
@@ -52,9 +52,9 @@ function initHideHome()
 {
     var hide = false;
     <?php
-    foreach($needProcess as $processKey => $value)
+    foreach($needProcess as $processKey => $processType)
     {
-        if($processKey == 'search') continue;
+        if($processType == 'notice') continue;
         echo "hide = true;\n";
         break;
     }
@@ -76,8 +76,9 @@ function finishedShow()
 {
     var show = true;
     <?php
-    foreach($needProcess as $processKey => $value)
+    foreach($needProcess as $processKey => $processType)
     {
+        if($processType == 'notice') continue;
         echo "if({$processKey}Finish == false) show = false;\n";
     }
     ?>
@@ -91,45 +92,8 @@ function finishedShow()
 <?php if(isset($needProcess['changeEngine'])):?>
 $(function()
 {
-    $('.col-md-6:first').append("<div id='changeEngineBox' class='alert alert-info'><p><?php echo $lang->upgrade->changeEngine;?></p><div class='info'></div></div>");
-    changeEngine();
+    $('.col-md-6:first').append("<div class='alert alert-info'><p><?php echo $lang->upgrade->needChangeEngine;?></p></div>");
 })
-function changeEngine()
-{
-    var link     = '<?php echo inlink('ajaxChangeTableEngine')?>';
-    var $infoBox = $('#changeEngineBox .info');
-    $.ajax(
-    {
-        type: "GET",
-        url: link,
-        success: function(response)
-        {
-            response = JSON.parse(response);
-            if(response == null)
-            {
-                changeEngineFinish = true;
-                finishedShow();
-            }
-            else if(response.result == 'finished')
-            {
-                changeEngineFinish = true;
-                $infoBox.prepend("<div class='text-success'>" + response.message + "</div>");
-                finishedShow();
-            }
-            else
-            {
-                if($infoBox.find('.' + response.table).length == 0) $infoBox.prepend("<div class='text-success " + response.table + "'></div>");
-                $infoBox.find('.' + response.table).html(response.message);
-                if(response.next) $infoBox.prepend("<div class='text-success " + response.next + "'>" + response.nextMessage + "</div>");
-                changeEngine();
-            }
-        },
-        error: function()
-        {
-            changeEngine();
-        }
-    })
-}
 <?php endif;?>
 <?php if(isset($needProcess['updateFile'])):?>
 $(function()