Performance hacks, encapsulation and more EL code usage:

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

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 1e4f5313d1d73e6d1bcb2e761c61ad5e0deb3353..cf4e7037bb565a4478c0b01fba2213ec0eab0b7c 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -70,7 +70,7 @@ switch (getExtensionMode()) {
 PRIMARY KEY (`url_id`),
 UNIQUE KEY `userid_url` (`url_userid`,`url`),
 INDEX `status_userid` (`url_status`,`url_userid`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar URLs'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar URLs'");
 
                // Reload locks
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_locks`');
@@ -82,7 +82,7 @@ INDEX `status_userid` (`url_status`,`url_userid`)
 PRIMARY KEY (`locks_id`),
 UNIQUE KEY `userid_url` (`locks_userid`,`locks_url_id`),
 INDEX (`locks_url_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar reload locks'");
+) 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`');
@@ -94,7 +94,7 @@ INDEX (`locks_url_id`)
 PRIMARY KEY (`salts_id`),
 UNIQUE KEY `salts_userid_url` (`salts_userid`,`salts_url_id`),
 INDEX (`salts_url_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar last used salts'");
+) 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`');
@@ -107,7 +107,7 @@ INDEX (`salts_url_id`)
 PRIMARY KEY (`stats_id`),
 UNIQUE KEY `userid_url` (`stats_userid`,`stats_url_id`),
 INDEX (`stats_url_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar Statistics'");
+) 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`');
@@ -118,7 +118,7 @@ INDEX (`stats_url_id`)
 `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 PRIMARY KEY (`actions_id`),
 UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar Member Actions'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Member Actions'");
 
                // Member actions
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','RETREAT','DELETED')");
@@ -162,8 +162,8 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_weekly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_monthly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_stats_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 30");
-               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*7)."");
-               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*3)."");
+               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay()*7)."");
+               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay()*3)."");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_pause_mode` ENUM('INTERNAL','EXERNAL') NOT NULL DEFAULT 'INTERNAL'");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_pause_url` VARCHAR(255) NOT NULL DEFAULT ''");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `surfbar_notify_limits` ENUM('Y','N') NOT NULL DEFAULT 'Y'");
@@ -194,7 +194,7 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
                addAdminMenuSql('surfbar','list_surfbar_actions','Mitgliederaktionen','Listet alle Mitgliederaktionen auf.',6);
 
                // Register module
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`mem_only`) VALUES('surfbar','Y','Y','N','N')");
+               addModuleSql('surfbar','Y','Y','N','N');
                break;
 
        case 'remove': // Do stuff when removing extension