X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_yoomedia_tm.php;h=64e47cab93c626a22c68dae39618856cbbba346e;hb=101e5f161c0c367c022c9288398226a57f3919d7;hp=617f41263ee7e9f6994c4e1020e76ea9daf643b5;hpb=6d36252268cb1928efaab3862dfb5df8006ef60a;p=mailer.git

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 617f41263e..64e47cab93 100644
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -42,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;
 }
 
@@ -60,7 +58,7 @@ if (isFormSent()) {
 } elseif (isPostRequestParameterSet('sent')) {
 	// Sent mail
 	YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
 	// Add mail to exclude list
 	YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
 } elseif (isPostRequestParameterSet('unlist')) {
@@ -71,7 +69,7 @@ if (isFormSent()) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == '0') {
 	// Output message
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
+	displayMessage('{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
 	// Abort here!
 	return false;
@@ -83,7 +81,7 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 // Sanity-check on result array
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
 	// Invalid result
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
+	displayMessage('{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
 	return false;
 } elseif (count($result[0]) < 7) {
 	// Error received so prepare error code
@@ -95,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');
@@ -122,10 +118,10 @@ 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
@@ -134,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);