Commit Graph

1685 Commits

Author SHA1 Message Date
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