Introduced wrapper function addCreateTableSql(), fixed parameter order:

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

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 66210e5ab31f097b99978ed0dba5cf93be790680..aed01066fb85533b6dbc77e3cd1605ee192da9e0 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.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 *
@@ -59,9 +59,9 @@ switch (getExtensionMode()) {
                // SQL commands to run
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='newsletter'");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='newsletter'");
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_data`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_topics`');
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_orders`');
+               addDropTableSql('newsletter_data');
+               addDropTableSql('newsletter_topics');
+               addDropTableSql('newsletter_orders');
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -139,8 +139,8 @@ switch (getExtensionMode()) {
                        case '0.2.0': // SQL queries for v0.2.0
                                // Tables:
                                // - Main data table
-                               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_data`');
-                               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_newsletter_data` (
+                               addDropTableSql('newsletter_data');
+                               addCreateTableSql('newsletter_data', "(
 `nl_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_subject` VARCHAR(255) NOT NULL DEFAULT '{OPEN_CONFIG}nl_default_subject{CLOSE_CONFIG}',
 `nl_header_text` MEDIUMTEXT,
@@ -158,8 +158,8 @@ PRIMARY KEY (`nl_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'General newsletter data'");
 
                                // - Topics data table
-                               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_topics`');
-                               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_newsletter_topics` (
+                               addDropTableSql('newsletter_topics');
+                               addCreateTableSql('newsletter_topics', "(
 `nl_topic_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_topic_title` VARCHAR(255) NOT NULL DEFAULT '',
@@ -170,8 +170,8 @@ PRIMARY KEY (`nl_topic_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter topics'");
 
                                // - Sponsor orders data table
-                               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_orders`');
-                               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_newsletter_orders` (
+                               addDropTableSql('newsletter_orders');
+                               addCreateTableSql('newsletter_orders', "(
 `nl_order_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_sponsor_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -184,12 +184,12 @@ PRIMARY KEY (`nl_order_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter orders'");
 
                                // Configuration
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_expire` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay() * 7)."");
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_archive_expire` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay() * 14)."");
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_default_subject` VARCHAR(255) NOT NULL DEFAULT 'Newsletter vom {OPEN_CONFIG}CURRENT_DATE{CLOSE_CONFIG}'");
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_default_header` MEDIUMTEXT");
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_default_footer` MEDIUMTEXT");
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_archive` ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+                               addConfigAddSql('nl_expire', "BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay() * 7)."");
+                               addConfigAddSql('nl_archive_expire', "BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay() * 14)."");
+                               addConfigAddSql('nl_default_subject', "VARCHAR(255) NOT NULL DEFAULT 'Newsletter vom {OPEN_CONFIG}CURRENT_DATE{CLOSE_CONFIG}'");
+                               addConfigAddSql('nl_default_header', "MEDIUMTEXT");
+                               addConfigAddSql('nl_default_footer', "MEDIUMTEXT");
+                               addConfigAddSql('nl_archive', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
 
                                // Admin menu
                                addAdminMenuSql('newsletter', 'list_newsletter', 'Newsletter Verwalten', 'Legen Sie hier einen neuen Newsletter mit Betreff und Verfallsdatum an und listen Sie bestehende auf. Die Grunddaten lassen sich hier ebenfalls ändern.', 1);
@@ -209,7 +209,7 @@ PRIMARY KEY (`nl_order_id`)
        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