Simplified some more code:

[mailer.git] / inc / modules / admin / what-list_surfbar_urls.php

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 0cf6e2ab9650351b3ae8b27c2c77e14c4a5244ee..248d360c8103b02bd6ab4059df9c1b1a4e9f4114 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -48,8 +48,8 @@ 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'));
 
@@ -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'
        );
 }