Fix for fatal error and naming convention applied

[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 b1bda7a96878ee25845297b496ff90953c684ea5..b8fcf915a440e7ddffff457a742a059f9f6b924c 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -37,13 +37,13 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $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 (!EXT_IS_ACTIVE('yoomedia')) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'yoomedia');
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'yoomedia'));
        return;
 } elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'bonus');
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'bonus'));
        return;
 }
 
@@ -51,7 +51,7 @@ 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;
@@ -91,7 +91,7 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
        $code = $code[0];
 
        // 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 +99,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 +123,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');