Eric Lippmann
50bbf77d0c
Fix module domain detection in Form::getTranslationDomain()
...
The usage of preg_replace had two errors:
1) The regular expression was wrong
2) $matches[0] always contains the full matched string, not the first parenthesized subpattern
The correct version of preg_replace would've been:
if (preg_match('/^Icinga\\\\Module\\\\([A-Za-z]+)\\\\/', get_called_class(), $matches) === 1) {
return strtolower($matches[1]);
}
But since there's no benefit of using a regular expression here except less speed, I replaced it
with using explode.
refs #7551
2014-12-30 10:08:33 +01:00
Eric Lippmann
58cfb67983
Load setup module when necessary when bootstrapping the CLI
...
fixes #8146
2014-12-30 09:27:37 +01:00
Eric Lippmann
9d9dd8ac99
Merge branch 'feature/rhel-packages-6401'
...
resolves #6401
2014-12-29 16:50:20 +01:00
Eric Lippmann
57121bf0ea
dompdf: Rename LICENSE.LGPL to LICENSE
2014-12-29 16:31:21 +01:00
Eric Lippmann
0b8ab18243
Parsedown: Rename LICENSE.txt to LICENSE
2014-12-29 16:30:44 +01:00
Matthias Jentsch
a1950aabba
Fix some obsolete or wrong docstrings
2014-12-29 16:27:28 +01:00
Matthias Jentsch
4cf8da4bb9
Do not focus logout menu item after a recurring login
...
Implement new MenuItemRenderer made for pages that are not part
of the regular site navigation and should trigger a complete site reload
instead of handling it via XHR.
2014-12-29 16:20:05 +01:00
Eric Lippmann
839523a73f
Web: Load setup module if necessary
2014-12-29 14:31:34 +01:00
Eric Lippmann
611d01788f
Add setup related utility functions to ApplicationBootstrap.php
2014-12-29 14:29:31 +01:00
Eric Lippmann
7d36a59c67
Use '@return $this' instead of '@return self' for document fluent interfaces in ApplicationBootstrap.php
2014-12-29 14:01:19 +01:00
Eric Lippmann
4ea52161a9
Merge branch 'master' into feature/packages-4075
2014-12-29 12:31:38 +01:00
Boden Garman
5e40ce2088
Only check the session save path is writable if the session handler is 'files'
...
fixes #8053
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2014-12-29 09:37:47 +01:00
Eric Lippmann
7f5ba135ee
Revert "Relax session storage check to the `files' save handler"
...
This reverts commit f7d11ce11f
.
Sorry mate but a guy on GitHub was faster ;)
refs #8053
2014-12-29 09:37:07 +01:00
Matthias Jentsch
41c101d99f
Use neutral default color in perfdata piecharts
...
If nothing is known about the state of the monitoring object, the piecharts should neither indicate OK nor Critical.
2014-12-23 16:12:25 +01:00
Matthias Jentsch
cda5a6a903
Streamline chart implementation
...
Define sparkline layout through CSS class and remove label/tooltip formatting.
fixes #7077
2014-12-23 15:26:45 +01:00
Matthias Jentsch
64a2acd12e
Do not display labels for single data sets in perfdata piecharts
...
Display generic chart titles for the whole piechart that only contain title and percentage and don't style perfdata piecharts using HTML properties.
refs #7077
refs #6200
refs #7304
2014-12-23 15:14:17 +01:00
Johannes Meyer
f7d11ce11f
Relax session storage check to the `files' save handler
...
fixes #8053
2014-12-22 11:02:48 +01:00
Johannes Meyer
6d263ae316
Do NOT fetch the translation domain from the request in Form::translate(..)
...
It might be the case that a module is using a library form...
refs #7551
2014-12-19 13:07:51 +01:00
Johannes Meyer
cf43b81400
Use the class namespace instead of the request in Form::translate(Plural)
...
refs #7551
2014-12-19 12:08:54 +01:00
Johannes Meyer
e5d2d4cec2
Add module-aware Form::translate and Form::translatePlural
...
refs #7551
2014-12-19 11:29:24 +01:00
Eric Lippmann
1468ed0a19
lib: Add separator parameter to String::cname()
2014-12-18 17:23:54 +01:00
Eric Lippmann
4dfac28393
lib: Fix PHPDoc of Form::setOnSuccess()
2014-12-18 17:21:06 +01:00
Johannes Meyer
7710fd7b0e
Hide unsupported export formats
...
refs #8112
2014-12-18 16:20:41 +01:00
Eric Lippmann
8ec0740005
Merge branch 'master' into feature/packages-4075
2014-12-18 14:02:17 +01:00
Johannes Meyer
3fde78f2b3
Enable the dompdf float support and fix our list's layout
2014-12-15 13:56:19 +01:00
Johannes Meyer
bca28a5ae2
Display inline pie-charts also in views exported to PDF
...
fixes #6463
2014-12-15 13:55:20 +01:00
Tom Ford
dc0f396fbf
Check LDAP username in case insensitive way
...
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
refs #7991
2014-12-10 16:00:39 +01:00
Eric Lippmann
68e460b5d1
Remove unused use in EmbeddedWeb
2014-12-10 09:32:02 +01:00
Eric Lippmann
888fa90fe2
Fix typo in PHPDoc in EmbeddedWeb
2014-12-10 09:31:37 +01:00
Eric Lippmann
2b5fe7baf4
Set default config dir to '/etc/icingaweb2'
2014-12-10 09:30:12 +01:00
Eric Lippmann
916868a051
Revert "Add support for "core" modules and make the setup module such a module"
...
This reverts commit 8af13f564b
.
The setup module must only be loaded when necessary not always.
2014-12-09 16:28:05 +01:00
Eric Lippmann
7d00f68660
Revert "Load core modules also when bootstrapping the CLI"
...
This reverts commit f12473d34b
.
The CLI must not load core modules, i.e. setup.
2014-12-09 16:27:04 +01:00
Johannes Meyer
196b6a4875
Ensure that Zend is loaded when showing status information in the CLI
...
fixes #7869
2014-12-09 15:38:13 +01:00
Eric Lippmann
1afc2a0b1d
lib: Add FileExtensionFilterIterator
...
Add iterator for iterating over files having a specific file extension.
2014-12-09 12:28:49 +01:00
Eric Lippmann
00a09284ef
lib: Add NonEmptyFileIterator
...
Add iterator for iterating over non-empty files.
2014-12-09 12:28:23 +01:00
Thomas Gelf
09e59ba44a
Modules\Module: determine correct config dir
2014-12-03 10:43:27 +01:00
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
Thomas Gelf
ce7aea5df7
Data\Filter: add isChain() and isExpression()
...
This makes node type distiction easier
2014-11-14 22:41:30 +01:00
Thomas Gelf
da47c7fc7e
Merge remote-tracking branch 'origin/master' into feature/redesign-7144
2014-11-14 21:32:57 +01:00
Eric Lippmann
11bb8dbab0
icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"
2014-11-14 16:02:17 +01:00
Eric Lippmann
ce69300c9a
cli: Fix the path to the clicommands
2014-11-14 16:01:40 +01:00
Eric Lippmann
9b2bff4d17
Remove Zend/Locale from our vendor library
2014-11-14 15:36:51 +01:00
Eric Lippmann
5178798fa9
Remove Zend/Gdata from our vendor library
...
Let's waste less space
2014-11-14 15:06:26 +01:00
Johannes Meyer
ddf2ef5cc9
Remove $request parameter from Form::onSuccess and Form::onRequest
...
fixes #7552
2014-11-14 14:59:29 +01:00
Eric Lippmann
029630308d
Load Zend on Web and EmbeddedWeb
...
refs #7464
2014-11-14 14:07:13 +01:00
Eric Lippmann
37dd2f5dd2
Do not load Zend on the CLI and remove our library from the include path
...
Adding Icinga Web 2's library to the include is not necessary for getting the Zend_Plugin_Loader working.
2014-11-14 14:04:24 +01:00
Eric Lippmann
c1591bc641
Zend: Reset require_once in Zend_Loader_Autoloader
...
refs #7464
2014-11-14 14:03:20 +01:00
Eric Lippmann
5bd888f46c
Merge branch 'master' into feature/include-zend-7464
2014-11-14 13:28:08 +01:00
Eric Lippmann
49d66a7b73
Use lessphp from the include path
...
refs #6165
refs #6166
2014-11-14 13:27:02 +01:00
Eric Lippmann
85c6150ca4
Move lessphp from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 13:26:11 +01:00
Eric Lippmann
97d026fb09
Update JShrink to version 1.0.1
...
refs #6165
refs #6166
2014-11-14 11:59:08 +01:00
Eric Lippmann
6624b764cf
Use JShrink from the include path
...
refs #6165
refs #6166
2014-11-14 11:55:06 +01:00
Eric Lippmann
8e7a56db58
Move JShrink from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:54:20 +01:00
Eric Lippmann
c081841917
Move Parsedown from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:50:38 +01:00
Johannes Meyer
586b4f463b
Let our module autloader know that we renamed our form namespaces
...
refs #7553
2014-11-14 11:30:44 +01:00
Johannes Meyer
775c20d9ad
Rename namespace Icinga\Form to Icinga\Forms
...
refs #7553
2014-11-14 10:57:14 +01:00
Johannes Meyer
1c4a5ce86f
Leave it up to Icinga\Web\Form to instantiate our own form elements
2014-11-14 10:15:27 +01:00
Johannes Meyer
872dce2208
Prefer form elements of Icinga\Web\Form\Element in Form::createElement
2014-11-14 10:15:27 +01:00
Thomas Gelf
69fdc6a329
Chart/InlinePie: smaller, white border for hover
...
I roughly changed the piechart defaults to their original (icon-like)
size. However, this is NOT how we should handle such changes. We MUST
be able to style them via CSS and get rid of that incredible amount of
HTML attributes.
I want to be able to set the height directly in CSS as em/px. And I want
also be able to set it to 100% and size the outer container.
refs #7077
2014-11-14 09:54:20 +01:00
Eric Lippmann
69c5728769
Remove htmlpurifier-4.6.0-lite from the IcingaVendor directory
2014-11-13 23:50:28 +01:00
Eric Lippmann
967492736b
Add HTMLPurifier version 4.6.0 to our vendor library
...
refs #6165
refs #6166
2014-11-13 23:49:31 +01:00
Thomas Gelf
d55c2a4c87
Widget\Filter*: fix parse error, replace minus
2014-11-13 21:47:40 +01:00
Bernd Erk
903219b302
Merge branch 'master' into feature/redesign-7144
...
Conflicts:
library/Icinga/Web/Menu.php
public/css/icinga/menu.less
2014-11-13 21:11:36 +01:00
Eric Lippmann
0a7decd0a9
Remove dompdf from the IcingaVendor directory
...
IcingaVendor will be removed.
refs #6165
refs #6166
2014-11-13 20:11:00 +01:00
Eric Lippmann
c4aeaf3428
Use dompdf from the include path
...
refs #6165
refs #6166
2014-11-13 20:10:24 +01:00
Eric Lippmann
d87acd557a
Add dompdf version 0.6.1 to our vendor library
...
refs #6165
refs #6166
2014-11-13 20:09:27 +01:00
Bernd Erk
20be45e8da
Enable icon font
2014-11-13 20:08:58 +01:00
Eric Lippmann
48a468b888
Add our vendor path to the include path
2014-11-13 19:52:28 +01:00
Eric Lippmann
81b144d057
Fix locale setup
...
The CLI must not try to use HTTP_ACCEPT_LANGUAGE. Avoided double try-catch blocks.
refs #6073
2014-11-13 18:02:03 +01:00
Bernd Erk
6201858a68
Merge branch 'master' into feature/redesign-7144
2014-11-13 17:47:26 +01:00
Eric Lippmann
e3c70bec6d
Fix timezone setup
...
The CLI must not try to use our web timezone detection thingy.
refs #6073
2014-11-13 17:07:36 +01:00
Eric Lippmann
ac2ec83852
Merge branch 'master' into feature/localization-form-6073
...
Conflicts:
library/Icinga/Application/ApplicationBootstrap.php
test/php/library/Icinga/User/Store/DbStoreTest.php
2014-11-13 17:03:41 +01:00
Eric Lippmann
94f8597271
Add existing GROUPBYs to count queries
2014-11-13 16:42:11 +01:00
Eric Lippmann
0e34001568
Use automatically a subquery when counting with groups
2014-11-13 16:42:11 +01:00
Johannes Meyer
77f5bc3932
Use GROUPBY instead of DISTINCT and subqueries when counting
2014-11-13 16:42:11 +01:00
Thomas Gelf
f86d3e7636
Web\StyleSheet: PCRE problem workaround, PHP5.3.7
...
Lines with embedded fonts where too long for lessphp's PCRE matches
unless PHP 5.3.7
2014-11-13 16:35:26 +01:00
Thomas Gelf
28c239c6fd
Web\Controller: initial commit
...
* This is the controller all modules should inherit from.
* We will flip code with the ModuleActionController as soon as a couple
of pending feature branches are merged back to the master.
2014-11-13 15:42:25 +01:00
Thomas Gelf
1c0e427d3b
Web\StyleSheet: compile webfont too
...
refs #6936
2014-11-13 15:41:13 +01:00
Thomas Gelf
50869c783d
MonitoringMenuItemRenderer: webfont icon support
...
refs #6936
2014-11-13 15:30:00 +01:00
Thomas Gelf
b16959bc44
Widget\Tab: support webfont icons
...
refs #6936
2014-11-13 15:22:47 +01:00
Thomas Gelf
29c7c2e707
Web\MenuRenderer: support webfont icons
...
refs #6936
2014-11-13 15:21:49 +01:00
Thomas Gelf
1aa8858dca
helpers/icon: support webfont shortcuts
...
* set icon class instead of icon image if no such is given
* fix TODO: merge parameter classes
refs #6936
2014-11-13 15:17:36 +01:00
Bernd Erk
ef2ec0442c
Merge branch 'master' into feature/redesign-7144
2014-11-13 14:40:26 +01:00
Johannes Meyer
6be51d1565
Use Icinga\Web\Form\Element\Button instead of Zend's button
...
Due to a bug in Zend prior to 1.12.2 we need our own button implementation
to support earlier versions of the Zend Framework. The side effect is, that
this button can also be used as submit button for our forms as isChecked
will do its job now properly.
2014-11-13 14:26:12 +01:00
Eric Lippmann
385157be8f
Zend: Remove require_once calls
...
refs #7464
2014-11-13 10:49:39 +01:00
Eric Lippmann
38ebc949a5
Zend: Include Zend version 1.12.9
...
refs #7464
2014-11-13 10:49:32 +01:00
Eric Lippmann
f427577067
Add getVendorDir() in favor of constant ICINGAWEB_VENDORS
2014-11-13 09:38:04 +01:00
Eric Lippmann
bfa834fc3b
Remove constant ICINGAWEB_APPDIR
...
We should avoid use of constants.
2014-11-13 09:33:31 +01:00
Eric Lippmann
9c103a9864
Remove constant ICINGAWEB_BASEDIR
...
We should avoid use of constants.
2014-11-13 09:24:51 +01:00
Bernd Erk
ac8cc0613c
Merge branch 'master' into feature/redesign-7144
...
Conflicts:
application/views/scripts/authentication/login.phtml
public/css/icinga/login.less
2014-11-12 17:21:54 +01:00
Eric Lippmann
75475b1684
Rename getBootstrapDirecory() to getBootstrapDirectory()
2014-11-12 17:14:43 +01:00
Eric Lippmann
c394cd0bff
Use realpath in ApplicationBootstrap::getBootstrapDirecory()
...
If the CLI is called from source, the base directory is now set to the correct path.
Packagers will have to provide the path to the base directory though.
2014-11-12 17:11:48 +01:00
Johannes Meyer
db7954c350
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 17:05:13 +01:00
Alexander Fuhr
c7f36a5afa
Fix empty preferences array warning in the DbStore
2014-11-12 17:03:22 +01:00
Eric Lippmann
ec6b56a060
Allow to define Icinga Web 2's base directory while bootstrapping
2014-11-12 15:52:43 +01:00
Eric Lippmann
b27d1d0058
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 14:48:15 +01:00
Eric Lippmann
a081db08a4
icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined"
2014-11-12 14:43:58 +01:00
Eric Lippmann
6089372c42
Do not define ICINGAWEB_BASEDIR in index.php
...
There's SCRIPT_FILENAME. The constants will be removed shortly.
2014-11-12 14:39:45 +01:00
Alexander Fuhr
993390941a
Add user account menu and move logout and preferences inside it
2014-11-12 13:22:14 +01:00
Eric Lippmann
277765ac72
No longer make ICINGAWEB_APPDIR configureable
2014-11-12 13:18:05 +01:00
Eric Lippmann
11e13582e2
Define the ICINGAWEB_VENDORS contant
2014-11-12 13:17:18 +01:00
Alexander Fuhr
4f84979c89
Fix IniStore to save and load proper user preferences
2014-11-12 13:16:09 +01:00
Eric Lippmann
8c9465ffbd
Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path
2014-11-12 13:06:43 +01:00
Eric Lippmann
877e9101f3
Do not define the constant ICINGAWEB_LIBDIR
...
This constant should not be needed anywhere.
2014-11-12 12:55:16 +01:00
Alexander Fuhr
533d2207fd
Fix `setupTimezone' and `setupInternationalization' for user preferences
2014-11-12 12:16:05 +01:00
Alexander Fuhr
8d120762de
Add timezone detection to `setupTimezone' in ApplicationBootstrap
2014-11-12 12:13:46 +01:00
Thomas Gelf
f0ca81d7af
Data\Filter: SORT_NATURAL only for PHP >= 5.4
2014-11-12 11:47:42 +01:00
Thomas Gelf
5851886877
Widget\Tab: no underlined space after icon
2014-11-12 11:30:06 +01:00
Alexander Fuhr
33107ff8f2
Add new table columns and change the preferences DB save process
2014-11-12 11:08:05 +01:00
Johannes Meyer
62aacce469
Place the noscript button next to the element it is supposed to apply
2014-11-12 10:48:52 +01:00
Johannes Meyer
7aae291f69
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 10:08:28 +01:00
Johannes Meyer
c3e28a42fb
Remove configuration option for setting the access mode on new files
2014-11-12 09:40:07 +01:00
Johannes Meyer
4992140326
Hardcode the access mode to use when creating files
...
refs #7163
2014-11-12 09:39:18 +01:00
Thomas Gelf
f24b0e2a4e
MonitoringBackend: a few more places, doesn't hurt
2014-11-12 00:20:37 +01:00
Thomas Gelf
0992f6cc15
Monitoring/MenuRenderers: unify logic, perftuning
...
This reduces duplicate code, query will be fired only once right now.
fixes #7554
2014-11-11 21:50:49 +01:00
Thomas Gelf
0d4d4930a9
Db\DbConnection: benchmark single row fetches
2014-11-11 21:07:02 +01:00
Thomas Gelf
d253e1e5b0
Util\Translator: available locales should be sorted
2014-11-11 19:45:56 +01:00
Thomas Gelf
f39301d47f
Cli: use STDOUT as the default logger
...
fixes #7636
2014-11-11 19:43:22 +01:00
Thomas Gelf
f347a74982
Logger\StdoutWriter: initial implementation
...
This log writer writes to STDOUT and uses ANSI colors on real terminals
fixes #7636
2014-11-11 19:40:59 +01:00
Thomas Gelf
629118b590
LogWriter: setting config must not be abstract
...
Storing the given config makes sense as default action, no need to
abstract the constructor per default.
refs #7636
2014-11-11 19:39:15 +01:00
Thomas Gelf
6d705721e3
Filters: try to give meaningful results for...
...
...missing columns
refs #4787
2014-11-11 19:26:37 +01:00
Thomas Gelf
8987b69d55
Filter: allow to list all filtered columns
...
This is important for backends that need to know which additional columns
to fetch.
refs #4787
2014-11-11 19:09:59 +01:00
Johannes Meyer
a6af51f402
Fix that Config::fromSection cannot return the actual value
...
refs #7147
2014-11-11 15:51:54 +01:00
Matthias Jentsch
c70f738236
Remove linebreaks from configuration keys and values
2014-11-11 15:10:50 +01:00
Matthias Jentsch
fdfad34e5c
Do not normalize configuration keys to nested arrays in IniWriter
...
More than one nesting level (the section) is no longer allowed in configuration files. Dots in keys are now
part of the key and will not lead to a nested configuration.
fixes #7120
2014-11-11 15:05:34 +01:00
Eric Lippmann
8e3394fd55
Merge branch 'master' into feature/redesign-7144
2014-11-11 13:54:13 +01:00
Johannes Meyer
eb4672923f
Require the OpenSSL module instead of providing an unsafe fallback
...
refs #7163
2014-11-11 10:19:09 +01:00
Johannes Meyer
f12473d34b
Load core modules also when bootstrapping the CLI
...
refs #7163
2014-11-11 10:00:28 +01:00
Johannes Meyer
9d292269b1
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
application/forms/Config/Resource/LdapResourceForm.php
test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer
8af13f564b
Add support for "core" modules and make the setup module such a module
...
refs #7163
2014-11-10 17:34:49 +01:00
Johannes Meyer
21ed823da7
Adjust namespace declarations
...
refs #7163
2014-11-10 16:31:40 +01:00
Johannes Meyer
8f212018ec
Move the setup wizard code to a dedicated module
...
refs #7163
2014-11-10 15:11:44 +01:00
Johannes Meyer
2bb7217d04
Do not require the openssl extension
2014-11-10 11:20:02 +01:00
Johannes Meyer
79493592bb
Do not use Installer anywhere.
...
"It's setup."
refs #7163
2014-11-10 10:30:52 +01:00
Johannes Meyer
f85ddeb215
Do not hardcode the php username dummy in Icinga\Application\Platform
...
refs #7163
2014-11-07 14:40:28 +01:00
Johannes Meyer
eadc7d8415
Remove the POSIX requirement
...
refs #7163
2014-11-07 14:39:34 +01:00
Johannes Meyer
9a5d01b3fd
Check the mysql or pgsql extension instead of just pdo, really
2014-11-07 14:31:20 +01:00
Johannes Meyer
124f64ad89
Merge branch 'master' into bugfix/drop-zend-config-7147
2014-11-07 14:07:15 +01:00
Johannes Meyer
7b99b74ae1
Prefer Icinga\Application\Config instead of Zend_Config
...
refs #7147
2014-11-07 13:53:03 +01:00
Johannes Meyer
268569114c
Fix that an error is thrown when reading INI files without trailing newlines
2014-11-07 13:38:35 +01:00
Johannes Meyer
4537b2932e
Fix that current(), key(), etc does not work with Config objects
2014-11-07 13:37:09 +01:00
Matthias Jentsch
54eda31633
Allow connect to hosts with no anonymous access
...
Do not throw exceptions on failed ldap connects during capability discovery
fixes #7325
2014-11-06 17:04:56 +01:00
Matthias Jentsch
d0706a55ea
Chain exceptions in LdapUserBackend instead of printing the message
2014-11-06 16:32:43 +01:00
Johannes Meyer
83f386f92a
Do not extend Zend_Config in Icinga\Application\Config
...
refs #7147
fixes #7580
2014-11-06 15:41:31 +01:00
Bernd Erk
f9e8cc84b9
Design: headline and main menu
2014-11-06 00:09:14 +01:00
Alexander Fuhr
2e24c53224
Merge branch 'master' into feature/localization-form-6073
...
Conflicts:
application/forms/Config/GeneralForm.php
application/forms/Preference/GeneralForm.php
library/Icinga/Application/Web.php
2014-11-05 13:27:45 +01:00
Eric Lippmann
a06568ce41
security: Add menu entry for security
...
refs #5647
2014-11-04 16:19:20 +01:00
Eric Lippmann
d2eddcbec6
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-04 16:15:06 +01:00
Johannes Meyer
7569c55796
Fix how password hashes are stored and retrieved in DbUserBackend
2014-11-04 15:52:09 +01:00
Johannes Meyer
0db658b7f3
Fix that pgsql privileges were tested in case of mysql
...
refs #7163
2014-11-04 15:51:11 +01:00
Johannes Meyer
69b38768cf
Fix "Icinga\Logger\Logger not found"
...
The class was moved to Icinga\Application\Logger.
2014-11-04 15:50:34 +01:00