X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_surfbar_urls.php;h=d8ab24966601ecc66870e0d9ce93aa56fe6aa2ce;hb=22f132c8d6314f76c69dff58ec0dac21f5ca3bf2;hp=0cf6e2ab9650351b3ae8b27c2c77e14c4a5244ee;hpb=98e932344cf1462454f0a875a25fed3d1df4f812;p=mailer.git

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 0cf6e2ab96..d8ab249666 100644
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -48,10 +48,10 @@ addMenuDescription('admin', __FILE__);
 // By default show the list...
 $show = true;
 
-// Check for 'id' element
-if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('id')) || (!is_array(postRequestParameter('id'))) || (count(postRequestParameter('id')) == 0))) {
+// 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, getMessage('ADMIN_SURFBAR_NO_SELECTIONS'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_SELECTIONS--}');
 
 	// Abort here
 	return;
@@ -61,11 +61,15 @@ if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('id')) || (!is_arra
 if (isFormSent('edit')) {
 	// Show entries for editing
 	adminEditEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
 		array('url_id', 'url_userid', 'url'),
 		array('bigintval', 'addMemberSelectionBox', ''),
-		array('', array(false, true, true, 'userid[]'), '')
+		array('', array(false, true, true, 'url_userid[]'), ''),
+		false,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_edit')) {
@@ -77,7 +81,9 @@ if (isFormSent('edit')) {
 		array(),
 		array(),
 		true,
-		'url_id'
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 } elseif (isPostRequestParameterSet('delete')) {
 	// Show entries for deletion
@@ -89,7 +95,7 @@ if (isFormSent('edit')) {
 		array('', '', '', ''),
 		false,
 		'url_id',
-		'userid',
+		'url_userid',
 		'url_userid'
 	);
 	$show = false;
@@ -101,11 +107,13 @@ if (isFormSent('edit')) {
 	adminLockEntriesConfirm(
 		postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('url_id', 'url_userid', 'url', 'url_registered', 'status'),
+		array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
 		array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
 		array('', '', '', '', ''),
 		false,
-		'url_id'
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_lock')) {
@@ -116,20 +124,24 @@ if (isFormSent('edit')) {
 		array(),
 		array(),
 		array(),
-		array('status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
+		array('url_status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
 		true,
-		'url_id'
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 } elseif (isPostRequestParameterSet('undelete')) {
 	// Undelete selected URLs. This does only work for deleted URLs... ;-)
 	adminUndeleteEntriesConfirm(
 		postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('url_id', 'url_userid', 'url', 'url_registered', 'status'),
+		array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
 		array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
 		array('', '', '', '', ''),
 		false,
-		'url_id'
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_undelete')) {
@@ -140,9 +152,11 @@ if (isFormSent('edit')) {
 		array(),
 		array(),
 		array(),
-		array('status' => array('DELETED' => 'ACTIVE')),
+		array('url_status' => array('DELETED' => 'ACTIVE')),
 		true,
-		'url_id'
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 }
 
@@ -161,28 +175,23 @@ ORDER BY
 	`url_id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all URLs
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// "Translate"/add content
-		$content['sw']              = $SW;
 		$content['url_registered']  = generateDateTime($content['url_registered'], 2);
 		$content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
-		if (empty($content['url_lock_reason'])) $content['url_lock_reason'] = '---';
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_surfbar_urls_row', true, $content);
-
-		// Switch color
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Load main template
 	loadTemplate('admin_list_surfbar_urls', false, $OUT);
 } else {
 	// No URLs in surfbar
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URLS_FOUND--}');
 }
 
 // Free result