tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 01:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Conform to coding guidelines

Browse Source
This commit is contained in:
Matthias Jentsch 2015-05-07 17:17:24 +02:00
parent c6c78989a5
commit 83efc3a4a3
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/controllers/DowntimeController.php
View File

@ -82,7 +82,7 @@ class Monitoring_DowntimeController extends Controller
'label' => $this->translate('Downtime'), 'label' => $this->translate('Downtime'),
'url' =>'monitoring/downtimes/show' 'url' =>'monitoring/downtimes/show'
) )
)->activate('downtime')->extend(new DashboardAction()); )->activate('downtime')->extend(new DashboardAction());
} }
/** /**
@ -92,7 +92,7 @@ class Monitoring_DowntimeController extends Controller
{ {
$this->view->downtime = $this->downtime; $this->view->downtime = $this->downtime;
$this->view->isService = $this->isService; $this->view->isService = $this->isService;
$this->view->stateName = isset($this->downtime->service_description) ? $this->view->stateName = isset($this->downtime->service_description) ?
Service::getStateText($this->downtime->service_state) : Service::getStateText($this->downtime->service_state) :
Host::getStateText($this->downtime->host_state); Host::getStateText($this->downtime->host_state);
$this->view->listAllLink = Url::fromPath('monitoring/list/downtimes'); $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');

23
modules/monitoring/application/views/scripts/comment/show.phtml
View File

@ -18,11 +18,12 @@
<td> <td>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
$this->comment->service_description, $this->comment->service_description,
$this->comment->service_display_name, $this->comment->service_display_name,
$this->comment->host_name, $this->comment->host_name,
$this->comment->host_display_name $this->comment->host_display_name
); ?> );
?>
</td> </td>
<?php else: ?> <?php else: ?>
<th> <?= $this->translate('Host') ?> </th> <th> <?= $this->translate('Host') ?> </th>
@ -31,7 +32,8 @@
<?= $this->link()->host( <?= $this->link()->host(
$this->comment->host_name, $this->comment->host_name,
$this->comment->host_display_name $this->comment->host_display_name
); ?> );
?>
</td> </td>
<?php endif ?> <?php endif ?>
</tr> </tr>
@ -55,10 +57,11 @@
<th><?= $this->translate('Expires') ?></th> <th><?= $this->translate('Expires') ?></th>
<td> <td>
<?= $this->comment->expiration ? sprintf( <?= $this->comment->expiration ? sprintf(
$this->translate('This comment expires on %s at %s.'), $this->translate('This comment expires on %s at %s.'),
date('d.m.y', $this->comment->expiration), date('d.m.y', $this->comment->expiration),
date('H:i', $this->comment->expiration) date('H:i', $this->comment->expiration)
) : $this->translate('This comment does not expire.'); ?> ) : $this->translate('This comment does not expire.');
?>
</td> </td>
</tr> </tr>

2
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -62,7 +62,7 @@ abstract class MonitoredObjectController extends Controller
->handleRequest(); ->handleRequest();
$this->view->checkNowForm = $checkNowForm; $this->view->checkNowForm = $checkNowForm;
} }
if ( ! in_array((int) $this->object->state, array(0, 99))) { if (! in_array((int) $this->object->state, array(0, 99))) {
if ((bool) $this->object->acknowledged) { if ((bool) $this->object->acknowledged) {
if ($auth->hasPermission('monitoring/command/remove-acknowledgement')) { if ($auth->hasPermission('monitoring/command/remove-acknowledgement')) {
$removeAckForm = new RemoveAcknowledgementCommandForm(); $removeAckForm = new RemoveAcknowledgementCommandForm();