From 3fdbced605c8948cf57f247dacec9497bbd6c139 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 8 Aug 2015 00:25:20 -0400
Subject: [PATCH] Update install pages for 2.4.0

---
 install/install_functions.inc.php             |  2 +-
 .../ajax/install-database-ajax.php            |  3 ++
 install/mods-for-hesk/installModsForHesk.php  |  3 ++
 install/mods-for-hesk/js/version-scripts.js   |  3 ++
 install/mods-for-hesk/modsForHesk.php         | 31 +++++++++++++------
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 41e2c64f..eef55759 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.4');
-define('MODS_FOR_HESK_NEW_VERSION','2.3.2');
+define('MODS_FOR_HESK_NEW_VERSION','2.4.0');
 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 17070024..a00501cf 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -45,6 +45,9 @@ if ($version == 1) {
     execute231Scripts();
 } elseif ($version == 232) {
     execute232Scripts();
+} elseif ($version == 240) {
+    execute240Scripts();
+    execute240FileUpdate();
 } 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 5e576af3..3e6ba0fa 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -58,6 +58,9 @@ function echoInitialVersionRows($version) {
     if ($version < 232) {
         printRow('v2.3.2');
     }
+    if ($version < 240) {
+        printRow('v2.4.0');
+    }
 }
 
 function printRow($version) {
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index f55b3614..62d45456 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -47,6 +47,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 232) {
         startVersionUpgrade('232');
         executeUpdate(232, '232', '2.3.2');
+    } else if (startingVersion < 240) {
+        startVersionUpgrade('240');
+        executeUpdate(240, '240', '2.4.0');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index d28174a9..a1d2fd61 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -137,6 +137,17 @@ hesk_dbConnect();
                                 }
                                 ?>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <?php
+                                        if ($version == '2.3.2') {
+                                            $v232btn = 'btn-success';
+                                            $disableAllExcept = '232';
+                                        } else {
+                                            $v232btn = 'btn-default';
+                                        }
+                                        ?>
+                                        <a id="232" class="btn <?php echo $v232btn; ?> btn-block disablable" href="installModsForHesk.php?v=232">v2.3.2</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.3.1') {
@@ -170,6 +181,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="221" class="btn <?php echo $v221btn; ?> btn-block disablable" href="installModsForHesk.php?v=221">v2.2.1</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.2.0') {
@@ -181,9 +195,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="220" class="btn <?php echo $v220btn; ?> btn-block disablable" href="installModsForHesk.php?v=220">v2.2.0</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.1.1') {
@@ -217,6 +228,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="201" class="btn <?php echo $v201btn; ?> btn-block disablable" href="installModsForHesk.php?v=201">v2.0.1</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.0.0') {
@@ -228,9 +242,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="200" class="btn <?php echo $v200btn; ?> btn-block disablable" href="installModsForHesk.php?v=200">v2.0.0</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '1.7.0') {
@@ -265,12 +276,12 @@ hesk_dbConnect();
                                         ?>
                                         <a id="160" class="btn <?php echo $v160btn; ?> btn-block disablable" href="installModsForHesk.php?v=160">v1.6.0</a>
                                     </div>
-                                    <div class="col-md-3 col-sm-12">
-                                        <a id="150" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=150">v1.5.0</a>
-                                    </div>
                                 </div>
                                 <br>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <a id="150" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=150">v1.5.0</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <a id="141" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=141">v1.4.1</a>
                                     </div>
@@ -280,6 +291,8 @@ hesk_dbConnect();
                                     <div class="col-md-3 col-sm-12">
                                         <a id="130" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=130">v1.3.0</a>
                                     </div>
+                                </div>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <a id="124" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=124">v1.2.4</a>
                                     </div>