Mailer project continued:

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index aed13dad847e43730355748b158739f6682f0e8c..c8899186684ff6c35febd8717c701ba87a000f75 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/24/2003 *
- * ===============                              Last change: 06/30/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/24/2003 *
+ * ===================                          Last change: 06/30/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : frametester.php                                  *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 $mode = 'guest';
@@ -47,7 +46,7 @@ if (isGetRequestElementSet('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(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
 
                // Finally is the entry valid?
@@ -56,12 +55,12 @@ if (isGetRequestElementSet('order')) {
                        list($sub, $url) = SQL_FETCHROW($result);
 
                        // This fixes a white page
-                       setRequestPostElement('url', $url);
+                       setPostRequestElement('url', $url);
 
                        // Mode is member
                        $mode = 'member';
                } else {
-                       // Matching line not found!
+                       // Matching line not found
                        redirectToUrl('modules.php?module=index&amp;what=login');
                }
 
@@ -73,9 +72,9 @@ if (isGetRequestElementSet('order')) {
        }
 } // END - if
 
-if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGetRequestElementSet('frame'))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
        // Default URL is ours
-       $url = getConfig('URL');
+       $url = getUrl();
 
        // Use URL from POST or GET data if set
        if (isPostRequestElementSet('url')) {
@@ -88,7 +87,12 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
 
        // Add missing element
        $frame = '';
-       if (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
+       if (!isFullPage()) {
+               $frame = getRequestElement('frame');
+       } // END - if
+
+       // Switch on 'frame'
+       // @TODO Rewrite this somehow
        switch ($frame) {
                case '':
                        switch ($mode) {
@@ -107,7 +111,7 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
                        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