X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_forced_ads.php;h=498e3d44fef304c694ef4e74e4b37d64fcdc08fa;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=c1e30869e33cd0d81a227fd9e39c5d9a4e3feb4a;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/modules/admin/what-list_forced_ads.php b/inc/modules/admin/what-list_forced_ads.php
index c1e30869e3..498e3d44fe 100644
--- a/inc/modules/admin/what-list_forced_ads.php
+++ b/inc/modules/admin/what-list_forced_ads.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,10 +44,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // By default show the list...
-$show = true;
+$show = TRUE;
 
 // Check for 'url_id' element
-if ((countRequestPost() > 0) && ((!isPostRequestElementSet('forced_ads_id')) || (!is_array(postRequestElement('forced_ads_id'))) || (count(postRequestElement('forced_ads_id')) == 0))) {
+if ((!isFormSent('add')) && (countRequestPost() > 0) && (!ifPostContainsSelections('forced_ads_id'))) {
 	// Not found so output message
 	displayMessage('{--ADMIN_FORCED_ADS_NO_SELECTIONS--}');
 
@@ -58,35 +58,35 @@ if ((countRequestPost() > 0) && ((!isPostRequestElementSet('forced_ads_id')) ||
 // Edit or delete button hit?
 if (isFormSent('add')) {
 	// Add new forced ad
-	showEntriesByXmlCallback('admin_add_do_forced_ads');
+	doGenericXmlTemplateCallback('admin_add_do_forced_ads');
 } elseif (isFormSent('edit')) {
 	// Show entries for editing
-	showEntriesByXmlCallback('admin_edit_show_forced_ads');
+	doGenericXmlTemplateCallback('admin_edit_show_forced_ads');
 
 	// Do not show the list of URLs after this template
-	$show = false;
+	$show = FALSE;
 } elseif (isFormSent('do_edit')) {
 	// Change data of entries
-	showEntriesByXmlCallback('admin_edit_do_forced_ads');
+	doGenericXmlTemplateCallback('admin_edit_do_forced_ads');
 } elseif (isFormSent('delete')) {
 	// Show entries for deletion
-	showEntriesByXmlCallback('admin_delete_show_forced_ads');
+	doGenericXmlTemplateCallback('admin_delete_show_forced_ads');
 
 	// Do not show the list of URLs after this template
-	$show = false;
+	$show = FALSE;
 } elseif (isFormSent('do_delete')) {
 	// Remove entries from database
-	showEntriesByXmlCallback('admin_delete_do_forced_ads');
+	doGenericXmlTemplateCallback('admin_delete_do_forced_ads');
 }
 
 // Show entries?
-if ($show === false) {
+if ($show === FALSE) {
 	// No, a form has already been show
-	return false;
+	return FALSE;
 } // END - if
 
 // List all URLs
-showEntriesByXmlCallback('admin_list_forced_ads');
+doGenericXmlTemplateCallback('admin_list_forced_ads');
 
 // Display form for adding a forced-ad
 loadTemplate('admin_add_forced_ad');