6087 Commits

Author SHA1 Message Date
Thomas Gelf
316d926811 Ldap/Query: re-add __toString
We stopped using __toString as it is unable to handle exceptions - and
this makes sense. However, that's IMO not a good reason to completely
drop __toString. Especially when debugging, benchmarking and similar you
often need a quick way to "dump" an object.

In that case you are often not in a mood to figure out whether that
specific class prefers create(), dump(), render() or whatever. We should
not base our view scripts on __toString - at least unless we do not catch
Exceptions in __toString methods, eventually "forwarding" them as triggered
error where needed.
2015-03-13 08:58:25 +01:00
Thomas Gelf
697d4aff27 doc/search: do not break on "ill-formed" docs
We got ugly exceptions for non-obvious errors such as missing titles
2015-03-13 08:57:45 +01:00
Thomas Gelf
6bf8849d98 doc/search: do not search with less than 3 chars
Please consider this a quickfix to avoid mass results while typing in
the global search field. We need farther improvements here:
* compact mode: e.g. title/first match on one row
* show a hint when less than 3 chars have been provided
* allow two chars once we fixed the above
2015-03-13 08:57:45 +01:00
Johannes Meyer
a3f2d7de7e LdapResourceForm: Translate "None" with a context as it's ambiguous 2015-03-13 08:53:08 +01:00
Johannes Meyer
99610bc1bd Avoid sub-tables when showing comments or downtimes in the detail view
fixes #8625
2015-03-13 08:32:50 +01:00
Eric Lippmann
e36c430bb3 Merge branch 'feature/protected-menu-8720'
resolves #8720
2015-03-13 04:26:19 +01:00
Eric Lippmann
efd7eb5793 Simplify skip-links' CSS
refs #8729
2015-03-13 04:18:31 +01:00
Eric Lippmann
9186c68b65 Merge branch 'bugfix/toggle-autorefresh-redirect-8605'
fixes #8605
2015-03-13 04:09:15 +01:00
Eric Lippmann
2e1ae185fb Retain detail URL if the layout is rerendered after a redirect
refs #8605
2015-03-13 04:04:58 +01:00
Eric Lippmann
1bd2e7cb84 Submit forms to the container's target URL if the form's action is not set
refs #8605
2015-03-13 04:02:42 +01:00
Eric Lippmann
f60a0b86ec POST disable/enable auto-refresh always against the current location
refs #8605
2015-03-13 04:01:08 +01:00
Eric Lippmann
200982e4f5 Set form action automatically only if Form::setAction() has not been called
refs #8605
2015-03-13 03:59:43 +01:00
Eric Lippmann
b5abff0313 Fix that the detail URL is no longer appended to the redirect URL on login
JavaScript relied on #redirect but we now protect IDs which make them unusable
for JS and CSS.

refs #8728
2015-03-13 03:48:46 +01:00
Eric Lippmann
32487e4e21 Ignore settings from instances.ini that don't have a setter on the transport class used
fixes #8543
2015-03-13 03:41:33 +01:00
Eric Lippmann
9f0af662a7 Write none instead of plaintext for unencrypted LDAP resources 2015-03-13 00:47:23 +01:00
Eric Lippmann
d8d0d88c95 Rename Capability::hasStartTLS to Capability::hasStartTls() 2015-03-13 00:29:00 +01:00
Eric Lippmann
f75c27fc99 Merge branch 'feature/show-reachability-6875'
resolves #6875
2015-03-13 00:27:12 +01:00
Eric Lippmann
ce3c2507ef Show reachability in the host and service detail view
refs #6875
2015-03-13 00:26:45 +01:00
Eric Lippmann
1c8c49e732 Select service_is_reachable in the service detail view
refs #6875
2015-03-13 00:26:02 +01:00
Eric Lippmann
37823f0415 Select host_is_reachable in the host detail view
refs #6875
2015-03-13 00:25:44 +01:00
Eric Lippmann
a4731ebbb3 Select is_reachable from host and service status
refs #6875
2015-03-13 00:25:08 +01:00
Eric Lippmann
020329d201 List STARTTLS before LDAPS ...
... when choosing encryption for a LDAP resource.
2015-03-13 00:03:01 +01:00
Eric Lippmann
708f08302f Use encryption instead of connection for the encryption setting of a LDAP resource 2015-03-13 00:02:18 +01:00
Eric Lippmann
61e01a4439 Fix SSL, TLS vs LDAPS, STARTTLS in the LDAP resource form 2015-03-13 00:00:21 +01:00
Eric Lippmann
db08ccad4b Fix encryption setting written to a LDAP reource's INI configuration
Use starttls for STARTTLS and ldaps for LDAPS.
2015-03-12 23:56:25 +01:00
Eric Lippmann
86f3ce9133 Rename Ldap\Connetion::SSL to ::LDAPS
The SSL constant was used to denote LDAP over TLS/SSL. In fact both STARTTLS and LDAPS use encrypted TLS/SSL communication
w/ STARTTLS upgrading a plain text connection and LDAPS using a separate port. Thus speaking of SSL only for LDAPS and TLS only for STARTTLS
is not correct.
2015-03-12 23:56:08 +01:00
Eric Lippmann
1b9ddaacac Add PHPDoc to Ldap\Connection's encryption consts 2015-03-12 23:35:38 +01:00
Eric Lippmann
17393a7b41 Remove unnecessary PHPDoc tags from Ldap\Connection 2015-03-12 23:30:04 +01:00
Eric Lippmann
cf271a2f8f Merge branch 'bugfix/search-priority-8668'
fixes #8668
2015-03-12 18:52:20 +01:00
Eric Lippmann
2e2dd7cd00 Raise priorities of the monitoring search URLs
refs #8668
2015-03-12 18:51:32 +01:00
Eric Lippmann
03f78a06fb Optimize imports in the SearchDashboard
refs #8668
2015-03-12 18:48:59 +01:00
Eric Lippmann
dc6b472ec9 Don't create search dashlets if the search string is empty
refs #8668
2015-03-12 18:47:34 +01:00
Eric Lippmann
515fe3249f Fix PHPDoc of SearchDashboard::search()
refs #8668
2015-03-12 18:44:23 +01:00
Eric Lippmann
77cd48e6fe We do not use the @package tag 2015-03-12 18:11:33 +01:00
Eric Lippmann
6c5a6215ef Render search results based on their priority
refs #8668
2015-03-12 18:11:06 +01:00
Eric Lippmann
3970d7dec2 Lower doc modules search priority
refs #8668
2015-03-12 18:09:43 +01:00
Eric Lippmann
c1d5231619 Add priority param to Module::provideSearchUrl()
refs #8668
2015-03-12 17:55:29 +01:00
Eric Lippmann
5749ff72b1 Fix typo in configuration.php 2015-03-12 16:48:29 +01:00
Eric Lippmann
29d5fd351b Merge branch 'bugfix/logout-external-8626'
fixes #8626
2015-03-12 16:47:49 +01:00
Eric Lippmann
be041435d3 Merge branch 'bugfix/unnecessary-joins-8614'
fixes #8614
2015-03-12 16:47:10 +01:00
Marius Hein
31d0641658 Merge branch 'feature/custom-notification-command-8644'
resolves #8644
2015-03-12 16:46:10 +01:00
Marius Hein
cb28f00c4d Merge branch 'master' into feature/custom-notification-command-8644 2015-03-12 16:45:57 +01:00
Marius Hein
ddd280d57b Fix permission send-custom-notification
refs #8644
2015-03-12 16:40:32 +01:00
Eric Lippmann
53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann
7156bd7dfb Fetch object comments by host_name and service_description
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann
29b5e4fd43 Add host_name and service_description columns w/o collation to the comment query
refs #8614
2015-03-12 16:38:32 +01:00
Eric Lippmann
112f8eb2f9 Remove COLLATE from host_name and service_description in the Contactgroup query
refs #8614
refs #8613
2015-03-12 16:33:28 +01:00
Eric Lippmann
7212434856 Remove COLLATE from host_name and service_description in the Contact query
refs #8614
refs #8613
2015-03-12 16:32:05 +01:00
Marius Hein
df3d81e181 SendCustomNotificationCommand: Update phpdoc strings
refs #8644
2015-03-12 16:30:11 +01:00
Johannes Meyer
b37757ca6e Disable the LdapDiscoveryConfirmPage
As long as the discovery code does not report multiple results, as it should,
actually, it's useless to demand the user to confirm the result.

resolves #8602
refs #8725
refs #8708
2015-03-12 16:14:58 +01:00