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

Merge branch 'master' into bugfix/test-fix-6542

Browse Source
This commit is contained in:
Eric Lippmann 2014-07-02 10:57:08 +02:00
commit 545a153490
110 changed files with 266 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -10,7 +10,6 @@
!.gitkeep
build/
test/js/npm-debug.log
# ./configure output
config.log
@ -20,10 +19,9 @@ config.status
Makefile
# cmd tester
test/php/bin/extcmd_test
modules/test/bin/extcmd_test
# misc test output
test/frontend/static/public
test/php/library/Icinga/Protocol/Statusdat/.cache
# Generated API documentation

2
.vagrant-puppet/manifests/default.pp
View File

@ -202,7 +202,7 @@ exec { 'iptables-allow-http':
exec { 'icinga-htpasswd':
creates => '/usr/share/icinga/htpasswd.users',
command => 'mkdir /usr/share/icinga && htpasswd -b -c /usr/share/icinga/htpasswd.users icingaadmin icinga',
command => 'mkdir -p /usr/share/icinga && htpasswd -b -c /usr/share/icinga/htpasswd.users icingaadmin icinga',
require => Class['apache']
}

2
application/clicommands/AutocompleteCommand.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Clicommands;
@ -118,4 +117,3 @@ class AutocompleteCommand extends Command
}
}
}
// @codeCoverageIgnoreEnd

2
application/clicommands/HelpCommand.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Clicommands;
@ -41,4 +40,3 @@ class HelpCommand extends Command
);
}
}
// @codeCoverageIgnoreEnd

2
application/clicommands/ModuleCommand.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Clicommands;
@ -212,4 +211,3 @@ class ModuleCommand extends Command
$this->fail("Not implemented yet");
}
}
// @codeCoverageIgnoreEnd

2
application/clicommands/WebCommand.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Clicommands;
@ -81,4 +80,3 @@ class WebCommand extends Command
}
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/AuthenticationController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -159,4 +158,3 @@ class AuthenticationController extends ActionController
}
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/ConfigController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -549,4 +548,3 @@ class ConfigController extends BaseConfigController
}
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/DashboardController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -191,4 +190,3 @@ class DashboardController extends ActionController
return true;
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/ErrorController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -78,4 +77,3 @@ class ErrorController extends ActionController
$this->view->request = $error->request;
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/FilterController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -117,4 +116,3 @@ class FilterController extends ActionController
}
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/IndexController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -56,4 +55,3 @@ class IndexController extends ActionController
{
}
}
// @codeCoverageIgnoreEnd

3
application/controllers/InstallController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -107,5 +106,3 @@ class InstallController extends ActionController
$session->write();
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/LayoutController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -43,4 +42,3 @@ class LayoutController extends ActionController
$this->renderScript('parts/topbar.phtml');
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/ListController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -79,4 +78,3 @@ class ListController extends Controller
}
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/PreferenceController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -83,4 +82,3 @@ class PreferenceController extends BasePreferenceController
$this->view->form = $form;
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/SearchController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
use Icinga\Web\Controller\ActionController;
use Icinga\Application\Icinga;
@ -57,4 +56,3 @@ class SearchController extends ActionController
$this->view->tabs = $dashboard->getTabs();
}
}
// @codeCoverageIgnoreEnd

2
application/controllers/StaticController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -188,4 +187,3 @@ class StaticController extends ActionController
$lessCompiler->printStack();
}
}
// @codeCoverageIgnoreEnd

5
application/forms/Config/Authentication/DbBackendForm.php
View File

@ -30,10 +30,10 @@
namespace Icinga\Form\Config\Authentication;
use \Exception;
use \Icinga\Authentication\Backend\DbUserBackend;
use \Zend_Config;
use Icinga\Data\ResourceFactory;
use Icinga\Authentication\UserBackend;
use Icinga\Authentication\DbConnection;
use Icinga\Authentication\Backend\DbUserBackend;
/**
* Form class for adding/modifying database authentication backends
@ -148,7 +148,6 @@ class DbBackendForm extends BaseBackendForm
$this->addErrorMessage(sprintf(t('Using the specified backend failed: %s'), $e->getMessage()));
return false;
}
return true;
}
}

2
application/forms/Config/ConfirmRemovalForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -93,4 +92,3 @@ class ConfirmRemovalForm extends Form
);
}
}
// @codeCoverageIgnoreEnd

2
application/forms/Config/GeneralForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -295,4 +294,3 @@ class GeneralForm extends Form
return $cfg;
}
}
// @codeCoverageIgnoreEnd

2
application/forms/Config/LoggingForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -202,4 +201,3 @@ class LoggingForm extends Form
return new Zend_Config($cfg);
}
}
// @codeCoverageIgnoreEnd

2
application/forms/Dashboard/AddUrlForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -165,4 +164,3 @@ class AddUrlForm extends Form
$this->setSubmitLabel("Add To Dashboard");
}
}
// @codeCoverageIgnoreEnd

2
application/forms/Install/LoggingPage.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -64,4 +63,3 @@ class LoggingPage extends Page
return $this->createForm()->getConfig();
}
}
// @codeCoverageIgnoreEnd

2
application/forms/Preference/GeneralForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -175,4 +174,3 @@ class GeneralForm extends Form
);
}
}
// @codeCoverageIgnoreEnd

2
application/views/helpers/FormDateTime.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -94,4 +93,3 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
return $xhtml;
}
}
// @codeCoverageIgnoreEnd

2
application/views/helpers/FormNumber.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -54,4 +53,3 @@ class Zend_View_Helper_FormNumber extends \Zend_View_Helper_FormText
. $this->getClosingBracket();
}
}
// @codeCoverageIgnoreEnd

2
application/views/helpers/FormTriStateCheckbox.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -63,4 +62,3 @@ class Zend_View_Helper_FormTriStateCheckbox extends Zend_View_Helper_FormElement
return $xhtml . '</div>';
}
}
// @codeCoverageIgnoreEnd

4
application/views/helpers/Util.php
View File

@ -1,6 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -142,5 +140,3 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
return sprintf('OUT OF BOUND (%d)' . $state, (int) $state);
}
}
// @codingStandardsIgnoreStop

2
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -495,4 +494,3 @@ abstract class ApplicationBootstrap
return $this;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Application/Benchmark.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -318,4 +317,3 @@ class Benchmark
{
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Application/Cli.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -191,4 +190,3 @@ class Cli extends ApplicationBootstrap
throw new ProgrammingError('Icinga is not running on CLI');
}
}
// @codeCoverageIgnoreEnd

4
library/Icinga/Application/EmbeddedWeb.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -30,9 +29,7 @@
namespace Icinga\Application;
// @codingStandardsIgnoreStart
require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
// @codingStandardsIgnoreStop
use Icinga\Exception\ProgrammingError;
@ -62,4 +59,3 @@ class EmbeddedWeb extends ApplicationBootstrap
->loadEnabledModules();
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Application/LegacyWeb.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -56,4 +55,3 @@ class LegacyWeb extends Web
return $this->legacyBasedir;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Application/Platform.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -93,4 +92,3 @@ class Platform
}
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Application/Web.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -376,4 +375,3 @@ class Web extends ApplicationBootstrap
return $this;
}
}
// @codeCoverageIgnoreEnd

3
library/Icinga/Chart/Inline/Inline.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -120,4 +119,4 @@ class Inline {
}
}
}
}

1
library/Icinga/Chart/Inline/PieChart.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.

55
library/Icinga/Config/PreservingIniWriter.php
View File

@ -177,29 +177,42 @@ class PreservingIniWriter extends Zend_Config_Writer_FileAbstract
// Iterate over all properties in the old configuration file and search for deleted properties
foreach ($oldconfig as $key => $value) {
$nextParents = array_merge($parents, array($key));
$newvalue = $newconfig->get($key);
$keyIdentifier = empty($parents) ? array($key) : array_slice($nextParents, 1, null, true);
if ($newvalue === null) {
if ($value instanceof Zend_Config) {
// The deleted value is a nested Zend_Config, handle it recursively
$this->diffConfigs($value, new Zend_Config(array()), $editor, $nextParents);
if ($section === null) {
$editor->removeSection($key);
}
} else {
// The deleted value is a plain value, use the editor to delete it
if (is_numeric($key)) {
$editor->resetArrayElement($keyIdentifier, $section);
} elseif (!empty($parents)) {
// Drop nested properties, fixes #5958
$editor->resetArrayElement($nextParents, $section);
} else {
$editor->reset($keyIdentifier, $section);
}
if ($newconfig->get($key) === null) {
$nextParents = array_merge($parents, array($key));
$keyIdentifier = empty($parents) ? array($key) : array_slice($nextParents, 1, null, true);
foreach ($this->getPropertyIdentifiers($value, $keyIdentifier) as $propertyIdentifier) {
$editor->reset($propertyIdentifier, $section);
}
}
}
}
/**
* Return all possible combinations of property identifiers for the given value
*
* @param mixed $value The value to return all combinations for
* @param array $key The root property identifier, if any
*
* @return array All property combinations that are possible
*
* @todo Cannot handle array properties yet (e.g. a.b[]='c')
*/
protected function getPropertyIdentifiers($value, array $key = null)
{
$combinations = array();
$rootProperty = $key !== null ? $key : array();
if ($value instanceof Zend_Config) {
foreach ($value as $subProperty => $subValue) {
$combinations = array_merge(
$combinations,
$this->getPropertyIdentifiers($subValue, array_merge($rootProperty, array($subProperty)))
);
}
} elseif (is_string($value)) {
$combinations[] = $rootProperty;
}
return $combinations;
}
}

2
library/Icinga/Logger/Writer/SyslogWriter.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -107,4 +106,3 @@ class SyslogWriter extends LogWriter
closelog();
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/User/Message.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\User;
@ -56,4 +55,3 @@ class Message
return $this->level;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Controller/ActionController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -477,4 +476,3 @@ class ActionController extends Zend_Controller_Action
return parent::__call($name, $params);
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Controller/BaseConfigController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -85,4 +84,3 @@ class BaseConfigController extends ActionController
return array();
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Controller/BasePreferenceController.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -92,4 +91,3 @@ class BasePreferenceController extends ActionController
$store->save($currentPreferences);
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Controller/ControllerTabCollector.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -123,4 +122,3 @@ class ControllerTabCollector
return array();
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Form/Decorator/BootstrapForm.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -104,4 +103,3 @@ class BootstrapForm extends Zend_Form_Decorator_Abstract
. '</div>';
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Form/Decorator/ConditionalHidden.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -60,4 +59,3 @@ class ConditionalHidden extends Zend_Form_Decorator_Abstract
return $content;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Form/Decorator/HelpText.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -61,4 +60,3 @@ class HelpText extends Zend_Form_Decorator_Abstract
return $content;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Form/Validator/DateFormatValidator.php
View File

@ -61,11 +61,9 @@ class DateFormatValidator extends Zend_Validate_Abstract
*
* @see Zend_Validate_Abstract::$_messageTemplates
*/
// @codingStandardsIgnoreStart
protected $_messageTemplates = array(
'INVALID_CHARACTERS' => 'Invalid date format'
);
// @codingStandardsIgnoreEnd
/**
* Validate the input value

2
library/Icinga/Web/Form/Validator/DateTimeValidator.php
View File

@ -60,9 +60,7 @@ class DateTimeValidator extends Zend_Validate_Abstract
*
* @see Zend_Validate_Abstract::$_messageTemplates
*/
// @codingStandardsIgnoreStart
protected $_messageTemplates = array();
// @codingStandardsIgnoreEnd
/**
* Create this validator

2
library/Icinga/Web/Form/Validator/TimeFormatValidator.php
View File

@ -58,11 +58,9 @@ class TimeFormatValidator extends Zend_Validate_Abstract
* @var array
* @see Zend_Validate_Abstract::$_messageTemplates
*/
// @codingStandardsIgnoreStart
protected $_messageTemplates = array(
'INVALID_CHARACTERS' => 'Invalid time format'
);
// @codingStandardsIgnoreEnd
/**
* Validate the input value

2
library/Icinga/Web/Form/Validator/WritablePathValidator.php
View File

@ -44,12 +44,10 @@ class WritablePathValidator extends Zend_Validate_Abstract
*
* @see Zend_Validate_Abstract::$_messageTemplates‚
*/
// @codingStandardsIgnoreStart
protected $_messageTemplates = array(
'NOT_WRITABLE' => 'Path is not writable',
'DOES_NOT_EXIST' => 'Path does not exist'
);
// @codingStandardsIgnoreEnd
/**
* When true, the file or directory must exist

2
library/Icinga/Web/Hook/Grapher.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -113,4 +112,3 @@ class Grapher
throw new Exception('This backend has no images');
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Hook/Ticket.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
/**
* Icinga Web Ticket Hook
@ -43,4 +42,3 @@ abstract class Ticket
abstract public function createLink($match);
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/JavaScript.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Web;
@ -94,4 +93,3 @@ class JavaScript
echo $out;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/LessCompiler.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -195,4 +194,3 @@ class LessCompiler
}
}
}
// @codeCoverageIgnoreEnd

4
library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
View File

@ -1,6 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -105,5 +103,3 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
return $range;
}
}
// @codingStandardsIgnoreEnd

2
library/Icinga/Web/Request.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -65,4 +64,3 @@ class Request extends Zend_Controller_Request_Http
return $this->user;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Session.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -79,4 +78,3 @@ class Session
return self::$session;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/StyleSheet.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Web;
@ -69,4 +68,3 @@ class StyleSheet
}
}
// @codeCoverageIgnoreEnd

4
library/Icinga/Web/View.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -172,7 +171,6 @@ class View extends Zend_View_Abstract
}
}
// @codingStandardsIgnoreStart
/**
* Use to include the view script in a scope that only allows public
* members.
@ -193,7 +191,6 @@ class View extends Zend_View_Abstract
include func_get_arg(0);
}
}
// @codingStandardsIgnoreEnd
/**
* Accesses a helper object from within a script
@ -212,4 +209,3 @@ class View extends Zend_View_Abstract
}
}
}
// @codeCoverageIgnoreEnd

4
library/Icinga/Web/View/helpers/format.php
View File

@ -11,7 +11,7 @@ $this->addHelperFunction('format', function () {
$this->addHelperFunction('timeSince', function ($timestamp) {
return sprintf(
'<span class="timeuntil" title="%s">%s</span>',
'<span class="timesince" title="%s">%s</span>',
date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
Format::timeSince($timestamp)
);
@ -19,7 +19,7 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
$this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) {
return sprintf(
'<span class="timeuntil" title="%s">%s</span>',
'<span class="timesince" title="%s">%s</span>',
date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
Format::prefixedTimeSince($timestamp, $ucfirst)
);

2
library/Icinga/Web/Widget.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
/**
* Web widget class
@ -51,4 +50,3 @@ class Widget
return $widget;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/AbstractWidget.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Web\Widget;
@ -122,4 +121,3 @@ abstract class AbstractWidget
return (string) $html;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/AlertMessageBox.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
namespace Icinga\Web\Widget;
@ -129,4 +128,3 @@ class AlertMessageBox extends AbstractWidget
return $html;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -344,4 +343,3 @@ class HistoryColorGrid extends AbstractWidget {
return $this->renderVertical($grid);
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/Chart/InlinePie.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -426,4 +425,3 @@ EOD;
}
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/SortBox.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -164,4 +163,3 @@ class SortBox extends AbstractWidget
return $form;
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/Tabextension/BasketAction.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -59,4 +58,3 @@ class BasketAction implements Tabextension
);
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/Tabextension/DashboardAction.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -60,4 +59,3 @@ class DashboardAction implements Tabextension
);
}
}
// @codeCoverageIgnoreEnd

2
library/Icinga/Web/Widget/Tabextension/OutputFormat.php
View File

@ -1,5 +1,4 @@
<?php
// @codeCoverageIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -125,4 +124,3 @@ class OutputFormat implements Tabextension
}
}
}
// @codeCoverageIgnoreEnd

2
modules/doc/application/controllers/IndexController.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -34,4 +33,3 @@ class Doc_IndexController extends DocController
$this->populateView();
}
}
// @codingStandardsIgnoreEnd

2
modules/doc/application/controllers/ModuleController.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
@ -44,4 +43,3 @@ class Doc_ModuleController extends DocController
$this->_helper->redirector->gotoSimpleAndExit('view', null, null, array('name' => $moduleName));
}
}
// @codingStandardsIgnoreEnd

2
modules/monitoring/application/controllers/ChartController.php
View File

@ -250,7 +250,7 @@ class Monitoring_ChartController extends Controller
(int) $query->hosts_unreachable_unhandled . ' Unreachable Hosts (Unhandled)',
(int) $query->hosts_pending . ' Pending Hosts'
)
),array(
), array(
'data' => array(
// (int) $query->services_ok,
(int) $query->services_warning_unhandled,

2
modules/monitoring/application/controllers/CommandController.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -1118,4 +1117,3 @@ class Monitoring_CommandController extends Controller
}
}
}
// @codingStandardsIgnoreStop

2
modules/monitoring/application/controllers/ConfigController.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -285,4 +284,3 @@ class Monitoring_ConfigController extends ModuleActionController
return $instanceCfg && $instanceCfg->get($instance);
}
}
// @codingStandardsIgnoreEnd

3
modules/monitoring/application/controllers/ProcessController.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -103,5 +102,3 @@ class Monitoring_ProcessController extends MonitoringController
->getQuery()->fetchAll();
}
}
// @codingStandardsIgnoreStop

2
modules/monitoring/application/controllers/ShowController.php
View File

@ -27,7 +27,6 @@
*/
// {{{ICINGA_LICENSE_HEADER}}}
// @codingStandardsIgnoreStart
use Icinga\Application\Benchmark;
use Icinga\Web\Hook;
use Icinga\Web\Widget\Tabs;
@ -190,4 +189,3 @@ class Monitoring_ShowController extends Controller
->extend(new DashboardAction());
}
}
// @codingStandardsIgnoreEnd

2
modules/monitoring/application/views/helpers/CheckPerformance.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -75,4 +74,3 @@ class Zend_View_Helper_CheckPerformance extends Zend_View_Helper_Abstract
return $out;
}
}
// @codingStandardsIgnoreStop

4
modules/monitoring/application/views/helpers/CommandForm.php
View File

@ -1,6 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -204,5 +202,3 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
return $out;
}
}
// @codingStandardsIgnoreStop

2
modules/monitoring/application/views/helpers/MonitoringProperties.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -308,4 +307,3 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract
return $type;
}
}
// @codingStandardsIgnoreStop

2
modules/monitoring/application/views/helpers/RuntimeVariables.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -63,4 +62,3 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
return $out;
}
}
// @codingStandardsIgnoreStop

4
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -13,6 +13,10 @@
$cf = $this->getHelper('CommandForm');
if (count($comments) === 0) {
echo t('No comments matching the filter');
}
foreach ($comments as $comment):
?>

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

@ -5,6 +5,13 @@
<?php endif ?>
<div class="content">
<div class="boxview" data-base-target="_next">
<?php
if (count($groupData) === 0) {
echo t('No contacts matching the filter');
}
?>
<?php foreach ($groupData as $groupName => $groupInfo): ?>
<div class="box contactgroup">
<h2><?= $groupInfo['alias']; ?></h2>

5
modules/monitoring/application/views/scripts/list/contacts.phtml
View File

@ -27,6 +27,11 @@ $contactHelper = $this->getHelper('ContactFlags');
<table class="table table-condensed pull-left">
<tbody>
<?php
if (count($contacts) === 0) {
echo t('No contacts matching the filter');
}
?>
<?php foreach($contacts as $contact): ?>
<?php $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
<tr>

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

@ -12,6 +12,11 @@ $helper = $this->getHelper('CommandForm');
<div class="content downtimes">
<table data-base-target="_next" class="action">
<tbody>
<?php
if (count($downtimes) === 0) {
echo t('No downtimes matching the filter');
}
?>
<?php foreach ($this->downtimes as $downtime): ?>
<tr>
<td>

5
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -14,6 +14,11 @@
<table data-base-target="_next" class="action">
<tbody>
<?php
if (count($history) === 0) {
echo t('No history events matching the filter');
}
?>
<?php foreach ($history as $event): ?>
<?php
$class = null;

6
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -5,6 +5,12 @@
<?php endif ?>
<div class="content">
<div class="boxview" data-base-target="_next">
<?php
if (count($hostgroups) === 0) {
echo t('No host groups matching the filter');
}
?>
<?php foreach($hostgroups as $h): ?>
<div class="box hostgroup">
<h2>

15
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -20,14 +20,13 @@ if (! $this->compact): ?>
<?php
endif;
if ($hosts->count() === 0): ?>
<?= $this->translate('No host found') ?>
<?php if (! $this->compact): ?>
</div>
<?php
endif;
return;
endif;
if ($hosts->count() === 0) {
echo t('No hosts matching the filter');
if (! $this->compact) {
echo '</div>';
}
return;
}
?>
<table

3
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -22,6 +22,9 @@ if (empty($this->notifications)) {
<tbody>
<?php
if (count($notifications) === 0) {
echo t('No notifications matching the filter');
}
foreach ($notifications as $notification):
if (isset($notification->service)) {

6
modules/monitoring/application/views/scripts/list/servicegroups.phtml
View File

@ -5,6 +5,12 @@
<?php endif ?>
<div class="content">
<div class="boxview" data-base-target="_next">
<?php
if (count($servicegroups) === 0) {
echo t('No service groups matching the filter');
}
?>
<?php foreach($servicegroups as $servicegroup): ?>
<div class="box servicegroup">
<h2>

2
modules/monitoring/application/views/scripts/list/servicematrix.phtml
View File

@ -23,7 +23,7 @@ $hostFilter = '(' . implode('|', array_keys($pivotData)) . ')';
?>
<?php if (count($pivotData) === 0): ?>
<?= $this->translate('No Service Found'); ?>
<?= $this->translate('No Services matching the filter'); ?>
<?php endif ?>
<?php foreach ($pivotData as $host_name => $serviceStates): ?>

3
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -29,6 +29,9 @@ if (!$this->compact): ?>
<tbody>
<?php
if (count($services) === 0) {
echo t('No services matching the filter');
}
foreach ($services as $service):
$serviceLink = $this->href(
'monitoring/show/service',

4
modules/monitoring/application/views/scripts/list/statehistorysummary.phtml
View File

@ -7,6 +7,10 @@
$grid->setColor('#FC0707');
$data = array();
if (count($summary) === 0) {
echo t('No history entry matching the filter');
}
foreach ($summary as $entry) {
$day = $entry->day;
$value = $entry->cnt_critical;

19
modules/monitoring/application/views/scripts/multi/host.phtml
View File

@ -9,8 +9,10 @@ $this->target = array('host' => $this->hostquery);
</div>
<div class="content">
<?php if (count($objects) === 0): ?>
<?= t('No hosts matching the filter'); ?>
<?php else: ?>
<h1> Summary for <?= count($objects) ?> hosts </h1>
<?= $this->render('multi/components/objectlist.phtml'); ?>
<table class="avp">
<tr>
@ -38,15 +40,16 @@ $this->target = array('host' => $this->hostquery);
<h2> <?=$this->icon('hostgroup.png')?> Host Actions </h2>
<table class="avp newsection">
<tbody>
<?= $this->render('multi/components/summary.phtml'); ?>
<?= $this->render('multi/components/comments.phtml'); ?>
<?= $this->render('multi/components/downtimes.phtml'); ?>
</tbody>
</table>
<table class="avp newsection">
<tbody>
<?= $this->render('multi/components/summary.phtml'); ?>
<?= $this->render('multi/components/comments.phtml'); ?>
<?= $this->render('multi/components/downtimes.phtml'); ?>
</tbody>
</table>
<?= $this->render('multi/components/flags.phtml') ?>
<?php endif ?>
</div>
<a

4
modules/monitoring/application/views/scripts/multi/service.phtml
View File

@ -13,6 +13,9 @@ $this->target = array(
</div>
<div class="content">
<?php if (count($objects) === 0): ?>
<?= t('No services matching the filter'); ?>
<?php else: ?>
<h1> Summary for <?= count($objects) ?> services </h1>
<table style="width: 100%; font-size: 0.8em;">
@ -54,4 +57,5 @@ $this->target = array(
</table>
<?= $this->render('multi/components/flags.phtml') ?>
<?php endif ?>
</div>

56
modules/monitoring/application/views/scripts/show/host.phtml
View File

@ -1,27 +1,31 @@
<div class="controls">
<?= $this->render('show/components/header.phtml') ?>
<h1><?= $this->translate("This host's current state") ?></h1>
</div>
<div class="content" data-base-target="_next">
<?= $this->render('show/components/output.phtml') ?>
<?= $this->render('show/components/grapher.phtml') ?>
<?php if ($object->host_name !== false): ?>
<div class="controls">
<?= $this->render('show/components/header.phtml') ?>
<h1><?= $this->translate("This host's current state") ?></h1>
</div>
<div class="content" data-base-target="_next">
<?= $this->render('show/components/output.phtml') ?>
<?= $this->render('show/components/grapher.phtml') ?>
<table class="avp newsection">
<tbody>
<?= $this->render('show/components/acknowledgement.phtml') ?>
<?= $this->render('show/components/comments.phtml') ?>
<?= $this->render('show/components/notifications.phtml') ?>
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/hostgroups.phtml') ?>
<?= $this->render('show/components/contacts.phtml') ?>
<?= $this->render('show/components/checkstatistics.phtml') ?>
<?= $this->render('show/components/customvars.phtml') ?>
<?= $this->render('show/components/flags.phtml') ?>
</tbody>
</table>
</div>
<table class="avp newsection">
<tbody>
<?= $this->render('show/components/acknowledgement.phtml') ?>
<?= $this->render('show/components/comments.phtml') ?>
<?= $this->render('show/components/notifications.phtml') ?>
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/hostgroups.phtml') ?>
<?= $this->render('show/components/contacts.phtml') ?>
<?= $this->render('show/components/checkstatistics.phtml') ?>
<?= $this->render('show/components/customvars.phtml') ?>
<?= $this->render('show/components/flags.phtml') ?>
</tbody>
</table>
</div>
<?php else: ?>
<p> Host not found </p>
<?php endif ?>

56
modules/monitoring/application/views/scripts/show/service.phtml
View File

@ -1,27 +1,31 @@
<div class="controls">
<?= $this->render('show/components/header.phtml') ?>
<h1><?= $this->translate("This service's current state") ?></h1>
</div>
<div class="content" data-base-target="_next">
<?= $this->render('show/components/output.phtml') ?>
<?= $this->render('show/components/grapher.phtml') ?>
<?php if ($object->host_name !== false): ?>
<div class="controls">
<?= $this->render('show/components/header.phtml') ?>
<h1><?= $this->translate("This service's current state") ?></h1>
</div>
<div class="content" data-base-target="_next">
<?= $this->render('show/components/output.phtml') ?>
<?= $this->render('show/components/grapher.phtml') ?>
<table class="avp newsection">
<tbody>
<?= $this->render('show/components/acknowledgement.phtml') ?>
<?= $this->render('show/components/comments.phtml') ?>
<?= $this->render('show/components/notifications.phtml') ?>
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/servicegroups.phtml') ?>
<?= $this->render('show/components/contacts.phtml') ?>
<?= $this->render('show/components/checkstatistics.phtml') ?>
<?= $this->render('show/components/customvars.phtml') ?>
<?= $this->render('show/components/flags.phtml') ?>
</tbody>
</table>
</div>
<table class="avp newsection">
<tbody>
<?= $this->render('show/components/acknowledgement.phtml') ?>
<?= $this->render('show/components/comments.phtml') ?>
<?= $this->render('show/components/notifications.phtml') ?>
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/servicegroups.phtml') ?>
<?= $this->render('show/components/contacts.phtml') ?>
<?= $this->render('show/components/checkstatistics.phtml') ?>
<?= $this->render('show/components/customvars.phtml') ?>
<?= $this->render('show/components/flags.phtml') ?>
</tbody>
</table>
</div>
<?php else: ?>
<p> Service not found </p>
<?php endif ?>

3
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -103,5 +102,3 @@ class GroupSummaryQuery extends IdoQuery
);
}
}
// @codingStandardsIgnoreStop

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -1,5 +1,4 @@
<?php
// @codingStandardsIgnoreStart
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga Web 2.
@ -538,4 +537,3 @@ class StatusQuery extends IdoQuery
);
}
}
// @codingStandardsIgnoreStop

Some files were not shown because too many files have changed in this diff Show More