Merge pull request #8036 from nupplaphil/task/redundant_system_call

[friendica.git] / src / App / BaseURL.php

diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index 9d9a2711e9530e4ab12d40294ecc86fa6052989f..6b79fad4662e6c0c88ad6bb18d457c79ad033e16 100644 (file)
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -2,9 +2,11 @@
 
 namespace Friendica\App;
 
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Config\IConfiguration;
+use Friendica\Core\System;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
+use Friendica\Network\HTTPException;
 
 /**
  * A class which checks and contains the basic
@@ -35,7 +37,7 @@ class BaseURL
        /**
         * The Friendica Config
         *
-        * @var Configuration
+        * @var IConfiguration
         */
        private $config;
 
@@ -251,10 +253,10 @@ class BaseURL
        }
 
        /**
-        * @param Configuration $config The Friendica configuration
+        * @param IConfiguration $config The Friendica IConfiguration
         * @param array         $server The $_SERVER array
         */
-       public function __construct(Configuration $config, array $server)
+       public function __construct(IConfiguration $config, array $server)
        {
                $this->config = $config;
                $this->server = $server;
@@ -339,10 +341,10 @@ class BaseURL
                 * Not all of those $_SERVER properties can be present, so we do by inverse priority order
                 */
                $relative_script_path =
-                       ($this->server['REDIRECT_URL']        ?? '' ) ?:
-                       ($this->server['REDIRECT_URI']        ?? '' ) ?:
-                       ($this->server['REDIRECT_SCRIPT_URL'] ?? '' ) ?:
-                       ($this->server['SCRIPT_URL']          ?? '' ) ?:
+                       ($this->server['REDIRECT_URL']        ?? '') ?:
+                       ($this->server['REDIRECT_URI']        ?? '') ?:
+                       ($this->server['REDIRECT_SCRIPT_URL'] ?? '') ?:
+                       ($this->server['SCRIPT_URL']          ?? '') ?:
                         $this->server['REQUEST_URI']         ?? '';
 
                /* $relative_script_path gives /relative/path/to/friendica/module/parameter
@@ -414,4 +416,31 @@ class BaseURL
                        return $url;
                }
        }
+
+       /**
+        * Redirects to another module relative to the current Friendica base URL.
+        * If you want to redirect to a external URL, use System::externalRedirectTo()
+        *
+        * @param string $toUrl The destination URL (Default is empty, which is the default page of the Friendica node)
+        * @param bool   $ssl   if true, base URL will try to get called with https:// (works just for relative paths)
+        *
+        * @throws HTTPException\InternalServerErrorException In Case the given URL is not relative to the Friendica node
+        */
+       public function redirect($toUrl = '', $ssl = false)
+       {
+               if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
+                       throw new HTTPException\InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo");
+               }
+
+               $redirectTo = $this->get($ssl) . '/' . ltrim($toUrl, '/');
+               System::externalRedirect($redirectTo);
+       }
+
+       /**
+        * Returns the base url as string
+        */
+       public function __toString()
+       {
+               return $this->get();
+       }
 }