X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-newsletter.php;h=2e5f885cad2c60de359be6cd8d0a8fdc5582b37f;hb=a954ccdf4aba81ec0e75a1836aa4bc14cb245aba;hp=9ffe320c879db84f6d242443c46a9844a738ed1f;hpb=ae80e170b5d25a4782af90a7c3d81fbb176fa293;p=mailer.git

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index 9ffe320c87..2e5f885cad 100644
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -32,52 +32,47 @@
  ************************************************************************/
 
 // 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);
-}
- elseif (!IS_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
+} elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN())) {
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Load status
-$result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // Remember charge value
-define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['nl_charge']));
+define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('nl_charge')));
 
 if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 {
 	// Save request
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET nl_timespan='".(ONE_DAY * 30)."' WHERE userid=%s LIMIT 1",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
+		array($GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Load admin message
-	$admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", "", $GLOBALS['userid']);
+	$admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);
 
 	// Add task
-	$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)
-VALUES ('0', 'NEW', 'NL_UNSUBSCRIBE', '".ADMIN_NL_SUBJECT."', '".addslashes($admin_msg)."', UNIX_TIMESTAMP(), '%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
+	SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
+VALUES ('0','NEW','NL_UNSUBSCRIBE','{!ADMIN_NL_SUBJECT!}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Send mail to member
-	$msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", "", $GLOBALS['userid']);
+	$msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']);
 	SEND_EMAIL($GLOBALS['userid'], NL_MEMBER_SUBJECT, $msg);
 
 	// Send mail to all admins
-	SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", "", $GLOBALS['userid']);
+	SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", array(), $GLOBALS['userid']);
 
 	// Display message
 	LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_DONE);
@@ -95,13 +90,13 @@ VALUES ('0', 'NEW', 'NL_UNSUBSCRIBE', '".ADMIN_NL_SUBJECT."', '".addslashes($adm
 	// Set status message and submit button
 	switch ($status)
 	{
-	case 'Y': // Receives the newsletter
+	case "Y": // Receives the newsletter
 		define('__STATUS_VALUE', NL_MEMBER_ON);
 		define('__UNTIL_VALUE', "");
 		define('NL_SUBMIT', NL_MEMBER_SUBMIT_OFF);
 		break;
 
-	case 'N': // Does not receive the newsletter
+	case "N": // Does not receive the newsletter
 		define('__STATUS_VALUE', NL_MEMBER_OFF);
 		define('__UNTIL_VALUE', MAKE_DATETIME($until, "2"));
 		define('NL_SUBMIT', NL_MEMBER_SUBMIT_ON);