A lot has been rewritten, ext-teams added, ext-forced continued:

[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 d7e2c5244ff94a06e07fe9ff99ac51aae939aebe..5f4b295e5d41378ec9cf3d1ec3b673d644858cc9 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -42,13 +42,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('yoomedia')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia'));
+if (!isExtensionActive('bonus')) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
        return;
-} elseif (!isExtensionActive('bonus')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
-       return;
-}
+} // END - if
 
 // Do actions here
 if (isFormSent()) {
@@ -58,7 +55,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')) {
@@ -118,7 +115,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--}';