From 469ded409f0842e1b541ee725983fba92ecad967 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 28 Jun 2015 14:39:42 -0400
Subject: [PATCH] Update installer

---
 install/install_functions.inc.php             |  2 +-
 .../ajax/install-database-ajax.php            |  2 ++
 install/mods-for-hesk/installModsForHesk.php  |  6 ++++
 install/mods-for-hesk/js/version-scripts.js   |  3 ++
 install/mods-for-hesk/modsForHesk.php         | 29 +++++++++++++------
 install/mods-for-hesk/sql/installSql.php      | 10 +++++++
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 97f0e0d3..41e2c64f 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.1');
+define('MODS_FOR_HESK_NEW_VERSION','2.3.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 3382e313..17070024 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -43,6 +43,8 @@ if ($version == 1) {
     execute230FileUpdate();
 } elseif ($version == 231) {
     execute231Scripts();
+} elseif ($version == 232) {
+    execute232Scripts();
 } 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 248c431f..b41431db 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -52,6 +52,12 @@ function echoInitialVersionRows($version) {
     if ($version < 230) {
         printRow('v2.3.0');
     }
+    if ($version < 231) {
+        printRow('v2.3.1');
+    }
+    if ($version < 232) {
+        printRow('v2.3.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 3260f67c..bee321ec 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -44,6 +44,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 231) {
         startVersionUpgrade('231');
         executeUpdate(231, '231', '2.3.1');
+    } else if (startingVersion < 232) {
+        startVersionUpgrade('232');
+        executeUpdate(232, '232', '2.3.2');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 9f5451fb..d28174a9 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.1') {
+                                            $v231btn = 'btn-success';
+                                            $disableAllExcept = '231';
+                                        } else {
+                                            $v231btn = 'btn-default';
+                                        }
+                                        ?>
+                                        <a id="231" class="btn <?php echo $v231btn; ?> btn-block disablable" href="installModsForHesk.php?v=231">v2.3.1</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.3.0') {
@@ -170,6 +181,9 @@ 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') {
@@ -181,9 +195,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="211" class="btn <?php echo $v211btn; ?> btn-block disablable" href="installModsForHesk.php?v=211">v2.1.1</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.1.0') {
@@ -217,6 +228,9 @@ 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') {
@@ -228,9 +242,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="170" class="btn <?php echo $v170btn; ?> btn-block disablable" href="installModsForHesk.php?v=170">v1.7.0</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '1.6.1') {
@@ -257,12 +268,12 @@ hesk_dbConnect();
                                     <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>
                                 </div>
                                 <br>
                                 <div class="row">
+                                    <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>
                                     <div class="col-md-3 col-sm-12">
                                         <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">v1.4.0</a>
                                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index a95813e6..93e3e9de 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -531,3 +531,13 @@ function execute231Scripts() {
     hesk_dbConnect();
     executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.3.1' WHERE `Key` = 'modsForHeskVersion'");
 }
+// END Verison 2.3.1
+
+// BEGIN Version 2.3.2
+function execute232Scripts() {
+    global $hesk_settings;
+
+    hesk_dbConnect();
+    executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.3.2' WHERE `Key` = 'modsForHeskVersion'");
+}
+// END Version 2.3.2
\ No newline at end of file