Add username, fix user ID

Author: MGatner

src/Controllers/Files.php

@@ -175,12 +175,13 @@ public function user($userId = null)
 			}
 
 			$this->setData([
-				'access' => 'display',
-				'title'  => 'User Files'
+				'access'   => 'display',
+				'title'    => 'User Files',
+				'username' => 'User',
 			]);
 		}
 		// Logged in, looking at another user
-		elseif ($userId !== user_id())
+		elseif ($userId != user_id())
 		{
 			// Check for list permission
 			if (! $this->model->mayList())
@@ -189,16 +190,18 @@ public function user($userId = null)
 			}
 
 			$this->setData([
-				'access' => $this->model->mayAdmin() ? 'manage' : 'display',
-				'title'  => 'User Files'
+				'access'   => $this->model->mayAdmin() ? 'manage' : 'display',
+				'title'    => 'User Files',
+				'username' => 'User',
 			]);
 		}
 		// Looking at own files
 		else
 		{
 			$this->setData([
-				'access' => 'manage',
-				'title'  => 'My Files'
+				'access'   => 'manage',
+				'title'    => 'My Files',
+				'username' => 'My',
 			]);
 		}
 
@@ -611,6 +614,7 @@ protected function setDefaults(): self
 			'files'    => null,
 			'selected' => explode(',', $this->request->getVar('selected') ?? ''),
 			'userId'   => null,
+			'username' => '',
 			'ajax'     => $this->request->isAJAX(),
 			'sort'     => $this->getSort(),
 			'order'    => $this->getOrder(),

src/Views/index.php

@@ -16,7 +16,7 @@
 					<a class="btn <?= $format === 'select' ? 'btn-secondary' : 'btn-outline-secondary' ?>" href="<?= site_url("files/{$source}") ?>?format=select" role="button"><i class="fas fa-tasks"></i></a>
 				</div>
 			</div>
-			
+
 			<h1><?= $access === 'manage' ? 'Manage' : 'Browse' ?> <?= $username ?? '' ?> Files</h1>
 
 			<form class="form-inline mb-3" name="files-search" method="get" action="<?= current_url() ?>">

tests/feature/UserTest.php

@@ -13,6 +13,7 @@ public function testShowsOwnFiles()
 		model('FileModel')->addToUser($file->id, $user->id);
 
 		$result = $this->get('files/user/' . $user->id);
+		$result->assertSee('Manage My Files', 'h1');
 		$result->assertSee($file->filename);
 	}
 
@@ -24,6 +25,7 @@ public function testShowsOtherFiles()
 		model('FileModel')->addToUser($file->id, $user->id);
 
 		$result = $this->get('files/user/1000');
+		$result->assertSee('Browse User Files', 'h1');
 		$result->assertDontSee($file->filename);
 	}
 }