From 5171512f85b1e5d742661fe9614a5edc5cbd006e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 22 Apr 2015 22:21:10 -0400
Subject: [PATCH] Update install scripts

---
 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         | 26 ++++++++++++++-----
 install/mods-for-hesk/sql/installSql.php      | 11 +++++++-
 6 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 49e7527d..638a164b 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.2');
-define('MODS_FOR_HESK_NEW_VERSION','2.2.0');
+define('MODS_FOR_HESK_NEW_VERSION','2.2.1');
 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 aa303894..ac1068e4 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -36,6 +36,8 @@ if ($version == 1) {
 } elseif ($version == 220) {
     execute220Scripts();
     execute220FileUpdate();
+} elseif ($version == 221) {
+    execute221Scripts();
 } 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 4e86aaf1..5b7480b3 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -46,6 +46,9 @@ function echoInitialVersionRows($version) {
     if ($version < 220) {
         printRow('v2.2.0');
     }
+    if ($version < 221) {
+        printRow('v2.2.1');
+    }
 }
 
 function printRow($version) {
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index 27bb7f8f..f7116047 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -35,6 +35,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 220) {
         startVersionUpgrade('220');
         executeUpdate(220, '220', '2.2.0');
+    } else if (startingVersion < 221) {
+        startVersionUpgrade('221');
+        executeUpdate(221, '221', '2.2.1');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index ab683f71..1b6194ed 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.2.0') {
+                                            $v220btn = 'btn-success';
+                                            $disableAllExcept = '220';
+                                        } else {
+                                            $v220btn = 'btn-default';
+                                        }
+                                        ?>
+                                        <a id="220" class="btn <?php echo $v220btn; ?> btn-block disablable" href="installModsForHesk.php?v=211">v2.2.0</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.1.1') {
@@ -170,6 +181,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') {
@@ -181,9 +195,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') {
@@ -218,12 +229,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>
@@ -233,6 +244,9 @@ 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>
+                                <br>
+                                <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>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 4401cc5d..f0ca04b9 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -427,4 +427,13 @@ $modsForHesk_settings[\'attachments\'] = 0;';
 
     return file_put_contents(HESK_PATH.'modsForHesk_settings.inc.php', $file);
 }
-// END Version 2.2.0
\ No newline at end of file
+// END Version 2.2.0
+
+// BEGIN Version 2.2.1
+function execute221Scripts() {
+    global $hesk_settings;
+
+    hesk_dbConnect();
+    executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.2.1' WHERE `Key` = 'modsForHeskVersion'");
+}
+// END Version 2.2.1
\ No newline at end of file