X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=5729ed7cfba93727005c255ce478fd5411bc4c24;hb=b8e38719844932afed4b1ac23755a4c05b72eb99;hp=f6d3d50513a7b6d705e420346402eec5faf7fbb2;hpb=9725980ca9c052e5c1a9edb8b815e8506b876448;p=mailer.git

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index f6d3d50513..5729ed7cfb 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -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,7 +139,7 @@ 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`');
+				addDropTableSql('newsletter_data');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_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}',
@@ -158,7 +158,7 @@ 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`');
+				addDropTableSql('newsletter_topics');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_newsletter_topics` (
 `nl_topic_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -170,7 +170,7 @@ 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`');
+				addDropTableSql('newsletter_orders');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_newsletter_orders` (
 `nl_order_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_sponsor_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);