X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_yoomedia_tm.php;h=925b7b083759edf5ff54f0c439dc2dedf379d9a0;hb=0ff49cce0f61b9ad28162f824e45777eb768a133;hp=c5b3a4d8f9f219682dc662bab29f27de39bb3a2f;hpb=98e388b809fe0f6d5dbe2a02273a11e6816fb333;p=mailer.git

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index c5b3a4d8f9..925b7b0837 100644
--- 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                        *
@@ -17,7 +17,8 @@
  * 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, 2010 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 +37,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 (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('remove')) {
 	// 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'));
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
 
 	// Abort here!
 	return false;
@@ -81,14 +83,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;
 }
 
@@ -106,7 +108,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) {
@@ -120,17 +122,17 @@ foreach ($result as $entry) {
 			} // END - if
 
 			// Add reload lock
-			$entry['already'] = sprintf(getMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN'), createFancyTime($countdown));
+			$entry['already'] = getMaskedMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', createFancyTime($countdown));
 		} else {
 			// Never resentable unless manual removal
 			$entry['already'] = getMessage('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
@@ -138,7 +140,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]
 ?>