[DEV-367] Use FileDownloader instead of fopen

fiftin · Jun 3, 2022 · 4001663 · 4001663
1 parent 68b2d2b
commit 4001663
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/server/controllers/system/csv-import.php b/server/controllers/system/csv-import.php
@@ -52,10 +52,13 @@ public function handler() {
             throw new RequestException(ERRORS::INVALID_FILE);
         }
 
-        $file = fopen($fileUploader->getFullFilePath(),'r');
+        $fileDownloader = FileDownloader::getInstance();
+        $fileDownloader->setFileName($fileUploader->getFileName());
+        $file = $fileDownloader->fopen();
+
         $errors = [];
 
-        while(($user = fgetcsv($file)) != false) {
+        while($file && ($user = fgetcsv($file)) != false) {
             Controller::setDataRequester(function ($key) use ($user) {
                 switch ($key) {
                     case 'email':

diff --git a/server/libs/FileDownloader.php b/server/libs/FileDownloader.php
@@ -23,6 +23,16 @@ public function download() {
         }
     }
 
+    public function fopen() {
+        $fullFilePath = $this->getFullFilePath();
+
+        if(file_exists($fullFilePath) && is_file($fullFilePath)) {
+            return fopen($fullFilePath, 'r');
+        } else {
+            return false;
+        }
+    }
+
     public function eraseFile() {
         unlink($this->getLocalPath() . $this->getFileName());
     }