From 68cb0114dc00872e172e50a119d8f75fc9c04d87 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 29 Oct 2015 21:49:13 -0400 Subject: [PATCH] Update installer --- inc/header.inc.php | 2 +- inc/headerAdmin.inc.php | 2 +- install/install_functions.inc.php | 2 +- .../ajax/install-database-ajax.php | 2 + install/mods-for-hesk/installModsForHesk.php | 3 ++ install/mods-for-hesk/js/version-scripts.js | 3 ++ install/mods-for-hesk/modsForHesk.php | 52 ++++++++++++------- install/mods-for-hesk/sql/installSql.php | 9 ++++ 8 files changed, 52 insertions(+), 23 deletions(-) diff --git a/inc/header.inc.php b/inc/header.inc.php index 70f19ccb..4d6b7933 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -29,7 +29,7 @@ *******************************************************************************/ // Define the current build -define('MODS_FOR_HESK_BUILD', 22); +define('MODS_FOR_HESK_BUILD', 23); /* Check if this is a valid include */ if (!defined('IN_SCRIPT')) { diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index a7934231..f1504330 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -29,7 +29,7 @@ *******************************************************************************/ // Define the current build -define('MODS_FOR_HESK_BUILD', 22); +define('MODS_FOR_HESK_BUILD', 23); /* Check if this is a valid include */ if (!defined('IN_SCRIPT')) { diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index e004a955..3edade87 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: define('HESK_NEW_VERSION','2.6.5'); -define('MODS_FOR_HESK_NEW_VERSION','2.5.1'); +define('MODS_FOR_HESK_NEW_VERSION','2.5.2'); define('REQUIRE_PHP_VERSION','5.0.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); diff --git a/install/mods-for-hesk/ajax/install-database-ajax.php b/install/mods-for-hesk/ajax/install-database-ajax.php index 6068f4f0..b520f934 100644 --- a/install/mods-for-hesk/ajax/install-database-ajax.php +++ b/install/mods-for-hesk/ajax/install-database-ajax.php @@ -50,6 +50,8 @@ if ($version == 2) { execute250Scripts(); } elseif ($version == 22) { execute251Scripts(); +} elseif ($version == 23) { + execute252Scripts(); } else { $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.'; print $response; diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php index 9473fd4c..6e293bca 100644 --- a/install/mods-for-hesk/installModsForHesk.php +++ b/install/mods-for-hesk/installModsForHesk.php @@ -74,6 +74,9 @@ function echoInitialVersionRows($version) if ($version < 22) { printRow('2.5.1'); } + if ($version < 23) { + printRow('2.5.2'); + } } function printRow($version) diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js index 6a1c9695..424ef110 100644 --- a/install/mods-for-hesk/js/version-scripts.js +++ b/install/mods-for-hesk/js/version-scripts.js @@ -62,6 +62,9 @@ function processUpdates(startingVersion) { } else if (startingVersion < 22) { startVersionUpgrade('251'); executeUpdate(22, '251', '2.5.1'); + } else if (startingVersion < 23) { + startVersionUpgrade('252'); + executeUpdate(23, '252', '2.5.2'); } else { installationFinished(); } diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php index 56f26db5..712de220 100644 --- a/install/mods-for-hesk/modsForHesk.php +++ b/install/mods-for-hesk/modsForHesk.php @@ -130,6 +130,18 @@ hesk_dbConnect(); } ?>
+
+ + 2.5.1 +
btn-block disablable" href="installModsForHesk.php?v=19">2.4.1
+
+
+ +
btn-block disablable" href="installModsForHesk.php?v=18">2.4.0
-
-
- -
btn-block disablable" href="installModsForHesk.php?v=15">2.3.0
+
+
+ +
btn-block disablable" href="installModsForHesk.php?v=14">2.2.1
-
-
- -
btn-block disablable" href="installModsForHesk.php?v=11">2.1.0
+
+
+ +
btn-block disablable" href="installModsForHesk.php?v=10">2.0.1
-
-
- -
btn-block disablable" href="installModsForHesk.php?v=7">1.6.1
+
+
+ +
btn-block disablable" href="installModsForHesk.php?v=6">1.6.0
-
-
- -
1.5.0 @@ -351,14 +363,14 @@ hesk_dbConnect(); 1.4.0
-
- 1.3.0 -

+
+ 1.3.0 +
1.2.4 diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index 001e6534..57162b37 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -684,4 +684,13 @@ function execute251Scripts() hesk_dbConnect(); executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = '2.5.1' WHERE `Key` = 'modsForHeskVersion'"); +} + +// Version 2.5.2 +function execute252Scripts() +{ + global $hesk_settings; + hesk_dbConnect(); + + executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = '2.5.2' WHERE `Key` = 'modsForHeskVersion'"); } \ No newline at end of file