Dev: fixed an issue with path based LimeSurvey

LimeSurvey · Jan 10, 2020 · d8a5845 · d8a5845
1 parent ab0a1df
commit d8a5845
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php
@@ -375,15 +375,19 @@ public function downloadFiles() {
         $arrayOfFiles = array_map( function($file){ return $file['path']; }, $files);
         $archive = new PclZip($zipfile);
         $checkFileCreate = $archive->create($arrayOfFiles, PCLZIP_OPT_REMOVE_ALL_PATH);
+        $urlFormat = Yii::app()->getUrlManager()->getUrlFormat();
+        $getFileLink = Yii::app()->createUrl('admin/filemanager/sa/getZipFile');
+        if($urlFormat == 'path') {
+            $getFileLink .= '?path='.$zipfile;
+        } else {
+            $getFileLink .= '&path='.$zipfile;
+        }
 
         $this->_printJsonResponse(
             [
                 'success' => true,
                 'message' => sprintf(gT("Files ready for download in archive %s."), $randomizedFileName),
-                'downloadLink' => Yii::app()->createUrl(
-                    'admin/filemanager/sa/getZipFile',
-                    ['path' => $zipfile]
-                ),
+                'downloadLink' => $getFileLink ,
             ]
         );
     }