Commit Graph

1783 Commits

Author SHA1 Message Date
Thomas Gelf cddb68bffb ActionController: shift global parameters globally 2014-12-03 10:40:48 +01:00
Eric Lippmann a2a97537ce Log: Fix StdoutWriter not using our "new" Logger's interface 2014-12-03 09:38:33 +01:00
Johannes Meyer ebf908b1b5 Make db requirement checks more sensitive
fixes #7837
2014-12-01 15:38:10 +01:00
Eric Lippmann d41602a67c Rearrange imports in Menu.php 2014-11-25 16:11:01 +01:00
Eric Lippmann eed10159fd Menu: Don't render sub menus when a dot appears in the label
I guess this was intended to be a feature. Turns out to be a bug though :)

fixes #7772
2014-11-21 17:39:18 +01:00
Eric Lippmann d84318d8b8 Fix Menu's PHPDoc
Don't use @var and don't use @return self for fluent interfaces.
2014-11-21 17:13:39 +01:00
Eric Lippmann 99ad72a0da Remove the Help decorator 2014-11-20 13:50:40 +01:00
Eric Lippmann 15506941a6 Ini: Fix that directives could not contain a slash
We introtuced preg_quote not quoting the delimiter.
2014-11-20 13:47:27 +01:00
Marius Hein bdc0321f62 Dashboard: Fix wrong URL
refs #7751
2014-11-20 13:41:12 +01:00
Eric Lippmann bb664a87ea Fix ugly positioning of help icons
If an element has a description, the description is now added to the element's label as title.
The CSS class has-feedback ensurers that the help icon is rendererd. If everything is working fine,
I'll the remove the super duper Help decorator.
2014-11-20 13:25:58 +01:00
Marius Hein d62d487251 Merge remote-tracking branch 'origin/master' into bugfix/dashboard-rework-7751 2014-11-20 12:48:28 +01:00
Marius Hein e600dc8adb Dashboard: Rename component to dashlet
refs #7751
2014-11-20 12:08:50 +01:00
Johannes Meyer 38957e340b Fix that DbQuery::renderFilter produces invalid filters
fixes #7749
2014-11-20 11:58:22 +01:00
Thomas Gelf fa44197947 Dashboard: fix complex urls 2014-11-19 16:45:15 +01:00
Eric Lippmann 2830b13082 Merge branch 'master' into feature/security-gui-5647 2014-11-19 16:31:26 +01:00
Eric Lippmann 74683ea025 Preferences: Use the lowercase username 2014-11-19 15:42:33 +01:00
Marius Hein 32af89e0a7 Merge remote-tracking branch 'origin/master' into bugfix/broken-badges-7736 2014-11-19 15:28:27 +01:00
Eric Lippmann 3e1583ca40 Security: Remove getPermissions and getRestrictions from the AdmissionLoader
These funtctions are superseded by getRestrictionsAndPermissions.

refs #5647
2014-11-19 15:13:45 +01:00
Eric Lippmann bed11ebb60 Security: Load user permissions and restrictions from roles.ini
refs #5647
2014-11-19 15:11:14 +01:00
Eric Lippmann b01a9a65e0 Security: Introduce AdmissionLoader::getPermissionsAndRestrictions() for loading permissins and restrictions from roles.ini
When loading from roles.ini there's currently an empty permission added which is of course a bug and will be fixed asap.

refs #5647
2014-11-19 15:10:09 +01:00
Eric Lippmann a2818bd937 Merge branch 'master' into feature/security-gui-5647 2014-11-19 14:13:26 +01:00
Matthias Jentsch 48699cacf4 Fix navigation layout in firefox and chrome
Hover css still broken

refs #7736
2014-11-19 12:15:18 +01:00
Marius Hein dbc1b1ce3e Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-19 11:48:22 +01:00
Marius Hein a40f357f3c Dashboard: Show error message when can not write to file
refs #4537
2014-11-19 11:47:31 +01:00
Thomas Gelf 47d81ccf7b css: allow to override vendor styles
* no more hovered icon underline
* simulate padding for headers in .controls
2014-11-19 10:33:57 +01:00
Marius Hein a5411c7a1c Dashboard: Fix reading and disabled system dashboards
refs #4537
2014-11-19 10:33:41 +01:00
Marius Hein cfb0ca1be0 Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-19 10:21:50 +01:00
Thomas Gelf 704a87c0f2 FilterEditor: make active element fit hover colors 2014-11-19 10:07:30 +01:00
Thomas Gelf eb823c4045 Widget\FilterEditor: fix root element stripping 2014-11-19 09:53:25 +01:00
Thomas Gelf c6ffdb3862 Widget\FilterEditor: fix failing parameter checking 2014-11-19 09:44:47 +01:00
Marius Hein 5ace5fd2dc Dashboard: Change icons
refs #4537
2014-11-18 17:47:57 +01:00
Eric Lippmann aef81a56d6 Merge branch 'master' into feature/security-gui-5647
Conflicts:
	library/Icinga/Application/Config.php
	library/Icinga/File/Ini/IniWriter.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Menu.php
2014-11-18 17:08:25 +01:00
Eric Lippmann f2717b6d26 Introduce Form::setOnSuccess() in favor of overriding the constructor
Zend_Form uses setters for options if a respective setter method exists.
It is not necessary to override the constructor for introducing new options.

Conflicts:
	library/Icinga/Web/Form.php
2014-11-18 17:02:39 +01:00
Marius Hein 10cfecf2ec Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537
Conflicts:
	application/controllers/DashboardController.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Widget/Dashboard.php
2014-11-18 16:36:42 +01:00
Bernd Erk 07c0180b1c Merge branch 'master' into feature/redesign-7144 2014-11-18 16:36:19 +01:00
Marius Hein 80871313e4 Dashboard: Remove actions
refs #4537
2014-11-18 16:28:04 +01:00
Johannes Meyer f007663235 Show the user a senseful error message in case enabledModules is missing
fixes #7205
2014-11-18 16:22:41 +01:00
Eric Lippmann 7eab09c2a2 Tests: Fix ApplicationBootstrap mock 2014-11-18 16:06:39 +01:00
Johannes Meyer 1cbdd2b51c Fix that hidden elements are getting ovewritten when validating a form
This works by "disabling" hidden elements which causes the browser not
to submit them. Due to a bug in Zend we need to manually ensure that
Form::isValid does not overwrite the value of disabled elements with null.

fixes #7717
2014-11-18 15:06:46 +01:00
Johannes Meyer 760bf1a020 Disable partial validation of forms by default 2014-11-18 15:06:46 +01:00
Alexander Fuhr 38ef33276a Replace description decorator through help decorator
refs #7696
resolves #7696
2014-11-18 14:58:54 +01:00
Alexander Fuhr 4a4fbaee8e Add Help decorator for icon help description
refs #7696
2014-11-18 14:58:05 +01:00
Johannes Meyer c288a68ed5 Merge branch 'master' into bugfix/drop-zend-config-7147
Conflicts:
	application/forms/LdapDiscoveryForm.php
2014-11-18 13:21:18 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Johannes Meyer 0c84bf614d Split config functionality into two classes
There is now Icinga\Application\Config as our ini configuration handler and
Icinga\Data\ConfigObject as our general configuration container.

refs #7147
2014-11-18 13:02:56 +01:00
Marius Hein 8805e4af4b Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-18 12:52:02 +01:00
Marius Hein 3e58ec2530 Dashboard: Use new controller actions
refs #4537
2014-11-18 12:51:28 +01:00
Eric Lippmann f9d7062476 Form: Add our element and decorator paths instead of calling createIcingaFormElement
createIcingaFormElement lacks all stuff applied in Zend_Form::createElement().
2014-11-18 12:51:06 +01:00
Gunnar Beutner 9a79cd58e9 Re-enable auto-refresh 2014-11-18 10:48:33 +01:00
Eric Lippmann e3629a7f41 Number element: Use is_numeric in favor of Zend's float validator
The float validator uses Zend_Locale which we have stripped in our vendor library thus leading to erroneous validation.
Further we'll use php-intl instead of Zend_Locale one day :)

fixes #7692
2014-11-18 10:31:40 +01:00
Marius Hein cbcd276b44 Dashboard: Rewrite forms and controller [WIP]
refs #4537
2014-11-18 10:04:41 +01:00
Eric Lippmann 47414f3528 Introduce Form::setOnSuccess() in favor of overriding the constructor
Zend_Form uses setters for options if a respective setter method exists.
It is not necessary to override the constructor for introducing new options.
2014-11-18 10:00:58 +01:00
Marius Hein bec0085683 Dashboard: Add urls to any dashboard (form)
refs #4537
2014-11-18 09:59:24 +01:00
Marius Hein 769e8f2636 Dashboard/Component: Add remove link
refs #4537
2014-11-18 09:59:23 +01:00
Marius Hein b679c1e770 Dashboard: Refactor search/replace implementation
refs #4537
2014-11-18 09:59:23 +01:00
Marius Hein 979bec24a5 Dashboard: Write user dashboards to disk
refs #4537
2014-11-18 09:59:23 +01:00
Marius Hein f6a2f6515d Dashboard: Introduce user flag widget
Fix: Do not render disabled components.

refs #4537
2014-11-18 09:59:23 +01:00
Marius Hein af799d42dc Widget/Dashboard: Cleanup object and remove unused stuff
refs #4537
2014-11-18 09:59:23 +01:00
Matthias Jentsch 5f8fcf4005 Fix Ldap server discovery
Add a new connection member that stores whether settings were guessed or product of a discovery, move discovery methods into seperate class.

fixes #7691
2014-11-18 09:45:54 +01:00
Bernd Erk f83bcbfd2b updates current font set and changes service and reporting icons 2014-11-17 17:08:08 +01:00
Bernd Erk 878aa81d98 Changes conf icon in menu 2014-11-17 17:08:08 +01:00
Johannes Meyer 812f9af949 Change modulePath setting to module_path
fixes #7694
2014-11-17 10:10:08 +01:00
Thomas Gelf 8d4089c22a Merge remote-tracking branch 'origin/feature/livestatus-playground-4787'
Not really useful yet, allows to play around a little bit
2014-11-16 19:41:54 +01:00
Thomas Gelf 0cea370a5c Widget\Tab: fix tagParams check breaking tabs 2014-11-16 19:37:11 +01:00
Thomas Gelf b6464c5d83 Livestatus\Connection: one more comment 2014-11-16 18:43:11 +01:00
Thomas Gelf aaec1b84bf Livestatus\Query: indentation 2014-11-16 18:42:10 +01:00
Thomas Gelf 0ff9d57504 Livestatus\Connection: just a comment 2014-11-16 18:37:01 +01:00
Thomas Gelf 40c4562fe4 Data\SimpleQuery: don't fail on missing columns...
...for now
2014-11-16 18:24:16 +01:00
Thomas Gelf c0343a0dae Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787 2014-11-16 18:07:18 +01:00
Thomas Gelf 195375f055 Livestatus\Query: use calculated column headers 2014-11-16 18:03:58 +01:00
Thomas Gelf d368df8211 Livestatus\Connection: check resource on disconnect 2014-11-16 18:01:07 +01:00
Thomas Gelf 2c7373f385 Livestatus\Connection: benchmark, comments 2014-11-16 17:59:56 +01:00
Thomas Gelf 140b246974 Livestatus\Connection: remove obsolete constant
TCPNODELAY is available in PHP >= 5.3
2014-11-16 17:58:56 +01:00
Thomas Gelf b2a55f0998 Db\DbQuery: do not expose applyFilterSql 2014-11-16 17:09:51 +01:00
Thomas Gelf 5ea2f33efb Db\DbQuery: add NOT LIKE support 2014-11-16 17:08:50 +01:00
Thomas Gelf 90f1ab06b4 Db\DbQuery: add "deep" clone support
Still far from being complete, Zend_Db_Select makes life really hard for
us. More to come...
2014-11-16 17:06:26 +01:00
Thomas Gelf 6bf0ca216a Livestatus\Query: resultrow method - base for more
This is where query-based column fixup voodoo starts
2014-11-16 16:35:02 +01:00
Thomas Gelf 628597d6cb Livestatus\Query: some more filter-related stuff 2014-11-16 16:32:53 +01:00
Thomas Gelf 46b047b013 Livestatus\Query: add customvar support 2014-11-16 16:31:09 +01:00
Thomas Gelf 7d02107803 Livestatus\Query: fix limit, add some notes 2014-11-16 16:29:40 +01:00
Thomas Gelf d7141392a5 Livestatus\Query: return available columns 2014-11-16 16:28:52 +01:00
Thomas Gelf 7b6b9b8574 LivestatusConnection: separator constant 2014-11-16 16:27:21 +01:00
Thomas Gelf e0143bf572 Livestatus\Connection: add missing use statements 2014-11-16 16:26:28 +01:00
Thomas Gelf fd55ffe47e Livestatus\Connection: switch to new fetch methods 2014-11-16 16:25:47 +01:00
Thomas Gelf efd395e12a Livestatus\ResponseRow: initial dummy implementation 2014-11-16 16:22:10 +01:00
Thomas Gelf 17c8453c1c Livestatus\Connection: line splitting implementation
Will need some more work to get SplFixedArray handling safe
2014-11-16 16:02:50 +01:00
Thomas Gelf e1cdd30c93 Livestatus\Connection: fetch row from socket...
...basically just calling readLine, but splitting columns
2014-11-16 16:00:03 +01:00
Thomas Gelf e755b37af3 Livestatus\Connection: discover column headers...
...in case the query doesn't know about
2014-11-16 15:56:58 +01:00
Thomas Gelf 8ec8c153dd Livestatus\Connection: implement readLineFromSocket
We want to stream data in the near future, so reading line by line is
essential
2014-11-16 15:55:53 +01:00
Thomas Gelf a027efc9e7 Livestatus\Connection: make use of socketError 2014-11-16 15:55:20 +01:00
Thomas Gelf d66c95a725 Livestatus\Connection: implement socketError method 2014-11-16 15:54:32 +01:00
Thomas Gelf be8120bd39 Livestatus\Connection: document hardcoded count 2014-11-16 15:53:19 +01:00
Thomas Gelf d6b9f56a2c Livestatus\Connection: throw "better" exceptions
Removed outdated method
2014-11-16 15:51:26 +01:00
Thomas Gelf 578873f695 Livestatus\Query: start using new filter methods 2014-11-16 15:48:59 +01:00
Thomas Gelf 3b1b38a353 Livestatus\Query: attempt to separate column handling 2014-11-16 15:47:06 +01:00
Thomas Gelf 4b5b5f4ae3 Livestatus\Query: use trigger_error in __toString 2014-11-16 15:37:52 +01:00
Thomas Gelf 510e1e66d6 Livestatus\Connection: add fetchRow / fetchPairs
Temporary ugly and slow implementation
2014-11-16 15:33:17 +01:00
Thomas Gelf 4cbe8da26f Livestatus\Query: add a lot of filter voodoo 2014-11-16 15:30:10 +01:00
Thomas Gelf 14cdcc8ce2 Livestatus\Query: fetch csv, not json 2014-11-16 15:28:17 +01:00
Thomas Gelf 23546a4224 Livestatus\Query: parse an array structure 2014-11-16 15:22:54 +01:00
Thomas Gelf 1b8449009c Livestatus\Connection: temporarily hardcode count 2014-11-16 15:20:12 +01:00
Thomas Gelf 0916f57ce8 Livestatus\Query: split string cast implementation
This way we can use an exception-throwing variant internally while not
breaking __toString
2014-11-16 15:13:07 +01:00
Thomas Gelf 38fec33849 Livestatus\Query: temporarily disable count cache 2014-11-16 15:12:13 +01:00
Thomas Gelf 48dfb1bb70 Livestatus\Query: remove obsolete properties 2014-11-16 15:11:31 +01:00
Thomas Gelf 39a995cc6f Livestatus\Query: remove SimpleQuery tasks 2014-11-16 15:09:33 +01:00
Thomas Gelf 6de98dcf97 Livestatus\Query: extend SimpleQuery, not abstract 2014-11-16 15:06:58 +01:00
Thomas Gelf 2e1cc8ed35 Widget\Tabs: use icon font 2014-11-16 14:41:22 +01:00
Thomas Gelf e89d4642e3 Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787 2014-11-16 10:12:34 +01:00
Thomas Gelf 9e0e3f12e3 FilterChain: addFilter should return itself 2014-11-16 02:49:33 +01:00
Thomas Gelf 387928de02 Filter: support 'q' searches
This makes the overall search play nice with the FilterEditor and
reduces code in the action controller. Still some work to do, but
seems to be pretty fine right now.
2014-11-16 02:40:28 +01:00
Thomas Gelf 5630374058 FilterEditor: handle ignoreParams correctly 2014-11-16 00:19:28 +01:00
Thomas Gelf e0bf021fb9 FilterEditor: apply submitted changes do filter 2014-11-15 23:49:37 +01:00
Thomas Gelf b1f82bd025 FilterEditor: add request handle support 2014-11-15 23:49:06 +01:00
Thomas Gelf 7da87b7341 FilterEditor: split render function and clean up 2014-11-15 23:48:17 +01:00
Thomas Gelf 0e4a8575a9 FilterEditor: new helper for text inputs 2014-11-15 23:46:36 +01:00
Thomas Gelf 1c5cba9ddf FilterEditor: don't sort all select's
Columns are now sorted separately, so that's fine
2014-11-15 23:45:03 +01:00
Thomas Gelf 2eb2fa51da FilterEditor: cache available columns 2014-11-15 23:43:13 +01:00
Thomas Gelf 1d4ea88251 FilterEditor: clean up selectColumn 2014-11-15 23:42:15 +01:00
Thomas Gelf e6ded2eb3c FilterEditor: use new id helper in selectSign 2014-11-15 23:39:21 +01:00
Thomas Gelf 934a0a4914 FilterEditor: helper function for op dropdown 2014-11-15 23:38:36 +01:00
Thomas Gelf c700e86008 FilterEditor: add helper rendering new filters 2014-11-15 23:37:31 +01:00
Thomas Gelf 711b1a5224 FilterEditor: elementId helper method for inputs 2014-11-15 23:34:21 +01:00
Thomas Gelf 7993ad2fde FilterEditor: add a couple of link generators
remove/add/strip/cancel
2014-11-15 23:32:38 +01:00
Thomas Gelf d6e3f06997 FilterEditor: readability 2014-11-15 23:31:17 +01:00
Thomas Gelf 4a38c069f3 FilterEditor: do not export removal function 2014-11-15 23:30:06 +01:00
Thomas Gelf 8858069514 FilterEditor: addTo method for special operations
Removed obsolete mark function
2014-11-15 23:27:58 +01:00
Thomas Gelf ee16391720 FilterEditor: no title, add cancel button 2014-11-15 23:24:55 +01:00
Thomas Gelf dcc0c213b2 FilterEditor: add redirect support
Not the cleanest way, could be improved
2014-11-15 23:18:50 +01:00
Thomas Gelf ac483a0fe6 FilterEditor: add compact search render support
We show the search box and a filter preview while not modifying the
filter
2014-11-15 23:11:55 +01:00
Thomas Gelf 44d5ee8fa0 FilterEditor: make constructor parameter optional
...and use new setters
2014-11-15 23:02:38 +01:00
Thomas Gelf c5ca3b633c FilterEditor: allow additional parameter control
We may want to keep additional parameters in our url and ignore other
ones when the filter changes
2014-11-15 22:57:25 +01:00
Thomas Gelf 269f4b4c83 FilterEditor: allow to set the query from outside
Query will be used to provide a column list
2014-11-15 22:55:26 +01:00
Thomas Gelf 118abbe980 FilterEditor: url-setter and protected lazy-shortcut 2014-11-15 22:54:40 +01:00
Thomas Gelf e75d0aa10e FilterEditor: add getter and setter for Filter
We will shift quite some logic over here
2014-11-15 22:52:55 +01:00
Thomas Gelf a75bfd1dfb FilterEditor: add failsafe string cast 2014-11-15 22:50:35 +01:00
Thomas Gelf 0fd4a094ea Web\Request: the request should know the URL 2014-11-15 22:40:29 +01:00
Thomas Gelf 2ecdfefa85 Widget\Tabs: use icon for dropdown tabs 2014-11-15 22:39:42 +01:00
Thomas Gelf 44c96f0410 FilterOr: override operator change for NOT
Replacing an OR filter with a NOT operator should return a NOT OR
when the OR contains more than one entry
2014-11-15 22:37:12 +01:00
Thomas Gelf 1f74c462d4 FilterChain: add and use count() function 2014-11-15 22:34:18 +01:00
Thomas Gelf 39d7d13ddb AbstractWidget: default properties should be empty
Helps troubleshooting, getter would fail with a hard-to-track error
otherwise.
2014-11-15 16:54:59 +01:00
Thomas Gelf 210aae27fd Merge remote-tracking branch 'origin/feature/redesign-7144' 2014-11-15 12:19:46 +01:00
Eric Lippmann 6ba4e55277 Throw exception on E_NOTICE
Use of uninitialized values must be detected asap.
2014-11-15 01:20:27 +01:00
Eric Lippmann 2cd8e14998 Remove Zend/Locale/Data/*.xml
This should be safe.
2014-11-15 01:20:02 +01:00
Eric Lippmann b38a108385 Revert "Remove Zend/Locale from our vendor library"
This reverts commit 9b2bff4d17.

At least Zend/Filter/Alnum.php requires Zend_Locale.
2014-11-15 01:14:49 +01:00
Eric Lippmann 52c19b5843 EmbeddedWeb must not load core modules, i.e. setup 2014-11-15 01:04:56 +01:00
Eric Lippmann 2c0122ba9f Fix ApplicationBootstrap::getBootstrapDirectory() when Icinga Web 2 is served using PHP's built-in web server 2014-11-15 01:04:14 +01:00
Thomas Gelf 925348d171 Data\Filter: add or/andFilter implementations
Those shortcuts make it easy to correctly add or/and conditions
regardless of the original filter type
2014-11-14 23:06:20 +01:00
Thomas Gelf 6aefc4b491 Data\Filter: fix $self VS $this 2014-11-14 22:53:46 +01:00
Thomas Gelf 178ddaade7 Data\Filter: add missing abstract function type 2014-11-14 22:44:04 +01:00
Thomas Gelf 53bca911fb Data\Filter: enforce isEmpty() implementation 2014-11-14 22:43:30 +01:00