upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2025-12-20 23:00:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

phpcs: some more

Browse source
This commit is contained in:
Thomas Gelf 2016-11-23 12:35:17 +01:00
parent 2b98629f3e
commit afcf42e871
6 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
application/forms/BpConfigForm.php
View file

@ -40,7 +40,7 @@ class BpConfigForm extends QuickForm
'label' => $this->translate('Title'), 'label' => $this->translate('Title'),
'description' => $this->translate( 'description' => $this->translate(
'Usually this title will be shown for this process. Equals name' 'Usually this title will be shown for this process. Equals name'
. ' if not given' . ' if not given'
), ),
)); ));
@ -48,7 +48,7 @@ class BpConfigForm extends QuickForm
'label' => $this->translate('Backend'), 'label' => $this->translate('Backend'),
'description' => $this->translate( 'description' => $this->translate(
'Icinga Web Monitoring Backend where current object states for' 'Icinga Web Monitoring Backend where current object states for'
. ' this process should be retrieved from' . ' this process should be retrieved from'
), ),
'multiOptions' => array( 'multiOptions' => array(
null => $this->translate('Use the configured default backend'), null => $this->translate('Use the configured default backend'),
@ -193,7 +193,9 @@ class BpConfigForm extends QuickForm
public function shouldBeDeleted() public function shouldBeDeleted()
{ {
if (! $this->hasDeleteButton()) return false; if (! $this->hasDeleteButton()) {
return false;
}
$name = $this->deleteButtonName; $name = $this->deleteButtonName;
return $this->getSentValue($name) === $this->getElement($name)->getLabel(); return $this->getSentValue($name) === $this->getElement($name)->getLabel();

2
application/views/helpers/RenderStateBadges.php
View file

@ -13,7 +13,7 @@ class Zend_View_Helper_RenderStateBadges extends Zend_View_Helper_Abstract
foreach ($summary as $state => $cnt) { foreach ($summary as $state => $cnt) {
if ($cnt === 0 if ($cnt === 0
|| $state === 'OK' || $state === 'OK'
||$ state === 'UP' || $state === 'UP'
) { ) {
continue; continue;
} }

5
library/Businessprocess/BpNode.php
View file

@ -362,7 +362,10 @@ class BpNode extends Node
foreach ($this->getChildren() as $name => $child) { foreach ($this->getChildren() as $name => $child) {
$children[] = (string) $child; $children[] = (string) $child;
if (array_key_exists($name, $rendered)) { continue; } if (array_key_exists($name, $rendered)) {
continue;
}
if ($child instanceof BpNode) { if ($child instanceof BpNode) {
$cfg .= $child->toLegacyConfigString($rendered) . "\n"; $cfg .= $child->toLegacyConfigString($rendered) . "\n";
} }

2
library/Businessprocess/MonitoredNode.php
View file

@ -21,4 +21,4 @@ abstract class MonitoredNode extends Node
) )
); );
} }
} }

8
library/Businessprocess/Node.php
View file

@ -465,8 +465,12 @@ abstract class Node
return ' '; return ' ';
} }
public function toLegacyConfigString(& $rendered = array()) { return '';} // TODO: Why isn't this abstract?
//abstract public function toLegacyConfigString(); // abstract public function toLegacyConfigString();
public function toLegacyConfigString(& $rendered = array())
{
return '';
}
public function __toString() public function __toString()
{ {

2
library/Businessprocess/ServiceNode.php
View file

@ -49,7 +49,7 @@ class ServiceNode extends MonitoredNode
if (! $this->bp->isLocked()) { if (! $this->bp->isLocked()) {
$url = Url::fromPath( 'businessprocess/node/simulate', array( $url = Url::fromPath('businessprocess/node/simulate', array(
'config' => $this->bp->getName(), 'config' => $this->bp->getName(),
'node' => $this->name 'node' => $this->name
)); ));