[document_repository] Fix download path to correct user

modules/document_repository/jsx/docIndex.js

@@ -164,6 +164,8 @@ class DocIndex extends React.Component {
       case 'File Name':
         let downloadURL = loris.BaseURL
                           + '/document_repository/Files/'
+                          + encodeURIComponent(row['Uploaded By'])
+                          + '/'
                           + encodeURIComponent(row['File Name']);
         result = <td>
           <a

modules/document_repository/php/files.class.inc

@@ -71,20 +71,26 @@ class Files extends \NDB_Page
                 ['message' => 'File deleted.']
             ));
         case "GET":
-            $filename = urldecode(basename($request->getUri()->getPath()));
-            $route    = explode('/', $request->getUri()->getPath());
+            $route = explode('/', $request->getUri()->getPath());
             if ($route[2] == 'meta') {
+                $id = urldecode(basename($request->getUri()->getPath()));
                 return (new \LORIS\Http\Response())
                     ->withHeader("Content-Type", "text/plain")
                     ->withBody(
                         new \LORIS\Http\StringStream(
-                            json_encode($this->getUploadDocFields($filename))
+                            json_encode($this->getUploadDocFields($id))
                         )
                     );
             }
+
+            $filename = explode(
+                'Files',
+                urldecode($request->getUri()->getPath())
+            )[1];
+
             $downloader = new \LORIS\FilesDownloadHandler(
                 new \SPLFileInfo(
-                    $downloadpath . $request->getAttribute('user')->getUsername()
+                    $downloadpath
                 )
             );
             return $downloader->handle(

modules/document_repository/php/module.class.inc

@@ -86,7 +86,10 @@ class Module extends \Module
             $last_login = $user->getLastLogin($DB);
 
             $docs         = $DB->pselect(
-                "SELECT File_name, Date_uploaded, Data_dir FROM document_repository
+                "SELECT File_name,
+                        Date_uploaded,
+                        CONCAT(uploaded_by, '/', File_name) AS Data_dir
+                 FROM document_repository
                  ORDER BY Date_uploaded DESC LIMIT 4",
                 []
             );