Merge branch 'master' into develop

LimeSurvey · Mar 26, 2020 · 3a04e97 · 3a04e97
2 parents 5f4a05f + ec14631
commit 3a04e97
Showing 1 changed file with 19 additions and 8 deletions.
diff --git 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);
@@ -819,12 +831,11 @@ private function composeFolderArray($folder, $level = '0')
         $shortName = end($pathArray);
 
         $folderArray = [
-            'key' => $shortName.'_'.$level,
-            'folder' => $folder,
-            'realPath' => $realPath,
+            '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;
     }