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 e82a6c6da3c90df4dca689b3d8b730180367758d..8fe248f89f2ce81b67c2560623b669a2a4dcbd20 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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,
@@ -70,10 +70,10 @@ 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`');
+               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,
@@ -82,10 +82,10 @@ 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`');
+               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,
@@ -94,10 +94,10 @@ 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`');
+               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,
@@ -107,10 +107,10 @@ 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`');
+               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,
@@ -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')");
@@ -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'");
 
@@ -237,7 +237,7 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
        case 'modify': // When the extension got modified
                break;
 
-       case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+       case 'test': // For testing purposes
                break;
 
        case 'init': // Do stuff when extension is initialized