X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=61614407de05757b904729a82fc057d0fa532bff;hp=a6211df68302821dc0f1f4157478d44e827269e2;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hpb=449139831a4780f563410e30d629c39bd1286c82

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index a6211df683..61614407de 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 - 2015 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 *
@@ -47,10 +47,10 @@ setThisExtensionVersion('0.2.0');
 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
+	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 <em>Immer aktiv</em> f&uuml;r diese Erweiterung deaktiviert.');
+				setExtensionUpdateNotes('URL im Versendeformular und Option <span class="bad">Immer aktiv</span> f&uuml;r diese Erweiterung deaktiviert.');
 				break;
 
 			case '0.0.3': // SQL queries for v0.0.3
@@ -143,8 +143,8 @@ switch (getExtensionMode()) {
 				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',
@@ -163,7 +163,7 @@ PRIMARY KEY (`nl_id`)",
 `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,
 PRIMARY KEY (`nl_topic_id`),
 INDEX `newsletter_id` (`nl_id`)",
@@ -179,7 +179,7 @@ INDEX `newsletter_id` (`nl_id`)",
 `nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N',
 PRIMARY KEY (`nl_order_id`),
-UNIQUE `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`),
+UNIQUE INDEX `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`),
 INDEX `topic` (`nl_topic_id`)",
 					'Newsletter orders');
 
@@ -187,8 +187,8 @@ INDEX `topic` (`nl_topic_id`)",
 				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 @@ INDEX `topic` (`nl_topic_id`)",
 		// @TODO Move these into configuration
 		$GLOBALS['url_ends'] = array(
 			' ',
-			"\n",
-			"\r",
+			PHP_EOL,
+			chr(13),
 			')',
 		);
 
@@ -233,7 +233,7 @@ INDEX `topic` (`nl_topic_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