From d35cf4d35800845bbd91490ae6d3de69949092a1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 16 Oct 2017 22:02:04 -0400
Subject: [PATCH] Fix some migrations

---
 install/index.php                                             | 2 +-
 install/js/install-script.js                                  | 2 +-
 install/migrations/v200/MigrateIpAndEmailBans.php             | 4 ++--
 .../migrations/v230/MovePermissionsToHeskPrivilegesColumn.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install/index.php b/install/index.php
index 599dc49a..5be220f7 100644
--- a/install/index.php
+++ b/install/index.php
@@ -139,7 +139,7 @@ if (hesk_dbNumRows($tableSql) > 0) {
                     </div>
                 </div>
                 <br>
-                <div id="error-block" class="well" style="font-family: 'Courier New', Courier, monospace">
+                <div id="error-block" class="well" style="display: none; font-family: 'Courier New', Courier, monospace">
                 </div>
                 <input type="hidden" name="starting-migration-number" value="<?php echo $startingMigrationNumber; ?>">
             </div>
diff --git a/install/js/install-script.js b/install/js/install-script.js
index ae58bc7a..8bf51617 100644
--- a/install/js/install-script.js
+++ b/install/js/install-script.js
@@ -119,7 +119,7 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) {
             } catch (e) {
                 message = response.responseText;
             }
-            $('#error-block').html("An error occurred! (Error Code: " + migrationNumber + ")<br>" + message).show();
+            $('#error-block').html("<br><br>An error occurred! (Error Code: " + migrationNumber + ")<br>" + message).show();
 
             updateProgressBar(migrationNumber, latestMigrationNumber, true, false);
 
diff --git a/install/migrations/v200/MigrateIpAndEmailBans.php b/install/migrations/v200/MigrateIpAndEmailBans.php
index 5d2f1534..604b370a 100644
--- a/install/migrations/v200/MigrateIpAndEmailBans.php
+++ b/install/migrations/v200/MigrateIpAndEmailBans.php
@@ -7,14 +7,14 @@ class MigrateIpAndEmailBans extends \AbstractMigration {
 
     function up($hesk_settings) {
         // Insert the email bans
-        $emailBanRS = executeQuery("SELECT `Email` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_emails`");
+        $emailBanRS = $this->executeQuery("SELECT `Email` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_emails`");
         while ($row = hesk_dbFetchAssoc($emailBanRS)) {
             $this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "banned_emails` (`email`, `banned_by`, `dt`)
                 VALUES ('" . hesk_dbEscape($row['Email']) . "', 1, NOW())");
         }
 
         // Insert the IP bans
-        $ipBanRS = executeQuery("SELECT `RangeStart`, `RangeEnd` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips`");
+        $ipBanRS = $this->executeQuery("SELECT `RangeStart`, `RangeEnd` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips`");
         while ($row = hesk_dbFetchAssoc($ipBanRS)) {
             $ipFrom = long2ip($row['RangeStart']);
             $ipTo = long2ip($row['RangeEnd']);
diff --git a/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php b/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php
index 9ace4515..f4a5a5b4 100644
--- a/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php
+++ b/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php
@@ -44,7 +44,7 @@ class MovePermissionsToHeskPrivilegesColumn extends \AbstractMigration {
         $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` ADD COLUMN `can_manage_settings` ENUM ('0', '1') NOT NULL DEFAULT '1'");
 
         $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` 
-            SET `can_change_settings` = '0'
+            SET `can_manage_settings` = '0'
             WHERE `heskprivileges` NOT LIKE '%can_man_settings%'");
         $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`
             SET `can_change_notification_settings` = '0'