From 7fe7fa54503593b7d4ffe3c2c74e71a53ad2aa97 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 30 Nov 2016 21:58:24 -0500
Subject: [PATCH] Bump version to 3.0.0 RC 1

---
 install/install_functions.inc.php                    | 4 ++--
 install/mods-for-hesk/ajax/install-database-ajax.php | 2 +-
 install/mods-for-hesk/installModsForHesk.php         | 2 +-
 install/mods-for-hesk/js/version-scripts.js          | 4 ++--
 install/mods-for-hesk/modsForHesk.php                | 7 ++++---
 install/mods-for-hesk/sql/installSql.php             | 6 ++++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 6e8f9f9a..d480b36c 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -36,8 +36,8 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
-define('HESK_NEW_VERSION','2.7.0');
-define('MODS_FOR_HESK_NEW_VERSION','3.0.0');
+define('HESK_NEW_VERSION','2.7.1');
+define('MODS_FOR_HESK_NEW_VERSION','3.0.0 RC 1');
 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 3d20ea77..9b07c848 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -71,7 +71,7 @@ if ($version == 2) {
 } elseif ($version == 32) {
     execute300Beta1Scripts();
 } elseif ($version == 33) {
-    execute300Scripts();
+    execute300RC1Scripts();
 } 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 f4eff9cc..3afdef64 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -41,7 +41,7 @@ $buildToVersionMap = array(
     30 => '2.6.3',
     31 => '2.6.4',
     32 => '3.0.0 beta 1',
-    33 => '3.0.0',
+    33 => '3.0.0 RC 1',
 );
 
 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 210ddbc2..bf9650cf 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -93,8 +93,8 @@ function processUpdates(startingVersion) {
         startVersionUpgrade('300b1');
         executeUpdate(32, '300b1', '3.0.0 beta 1');
     } else if (startingVersion < 33) {
-        startVersionUpgrade('300');
-        executeUpdate(33, '300', '3.0.0');
+        startVersionUpgrade('300rc1');
+        executeUpdate(33, '300rc1', '3.0.0 RC 1');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index c30958d8..0ad942ee 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -111,12 +111,13 @@ hesk_dbConnect();
                         <hr>
                         <div class="row">
                             <form class="form-horizontal">
-                                <input type="hidden" name="current-version" value="<?php echo $version != NULL && $version != MODS_FOR_HESK_NEW_VERSION ? $version : 0; ?>">
+                                <input type="hidden" name="current-version-hidden" value="<?php echo $version != NULL && $version != MODS_FOR_HESK_NEW_VERSION ? $version : 0; ?>">
                                 <label for="current-version" class="col-sm-3 control-label">Current Version</label>
                                 <div class="col-md-9">
                                     <div class="col-md-8">
                                         <select name="current-version" class="form-control">
-                                            <optgroup label="Mods for HESK 3">
+                                            <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>
                                             <optgroup label="Mods for HESK 2">
@@ -217,7 +218,7 @@ if ($disableAllExcept !== NULL) {
     var dropdown = $('select[name="current-version"]');
     dropdown.change(updateLink);
 
-    var currentVersion = $('input[name="current-version"]').val();
+    var currentVersion = $('input[name="current-version-hidden"]').val();
     dropdown.find('option').each(function() {
         var $that = $(this);
 
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index c4eed289..4428cb64 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -891,9 +891,11 @@ function execute300Beta1Scripts() {
     updateVersion('3.0.0 beta 1');
 }
 
-function execute300Scripts() {
+function execute300RC1Scripts() {
     global $hesk_settings;
     hesk_dbConnect();
 
-    updateVersion('3.0.0');
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `autorefresh`");
+
+    updateVersion('3.0.0 RC 1');
 }
\ No newline at end of file