ApplicationState::detectServerURL : add parameter to skip admin confi…

…g (= external url) and only use "internal" url.
pydio · Aug 30, 2016 · 4a055dd · 4a055dd
1 parent 8fcaf96
commit 4a055dd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/core/src/pydio/Core/Utils/ApplicationState.php b/core/src/core/src/pydio/Core/Utils/ApplicationState.php
@@ -100,14 +100,15 @@ public static function getTravelPath($from, $to)
 
     /**
      * Build the current server URL
-     * @param bool $withURI
+     * @param bool $withURI Wether to return the "path" part in scheme://host[/path]
+     * @param bool $forceInternal Wether to force server local IP detection, or to use external URL if it is set in the configuration
      * @static
      * @return string
      */
-    public static function detectServerURL($withURI = false)
+    public static function detectServerURL($withURI = false, $forceInternal = false)
     {
         $setUrl = ConfService::getGlobalConf("SERVER_URL");
-        if (!empty($setUrl)) {
+        if (!empty($setUrl) && !$forceInternal) {
             return (string)$setUrl;
         }
         if (php_sapi_name() == "cli") {