Commit Graph

2057 Commits

Author SHA1 Message Date
Eric Lippmann 82ee1d6e60 Merge branch 'master' into bugfix/significant-whitespaces-8777
Conflicts:
	library/Icinga/Web/Widget/FilterEditor.php
2015-05-18 13:35:28 +02:00
Alexander Fuhr 2cbcea25cb Merge branch 'feature/ido-resource-validation-9203'
fixes #9214
resolves #9203
2015-05-15 15:59:18 +02:00
Johannes Meyer 99c511eefd Limiter: Do not use a hardcoded default limit 2015-05-15 15:22:22 +02:00
Johannes Meyer 9a043386de Controller: Make setupSortControl creating a Zend_Paginator on its own
We're accessing the url GET parameters `sort' and `dir' in a controller now.

fixes #8339
2015-05-15 14:37:41 +02:00
Johannes Meyer fbf0ad4339 Drop interface Browsable
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)

refs #8339
2015-05-15 14:37:41 +02:00
Johannes Meyer ed5f646b6f SimpleQuery: Implement interface IteratorAggregate
I'd like to foreach such.
2015-05-15 14:37:41 +02:00
Johannes Meyer e04655e8cf Controller: Apply the user chosen sort rules when in compact view as well 2015-05-15 14:37:41 +02:00
Johannes Meyer ad8903660d Revert "SortBox::handleRequest(): set query order direction to asc if it's not given"
This reverts commit 59753acece.
2015-05-15 14:37:41 +02:00
Alexander Fuhr 9f35db71bf Form: Add typed notifications to the form
refs #9203
2015-05-15 13:04:01 +02:00
Alexander Fuhr 1eb11625ef Add new FormNotification Decorator to render form notifications
refs #9203
2015-05-15 13:02:54 +02:00
Alexander A. Klimov 59753acece SortBox::handleRequest(): set query order direction to asc if it's not given 2015-05-13 14:40:40 +02:00
Alexander A. Klimov d43513dcac Controller: use Icinga\Data\Sortable 2015-05-12 16:38:31 +02:00
Alexander A. Klimov afa0dc0956 SortBox::handleRequest(): check whether $this->query !== null
refs #9220
2015-05-12 10:29:50 +02:00
Alexander A. Klimov e1c3d23d12 Icinga\Web\Controller::setupSortControl(): set query on the newly created SortBox (if given)
refs #9220
2015-05-11 16:28:23 +02:00
Alexander A. Klimov 32659647b9 Implement Icinga\Web\Widget\SortBox::handleRequest()
refs #9220
2015-05-11 16:09:20 +02:00
Alexander A. Klimov 17ebe07e57 Implement Icinga\Web\Widget\SortBox::setQuery()
refs #9220
2015-05-11 15:37:00 +02:00
Alexander A. Klimov 295254d1d5 Rename Icinga\Web\Widget\SortBox::applyRequest() to ...::setRequest()
refs #9220
2015-05-11 14:07:57 +02:00
Alexander A. Klimov 152c6a8f7f Merge Monitoring_ListController::hasBetterUrl() into Icinga\Web\Controller::init()
refs #9220
2015-05-11 13:36:58 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
Alexander Fuhr be696e5adf LogFileIterator: Fix missing closing bracket 2015-05-05 12:50:35 +02:00
Alexander Fuhr 612fefba9c Fix the permission wildcards assertion
fixes #9202
2015-05-05 12:36:26 +02:00
Alexander A. Klimov ab0b478e4f Icinga\Web\Widget\Tabextension\DashboardAction::apply(): translate label "Add To Dashboard" 2015-04-30 17:49:42 +02:00
Alexander A. Klimov ffe23a184f Don't display "Add To Dashboard" on the dashboard
resolves #9026
2015-04-30 17:47:23 +02:00
Alexander Fuhr 7f28c0a237 Implement ProblemMenuItemRenderer
refs # 4139
2015-04-30 16:06:05 +02:00
Alexander A. Klimov 7c0be30def Handle and display multiline log messages correctly 2015-04-24 17:36:49 +02:00
Alexander A. Klimov ec82b3bc09 Implement Icinga\Protocol\File\LogFileIterator 2015-04-24 17:36:48 +02:00
Alexander A. Klimov 3d53e6f9b5 Icinga\Protocol\File\FileReader::count(): call iterator_count() only once per instance and cache the returned value 2015-04-24 11:10:40 +02:00
Alexander A. Klimov 5ba539b7c1 SyslogWriter: replace \n w/ 4 spaces in multiline log messages 2015-04-24 10:28:45 +02:00
Alexander A. Klimov a429617a95 Revert "Log each line of a multiline log message separatly"
This reverts commit 39042ab306.
2015-04-24 10:17:35 +02:00
Alexander A. Klimov 39042ab306 Log each line of a multiline log message separatly
resolves #9000
2015-04-23 17:44:00 +02:00
Alexander A. Klimov 9cd7765d9e If session_save_path() returns '', use sys_get_temp_dir()
resolves #8994
2015-04-22 17:26:15 +02:00
Alexander A. Klimov 1daecbbca0 Don't use `false === ...' when `! ...' is enough 2015-04-22 17:04:31 +02:00
Alexander A. Klimov 9393d11c0b Display an error message when enabled modules cannot be read because /etc/icingaweb2 is not readable
resolves #9141
2015-04-22 16:44:00 +02:00
Thomas Gelf d3964a31fb MenuItemRenderer: add missing use clause
Otherwise this completely broke Icinga Web as soon as a single module
used a legacy icon.

refs #7658
2015-04-20 21:49:45 +02:00
Alexander A. Klimov d6e7061de3 Implement Icinga\Web\Widget\FilterEditor::setSearchColumns() for specifying custom search columns 2015-04-20 18:01:48 +02:00
Alexander Fuhr 5f3aafd3bd Merge branch 'bugfix/menu-item-renderer-deduplication-7658'
fixes #7658
2015-04-20 17:15:21 +02:00
Alexander Fuhr 9ebf4742de Use the MenuItemRenderer render() implemnetations
refs #7658
2015-04-20 17:07:34 +02:00
Alexander Fuhr 4eb5f75c62 Use default MenuItemRenderer as renderer if no custom renderer is set
refs #7658
2015-04-20 17:04:46 +02:00
Alexander Fuhr f543321ac4 Replace MenuItemRenderer interface with a base class MenuItemRenderer
refs #7658
2015-04-20 17:02:42 +02:00
Johannes Meyer da7aa23820 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 15:20:23 +02:00
Alexander Fuhr 7bc07c4368 Force absolute nampesace for module menu item renderer
refs #7642
2015-04-20 13:21:37 +02:00
Alexander Fuhr a9819907ed Add namespaced item renderer class loader
refs #7642
2015-04-20 13:08:49 +02:00
Alexander Fuhr 593ea7add5 Move monitoring module renderers from global module to monitoring module
refs #7642
2015-04-20 13:02:12 +02:00
Johannes Meyer 54a370ca22 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 11:15:04 +02:00
Johannes Meyer 8dba5752dc ModuleManager: Improve error messages when en-/disabling modules 2015-04-20 10:09:33 +02:00
Johannes Meyer 2bd31ee395 Icinga\Web\Controller: Add helper functions to create control widgets
refs #7876
2015-04-17 16:08:41 +02:00
Johannes Meyer b52b507134 FilterEditor: Fix css 2015-04-17 10:05:48 +02:00
Matthias Jentsch 6898a4e0d5 Display icon tooltips without delay
Original functionality was broken when changing the icon library.
2015-04-16 18:32:47 +02:00
Matthias Jentsch 168577ff33 Use icon instead of the letter 'X' in close tab 2015-04-16 18:32:47 +02:00
Eric Lippmann ff45faf123 lib: Remove prefixedTimeUntil()
refs #6778
2015-04-15 15:47:58 +02:00
Eric Lippmann 44c8d37288 lib: Remove prefixedTimeSince()
refs #6778
2015-04-15 15:47:10 +02:00
Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
2015-04-15 15:43:39 +02:00
Johannes Meyer 675d070b86 Set the view property `compact' exactly once
refs #7876
2015-04-15 15:33:00 +02:00
Eric Lippmann ae1962af27 Let DateFormatter format dates like Format::smartTimeDiff()
Date diffs which are bigger than 3 days are now displayed w/o time again.

refs #6778
2015-04-15 15:26:25 +02:00
Johannes Meyer ed2de3c4d0 Fix SortBox widget
refs #7876
2015-04-15 14:20:36 +02:00
Johannes Meyer d882ea11b4 Avoid to set an empty redirect url parameter when accessing icinga web 2 2015-04-15 11:00:47 +02:00
Johannes Meyer 36fed03764 Do not log that the logging configuration is invalid on every request
Instead, log those messages *everytime* a subsequent message is being
logged.

refs #8957
2015-04-13 17:11:42 +02:00
Johannes Meyer 67ad575cf5 Set the configured logging level even if the configured logging type is invalid
refs #8957
2015-04-13 17:09:49 +02:00
Johannes Meyer 638c00d685 Merge branch 'master' into feature/non-collated-ido-queries-8613 2015-04-13 15:55:32 +02:00
Eric Lippmann 5a46821d91 Rename timeago, timesince and timeuntil CSS classes to time-ago, time-since and time-until
refs #6778
2015-04-10 14:19:08 +02:00
Alexander A. Klimov a817d9070e Move setupSortControl() from Monitoring_ListController to Icinga\Web\Controller 2015-04-10 11:36:25 +02:00
Eric Lippmann 3ec6caa15b lib: Add timeAgo to views
refs #6778
2015-04-10 09:56:39 +02:00
Eric Lippmann 7f73c6ae29 Use DateFormatter in our Format util for time ago, since and until
Note that time diff formatting now always includes the prefix using the functions timeAgo, timeSince and timeUntil.
I'll remove the related prefixed* functions later on and implement it as parameter to the functions listed above.

refs #6778
2015-04-10 09:51:15 +02:00
Eric Lippmann f2e5066430 lib: Add DateFormatter for ICU date formatting
The DateFormatter class is supposed to handle locale-dependent date, time, and time diff (ago, since, until) formatting.

refs #6778
2015-04-10 09:44:38 +02:00
Eric Lippmann 06830e035e Set default locale for the intl extension upon locale detection
refs #6778
2015-04-10 09:29:46 +02:00
Eric Lippmann 3f2d87777a Use IntlDateFormatter in Format::timeUntil()
refs #6778
2015-04-08 15:19:51 +02:00
Johannes Meyer 55e9407371 Use `service' instead of `service_description' when searching for services
refs #8613
2015-04-08 14:57:30 +02:00
Johannes Meyer e94c99e20e Use `host' instead of `host_name' when searching for hosts
refs #8613
2015-04-08 14:57:08 +02:00
Eric Lippmann 45d1230b28 Merge branch 'master' into bugfix/significant-whitespaces-8777 2015-04-08 10:19:53 +02:00
Eric Lippmann a185107927 Trim off leading whitespaces from filter values when searching
Because whitespaces may be used when searching for entities using the query string format "column = value" we have to trim off leading whitespaces from filter values.
This loses the possibility for search for entities with leading whitespaces of course.

refs #8777
2015-04-08 10:14:42 +02:00
Eric Lippmann 6e6aabedf2 Don't trim filter expressions
Leading and trailing whitespaces may be significant for comparison.

refs #8777
2015-04-08 09:31:11 +02:00
Matthias Jentsch 46da404452 Add docstrings to ObjectList and coding style 2015-04-07 16:34:20 +02:00
Johannes Meyer 9596b4fdf7 Form: Make it possible to preserve default values during (auto)submission 2015-04-07 15:07:36 +02:00
Alexander Klimov 967a2e82dc Use (only) "@return $this" in fluent interfaces' documentation 2015-04-07 14:24:11 +02:00
Eric Lippmann 6b63f3d8a2 Merge branch 'feature/require-mandatory-params-8886'
resolves #8886
2015-04-07 13:06:43 +02:00
Eric Lippmann dfd8c91827 Add PHPDoc to ActionController::$params 2015-04-07 12:25:46 +02:00
Eric Lippmann 002e793a53 lib: Add Params::req()
Params::req() should be used for requiring a mandatory CLI parameter.

refs #8886
2015-04-07 12:20:37 +02:00
Eric Lippmann 93b1a35de0 lib: Add UrlParams::req()
UrlParams::req() should be used for requiring a mandatory URL parameter.

refs #8886
2015-04-07 12:17:59 +02:00
Eric Lippmann 0fc5801e5e lib: Add MissingParameterException::getParameter and ::setParameter ...
... for getting/setting the name of the missing parameter which caused the exception.

refs #8886
2015-04-07 12:15:15 +02:00
Alexander Klimov e32eeb991e Implement Icinga\Web\Widget\SortBox::create() 2015-04-07 11:37:06 +02:00
Alexander Klimov 57ed849cee Icinga\Web\Widget\SortBox::applyRequest(): return $this 2015-04-07 11:26:16 +02:00
Eric Lippmann 4d795494fc Fix MissingParameterException's PHPDoc
refs #8886
2015-04-07 10:48:37 +02:00
Johannes Meyer b0b95ab387 Fix that Icinga\Application\Logger::writesTo* is not functional 2015-04-07 10:31:57 +02:00
Matthias Jentsch 5619ac960c Add inline pies to host and service back to multi-select views
Add old inline pie code and visualize handled/unhandled state.

refs #8565
2015-04-02 16:25:20 +02:00
Eric Lippmann 9ce9e0270c Fix that LDAP encryption settings have no effect
I renamed the directive for the encryption setting from 'connection' to 'encryption' before releasing Beta3 but
I forgot to change the Connection class accordingly.

fixes #8953
2015-04-02 10:41:25 +02:00
Matthias Jentsch 9fbd7822d0 Fix coding guideline violations 2015-03-31 17:41:57 +02:00
Matthias Jentsch b0b0ae157c Turn prepareStateName into more generic string utility function
refs #8565
2015-03-31 16:45:21 +02:00
Matthias Jentsch 5383999ef7 Add warning to links that open in a new window
Add warning on mouseover / focus as recommended by as recommended by WCAG20 G201

refs #7937
2015-03-19 10:49:28 +01:00
Eric Lippmann 949438d753 lib: Add SimpleQuery::splitOrder() ...
... for supporting specifying the sort direction next to the column, e.g.
'service_display_name ASC'

refs #8716
2015-03-13 17:09:32 +01:00
Thomas Gelf 63f87da53d Session: reworked to avoid duplicate notifications
* clear session on initialization, store once on shutdown
* less static method calls
* fixes erraneous cli checks
2015-03-13 14:10:27 +01:00
Johannes Meyer 0bc1416b10 Use the correct name for malformed LDAP attributes automatically
...or more purposefully: Guard lazy users from themselves. I hope I don't
have to explain why _this_ is not part of Icinga\Protocol\Ldap\Query...

resolves #8608
2015-03-13 11:17:43 +01:00
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
Eric Lippmann e36c430bb3 Merge branch 'feature/protected-menu-8720'
resolves #8720
2015-03-13 04:26:19 +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 d8d0d88c95 Rename Capability::hasStartTLS to Capability::hasStartTls() 2015-03-13 00:29:00 +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 03f78a06fb Optimize imports in the SearchDashboard
refs #8668
2015-03-12 18:48:59 +01:00