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

Don't close and re-open php tags, remove unneeded spaces

Browse Source 
To close and re-open php tags makes no sense if there's nothing between them
This commit is contained in:
Alexander Klimov 2014-07-16 17:49:25 +02:00
parent bfc54b7e32
commit 62da942159
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
$stateColumn = 'host_hard_state'; $stateColumn = 'host_hard_state';
$stateChangeColumn = 'host_last_hard_state_change'; $stateChangeColumn = 'host_last_hard_state_change';
} else { } else {
$stateType = 'soft';
$stateColumn = 'host_state'; $stateColumn = 'host_state';
$stateChangeColumn = 'host_last_state_change'; $stateChangeColumn = 'host_last_state_change';
$stateType = 'soft';
} }
$this->addTitleTab('hosts'); $this->addTitleTab('hosts');
@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
} }
} }
$this->setAutorefreshInterval(10); $this->setAutorefreshInterval(10);
$columns = array_merge(array( $columns = array_merge(array(
'host_name', 'host_name',
'host_state', 'host_state',

7
modules/monitoring/application/views/scripts/list/contactgroups.phtml
View File

@ -10,9 +10,8 @@
if (count($groupData) === 0) { if (count($groupData) === 0) {
echo t('No contacts matching the filter'); echo t('No contacts matching the filter');
} }
?>
<?php foreach ($groupData as $groupName => $groupInfo): ?> foreach ($groupData as $groupName => $groupInfo): ?>
<div class="box contactgroup"> <div class="box contactgroup">
<h2><?= $groupInfo['alias']; ?></h2> <h2><?= $groupInfo['alias']; ?></h2>
<?php if ($groupInfo['alias'] !== $groupName): ?> <?php if ($groupInfo['alias'] !== $groupName): ?>
@ -31,8 +30,8 @@ if (count($groupData) === 0) {
<p> <p>
<?php if ($c->contact_email): ?> <?php if ($c->contact_email): ?>
<?= $c->contact_email; ?> <?= $c->contact_email; ?>
<?php endif ?> <?php endif;
<?php if ($c->contact_pager): ?> if ($c->contact_pager): ?>
<br /> <br />
<?= $c->contact_pager; ?> <?= $c->contact_pager; ?>
<?php endif ?> <?php endif ?>

7
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<div style="margin: 1em"> <div style="margin: 1em">
<?= $this->sortControl->render($this); ?> <?= $this->sortControl->render($this); ?>
</div> </div>
<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
<div class="content downtimes"> <div class="content downtimes">
@ -16,8 +16,7 @@ $helper = $this->getHelper('CommandForm');
if (count($downtimes) === 0) { if (count($downtimes) === 0) {
echo t('No downtimes matching the filter'); echo t('No downtimes matching the filter');
} }
?> foreach ($this->downtimes as $downtime): ?>
<?php foreach ($this->downtimes as $downtime): ?>
<tr> <tr>
<td> <td>
<?= $this->dateFormat()->formatDateTime($downtime->start); ?> - <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -