X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_surfbar_urls.php;h=ed361f788654b74bab658b144cc5579b27412faf;hp=e9964c13cca376b7923a7fb451a2c83201c695fe;hb=29385a0483bbcbbe940a32a49d488b1d5add15c5;hpb=9e3656b7346cd7ba24f241f2e0378b9e4675acd3

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index e9964c13cc..ed361f7886 100644
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -48,90 +48,115 @@ 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;
 } // END - if
 
 // Edit or delete button hit?
-if (isPostRequestParameterSet('edit')) {
+if (isFormSent('edit')) {
 	// Show entries for editing
 	adminEditEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('id', 'userid', 'url'),
+		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')) {
 	// Change data of entries
 	adminEditEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
 		array(),
 		array(),
 		array(),
-		true
+		true,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 } elseif (isPostRequestParameterSet('delete')) {
 	// Show entries for deletion
 	adminDeleteEntriesConfirm(
-	postRequestParameter('id'),
+	postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('id', 'userid', 'url', 'registered'),
+		array('url_id', 'url_userid', 'url', 'url_registered'),
 		array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', ''),
-		array('', '', '', '')
+		array('', '', '', ''),
+		false,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_delete')) {
 	// Remove entries from database
-	adminDeleteEntriesConfirm(postRequestParameter('id'), 'surfbar_urls', array(), array(), array(), true);
-} elseif (isPostRequestParameterSet('lock')) {
+	adminDeleteEntriesConfirm(postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), true, 'url_id');
+} elseif (isFormSent('lock')) {
 	// Un-/lock selected URLs. This does not work for pending URLs
 	adminLockEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('id', 'userid', 'url', 'registered', 'status'),
+		array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
 		array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-		array('', '', '', '', '')
+		array('', '', '', '', ''),
+		false,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_lock')) {
 	// Un-/lock selected URLs. This does not work for pending URLs
 	adminLockEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
 		array(),
 		array(),
 		array(),
-		array('status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
-		true
+		array('url_status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
+		true,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 } elseif (isPostRequestParameterSet('undelete')) {
 	// Undelete selected URLs. This does only work for deleted URLs... ;-)
 	adminUndeleteEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
-		array('id', 'userid', 'url', 'registered', 'status'),
+		array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
 		array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-		array('', '', '', '', '')
+		array('', '', '', '', ''),
+		false,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 	$show = false;
 } elseif (isPostRequestParameterSet('do_undelete')) {
 	// Undelete selected URLs. This does only work for deleted URLs... ;-)
 	adminUndeleteEntriesConfirm(
-		postRequestParameter('id'),
+		postRequestParameter('url_id'),
 		'surfbar_urls',
 		array(),
 		array(),
 		array(),
-		array('status' => array('DELETED' => 'ACTIVE')),
-		true
+		array('url_status' => array('DELETED' => 'ACTIVE')),
+		true,
+		'url_id',
+		'url_userid',
+		'url_userid'
 	);
 }
 
@@ -140,14 +165,14 @@ if ($show === false) return false;
 
 // List all URLs
 $result = SQL_QUERY("SELECT
-	`id`, `userid`, `url`, `views_total`, `status` AS `url_status`,
-	UNIX_TIMESTAMP(`registered`) AS url_registered,
-	UNIX_TIMESTAMP(`last_locked`) AS url_last_locked,
-	`lock_reason`
+	`url_id`, `url_userid`, `url`, `url_views_total`, `url_status`,
+	UNIX_TIMESTAMP(`url_registered`) AS `url_registered`,
+	UNIX_TIMESTAMP(`url_last_locked`) AS `url_last_locked`,
+	`url_lock_reason`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 ORDER BY
-	`id` ASC", __FILE__, __LINE__);
+	`url_id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
@@ -156,13 +181,8 @@ if (SQL_NUMROWS($result) > 0) {
 	while ($content = SQL_FETCHARRAY($result)) {
 		// "Translate"/add content
 		$content['sw']              = $SW;
-		$content['userid']          = generateUserProfileLink($content['userid']);
-		$content['url']             = generateFrametesterUrl($content['url']);
-		$content['views_total']     = translateComma($content['views_total']);
-		$content['url_status']      = translateSurfbarUrlStatus($content['url_status']);
 		$content['url_registered']  = generateDateTime($content['url_registered'], 2);
 		$content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
-		if (empty($content['lock_reason'])) $content['lock_reason'] = '---';
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_surfbar_urls_row', true, $content);
@@ -175,7 +195,7 @@ if (SQL_NUMROWS($result) > 0) {
 	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