53bca911fb
Data\Filter: enforce isEmpty() implementation
2014-11-14 22:43:30 +01:00
ce7aea5df7
Data\Filter: add isChain() and isExpression()
...
This makes node type distiction easier
2014-11-14 22:41:30 +01:00
da47c7fc7e
Merge remote-tracking branch 'origin/master' into feature/redesign-7144
2014-11-14 21:32:57 +01:00
11bb8dbab0
icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"
2014-11-14 16:02:17 +01:00
ce69300c9a
cli: Fix the path to the clicommands
2014-11-14 16:01:40 +01:00
9b2bff4d17
Remove Zend/Locale from our vendor library
2014-11-14 15:36:51 +01:00
5178798fa9
Remove Zend/Gdata from our vendor library
...
Let's waste less space
2014-11-14 15:06:26 +01:00
ddf2ef5cc9
Remove $request parameter from Form::onSuccess and Form::onRequest
...
fixes #7552
2014-11-14 14:59:29 +01:00
029630308d
Load Zend on Web and EmbeddedWeb
...
refs #7464
2014-11-14 14:07:13 +01:00
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
c1591bc641
Zend: Reset require_once in Zend_Loader_Autoloader
...
refs #7464
2014-11-14 14:03:20 +01:00
5bd888f46c
Merge branch 'master' into feature/include-zend-7464
2014-11-14 13:28:08 +01:00
49d66a7b73
Use lessphp from the include path
...
refs #6165
refs #6166
2014-11-14 13:27:02 +01:00
85c6150ca4
Move lessphp from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 13:26:11 +01:00
97d026fb09
Update JShrink to version 1.0.1
...
refs #6165
refs #6166
2014-11-14 11:59:08 +01:00
6624b764cf
Use JShrink from the include path
...
refs #6165
refs #6166
2014-11-14 11:55:06 +01:00
8e7a56db58
Move JShrink from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:54:20 +01:00
c081841917
Move Parsedown from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:50:38 +01:00
586b4f463b
Let our module autloader know that we renamed our form namespaces
...
refs #7553
2014-11-14 11:30:44 +01:00
775c20d9ad
Rename namespace Icinga\Form to Icinga\Forms
...
refs #7553
2014-11-14 10:57:14 +01:00
1c4a5ce86f
Leave it up to Icinga\Web\Form to instantiate our own form elements
2014-11-14 10:15:27 +01:00
872dce2208
Prefer form elements of Icinga\Web\Form\Element in Form::createElement
2014-11-14 10:15:27 +01:00
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
69c5728769
Remove htmlpurifier-4.6.0-lite from the IcingaVendor directory
2014-11-13 23:50:28 +01:00
967492736b
Add HTMLPurifier version 4.6.0 to our vendor library
...
refs #6165
refs #6166
2014-11-13 23:49:31 +01:00
d55c2a4c87
Widget\Filter*: fix parse error, replace minus
2014-11-13 21:47:40 +01:00
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
0a7decd0a9
Remove dompdf from the IcingaVendor directory
...
IcingaVendor will be removed.
refs #6165
refs #6166
2014-11-13 20:11:00 +01:00
c4aeaf3428
Use dompdf from the include path
...
refs #6165
refs #6166
2014-11-13 20:10:24 +01:00
d87acd557a
Add dompdf version 0.6.1 to our vendor library
...
refs #6165
refs #6166
2014-11-13 20:09:27 +01:00
20be45e8da
Enable icon font
2014-11-13 20:08:58 +01:00
48a468b888
Add our vendor path to the include path
2014-11-13 19:52:28 +01:00
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
6201858a68
Merge branch 'master' into feature/redesign-7144
2014-11-13 17:47:26 +01:00
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
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
94f8597271
Add existing GROUPBYs to count queries
2014-11-13 16:42:11 +01:00
0e34001568
Use automatically a subquery when counting with groups
2014-11-13 16:42:11 +01:00
77f5bc3932
Use GROUPBY instead of DISTINCT and subqueries when counting
2014-11-13 16:42:11 +01:00
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
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
1c0e427d3b
Web\StyleSheet: compile webfont too
...
refs #6936
2014-11-13 15:41:13 +01:00
50869c783d
MonitoringMenuItemRenderer: webfont icon support
...
refs #6936
2014-11-13 15:30:00 +01:00
b16959bc44
Widget\Tab: support webfont icons
...
refs #6936
2014-11-13 15:22:47 +01:00
29c7c2e707
Web\MenuRenderer: support webfont icons
...
refs #6936
2014-11-13 15:21:49 +01:00
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
ef2ec0442c
Merge branch 'master' into feature/redesign-7144
2014-11-13 14:40:26 +01:00
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
385157be8f
Zend: Remove require_once calls
...
refs #7464
2014-11-13 10:49:39 +01:00
38ebc949a5
Zend: Include Zend version 1.12.9
...
refs #7464
2014-11-13 10:49:32 +01:00
f427577067
Add getVendorDir() in favor of constant ICINGAWEB_VENDORS
2014-11-13 09:38:04 +01:00
bfa834fc3b
Remove constant ICINGAWEB_APPDIR
...
We should avoid use of constants.
2014-11-13 09:33:31 +01:00
9c103a9864
Remove constant ICINGAWEB_BASEDIR
...
We should avoid use of constants.
2014-11-13 09:24:51 +01:00
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
75475b1684
Rename getBootstrapDirecory() to getBootstrapDirectory()
2014-11-12 17:14:43 +01:00
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
db7954c350
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 17:05:13 +01:00
c7f36a5afa
Fix empty preferences array warning in the DbStore
2014-11-12 17:03:22 +01:00
ec6b56a060
Allow to define Icinga Web 2's base directory while bootstrapping
2014-11-12 15:52:43 +01:00
b27d1d0058
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 14:48:15 +01:00
a081db08a4
icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined"
2014-11-12 14:43:58 +01:00
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
993390941a
Add user account menu and move logout and preferences inside it
2014-11-12 13:22:14 +01:00
277765ac72
No longer make ICINGAWEB_APPDIR configureable
2014-11-12 13:18:05 +01:00
11e13582e2
Define the ICINGAWEB_VENDORS contant
2014-11-12 13:17:18 +01:00
4f84979c89
Fix IniStore to save and load proper user preferences
2014-11-12 13:16:09 +01:00
8c9465ffbd
Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path
2014-11-12 13:06:43 +01:00
877e9101f3
Do not define the constant ICINGAWEB_LIBDIR
...
This constant should not be needed anywhere.
2014-11-12 12:55:16 +01:00
533d2207fd
Fix `setupTimezone' and `setupInternationalization' for user preferences
2014-11-12 12:16:05 +01:00
8d120762de
Add timezone detection to `setupTimezone' in ApplicationBootstrap
2014-11-12 12:13:46 +01:00
f0ca81d7af
Data\Filter: SORT_NATURAL only for PHP >= 5.4
2014-11-12 11:47:42 +01:00
5851886877
Widget\Tab: no underlined space after icon
2014-11-12 11:30:06 +01:00
33107ff8f2
Add new table columns and change the preferences DB save process
2014-11-12 11:08:05 +01:00
62aacce469
Place the noscript button next to the element it is supposed to apply
2014-11-12 10:48:52 +01:00
7aae291f69
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 10:08:28 +01:00
c3e28a42fb
Remove configuration option for setting the access mode on new files
2014-11-12 09:40:07 +01:00
4992140326
Hardcode the access mode to use when creating files
...
refs #7163
2014-11-12 09:39:18 +01:00
f24b0e2a4e
MonitoringBackend: a few more places, doesn't hurt
2014-11-12 00:20:37 +01:00
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
0d4d4930a9
Db\DbConnection: benchmark single row fetches
2014-11-11 21:07:02 +01:00
d253e1e5b0
Util\Translator: available locales should be sorted
2014-11-11 19:45:56 +01:00
f39301d47f
Cli: use STDOUT as the default logger
...
fixes #7636
2014-11-11 19:43:22 +01:00
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
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
6d705721e3
Filters: try to give meaningful results for...
...
...missing columns
refs #4787
2014-11-11 19:26:37 +01:00
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
a6af51f402
Fix that Config::fromSection cannot return the actual value
...
refs #7147
2014-11-11 15:51:54 +01:00
c70f738236
Remove linebreaks from configuration keys and values
2014-11-11 15:10:50 +01:00
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
8e3394fd55
Merge branch 'master' into feature/redesign-7144
2014-11-11 13:54:13 +01:00
eb4672923f
Require the OpenSSL module instead of providing an unsafe fallback
...
refs #7163
2014-11-11 10:19:09 +01:00
f12473d34b
Load core modules also when bootstrapping the CLI
...
refs #7163
2014-11-11 10:00:28 +01:00
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
8af13f564b
Add support for "core" modules and make the setup module such a module
...
refs #7163
2014-11-10 17:34:49 +01:00
21ed823da7
Adjust namespace declarations
...
refs #7163
2014-11-10 16:31:40 +01:00
8f212018ec
Move the setup wizard code to a dedicated module
...
refs #7163
2014-11-10 15:11:44 +01:00
2bb7217d04
Do not require the openssl extension
2014-11-10 11:20:02 +01:00
79493592bb
Do not use Installer anywhere.
...
"It's setup."
refs #7163
2014-11-10 10:30:52 +01:00
f85ddeb215
Do not hardcode the php username dummy in Icinga\Application\Platform
...
refs #7163
2014-11-07 14:40:28 +01:00
eadc7d8415
Remove the POSIX requirement
...
refs #7163
2014-11-07 14:39:34 +01:00
9a5d01b3fd
Check the mysql or pgsql extension instead of just pdo, really
2014-11-07 14:31:20 +01:00
124f64ad89
Merge branch 'master' into bugfix/drop-zend-config-7147
2014-11-07 14:07:15 +01:00
7b99b74ae1
Prefer Icinga\Application\Config instead of Zend_Config
...
refs #7147
2014-11-07 13:53:03 +01:00
268569114c
Fix that an error is thrown when reading INI files without trailing newlines
2014-11-07 13:38:35 +01:00
4537b2932e
Fix that current(), key(), etc does not work with Config objects
2014-11-07 13:37:09 +01:00
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
d0706a55ea
Chain exceptions in LdapUserBackend instead of printing the message
2014-11-06 16:32:43 +01:00
83f386f92a
Do not extend Zend_Config in Icinga\Application\Config
...
refs #7147
fixes #7580
2014-11-06 15:41:31 +01:00
f9e8cc84b9
Design: headline and main menu
2014-11-06 00:09:14 +01:00
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
7569c55796
Fix how password hashes are stored and retrieved in DbUserBackend
2014-11-04 15:52:09 +01:00
0db658b7f3
Fix that pgsql privileges were tested in case of mysql
...
refs #7163
2014-11-04 15:51:11 +01:00
69b38768cf
Fix "Icinga\Logger\Logger not found"
...
The class was moved to Icinga\Application\Logger.
2014-11-04 15:50:34 +01:00
5a169ee656
Fix "PreservingIniWriter not found"
...
The class was renamed a few commits ago to "IniWriter"
2014-11-04 14:35:57 +01:00
170ded6510
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
581935c26f
Fix database setup and add support for the new schema
...
refs #7163
2014-11-04 13:51:15 +01:00
805cb9f079
Do not report whether files were skipped because they already exist
...
I've removed the summary earlier as a user does not configure this in any
way so it's not necessary to show him what should had happened to files
as well.
refs #7163
2014-11-04 13:47:37 +01:00
45d3005f3c
Throw exceptions on PHP warnings
...
Sometimes we miss PHP warnings because our layout overlays them.
2014-11-04 13:20:41 +01:00
8913bf53c9
Fix salt extraction
2014-11-04 13:03:36 +01:00
99277383b9
Fix retrieving a user's data from the database
2014-11-04 13:03:12 +01:00
cad8f7538e
Leave it up to the database to decide what is the current time
2014-11-04 12:42:39 +01:00
f9fee2df70
Do not interrupt authentication chain on invalid ldap connection infos
...
Catch LdapExceptions and throw AuthenticationException to not interrupt authentication chain
fixes #7497
2014-11-04 12:35:41 +01:00
b38e3affb9
Move INI writer classes to the File namespace
...
fixes #7150
2014-10-31 10:54:53 +01:00
16352fc10c
Move Logger to the Application namespace
...
fixes #7148
2014-10-31 10:27:17 +01:00
4f1e1ddb6f
Adjust the DbUserBackend to reflect the new database schema
2014-10-30 15:40:07 +01:00
538bc8aec8
Drop unused method parameter in DbTool::checkPrivileges
2014-10-30 15:08:04 +01:00
521a36e0af
Fix method documentation of DbTool::checkPgsqlPriv()
2014-10-30 15:07:33 +01:00
e58520c3e6
Drop irritating and redundant docblock warning
2014-10-30 15:06:57 +01:00
1bd1b58d46
Drop unused use statement
2014-10-30 15:06:14 +01:00
c1bff9a26e
Merge branch 'master' into feature/setup-wizard-7163
2014-10-30 10:38:21 +01:00
9365e3ca94
Remove the setup token from disk upon completion of the wizard
...
refs #7163
2014-10-30 10:36:02 +01:00
ec47f6bdb3
Create permissions.ini when defining the initial administrator
...
refs #7163
2014-10-30 09:53:58 +01:00
1b83ec3ce2
Preferences: Fix saving preferences when using a database store
...
Our DbSelect::where() is not (or no longer?) compatible w/ Zend_Db_Select::where().
DbStore::load() now uses Zend_Db_Select but we should definitely think about our
DbSelect::where() implementation.
fixes #7353
2014-10-30 09:49:21 +01:00
39729c9580
Logger: Fix level comparison
2014-10-29 16:51:17 +01:00
504853961b
Add temporary requirement for the DOM php module
...
Should be removed once dompdf isn't shipped with Icinga Web 2 anymore
refs #7163
refs #6172
2014-10-29 16:25:25 +01:00
c8e323e8a7
Improve requirment checks
...
refs #7163
2014-10-29 16:24:31 +01:00
4d8842db09
Return a dummy PHP username in case the POSIX module is not available
2014-10-29 16:22:41 +01:00
81e06fe570
Do not show a requirement for Zend_Db_Adaper_*
...
refs #7163
refs #7464
2014-10-29 15:49:14 +01:00
9cd4aeec06
Fix MySQL login creation in DbTool::addLogin()
...
refs #7163
2014-10-29 15:45:57 +01:00
33a64eb55a
Do not throw an exception in DbTool due to an implementation detail
...
Throwing exceptions due to failing logic which is purely an implementation
detail must not affect the calling code in any way.
refs #7163
2014-10-29 15:45:26 +01:00
47d9426a1f
Use a hardcoded path where to look for modules
...
refs #7163
2014-10-29 15:43:08 +01:00
ec6948dddf
Fix that the ModulePage does not provide a wizard's requirement info
...
refs #7163
2014-10-29 11:38:21 +01:00
32006420c5
Fix WelcomePage
...
There were some grammar- and layout-errors
as well as information missing :(
2014-10-29 11:36:03 +01:00
6a3244d8df
Do not show a summary for the MakeDirStep
...
The user does not configure anything this step will process so there is no
need to show the user a summary about something he can't control.
refs #7163
2014-10-29 08:38:59 +01:00
83cfcef85c
Add EnableModuleStep
...
refs #7163
2014-10-29 08:38:59 +01:00
3c438d9221
Allow install steps to return no summary
...
refs #7163
2014-10-29 08:38:59 +01:00
dbf5512252
Drop Icinga\Application\Installation and introduce Icinga\Installation
...
refs #7163
2014-10-29 08:38:59 +01:00
a899070606
Move MakeDirStep to Icinga\Web\Setup
...
refs #7163
2014-10-29 08:38:59 +01:00
dd6b045183
Fix that the ModulePage cant find modules when being asked for
...
refs #7163
2014-10-29 08:38:59 +01:00
98acc24869
Create configuration sub directories as part of the setup wizard
...
refs #7163
2014-10-29 08:38:59 +01:00
Thomas Gelf
Eric Lippmann
Johannes Meyer
Bernd Erk
Alexander Fuhr
Matthias Jentsch