Introduced wrapper function addCreateTableSql(), fixed parameter order:

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

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 98be8b9603c3e7ba337df6581c6f2ed356c3d2be..02150fc03bb12d628644784bf0832e02eee99db7 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -75,7 +75,7 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // Main table which hold
                addDropTableSql('network_data');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_data` (
+               addCreateTableSql('network_data', "(
 `network_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_short_name` VARCHAR(50) NOT NULL DEFAULT '',
 `network_title` VARCHAR(255) NOT NULL DEFAULT '',
@@ -92,7 +92,7 @@ PRIMARY KEY (`network_id`)
                // Types the network provider is supporting (e.g. Forced-Banner and so on)
                // @TODO network_type_handle is an internal name and needs documentation
                addDropTableSql('network_types');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_types` (
+               addCreateTableSql('network_types', "(
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_handle` VARCHAR(255) NOT NULL DEFAULT '',
@@ -105,7 +105,7 @@ PRIMARY KEY (`network_type_id`)
 
                // HTTP parameters (names) for URLs
                addDropTableSql('network_request_params');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_request_params` (
+               addCreateTableSql('network_request_params', "(
 `network_param_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -119,7 +119,7 @@ PRIMARY KEY (`network_param_id`)
 
                // Error status codes
                addDropTableSql('network_error_codes');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_error_codes` (
+               addCreateTableSql('network_error_codes', "(
 `network_type_code_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_code_value` VARCHAR(50) NOT NULL DEFAULT '',
@@ -131,7 +131,7 @@ PRIMARY KEY (`network_type_code_id`)
 
                // Code types (internal table)
                addDropTableSql('network_error_types');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_error_types` (
+               addCreateTableSql('network_error_types', "(
 `network_code_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_code` VARCHAR(100) NOT NULL DEFAULT 'INVALID_CODE',
 UNIQUE (`network_code`),
@@ -140,7 +140,7 @@ PRIMARY KEY (`network_code_id`)
 
                // Valid translation keys (we hate hard-coded arrays, you see?)
                addDropTableSql('network_translations');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_translations` (
+               addCreateTableSql('network_translations', "(
 `network_translation_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_translation_name` VARCHAR(100) NOT NULL DEFAULT '',
 UNIQUE (`network_translation_name`),
@@ -149,7 +149,7 @@ PRIMARY KEY (`network_translation_id`)
 
                // Array-Element translation tables per type/provider
                addDropTableSql('network_api_translation');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_api_translation` (
+               addCreateTableSql('network_api_translation', "(
 `network_api_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -162,7 +162,7 @@ PRIMARY KEY (`network_api_id`)
 
                // Data from the webmaster (you!)
                addDropTableSql('network_config');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_config` (
+               addCreateTableSql('network_config', "(
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_affiliate_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_api_password` VARCHAR(255) NOT NULL DEFAULT '',
@@ -176,7 +176,7 @@ PRIMARY KEY (`network_id`)
 
                // Configuration data for e.g. reload-time
                addDropTableSql('network_types_config');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_types_config` (
+               addCreateTableSql('network_types_config', "(
 `network_data_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -193,7 +193,7 @@ PRIMARY KEY (`network_data_id`)
                // `network_cache_refresh` in seconds or if set to zero, full day
                // divided by query amount.
                addDropTableSql('network_cache');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_cache` (
+               addCreateTableSql('network_cache', "(
 `network_cache_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -205,7 +205,7 @@ PRIMARY KEY (`network_cache_id`)
 
                // Reload locks for several types
                addDropTableSql('network_reloads');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_reloads` (
+               addCreateTableSql('network_reloads', "(
 `network_reload_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,