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

fixing go back button on server info page when coming from status

pull/46/head
Pepijn Over 2014-03-30 16:06:27 +02:00
parent 6487091691
commit 81b7698359
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/psm/Module/Server/Controller/ServerController.class.php
View File

@ -257,10 +257,11 @@ class ServerController extends AbstractServerController {
'remove' 'remove'
); );
} }
$back_to = isset($_GET['back_to']) ? $_GET['back_to'] : 'server';
$sidebar->addLink( $sidebar->addLink(
'go_back', 'go_back',
psm_get_lang('system', 'go_back'), psm_get_lang('system', 'go_back'),
psm_build_url(array('mod' => 'server')), psm_build_url(array('mod' => $back_to)),
'th-list' 'th-list'
); );

4
src/psm/Module/Server/Controller/StatusController.class.php
View File

@ -75,7 +75,7 @@ class StatusController extends AbstractServerController {
} }
$server['last_checked_nice'] = psm_timespan($server['last_check']); $server['last_checked_nice'] = psm_timespan($server['last_check']);
$server['last_online_nice'] = psm_timespan($server['last_online']); $server['last_online_nice'] = psm_timespan($server['last_online']);
$server['url_view'] = psm_build_url(array('mod' => 'server', 'action' => 'view', 'id' => $server['server_id'])); $server['url_view'] = psm_build_url(array('mod' => 'server', 'action' => 'view', 'id' => $server['server_id'], 'back_to' => 'server_status'));
if ($server['status'] == "off") { if ($server['status'] == "off") {
$offline[$server['server_id']] = $server; $offline[$server['server_id']] = $server;
@ -90,7 +90,7 @@ class StatusController extends AbstractServerController {
// add servers to template // add servers to template
$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_offline', $offline); $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_offline', $offline);
$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_online', $online); $this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'servers_online', $online);
// check if we need to add the auto refresh // check if we need to add the auto refresh
$auto_refresh = psm_get_conf('auto_refresh_servers'); $auto_refresh = psm_get_conf('auto_refresh_servers');
if(intval($auto_refresh) > 0) { if(intval($auto_refresh) > 0) {