X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_yoomedia_tm.php;h=47f708b9f6eef302f8f8cbbc94be5465c9c84975;hb=d1d5f7046b3f8132679c2c14754e1fc4707d6baa;hp=58d120c46bd399503b5649e26865940b92a65431;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 58d120c46b..47f708b9f6 100644
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -60,7 +60,7 @@ if (isFormSent()) {
 } elseif (isPostRequestParameterSet('sent')) {
 	// Sent mail
 	YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isPostRequestParameterSet('remove')) {
+} elseif (isFormSent('remove')) {
 	// Add mail to exclude list
 	YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
 } elseif (isPostRequestParameterSet('unlist')) {
@@ -71,7 +71,7 @@ if (isFormSent()) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == '0') {
 	// Output message
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}');
 
 	// Abort here!
 	return false;
@@ -81,9 +81,9 @@ if (getConfig('yoomedia_requests_remain') == '0') {
 $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 
 // Sanity-check on result array
-if ((!is_array($result)) || (count($result) == '0') || (!isset($result[0]['id']))) {
+if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
 	// Invalid result
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_INVALID_RESULT'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_INVALID_RESULT--}');
 	return false;
 } elseif (count($result[0]) < 7) {
 	// Error received so prepare error code
@@ -95,12 +95,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');
@@ -125,7 +123,7 @@ foreach ($result as $entry) {
 			$entry['already'] = getMaskedMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', createFancyTime($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 +132,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);