From dae6e63dc11a33979c705c28b3868bfba1ee434c Mon Sep 17 00:00:00 2001
From: Olle Harstedt <olleharstedt@yahoo.com>
Date: Wed, 25 Mar 2020 13:58:48 +0100
Subject: [PATCH 1/3] Dev: Add missing docblocks

---
 .../admin/LimeSurveyFileManager.php            | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php
index 38fe1a76519..61c82e9b4cf 100644
--- a/application/controllers/admin/LimeSurveyFileManager.php
+++ b/application/controllers/admin/LimeSurveyFileManager.php
@@ -168,6 +168,11 @@ public function getFolderList($iSurveyId = null)
         $this->printJsonResponse($aAllowedFolders);
     }
 
+    /**
+     * Delete file.
+     *
+     * @return void
+     */
     public function deleteFile()
     {
         $iSurveyId = Yii::app()->request->getPost('surveyid');
@@ -206,6 +211,11 @@ public function deleteFile()
         );
     }
 
+    /**
+     * Move file(s)
+     *
+     * @return void
+     */
     public function transitFiles()
     {
         $folder = Yii::app()->request->getPost('targetFolder');
@@ -215,7 +225,7 @@ public function transitFiles()
 
         $checkDirectory = $this->checkFolder($folder, $iSurveyId);
         
-        foreach($files as $file) {
+        foreach ($files as $file) {
             $this->checkChangedFilename($file);
 
             $realTargetPath = dirname(Yii::app()->basePath) . DIRECTORY_SEPARATOR . $folder;
@@ -256,8 +266,6 @@ public function transitFiles()
             'success' => true,
             'message' => $successMessage,
         ]);
-        return;
-
     }
 
     /**
@@ -570,6 +578,10 @@ private function extensionAllowed($fileExtension, $purpose = 'show')
         }
     }
 
+    /**
+     * @param string $fileDestination
+     * @return boolean
+     */
     private function checkTargetExists($fileDestination)
     {
         return is_file($fileDestination);

From 126d624914168dbd92ae77aec0752b79083775b7 Mon Sep 17 00:00:00 2001
From: Olle Harstedt <olleharstedt@yahoo.com>
Date: Wed, 25 Mar 2020 14:06:53 +0100
Subject: [PATCH 2/3] Dev: Don't send absolute path to browser

---
 application/controllers/admin/LimeSurveyFileManager.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php
index 61c82e9b4cf..6972ddb14eb 100644
--- a/application/controllers/admin/LimeSurveyFileManager.php
+++ b/application/controllers/admin/LimeSurveyFileManager.php
@@ -833,7 +833,6 @@ private function composeFolderArray($folder, $level = '0')
         $folderArray = [
             'key' => $shortName.'_'.$level,
             'folder' => $folder,
-            'realPath' => $realPath,
             'shortName' => $shortName,
             'surveyId' => intval($shortName),
             'children' => $childFolders,

From ec14631bbdb34be768d56487761c96cc4931b748 Mon Sep 17 00:00:00 2001
From: Olle Harstedt <olleharstedt@yahoo.com>
Date: Wed, 25 Mar 2020 14:07:02 +0100
Subject: [PATCH 3/3] Dev: Formatting

---
 application/controllers/admin/LimeSurveyFileManager.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/admin/LimeSurveyFileManager.php b/application/controllers/admin/LimeSurveyFileManager.php
index 6972ddb14eb..41f83d9a20e 100644
--- a/application/controllers/admin/LimeSurveyFileManager.php
+++ b/application/controllers/admin/LimeSurveyFileManager.php
@@ -831,11 +831,11 @@ private function composeFolderArray($folder, $level = '0')
         $shortName = end($pathArray);
 
         $folderArray = [
-            'key' => $shortName.'_'.$level,
-            'folder' => $folder,
+            'key'       => $shortName.'_'.$level,
+            'folder'    => $folder,
             'shortName' => $shortName,
-            'surveyId' => intval($shortName),
-            'children' => $childFolders,
+            'surveyId'  => intval($shortName),  // Will be 0 for 'global' and 'generalfiles'.
+            'children'  => $childFolders,
         ];
         return $folderArray;
     }