X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_surfbar_urls.php;h=ba8a6daa2fdf8ae59646e55cbd4b4671ae99f7c5;hb=5c4d360166de238420eec3e5f4e694befb09ab5d;hp=5204455333db2d0fb79f91a1974a4bd3ef2a90de;hpb=5cbe0f6707ac473dc2ba431236bc4a6e2600a699;p=mailer.git

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 5204455333..ba8a6daa2f 100644
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -49,7 +49,7 @@ $show = true;
 // Check for 'url_id' element
 if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('url_id')) || (!is_array(postRequestParameter('url_id'))) || (count(postRequestParameter('url_id')) == 0))) {
 	// Not found so output message
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_SELECTIONS--}');
+	displayMessage('{--ADMIN_SURFBAR_NO_SELECTIONS--}');
 
 	// Abort here
 	return;
@@ -58,88 +58,22 @@ if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('url_id')) || (!is_
 // Edit or delete button hit?
 if (isFormSent('edit')) {
 	// Show entries for editing
-	adminEditEntriesConfirm(
-		postRequestParameter('url_id'),
-		'surfbar_urls',
-		array(
-			'url_id',
-			'url_userid',
-			'url'
-		),
-		array(
-			'bigintval',
-			'addMemberSelectionBox',
-			''
-		),
-		array(
-			'',
-			array(
-				false,
-				true,
-				true,
-				'url_userid[]'
-			),
-			''
-		),
-		false,
-		'url_id',
-		'url_userid',
-		'url_userid'
-	);
+	showEntriesByXmlCallback('admin_edit_show_surfbar_urls');
+
+	// Do not show the list of URLs after this template
 	$show = false;
-} elseif (isPostRequestParameterSet('do_edit')) {
+} elseif (isFormSent('do_edit')) {
 	// Change data of entries
-	adminEditEntriesConfirm(
-		postRequestParameter('url_id'),
-		'surfbar_urls',
-		array(),
-		array(),
-		array(),
-		true,
-		'url_id',
-		'url_userid',
-		'url_userid'
-	);
-} elseif (isPostRequestParameterSet('delete')) {
+	showEntriesByXmlCallback('admin_edit_do_surfbar_urls');
+} elseif (isFormSent('delete')) {
 	// Show entries for deletion
-	adminDeleteEntriesConfirm(
-	postRequestParameter('url_id'),
-		'surfbar_urls',
-		array(
-			'url_id',
-			'url_userid',
-			'url',
-			'url_registered'
-		),
-		array(
-			'bigintval',
-			'generateUserProfileLink',
-			'generateFrametesterUrl',
-			''
-		),
-		array(
-			'',
-			'',
-			'',
-			''
-		),
-		false,
-		'url_id',
-		'url_userid',
-		'url_userid'
-	);
+	showEntriesByXmlCallback('admin_del_show_surfbar_urls');
+
+	// Do not show the list of URLs after this template
 	$show = false;
-} elseif (isPostRequestParameterSet('do_delete')) {
+} elseif (isFormSent('do_delete')) {
 	// Remove entries from database
-	adminDeleteEntriesConfirm(
-		postRequestParameter('url_id'),
-		'surfbar_urls',
-		array(),
-		array(),
-		array(),
-		true,
-		'url_id'
-	);
+	showEntriesByXmlCallback('admin_del_do_surfbar_urls');
 } elseif (isFormSent('lock')) {
 	// Un-/lock selected URLs. This does not work for pending URLs
 	adminLockEntriesConfirm(
@@ -171,8 +105,10 @@ if (isFormSent('edit')) {
 		'url_userid',
 		'url_userid'
 	);
+
+	// Do not show the list of URLs after this template
 	$show = false;
-} elseif (isPostRequestParameterSet('do_lock')) {
+} elseif (isFormSent('do_lock')) {
 	// Un-/lock selected URLs. This does not work for pending URLs
 	adminLockEntriesConfirm(
 		postRequestParameter('url_id'),
@@ -191,7 +127,7 @@ if (isFormSent('edit')) {
 		'url_userid',
 		'url_userid'
 	);
-} elseif (isPostRequestParameterSet('undelete')) {
+} elseif (isFormSent('undelete')) {
 	// Undelete selected URLs. This does only work for deleted URLs... ;-)
 	adminUndeleteEntriesConfirm(
 		postRequestParameter('url_id'),
@@ -223,7 +159,7 @@ if (isFormSent('edit')) {
 		'url_userid'
 	);
 	$show = false;
-} elseif (isPostRequestParameterSet('do_undelete')) {
+} elseif (isFormSent('do_undelete')) {
 	// Undelete selected URLs. This does only work for deleted URLs... ;-)
 	adminUndeleteEntriesConfirm(
 		postRequestParameter('url_id'),
@@ -244,7 +180,10 @@ if (isFormSent('edit')) {
 }
 
 // Show entries?
-if ($show === false) return false;
+if ($show === false) {
+	// No, a form has already been show
+	return false;
+} // END - if
 
 // List all URLs
 $result = SQL_QUERY("SELECT
@@ -274,7 +213,7 @@ if (!SQL_HASZERONUMS($result)) {
 	loadTemplate('admin_list_surfbar_urls', false, $OUT);
 } else {
 	// No URLs in surfbar
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URLS_FOUND--}');
+	displayMessage('{--ADMIN_SURFBAR_NO_URLS_FOUND--}');
 }
 
 // Free result