X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=4b625bc6d6452de83b2b74f16ab0b38e0d44b42c;hp=d480fc3b564fd3fb473637342b62f68b3dbaa2cd;hb=43885129ac24cee5545a8a5ad51e90aa182fdf46;hpb=307a4e11763f0914e73dc756b219356e1c29ab25

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index d480fc3b56..4b625bc6d6 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -79,10 +79,10 @@ case "update": // Update an extension
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'config_newsletter', 'Einstellungen', 'Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";
 		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'newsletter', 'Newsletter-Empfang', 'N', 'Y', 10)";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_charge float(10,2) not null default '5.00'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_until varchar(10) not null default '0'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_timespan varchar(10) not null default '0'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_charge FLOAT(10,2) NOT NULL DEFAULT '5.00'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_receive ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_until VARCHAR(10) NOT NULL DEFAULT '0'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nl_timespan VARCHAR(10) NOT NULL DEFAULT '0'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Vor der eigentlichen Freigabe dieser Erweiterungen habe ich sie versehendlich im Archiv mit auf den Server hochgeladen. Diese Version fügt die bereits angekündigte Funktionalitäten, wie zum Beispiel das Einstellen der Abschaltgebühr.";
@@ -129,7 +129,7 @@ case "update": // Update an extension
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_month char(2) not null default '".date("m", time())."'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_month CHAR(2) NOT NULL DEFAULT '".date("m", time())."'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Nur bei installierter Erweiterung <STRONG>html_mail</STRONG> k&ouml;nnen Sie auch HTML-Mails versenden.";
@@ -151,7 +151,7 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
 	$dummy = LOAD_CONFIG();
-	$_CONFIG = array_merge($_CONFIG, $dummy);
+	$_CONFIG = merge_array($_CONFIG, $dummy);
 	unset($dummy);
 
 	// URL ends which are used to indentify the end of an URL or email link
@@ -172,10 +172,10 @@ default: // Do stuff when extension is loaded
 		'2', '3', '4', '5', '6', '7', '8', '9'
 	);
 
-	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
+	if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
 	{
 		// Daily reset was run so let's check out for expired newsletter orders
-		$INC_POOL[] = PATH."inc/monthly/monthly_newsletter.php";
+		$INC_POOL[] = sprintf("%sinc/monthly/monthly_newsletter.php", PATH);
 	}
 	break;
 }