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 e5486dc9c8caa4a856bd9c74fecc1519df5edd00..64e47cab93c626a22c68dae39618856cbbba346e 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * M-XChange v0.2.1                                   Start: 10/10/2008 *
- * ================                             Last change: 10/10/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 10/10/2008 *
+ * ===================                          Last change: 10/10/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_yoomedia_tm.php                        *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software. You can redistribute it and/or modify *
@@ -41,13 +40,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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;
 }
 
@@ -56,13 +55,13 @@ if (isFormSent()) {
        // Prepare mail for delivery
        YOOMEDIA_PREPARE_MAIL_DELIVERY(postRequestArray());
        return;
-} elseif (isPostRequestElementSet('sent')) {
+} elseif (isPostRequestParameterSet('sent')) {
        // Sent mail
        YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isPostRequestElementSet('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Add mail to exclude list
        YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
-} elseif (isPostRequestElementSet('unlist')) {
+} elseif (isPostRequestParameterSet('unlist')) {
        // Remove mail from exclude list
        YOOMEDIA_UNLIST_MAIL(postRequestArray(), 'normal');
 }
@@ -70,7 +69,7 @@ if (isFormSent()) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == '0') {
        // Output message
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
+       displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
        // Abort here!
        return false;
@@ -80,9 +79,9 @@ if (getConfig('yoomedia_requests_remain') == '0') {
 $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 
 // Sanity-check on result array
-if ((!is_array($result)) || (count($result) == '0') || (!isset($result[0]['id']))) {
+if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_INVALID_RESULT'));
+       displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
@@ -94,12 +93,10 @@ if ((!is_array($result)) || (count($result) == '0') || (!isset($result[0]['id'])
 }
 
 // Prepare all entries
-$OUT = ''; $SW = 2;
+$OUT = '';
 foreach ($result as $entry) {
        // Translate some data
        $entry['pay']    = translateComma($entry['pay'], true, 5);
-       $entry['remain'] = translateComma($entry['remain']);
-       $entry['sw']     = $SW;
 
        // Check reload lock
        $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], 'textmail');
@@ -121,10 +118,10 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = sprintf(getMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN'), createFancyTime($countdown));
+                       $entry['already'] = '{%message,ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN=' . $countdown . '%}';
                } else {
                        // Never resentable unless manual removal
-                       $entry['already'] = getMessage('ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED');
+                       $entry['already'] = '{--ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED--}';
                }
 
                // Load row template for displaying
@@ -133,10 +130,7 @@ foreach ($result as $entry) {
                // Load row template with buttons
                $OUT .= loadTemplate('admin_list_yoomedia_tm_row', true, $entry);
        }
-
-       // Switch color
-       $SW = 3 - $SW;
-} // END - if
+} // END - foreach
 
 // Load main template
 loadTemplate('admin_list_yoomedia_tm', false, $OUT);