Accounts: Add edit and delete pages; implement forms (no real actions yet)
This commit is contained in:
parent
4e8d879008
commit
7859ef77ee
GPG Key ID:
F8D4956E224DA232
|
|
@ -86,12 +86,8 @@ main.login_page {
|
|||
border: 1px solid #666666;
|
||||
}
|
||||
|
||||
main.login_page table td {
|
||||
padding: 0.2em;
|
||||
}
|
||||
|
||||
/* --- Text and other styling --- */
|
||||
h2 {
|
||||
h2, h4 {
|
||||
margin: 0 0 0.5em 0;
|
||||
}
|
||||
|
||||
|
|
@ -105,9 +101,9 @@ a:hover, a:focus {
|
|||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.error {
|
||||
.error_box {
|
||||
background: #ff4444;
|
||||
width: 30em;
|
||||
max-width: 50em;
|
||||
margin: 1em 0;
|
||||
padding: 1em;
|
||||
}
|
||||
|
|
@ -134,7 +130,14 @@ button {
|
|||
|
||||
/* --- Tables --- */
|
||||
|
||||
table, tr, td, th {
|
||||
table td, table th {
|
||||
padding: 0.25em 0.5em;
|
||||
}
|
||||
|
||||
table.bordered_table,
|
||||
table.bordered_table tr,
|
||||
table.bordered_table td,
|
||||
table.bordered_table th {
|
||||
border: 1px solid #999999;
|
||||
border-collapse: collapse;
|
||||
padding: 0.25em 0.5em;
|
||||
|
|
@ -144,17 +147,15 @@ table, tr, td, th {
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
/* --- Filter options --- */
|
||||
.filter_options {
|
||||
/* --- Boxes --- */
|
||||
.filter_options,
|
||||
.edit_box,
|
||||
.confirmation_box {
|
||||
border: 1px solid #999999;
|
||||
padding: 1em;
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.filter_options h4 {
|
||||
margin: 0 0 0.5em 0;
|
||||
}
|
||||
|
||||
/* --- Detail columns --- */
|
||||
input#show_details_checkbox {
|
||||
margin-bottom: 1em;
|
||||
|
|
@ -163,3 +164,13 @@ input#show_details_checkbox {
|
|||
input#show_details_checkbox:not(:checked) ~ table .detail_column {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* --- Edit box --- */
|
||||
.edit_box p:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* --- Confirmation box --- */
|
||||
.confirmation_box p:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,4 +70,58 @@ class AccountController extends BaseController
|
|||
|
||||
return $this->view->render($response, 'account_details.html.twig', $renderData);
|
||||
}
|
||||
|
||||
public function showAccountCreate(Request $request, Response $response): Response
|
||||
{
|
||||
return $this->showAccounts($request, $response);
|
||||
}
|
||||
|
||||
public function showAccountEdit(Request $request, Response $response, array $args): Response
|
||||
{
|
||||
// Parse URL arguments
|
||||
$accountId = (int)$args['id'];
|
||||
|
||||
// Get account data from database
|
||||
$accountData = $this->accountRepository->fetchAccountById($accountId);
|
||||
|
||||
$renderData = [
|
||||
'id' => $accountId,
|
||||
'accountUsername' => $accountData['username'],
|
||||
'accountData' => $accountData,
|
||||
];
|
||||
|
||||
return $this->view->render($response, 'account_edit.html.twig', $renderData);
|
||||
}
|
||||
|
||||
public function editAccount(Request $request, Response $response, array $args): Response
|
||||
{
|
||||
// TODO: just a placeholder
|
||||
$this->view->getEnvironment()->addGlobal('error', 'Not implemented yet!');
|
||||
return $this->showAccountEdit($request, $response, $args);
|
||||
}
|
||||
|
||||
public function showAccountDelete(Request $request, Response $response, array $args): Response
|
||||
{
|
||||
// Parse URL arguments
|
||||
$accountId = (int)$args['id'];
|
||||
|
||||
// Get account data and list of aliases from database
|
||||
$accountData = $this->accountRepository->fetchAccountById($accountId);
|
||||
$aliases = $this->aliasRepository->fetchAliasesForUserId($accountId);
|
||||
|
||||
$renderData = [
|
||||
'id' => $accountId,
|
||||
'accountUsername' => $accountData['username'],
|
||||
'aliases' => $aliases,
|
||||
];
|
||||
|
||||
return $this->view->render($response, 'account_delete.html.twig', $renderData);
|
||||
}
|
||||
|
||||
public function deleteAccount(Request $request, Response $response, array $args): Response
|
||||
{
|
||||
// TODO: just a placeholder
|
||||
$this->view->getEnvironment()->addGlobal('error', 'Not implemented yet!');
|
||||
return $this->showAccountDelete($request, $response, $args);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,11 @@ class Routes
|
|||
|
||||
// Accounts
|
||||
$app->get('/accounts', AccountController::class . ':showAccounts');
|
||||
$app->get('/accounts/new', AccountController::class . ':showAccountCreate');
|
||||
$app->get('/accounts/{id:[1-9][0-9]*}', AccountController::class . ':showAccountDetails');
|
||||
$app->get('/accounts/{id:[1-9][0-9]*}/edit', AccountController::class . ':showAccountDetails');
|
||||
$app->get('/accounts/{id:[1-9][0-9]*}/delete', AccountController::class . ':showAccountDetails');
|
||||
$app->get('/accounts/{id:[1-9][0-9]*}/edit', AccountController::class . ':showAccountEdit');
|
||||
$app->post('/accounts/{id:[1-9][0-9]*}/edit', AccountController::class . ':editAccount');
|
||||
$app->get('/accounts/{id:[1-9][0-9]*}/delete', AccountController::class . ':showAccountDelete');
|
||||
$app->post('/accounts/{id:[1-9][0-9]*}/delete', AccountController::class . ':deleteAccount');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
{% extends "base.html.twig" %}
|
||||
|
||||
{% block title %}Delete account{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Account: {{ accountUsername }}</h2>
|
||||
|
||||
<p>
|
||||
<b>Actions:</b>
|
||||
<a href="/accounts/{{ id }}">View</a> |
|
||||
<a href="/accounts/{{ id }}/edit">Edit</a> |
|
||||
<span>Delete</span> |
|
||||
<a href="mailto:{{ accountUsername }}">Send mail</a>
|
||||
</p>
|
||||
|
||||
<h3>Delete account</h3>
|
||||
|
||||
<p>You are about to delete the mail account "{{ accountUsername }}" including the following aliases:</p>
|
||||
<ul>
|
||||
{% for alias in aliases %}
|
||||
<li>{{ alias['mail_address'] }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<p><b>Note:</b> This will only delete the user entry from the database. Mail data will not be deleted!</p>
|
||||
|
||||
{% if error is defined %}
|
||||
<div class="error_box">
|
||||
<h4>Error:</h4>
|
||||
{{ error }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="confirmation_box">
|
||||
<p><b>Please confirm that you want to delete this account by entering your password.</b></p>
|
||||
<form action="/accounts/{{ id }}/delete" method="POST">
|
||||
<p>
|
||||
<label for="admin_password">Your password:</label>
|
||||
<input type="password" id="admin_password" name="admin_password"/>
|
||||
</p>
|
||||
<button type="submit">Delete account</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,18 +1,21 @@
|
|||
{% extends "base.html.twig" %}
|
||||
|
||||
{% block title %}Accounts{% endblock %}
|
||||
{% block title %}View account{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Account: {{ accountUsername }}</h2>
|
||||
|
||||
<p>
|
||||
<b>Actions:</b>
|
||||
<span>View</span> |
|
||||
<a href="/accounts/{{ id }}/edit">Edit</a> |
|
||||
<a href="/accounts/{{ id }}/delete">Delete</a> |
|
||||
<a href="mailto:{{ accountUsername }}">Send mail</a>
|
||||
</p>
|
||||
|
||||
<table class="vertical_table_headers">
|
||||
<h3>View account details</h3>
|
||||
|
||||
<table class="bordered_table vertical_table_headers">
|
||||
<tr>
|
||||
<th style="min-width: 10em">User ID</th>
|
||||
<td style="min-width: 20em">{{ accountData['user_id'] }}</td>
|
||||
|
|
@ -62,7 +65,7 @@
|
|||
<h3>Aliases</h3>
|
||||
|
||||
{% if aliases %}
|
||||
<table>
|
||||
<table class="bordered_table">
|
||||
<tr>
|
||||
<th>Address</th>
|
||||
<th>Created at</th>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,115 @@
|
|||
{% extends "base.html.twig" %}
|
||||
|
||||
{% block title %}Edit account{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Account: {{ accountUsername }}</h2>
|
||||
|
||||
<p>
|
||||
<b>Actions:</b>
|
||||
<a href="/accounts/{{ id }}">View</a> |
|
||||
<span>Edit</span> |
|
||||
<a href="/accounts/{{ id }}/delete">Delete</a> |
|
||||
<a href="mailto:{{ accountUsername }}">Send mail</a>
|
||||
</p>
|
||||
|
||||
<h3>Edit account data</h3>
|
||||
|
||||
<form action="/accounts/{{ id }}/edit" method="POST">
|
||||
{% if error is defined %}
|
||||
<div class="error_box">
|
||||
<h4>Error</h4>
|
||||
{{ error }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="edit_box">
|
||||
<h4>Username</h4>
|
||||
<table>
|
||||
<tr>
|
||||
<td>Current username:</td>
|
||||
<td>{{ accountData['username'] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="edit_username">New username:</label></td>
|
||||
<td><input id="edit_username" name="username"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<label><input type="checkbox" name="username_create_alias"> Create alias for old username</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<label><input type="checkbox" name="username_replace_alias"> Replace existing alias</label>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="edit_box">
|
||||
<h4>Password</h4>
|
||||
<p>The new password will be hashed using the current default hash algorithm.</p>
|
||||
<table>
|
||||
<tr>
|
||||
<td><label for="edit_password">New password:</label></td>
|
||||
<td><input type="password" id="edit_password" name="password"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="edit_password_repeat">Repeat password:</label></td>
|
||||
<td><input type="password" id="edit_password_repeat" name="password_repeat"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="edit_box">
|
||||
<h4>Account status</h4>
|
||||
<table>
|
||||
<tr>
|
||||
<td>Current status:</td>
|
||||
<td>{{ accountData['is_active'] == '1' ? '<span class="green">Active</span>' : '<span class="red">Inactive</span>' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>New status:</td>
|
||||
<td>
|
||||
<label>
|
||||
<input type="checkbox" name="is_active" {{ accountData['is_active'] == '1' ? 'checked' : '' }}/> Active
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="edit_box">
|
||||
<h4>Home directory</h4>
|
||||
<p><b>Important:</b> Changing the home directory here will <b>NOT</b> move any existing mail data, this needs to be done
|
||||
manually!</p>
|
||||
<table>
|
||||
<tr>
|
||||
<td>Current home directory:</td>
|
||||
<td><span class="gray">/srv/vmail/</span>{{ accountData['home_dir'] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="edit_home_dir">New home directory:</label></td>
|
||||
<td>
|
||||
<span class="gray">/srv/vmail/</span><input id="edit_home_dir" name="home_dir"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="edit_box">
|
||||
<h4><label for="edit_memo">Admin memo</label></h4>
|
||||
<p>This field is only readable by admins.</p>
|
||||
<table>
|
||||
<tr>
|
||||
<td><label for="edit_memo">Admin memo:</label></td>
|
||||
<td><textarea id="edit_memo" name="memo" style="min-width: 40em;">{{ accountData['memo'] }}</textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<button type="submit">Save changes</button>
|
||||
<button type="reset">Reset form</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -5,7 +5,12 @@
|
|||
{% block content %}
|
||||
<h2>Accounts</h2>
|
||||
|
||||
<p>List of all mail accounts.</p>
|
||||
<p>
|
||||
<b>Actions:</b>
|
||||
<a href="/accounts/new">Create account</a>
|
||||
</p>
|
||||
|
||||
<h3>List of accounts</h3>
|
||||
|
||||
<div class="filter_options">
|
||||
<form action="/accounts" method="GET">
|
||||
|
|
@ -19,7 +24,7 @@
|
|||
|
||||
<input type="checkbox" id="show_details_checkbox"><label for="show_details_checkbox"> Show detail columns</label>
|
||||
|
||||
<table>
|
||||
<table class="bordered_table">
|
||||
<tr>
|
||||
<th style="min-width: 15em">Username</th>
|
||||
<th style="min-width: 10em">Domain</th>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<p>This is a list of all domains auto-generated from the existing mail accounts and aliases. As such it is read-only.</p>
|
||||
|
||||
<table>
|
||||
<table class="bordered_table">
|
||||
<tr>
|
||||
<th style="min-width: 12em">Domain</th>
|
||||
<th>Accounts</th>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<form action="/login" method="POST">
|
||||
{% if error is defined %}
|
||||
<div class="error">{{ error }}</div>
|
||||
<div class="error_box">{{ error }}</div>
|
||||
{% endif %}
|
||||
|
||||
<table>
|
||||
|
|
|
|||
Loading…
Reference in New Issue