From 338d067aba41dd6e9178cebec5433eecd614196e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 3 Feb 2015 15:49:34 +0100 Subject: [PATCH] Add license header fixes #7788 --- Vagrantfile | 2 ++ .../clicommands/AutocompleteCommand.php | 3 +-- application/clicommands/HelpCommand.php | 3 +-- application/clicommands/ModuleCommand.php | 3 +-- application/clicommands/WebCommand.php | 3 +-- .../controllers/AuthenticationController.php | 3 +-- application/controllers/ConfigController.php | 1 + .../controllers/DashboardController.php | 3 +-- application/controllers/ErrorController.php | 1 + application/controllers/FilterController.php | 3 +-- application/controllers/IndexController.php | 3 +-- application/controllers/LayoutController.php | 3 +-- application/controllers/ListController.php | 3 +-- .../controllers/PreferenceController.php | 3 +-- application/controllers/RolesController.php | 1 + application/controllers/SearchController.php | 3 +-- application/controllers/StaticController.php | 3 +-- .../forms/Authentication/LoginForm.php | 3 +-- .../Config/Authentication/DbBackendForm.php | 3 +-- .../Authentication/ExternalBackendForm.php | 3 +-- .../Config/Authentication/LdapBackendForm.php | 3 +-- .../AuthenticationBackendConfigForm.php | 3 +-- .../AuthenticationBackendReorderForm.php | 3 +-- .../Config/General/ApplicationConfigForm.php | 3 +-- .../Config/General/LoggingConfigForm.php | 3 +-- .../forms/Config/GeneralConfigForm.php | 3 +-- .../forms/Config/Resource/DbResourceForm.php | 3 +-- .../Config/Resource/FileResourceForm.php | 3 +-- .../Config/Resource/LdapResourceForm.php | 3 +-- .../Resource/LivestatusResourceForm.php | 3 +-- .../forms/Config/ResourceConfigForm.php | 3 +-- application/forms/ConfigForm.php | 3 +-- application/forms/ConfirmRemovalForm.php | 3 +-- application/forms/Dashboard/DashletForm.php | 3 +-- application/forms/LdapDiscoveryForm.php | 3 +-- application/forms/PreferenceForm.php | 3 +-- application/forms/Security/RoleForm.php | 3 +-- application/views/helpers/DateFormat.php | 3 +-- application/views/helpers/FormDateTime.php | 3 +-- application/views/helpers/FormNumber.php | 3 +-- .../views/helpers/FormTriStateCheckbox.php | 3 +-- application/views/helpers/Util.php | 3 +-- bin/icingacli | 3 +-- bin/license_writer.py | 3 +-- etc/bash_completion.d/icingacli | 3 --- etc/schema/mysql.schema.sql | 2 ++ etc/schema/pgsql.schema.sql | 19 +++------------ icingaweb2.spec | 2 ++ .../Application/ApplicationBootstrap.php | 3 +-- library/Icinga/Application/Benchmark.php | 3 +-- library/Icinga/Application/Cli.php | 3 +-- library/Icinga/Application/Config.php | 3 +-- library/Icinga/Application/EmbeddedWeb.php | 3 +-- library/Icinga/Application/Icinga.php | 3 +-- library/Icinga/Application/LegacyWeb.php | 3 +-- library/Icinga/Application/Loader.php | 3 +-- library/Icinga/Application/Logger.php | 3 +-- .../Icinga/Application/Logger/LogWriter.php | 3 +-- .../Application/Logger/Writer/FileWriter.php | 3 +-- .../Logger/Writer/StdoutWriter.php | 2 +- .../Logger/Writer/SyslogWriter.php | 3 +-- .../Icinga/Application/Modules/Manager.php | 3 +-- library/Icinga/Application/Modules/Module.php | 3 +-- library/Icinga/Application/Platform.php | 3 +-- library/Icinga/Application/Web.php | 3 +-- library/Icinga/Application/functions.php | 3 +-- library/Icinga/Application/webrouter.php | 3 +-- .../Icinga/Authentication/AdmissionLoader.php | 3 +-- library/Icinga/Authentication/AuthChain.php | 3 +-- .../Authentication/Backend/DbUserBackend.php | 3 +-- .../Backend/DbUserGroupBackend.php | 3 +-- .../Backend/ExternalBackend.php | 3 +-- .../Backend/IniUserGroupBackend.php | 3 +-- .../Backend/LdapUserBackend.php | 3 +-- library/Icinga/Authentication/Manager.php | 3 +-- library/Icinga/Authentication/UserBackend.php | 3 +-- .../Authentication/UserGroupBackend.php | 3 +-- library/Icinga/Chart/Axis.php | 3 +-- library/Icinga/Chart/Chart.php | 3 +-- library/Icinga/Chart/Format.php | 3 +-- library/Icinga/Chart/Graph/BarGraph.php | 3 +-- library/Icinga/Chart/Graph/LineGraph.php | 3 +-- library/Icinga/Chart/Graph/StackedGraph.php | 3 +-- library/Icinga/Chart/Graph/Tooltip.php | 5 ++-- library/Icinga/Chart/GridChart.php | 3 +-- library/Icinga/Chart/Inline/Inline.php | 3 +-- library/Icinga/Chart/Inline/PieChart.php | 3 +-- library/Icinga/Chart/Legend.php | 3 +-- library/Icinga/Chart/Palette.php | 3 +-- library/Icinga/Chart/PieChart.php | 3 +-- library/Icinga/Chart/Primitive/Animatable.php | 3 +-- library/Icinga/Chart/Primitive/Animation.php | 3 +-- library/Icinga/Chart/Primitive/Canvas.php | 3 +-- library/Icinga/Chart/Primitive/Circle.php | 3 +-- library/Icinga/Chart/Primitive/Drawable.php | 3 +-- library/Icinga/Chart/Primitive/Line.php | 3 +-- library/Icinga/Chart/Primitive/Path.php | 3 +-- library/Icinga/Chart/Primitive/PieSlice.php | 3 +-- library/Icinga/Chart/Primitive/RawElement.php | 3 +-- library/Icinga/Chart/Primitive/Rect.php | 3 +-- library/Icinga/Chart/Primitive/Styleable.php | 3 +-- library/Icinga/Chart/Primitive/Text.php | 3 +-- library/Icinga/Chart/Render/LayoutBox.php | 3 +-- library/Icinga/Chart/Render/RenderContext.php | 3 +-- library/Icinga/Chart/Render/Rotator.php | 7 ++---- library/Icinga/Chart/SVGRenderer.php | 3 +-- library/Icinga/Chart/Unit/AxisUnit.php | 3 +-- library/Icinga/Chart/Unit/CalendarUnit.php | 3 +-- library/Icinga/Chart/Unit/LinearUnit.php | 3 +-- library/Icinga/Chart/Unit/LogarithmicUnit.php | 3 +-- library/Icinga/Chart/Unit/StaticAxis.php | 3 +-- library/Icinga/Cli/AnsiScreen.php | 3 +-- library/Icinga/Cli/Command.php | 3 +-- library/Icinga/Cli/Documentation.php | 3 +-- .../Cli/Documentation/CommentParser.php | 3 +-- library/Icinga/Cli/Loader.php | 3 +-- library/Icinga/Cli/Params.php | 3 +-- library/Icinga/Cli/Screen.php | 3 +-- library/Icinga/Data/Browsable.php | 3 +-- library/Icinga/Data/ConfigObject.php | 3 +-- library/Icinga/Data/ConnectionInterface.php | 3 +-- .../Icinga/Data/DataArray/ArrayDatasource.php | 5 ++-- library/Icinga/Data/Db/DbConnection.php | 3 +-- library/Icinga/Data/Db/DbQuery.php | 3 +-- library/Icinga/Data/Fetchable.php | 3 +-- library/Icinga/Data/Filter/Filter.php | 3 +-- library/Icinga/Data/Filter/FilterAnd.php | 5 ++-- library/Icinga/Data/Filter/FilterChain.php | 7 +++--- library/Icinga/Data/Filter/FilterEqual.php | 3 +-- .../Data/Filter/FilterEqualOrGreaterThan.php | 3 +-- .../Data/Filter/FilterEqualOrLessThan.php | 3 +-- .../Icinga/Data/Filter/FilterException.php | 3 +-- .../Icinga/Data/Filter/FilterExpression.php | 3 +-- .../Icinga/Data/Filter/FilterGreaterThan.php | 3 +-- library/Icinga/Data/Filter/FilterLessThan.php | 3 +-- library/Icinga/Data/Filter/FilterMatch.php | 3 +-- library/Icinga/Data/Filter/FilterMatchNot.php | 3 +-- library/Icinga/Data/Filter/FilterNot.php | 3 +-- library/Icinga/Data/Filter/FilterNotEqual.php | 3 +-- library/Icinga/Data/Filter/FilterOr.php | 3 +-- .../Data/Filter/FilterParseException.php | 3 +-- .../Icinga/Data/Filter/FilterQueryString.php | 3 +-- library/Icinga/Data/Filterable.php | 3 +-- library/Icinga/Data/Identifiable.php | 3 +-- library/Icinga/Data/Limitable.php | 3 +-- library/Icinga/Data/PivotTable.php | 3 +-- library/Icinga/Data/QueryInterface.php | 3 +-- library/Icinga/Data/Queryable.php | 3 +-- library/Icinga/Data/ResourceFactory.php | 3 +-- library/Icinga/Data/Selectable.php | 3 +-- library/Icinga/Data/SimpleQuery.php | 3 +-- library/Icinga/Data/Sortable.php | 3 +-- library/Icinga/Data/Tree/Node.php | 3 +-- library/Icinga/Data/Tree/NodeInterface.php | 3 +-- .../Exception/AuthenticationException.php | 3 +-- .../Icinga/Exception/ConfigurationError.php | 3 +-- library/Icinga/Exception/IcingaException.php | 3 +-- .../Exception/InvalidPropertyException.php | 3 +-- .../Exception/MissingParameterException.php | 3 +-- library/Icinga/Exception/NotFoundError.php | 3 +-- .../Icinga/Exception/NotImplementedError.php | 3 +-- library/Icinga/Exception/NotReadableError.php | 3 +-- library/Icinga/Exception/NotWritableError.php | 3 +-- library/Icinga/Exception/ProgrammingError.php | 3 +-- library/Icinga/Exception/QueryException.php | 3 +-- .../Exception/SystemPermissionException.php | 3 +-- library/Icinga/File/Csv.php | 3 +-- .../File/FileExtensionFilterIterator.php | 3 +-- library/Icinga/File/Ini/IniEditor.php | 3 +-- library/Icinga/File/Ini/IniWriter.php | 3 +-- library/Icinga/File/NonEmptyFileIterator.php | 3 +-- library/Icinga/File/Pdf.php | 3 +-- library/Icinga/Protocol/Dns.php | 3 +-- .../File/Exception/FileReaderException.php | 2 +- library/Icinga/Protocol/File/FileIterator.php | 3 +-- library/Icinga/Protocol/File/FileQuery.php | 3 +-- library/Icinga/Protocol/File/FileReader.php | 3 +-- library/Icinga/Protocol/Ldap/Connection.php | 3 +-- library/Icinga/Protocol/Ldap/Discovery.php | 5 ++-- library/Icinga/Protocol/Ldap/Exception.php | 3 +-- library/Icinga/Protocol/Ldap/LdapUtils.php | 3 +-- library/Icinga/Protocol/Ldap/Node.php | 3 +-- library/Icinga/Protocol/Ldap/Query.php | 3 +-- library/Icinga/Protocol/Ldap/Root.php | 3 +-- .../Icinga/Protocol/Livestatus/Connection.php | 5 ++-- library/Icinga/Protocol/Livestatus/Query.php | 9 ++++---- .../Protocol/Livestatus/ResponseRow.php | 1 + library/Icinga/Protocol/Nrpe/Connection.php | 3 +-- library/Icinga/Protocol/Nrpe/Packet.php | 3 +-- library/Icinga/Security/SecurityException.php | 1 + library/Icinga/Test/BaseTestCase.php | 3 +-- library/Icinga/Test/DbTest.php | 3 +-- library/Icinga/User.php | 3 +-- library/Icinga/User/Preferences.php | 3 +-- .../User/Preferences/PreferencesStore.php | 3 +-- .../Icinga/User/Preferences/Store/DbStore.php | 3 +-- .../User/Preferences/Store/IniStore.php | 3 +-- library/Icinga/Util/Color.php | 3 +-- library/Icinga/Util/ConfigAwareFactory.php | 3 +-- library/Icinga/Util/DateTimeFactory.php | 3 +-- library/Icinga/Util/Dimension.php | 3 +-- .../Icinga/Util/EnumeratingFilterIterator.php | 3 +-- library/Icinga/Util/File.php | 3 +-- library/Icinga/Util/Format.php | 3 +-- library/Icinga/Util/String.php | 3 +-- library/Icinga/Util/TimezoneDetect.php | 3 +-- library/Icinga/Util/Translator.php | 3 +-- library/Icinga/Web/Controller.php | 1 + .../Web/Controller/ActionController.php | 1 + .../Controller/BasePreferenceController.php | 3 +-- .../Web/Controller/ControllerTabCollector.php | 3 +-- .../Web/Controller/ModuleActionController.php | 3 +-- library/Icinga/Web/FileCache.php | 2 +- library/Icinga/Web/Form.php | 1 + .../Web/Form/Decorator/ConditionalHidden.php | 3 +-- .../Web/Form/Decorator/ElementDoubler.php | 3 +-- .../Web/Form/Decorator/NoScriptApply.php | 3 +-- library/Icinga/Web/Form/Element/Button.php | 3 +-- .../Web/Form/Element/CsrfCounterMeasure.php | 3 +-- .../Web/Form/Element/DateTimePicker.php | 3 +-- library/Icinga/Web/Form/Element/Note.php | 3 +-- library/Icinga/Web/Form/Element/Number.php | 3 +-- .../Web/Form/Element/TriStateCheckbox.php | 3 +-- library/Icinga/Web/Form/FormElement.php | 3 +-- .../Web/Form/InvalidCSRFTokenException.php | 3 +-- .../Form/Validator/DateFormatValidator.php | 3 +-- .../Web/Form/Validator/DateTimeValidator.php | 3 +-- .../Form/Validator/ReadablePathValidator.php | 3 +-- .../Form/Validator/TimeFormatValidator.php | 3 +-- .../Web/Form/Validator/TriStateValidator.php | 3 +-- .../Form/Validator/WritablePathValidator.php | 3 +-- library/Icinga/Web/Hook.php | 3 +-- library/Icinga/Web/Hook/GrapherHook.php | 3 +-- library/Icinga/Web/Hook/TicketHook.php | 3 +-- library/Icinga/Web/Hook/WebBaseHook.php | 5 ++-- library/Icinga/Web/JavaScript.php | 3 +-- library/Icinga/Web/LessCompiler.php | 3 +-- library/Icinga/Web/Menu.php | 3 +-- .../Web/Menu/ForeignMenuItemRenderer.php | 3 +-- library/Icinga/Web/Menu/MenuItemRenderer.php | 3 +-- .../Web/Menu/MonitoringMenuItemRenderer.php | 3 +-- .../Web/Menu/ProblemMenuItemRenderer.php | 1 + .../Menu/UnhandledHostMenuItemRenderer.php | 1 + .../Menu/UnhandledServiceMenuItemRenderer.php | 1 + library/Icinga/Web/MenuRenderer.php | 3 +-- library/Icinga/Web/Notification.php | 3 +-- .../Web/Paginator/Adapter/QueryAdapter.php | 3 +-- .../ScrollingStyle/SlidingWithBorder.php | 5 ++-- library/Icinga/Web/Request.php | 3 +-- library/Icinga/Web/Response.php | 3 +-- library/Icinga/Web/Session.php | 3 +-- library/Icinga/Web/Session/PhpSession.php | 3 +-- library/Icinga/Web/Session/Session.php | 3 +-- .../Icinga/Web/Session/SessionNamespace.php | 3 +-- library/Icinga/Web/StyleSheet.php | 3 +-- library/Icinga/Web/Url.php | 3 +-- library/Icinga/Web/UrlParams.php | 5 ++-- library/Icinga/Web/View.php | 3 +-- library/Icinga/Web/View/DateTimeRenderer.php | 3 +-- library/Icinga/Web/View/helpers/format.php | 3 +-- library/Icinga/Web/View/helpers/generic.php | 3 +-- library/Icinga/Web/View/helpers/url.php | 5 ++-- library/Icinga/Web/ViewStream.php | 3 +-- library/Icinga/Web/Widget.php | 3 +-- library/Icinga/Web/Widget/AbstractWidget.php | 3 +-- .../Web/Widget/Chart/HistoryColorGrid.php | 3 +-- library/Icinga/Web/Widget/Chart/InlinePie.php | 3 +-- library/Icinga/Web/Widget/Dashboard.php | 3 +-- .../Icinga/Web/Widget/Dashboard/Dashlet.php | 3 +-- library/Icinga/Web/Widget/Dashboard/Pane.php | 3 +-- .../Web/Widget/Dashboard/UserWidget.php | 3 +-- library/Icinga/Web/Widget/FilterEditor.php | 9 ++++---- library/Icinga/Web/Widget/FilterWidget.php | 5 ++-- library/Icinga/Web/Widget/Limiter.php | 3 +-- library/Icinga/Web/Widget/SearchDashboard.php | 3 +-- library/Icinga/Web/Widget/SortBox.php | 3 +-- library/Icinga/Web/Widget/Tab.php | 3 +-- .../Web/Widget/Tabextension/BasketAction.php | 3 +-- .../Widget/Tabextension/DashboardAction.php | 3 +-- .../Widget/Tabextension/DashboardSettings.php | 5 ++-- .../Web/Widget/Tabextension/OutputFormat.php | 3 +-- .../Web/Widget/Tabextension/Tabextension.php | 3 +-- library/Icinga/Web/Widget/Tabs.php | 3 +-- library/Icinga/Web/Widget/Widget.php | 3 +-- library/Icinga/Web/Window.php | 3 +-- library/Icinga/Web/Wizard.php | 3 +-- .../controllers/IcingawebController.php | 3 +-- .../controllers/IndexController.php | 3 +-- .../controllers/ModuleController.php | 3 +-- .../controllers/StyleController.php | 1 + modules/doc/configuration.php | 3 +-- modules/doc/library/Doc/DocController.php | 3 +-- modules/doc/library/Doc/DocIterator.php | 3 +-- modules/doc/library/Doc/DocParser.php | 3 +-- modules/doc/library/Doc/DocTree.php | 3 +-- .../Exception/ChapterNotFoundException.php | 3 +-- .../Doc/Exception/DocEmptyException.php | 3 +-- .../library/Doc/Exception/DocException.php | 3 +-- modules/doc/library/Doc/Renderer.php | 3 +-- modules/doc/library/Doc/Section.php | 3 +-- .../doc/library/Doc/SectionFilterIterator.php | 3 +-- modules/doc/library/Doc/SectionRenderer.php | 3 +-- modules/doc/library/Doc/TocRenderer.php | 3 +-- modules/doc/public/css/module.less | 2 ++ modules/doc/run.php | 1 + .../clicommands/ConferenceCommand.php | 3 +-- .../application/clicommands/ListCommand.php | 3 +-- .../application/clicommands/NrpeCommand.php | 3 +-- .../controllers/AlertsummaryController.php | 3 +-- .../controllers/ChartController.php | 3 +-- .../controllers/ConfigController.php | 3 +-- .../controllers/HostController.php | 3 +-- .../controllers/HostsController.php | 3 +-- .../controllers/ListController.php | 1 + .../controllers/ProcessController.php | 3 +-- .../controllers/ServiceController.php | 3 +-- .../controllers/ServicesController.php | 3 +-- .../controllers/ShowController.php | 3 +-- .../controllers/TacticalController.php | 3 +-- .../controllers/TimelineController.php | 3 +-- .../application/forms/Command/CommandForm.php | 3 +-- .../DisableNotificationsExpireCommandForm.php | 3 +-- .../ToggleInstanceFeaturesCommandForm.php | 3 +-- .../Object/AcknowledgeProblemCommandForm.php | 3 +-- .../Command/Object/AddCommentCommandForm.php | 3 +-- .../Command/Object/CheckNowCommandForm.php | 3 +-- .../Object/DeleteCommentCommandForm.php | 3 +-- .../Object/DeleteDowntimeCommandForm.php | 3 +-- .../Command/Object/ObjectsCommandForm.php | 3 +-- .../Object/ProcessCheckResultCommandForm.php | 3 +-- .../RemoveAcknowledgementCommandForm.php | 3 +-- .../Object/ScheduleHostCheckCommandForm.php | 3 +-- .../ScheduleHostDowntimeCommandForm.php | 3 +-- .../ScheduleServiceCheckCommandForm.php | 3 +-- .../ScheduleServiceDowntimeCommandForm.php | 3 +-- .../ToggleObjectFeaturesCommandForm.php | 3 +-- .../forms/Config/BackendConfigForm.php | 3 +-- .../Config/Instance/LocalInstanceForm.php | 3 +-- .../Config/Instance/RemoteInstanceForm.php | 3 +-- .../forms/Config/InstanceConfigForm.php | 3 +-- .../forms/Config/SecurityConfigForm.php | 3 +-- .../application/forms/EventOverviewForm.php | 3 +-- .../application/forms/Setup/BackendPage.php | 3 +-- .../forms/Setup/IdoResourcePage.php | 3 +-- .../application/forms/Setup/InstancePage.php | 3 +-- .../forms/Setup/LivestatusResourcePage.php | 3 +-- .../application/forms/Setup/SecurityPage.php | 3 +-- .../application/forms/Setup/WelcomePage.php | 3 +-- .../application/forms/StatehistoryForm.php | 3 +-- .../views/helpers/CheckPerformance.php | 3 +-- .../views/helpers/ContactFlags.php | 3 +-- .../application/views/helpers/Customvar.php | 1 + .../application/views/helpers/Link.php | 1 + .../views/helpers/MonitoringFlags.php | 3 +-- .../application/views/helpers/Perfdata.php | 3 +-- .../views/helpers/PluginOutput.php | 3 +-- .../views/helpers/ResolveMacros.php | 3 +-- .../views/helpers/RuntimeVariables.php | 3 +-- .../views/helpers/SelectionToolbar.php | 3 +-- modules/monitoring/configuration.php | 1 + .../monitoring/library/Monitoring/Backend.php | 1 + .../Monitoring/Backend/Ido/IdoBackend.php | 1 + .../Backend/Ido/Query/AllcontactsQuery.php | 3 +-- .../Backend/Ido/Query/CommandQuery.php | 5 ++-- .../Backend/Ido/Query/CommentQuery.php | 3 +-- .../Ido/Query/CommentdeletionhistoryQuery.php | 3 +-- .../Backend/Ido/Query/CommenthistoryQuery.php | 3 +-- .../Backend/Ido/Query/ContactQuery.php | 3 +-- .../Backend/Ido/Query/ContactgroupQuery.php | 3 +-- .../Backend/Ido/Query/CustomvarQuery.php | 3 +-- .../Backend/Ido/Query/DowntimeQuery.php | 1 + .../Ido/Query/DowntimeendhistoryQuery.php | 3 +-- .../Ido/Query/DowntimestarthistoryQuery.php | 3 +-- .../Backend/Ido/Query/EventHistoryQuery.php | 1 + .../Backend/Ido/Query/EventgridQuery.php | 3 +-- .../Backend/Ido/Query/GroupsummaryQuery.php | 3 +-- .../Backend/Ido/Query/HostgroupQuery.php | 3 +-- .../Backend/Ido/Query/HoststatusQuery.php | 3 +-- .../Monitoring/Backend/Ido/Query/IdoQuery.php | 3 +-- .../Backend/Ido/Query/NotificationQuery.php | 1 + .../Ido/Query/NotificationhistoryQuery.php | 3 +-- .../Backend/Ido/Query/ProgramstatusQuery.php | 3 +-- .../Backend/Ido/Query/RuntimesummaryQuery.php | 3 +-- .../Ido/Query/RuntimevariablesQuery.php | 3 +-- .../Backend/Ido/Query/ServicegroupQuery.php | 3 +-- .../Backend/Ido/Query/StatehistoryQuery.php | 1 + .../Backend/Ido/Query/StatusQuery.php | 3 +-- .../Backend/Ido/Query/StatusSummaryQuery.php | 3 +-- .../Backend/Livestatus/LivestatusBackend.php | 1 + .../Livestatus/Query/DowntimeQuery.php | 3 +-- .../Livestatus/Query/HostgroupQuery.php | 3 +-- .../Livestatus/Query/ServicegroupQuery.php | 3 +-- .../Backend/Livestatus/Query/StatusQuery.php | 3 +-- .../Livestatus/Query/StatusSummaryQuery.php | 7 +++--- .../Monitoring/Backend/MonitoringBackend.php | 1 + .../library/Monitoring/BackendStep.php | 3 +-- .../library/Monitoring/Cli/CliUtils.php | 3 +-- .../Command/Exception/TransportException.php | 3 +-- .../Monitoring/Command/IcingaCommand.php | 3 +-- .../DisableNotificationsExpireCommand.php | 3 +-- .../Instance/ToggleInstanceFeatureCommand.php | 3 +-- .../Object/AcknowledgeProblemCommand.php | 3 +-- .../Command/Object/AddCommentCommand.php | 3 +-- .../Command/Object/DeleteCommentCommand.php | 3 +-- .../Command/Object/DeleteDowntimeCommand.php | 3 +-- .../Command/Object/ObjectCommand.php | 3 +-- .../Object/ProcessCheckResultCommand.php | 3 +-- .../Object/PropagateHostDowntimeCommand.php | 3 +-- .../Object/RemoveAcknowledgementCommand.php | 3 +-- .../Object/ScheduleHostCheckCommand.php | 3 +-- .../Object/ScheduleHostDowntimeCommand.php | 3 +-- .../Object/ScheduleServiceCheckCommand.php | 3 +-- .../Object/ScheduleServiceDowntimeCommand.php | 3 +-- .../Object/ToggleObjectFeatureCommand.php | 3 +-- .../Command/Object/WithCommentCommand.php | 3 +-- .../IcingaCommandFileCommandRenderer.php | 1 + .../IcingaCommandRendererInterface.php | 1 + .../Command/Transport/CommandTransport.php | 3 +-- .../Transport/CommandTransportInterface.php | 3 +-- .../Command/Transport/LocalCommandFile.php | 3 +-- .../Command/Transport/RemoteCommandFile.php | 3 +-- .../library/Monitoring/Controller.php | 3 +-- .../library/Monitoring/DataView/Command.php | 5 ++-- .../library/Monitoring/DataView/Comment.php | 3 +-- .../library/Monitoring/DataView/Contact.php | 3 +-- .../Monitoring/DataView/Contactgroup.php | 3 +-- .../library/Monitoring/DataView/Customvar.php | 3 +-- .../library/Monitoring/DataView/DataView.php | 3 +-- .../library/Monitoring/DataView/Downtime.php | 3 +-- .../Monitoring/DataView/EventHistory.php | 1 + .../library/Monitoring/DataView/Eventgrid.php | 3 +-- .../Monitoring/DataView/Groupsummary.php | 3 +-- .../Monitoring/DataView/HostStatus.php | 3 +-- .../library/Monitoring/DataView/Hostgroup.php | 3 +-- .../Monitoring/DataView/Notification.php | 3 +-- .../Monitoring/DataView/Programstatus.php | 3 +-- .../Monitoring/DataView/Runtimesummary.php | 3 +-- .../Monitoring/DataView/Runtimevariables.php | 3 +-- .../Monitoring/DataView/ServiceStatus.php | 3 +-- .../Monitoring/DataView/Servicegroup.php | 3 +-- .../Monitoring/DataView/StatusSummary.php | 3 +-- .../library/Monitoring/Environment.php | 3 +-- .../Exception/UnsupportedBackendException.php | 3 +-- .../library/Monitoring/InstanceStep.php | 3 +-- .../library/Monitoring/MonitoringWizard.php | 3 +-- .../library/Monitoring/Object/Host.php | 3 +-- .../library/Monitoring/Object/HostList.php | 1 + .../Monitoring/Object/MonitoredObject.php | 3 +-- .../library/Monitoring/Object/ObjectList.php | 1 + .../library/Monitoring/Object/Service.php | 3 +-- .../library/Monitoring/Object/ServiceList.php | 1 + .../monitoring/library/Monitoring/Plugin.php | 3 +-- .../library/Monitoring/Plugin/Perfdata.php | 3 +-- .../library/Monitoring/Plugin/PerfdataSet.php | 3 +-- .../library/Monitoring/SecurityStep.php | 5 ++-- .../library/Monitoring/Timeline/TimeEntry.php | 3 +-- .../library/Monitoring/Timeline/TimeLine.php | 3 +-- .../library/Monitoring/Timeline/TimeRange.php | 3 +-- .../Controller/MonitoredObjectController.php | 1 + .../Monitoring/Web/Hook/HostActionsHook.php | 1 + .../Web/Hook/TimelineProviderHook.php | 3 +-- .../Monitoring/Web/Widget/SelectBox.php | 5 ++-- modules/monitoring/public/css/module.less | 7 +++--- modules/monitoring/public/js/module.js | 3 +-- .../views/helpers/MonitoringFlagsTest.php | 3 +-- .../views/helpers/ResolveMacrosTest.php | 3 +-- .../Monitoring/Plugin/PerfdataSetTest.php | 3 +-- .../Monitoring/Plugin/PerfdataTest.php | 3 +-- .../test/php/regression/Bug6088Test.php | 3 +-- .../test/php/regression/Bug7043Test.php | 3 ++- .../application/clicommands/ConfigCommand.php | 3 +-- .../application/clicommands/TokenCommand.php | 3 +-- .../controllers/IndexController.php | 3 +-- .../application/forms/AdminAccountPage.php | 3 +-- .../application/forms/AuthBackendPage.php | 3 +-- .../application/forms/AuthenticationPage.php | 3 +-- .../forms/DatabaseCreationPage.php | 3 +-- .../application/forms/DbResourcePage.php | 3 +-- .../application/forms/GeneralConfigPage.php | 3 +-- .../forms/LdapDiscoveryConfirmPage.php | 3 +-- .../application/forms/LdapDiscoveryPage.php | 3 +-- .../application/forms/LdapResourcePage.php | 3 +-- .../setup/application/forms/ModulePage.php | 3 +-- .../application/forms/PreferencesPage.php | 3 +-- .../application/forms/RequirementsPage.php | 3 +-- .../setup/application/forms/SummaryPage.php | 3 +-- .../setup/application/forms/WelcomePage.php | 3 +-- .../Setup/Exception/SetupException.php | 5 ++-- modules/setup/library/Setup/Requirements.php | 3 +-- modules/setup/library/Setup/Setup.php | 3 +-- modules/setup/library/Setup/SetupWizard.php | 3 +-- modules/setup/library/Setup/Step.php | 3 +-- .../Setup/Steps/AuthenticationStep.php | 3 +-- .../library/Setup/Steps/DatabaseStep.php | 3 +-- .../library/Setup/Steps/GeneralConfigStep.php | 3 +-- .../library/Setup/Steps/ResourceStep.php | 3 +-- modules/setup/library/Setup/Utils/DbTool.php | 3 +-- .../library/Setup/Utils/EnableModuleStep.php | 3 +-- .../setup/library/Setup/Utils/MakeDirStep.php | 3 +-- .../Web/Form/Validator/TokenValidator.php | 3 +-- modules/setup/library/Setup/WebWizard.php | 3 +-- modules/setup/library/Setup/Webserver.php | 3 +-- .../setup/library/Setup/Webserver/Apache.php | 3 +-- .../setup/library/Setup/Webserver/Nginx.php | 3 +-- .../application/clicommands/PhpCommand.php | 3 +-- .../clicommands/CompileCommand.php | 3 +-- .../clicommands/RefreshCommand.php | 3 +-- .../Translation/Cli/TranslationCommand.php | 3 +-- .../Util/GettextTranslationHelper.php | 3 +-- packages/files/bin/icingacli | 1 + packages/files/public/index.php | 1 + public/css/icinga/defaults.less | 3 +-- public/css/icinga/forms.less | 3 +-- public/css/icinga/header-elements.less | 3 +-- public/css/icinga/layout-colors.less | 3 +-- public/css/icinga/layout-structure.less | 3 +-- public/css/icinga/login.less | 5 ++-- public/css/icinga/main-content.less | 5 ++-- public/css/icinga/menu.less | 3 +-- public/css/icinga/monitoring-colors.less | 17 +++++++------- public/css/icinga/pagination.less | 3 +-- public/css/icinga/selection-toolbar.less | 3 +-- public/css/icinga/setup.less | 4 +++- public/css/icinga/tabs.less | 3 +-- public/css/icinga/widgets.less | 5 ++-- public/css/pdf/pdfprint.less | 3 +-- public/index.php | 3 +-- public/js/helpers.js | 3 +-- public/js/icinga.js | 3 +-- public/js/icinga/behavior/form.js | 3 +-- public/js/icinga/behavior/navigation.js | 5 ++-- public/js/icinga/behavior/sparkline.js | 3 +-- public/js/icinga/behavior/tooltip.js | 3 +-- public/js/icinga/behavior/tristate.js | 5 ++-- public/js/icinga/eventlistener.js | 3 +-- public/js/icinga/events.js | 3 +-- public/js/icinga/history.js | 3 +-- public/js/icinga/loader.js | 3 +-- public/js/icinga/logger.js | 3 +-- public/js/icinga/module.js | 3 +-- public/js/icinga/timer.js | 3 +-- public/js/icinga/timezone.js | 4 +++- public/js/icinga/ui.js | 23 +++++++++---------- public/js/icinga/utils.js | 3 +-- .../Authentication/DbBackendFormTest.php | 3 +-- .../Authentication/LdapBackendFormTest.php | 3 +-- .../AuthenticationBackendReorderFormTest.php | 3 +-- .../Config/Resource/DbResourceFormTest.php | 3 +-- .../Config/Resource/LdapResourceFormTest.php | 3 +-- .../Resource/LivestatusResourceFormTest.php | 3 +-- .../views/helpers/DateFormatTestBroken.php | 3 +-- test/php/bootstrap.php | 3 +-- .../library/Icinga/Application/ConfigTest.php | 3 +-- .../library/Icinga/Application/LoaderTest.php | 3 +-- .../library/Icinga/Chart/GraphChartTest.php | 3 +-- .../php/library/Icinga/Chart/PieChartTest.php | 5 ++-- .../library/Icinga/Data/ConfigObjectTest.php | 3 +-- .../Data/DataArray/ArrayDatasourceTest.php | 3 +-- .../library/Icinga/Data/Filter/FilterTest.php | 3 +-- test/php/library/Icinga/File/CsvTest.php | 3 +-- .../library/Icinga/File/Ini/IniWriterTest.php | 3 +-- .../Icinga/Logger/Writer/StreamWriterTest.php | 3 +-- .../Icinga/Protocol/Ldap/QueryTest.php | 3 +-- .../library/Icinga/Test/BaseTestCaseTest.php | 3 +-- .../library/Icinga/User/PreferencesTest.php | 3 +-- .../library/Icinga/User/Store/DbStoreTest.php | 3 +-- .../Icinga/User/Store/IniStoreTest.php | 3 +-- test/php/library/Icinga/UserTest.php | 3 +-- .../Icinga/Util/DateTimeFactoryTest.php | 3 +-- .../php/library/Icinga/Util/DimensionTest.php | 3 +-- test/php/library/Icinga/Util/FileTest.php | 3 +-- test/php/library/Icinga/Util/StringTest.php | 3 +-- .../library/Icinga/Util/TranslatorTest.php | 3 +-- .../Web/Form/Element/DateTimePickerTest.php | 3 +-- .../Validator/DateFormatValidatorTest.php | 3 +-- .../Validator/TimeFormatValidatorTest.php | 3 +-- .../Validator/WritablePathValidatorTest.php | 3 +-- test/php/library/Icinga/Web/FormTest.php | 3 +-- test/php/library/Icinga/Web/HookTest.php | 3 +-- test/php/library/Icinga/Web/MenuTest.php | 3 +-- .../ScrollingStyle/SlidingWithBorderTest.php | 3 +-- .../Icinga/Web/Session/PhpSessionTest.php | 3 +-- .../Web/Session/SessionNamespaceTest.php | 3 +-- test/php/library/Icinga/Web/UrlTest.php | 3 +-- .../Icinga/Web/View/DateTimeRendererTest.php | 3 +-- .../Icinga/Web/Widget/DashboardTest.php | 3 +-- .../Icinga/Web/Widget/SearchDashboardTest.php | 3 +-- test/php/regression/Bug4102Test.php | 3 +-- test/php/regression/Bug6284Test.php | 3 +-- test/php/regression/Bug6432Test.php | 3 +-- 590 files changed, 652 insertions(+), 1165 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1e5e3a073..9090b23aa 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,8 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt + VAGRANTFILE_API_VERSION = "2" VAGRANT_REQUIRED_VERSION = "1.5.0" diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php index 5a5a0e0c0..045ee8cdc 100644 --- a/application/clicommands/AutocompleteCommand.php +++ b/application/clicommands/AutocompleteCommand.php @@ -1,6 +1,5 @@ render($order, $data, $format)); } -} \ No newline at end of file +} diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php index 190e09bf9..b95fa1fc4 100644 --- a/library/Icinga/Chart/GridChart.php +++ b/library/Icinga/Chart/GridChart.php @@ -1,6 +1,5 @@ element->toSvg($ctx); return $this->rotate($ctx, $el, $this->degrees); } -} \ No newline at end of file +} diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php index da6015ceb..7de8463bb 100644 --- a/library/Icinga/Chart/SVGRenderer.php +++ b/library/Icinga/Chart/SVGRenderer.php @@ -1,6 +1,5 @@ filters as & $filter) { $filter = clone $filter; } - } + } } diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php index 66e4c06ad..1e567dbf1 100644 --- a/library/Icinga/Data/Filter/FilterEqual.php +++ b/library/Icinga/Data/Filter/FilterEqual.php @@ -1,6 +1,5 @@ matches($res)) continue; $result[] = $res; } - + if ($query->hasOrder()) { usort($result, array($query, 'compare')); } diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php index a421c7e71..94380dfa6 100644 --- a/library/Icinga/Protocol/Livestatus/Query.php +++ b/library/Icinga/Protocol/Livestatus/Query.php @@ -1,6 +1,5 @@ raw SplArray // $res -> object - // $cv -> + // $cv -> // $result -> object to be returned $result = (object) array(); $res = $this->withHeaders($row); @@ -142,7 +141,7 @@ class Query extends SimpleQuery } } - + return $result; } @@ -313,7 +312,7 @@ class Query extends SimpleQuery } elseif (is_array($col)) { foreach ($col as $k) { $columns[$k] = true; - } + } } else { $columns[$col] = true; } diff --git a/library/Icinga/Protocol/Livestatus/ResponseRow.php b/library/Icinga/Protocol/Livestatus/ResponseRow.php index d4b0fd7cb..9cb67ccf3 100644 --- a/library/Icinga/Protocol/Livestatus/ResponseRow.php +++ b/library/Icinga/Protocol/Livestatus/ResponseRow.php @@ -1,4 +1,5 @@ view; } -} \ No newline at end of file +} diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php index 9fa687042..a8913d3e7 100644 --- a/library/Icinga/Web/JavaScript.php +++ b/library/Icinga/Web/JavaScript.php @@ -1,6 +1,5 @@ reIndexAll(); - return $this; + return $this; } public function remove($param) diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php index 2122662ac..fe232af86 100644 --- a/library/Icinga/Web/View.php +++ b/library/Icinga/Web/View.php @@ -1,6 +1,5 @@ addHelperFunction('icon', function ($img, $title = null, array $propertie $properties['alt'] = $title; $properties['title'] = $title; } - + if ($class !== null) { if (isset($props['class'])) { $properties['class'] .= ' ' . $class; diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php index e5dacd879..6abf49ac3 100644 --- a/library/Icinga/Web/ViewStream.php +++ b/library/Icinga/Web/ViewStream.php @@ -1,6 +1,5 @@ filter === null) { - $this->filter = Filter::fromQueryString((string) $this->url()->getParams()); + $this->filter = Filter::fromQueryString((string) $this->url()->getParams()); } return $this->filter; } @@ -404,7 +403,7 @@ class FilterEditor extends AbstractWidget protected function renderFilterExpression(FilterExpression $filter) { if ($this->addTo && $this->addTo === $filter->getId()) { - return + return preg_replace( '/ class="autosubmit"/', ' class="autofocus"', @@ -544,7 +543,7 @@ class FilterEditor extends AbstractWidget $cols[$active] = str_replace('_', ' ', ucfirst(ltrim($active, '_'))); } - return $this->select($this->elementId('column', $filter), $cols, $active); + return $this->select($this->elementId('column', $filter), $cols, $active); } protected function applyChanges($changes) diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php index cf47ef581..bd79c25e0 100644 --- a/library/Icinga/Web/Widget/FilterWidget.php +++ b/library/Icinga/Web/Widget/FilterWidget.php @@ -1,6 +1,5 @@ renderFilter($this->filter); - + $editorUrl = clone $url; $editorUrl->setParam('modifyFilter', true); if ($this->filter->isEmpty()) { diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php index 5afa7e4b8..acc66c885 100644 --- a/library/Icinga/Web/Widget/Limiter.php +++ b/library/Icinga/Web/Widget/Limiter.php @@ -1,6 +1,5 @@ 'host_name', - + 'services_total' => 'state != 9999', 'services_problem' => 'state > 0', 'services_problem_handled' => 'state > 0 & (scheduled_downtime_depth > 0 | acknowledged = 1 | host_state > 0)', @@ -50,7 +49,7 @@ if (! array_key_exists($col, $this->available_columns)) { throw new ProgrammingError('No such column: %s', $col); } $filter = $this->filterStringToFilter($this->available_columns[$col]); - + //Filter::fromQueryString(str_replace(' ', '', $this->available_columns[$col])); $parts[] = $this->renderFilter( $filter, 'Stats', 0, false); } diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php index d165f1252..0a1baad7d 100644 --- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php +++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php @@ -1,4 +1,5 @@

' . $this->error->getMessage() . '

'; } } -} \ No newline at end of file +} diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php index bd83a42cd..112bd1e8b 100644 --- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php +++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php @@ -1,6 +1,5 @@ assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set'); } -} \ No newline at end of file +} diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php index e63e770b8..f9a73aba4 100644 --- a/modules/setup/application/clicommands/ConfigCommand.php +++ b/modules/setup/application/clicommands/ConfigCommand.php @@ -1,6 +1,5 @@ .tabs, .dontprint { display: none !important; diff --git a/public/index.php b/public/index.php index 48a500666..0062bf94f 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,4 @@ 0 ? 1 : 0; - + // fetch current value from radiobuttons var value = $target.find('input:checked').first().val(); - + $target.append( ' ' - ); + ); if (triState) { // TODO: find a better way to activate indeterminate checkboxes after load. $target.append( '' ); } diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js index ba4d7a040..8539d29ca 100644 --- a/public/js/icinga/utils.js +++ b/public/js/icinga/utils.js @@ -1,5 +1,4 @@ -// {{{ICINGA_LICENSE_HEADER}}} -// {{{ICINGA_LICENSE_HEADER}}} +/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */ /** * Icinga utility functions diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php index 6af628b06..8067b6259 100644 --- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php +++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php @@ -1,6 +1,5 @@ query('//x:path[@data-icinga-graph-type="pieslice"]'); $this->assertEquals(3, $path->length, 'Assert the correct number of datapoints being drawn as SVG bars'); } -} \ No newline at end of file +} diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php index c4b825e58..40b095267 100644 --- a/test/php/library/Icinga/Data/ConfigObjectTest.php +++ b/test/php/library/Icinga/Data/ConfigObjectTest.php @@ -1,6 +1,5 @@