From 1874dd435777aacdc84ca05f72cfaa0dd54dc9ec Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Tue, 16 May 2017 18:54:59 +0530
Subject: [PATCH] Added hook to stop migration if non ported extension found
---
includes/main/WebUI.php | 2 +-
migrate/index.php | 23 ++++++++++++--------
modules/Migration/actions/DisableModules.php | 23 ++++++++++++++++++++
vtigerversion.php | 2 +-
4 files changed, 39 insertions(+), 11 deletions(-)
create mode 100644 modules/Migration/actions/DisableModules.php
diff --git a/includes/main/WebUI.php b/includes/main/WebUI.php
index 026c7a327..59ca34345 100644
--- a/includes/main/WebUI.php
+++ b/includes/main/WebUI.php
@@ -96,7 +96,7 @@ class Vtiger_WebUI extends Vtiger_EntryPoint {
// Better place this here as session get initiated
//skipping the csrf checking for the forgot(reset) password
- if($request->get('mode') != 'reset' && $request->get('action') != 'Login')
+ if($request->get('mode') != 'reset' && $request->get('action') != 'Login' && $request->get('mode') != 'fromMig')
require_once 'libraries/csrf-magic/csrf-magic.php';
// TODO - Get rid of global variable $current_user
diff --git a/migrate/index.php b/migrate/index.php
index 905245cdd..811ccc3a1 100644
--- a/migrate/index.php
+++ b/migrate/index.php
@@ -16,15 +16,14 @@ include_once 'includes/main/WebUI.php';
$errorMessage = $_REQUEST['error'];
if (!$errorMessage) {
$extensionStoreInstance = Settings_ExtensionStore_Extension_Model::getInstance();
- $vtigerStandardModules = array( 'Accounts', 'Assets', 'Calendar', 'Campaigns', 'Contacts', 'CustomerPortal',
- 'Dashboard', 'Documents', 'Emails', 'EmailTemplates', 'Events', 'ExtensionStore',
+ $vtigerStandardModules = array( 'Accounts', 'Assets', 'Calendar', 'Campaigns', 'Contacts', 'CustomerPortal', 'Dashboard', 'Emails', 'EmailTemplates', 'Events', 'ExtensionStore',
'Faq', 'Google', 'HelpDesk', 'Home', 'Import', 'Invoice', 'Leads', 'MailManager', 'Mobile', 'ModComments', 'ModTracker',
'PBXManager', 'Portal', 'Potentials', 'PriceBooks', 'Products', 'Project', 'ProjectMilestone', 'ProjectTask', 'PurchaseOrder',
'Quotes', 'RecycleBin', 'Reports', 'Rss', 'SalesOrder', 'ServiceContracts', 'Services', 'SMSNotifier', 'Users', 'Vendors',
'Webforms', 'Webmails', 'WSAPP');
$nonPortedExtns = array();
$db = PearDatabase::getInstance();
- $result = $db->pquery('SELECT name FROM vtiger_tab WHERE trim(name) NOT IN ('.generateQuestionMarks($vtigerStandardModules).')', $vtigerStandardModules);
+ $result = $db->pquery('SELECT name FROM vtiger_tab WHERE isentitytype != ? AND presence != ? AND trim(name) NOT IN ('.generateQuestionMarks($vtigerStandardModules).')', array(1, 1, $vtigerStandardModules));
while($row = $db->fetch_row($result)) {
$module = $row['name'];//label
if ($module) {
@@ -42,7 +41,7 @@ if (!$errorMessage) {
}
}
if ($nonPortedExtns) {
- $portingMessage = 'Following extension(s) seem to have failed upgrade check with Vtiger7.<br><ul>';
+ $portingMessage = 'Following custom modules are not compatible with Vtiger 7. Please disable these modules to proceed.';
foreach ($nonPortedExtns as $module) {
$portingMessage .= "<li>$module</li>";
}
@@ -102,7 +101,13 @@ if (!$errorMessage) {
</div>
</div>
<div class="button-container col-lg-12">
- <input type="button" onclick="window.location.href='../index.php'" class="btn btn-large btn-primary pull-right" value="Finish"/>
+ <div class="pull-right">
+ <form action="../index.php?module=Migration&action=DisableModules&mode=fromMig" method="POST">
+ <input type="hidden" name="modulesList" <?php echo 'value="'.Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($nonPortedExtns)).'"'; ?> />
+ <input type="submit" class="btn btn-warning" value="Disable modules & Proceed"/>
+ <input type="button" onclick="window.location.href='../index.php'" class="btn btn-default" value="Close"/>
+ </form>
+ </div>
<?php } else if($currentVersion[0] >= 6 && $currentVersion[1] >= 0) { ?>
<div class="col-lg-8" style="padding-left: 30px;">
<h3> Welcome to Vtiger Migration</h3>
@@ -115,7 +120,7 @@ if (!$errorMessage) {
Please note that it is not possible to revert back to <?php echo $vtiger_current_version ?> after the upgrade to vtiger 7 <br>
So, it is important to take a backup of the <?php echo $vtiger_current_version ?> installation, including the source files and database.
</p><br>
- <form action="../index.php?module=Migration&action=Extract&mode=reset" method="POST">
+ <form action="../index.php?module=Migration&action=Extract&mode=fromMig" method="POST">
<div><input type="checkbox" id="checkBox1" name="checkBox1"/><div class="chkbox"></div> I have taken the backup of database <a href="http://community.vtiger.com/help/vtigercrm/administrators/backup.html" target="_blank" >(how to?)</a></div><br>
<div><input type="checkbox" id="checkBox2" name="checkBox2"/><div class="chkbox"></div> I have taken the backup of source folder <a href="http://community.vtiger.com/help/vtigercrm/administrators/backup.html" target="_blank" >(how to?)</a></div><br>
<br>
@@ -128,7 +133,7 @@ if (!$errorMessage) {
</div>
<br><br><br>
<div class="button-container">
- <input type="submit" class="btn btn-large btn-primary" id="startMigration" name="startMigration" value="Start Migration" />
+ <input type="submit" class="btn btn-primary" id="startMigration" name="startMigration" value="Start Migration" />
</div>
</form>
</div>
@@ -146,7 +151,7 @@ if (!$errorMessage) {
</p>
</div>
<div class="button-container col-lg-12">
- <input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary pull-right" value="Finish"/>
+ <input type="button" onclick="window.location.href='index.php'" class="btn btn-primary pull-right" value="Finish"/>
<?php } else { ?>
<div class="col-lg-1"></div>
<div class="col-lg-7">
@@ -157,7 +162,7 @@ if (!$errorMessage) {
</p>
</div>
<div class="button-container col-lg-12">
- <input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary pull-right" value="Finish"/>
+ <input type="button" onclick="window.location.href='index.php'" class="btn btn-primary pull-right" value="Finish"/>
<?php } ?>
</div>
</div>
diff --git a/modules/Migration/actions/DisableModules.php b/modules/Migration/actions/DisableModules.php
new file mode 100644
index 000000000..f04fb9195
--- /dev/null
+++ b/modules/Migration/actions/DisableModules.php
@@ -0,0 +1,23 @@
+<?php
+/*+**********************************************************************************
+ * The contents of this file are subject to the vtiger CRM Public License Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ************************************************************************************/
+
+class Migration_DisableModules_Action extends Vtiger_Action_Controller {
+
+ public function process(Vtiger_Request $request) {
+ $modulesList = $request->get('modulesList');
+ if ($modulesList) {
+ $moduleManagerModel = new Settings_ModuleManager_Module_Model();
+ $moduleManagerModel->disableModule($modulesList);
+ }
+
+ header('Location: migrate/index.php');
+ }
+
+}
diff --git a/vtigerversion.php b/vtigerversion.php
index cbe25e18b..6a6f3bc70 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-$patch_version = '20160714'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '-20170517'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '7.0.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;
--
GitLab