Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[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 52ee49a71757c2328c7a18c60db3849332d6c184..83c6ad23ca34995c1515214dbcc4dd6745710398 100644 (file)
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,35 +46,38 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Is the form sent?
-if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) {
+if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) {
        // Unlock selected URLs
-       if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('id'))) {
+       if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('url_id'))) {
                // Unlock done! :-)
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}');
        } else {
                // Unlock failed!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}');
        }
-} elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) {
+} elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) {
        // Reject selected URLs
-       if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('id'))) {
+       if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('url_id'))) {
                // Unlock done! :-)
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}');
        } else {
                // Unlock failed!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}');
        }
 }
 
 // List all URLs
 $result = SQL_QUERY("SELECT
-       `id`, `userid`, `url`, UNIX_TIMESTAMP(`registered`) AS registered
+       `url_id`,
+       `url_userid`,
+       `url`,
+       UNIX_TIMESTAMP(`url_registered`) AS `url_registered`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-       `status`='PENDING'
+       `url_status`='PENDING'
 ORDER BY
-       `id` ASC", __FILE__, __LINE__);
+       `url_id` ASC", __FILE__, __LINE__);
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
@@ -81,10 +85,8 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate"/add content
-               $content['sw']          = $SW;
-               $content['userid']      = generateUserProfileLink($content['userid']);
-               $content['framekiller'] = generateFrametesterUrl($content['url']);
-               $content['registered']  = generateDateTime($content['registered'], 2);
+               $content['sw']             = $SW;
+               $content['url_registered'] = generateDateTime($content['url_registered'], 2);
 
                // Load row template
                $OUT .= loadTemplate('admin_unlock_surfbar_urls_row', true, $content);
@@ -97,7 +99,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_unlock_surfbar_urls', false, $OUT);
 } else {
        // No URLs in surfbar
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URLS_FOUND--}');
 }
 
 // Free result