Commit Graph

764 Commits

Author SHA1 Message Date
Thomas Gelf da47c7fc7e Merge remote-tracking branch 'origin/master' into feature/redesign-7144 2014-11-14 21:32:57 +01:00
Alexander Fuhr 86cca8ff0b Fix the `date_default_timezone_get()' error 2014-11-14 17:08:34 +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
Johannes Meyer ddf2ef5cc9 Remove $request parameter from Form::onSuccess and Form::onRequest
fixes #7552
2014-11-14 14:59:29 +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
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
Bernd Erk 20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Eric Lippmann cc161764ff Use 'Preferences' instead of 'General Settings'
refs #6073
2014-11-13 18:08:30 +01:00
Bernd Erk 6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +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
Johannes Meyer f49d9e8591 Fix the tooltip's max page count in the joystick navigation 2014-11-13 16:45:03 +01:00
Bernd Erk c98a6d5912 Fixes type in error message 2014-11-13 15:41:31 +01:00
Thomas Gelf 47b1189af4 application/fonts: initial import
First sample font, to be replaced.

refs #6936
2014-11-13 15:40:20 +01:00
Bernd Erk 45418bd902 Removes login form placeholder 2014-11-13 15:08:49 +01:00
Bernd Erk ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +01:00
Eric Lippmann bfa834fc3b Remove constant ICINGAWEB_APPDIR
We should avoid use of constants.
2014-11-13 09:33:31 +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
Johannes Meyer db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Bernd Erk 288c52f88d Fix padding and moved h1 into control section 2014-11-12 16:56:04 +01:00
Johannes Meyer 259a465f97 Show only the most important warning on the login page 2014-11-12 16:23:55 +01:00
Johannes Meyer 2eb9a771c9 Do not check for any config file, just the directory to show the login-warning
refs #7163
2014-11-12 15:58:18 +01:00
Johannes Meyer 8e1a6a5b83 Fix that navigating in the service grid opens the grid in a new column
refs #6180
2014-11-12 15:13:32 +01:00
Johannes Meyer 933172f250 Replace navigation of the service matrix and rename it to service grid
fixes #6180
2014-11-12 15:07:01 +01:00
Alexander Fuhr 2bae33d6ad Change PreferenceForm and add the ability to store preferences in the current session 2014-11-12 13:18:35 +01:00
Alexander Fuhr 8d4e56a1fe Remove timezone element from the ApplicationConfigForm 2014-11-12 12:09:47 +01:00
Alexander Fuhr 8f6cac6a9e Add translation to preference tab title 2014-11-12 11:10:25 +01:00
Johannes Meyer c3e28a42fb Remove configuration option for setting the access mode on new files 2014-11-12 09:40:07 +01:00
Eric Lippmann 8e3394fd55 Merge branch 'master' into feature/redesign-7144 2014-11-11 13:54:13 +01:00
Johannes Meyer b26e585837 Fix that the authentication.ini is being used as trigger for the config warning
Should have been the config.ini instead.

refs #7163
2014-11-11 12:42:49 +01:00
Johannes Meyer af99f62843 Prefer Icinga\Application\Config over Zend_Config
refs #7163
2014-11-11 12:11:14 +01:00
Johannes Meyer 8909bd5d59 Show warning on login page even if the configuration directory exists
refs #7163
2014-11-11 10:04:01 +01:00
Johannes Meyer 5009083915 Remove dummy documentation link 2014-11-11 10:00:02 +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 8f212018ec Move the setup wizard code to a dedicated module
refs #7163
2014-11-10 15:11:44 +01:00
Johannes Meyer 5c9d7d6548 Add refresh button to the requirements page
refs #7163
refs #7587
2014-11-10 12:54:26 +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 6c664b72aa Do not "require" sudo
refs #7163
2014-11-10 09:19:38 +01:00
Johannes Meyer 942530d514 Ensure that the CLI successfully changed the group of the config directory
refs #7163
2014-11-07 15:34:54 +01:00
Johannes Meyer 004ac04de6 Do not check whether we are a super user
refs #7163
2014-11-07 15:33:40 +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 9a5d01b3fd Check the mysql or pgsql extension instead of just pdo, really 2014-11-07 14:31:20 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Bernd Erk 3c5d46ee71 redesigned login screen and image appearance 2014-11-07 00:40:32 +01:00
Eric Lippmann 5c8af79704 security: Add view scripts for creating, updating and removing restrictions
refs #5647
2014-11-06 17:39:51 +01:00
Eric Lippmann ebd77ee5c1 security: Add actions for creating, updating and removing restrictions
refs #5647
2014-11-06 17:39:20 +01:00
Eric Lippmann 945d94491a security: add form for setting and removing user and group restrictions
refs #5647
2014-11-06 17:38:38 +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 acded327e3 security: Add view scripts for creating, updating and removing permissions
refs #5647
2014-11-04 16:18:59 +01:00
Eric Lippmann d0fc38ce94 security: Add controller for creating, updating and removing permissions
refs #5647
2014-11-04 16:17:54 +01:00
Eric Lippmann 0f48382f69 security: Add form for granting and revoking user and group permissions
refs #5647
2014-11-04 16:14:39 +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
Eric Lippmann aac161d7a0 config forms: prepend our custom view decorator when saving the configuration failed 2014-11-04 14:48:24 +01:00
Johannes Meyer 5a169ee656 Fix "PreservingIniWriter not found"
The class was renamed a few commits ago to "IniWriter"
2014-11-04 14:35:57 +01:00
Johannes Meyer 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
Johannes Meyer 581935c26f Fix database setup and add support for the new schema
refs #7163
2014-11-04 13:51:15 +01:00
Johannes Meyer 0c8aa6502b Add `prefix' option when creating the resource config for web2's database
refs #7163
2014-11-04 13:49:01 +01:00
Johannes Meyer ab5df7d2ba Show notification bar in the wizard as well
refs #7163
2014-11-04 13:48:09 +01:00
Eric Lippmann b38e3affb9 Move INI writer classes to the File namespace
fixes #7150
2014-10-31 10:54:53 +01:00
Eric Lippmann 16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer c1bff9a26e Merge branch 'master' into feature/setup-wizard-7163 2014-10-30 10:38:21 +01:00
Johannes Meyer a7e942cdc9 Show a warning on the first page in case the user already configured web2
refs #7163
2014-10-30 10:37:51 +01:00
Johannes Meyer b9209daea5 Add another useful TODO
refs #7163
2014-10-30 09:54:14 +01:00
Eric Lippmann c4554ac692 Log exceptions when saving preferences 2014-10-30 09:48:25 +01:00
Eric Lippmann 2698516005 Auth: Remove setting the not existent layout 'login' when logging out externally authenticated users
fixes #7191
2014-10-29 16:31:17 +01:00
Johannes Meyer 47d9426a1f Use a hardcoded path where to look for modules
refs #7163
2014-10-29 15:43:08 +01:00
Johannes Meyer 32006420c5 Fix WelcomePage
There were some grammar- and layout-errors
as well as information missing :(
2014-10-29 11:36:03 +01:00
Johannes Meyer c6b18d2f3d Improve feedback when creating the configuration directory using the CLI
The user gets now a success message as well as not a failure message in case the directory already exists.

refs #7163
2014-10-29 08:46:22 +01:00
Johannes Meyer 16e614e71a Fix grammar.. 2014-10-29 08:39:00 +01:00
Johannes Meyer 3c438d9221 Allow install steps to return no summary
refs #7163
2014-10-29 08:38:59 +01:00
Johannes Meyer d19d4b1a4c Fix the ModulePage's request handling
This caused a module's summary page not being able to render the
summary as /<ModuleSetup>/->setupPage() is never been called
after a wizard is completed.

refs #7163
2014-10-29 08:38:59 +01:00
Johannes Meyer dd6b045183 Fix that the ModulePage cant find modules when being asked for
refs #7163
2014-10-29 08:38:59 +01:00
Johannes Meyer 85f7dcf825 Revert "Create sub directories with the CLI's setup command as well"
This reverts commit 9589919ae8.
2014-10-29 08:38:59 +01:00
Johannes Meyer 1fd4a301c4 Pass the wizard title to the summary page to be able to reuse the page
Module wizards can now use the SummaryPage as well if they want to.

refs #7163
2014-10-29 08:38:58 +01:00
Johannes Meyer e5512f586f Do not use getForm() but getCurrentPage() to avoid page creation
refs #7163
2014-10-29 08:38:58 +01:00
Johannes Meyer 3206ded18c Pass the entire page data to the ModulePage
As module wizards might require some configuration values aggregated by
the main application wizard we pass the entire page data to each wizard as
if the data were aggregated by a module wizard itself.

refs #7163
2014-10-29 08:38:58 +01:00
Matthias Jentsch b5468a122d Explain token generation on the welcome page
Add token generation manual to the welcome page. Display example code
containing the current configuration dir, to generate tokens.

fixes #7408
2014-10-28 17:32:49 +01:00
Matthias Jentsch 2e8c0cffe6 Check privileges of database user accounts before continuing with the setup
Implement owner and privilege checks for postgresql, and fix some errors in
existing MySQL privilege checks.

resolves #7389
2014-10-27 15:08:52 +01:00
Johannes Meyer dae2cbbeae Add missing action attribute to "by view-script" rendered forms
refs #7163
2014-10-27 09:01:00 +01:00
Johannes Meyer 9589919ae8 Create sub directories with the CLI's setup command as well
refs #7163
2014-10-27 08:34:37 +01:00
Johannes Meyer 2f83976f50 Add ModulePage
refs #7163
2014-10-24 17:10:17 +02:00
Johannes Meyer 03bbc2e2e6 Use a dedicated method to clear a wizard's session
Simplifies session removal in case a sub-class of Icinga\Web\Wizard
requires special session handling

refs #7163
2014-10-24 13:55:41 +02:00
Johannes Meyer ffc69c378c Fix typo in ConfigController::moduleenableAction() 2014-10-24 13:49:49 +02:00
Johannes Meyer a6cbde54c5 Move summary HTML generation from the view script to each install step
refs #7163
2014-10-23 15:15:59 +02:00
Johannes Meyer 216c072024 Implement installation routines modularly
This allows us to "merge" module installation
routines with our main installer routines.

refs #7163
2014-10-23 11:41:16 +02:00
Alexander Klimov 38220afd11 PHP: avoid short tags <? 2014-10-23 10:44:54 +02:00
Johannes Meyer 2fd22261eb Remove instruction initially purposed for testing only 2014-10-22 16:31:19 +02:00
Johannes Meyer f5c4708ae2 Add a default file mode for new configuration files
The file mode which can be configured in the general configuration is now
used when creating new configuration files with the PreservingIniWriter.
2014-10-21 17:02:21 +02:00
Johannes Meyer d201cff087 Don't suppress an E_WARNING in CLI commands
We should probably set an error handler to catch such things in the CLI..
2014-10-21 16:36:14 +02:00
Johannes Meyer 049e42ba9a Add CLI command to create the configuration directory
It is now not necessary anymore to generate the token as the web server's
user. A user now creates the configuration directory using the CLI as well,
while the SGID is set (in the default mode) causing the token only to be
accessible by the super user who owns the directory/file and the web
server's group.

refs #7163
refs #7408
refs #7410
2014-10-21 16:23:54 +02:00
Johannes Meyer 3a3d29ea4f Add more detailed explanations when configuring authentication backends
refs #7163
fixes #7411
2014-10-21 16:15:04 +02:00
Johannes Meyer b4a69792d8 Add note to login page when the configuration directory is missing
refs #7163
refs #7409
2014-10-21 16:11:49 +02:00
Johannes Meyer 8c62c66a4e Make regular expression pattern in autologin backend being fully optional 2014-10-20 15:14:14 +02:00
Eric Lippmann 53608c83d0 iframe: Load JavaScript even when 'isIframe' is true 2014-10-20 13:27:56 +02:00
Eric Lippmann a2e1663e34 index: Don't drop query parameters when redirecting to dashboard 2014-10-20 13:27:33 +02:00
Michael Friedrich 5b3c24dd92 Tell the user which file the setup token could not be written to
fixes #7407
2014-10-20 10:00:23 +02:00
Johannes Meyer 7f453be1cc Fix that no form values are stored for the LdapDiscoveryPage
refs #7163
2014-10-17 16:00:52 +02:00
Johannes Meyer f453fd06e8 Show the user which pages he already visited while navigating back
refs #7163
2014-10-17 15:41:25 +02:00
Johannes Meyer 768d8da4f8 Fix that syslog or file config elements are not shown in case of no default 2014-10-17 13:11:25 +02:00