More rewrites to make use of (cached) wrapper functions

[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 9afddf7f6a692df3454abfd5ed497f27076c7f40..d8ab24966601ecc66870e0d9ce93aa56fe6aa2ce 100644 (file)
--- 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'
        );
 }
 
@@ -150,32 +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_userid']      = generateUserProfileLink($content['url_userid']);
-               $content['url']             = generateFrametesterUrl($content['url']);
-               $content['views_total']     = translateComma($content['url_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);
-
-               // 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