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 9631fa303389fd3140b56a225a25d46adaed2ed5..d874566ebd34b09a7225ba1944d87b55b82523d8 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 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -46,13 +46,12 @@ 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(getRequestElement('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
                        setPostRequestElement('url', $url);
@@ -63,9 +62,6 @@ if (isGetRequestElementSet('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');
@@ -100,12 +96,12 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isF
                                        // Build frameset
                                        $content['order'] = bigintval(getRequestElement('order'));
                                        $content['url']   = generateDereferrerUrl($url);
-                                       loadTemplate('member_order_frametester', false, $content);
+                                       loadTemplate('member_order_frametester', FALSE, $content);
                                        break;
 
                                case 'guest':
                                        $content['url']   = generateDereferrerUrl($url);
-                                       loadTemplate('guest_frametester', false, $content);
+                                       loadTemplate('guest_frametester', FALSE, $content);
                                        break;
                        } // END - switch
                        break;
@@ -115,11 +111,11 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isF
                        break;
 
                case 'back': // Back buttom
-                       loadTemplate('member_order_back', false, getRequestElement('order'));
+                       loadTemplate('member_order_back', FALSE, getRequestElement('order'));
                        break;
 
                case 'send': // Send mail away
-                       loadTemplate('member_order_send', false, getRequestElement('order'));
+                       loadTemplate('member_order_send', FALSE, getRequestElement('order'));
                        break;
        } // END - switch
 } else {