Improved url detection for redirects

diff --git a/src/App.php b/src/App.php
index 845560a4d676df27d4d3548eb8d1b88b1123bd15..9af56680e0869e15c62a15003fdb2b232cc835d9 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1880,7 +1880,7 @@ class App
         */
        public function internalRedirect($toUrl = '', $ssl = false)
        {
-               if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
+               if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
                        throw new InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo");
                }
 
@@ -1897,7 +1897,7 @@ class App
         */
        public function redirect($toUrl)
        {
-               if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
+               if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
                        Core\System::externalRedirect($toUrl);
                } else {
                        $this->internalRedirect($toUrl);

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index ecfe18e596b528b3587af7be1ae9b06b7201663a..694af23208fb025d3b74266272def9ab560748bf 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -43,7 +43,7 @@ class Magic extends BaseModule
                }
 
                if (!$cid) {
-                       Logger::log('No contact record found: ' . print_r($_REQUEST, true), Logger::DEBUG);
+                       Logger::log('No contact record found: ' . json_encode($_REQUEST), Logger::DEBUG);
                        // @TODO Finding a more elegant possibility to redirect to either internal or external URL
                        $a->redirect($dest);
                }