X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=1ff4ca2acdcee39febeb8ef5ce41780f26d67cb9;hp=aed01066fb85533b6dbc77e3cd1605ee192da9e0;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=be39a7fb887473487fd2c5f8d550aa03b720cb73
diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index aed01066fb..1ff4ca2acd 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -43,14 +43,14 @@ if (!defined('__SECURITY')) {
// Version number
setThisExtensionVersion('0.2.0');
-// Version history array (add more with , '0.1.0' and so on)
-setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.2.0'));
+// Version history array (add more with , '0.0.1' and so on)
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.2.0'));
// This extension is in development (non-productive)
-enableExtensionProductive(false);
+enableExtensionProductive(FALSE);
switch (getExtensionMode()) {
- case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+ case 'setup': // Do stuff when installation is running
// SQL commands to run
addExtensionSql('');
break;
@@ -75,7 +75,7 @@ switch (getExtensionMode()) {
case '0.0.1': // SQL queries for v0.0.1
addAdminMenuSql('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, usw.', 3);
addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN ('newsletter','config_newsletter') LIMIT 1");
- addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `nl_receive` ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+ addExtensionAddTableColumnSql('user_data', 'nl_receive', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
// Update notes (these will be set as task text!)
setExtensionUpdateNotes('Menüpunkte hinzufügen und Mitgliedereinstellung.');
@@ -83,7 +83,7 @@ switch (getExtensionMode()) {
case '0.0.2': // SQL queries for v0.0.2
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes('URL im Versendeformular und Option Immer aktiv für diese Erweiterung deaktiviert.');
+ setExtensionUpdateNotes('URL im Versendeformular und Option Immer aktiv für diese Erweiterung deaktiviert.');
break;
case '0.0.3': // SQL queries for v0.0.3
@@ -140,11 +140,11 @@ switch (getExtensionMode()) {
// Tables:
// - Main data table
addDropTableSql('newsletter_data');
- addCreateTableSql('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,
-`nl_footer_text` MEDIUMTEXT,
+`nl_header_text` MEDIUMTEXT NOT NULL,
+`nl_footer_text` MEDIUMTEXT NOT NULL,
`nl_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
`nl_send` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
`nl_ready` ENUM('Y','N') NOT NULL DEFAULT 'N',
@@ -154,41 +154,41 @@ switch (getExtensionMode()) {
`nl_recipients` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
`nl_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
`nl_total_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-PRIMARY KEY (`nl_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'General newsletter data'");
+PRIMARY KEY (`nl_id`)",
+ 'General newsletter data');
// - Topics data table
addDropTableSql('newsletter_topics');
- addCreateTableSql('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 '',
-`nl_topic_text` MEDIUMTEXT,
+`nl_topic_text` MEDIUMTEXT NOT NULL,
`nl_topic_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-INDEX `newsletter_id` (`nl_id`),
-PRIMARY KEY (`nl_topic_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter topics'");
+PRIMARY KEY (`nl_topic_id`),
+INDEX `newsletter_id` (`nl_id`)",
+ 'Newsletter topics');
// - Sponsor orders data table
addDropTableSql('newsletter_orders');
- addCreateTableSql('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,
`nl_topic_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
`nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
`nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N',
-UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`),
-INDEX `topic` (`nl_topic_id`),
-PRIMARY KEY (`nl_order_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter orders'");
+PRIMARY KEY (`nl_order_id`),
+UNIQUE INDEX `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`),
+INDEX `topic` (`nl_topic_id`)",
+ 'Newsletter orders');
// Configuration
- 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_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_default_header', 'MEDIUMTEXT NOT NULL,');
+ addConfigAddSql('nl_default_footer', 'MEDIUMTEXT NOT NULL,');
addConfigAddSql('nl_archive', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
// Admin menu
@@ -218,8 +218,8 @@ PRIMARY KEY (`nl_order_id`)
// @TODO Move these into configuration
$GLOBALS['url_ends'] = array(
' ',
- "\n",
- "\r",
+ PHP_EOL,
+ chr(13),
')',
);
@@ -233,7 +233,7 @@ PRIMARY KEY (`nl_order_id`)
break;
default: // Unknown extension mode
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+ reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
break;
} // END - switch