New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / modules / member / what-newsletter.php

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index 2e5f885cad2c60de359be6cd8d0a8fdc5582b37f..5cac3962b529e4b53346fc740078936b61a6b5c9 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  :                                                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,79 +38,75 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('newsletter')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'newsletter'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __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",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // Remember charge value
-define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('nl_charge')));
+define('__CHARGE_VALUE', translateComma(getConfig('nl_charge')));
 
-if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
-{
+if ((IS_FORM_SENT()) && ($status == 'Y') && ($span == '0')) {
        // Save request
        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__);
+               array(getUserId()), __FILE__, __LINE__);
 
        // Load admin message
-       $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);
+       $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), getUserId());
 
        // Add task
        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__);
+VALUES ('0','NEW','NL_UNSUBSCRIBE','{--ADMIN_NL_SUBJECT--}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array(getUserId()), __FILE__, __LINE__);
 
        // Send mail to member
-       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']);
-       SEND_EMAIL($GLOBALS['userid'], NL_MEMBER_SUBJECT, $msg);
+       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), getUserId());
+       sendEmail(getUserId(), getMessage('NL_MEMBER_SUBJECT'), $msg);
 
        // Send mail to all admins
-       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", array(), $GLOBALS['userid']);
+       sendAdminNotification(getMessage('NL_ADMIN_SUBJECT'), "admin_newsletter_request", array(), getUserId());
 
        // Display message
-       LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_DONE);
-}
- elseif ($span > 0)
-{
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_DONE'));
+} elseif ($span > 0) {
        // Already ordered
-       LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_ALREADY);
-}
- else
-{
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_ALREADY'));
+} else {
        // Load template for the note
        define('NL_MEMBER_NOTE', LOAD_TEMPLATE("member_newsletter_note", true));
 
        // Set status message and submit button
        switch ($status)
        {
-       case "Y": // Receives the newsletter
-               define('__STATUS_VALUE', NL_MEMBER_ON);
-               define('__UNTIL_VALUE', "");
-               define('NL_SUBMIT', NL_MEMBER_SUBMIT_OFF);
+       case 'Y': // Receives the newsletter
+               define('__STATUS_VALUE', getMessage('NL_MEMBER_ON'));
+               define('__UNTIL_VALUE' , '');
+               define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_OFF'));
                break;
 
-       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);
+       case 'N': // Does not receive the newsletter
+               define('__STATUS_VALUE', getMessage('NL_MEMBER_OFF'));
+               define('__UNTIL_VALUE' , generateDateTime($until, "2"));
+               define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_ON'));
                break;
        }
 
        // Load template and member settings
        LOAD_TEMPLATE("member_newsletter");
 }
+
 //
 ?>