Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some migrations

Browse Source
This commit is contained in:
Mike Koch 2017-10-16 22:02:04 -04:00
parent cae76032d1
commit d35cf4d358
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/index.php
View File

@ -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>

2
install/js/install-script.js
View File

@ -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);

4
install/migrations/v200/MigrateIpAndEmailBans.php
View File

@ -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']);

2
install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php
View File

@ -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'