Fixed issue 18821: Public url is not used for SURVEYURL (#3229)

* Fixed issue 18821: Public url is not used for SURVEYURL * Fixed issue 18821: Public url is not used for SURVEYURL (moved and renamed function)
LimeSurvey · Jun 23, 2023 · 3c70454 · 3c70454
1 parent bc2bbb9
commit 3c70454
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 18 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -666,4 +666,44 @@ private function setSessionByDB($aApplicationConfig)
             'lifetime' => $lifetime
         ]);
     }
+
+    /**
+     * Creates an absolute URL based on the given controller and action information.
+     * @param string $route the URL route. This should be in the format of 'ControllerID/ActionID'.
+     * @param array $params additional GET parameters (name=>value). Both the name and value will be URL-encoded.
+     * @param string $schema schema to use (e.g. http, https). If empty, the schema used for the current request will be used.
+     * @param string $ampersand the token separating name-value pairs in the URL.
+     * @return string the constructed URL
+     */
+    public function createPublicUrl($route, $params = array(), $schema = '', $ampersand = '&')
+    {
+        $sPublicUrl = $this->getPublicBaseUrl(true);
+        $sActualBaseUrl = Yii::app()->getBaseUrl(true);
+        if ($sPublicUrl !== $sActualBaseUrl) {
+            $url = parent::createAbsoluteUrl($route, $params, $schema, $ampersand);
+            if (substr((string)$url, 0, strlen((string)$sActualBaseUrl)) == $sActualBaseUrl) {
+                $url = substr((string)$url, strlen((string)$sActualBaseUrl));
+            }
+            return trim((string)$sPublicUrl, "/") . $url;
+        } else {
+            return parent::createAbsoluteUrl($route, $params, $schema, $ampersand);
+        }
+    }
+
+    /**
+     * Returns the relative URL for the application while
+     * considering if a "publicurl" config parameter is set to a valid url
+     * @param boolean $absolute whether to return an absolute URL. Defaults to false, meaning returning a relative one.
+     * @return string the relative or the configured public URL for the application
+     */
+    public function getPublicBaseUrl($absolute = false)
+    {
+        $sPublicUrl = Yii::app()->getConfig("publicurl");
+        $aPublicUrl = parse_url($sPublicUrl);
+        $baseUrl = parent::getBaseUrl($absolute);
+        if (isset($aPublicUrl['scheme']) && isset($aPublicUrl['host'])) {
+            $baseUrl = $sPublicUrl;
+        }
+        return $baseUrl;
+    }
 }
diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php
@@ -156,7 +156,9 @@ protected function customInit()
     }
 
     /**
-     * Creates an absolute URL based on the given controller and action information.
+     * Returns an absolute URL based on the given controller and action information.
+     * The functionalty was moved to
+     * \LSYii_Application::createPublicUrl, to be safe the function remains here.
      * @param string $route the URL route. This should be in the format of 'ControllerID/ActionID'.
      * @param array $params additional GET parameters (name=>value). Both the name and value will be URL-encoded.
      * @param string $schema schema to use (e.g. http, https). If empty, the schema used for the current request will be used.
@@ -165,20 +167,7 @@ protected function customInit()
      */
     public function createAbsoluteUrl($route, $params = array(), $schema = '', $ampersand = '&')
     {
-        $sPublicUrl = Yii::app()->getConfig("publicurl");
-        // Control if public url are really public : need scheme and host
-        // If yes: use it
-        $aPublicUrl = parse_url((string) $sPublicUrl);
-        if (isset($aPublicUrl['scheme']) && isset($aPublicUrl['host'])) {
-            $url = parent::createAbsoluteUrl($route, $params, $schema, $ampersand);
-            $sActualBaseUrl = Yii::app()->getBaseUrl(true);
-            if (substr((string) $url, 0, strlen((string) $sActualBaseUrl)) == $sActualBaseUrl) {
-                $url = substr((string) $url, strlen((string) $sActualBaseUrl));
-            }
-            return trim((string) $sPublicUrl, "/") . $url;
-        } else {
-                    return parent::createAbsoluteUrl($route, $params, $schema, $ampersand);
-        }
+        return App()->createPublicUrl($route, $params, $schema, $ampersand);
     }
 
     /**

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -2333,13 +2333,14 @@ public function getSurveyUrl($language = null, $params = [], $preferShortUrl = t
                 }
 
                 // Create the URL according to the configured format
+                $baseUrl = App()->getPublicBaseUrl(true);
                 $urlManager = Yii::app()->getUrlManager();
                 $urlFormat = $urlManager->getUrlFormat();
                 if ($urlFormat == CUrlManager::GET_FORMAT) {
-                    $url = Yii::app()->getBaseUrl(true);
+                    $url = $baseUrl;
                     $params = [$urlManager->routeVar => $alias] + $params;
                 } else {
-                    $url = Yii::app()->getBaseUrl(true) . '/' . $alias;
+                    $url = $baseUrl . '/' . $alias;
                 }
                 $query = $urlManager->createPathInfo($params, '=', '&');
                 if (!empty($query)) {
@@ -2351,7 +2352,8 @@ public function getSurveyUrl($language = null, $params = [], $preferShortUrl = t
 
         // If short url is not preferred or no alias is found, return a traditional URL
         $urlParams = array_merge($params, ['sid' => $this->sid, 'lang' => $language]);
-        $url = Yii::app()->createAbsoluteUrl('survey/index', $urlParams);
+        $url = App()->createPublicUrl('survey/index', $urlParams);
+
         return $url;
     }