A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / modules / frametester.php

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index e9fe5042261253f9bc8efec937327a3d65e970e7..90437458c439338aba4a06305985ddd63e6eccad 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,7 +46,7 @@ if (isGetRequestParameterSet('order')) {
        // Order number placed, is he also logged in?
        if (isMember()) {
                // Ok, test passed... :)
-               $result = SQL_QUERY_ESC("SELECT `subject`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `subject`,`url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
                        array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
                // Finally is the entry valid?
@@ -62,7 +60,7 @@ if (isGetRequestParameterSet('order')) {
                        // Mode is member
                        $mode = 'member';
                } else {
-                       // Matching line not found!
+                       // Matching line not found
                        redirectToUrl('modules.php?module=index&what=login');
                }
 
@@ -76,7 +74,7 @@ if (isGetRequestParameterSet('order')) {
 
 if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
        // Default URL is ours
-       $url = getConfig('URL');
+       $url = getUrl();
 
        // Use URL from POST or GET data if set
        if (isPostRequestParameterSet('url')) {
@@ -108,7 +106,7 @@ if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (
                        break;
 
                case 'test_top':
-                       loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
+                       displayMessage('{--GUEST_FRAMETESTER_TOP--}');
                        break;
 
                case 'back': // Back buttom