X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_surfbar_urls.php;h=885a27c960974b25571b3386079d2b4819531854;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hp=32a6624c27812debad57480315085b2b0f619554;hpb=1473fe9de9fe73856ab7fde98f5b74ee655e2104;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index 32a6624c27..885a27c960 100644
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -46,59 +46,56 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Is the form sent?
-if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) {
+if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) {
 	// Unlock selected URLs
-	if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('id'))) {
+	if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('url_id'))) {
 		// Unlock done! :-)
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}');
 	} else {
 		// Unlock failed!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}');
 	}
-} elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) {
+} elseif ((isPostRequestParameterSet('reject')) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) {
 	// Reject selected URLs
-	if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('id'))) {
+	if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('url_id'))) {
 		// Unlock done! :-)
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}');
 	} else {
 		// Unlock failed!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}');
 	}
 }
 
 // List all URLs
 $result = SQL_QUERY("SELECT
-	`id`, `userid`, `url`, UNIX_TIMESTAMP(`registered`) AS url_registered
+	`url_id`,
+	`url_userid`,
+	`url`,
+	UNIX_TIMESTAMP(`url_registered`) AS `url_registered`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-	`status`='PENDING'
+	`url_status`='PENDING'
 ORDER BY
-	`id` ASC", __FILE__, __LINE__);
+	`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['userid']         = generateUserProfileLink($content['userid']);
-		$content['framekiller']    = generateFrametesterUrl($content['url']);
 		$content['url_registered'] = generateDateTime($content['url_registered'], 2);
 
 		// Load row template
 		$OUT .= loadTemplate('admin_unlock_surfbar_urls_row', true, $content);
-
-		// Switch color
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Load main template
 	loadTemplate('admin_unlock_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