From 76d47a6f64b0cdb26745ac9acf8fc9f30e89fcec Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 31 Dec 2016 22:00:43 -0500
Subject: [PATCH] Update installer for 3.0.0

---
 build.php                                            | 2 +-
 install/install_functions.inc.php                    | 2 +-
 install/mods-for-hesk/ajax/install-database-ajax.php | 2 ++
 install/mods-for-hesk/installModsForHesk.php         | 1 +
 install/mods-for-hesk/js/version-scripts.js          | 3 +++
 install/mods-for-hesk/modsForHesk.php                | 6 +++---
 install/mods-for-hesk/sql/installSql.php             | 7 +++++++
 7 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.php b/build.php
index be229132..8616ae51 100644
--- a/build.php
+++ b/build.php
@@ -1,4 +1,4 @@
 <?php
 
 // Define the current build
-define('MODS_FOR_HESK_BUILD', 33);
\ No newline at end of file
+define('MODS_FOR_HESK_BUILD', 34);
\ No newline at end of file
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index d480b36c..824ed358 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.7.1');
-define('MODS_FOR_HESK_NEW_VERSION','3.0.0 RC 1');
+define('MODS_FOR_HESK_NEW_VERSION','3.0.0');
 define('REQUIRE_PHP_VERSION','5.3.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 9b07c848..5400cdc9 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -72,6 +72,8 @@ if ($version == 2) {
     execute300Beta1Scripts();
 } elseif ($version == 33) {
     execute300RC1Scripts();
+} elseif ($version == 34) {
+    execute300Scripts();
 } 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 3afdef64..d281cfa8 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -42,6 +42,7 @@ $buildToVersionMap = array(
     31 => '2.6.4',
     32 => '3.0.0 beta 1',
     33 => '3.0.0 RC 1',
+    34 => '3.0.0',
 );
 
 function echoInitialVersionRows($version, $build_to_version_map)
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index bf9650cf..04ca3828 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -95,6 +95,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 33) {
         startVersionUpgrade('300rc1');
         executeUpdate(33, '300rc1', '3.0.0 RC 1');
+    } else if (startingVersion < 34) {
+        startVersionUpgrade('300');
+        executeUpdate(34, '300', '3.0.0');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 0ad942ee..fb3e1656 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -116,9 +116,9 @@ hesk_dbConnect();
                                 <div class="col-md-9">
                                     <div class="col-md-8">
                                         <select name="current-version" class="form-control">
-                                            <optgroup label="Mods for HESK 3 (Pre-release Builds)">
-                                                <option value="33">3.0.0 RC 1</option>
-                                                <option value="32">3.0.0 beta 1</option>
+                                            <optgroup label="Mods for HESK 3">
+                                                <option value="33">3.0.0 RC 1 [Prerelease Build]</option>
+                                                <option value="32">3.0.0 beta 1 [Prerelease Build]</option>
                                             </optgroup>
                                             <optgroup label="Mods for HESK 2">
                                                 <option value="31">2.6.4</option>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 4428cb64..84bf7f7e 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -898,4 +898,11 @@ function execute300RC1Scripts() {
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `autorefresh`");
 
     updateVersion('3.0.0 RC 1');
+}
+
+function execute300Scripts() {
+    global $hesk_settings;
+    hesk_dbConnect();
+
+    updateVersion('3.0.0');
 }
\ No newline at end of file