Fixes for ext-surfbar (the usual asset)

[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 5bc5655ec0c74fa41f79542cdfd6b42856719e24..0cf6e2ab9650351b3ae8b27c2c77e14c4a5244ee 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -49,7 +49,7 @@ addMenuDescription('admin', __FILE__);
 $show = true;
 
 // Check for 'id' element
-if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('id')) || (!is_array(postRequestParameter('id'))) || (count(postRequestParameter('id')) == '0'))) {
+if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('id')) || (!is_array(postRequestParameter('id'))) || (count(postRequestParameter('id')) == 0))) {
        // Not found so output message
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_SELECTIONS'));
 
@@ -58,80 +58,91 @@ if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('id')) || (!is_arra
 } // END - if
 
 // Edit or delete button hit?
-if (isPostRequestParameterSet('edit')) {
+if (isFormSent('edit')) {
        // Show entries for editing
        adminEditEntriesConfirm(
                postRequestParameter('id'),
                'surfbar_urls',
-               array('id', 'userid', 'url'),
+               array('url_id', 'url_userid', 'url'),
                array('bigintval', 'addMemberSelectionBox', ''),
-               array('', array(false, true, true), '')
+               array('', array(false, true, true, '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'
        );
 } elseif (isPostRequestParameterSet('delete')) {
        // Show entries for deletion
        adminDeleteEntriesConfirm(
-       postRequestParameter('id'),
+       postRequestParameter('url_id'),
                'surfbar_urls',
-               array('id', 'userid', 'url', 'registered'),
-               array('bigintval', 'generateUserProfileLink', 'FRAMETESTER', ''),
-               array('', '', '', '')
+               array('url_id', 'url_userid', 'url', 'url_registered'),
+               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', ''),
+               array('', '', '', ''),
+               false,
+               'url_id',
+               '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('bigintval', 'generateUserProfileLink', 'FRAMETESTER', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', '')
+               array('url_id', 'url_userid', 'url', 'url_registered', 'status'),
+               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
+               array('', '', '', '', ''),
+               false,
+               'url_id'
        );
        $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
+               true,
+               'url_id'
        );
 } 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('bigintval', 'generateUserProfileLink', 'FRAMETESTER', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', '')
+               array('url_id', 'url_userid', 'url', 'url_registered', 'status'),
+               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
+               array('', '', '', '', ''),
+               false,
+               'url_id'
        );
        $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
+               true,
+               'url_id'
        );
 }
 
@@ -140,14 +151,14 @@ if ($show === false) return false;
 
 // List all URLs
 $result = SQL_QUERY("SELECT
-       `id`, `userid`, `url`, `views_total`, `status`,
-       UNIX_TIMESTAMP(`registered`) AS registered,
-       UNIX_TIMESTAMP(`last_locked`) AS 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) {
@@ -155,14 +166,10 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        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['status']      = translateSurfbarUrlStatus($content['status']);
-               $content['registered']  = generateDateTime($content['registered'], 2);
-               $content['last_locked'] = generateDateTime($content['last_locked'], 2);
-               if (empty($content['lock_reason'])) $content['lock_reason'] = '---';
+               $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);