Commit Graph

2571 Commits

Author SHA1 Message Date
Eric Lippmann ce2b686252 Add file and line of logged menu item renderer exceptions
fixes #9696
2015-07-21 16:54:23 +02:00
Johannes Meyer 8f2849f32a Form: Improve code readability..
..and avoid the necessity to provide another mock when testing
Form::handleRequest().

refs #8758
2015-07-21 16:48:56 +02:00
Johannes Meyer 7c89887773 Form: Provide an absolute url as redirect url for successful frame uploads
refs #8758
2015-07-21 16:35:56 +02:00
Johannes Meyer 6c9819204d Form: Only work with a single type when handling redirect urls
$form->setRedirectUrl('some/url') still works, but $form->getRedirectUrl()
will only return instances of Icinga\Web\Url now.
2015-07-21 16:33:24 +02:00
Johannes Meyer fc481e527b Form: Process request parameter _frameUpload
This parameter is being used to flag a request as form submission issued
by utilizing an iframe. Appending it to a form's action causes no redirection
to take place in case of successful submission and a reduced but still valid
layout to be printed in any way. Redirection must be handled by the client
regarding the meta tag "redirectUrl".

refs #8758
2015-07-21 15:22:24 +02:00
Johannes Meyer 0a9a066749 Form: Do not create a new instance of Url when returning the redirect url
We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
2015-07-21 15:13:56 +02:00
Johannes Meyer 47fbc24f17 Merge branch 'master' into bugfix/improve-form-notifications-8983
Conflicts:
	library/Icinga/Web/Form.php
	modules/setup/application/forms/AdminAccountPage.php
2015-07-20 15:52:10 +02:00
Matthias Jentsch 5478027855 Bring back user count in ldap backend inspection
We already use count later in the wizard anyways.

refs #9630
2015-07-16 16:52:56 +02:00
Matthias Jentsch e357960d1e Add Inspection API to DB backend
refs #9641
2015-07-16 16:16:55 +02:00
Matthias Jentsch f4054d575b Add Inspection API to db connection
refs #9641
2015-07-16 15:29:45 +02:00
Matthias Jentsch c55ba6dff4 fix coding guideline violations 2015-07-16 13:51:35 +02:00
Matthias Jentsch ffe672c252 Improve message texts and scalabillity
Always start uppercase and don't use count() function until we've got a more scalable implementation in the LdapConnection.

refs #9630
2015-07-16 13:51:26 +02:00
Matthias Jentsch 6b8e5da76d Move all assertion functions into the inspect functions
Reduce code duplication and add class Inspection

refs #9630
2015-07-16 12:21:11 +02:00
Johannes Meyer 2164bb86c8 Tabs: Do not create a new instance of Url when rendering the refresh url
We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
2015-07-16 11:27:31 +02:00
Johannes Meyer 549f36f82c Form: Do not create a new instance of Url when setting the action
We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
2015-07-16 11:27:02 +02:00
Johannes Meyer d192410435 Introduce GET parameter _disableLayout to ... disable the entire layout
refs #8758
2015-07-16 11:23:48 +02:00
Matthias Jentsch 59c4f8d056 Use Inspection API in User Backend Form
refs #9630
2015-07-15 19:35:25 +02:00
Matthias Jentsch cf8b760ade Use Inspection API in LdapResourceForm
refs #9630
2015-07-15 19:33:47 +02:00
Matthias Jentsch 276aa43aa2 Upgrdae Inspection API again
Do not use InspectionException any more to reduce complexity of nested inspections, but keep error states
in the Inspection object itself.

refs #9630
2015-07-15 18:39:09 +02:00
Matthias Jentsch 6762ef053e Upgrade Inspection API
Reduce code duplication and stateffullnes by using InspectionException to indicate that an error was thrown, and only using one inspect function.

refs #9630
2015-07-15 17:51:18 +02:00
Matthias Jentsch 774d6ce94a Fix invalid function call in getCapabilities caused by refactoring 2015-07-15 15:36:32 +02:00
Johannes Meyer f3c8f2229f ErrorLabeller: Provide localized output for the MimeType validator
refs #8758
2015-07-15 15:15:15 +02:00
Matthias Jentsch af58d6964b Fix isEncrypted function broken by refactaring
refs #9608
2015-07-15 12:23:30 +02:00
Matthias Jentsch 7daa97a166 Clean up unneded code
Remove the now useless error handling cases in case encryption wasn't successful.

refs #9608
2015-07-15 11:31:56 +02:00
Matthias Jentsch 3b8b5b0022 Revert accidentally commited unneded changes 2015-07-15 11:16:06 +02:00
Matthias Jentsch 212111511a Fix violations of coding guidelines 2015-07-15 10:32:54 +02:00
Matthias Jentsch 84899e3e56 Revert some unneeded changes
refs #9605
2015-07-15 09:56:18 +02:00
Matthias Jentsch f4d8bfc309 Display connection test info when inspecting LdapConnections
refs #9605
2015-07-14 18:36:26 +02:00
Matthias Jentsch 3ddb8ca1bd Add abillity to discover AD version and vendor name to discovery
refs #9605
2015-07-14 18:32:44 +02:00
Matthias Jentsch 40d432100b Add a function to test the connection health
refs #9605
2015-07-14 18:29:58 +02:00
Matthias Jentsch 6599940e6c Introduce Interface for inspecting ldap connections
refs #9605
2015-07-14 12:30:16 +02:00
Johannes Meyer 23f7570ce0 LdapConnection: Don't run a discovery when preparing a new connection
fixes #9179
2015-07-10 10:45:10 +02:00
Johannes Meyer a8ac420897 LdapConnection: Establish a connection lazily 2015-07-10 09:51:39 +02:00
Johannes Meyer f5089dab1a DbUserGroupBackend: Use is_numeric() instead of is_int()
Using MySQL fetchColumn() returns integers for id fields, using MariaDB
though, fetchColumn() returns strings..

fixes #9572
2015-07-07 14:07:55 +02:00
Johannes Meyer caca219aa1 DbRepository: Consider table aliases while handling statement columns
Usually not required as there are no aliases for statements possible
but since we cannot differentiate everywhere what type of column
we're processing it is safer to always handle such.

fixes #9553
2015-07-03 13:06:10 +02:00
Johannes Meyer 066b3d9e28 ApplicationConfigForm: Make preference options be global options
refs #8709
2015-07-01 15:41:45 +02:00
Johannes Meyer 5b908d85bb Form: Fix notifications
* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
(cherry picked from commit 147f6be714)
2015-07-01 14:26:03 +02:00
Johannes Meyer d5ba40ac19 Form: Add hint support
Hints are short messages displayed at the bottom of a form
used to describe specific aspects on how to interact with
the form.

refs #8983
2015-06-30 15:02:58 +02:00
Johannes Meyer ea6f707bdf FormDescriptions: Do not render a description for required fields
refs #8983
2015-06-30 14:28:27 +02:00
Johannes Meyer 147f6be714 Form: Fix notifications
* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
2015-06-30 14:25:33 +02:00
Matthias Jentsch aecfb2eb97 Merge branch 'bugfix/multiselection-not-visible-9054'
fixes #9054
fixes #9346
2015-06-30 14:08:19 +02:00
Johannes Meyer 702a9c9523 Form: Show notifications and errors below any descriptions
They might be textually related to one or more descriptions.

refs #8983
2015-06-30 13:22:54 +02:00
Matthias Jentsch 6a7e3fe440 Document multi selection and use clearer names
refs #9054
2015-06-30 13:03:41 +02:00
Matthias Jentsch aec59d9941 Use current filter to highlight active rows instead of storing active rows in JS
Clean up selection code and move it into separate behavior and parse filter query to fetch selectable rows.

refs #9054
refs #9346
2015-06-29 18:48:42 +02:00
Johannes Meyer e795665421 Wizard: Issue a partial validation only if desired for a certain page
fixes #9306
2015-06-29 17:08:31 +02:00
Johannes Meyer cfd43f251e Revert "Sortable: Allow to check for a particular sort rule"
This reverts commit ae21baa41e.
2015-06-26 15:13:46 +02:00
Johannes Meyer 0fc8e6046c RepositoryQuery: Update sort order when converting sort rules in fetchAll 2015-06-26 15:13:31 +02:00
Johannes Meyer 0bcf7907d4 RepositoryQuery: Optimize value conversion in fetchColumn & -Pairs 2015-06-26 15:11:15 +02:00
Johannes Meyer ae21baa41e Sortable: Allow to check for a particular sort rule 2015-06-26 14:54:15 +02:00
Johannes Meyer 9055eb9cb7 RepositoryQuery: Do not sort by converted columns for limited queries
A limited query with conversion rules makes it impossible to sort
the result.
2015-06-26 14:24:03 +02:00
Johannes Meyer 56c506c8af SimpleQuery: Do not report to have a limit if there is none 2015-06-26 14:21:09 +02:00
Johannes Meyer 5d3eb5e8cb Repository: Allow to check for conversion rules of a specific column 2015-06-26 14:20:35 +02:00
Johannes Meyer 4ba84903f1 Repository: Accept already resolved columns as well
If a column was aliased, one was required to use the alias when
selecting, sorting or filtering. This is now not necessary anymore
as it's now possible to use the actual column name as well.
2015-06-26 13:07:21 +02:00
Johannes Meyer f956d09597 LdapConnection: Fetch attributes required for sorting the results 2015-06-25 15:51:19 +02:00
Johannes Meyer 6ff15acc1b LdapConnection: Fix that fetchColumn() returns results unordered 2015-06-25 15:50:15 +02:00
Johannes Meyer ca112af9ad RepositoryQuery: Allow to ignore any default sort rules 2015-06-25 15:49:09 +02:00
Johannes Meyer 3dddee8b7d Setup: Fix authentication backend validation
This is a ridiculous dirty fix. We'll definitely need to
improve how we create authentication backends...

fixes #9509
2015-06-25 14:36:51 +02:00
Johannes Meyer ebe144c16a Form: Do not encode actions twice 2015-06-24 16:15:45 +02:00
Johannes Meyer 8448f4ade4 Revert "Tabs: Merge the action's params into the current request url's params"
This reverts commit ba4dd255ec.

fixes #9494
2015-06-24 15:27:39 +02:00
Johannes Meyer 98b01207cf Show intersecting ok-states as well in the default servicegrid view
fixes #9360
2015-06-24 14:37:07 +02:00
Johannes Meyer 9595809dfa SimpleQuery: Deep clone the filter when cloning the query 2015-06-24 14:33:11 +02:00
Johannes Meyer 3c47ef6826 Ldap\Exception: Rename to LdapException
refs #8954
2015-06-24 09:19:41 +02:00
Johannes Meyer 5dea14f04b Ldap\Query: Rename to LdapQuery
refs #8954
2015-06-24 09:14:25 +02:00
Johannes Meyer c3ad7b211a Ldap\Connection: Rename to LdapConnection
refs #8954
2015-06-24 09:05:29 +02:00
Johannes Meyer 7921e62a0c Ldap\Connection: Fix existing documentation
Part #2

refs #8954
2015-06-23 17:38:19 +02:00
Johannes Meyer f234b3b768 Ldap\Connection: Re-organize some methods..
..and add some missing documentation.

refs #8954
2015-06-23 17:37:10 +02:00
Johannes Meyer 372ca8859e Ldap\Connection: Some coding style fixes
refs #8954
2015-06-23 17:27:30 +02:00
Johannes Meyer 7640284564 Ldap\Connection: Add missing documentation
Part #2

refs #8954
2015-06-23 17:23:47 +02:00
Johannes Meyer b25bf4838b Ldap\Connection: Re-organize some properties
lowerCamelCase, initialisation in __construct, and stuff..

refs #8954
2015-06-23 17:22:26 +02:00
Johannes Meyer 9b0ac3000a Ldap\Connection: Drop unused property $count
refs #8954
2015-06-23 17:17:53 +02:00
Johannes Meyer 02ee460c08 Ldap\Connection: Fix existing documentation
Part #1

refs #8954
2015-06-23 17:12:24 +02:00
Johannes Meyer 778bf376b2 Ldap\Connection: Add missing documentation
Part #1

refs #8954
2015-06-23 17:06:35 +02:00
Johannes Meyer c32f9ae735 Ldap\Connection: Drop parameter $fields from method fetchDn() 2015-06-23 15:56:29 +02:00
Johannes Meyer 87e31f497e Ldap\Connection: Rename method deleteDN() to deleteDn() 2015-06-23 15:21:32 +02:00
Johannes Meyer 3f5cd4b670 Ldap\Connection: Rename method getDN() to getDn() 2015-06-23 15:16:53 +02:00
Johannes Meyer 56cb4c28c4 Ldap\Connection: Rename method hasDN() to hasDn() 2015-06-23 15:11:11 +02:00
Johannes Meyer 759e243d90 Ldap\Connection: Add method fetchPairs() 2015-06-23 15:05:47 +02:00
Johannes Meyer ac7a7e6674 Ldap\Connection: Add method fetchColumn() 2015-06-23 15:05:03 +02:00
Johannes Meyer 197861efda Ldap\Connection: Do not suppress errors for failed credential tests 2015-06-23 14:12:01 +02:00
Johannes Meyer 9d6d76a26d Ldap\Connection: Return false if nothing is found for fetchOne()
This should behave like DbConnection::fetchOne().

refs #8954
2015-06-23 12:41:50 +02:00
Johannes Meyer 6d8c56a12f Ldap\Connection: Return false if nothing is found for fetchRow()
This should behave like DbConnection::fetchRow().

refs #8954
2015-06-23 10:49:51 +02:00
Johannes Meyer 15220da645 Automatically strip unnecessary parentheses from custom ldap filters
fixes #9348
2015-06-23 10:32:45 +02:00
Johannes Meyer 2e375dd57c Do not bypass the view renderer when rendering benchmarks
fixes #9402
2015-06-22 13:56:41 +02:00
Johannes Meyer 6d48de6cf5 DbConnection: Do not accept configuration for table prefixes
fixes #9418
2015-06-22 13:32:34 +02:00
Johannes Meyer d36f90d8cb Navigation: Restructure authentication backend configuration
This moves the configuration tabs for user and group backends into
a dedicated menu entry called "Authentication". All tabs previously
available in this menu entry were moved into their own dedicated
menu entry as well to not to confuse users.

fixes #9398
2015-06-22 13:26:24 +02:00
Johannes Meyer d5ae135415 DbQuery: Add select() method to access self::$select publicly 2015-06-19 14:05:12 +02:00
Johannes Meyer fb9641fb3c Controller: Validate restriction columns 2015-06-18 16:43:20 +02:00
Thomas Gelf cd70c27519 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-18 15:18:42 +02:00
Johannes Meyer 2bffe56bd5 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-18 14:54:01 +02:00
Thomas Gelf 1f5db2f8c1 ActionController: introduce showCompact
Works like view=compact, it will allow us to "free" the "view" parameter
2015-06-18 13:41:12 +02:00
Thomas Gelf 2f62a4383a Layout: add showFullscreen parameter
refs #6729
2015-06-18 13:41:12 +02:00
Thomas Gelf c069414b1b LdapQuery: fix forgotten connection property rename 2015-06-18 11:31:32 +02:00
Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361
Conflicts:
	modules/monitoring/application/views/scripts/host/history.phtml
	modules/monitoring/application/views/scripts/list/services.phtml
2015-06-18 11:26:51 +02:00
Johannes Meyer 1169793213 IdoQuery: Add prototype for dynamic GROUP BY clauses 2015-06-18 09:36:04 +02:00
Johannes Meyer 386447b847 DbQuery: Add getter for GROUP BY clauses
Allows to override this in a child to provide group by clauses not
until they are actually required.

refs #9009
2015-06-18 09:29:58 +02:00
Johannes Meyer 4d06bff5e8 Merge branch 'master' into feature/Move-notifications-to-the-bottom-of-the-page-8247 2015-06-17 12:47:58 +02:00
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
2015-06-16 17:12:51 +02:00
Johannes Meyer ba4dd255ec Tabs: Merge the action's params into the current request url's params 2015-06-16 16:02:32 +02:00
Johannes Meyer 68be11b929 UrlParams: Allow conversion to an associative array 2015-06-16 16:01:42 +02:00
Thomas Gelf b3028e9988 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-16 11:49:03 +02:00
Thomas Gelf 7a18638504 Revert "Web/Menu: move "About" to config section"
Has been fixed in current master.
This reverts commit 56d67def00.
2015-06-16 11:48:40 +02:00
Johannes Meyer aa0b1d43ef Menu: Move about page into the system menu as sub-entry 2015-06-16 11:43:58 +02:00
Thomas Gelf 56d67def00 Web/Menu: move "About" to config section
This is IMO never worth a main menu entry, at least not in it's current
implementation and look-a-like.
2015-06-16 00:18:31 +02:00
Thomas Gelf 0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +02:00
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'
resolves #7595
2015-06-15 17:30:42 +02:00
Johannes Meyer b8efe314a0 DbQuery: Ignore wildcard only filters
This increases query performance vastly, since LIKE '%' comparisons
prevent the dbms from utilizing an index.
2015-06-15 13:59:46 +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
Paul Richards e8cdcce61d Fix PHP warning on Windows due to LC_MESSAGES not defined
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Don't define LC_MESSAGES globally as only 2 methods would need that
Use LC_ALL rather than 6

fixes #8912
2015-06-12 13:49:38 +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 b58ffbe034 Revert "Translator: fall back to LC_ALL if LC_MESSAGES is not defined"
This reverts commit 9fe2d4928d.
2015-06-12 13:29:31 +02:00
Alexander A. Klimov 9fe2d4928d Translator: fall back to LC_ALL if LC_MESSAGES is not defined
fixes #8912
2015-06-12 12:28:30 +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 0bce5e83ad Revert "Fix PHP warning on windows due to LC_MESSAGES not defined."
This reverts commit 5b18ff7965.
2015-06-12 10:38:25 +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
Paul Richards 5b18ff7965 Fix PHP warning on windows due to LC_MESSAGES not defined.
fixes #8912
2015-06-11 17:28:50 +02:00
Alexander A. Klimov 392047b2ee Add support for command line arguments in the format --arg=<value>
refs #8472
2015-06-10 17:19:49 +02:00
Johannes Meyer d5dffe9a7a Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-09 09:22:50 +02:00
Johannes Meyer eba862a290 view->url(): Clone $path if it's already of type Icinga\Web\Url
Avoids side effects in case of url params adjustments.

fixes #9351
2015-06-09 09:21:12 +02:00
Matthias Jentsch 3600e1088c Fix key and value sanitazion in ini writer 2015-06-08 13:11:40 +02:00
Matthias Jentsch ddba1d86fa Fix spacing in ini files
refs #8706
2015-06-08 13:11:40 +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
Johannes Meyer 24cb6bfc6e Form: Preserve defaults for subforms as well 2015-06-05 16:01:52 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +02:00
Johannes Meyer 5688f0cb85 Allow to configure user group backends of type LDAP
refs #7343
2015-06-05 14:53:29 +02:00
Thomas Gelf edeb24792e CSS: move monitoring styles to monitoring module 2015-06-05 12:49:07 +02:00
Johannes Meyer cacd97fb46 LdapUserGroupBackend: Make default configuration providers public
I'd like to access these when preparing a config form.

refs #7343
2015-06-05 11:09:31 +02:00
Johannes Meyer 02d2ea682e LdapUserGroupBackend: Do not permit to link different directories
I cannot think of a valid usecase right now. In case someone got one,
revert this commit and make use of the backend itself and not only
its configuration.

refs #7343
2015-06-05 10:51:54 +02:00
Johannes Meyer 0ab192cd1f LdapUserGroupBackend: Allow to link a user backend
refs #7343
2015-06-05 10:41:47 +02:00
Johannes Meyer 127489ca20 UserBackend: Allow to only pass a backend's name 2015-06-05 10:40:47 +02:00
Alexander A. Klimov cbc731034a Don't throw any exception
refs #9247
2015-06-05 10:23:17 +02:00
Johannes Meyer ee2462a6b2 LdapUserGroupBackend: Let the backend decide which defaults to use
refs #7343
2015-06-05 10:19:28 +02:00
Alexander A. Klimov 602f0cf755 Move Version to Icinga\Application\
refs #9247
2015-06-05 10:18:24 +02:00
Johannes Meyer 3fd0d99db2 LdapUserGroupBackend: Add support for custom query filters
refs #7343
2015-06-05 09:57:40 +02:00
Alexander A. Klimov 7577b37cdb Change VERSION's format
refs #9247
2015-06-03 18:08:54 +02:00
Johannes Meyer 90d946f149 LdapUserGroupBackend: We need a datasource, actually
Forgot to add this when disabling LdapRepository inheritance...

refs #7343
2015-06-03 16:40:14 +02:00
Johannes Meyer d9eb8f9e8d LdapUserGroupBackend: Do not extend LdapRepository
Selecting groups works, but not memberships. Does not make sense
until both things work...

refs #7343
2015-06-03 16:33:22 +02:00
Johannes Meyer 89d992278b Introduce class LdapUserGroupBackend
refs #743
2015-06-03 16:27:50 +02:00
Johannes Meyer e65cf954e6 LdapRepository: Add normed attribute `gid'
refs #7343
2015-06-03 16:08:29 +02:00
Johannes Meyer 86c63ec913 Introduce class LdapRepository
refs #7343
2015-06-03 15:28:07 +02:00
Alexander A. Klimov 757e993871 Outsource version-getting logic to Version::get()
refs #9247
2015-06-03 15:23:05 +02:00
Johannes Meyer 96f5f8fd49 LdapUserBackend: Do not fetch a user's groups
refs #7343
2015-06-03 15:16:54 +02:00
Johannes Meyer e0c0e9c874 LdapUserBackend: Move function retrieveGeneralizedTime into its parent
refs #7343
2015-06-03 14:36:46 +02:00
Johannes Meyer 5dd3950594 Ldap\Connection: Disable server side sorting as it's not working
refs #9364
2015-06-03 14:24:48 +02:00
Johannes Meyer 1a0d1702c9 Ldap\Connection: Do not sort *after* the result has been limited
fixes #9352
2015-06-03 14:22:38 +02:00
Eric Lippmann ae78613443 lib: Add sub query mode to the DbQuery
refs #9009
2015-06-03 14:13:15 +02:00
Matthias Jentsch e7a875da26 Merge branch 'bugfix/perfdata-details-hidden-8334'
fixes #8334
2015-06-02 17:51:57 +02:00
Alexander A. Klimov 5b8de49cdf Link to the about page
refs #9247
2015-06-02 17:16:27 +02:00
Matthias Jentsch 1e8151bed3 Limit perfdata label size
Add paratentheses when perfdata label size exceeds a certain limit. Display the full label as tooltip.

refs #8334
2015-06-02 17:09:40 +02:00
Johannes Meyer 28a28a89d3 Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Data/SimpleQuery.php
2015-06-02 14:54:13 +02:00
Johannes Meyer 06fb6ff6fc SimpleQuery: Re-add method paginate but flag it as deprecated 2015-06-02 14:47:29 +02:00
Johannes Meyer 267e71f38b User: Consider the required permission more important if it has a wildcard
refs #9202
2015-06-02 12:01:02 +02:00
Johannes Meyer 7213379cac AuthBackendController: Add final indexAction
Required to automatically redirect to the first permitted list action.

refs #8826
2015-06-02 11:59:04 +02:00
Johannes Meyer 00c31ffd28 RolesController: Rename to RoleController 2015-06-02 11:57:13 +02:00
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Johannes Meyer 5d50eabb44 FileReader: Mimic cursor capability 2015-06-02 10:39:49 +02:00
Johannes Meyer ae30a62055 ConfigController: Add tab for the user group backend configuration
refs #8826
2015-06-02 10:23:40 +02:00
Johannes Meyer cf96e66ff2 Rename permission config/application/roles* to config/authentication/...
Does also split it into *, show, add, edit, remove as this should behave like
any other authentication configuration.

refs #8826
2015-06-02 09:07:06 +02:00
Johannes Meyer 3fffd90135 Rename permission config/application/groups* to config/authentication/...
refs #8826
2015-06-02 09:04:34 +02:00
Johannes Meyer a558f2873a Rename permission config/application/users* to config/authentication/...
refs #8826
2015-06-02 09:02:57 +02:00
Johannes Meyer 46e2393074 UsergroupbackendController: Do only assert that the user has one permission
The configuration of a backend itself should not be that granular.

refs #8826
2015-06-02 08:58:21 +02:00
Eric Lippmann 44968266f6 Fix no-op searches
Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
2015-06-01 17:22:52 +02:00
Johannes Meyer 7b9983de38 Merge the menu entries for users, groups and roles into "Authentication" 2015-06-01 17:16:24 +02:00
Matthias Jentsch 6661d49bd2 Use ltrim instead of a manual loop to remove trailing lines in ini writer
refs #8706
2015-06-01 17:00:43 +02:00
Johannes Meyer 17e7f1e754 Link the roles configuration with the user and group management
refs #8826
2015-06-01 16:43:11 +02:00
Johannes Meyer 66fd7dfd93 ConfigController: Rename applicationAction to generalAction 2015-06-01 16:35:27 +02:00
Johannes Meyer 49bb09d9d3 Add dedicated menu entries to manage users, groups and roles
refs #8826
2015-06-01 16:31:48 +02:00
Matthias Jentsch 1901f0af98 Improve .ini file formatting
End every file with a newline, and only display 1 empty line between each section, to improve readabillity.

fixes #8706
2015-06-01 16:12:02 +02:00
Johannes Meyer c7ce1498bf Introduce menu entry "Configuration" 2015-06-01 16:10:23 +02:00
Johannes Meyer e936c76ca9 DbUserGroupBackend: Really clear memberships and parent relations...
...when removing a group.

refs #8826
2015-06-01 15:34:38 +02:00
Johannes Meyer 1385295e4e DbUserGroupBackend: Properly handle sequences of group names
refs #8826
2015-06-01 15:33:35 +02:00
Johannes Meyer 62fff94808 DbUserGroupBackend: Do not try to fetch a group id for null
refs #8826
2015-06-01 15:16:03 +02:00
Johannes Meyer beb5bd7370 Repository: Clone a filter implicitly in self::requireFilter($clone = true)
refs #8826
2015-06-01 15:03:08 +02:00
Johannes Meyer 601b720a03 LdapUserBackend: Fetch and interpret the correct attributes (OpenLDAP)
refs #8826
2015-06-01 14:05:44 +02:00
Johannes Meyer d1a5321d02 LdapUserBackend: Fetch and interpret the correct attributes (ActiveDirectory)
refs #8826
2015-06-01 12:23:16 +02:00
Johannes Meyer 7127d5eb39 Ldap\Connection: Connect automatically in case capabilities are not set yet 2015-06-01 12:20:36 +02:00
Johannes Meyer d097f7fe8f Add menu entry for the user group backend configuration
That's definitely just a placeholder...

refs #8826
2015-05-29 16:36:05 +02:00
Alexander A. Klimov 0ba4d24880 Move notifications to the bottom of the page
refs #8247
2015-05-29 14:17:12 +02:00
Johannes Meyer c8e8a39f5a DbRepository: Relax check in providesValueConversion()
Would otherwise conflict when tables are joined in.

refs #8826
2015-05-29 11:58:21 +02:00
Johannes Meyer cc779024fe Repository: providesValueConversion() should not be required being called
refs #8826
2015-05-29 11:57:38 +02:00
Johannes Meyer b82d7d7cc0 DbRepository: split() is deprecated, use explode() instead
Why php, why? :'(

refs #8826
2015-05-29 11:37:42 +02:00
Johannes Meyer 3959dc27d7 Repository: Do not return filter columns when requiring all query columns
I really wonder why I did not notice this until now...

refs #8826
2015-05-29 11:36:08 +02:00
Johannes Meyer a88037f45d DbUserGroupBackend: Fetch and persist a group's id when it's name is given
refs #8826
2015-05-29 11:33:35 +02:00
Johannes Meyer bb285db05b Differentiate the source or destination of a column when converting values
refs #8826
2015-05-29 11:32:15 +02:00
Johannes Meyer 60ce78c958 DbUserGroupBackend: Adjust how to load the name of a group's parent
refs #8826
2015-05-29 08:57:49 +02:00
Johannes Meyer c94e6a3292 Db/IniUserGroupBackend: Drop column parent_name, it's not a name anymore
refs #8826
2015-05-29 08:56:58 +02:00
Johannes Meyer 5e0ae6410b DbRepository: Consider a filter column without query context as a statement column
Feels wrong..somehow, but it works.

refs #8826
2015-05-29 08:02:12 +02:00
Johannes Meyer 32b99be8ab DbUserGroupBackend: Adjust to fit the new database schema
refs #8826
2015-05-28 15:22:15 +02:00
Johannes Meyer fd931e4232 RepositoryQuery: getQuery() might be called during prepareQueryColumns() 2015-05-28 14:26:48 +02:00
Johannes Meyer 08f8fe6f49 DbRepository: Add support for joining tables based on query/filter columns
refs #8826
2015-05-28 13:53:49 +02:00
Johannes Meyer 119b2fdddb DbQuery: Allow to join additional tables
This should just be the beginning of such additions, there is still a group(),
distinct(), etc missing..
2015-05-28 13:52:00 +02:00
Johannes Meyer 58d78f59f3 DbQuery: Initialize self::$select as early as possible
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
Johannes Meyer 5326ce6bca DbRepository: Add support for table specific aliases
This was previously only possible for the base table and in case one wanted
to use table aliases in the query column definition for non-base tables as
well, it did not work well due to not being explicitly supported. Now, to use
such table aliases one must initialize DbRepository::tableAliases.

refs #8826
2015-05-28 13:44:51 +02:00
Johannes Meyer 647dd9d425 RepositoryQuery: Pass through the query when requiring a table or column
This allows now to adjust the query in custom repository implementations.

refs #8826
2015-05-28 13:25:26 +02:00
Eric Lippmann 31400ea16a monitoring: Fix that searching for specific columns is no longer possible if default search columns are set 2015-05-28 13:17:00 +02:00
Alexander Fuhr bf21f55656 Add a new ssh resource form
refs #7595
2015-05-28 10:44:58 +02:00
Alexander A. Klimov cba36ec017 Ignore the preferences' loadability during authentication
fixes #8956
2015-05-27 15:13:53 +02:00