808 Commits

Author SHA1 Message Date
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 48870bb7e2ed392a6898591b20eace0c96f54993.
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