[Document Repository] Fix duplicate filename in path (aces#4466)

Got rid of $fullPath usage. Code was checking for a directory named by the file, creating a directory named after the file, and uploading the file inside this new directory.

modules/document_repository/php/files.class.inc

@@ -115,9 +115,10 @@ class Files extends \NDB_Page
                 );
           break;
         case "GET":
-            $record = basename($request->getUri()->getPath());
+            $name   = \User::singleton()->getUsername();
+            $record = urldecode(basename($request->getUri()->getPath()));
             if (!is_numeric($record)) {
-                $file = __DIR__ . "/../user_uploads/$record";
+                $file = __DIR__ . "/../user_uploads/$name/$record";
                 return (new \LORIS\Http\Response())
                 ->withHeader(
                     'Content-Disposition',
@@ -372,15 +373,15 @@ class Files extends \NDB_Page
         $fileSize     = $uploadedFile->getSize();
         $fileName     = $uploadedFile->getClientFileName();
         $fileType     = pathinfo($fileName, PATHINFO_EXTENSION);
-        $uploadPath   = "$base/modules/document_repository/user_uploads/";
+        $uploadPath   = "$base/modules/document_repository/user_uploads/$name/";
         // $category is a string representation of an ID, and so should be at
         // least equal to zero.
         if (intval($category) < 0) {
             throw new \LorisException(
                 "'Category' parameter must be a positive integer."
             );
         }
-        // Check to see if $fullPath is writable. If not, throw an error. If it
+        // Check to see if $uploadPath is writable. If not, throw an error. If it
         // doesn't exist, create an uploads folder for the logged-in user.
         if (!is_writable($uploadPath)) {
             if (file_exists($uploadPath)) {