Fixes some HTML errors, shell scripts cleaned up

[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 5204455333db2d0fb79f91a1974a4bd3ef2a90de..d2163ad8f78949237623cc5dbef7a3c51d5646b7 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -58,36 +58,11 @@ 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'),
@@ -100,10 +75,10 @@ if (isFormSent('edit')) {
                'url_userid',
                'url_userid'
        );
-} elseif (isPostRequestParameterSet('delete')) {
+} elseif (isFormSent('delete')) {
        // Show entries for deletion
        adminDeleteEntriesConfirm(
-       postRequestParameter('url_id'),
+               postRequestParameter('url_id'),
                'surfbar_urls',
                array(
                        'url_id',
@@ -128,8 +103,10 @@ if (isFormSent('edit')) {
                'url_userid',
                'url_userid'
        );
+
+       // 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'),
@@ -171,8 +148,10 @@ if (isFormSent('edit')) {
                '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'),
@@ -191,7 +170,7 @@ if (isFormSent('edit')) {
                'url_userid',
                'url_userid'
        );
-} elseif (isPostRequestParameterSet('undelete')) {
+} elseif (isFormSent('undelete')) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        adminUndeleteEntriesConfirm(
                postRequestParameter('url_id'),
@@ -223,7 +202,7 @@ if (isFormSent('edit')) {
                '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'),
@@ -244,7 +223,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