Fixed issue #8238: Image url in email editor don't take publicurl con…

…figuration Dev: fix $_SESSION['KCFINDER']['uploadURL'] for emailsettings Dev: need a function or reviewing configuration system ?
LimeSurvey · Oct 5, 2013 · fd935cd · fd935cd
1 parent 40674fa
commit fd935cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
@@ -37,6 +37,7 @@ function index($iSurveyId)
         Yii::app()->loadHelper('surveytranslator');
 
         Yii::app()->session['FileManagerContext'] = "edit:emailsettings:{$iSurveyId}";
+        initKcfinder();
 
         if(isset($iSurveyId) && getEmailFormat($iSurveyId) == 'html')
         {

diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -43,7 +43,21 @@ function initKcfinder()
                     $_SESSION['KCFINDER']['disabled'] = false;
                     if (preg_match('/^edit:emailsettings/',$_SESSION['FileManagerContext']) != 0)
                     {
-                        $_SESSION['KCFINDER']['uploadURL'] = Yii::app()->getRequest()->getHostInfo().Yii::app()->getConfig('uploadurl')."/surveys/{$surveyid}/";
+                        // Uploadurl use public url or getBaseUrl(true);
+                        // Maybe need external function
+                        $sBaseAbsoluteUrl=Yii::app()->getBaseUrl(true);
+                        $sPublicUrl=Yii::app()->getConfig("publicurl");
+                        $aPublicUrl=parse_url($sPublicUrl);
+                        if(isset($aPublicUrl['scheme']) && isset($aPublicUrl['host']))
+                        {
+                            $sBaseAbsoluteUrl=$sPublicUrl;
+                        }
+                        $sBaseUrl=Yii::app()->getBaseUrl();
+                        $sUploadUrl=Yii::app()->getConfig('uploadurl');
+                        if (substr($sUploadUrl, 0, strlen($sBaseUrl)) == $sBaseUrl) {
+                            $sUploadUrl = substr($sUploadUrl, strlen($sBaseUrl));
+                        }
+                        $_SESSION['KCFINDER']['uploadURL'] = trim($sBaseAbsoluteUrl,"/").$sUploadUrl."/surveys/{$surveyid}/";
                     }
                     else
                     {