Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / modules / admin / what-unlock_surfbar_urls.php

diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index a01b3c8446aedb0aee7269038e939416083263b4..8ce2a2a8a0d9e8e14dbc40aa38db8c6a4f175712 100644 (file)
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -41,31 +41,31 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Is the form sent?
-if ((isset($_POST['unlock'])) && (is_array($_POST['id'])) && (count($_POST['id']) > 0)) {
+if ((REQUEST_ISSET_POST(('unlock'))) && (is_array(REQUEST_POST('id'))) && (count(REQUEST_POST('id')) > 0)) {
        // Unlock selected URLs
-       if (SURFBAR_ADMIN_UNLOCK_URL_IDS($_POST['id'])) {
+       if (SURFBAR_ADMIN_UNLOCK_URL_IDS(REQUEST_POST('id'))) {
                // Unlock done! :-)
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
        } else {
                // Unlock failed!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
        }
-} elseif ((isset($_POST['reject'])) && (is_array($_POST['id'])) && (count($_POST['id']) > 0)) {
+} elseif ((REQUEST_ISSET_POST(('reject'))) && (is_array(REQUEST_POST('id'))) && (count(REQUEST_POST('id')) > 0)) {
        // Reject selected URLs
-       if (SURFBAR_ADMIN_REJECT_URL_IDS($_POST['id'])) {
+       if (SURFBAR_ADMIN_REJECT_URL_IDS(REQUEST_POST('id'))) {
                // Unlock done! :-)
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
        } else {
                // Unlock failed!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
        }
 }
 
 // List all URLs
 $result = SQL_QUERY("SELECT id, userid, url, UNIX_TIMESTAMP(registered) AS registered
-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
-WHERE status='PENDING'
-ORDER BY id ASC", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
+WHERE `status`='PENDING'
+ORDER BY `id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
@@ -89,7 +89,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_unlock_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