Some code beaty applied

[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 207f45b6038c1d8e2639c8023821906ac3dbd894..0852fc1d5be3cafc2a1476a75679c53929790f5d 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -58,63 +58,57 @@ if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('url_id')) || (!is_
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       adminEditEntriesConfirm(
-               postRequestParameter('url_id'),
-               'surfbar_urls',
-               array('url_id', 'url_userid', 'url'),
-               array('bigintval', 'addMemberSelectionBox', ''),
-               array('', array(false, true, true, 'url_userid[]'), ''),
-               false,
-               'url_id',
-               'url_userid',
-               'url_userid'
-       );
+       showEntriesByXmlCallback('admin_edit_show_surfbar_urls');
+
+       // Do not show the list of URLs after this template
        $show = false;
-} elseif (isPostRequestParameterSet('do_edit')) {
+} elseif (isFormSent('do_edit')) {
        // Change data of entries
-       adminEditEntriesConfirm(
-               postRequestParameter('url_id'),
-               'surfbar_urls',
-               array(),
-               array(),
-               array(),
-               true,
-               'url_id',
-               'url_userid',
-               'url_userid'
-       );
-} elseif (isPostRequestParameterSet('delete')) {
+       showEntriesByXmlCallback('admin_edit_do_surfbar_urls');
+} elseif (isFormSent('delete')) {
        // Show entries for deletion
-       adminDeleteEntriesConfirm(
-       postRequestParameter('url_id'),
-               'surfbar_urls',
-               array('url_id', 'url_userid', 'url', 'url_registered'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', ''),
-               array('', '', '', ''),
-               false,
-               'url_id',
-               'url_userid',
-               'url_userid'
-       );
+       showEntriesByXmlCallback('admin_del_show_surfbar_urls');
+
+       // Do not show the list of URLs after this template
        $show = false;
-} elseif (isPostRequestParameterSet('do_delete')) {
+} elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       adminDeleteEntriesConfirm(postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), true, 'url_id');
+       showEntriesByXmlCallback('admin_del_do_surfbar_urls');
 } elseif (isFormSent('lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        adminLockEntriesConfirm(
                postRequestParameter('url_id'),
                'surfbar_urls',
-               array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url',
+                       'url_registered',
+                       'url_status'
+               ),
+               array(
+                       'bigintval',
+                       'generateUserProfileLink',
+                       'generateFrametesterUrl',
+                       '',
+                       'translateSurfbarUrlStatus'
+               ),
+               array(
+                       '',
+                       '',
+                       '',
+                       '',
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
                'url_userid'
        );
+
+       // Do not show the list of URLs after this template
        $show = false;
-} elseif (isPostRequestParameterSet('do_lock')) {
+} elseif (isFormSent('do_lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        adminLockEntriesConfirm(
                postRequestParameter('url_id'),
@@ -122,27 +116,50 @@ if (isFormSent('edit')) {
                array(),
                array(),
                array(),
-               array('url_status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
+               array(
+                       'url_status' => array(
+                               'ACTIVE' => 'LOCKED',
+                               'LOCKED' => 'ACTIVE'
+                       )
+               ),
                true,
                'url_id',
                'url_userid',
                'url_userid'
        );
-} elseif (isPostRequestParameterSet('undelete')) {
+} elseif (isFormSent('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', 'url_status'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url',
+                       'url_registered',
+                       'url_status'
+               ),
+               array(
+                       'bigintval',
+                       'generateUserProfileLink',
+                       'generateFrametesterUrl',
+                       '',
+                       'translateSurfbarUrlStatus'
+               ),
+               array(
+                       '',
+                       '',
+                       '',
+                       '',
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
                'url_userid'
        );
        $show = false;
-} elseif (isPostRequestParameterSet('do_undelete')) {
+} elseif (isFormSent('do_undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        adminUndeleteEntriesConfirm(
                postRequestParameter('url_id'),
@@ -150,7 +167,11 @@ if (isFormSent('edit')) {
                array(),
                array(),
                array(),
-               array('url_status' => array('DELETED' => 'ACTIVE')),
+               array(
+                       'url_status' => array(
+                               'DELETED' => 'ACTIVE'
+                       )
+               ),
                true,
                'url_id',
                'url_userid',
@@ -159,7 +180,10 @@ if (isFormSent('edit')) {
 }
 
 // Show entries?
-if ($show === false) return false;
+if ($show === false) {
+       // No, a form has already been show
+       return false;
+} // END - if
 
 // List all URLs
 $result = SQL_QUERY("SELECT