tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove leading and trailing blanks from ip addresses 

refs #2494
This commit is contained in:
Alexander A. Klimov 2017-12-15 13:08:14 +01:00
parent 4b458fd719
commit ba9d286567
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/monitoring/application/views/scripts/partials/object/host-header.phtml
View File

@ -26,14 +26,10 @@ use Icinga\Module\Monitoring\Object\Host;
<?php endif ?> <?php endif ?>
<?= $this->hostFlags($object) ?> <?= $this->hostFlags($object) ?>
<?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?> <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
<div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>"> <div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>"><?= $this->escape($object->host_address6) ?></div>
<?= $this->escape($object->host_address6) ?>
</div>
<?php endif ?> <?php endif ?>
<?php if ($object->host_address && $object->host_address !== $object->host_name): ?> <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
<div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>"> <div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>"><?= $this->escape($object->host_address) ?></div>
<?= $this->escape($object->host_address) ?>
</div>
<?php endif ?> <?php endif ?>
</td> </td>
</tr> </tr>

8
modules/monitoring/application/views/scripts/partials/object/service-header.phtml
View File

@ -22,14 +22,10 @@ use Icinga\Module\Monitoring\Object\Service;
<?php endif ?> <?php endif ?>
<?= $this->hostFlags($object) ?> <?= $this->hostFlags($object) ?>
<?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?> <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
<div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>"> <div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>"><?= $this->escape($object->host_address6) ?></div>
<?= $this->escape($object->host_address6) ?>
</div>
<?php endif ?> <?php endif ?>
<?php if ($object->host_address && $object->host_address !== $object->host_name): ?> <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
<div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>"> <div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>"><?= $this->escape($object->host_address) ?></div>
<?= $this->escape($object->host_address) ?>
</div>
<?php endif ?> <?php endif ?>
</td> </td>
</tr> </tr>