Browse Source

updated Admin/Users controller, en/Admin language & Users/Home view

v3-dev
REJack 6 years ago
parent
commit
ce80f5f956
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
  1. 7
      app/Controllers/Admin/Users.php
  2. 2
      app/Language/en/Admin.php
  3. 6
      app/Views/Admin/Users/Home.php

7
app/Controllers/Admin/Users.php

@ -118,7 +118,7 @@ class Users extends Controller
$username = $this->request->getPost('username'); $username = $this->request->getPost('username');
$password = $this->request->getPost('password'); $password = $this->request->getPost('password');
if (! $this->aauth->updateUser($userId, empty($email) ? null : $email, empty($password) ? null : $password, empty($username) ? null : $username)) if (! $this->aauth->updateUser($userId, empty($email) ? null : $email, empty($password) ? null : $password, empty($username) ? null : $username))
{ {
return redirect()->back()->with('errors', $this->aauth->getErrorsArray()); return redirect()->back()->with('errors', $this->aauth->getErrorsArray());
} }
@ -153,9 +153,9 @@ class Users extends Controller
} }
$id = $this->request->getPost('id'); $id = $this->request->getPost('id');
if ($userId == $id) if ($userId === $id)
{ {
if($this->aauth->deleteUser($userId)) if ($this->aauth->deleteUser($userId))
{ {
return redirect()->to('/admin/users'); return redirect()->to('/admin/users');
} }
@ -168,5 +168,4 @@ class Users extends Controller
echo view('Templates/FooterAdmin'); echo view('Templates/FooterAdmin');
} }
} }

2
app/Language/en/Admin.php

@ -41,7 +41,7 @@ return [
'usersEditSubmit' => 'Update user', 'usersEditSubmit' => 'Update user',
'usersShowHeader' => 'Show user', 'usersShowHeader' => 'Show user',
'usersDeleteHeader' => 'Delete user', 'usersDeleteHeader' => 'Delete user',
'usersDeleteSubmit' => 'Delete user', 'usersDeleteSubmit' => 'Delete user',
'usersBreadcrumbTitle' => 'Users', 'usersBreadcrumbTitle' => 'Users',
'usersLabelId' => 'Id', 'usersLabelId' => 'Id',
'usersLabelEmail' => 'Email address', 'usersLabelEmail' => 'Email address',

6
app/Views/Admin/Users/Home.php

@ -34,12 +34,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<? foreach ($users as $user): ?> <?php foreach ($users as $user): ?>
<tr> <tr>
<th scope="row"><?= $user['id'] ?></th> <th scope="row"><?= $user['id'] ?></th>
<td><?= $user['email'] ?></td> <td><?= $user['email'] ?></td>
<td><?= $user['username'] ?></td> <td><?= $user['username'] ?></td>
<td><?= $user['banned'] == 1 ? 'Yes' : 'No' ?></td> <td><?= $user['banned'] === 1 ? 'Yes' : 'No' ?></td>
<td><?= $user['created_at'] ?></td> <td><?= $user['created_at'] ?></td>
<td><?= $user['updated_at'] ?></td> <td><?= $user['updated_at'] ?></td>
<td><?= $user['last_ip_address'] ?></td> <td><?= $user['last_ip_address'] ?></td>
@ -53,7 +53,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<? endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>

Loading…
Cancel
Save