X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fframetester.php;h=6bf21086fcb7c664995396f67341579e50fdf74a;hb=10492182b811dfcc6279bc43f99c49f847e326a4;hp=5779deb1bf8ca5b422ba05281994a6e2d8a3ae7f;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php index 5779deb1bf..6bf21086fc 100644 --- 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, '