X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=3cc7ef5ef35301eefbbf47261299017ed61d079c;hb=f89ab3d6301df13ebaf61a079d86a7f5047df915;hp=c86dcc749ed96e4d9b08323a9d6123770a76b81b;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index c86dcc749e..3cc7ef5ef3 100644
--- 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 *
@@ -50,7 +50,7 @@ setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0
 enableExtensionProductive(false);
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+	case 'register': // Do stuff when installation is running
 		// SQL commands to run
 		addExtensionSql('');
 		break;
@@ -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,
@@ -155,11 +155,11 @@ switch (getExtensionMode()) {
 `nl_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_total_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`nl_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='General newsletter data'");
+) 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 '',
@@ -167,11 +167,11 @@ PRIMARY KEY (`nl_id`)
 `nl_topic_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 INDEX `newsletter_id` (`nl_id`),
 PRIMARY KEY (`nl_topic_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Newsletter topics'");
+) 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,
@@ -181,15 +181,15 @@ PRIMARY KEY (`nl_topic_id`)
 UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`),
 INDEX `topic` (`nl_topic_id`),
 PRIMARY KEY (`nl_order_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Newsletter orders'");
+) 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 ".(getConfig('ONE_DAY') * 7)."");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_archive_expire` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY') * 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