Rewrote some parts:

[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 41aa282d7ff4ed4e0f90ddd70221198291020a77..37f07a08d6ba79a0e4a4a31ccd16547ea53e363d 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -14,12 +14,10 @@
  * $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, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software. You can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,28 +40,25 @@ 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'));
+if (!isExtensionActive('bonus')) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
        return;
-} elseif (!isExtensionActive('bonus')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
-       return;
-}
+} // END - if
 
 // Do actions here
 if (isFormSent()) {
        // Prepare mail for delivery
        YOOMEDIA_PREPARE_MAIL_DELIVERY(postRequestArray());
        return;
-} elseif (isPostRequestParameterSet('sent')) {
+} elseif (isPostRequestElementSet('send')) {
        // Sent mail
        YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isPostRequestParameterSet('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Add mail to exclude list
        YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
-} elseif (isPostRequestParameterSet('unlist')) {
+} elseif (isPostRequestElementSet('unlist')) {
        // Remove mail from exclude list
        YOOMEDIA_UNLIST_MAIL(postRequestArray(), 'normal');
 }
@@ -71,42 +66,40 @@ 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;
+       return FALSE;
 } // END - if
 
 // Get parsed array back
 $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 
 // Sanity-check on result array
-if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
+if ((!isFilledArray($result)) || (!isset($result[0]['id']))) {
        // Invalid result
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_INVALID_RESULT'));
-       return false;
+       displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
+       return FALSE;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
        $code = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($result);
 
        // Output message
-       loadTemplate('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(translateYooMediaError($code))));
-       return false;
+       loadTemplate('admin_yoomedia_error', FALSE, sprintf('{--ADMIN_YOOMEDIA_ERROR_%s--}', strtoupper(translateYooMediaError($code))));
+       return FALSE;
 }
 
 // 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;
+       $entry['pay']    = translateComma($entry['pay'], TRUE, 5);
 
        // Check reload lock
        $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], 'textmail');
 
        // Is this mail already sent?
-       if ($reload !== false) {
+       if ($reload !== FALSE) {
                // Init countdown
                $countdown = '0';
 
@@ -122,25 +115,22 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = getMaskedMessage('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
-               $OUT .= loadTemplate('admin_list_yoomedia_tm_already', true, $entry);
+               $OUT .= loadTemplate('admin_list_yoomedia_tm_already', TRUE, $entry);
        } else {
                // Load row template with buttons
-               $OUT .= loadTemplate('admin_list_yoomedia_tm_row', true, $entry);
+               $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);
+loadTemplate('admin_list_yoomedia_tm', FALSE, $OUT);
 
 // [EOF]
 ?>