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 b1bda7a96878ee25845297b496ff90953c684ea5..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 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -36,40 +35,41 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $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');
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+if (!isExtensionActive('yoomedia')) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
-} elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'bonus');
+} elseif (!isExtensionActive('bonus')) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
-// Add description as navigation point
-ADD_DESCR('admin', __FILE__);
-
 // Do actions here
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Prepare mail for delivery
-       YOOMEDIA_PREPARE_MAIL_DELIVERY(REQUEST_POST_ARRAY());
+       YOOMEDIA_PREPARE_MAIL_DELIVERY(postRequestArray());
        return;
-} elseif (REQUEST_ISSET_POST(('sent'))) {
+} elseif (isPostRequestParameterSet('sent')) {
        // Sent mail
-       YOOMEDIA_SEND_BONUS_MAIL(REQUEST_POST_ARRAY(), 'normal');
-} elseif (REQUEST_ISSET_POST('remove')) {
+       YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
+} elseif (isFormSent('do_delete')) {
        // Add mail to exclude list
-       YOOMEDIA_EXCLUDE_MAIL(REQUEST_POST_ARRAY(), 'normal');
-} elseif (REQUEST_ISSET_POST(('unlist'))) {
+       YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
+} elseif (isPostRequestParameterSet('unlist')) {
        // Remove mail from exclude list
-       YOOMEDIA_UNLIST_MAIL(REQUEST_POST_ARRAY(), 'normal');
+       YOOMEDIA_UNLIST_MAIL(postRequestArray(), 'normal');
 }
 
 // Enougth queries left?
-if (getConfig('yoomedia_requests_remain') == 0) {
+if (getConfig('yoomedia_requests_remain') == '0') {
        // Output message
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
+       displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
        // Abort here!
        return false;
@@ -81,27 +81,22 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 // Sanity-check on result array
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
-       LOAD_TEMPLATE('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
-       $code = explode(" ", $result[0]['id']);
-       $code = $code[0];
-       $code = explode("<br />", $code);
-       $code = $code[0];
+       $code = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($result);
 
        // Output message
-       LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(YOOMEDIA_TRANSLATE_ERROR($code))));
+       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']    = TRANSLATE_COMMA($entry['pay'], true, 5);
-       $entry['remain'] = TRANSLATE_COMMA($entry['remain']);
-       $entry['sw']     = $SW;
+       $entry['pay']    = translateComma($entry['pay'], true, 5);
 
        // Check reload lock
        $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], 'textmail');
@@ -109,7 +104,7 @@ foreach ($result as $entry) {
        // Is this mail already sent?
        if ($reload !== false) {
                // Init countdown
-               $countdown = 0;
+               $countdown = '0';
 
                // Not manually locked?
                if ($reload > 0) {
@@ -123,25 +118,22 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = sprintf(getMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN'), CREATE_FANCY_TIME($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 .= LOAD_TEMPLATE('admin_list_yoomedia_tm_already', true, $entry);
+               $OUT .= loadTemplate('admin_list_yoomedia_tm_already', true, $entry);
        } else {
                // Load row template with buttons
-               $OUT .= LOAD_TEMPLATE('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
-LOAD_TEMPLATE('admin_list_yoomedia_tm', false, $OUT);
+loadTemplate('admin_list_yoomedia_tm', false, $OUT);
 
-//
+// [EOF]
 ?>