github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed server column from notification log.

pull/703/head^2
TimZ99 2019-02-08 16:16:57 +01:00
parent 6c14709d7c
commit c44760c0f7
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/psm/Module/Server/Controller/LogController.php
View File

@ -100,15 +100,17 @@ class LogController extends AbstractServerController {
for ($x = 0; $x < $log_count; $x++) { for ($x = 0; $x < $log_count; $x++) {
$record = &$records[$x]; $record = &$records[$x];
$record['users'] = ''; $record['users'] = '';
$record['server'] = $record['label']; if($key == 'status'){
$record['type_icon'] = ($record['server_type'] == 'website') ? 'globe-americas' : 'cogs'; $record['server'] = $record['label'];
$record['type_title'] = psm_get_lang('servers', 'type_'.$record['server_type']); $record['type_icon'] = ($record['server_type'] == 'website') ? 'globe-americas' : 'cogs';
$ip = '('.$record['ip']; $record['type_title'] = psm_get_lang('servers', 'type_'.$record['server_type']);
if (!empty($record['port']) && (($record['server_type'] != 'website') || ($record['port'] != 80))) { $ip = '('.$record['ip'];
$ip .= ':'.$record['port']; if (!empty($record['port']) && (($record['server_type'] != 'website') || ($record['port'] != 80))) {
$ip .= ':'.$record['port'];
}
$ip .= ')';
$record['ip'] = $ip;
} }
$ip .= ')';
$record['ip'] = $ip;
$record['datetime_format'] = psm_date($record['datetime']); $record['datetime_format'] = psm_date($record['datetime']);
// fix up user list // fix up user list

12
src/templates/default/module/server/log.tpl.html
View File

@ -13,18 +13,24 @@
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col">{{ label_server }}</th> {% if tab.id|lower == 'status' %}<th scope="col">{{ label_server }}</th>{% endif %}
<th scope="col">{{ label_message }}</th>
<th scope="col">{{ label_date }}</th> <th scope="col">{{ label_date }}</th>
<th scope="col">{{ label_message }}</th>
{% if tab.has_users %}<th scope="col">{{ label_users }}</th>{% endif %} {% if tab.has_users %}<th scope="col">{{ label_users }}</th>{% endif %}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for entry in tab.entries %} {% for entry in tab.entries %}
<tr> <tr>
{% if entry.server %}
<th scope="row"><i class="fas fa-{{ entry.type_icon }}" title="{{ entry.type_title }}"></i> {{ entry.server }} {{ entry.ip }}</th> <th scope="row"><i class="fas fa-{{ entry.type_icon }}" title="{{ entry.type_title }}"></i> {{ entry.server }} {{ entry.ip }}</th>
{% endif %}
{% if entry.server %}
<td>{{ entry.datetime_format }}</td>
{% else %}
<th scope="row">{{ entry.datetime_format }}</th>
{% endif %}
<td>{{ entry.message|raw }}</td> <td>{{ entry.message|raw }}</td>
<td>{{ entry.datetime_format }}</td>
{% if tab.has_users %}<td>{{ entry.user_list|raw }}</td>{% endif %} {% if tab.has_users %}<td>{{ entry.user_list|raw }}</td>{% endif %}
</tr> </tr>
{% endfor %} {% endfor %}