A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 aabef21732e367c6f4b07136340aa6ef129ef9e0..ed42872f93d66a158cf7507108ef23831c8e17f1 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -44,7 +44,7 @@ ADD_DESCR("admin", __FILE__);
 $show = true;
 
 // Check for 'id' element
-if ((count($_POST) > 0) && ((!isset($_POST['id'])) || (!is_array($_POST['id'])) || (count($_POST['id']) == 0))) {
+if ((REQUEST_POST_COUNT() > 0) && ((!REQUEST_ISSET_POST(('id'))) || (!is_array(REQUEST_POST('id'))) || (count(REQUEST_POST('id')) == 0))) {
        // Not found so output message
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_SELECTIONS'));
 
@@ -53,53 +53,53 @@ if ((count($_POST) > 0) && ((!isset($_POST['id'])) || (!is_array($_POST['id']))
 }
 
 // Edit or delete button hit?
-if (isset($_POST['edit'])) {
+if (REQUEST_ISSET_POST('edit')) {
        // Show entries for editing
        ADMIN_EDIT_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array("id", "userid", "url"),
                array("bigintval", "ADD_MEMBER_SELECTION_BOX", ""),
                array("", array(false, true, true), "")
        );
        $show = false;
-} elseif (isset($_POST['do_edit'])) {
+} elseif (REQUEST_ISSET_POST(('do_edit'))) {
        // Change data of entries
        ADMIN_EDIT_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array(),
                array(),
                array(),
                true
        );
-} elseif (isset($_POST['delete'])) {
+} elseif (REQUEST_ISSET_POST(('delete'))) {
        // Show entries for deletion
        ADMIN_DELETE_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array("id", "userid", "url", "registered"),
                array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", ""),
                array("", "", "", "")
        );
        $show = false;
-} elseif (isset($_POST['do_delete'])) {
+} elseif (REQUEST_ISSET_POST(('do_delete'))) {
        // Remove entries from database
-       ADMIN_DELETE_ENTRIES_CONFIRM($_POST['id'], "surfbar_urls", array(), array(), array(), true);
-} elseif (isset($_POST['lock'])) {
+       ADMIN_DELETE_ENTRIES_CONFIRM(REQUEST_POST('id'), "surfbar_urls", array(), array(), array(), true);
+} elseif (REQUEST_ISSET_POST(('lock'))) {
        // Un-/lock selected URLs. This does not work for pending URLs
        ADMIN_LOCK_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array("id", "userid", "url", "registered", "status"),
                array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "", "SURFBAR_TRANSLATE_STATUS"),
                array("", "", "", "", "")
        );
        $show = false;
-} elseif (isset($_POST['do_lock'])) {
+} elseif (REQUEST_ISSET_POST(('do_lock'))) {
        // Un-/lock selected URLs. This does not work for pending URLs
        ADMIN_LOCK_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array(),
                array(),
@@ -107,20 +107,20 @@ if (isset($_POST['edit'])) {
                array("status" => array("ACTIVE" => "LOCKED", "LOCKED" => "ACTIVE")),
                true
        );
-} elseif (isset($_POST['undelete'])) {
+} elseif (REQUEST_ISSET_POST(('undelete'))) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        ADMIN_UNDELETE_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array("id", "userid", "url", "registered", "status"),
                array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "", "SURFBAR_TRANSLATE_STATUS"),
                array("", "", "", "", "")
        );
        $show = false;
-} elseif (isset($_POST['do_undelete'])) {
+} elseif (REQUEST_ISSET_POST(('do_undelete'))) {
        // Undelete selected URLs. This does only work for deleted URLs... ;-)
        ADMIN_UNDELETE_ENTRIES_CONFIRM(
-               $_POST['id'],
+               REQUEST_POST('id'),
                "surfbar_urls",
                array(),
                array(),