Fixes for stripped HTML tags, and false warnings in debug log

[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 4221cf2fa08f2917681e3deeff158b4b2abce15d..6f9c4379c9acef2c5e25132e369b798e456f1257 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -43,54 +43,63 @@ ADD_DESCR("admin", __FILE__);
 // By default show the list...
 $show = true;
 
+// Check for 'id' element
+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'));
+
+       // Abort here
+       return;
+}
+
 // 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", "reward", "costs"),
-               array("bigintval", "ADD_MEMBER_SELECTION_BOX", "", "TRANSLATE_COMMA", "TRANSLATE_COMMA"),
-               array("", array(false, true, true), "", "", "")
+               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", "MAKE_DATETIME"),
-               array("", "", "", "2")
+               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", "MAKE_DATETIME", "SURFBAR_TRANSLATE_STATUS"),
-               array("", "", "", "2", "")
+               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(),
@@ -98,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", "MAKE_DATETIME", "SURFBAR_TRANSLATE_STATUS"),
-               array("", "", "", "2", "")
+               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(),
@@ -126,8 +135,8 @@ if (!$show) 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
-FROM "._MYSQL_PREFIX."_surfbar_urls
-ORDER BY id ASC", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
+ORDER BY `id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
@@ -155,7 +164,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_list_surfbar_urls", false, $OUT);
 } else {
        // No URLs in surfbar
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_URLS_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND'));
 }
 
 // Free result