Heavy rewrite:

[mailer.git] / inc / modules / admin / what-list_yoomedia_tm.php

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 7dfd145aa6b0e6470ec22bccc856496bf1035e6a..c5b3a4d8f9f219682dc662bab29f27de39bb3a2f 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -40,10 +40,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('yoomedia')) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'yoomedia'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
 } elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'bonus'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
@@ -51,17 +51,17 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Do actions here
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Prepare mail for delivery
        YOOMEDIA_PREPARE_MAIL_DELIVERY(REQUEST_POST_ARRAY());
        return;
-} elseif (REQUEST_ISSET_POST(('sent'))) {
+} elseif (REQUEST_ISSET_POST('sent')) {
        // Sent mail
        YOOMEDIA_SEND_BONUS_MAIL(REQUEST_POST_ARRAY(), 'normal');
 } elseif (REQUEST_ISSET_POST('remove')) {
        // Add mail to exclude list
        YOOMEDIA_EXCLUDE_MAIL(REQUEST_POST_ARRAY(), 'normal');
-} elseif (REQUEST_ISSET_POST(('unlist'))) {
+} elseif (REQUEST_ISSET_POST('unlist')) {
        // Remove mail from exclude list
        YOOMEDIA_UNLIST_MAIL(REQUEST_POST_ARRAY(), 'normal');
 }
@@ -85,13 +85,10 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
-       $code = explode(" ", $result[0]['id']);
-       $code = $code[0];
-       $code = explode("<br />", $code);
-       $code = $code[0];
+       $code = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($result);
 
        // Output message
-       LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(YOOMEDIA_TRANSLATE_ERROR($code))));
+       LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(yoomediaTranslateError($code))));
        return false;
 }
 
@@ -99,8 +96,8 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
 $OUT = ''; $SW = 2;
 foreach ($result as $entry) {
        // Translate some data
-       $entry['pay']    = TRANSLATE_COMMA($entry['pay'], true, 5);
-       $entry['remain'] = TRANSLATE_COMMA($entry['remain']);
+       $entry['pay']    = translateComma($entry['pay'], true, 5);
+       $entry['remain'] = translateComma($entry['remain']);
        $entry['sw']     = $SW;
 
        // Check reload lock
@@ -123,7 +120,7 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = sprintf(getMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN'), CREATE_FANCY_TIME($countdown));
+                       $entry['already'] = sprintf(getMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN'), createFancyTime($countdown));
                } else {
                        // Never resentable unless manual removal
                        $entry['already'] = getMessage('ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED');