Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[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 c5b3a4d8f9f219682dc662bab29f27de39bb3a2f..52a639819437be50b8e0009b813adeebcecaa49d 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software. You can redistribute it and/or modify *
@@ -36,40 +36,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__, generateExtensionInactiveNotInstalledMessage('yoomedia'));
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addMenuDescription('admin', __FILE__);
+
+if (!isExtensionActive('yoomedia')) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
-} elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
+} elseif (!isExtensionActive('bonus')) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
-// Add description as navigation point
-ADD_DESCR('admin', __FILE__);
-
 // Do actions here
 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 (isPostRequestElementSet('sent')) {
        // Sent mail
-       YOOMEDIA_SEND_BONUS_MAIL(REQUEST_POST_ARRAY(), 'normal');
-} elseif (REQUEST_ISSET_POST('remove')) {
+       YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
+} elseif (isPostRequestElementSet('remove')) {
        // Add mail to exclude list
-       YOOMEDIA_EXCLUDE_MAIL(REQUEST_POST_ARRAY(), 'normal');
-} elseif (REQUEST_ISSET_POST('unlist')) {
+       YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
+} elseif (isPostRequestElementSet('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) {
        // Output message
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
 
        // Abort here!
        return false;
@@ -81,14 +82,14 @@ $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'));
+       loadTemplate('admin_settings_saved', false, getMessage('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
-       LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(yoomediaTranslateError($code))));
+       loadTemplate('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(translateYooMediaError($code))));
        return false;
 }
 
@@ -127,10 +128,10 @@ foreach ($result as $entry) {
                }
 
                // 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
@@ -138,7 +139,7 @@ foreach ($result as $entry) {
 } // END - if
 
 // Load main template
-LOAD_TEMPLATE('admin_list_yoomedia_tm', false, $OUT);
+loadTemplate('admin_list_yoomedia_tm', false, $OUT);
 
-//
+// [EOF]
 ?>