New wrapper functions introduced, some one-line parameter monsters killed:

[mailer.git] / inc / extensions / ext-surfbar.php

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 2a1a4ec972422cd9d828a204bb96bfda9e6ca5f5..8fe248f89f2ce81b67c2560623b669a2a4dcbd20 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -52,7 +52,7 @@ enableExtensionProductive(false);
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run (surfbar URLs)
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_urls`');
+               addDropTableSql('surfbar_urls');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_surfbar_urls` (
 `url_id` BIGINT(20) UNSIGNED  NOT NULL AUTO_INCREMENT,
 `url_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
@@ -73,7 +73,7 @@ INDEX `status_userid` (`url_status`,`url_userid`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar URLs'");
 
                // Reload locks
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_locks`');
+               addDropTableSql('surfbar_locks');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_surfbar_locks` (
 `locks_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `locks_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
@@ -85,7 +85,7 @@ INDEX (`locks_url_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar reload locks'");
 
                // Surfbar salts
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_salts`');
+               addDropTableSql('surfbar_salts');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_surfbar_salts` (
 `salts_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `salts_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
@@ -97,7 +97,7 @@ INDEX (`salts_url_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar last used salts'");
 
                // Statistics
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_stats`');
+               addDropTableSql('surfbar_stats');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_surfbar_stats` (
 `stats_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `stats_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -110,7 +110,7 @@ INDEX (`stats_url_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Statistics'");
 
                // Member actions pending on status
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_actions`');
+               addDropTableSql('surfbar_actions');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_surfbar_actions` (
 `actions_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `actions_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
@@ -199,11 +199,11 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
 
        case 'remove': // Do stuff when removing extension
                // SQL commands to run
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_actions`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_locks`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_salts`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_stats`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_urls`');
+               addDropTableSql('surfbar_actions');
+               addDropTableSql('surfbar_locks');
+               addDropTableSql('surfbar_salts');
+               addDropTableSql('surfbar_stats');
+               addDropTableSql('surfbar_urls');
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='surfbar'");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='surfbar'");