Commit Graph

697 Commits

Author SHA1 Message Date
Alexander A. Klimov 9e2da07eb7 Menu: use target="_self" instead of data-base-target="_self" in logout link
refs #10330
2015-12-17 17:56:13 +01:00
Eric Lippmann 1f467ecfaa Add theme to the stylesheet if set and ...
... revamp interface of LessCompiler and StyleSheet

refs #10705
2015-11-27 16:40:17 +01:00
Eric Lippmann e7262b7d14 Set up logging in EmbeddedWeb 2015-11-27 16:39:19 +01:00
Eric Lippmann 64bed9867f lib: Add Web::getThemes()
refs #10705
2015-11-26 14:49:49 +01:00
Thomas Gelf edcc698e1e Hook: throw exceptions for missing classes
We are otherwise not catching the resulting fatal errors right now
2015-11-17 17:04:04 +01:00
Eric Lippmann fad52e0929 Update version 2015-11-16 15:34:47 +01:00
Thomas Gelf 9156e58329 Web: re-add duplicate ZF plugin loader paths
Not sure why we need both of them, my installation works with both,
one or the other. Re-adding the duplicate one as a related issue
has been reported.

refs #10634
2015-11-15 23:34:44 +01:00
Thomas Gelf 4b9607ad35 Module: we want to load from ProvidedHook
refs #10613
2015-11-13 17:37:02 +01:00
Thomas Gelf 8fa33cebc7 Hook: normalize names also for all() 2015-11-13 17:37:02 +01:00
Thomas Gelf 380f11d9c2 Module: add new provideHook method 2015-11-13 17:37:02 +01:00
Thomas Gelf b7189382fb Module: add getNamespace() method 2015-11-13 17:37:02 +01:00
Thomas Gelf 997c5a0a13 Hook: normalize names 2015-11-13 17:37:02 +01:00
Thomas Gelf b66e4dfdf2 Module: use Application\Hook instead of Web\Hook 2015-11-13 17:37:02 +01:00
Thomas Gelf 54db2c9afa Module::registerHook: use class as default key
refs #9685
2015-11-13 17:37:02 +01:00
Thomas Gelf a24bf32c5b Hook: allow hooks for old modules Web\Hooks
refs #10613
2015-11-13 17:37:02 +01:00
Thomas Gelf 52159c2627 Hook: switch base namespace checks 2015-11-13 17:37:02 +01:00
Thomas Gelf d903f850da Application\Hook: move existing ones, keep compat 2015-11-13 17:37:02 +01:00
Thomas Gelf 576747f792 Application\Hook is the new Hook loader 2015-11-13 17:37:02 +01:00
Johannes Meyer 5fcd65a05a Web: Fix that shared child menu entries were not displayed for non-owners
fixes #10319
2015-11-13 15:28:39 +01:00
Eric Lippmann d5fe0c9610 Merge branch 'feature/dope-layout-5543#2' 2015-11-13 15:21:07 +01:00
Thomas Gelf 74f53725e1 ApplicationBootstrap: phpdoc-deprecate 2015-11-13 11:53:14 +01:00
Thomas Gelf a94662492b ApplicationBootstrap: wipe setupZendAutoloader() 2015-11-13 11:53:14 +01:00
Thomas Gelf d0ce9f86d8 Module: less stat calls, less work to do 2015-11-13 11:53:14 +01:00
Thomas Gelf 99a6bc12a9 ApplicationBootstrap: register global app dir 2015-11-13 11:53:14 +01:00
Thomas Gelf 9270ef6d6f Application\Web: less assistance for class loader 2015-11-13 11:52:13 +01:00
Thomas Gelf 05b7388a18 ClassLoader: completely refactored 2015-11-13 11:52:13 +01:00
Thomas Gelf a1832e1424 Modules/Manager: did we load all enabled modules? 2015-11-13 11:52:13 +01:00
Thomas Gelf f9a0e7dec6 Module: provide getApplicationDir() 2015-11-13 11:52:13 +01:00
Thomas Gelf 7a2824e070 ApplicationBootstrap: syntax 2015-11-13 11:51:41 +01:00
Johannes Meyer 60a951a97d Logger: Add method getLevel()
refs #10567
2015-11-11 09:59:28 +01:00
Eric Lippmann 92e3895c94 Revert user menu to its original state
refs #5543
2015-11-10 14:05:48 +01:00
Eric Lippmann e07e16d7a1 lib: Remove UserNavigationItemRenderer 2015-10-22 14:26:53 +02:00
Markus Frosch 7ecbefee79 Handle E_RECOVERABLE_ERROR with our error handler
refs #10361
2015-10-14 16:34:22 +02:00
Johannes Meyer 7696172249 Logger: Also use the utility method for non-solitary exception arguments 2015-10-05 12:54:04 +02:00
Eric Lippmann 54bb99a96d Merge branch 'feature/dope-layout-5543'
refs #5543
2015-10-02 11:16:35 +02:00
Eric Lippmann 359dde708c Prepare 2.0.0 release 2015-10-01 23:39:27 +02:00
Eric Lippmann e4a42c5cc9 Don't use deprecated functions 2015-10-01 23:19:37 +02:00
Eric Lippmann 3d2521abf0 Merge branch 'master' into feature/dope-layout-5543 2015-10-01 17:42:24 +02:00
Johannes Meyer c7d5e1456a Navigation: Allow basic wildcard to share navigation items 2015-10-01 13:56:28 +02:00
Eric Lippmann cb46af8e9c Rearrange menu entries
refs #5543
2015-10-01 09:01:03 +02:00
Eric Lippmann 231c63b703 Merge branch 'master' into feature/dope-layout-5543 2015-09-30 18:52:52 +02:00
Eric Lippmann 3cd3a7891c Revert "Rename application/VERSION to application/GITCOMMIT"
This reverts commit feb27b8a02.
2015-09-30 18:37:48 +02:00
Johannes Meyer 142851ede7 Merge branch 'master' into feature/show-icinga-web-2-s-version-in-the-frontend-9247 2015-09-30 15:54:22 +02:00
Johannes Meyer a2827e0dd9 Web: It's not necessary anymore to set a key column
refs #10246
2015-09-30 11:47:22 +02:00
Johannes Meyer bbd68457ae Config: Use DIRECTORY_SEPARATOR in static method navigation()
refs #10246
2015-09-30 11:41:49 +02:00
Johannes Meyer 633dca6b76 Web: Load the new config files for shared items
refs #10246
2015-09-30 11:38:51 +02:00
Johannes Meyer befbc6cd6a Config: Add static method navigation()
refs #10246
2015-09-30 11:30:38 +02:00
Johannes Meyer b4bcfa4e08 NavigationController: Register navigation item types differently
refs #10246
2015-09-29 17:12:57 +02:00
Bernd Erk ef16c3c479 CSS: design user logout and preferences 2015-09-28 17:58:23 +02:00
Eric Lippmann 98f1e9028e Fix user menu CSS classes
refs #5543
2015-09-28 16:40:16 +02:00
Eric Lippmann a408636923 Move logout to new navigation item
refs #5543
2015-09-28 15:28:17 +02:00
Eric Lippmann 9dff864b80 Prepare markup for new user menu
refs #5543
2015-09-28 14:48:54 +02:00
Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
Alexander A. Klimov 8dc9928cb3 IniParser::parseIniFile(): return a Config instance
refs #10150
2015-09-25 12:04:13 +02:00
Alexander A. Klimov e2d6089ff3 Make Version::get() failsafe
refs #9247
2015-09-24 12:25:02 +02:00
Alexander A. Klimov feb27b8a02 Rename application/VERSION to application/GITCOMMIT
refs #9247
2015-09-24 11:35:18 +02:00
Alexander A. Klimov 3e99adbe63 Version::get(): first try to parse application/VERSION
refs #9247
2015-09-24 11:05:21 +02:00
Alexander A. Klimov cc4a47506f Fetch version from constant
refs #9247
2015-09-24 10:53:33 +02:00
Alexander A. Klimov 7c3b46fefa Make regex less complicated 2015-09-23 17:48:30 +02:00
Alexander A. Klimov d6cf6313b9 Split complex if statements 2015-09-23 15:53:10 +02:00
Alexander A. Klimov abcdc5adb1 Fetch Git commit ID from .git/HEAD if available
refs #9247
2015-09-23 15:06:02 +02:00
Alexander A. Klimov 626c3494e4 Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file()
refs #10150
2015-09-22 14:50:49 +02:00
Johannes Meyer 0ec3610349 Web: Properly load shared menu items
refs #5600
2015-09-17 13:40:40 +02:00
Eric Lippmann f46504554e lib: Check for mssql extension too in Platform::hasMssqlSupport()
refs #9683
2015-09-17 11:48:25 +02:00
Johannes Meyer 8c17364780 Late translate a module's menu section labels
refs #5600
2015-09-16 14:36:35 +02:00
Johannes Meyer 8b7a1ce28f Late translate a module's dashboard-pane/dashlet labels
refs #5600
2015-09-16 14:29:33 +02:00
Johannes Meyer bbadb0b75c Add support for no-op translations
refs #5600
2015-09-16 14:16:40 +02:00
Johannes Meyer 0ca6e04a5a Module: Allow to pass a label for a custom navigation item type
refs #5600
2015-09-16 13:51:35 +02:00
Johannes Meyer ccae7c4d0d Module: Allow to define a dashboard pane's properties
Since dashboards are now alphabetically sorted as well, we need some way
to affect this as the old behaviour was to sort them as they were registered

refs #5600
2015-09-15 13:54:53 +02:00
Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/configuration.php
2015-09-15 13:31:30 +02:00
Eric Lippmann d52bb7d92a lib: Add Platform::hasLdapSupport() and Platform::hasDatabaseSupport()
refs #9683
2015-09-07 16:43:41 +02:00
Eric Lippmann 358f1750fb lib: Add Platform::hasOciSupport()
refs #9683
2015-09-07 16:34:10 +02:00
Eric Lippmann bba1838c7d lib: Add Platform::hasOracleSupport()
refs #9683
2015-09-07 16:34:10 +02:00
Eric Lippmann 9f3ef5cc8d lib: Add Platform::hasMssqlSupport()
refs #9683
2015-09-07 16:34:04 +02:00
Johannes Meyer b1e3519353 Add class NavigationController (WIP)
refs #5600
2015-09-07 13:55:19 +02:00
Johannes Meyer 27f3a8f152 Web: Add method getSharedNavigation()
refs #5600
2015-09-07 13:22:02 +02:00
Eric Lippmann 0f8c28d749 Merge branch 'master' into feature/api-9606 2015-09-07 11:33:44 +02:00
Johannes Meyer 1be6dc0553 Module.php: Allow modules to provide configurable navigation items
refs #5600
2015-09-07 11:06:11 +02:00
Johannes Meyer 95a61e89a9 Module: Fix how dashlets are loaded
refs #5600
2015-09-04 15:51:33 +02:00
Johannes Meyer 70a48643c1 Add class DashboardContainer
refs #5600
2015-09-04 15:25:19 +02:00
Johannes Meyer 5c2619dcb5 Add class NavigationItemContainer
refs #5600
2015-09-04 15:04:29 +02:00
Johannes Meyer ab23b56973 Web: Load module menus
refs #5600
2015-09-04 13:55:49 +02:00
Johannes Meyer 27a6b5bb75 Module: Utilize MenuItemContainer instead of Menu
refs #5600
2015-09-04 13:54:53 +02:00
Johannes Meyer 8643fec309 Add class MenuItemContainer
resf #5600
2015-09-04 13:54:23 +02:00
Johannes Meyer 294f9022f2 Use the new navigation to render the menu
refs #5600
2015-09-04 10:53:01 +02:00
Emil Vikström e3ea0e5949 Use yellow for warning logs in ANSI CLI
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 22:55:42 +02:00
Eric Lippmann c0eb0cbe6a modules: Tell the dispatcher that the static controller is to be found in the default module
refs #5786
2015-08-28 13:13:07 +02:00
Eric Lippmann bcc02f50ec lib: Optimize imports in webrouter 2015-08-28 09:42:49 +02:00
Eric Lippmann 4070f6c75b Merge branch 'master' into feature/namespaced-controllers-5786 2015-08-27 15:05:44 +02:00
Eric Lippmann ba09b02f5c lib: Fix PHPDoc of Version::get() 2015-08-27 13:06:49 +02:00
Eric Lippmann df66d0b0f5 lib: Add PHPDoc to Version 2015-08-27 13:06:31 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Eric Lippmann 96fb3b5d4b Merge branch 'master' into feature/api-9606 2015-08-25 09:25:59 +02:00
Eric Lippmann a20eef50e1 Set up the user backend factory before setting up the user
refs #9606
2015-08-24 15:37:55 +02:00
Johannes Meyer 93f7bfeeb9 Allow to dis-/enable stacktraces in a user's preferences
refs #9113
2015-08-24 14:47:37 +02:00
Johannes Meyer 0c47aececc Allow to disable stack traces globally
refs #9113
2015-08-24 14:44:54 +02:00
Eric Lippmann 5da139943c lib: Fix type hint for $menuItems in Module 2015-08-20 16:59:02 +02:00
Eric Lippmann 9aa62c9898 lib: Fix type hint for $tabs in Module 2015-08-20 16:58:24 +02:00
Eric Lippmann 800173b19f lib: Fix type hint for $router in Module 2015-08-20 16:47:17 +02:00
Eric Lippmann 5d8f091209 lib: Don't alias Zend classes in Module 2015-08-20 16:46:31 +02:00
Eric Lippmann f24449b225 modules: Register controller namesoace in Module::registerWebIntegration()
Else we get an exception when loading modules on the CLI because Zend classes are not autoloaded.

refs #5786
2015-08-20 16:24:12 +02:00
Eric Lippmann 3c812e6d2b Register module controller namespace
refs #5786
2015-08-18 13:02:54 +02:00
Eric Lippmann d267686ef4 Fix PHPDoc in Web to read class loader instead of auto loader
refs #5786
2015-08-18 12:51:46 +02:00
Eric Lippmann cb8fb93ab0 Fix PHPDoc in ApplicationBootstrap to read class loader instead of auto loader
refs #5786
2015-08-18 12:50:46 +02:00
Eric Lippmann fae2e0979a Fix class loading to not rely on the longest namespace match
refs #5786
2015-08-18 10:50:29 +02:00
Eric Lippmann 234dc951d2 Remove the is_dir check from the ClassLoader
refs #5786
2015-08-18 09:32:00 +02:00
Eric Lippmann ac99e54f17 Fix PHPDoc in ClassLoader
refs #5786
2015-08-18 09:27:34 +02:00
Eric Lippmann a382a563d5 Move Loader::__destruct to the bottom of the method list
refs #5786
2015-08-18 09:10:23 +02:00
Eric Lippmann 13fc7e16f2 Rename Loader to ClassLoader
refs #5786
2015-08-18 09:06:58 +02:00
Eric Lippmann b6fdbf055e Remove unnecessary pass by refenrece in the loader
refs #5786
2015-08-17 14:35:35 +02:00
Eric Lippmann 7563a7a0ba Rename Loader::unRegister() to Loader::register() 2015-08-17 14:34:39 +02:00
Eric Lippmann 7252f3237a Introduce a constant for the controller namespace
refs #5786
2015-08-17 13:43:34 +02:00
Eric Lippmann 1e1d4531c6 Register the controller namespace
refs #5786
2015-08-17 13:31:26 +02:00
Eric Lippmann d4de7c0519 lib: Make Loader::registerNamespace() fluent
refs #5786
2015-08-17 13:29:15 +02:00
Eric Lippmann 392eee5a1f Merge branch 'master' into feature/namespaced-controllers-5786
Conflicts:
	library/Icinga/Application/Web.php
2015-08-17 12:59:44 +02:00
Johannes Meyer 282aaa6e5b Load additional static files for modules, really
Since we're only processing the config script upon calling
Module::hasJs/Css() if no module.js or module.css exists,
we need to ensure that it's processed when calling
Module::getJS/CssFiles().

refs #9702
2015-08-10 10:00:02 +02:00
Johannes Meyer 712d545f48 Module: Allow to define additional Javascript files
refs #9702
2015-08-06 15:10:54 +02:00
Johannes Meyer 51aa22d429 Module: Allow to define additional CSS/LESS files
refs #9702
2015-08-06 15:10:33 +02:00
Johannes Meyer 59ef54314a Extend the Web bootstrapper from the EmbeddedWeb bootstrapper
In a embedded web environment we may also need a request and response.

refs #9702
2015-08-06 15:08:41 +02:00
Matthias Jentsch 60675979bc Merge branch 'bugfix/creating-dashlet-with-parentheses-9530'
fixes #9530
2015-08-05 18:22:29 +02:00
Matthias Jentsch f8e2dc850c Drop IniEditor and clean up IniWriter
Replace the ini editor code with a new parser implementation that manipulates a DOM. Do not support capabillities that are no longer needed, like nested configurations, section inheritance, section-less properties.
2015-08-05 18:10:17 +02:00
Alexander Fuhr c3fe14a205 Modules/Manager: Fix that non-existent modules can be disabled
fixes #9374
2015-08-04 14:34:30 +02:00
Johannes Meyer 316a4d8b82 Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609 2015-07-30 16:16:04 +02:00
Eric Lippmann 42d698a6b3 lib: Add Web::getResponse()
Use this method for retrieving the response object outside a controller.

refs #9660
2015-07-30 13:47:54 +02:00
Eric Lippmann ce2a196c4a lib/Web: Set up request before setting up the user
refs #9660
2015-07-29 17:22:10 +02:00
Eric Lippmann db48a944e3 lib: Introduce Web::getRequest()
Basic auth will need the request before we set up the front controller.

refs #9660
2015-07-29 16:27:48 +02:00
Johannes Meyer 13edbf901d UserBackend: Implement interface ConfigAwareFactory
refs #9609
2015-07-29 13:44:26 +02:00
Eric Lippmann 07849e0fea lib: Rename Authentication/Manager to Authentication/Auth
refs #9660
2015-07-28 17:08:55 +02:00
Eric Lippmann 7cfc78558d Merge branch 'master' into feature/secure-modules-9644
Conflicts:
	library/Icinga/Exception/IcingaException.php
2015-07-28 13:42:02 +02:00
Johannes Meyer 982e226db0 IcingaException: Add utility method to format exceptions as one-liner 2015-07-24 16:19:20 +02:00
Eric Lippmann 149a974a44 Fix coding style in Module.php
refs #9644
2015-07-24 15:06:25 +02:00
Eric Lippmann 519d025de5 Allow to get permissions and restrictions from unloaded modules
refs #9644
2015-07-24 14:24:48 +02:00
Eric Lippmann 444fdadf13 Allow to get unloaded modules via Manager::getModule()
refs #9644
2015-07-24 14:23:48 +02:00
Eric Lippmann ec1ddd82b3 Move Module::__construct to the top of the function list
refs #9664
2015-07-24 14:19:17 +02:00
Eric Lippmann 5dcc307e87 Add namespace for module permissions to the module manager
refs #9644
2015-07-22 14:59:35 +02:00
Paul Richards aac5d49eed IIS: use 'config' folder within icingaweb root instead of '/etc/icingaweb2' on Windows
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Make use of Platform::isWindows()
Call ::setupAutoloader() before that

fixes #8916
2015-06-12 14:46:00 +02:00
Paul Richards edd8f5738f Windows: Fix webrouter on IIS
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Remove unneeded whitespace

fixes #8914
2015-06-12 14:05:40 +02:00
Alexander A. Klimov 7ea6eeb20d Revert "Don't use /etc/icingaweb2 as config path on Windows"
This reverts commit 48870bb7e2.
2015-06-12 13:29:36 +02:00
Alexander A. Klimov 48870bb7e2 Don't use /etc/icingaweb2 as config path on Windows
fixes #8916
2015-06-12 11:57:44 +02:00
Alexander A. Klimov 1e0219f697 Revert "IIS: use 'config' folder within icingaweb root on windows"
This reverts commit 4607a85cf5.
2015-06-12 10:38:11 +02:00
Paul Richards 4607a85cf5 IIS: use 'config' folder within icingaweb root on windows
fixes #8916
2015-06-11 18:10:37 +02:00
Alexander A. Klimov 1bd18c5adb Merge branch 'feature/Show-Icinga-Web-2-s-version-in-the-frontend-9247'
resolves #9247
2015-06-08 12:40:14 +02:00
Alexander A. Klimov 6a914dc25b Merge branch 'bugfix/Show-all-shell-commands-required-to-get-ready-in-the-setup-wizard-8705'
fixes #8705
2015-06-05 18:40:07 +02:00
Alexander A. Klimov 76e748c483 Don't throw any exception
refs #8705
2015-06-05 17:12:32 +02:00
Alexander A. Klimov cbc731034a Don't throw any exception
refs #9247
2015-06-05 10:23:17 +02:00
Alexander A. Klimov 602f0cf755 Move Version to Icinga\Application\
refs #9247
2015-06-05 10:18:24 +02:00
Alexander A. Klimov b842a39650 Implement ::getLinuxDistro()
refs #8705
2015-05-26 18:23:26 +02:00
Johannes Meyer ec556edc65 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-26 09:28:35 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00