Performance hacks, encapsulation and more EL code usage:

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

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 515a053c2517563a9ed390ddf634382d2c71b706..8c94e00c8d00cb0a69e9c8f709cdb42dbd0d7136 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -85,7 +85,7 @@ switch (getExtensionMode()) {
 `network_charset` VARCHAR(20) NOT NULL DEFAULT 'UTF-8',
 UNIQUE (`network_short_name`),
 PRIMARY KEY (`network_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Network data'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Network data'");
 
                // Types the network provider is supporting (e.g. Forced-Banner and so on)
                // @TODO network_type_handle is an internal name and needs documentation
@@ -99,7 +99,7 @@ PRIMARY KEY (`network_id`)
 `network_type_banner_url` VARCHAR(255) NULL DEFAULT NULL,
 UNIQUE `provider_type` (`network_id`,`network_type_handle`),
 PRIMARY KEY (`network_type_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Types provideable by networks'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Types provideable by networks'");
 
                // HTTP parameters (names) for URLs
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_request_params`');
@@ -113,7 +113,7 @@ PRIMARY KEY (`network_type_id`)
 UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
 UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),
 PRIMARY KEY (`network_param_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Request parameters for GET/POST request'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Request parameters for GET/POST request'");
 
                // Error status codes
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_codes`');
@@ -125,7 +125,7 @@ PRIMARY KEY (`network_param_id`)
 UNIQUE `code_type` (`network_type_code_value`,`network_type_id`),
 INDEX (`network_type_id`),
 PRIMARY KEY (`network_type_code_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Error codes for all types'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Error codes for all types'");
 
                // Code types (internal table)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_types`');
@@ -134,7 +134,7 @@ PRIMARY KEY (`network_type_code_id`)
 `network_code` VARCHAR(100) NOT NULL DEFAULT 'INVALID_CODE',
 UNIQUE (`network_code`),
 PRIMARY KEY (`network_code_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Error types, generic data, DO NOT ALTER!'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Error types, generic data, DO NOT ALTER!'");
 
                // Valid translation keys (we hate hard-coded arrays, you see?)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_translations`');
@@ -143,7 +143,7 @@ PRIMARY KEY (`network_code_id`)
 `network_translation_name` VARCHAR(100) NOT NULL DEFAULT '',
 UNIQUE (`network_translation_name`),
 PRIMARY KEY (`network_translation_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Translations for array keys, generic data, DO NOT ALTER!'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Translations for array keys, generic data, DO NOT ALTER!'");
 
                // Array-Element translation tables per type/provider
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_api_translation`');
@@ -156,7 +156,7 @@ PRIMARY KEY (`network_translation_id`)
 UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`network_api_index`),
 INDEX (`sort`),
 PRIMARY KEY (`network_api_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Translation of API responses, generic data, DO NOT ALTER!'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Translation of API responses, generic data, DO NOT ALTER!'");
 
                // Data from the webmaster (you!)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_config`');
@@ -170,7 +170,7 @@ PRIMARY KEY (`network_api_id`)
 UNIQUE `network_affiliate` (`network_id`,`network_affiliate_id`),
 UNIQUE `affiliate_site` (`network_affiliate_id`,`network_site_id`),
 PRIMARY KEY (`network_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Configuration data from the webmaster (you!)'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Configuration data from the webmaster (you!)'");
 
                // Configuration data for e.g. reload-time
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_types_config`');
@@ -185,7 +185,7 @@ PRIMARY KEY (`network_id`)
 `allow_erotic` VARCHAR(10) NOT NULL DEFAULT '',
 UNIQUE `provider_type` (`network_id`,`network_type_id`),
 PRIMARY KEY (`network_data_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Configuration data for every type (e.g. reload-time)'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Configuration data for every type (e.g. reload-time)'");
 
                // Cache for queried APIs. Re-check depends on config
                // `network_cache_refresh` in seconds or if set to zero, full day
@@ -196,10 +196,10 @@ PRIMARY KEY (`network_data_id`)
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_cache_data` MEDIUMBLOB,
-`network_cache_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
+`network_cache_timestamp` TIMESTAMP NULL DEFAULT NULL,
 UNIQUE `provider_type` (`network_id`,`network_type_id`),
 PRIMARY KEY (`network_cache_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Cache for all queried APIs'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Cache for all queried APIs'");
 
                // Reload locks for several types
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_reloads`');
@@ -211,7 +211,7 @@ PRIMARY KEY (`network_cache_id`)
 `network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 UNIQUE `provider_type` (`network_id`,`network_type_id`),
 PRIMARY KEY (`network_reload_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Reload locks'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Reload locks'");
 
                // Insert API response array translations, these will be used for calling the right filter function
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_translations` (`network_translation_name`) VALUES