X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=5d741c6ce53484faa951971ff3d814a288002293;hp=0a3f6ce971bfd21165fffd456af7e395884af0c3;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hpb=3299d3eba008bfd2450d0f19d072126f98c78e1e

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 0a3f6ce971..5d741c6ce5 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -49,40 +48,40 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.
 
 switch ($EXT_LOAD_MODE)
 {
-case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
 	// SQL commands to run
 	$SQLs[] = "";
 	break;
 
 case "remove": // Do stuff when removing extension
 	// SQL commands to run
-	$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='newsletter' AND what != 'send_newsletter' LIMIT 3";
-	$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='newsletter' LIMIT 1";
+	$SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='newsletter' AND what != 'send_newsletter' LIMIT 3";
+	$SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='newsletter' LIMIT 1";
 	break;
 
 case "activate": // Do stuff when admin activates this extension
 	// SQL commands to run
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET locked='N', visible='Y' WHERE what='newsletter' LIMIT 1";
+	$SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `locked`='N', `visible`='Y' WHERE `what`='newsletter' LIMIT 1";
 	break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
 	// SQL commands to run
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET locked='Y', visible='N' WHERE what='newsletter' LIMIT 1";
+	$SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `locked`='Y', `visible`='N' WHERE `what`='newsletter' LIMIT 1";
 	break;
 
 case "update": // Update an extension
 	switch ($EXT_VER)
 	{
 	case "0.0.1": // SQL queries for v0.0.1
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', '', 'Newsletter', 'Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'list_newsletter', 'Abbestellungen', 'Alle Abbestellungen auflisten und bearbeiten.', 2)";
-		$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[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
+		$SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)";
+		$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) UNSIGNED 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.";
@@ -90,12 +89,12 @@ case "update": // Update an extension
 
 	case "0.0.2": // SQL queries for v0.0.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "URL im Versendeformular und Option <I>Immer aktiv</I> f&uuml;r diese Erweiterung deaktiviert.";
+		$UPDATE_NOTES = "URL im Versendeformular und Option <em>Immer aktiv</em> f&uuml;r diese Erweiterung deaktiviert.";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.0.4": // SQL queries for v0.0.4
@@ -115,7 +114,7 @@ case "update": // Update an extension
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Script <STRONG>inc/monthly/monthly_newsletter.php</STRONG> wird nicht mehr ausgef&uuml;hrt, wenn die Erweiterung nicht aktiviert ist.";
+		$UPDATE_NOTES = "Script <strong>inc/monthly/monthly_newsletter.php</strong> wird nicht mehr ausgef&uuml;hrt, wenn die Erweiterung nicht aktiviert ist.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
@@ -125,21 +124,18 @@ case "update": // Update an extension
 
 	case "0.0.9": // SQL queries for v0.0.9
 		// 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.";
+		$UPDATE_NOTES = "Nur bei installierter Erweiterung <strong>html_mail</strong> k&ouml;nnen Sie auch HTML-Mails versenden.";
 		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())."'";
-
 		// 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.";
+		$UPDATE_NOTES = "Nur bei installierter Erweiterung <strong>html_mail</strong> k&ouml;nnen Sie auch HTML-Mails versenden.";
 		break;
 
 	case "0.1.1": // SQL queries for v0.1.1
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config DROP nl_currency";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <A href=\"".SERVER_URL."/extensions/ext-other.zip\"><STRONG>ext-other.zip</STRONG></A> verlagert. Bitte auch diese aktualisieren.";
+		$UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <a href=\"#\"><strong>ext-other.zip</strong></a> verlagert. Bitte auch diese aktualisieren.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
@@ -149,15 +145,14 @@ case "update": // Update an extension
 	}
 	break;
 
-default: // Do stuff when extension is loaded
-	$dummy = LOAD_CONFIG();
-	$_CONFIG = array_merge($_CONFIG, $dummy);
-	unset($dummy);
+case "test": // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+	break;
 
+default: // Do stuff when extension is loaded
 	// URL ends which are used to indentify the end of an URL or email link
 	// Don't use these chars in links... ;-)
 	//
-	$URL_ENDS = array(
+	$GLOBALS['url_ends'] = array(
 		" ",
 		"\n",
 		"\r",
@@ -165,26 +160,19 @@ default: // Do stuff when extension is loaded
 	);
 
 	// Valid email chars (without @, or do you want to have another @ inside your email addy?)
-	$VALID_EMAIL_CHARS = array(
-		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
-		't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
-		'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',	'-', '.', '_', '0', '1',
-		'2', '3', '4', '5', '6', '7', '8', '9'
+	$GLOBALS['valid_email_chars'] = array(
+		'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s',
+		't','u','v','w','x','y','z','a','B','C','D','E','F','G','H','I','J','K','L',
+		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1',
+		'2','3','4','5','6','7','8','9'
 	);
 
-	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
-	{
+	if (isBooleanConstantAndTrue('__DAILY_RESET') && (!isBooleanConstantAndTrue('DEBUG_MODE')) && ($GLOBALS['output_mode'] != 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", constant('PATH'));
 	}
 	break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "newsletter";
-
-// Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
-
 //
 ?>