Fixes for POST setter, template and others

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 5779deb1bf8ca5b422ba05281994a6e2d8a3ae7f..6bf21086fcb7c664995396f67341579e50fdf74a 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -77,20 +77,21 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
        // Default URL is ours
        $url = getConfig('URL');
 
-       // Decode URL if set in GET parameters
-       if (isGetRequestElementSet('url'))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
-
-       // Use URL from POST data if set
-       if (isPostRequestElementSet('url')) $url = postRequestElement('url');
+       // Use URL from POST or GET data if set
+       if (isPostRequestElementSet('url')) {
+               // POST data comes first
+               $url = postRequestElement('url');
+       } elseif (isGetRequestElementSet('url')) {
+               // Then GET data
+               $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
+       }
 
        // Add missing element
        $frame = '';
        if (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
-       switch ($frame)
-       {
+       switch ($frame) {
                case '':
-                       switch ($mode)
-                       {
+                       switch ($mode) {
                                case 'member':
                                        // Build frameset
                                        $content['order'] = bigintval(getRequestElement('order'));
@@ -102,24 +103,25 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
                                        $content['url']   = generateDerefererUrl($url);
                                        loadTemplate('guest_frametester', false, $content);
                                        break;
-                       }
+                       } // END - switch
                        break;
 
-                               case 'test_top':
-                                       loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
-                                       break;
+               case 'test_top':
+                       loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
+                       break;
 
-                               case 'back': // Back buttom
-                                       loadTemplate('member_order_back', false, getRequestElement('order'));
-                                       break;
+               case 'back': // Back buttom
+                       loadTemplate('member_order_back', false, getRequestElement('order'));
+                       break;
 
-                               case 'send': // Send mail away
-                                       loadTemplate('member_order_send', false, getRequestElement('order'));
-                                       break;
-       }
+               case 'send': // Send mail away
+                       loadTemplate('member_order_send', false, getRequestElement('order'));
+                       break;
+       } // END - switch
 } else {
        // Go away...
        redirectToUrl('modules.php?module=login');
 }
-//
+
+// [EOF]
 ?>