Added update_year.sh (still not fully flexible) and updated all years with it.

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index a31c49f5c7b66d6b2a2fff70c4329489e05d19f4..d874566ebd34b09a7225ba1944d87b55b82523d8 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -37,25 +37,24 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 $mode = 'guest';
 
-if (isGetRequestParameterSet('order')) {
+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",
-                       array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+               $content = getPoolDataFromId(getRequestElement('order'));
 
                // Finally is the entry valid?
-               if (SQL_NUMROWS($result) == 1) {
+               if ((isFilledArray($content)) && ($content['data_type'] == 'TEMP')) {
                        // Load subject and URL (but forwhat do we need the subject line here???
-                       list($sub, $url) = SQL_FETCHROW($result);
+                       list($url) = sqlFetchRow($result);
 
                        // This fixes a white page
-                       setPostRequestParameter('url', $url);
+                       setPostRequestElement('url', $url);
 
                        // Mode is member
                        $mode = 'member';
@@ -63,44 +62,46 @@ if (isGetRequestParameterSet('order')) {
                        // Matching line not found
                        redirectToUrl('modules.php?module=index&what=login');
                }
-
-               // Free memory
-               SQL_FREERESULT($result);
        } else {
                // He is no longer logged in
                redirectToUrl('modules.php?module=index&what=login');
        }
 } // END - if
 
-if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
        // Default URL is ours
        $url = getUrl();
 
        // Use URL from POST or GET data if set
-       if (isPostRequestParameterSet('url')) {
+       if (isPostRequestElementSet('url')) {
                // POST data comes first
-               $url = postRequestParameter('url');
-       } elseif (isGetRequestParameterSet('url')) {
+               $url = postRequestElement('url');
+       } elseif (isGetRequestElementSet('url')) {
                // Then GET data
-               $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestParameter('url')))));
+               $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
        }
 
        // Add missing element
        $frame = '';
-       if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('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(getRequestParameter('order'));
-                                       $content['url']   = generateDerefererUrl($url);
-                                       loadTemplate('member_order_frametester', false, $content);
+                                       $content['order'] = bigintval(getRequestElement('order'));
+                                       $content['url']   = generateDereferrerUrl($url);
+                                       loadTemplate('member_order_frametester', FALSE, $content);
                                        break;
 
                                case 'guest':
-                                       $content['url']   = generateDerefererUrl($url);
-                                       loadTemplate('guest_frametester', false, $content);
+                                       $content['url']   = generateDereferrerUrl($url);
+                                       loadTemplate('guest_frametester', FALSE, $content);
                                        break;
                        } // END - switch
                        break;
@@ -110,11 +111,11 @@ if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (
                        break;
 
                case 'back': // Back buttom
-                       loadTemplate('member_order_back', false, getRequestParameter('order'));
+                       loadTemplate('member_order_back', FALSE, getRequestElement('order'));
                        break;
 
                case 'send': // Send mail away
-                       loadTemplate('member_order_send', false, getRequestParameter('order'));
+                       loadTemplate('member_order_send', FALSE, getRequestElement('order'));
                        break;
        } // END - switch
 } else {