Way more usage of EL code:

[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 e8e39f1787a1cb61de4e618bd87686921e408aea..64e47cab93c626a22c68dae39618856cbbba346e 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -43,10 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('yoomedia')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('yoomedia'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
 } elseif (!isExtensionActive('bonus')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
@@ -58,7 +58,7 @@ if (isFormSent()) {
 } elseif (isPostRequestParameterSet('sent')) {
        // Sent mail
        YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Add mail to exclude list
        YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
 } elseif (isPostRequestParameterSet('unlist')) {
@@ -69,7 +69,7 @@ if (isFormSent()) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == '0') {
        // Output message
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
+       displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
        // Abort here!
        return false;
@@ -81,7 +81,7 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 // Sanity-check on result array
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
+       displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
@@ -118,7 +118,7 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = getMaskedMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', $countdown);
+                       $entry['already'] = '{%message,ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN=' . $countdown . '%}';
                } else {
                        // Never resentable unless manual removal
                        $entry['already'] = '{--ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED--}';