Mailer continued, sub-id tracking continued:

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 6210bd1b7569946b6f201f05c4c114702e24f869..9631fa303389fd3140b56a225a25d46adaed2ed5 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 $mode = 'guest';
@@ -72,7 +72,7 @@ if (isGetRequestElementSet('order')) {
        }
 } // END - if
 
-if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGetRequestElementSet('frame'))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
        // Default URL is ours
        $url = getUrl();
 
@@ -87,19 +87,24 @@ 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) {
                                case 'member':
                                        // Build frameset
                                        $content['order'] = bigintval(getRequestElement('order'));
-                                       $content['url']   = generateDerefererUrl($url);
+                                       $content['url']   = generateDereferrerUrl($url);
                                        loadTemplate('member_order_frametester', false, $content);
                                        break;
 
                                case 'guest':
-                                       $content['url']   = generateDerefererUrl($url);
+                                       $content['url']   = generateDereferrerUrl($url);
                                        loadTemplate('guest_frametester', false, $content);
                                        break;
                        } // END - switch