Commit Graph

999 Commits

Author SHA1 Message Date
Eric Lippmann 0a6440a6a6 Security: Add role form
This form will replace the permission and restriction form

refs #5647
2014-11-19 14:24:02 +01:00
Eric Lippmann 8aab5dc0f0 Security: Show roles instead of permissions and restrictions
refs #5647
2014-11-19 14:23:56 +01:00
Eric Lippmann a2818bd937 Merge branch 'master' into feature/security-gui-5647 2014-11-19 14:13:26 +01:00
Bernd Erk fd5fe26a1f Changes login screen and added header 2014-11-19 13:43:48 +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 63cd5854d4 Merge remote-tracking branch 'origin/master' into feature/redesign-7144 2014-11-19 07:56:48 +01:00
Thomas Gelf 8c305f59f2 LoginForm: re-establish placeholder texts 2014-11-19 06:56:36 +01:00
Marius Hein 5ace5fd2dc Dashboard: Change icons
refs #4537
2014-11-18 17:47:57 +01:00
Eric Lippmann 84b98cd58d Security: Fix Form namespace 2014-11-18 17:10:14 +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 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 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 be6358452e Do not redirect to the wizard in case of an empty config.ini 2014-11-18 13:13:02 +01:00
Johannes Meyer 4ab5b2abf3 Fix anonymous onSuccess callbacks 2014-11-18 13:12:30 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Marius Hein 3e58ec2530 Dashboard: Use new controller actions
refs #4537
2014-11-18 12:51:28 +01:00
Marius Hein cbcd276b44 Dashboard: Rewrite forms and controller [WIP]
refs #4537
2014-11-18 10:04:41 +01:00
Marius Hein 89b36f79b2 Dashboard: Reenable generic add link in tab bar
refs #4537
2014-11-18 09:59:24 +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 af799d42dc Widget/Dashboard: Cleanup object and remove unused stuff
refs #4537
2014-11-18 09:59:23 +01:00
Marius Hein 5f9d394bbe AddToDashboard: Form layout and template
refa #4537
2014-11-18 09:59:23 +01:00
Marius Hein 1000b4661f AddToDashboard: Remove controller logic
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 245c247ff3 Changes remove icon in monitoring module to cancel icon 2014-11-17 17:08:08 +01:00
Bernd Erk f83bcbfd2b updates current font set and changes service and reporting icons 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 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
Johannes Meyer 24b6274f01 Fix logging configuration installation
refs #7163
refs #6933
2014-10-17 13:05:56 +02:00
Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/General/LoggingConfigForm.php
2014-10-17 13:04:59 +02:00
Johannes Meyer a54c81b2a7 Adjust button labels only in WebSetup::addButtons(), not in view scripts
refs #7163
2014-10-17 11:20:20 +02:00
Johannes Meyer 2ecb862fc3 Style welcome page and fill placeholders
refs #7163
2014-10-17 11:19:04 +02:00
Johannes Meyer 223502c314 Style installation report
refs #7163
2014-10-17 09:18:10 +02:00
Johannes Meyer d4acbeb061 Fix that the location is not getting updated when navigating to the login
refs #7163
2014-10-16 16:13:37 +02:00
Eric Lippmann 5ca97c14d6 logging config: Support 'log' 'none' 2014-10-16 16:13:00 +02:00
Johannes Meyer d73423ceee Style summary page
Dropped also the layout logic as it was too generic.

refs #7163
2014-10-16 14:52:26 +02:00
Eric Lippmann f9e7e6d888 general config: Don't keep unused configuration directives 2014-10-16 11:20:16 +02:00
Johannes Meyer 21379cb24d Show ldap discovery results in a nice table
refs #7163
2014-10-15 15:46:54 +02:00
Johannes Meyer 1daeaef1c5 Fix that it is not possible to create an autologin auth backend
Occured only when no database resource nor a ldap resource exists.
2014-10-15 10:51:18 +02:00
Johannes Meyer 00ffb34829 Fix incorrect form fields being displayed when no database resource exists 2014-10-15 10:48:50 +02:00
Johannes Meyer 94f8745fc0 Fix authentication backend validation 2014-10-15 10:46:40 +02:00
Johannes Meyer f869a1bf17 Fix that the LdapDiscoveryForm discovers only MSAD hosts
refs #7163
2014-10-15 10:45:24 +02:00
Johannes Meyer 8f7348b823 Revert "Fix backend validation of LdapBackendForm"
This reverts commit 0777848a84.
2014-10-15 08:49:17 +02:00
Matthias Jentsch 937dbe2c15 Add missing close buttons to views without tabs 2014-10-14 17:54:52 +02:00
Johannes Meyer c9d12cf8ac Style requirements page
refs #7163
2014-10-14 16:45:04 +02:00
Johannes Meyer c0df55c079 Add progress bar
refs #7163
2014-10-14 16:14:28 +02:00
Matthias Jentsch 0777848a84 Fix backend validation of LdapBackendForm 2014-10-14 14:44:51 +02:00
Matthias Jentsch 771149e8d6 Move optional base_dn to end of form 2014-10-14 14:44:31 +02:00
Johannes Meyer 448991eec5 Put some margin around the setup wizard
refs #7163
2014-10-13 09:43:12 +02:00
Johannes Meyer b5798331db Wrap form notifications in <p> by default, not <div> 2014-10-13 09:41:36 +02:00
Johannes Meyer d16fddd274 Add a next button double to the admin account page as well
Forgot to adjust this page as it's using a dedicated view script.

refs #7163
2014-10-09 16:12:36 +02:00
Johannes Meyer 169a646a1a Fix that LDAP discovery suggestions are not populated
I've broke this when re-commiting the changes made by Matthias and fixed
this by populating dependent pages directly in WebSetup::setupPage.

refs #7163
2014-10-09 10:47:45 +02:00
Matthias Jentsch e29a568bff Add LDAP discovery pages
refs #7163
2014-10-09 10:20:07 +02:00
Matthias Jentsch e3164a275f Clarify the new meaning of an ldap resource's `root_dn' directive 2014-10-09 10:13:26 +02:00
Matthias Jentsch 04e83a53c5 Add `base_dn' directive to LDAP backend config 2014-10-09 10:10:09 +02:00
Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php
2014-10-08 16:34:31 +02:00
Johannes Meyer b7d3a47bc6 Add file-owner note to help output of the generateToken command
Clarifies that the token file must be owned by the webserver's user as there
is no reliable way to determine this user automagically.

refs #7163
2014-10-08 16:07:43 +02:00
Johannes Meyer 06e82ed892 Make it possible to skip the db-creation step
refs #7163
2014-10-08 15:34:28 +02:00
Johannes Meyer 647447b4d2 Ensure that a new admin account does not already exist
refs #7163
2014-10-08 10:38:04 +02:00
Eric Lippmann 1b23fd7fbe monitoring: Don't support status.dat as backend
Icinga Web 2 will not support status.dat for now and maybe forever.
2014-10-07 13:22:07 +02:00
Johannes Meyer ad7965228c Add install routines for all INI files
This is just a quick&dirty implementation. Once we know how modules are
being processed/installed this needs to be revisited.

refs #7163
2014-10-06 16:49:29 +02:00
Johannes Meyer 450ec2add0 Make it possible to differentiate the "final" next button
refs #7163
2014-10-06 16:29:39 +02:00
Johannes Meyer b50c780bcf Let the setup's view scripts be a bit more generic
refs #7163
2014-10-06 16:04:58 +02:00
Johannes Meyer ac255eeda0 Change form name of GeneralConfigPage to "setup_general_config"
Used to be "setup_application_config".

refs #7163
2014-10-06 13:52:32 +02:00
Johannes Meyer 83006c014c Wrap wizard buttons in a div
refs #7163
2014-10-06 11:07:21 +02:00
Johannes Meyer 5f68850443 Fix that radio buttons are not populated
refs #7163
2014-10-06 10:28:42 +02:00
Johannes Meyer f29705fc59 Add summary page
refs #7163
2014-10-02 17:11:00 +02:00
Johannes Meyer 0793033559 Add translation contexts to ambiguous form element labels 2014-10-02 16:34:44 +02:00
Johannes Meyer a980184eb9 Move css instructions to dedicated stylesheet
refs #7163
2014-10-01 15:46:58 +02:00
Johannes Meyer 3a11182bf0 Fix welcome page name not conforming the "standard"
refs #7163
2014-10-01 10:33:06 +02:00
Johannes Meyer e186c21821 Fix form submit when JS is enabled
refs #7163
2014-10-01 09:18:44 +02:00
Johannes Meyer 08d259eccf Add database creation page
refs #7163
2014-10-01 09:16:53 +02:00
Eric Lippmann 266936b9b5 Fix that logout of unauthenticated users throws exceptions 2014-10-01 08:13:17 +02:00
Matthias Jentsch 8008387559 Fix typo 2014-09-30 15:59:11 +02:00
Matthias Jentsch f1903855b9 Avoid type warning in LoginForm 2014-09-30 15:50:16 +02:00
Matthias Jentsch 9a57ddcfa6 Fix login redirects when AutologinBackend is used 2014-09-30 15:49:31 +02:00
Johannes Meyer e9e4ef01e5 Use Icinga\Web\Form\Element\Note instead of Zend_Form_Element_Note
Zend_Form_Element_Note is not available prior Zend v1.12.2

refs #7163
2014-09-29 15:46:30 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Johannes Meyer c3e3a4127d Add missing description to the GeneralConfigPage
refs #7163
2014-09-29 15:28:36 +02:00
Alexander Fuhr f7b7e0283a Translation: another bunch of translatable strings 2014-09-29 15:20:19 +02:00
Johannes Meyer ab93969944 Add missing platform checks to DbResourceForm 2014-09-29 14:46:27 +02:00
Johannes Meyer 288ae6885b Show the web wizard, finally
refs #7163
2014-09-29 14:31:43 +02:00
Johannes Meyer 243dd19281 Add AdminAccount page
refs #7163
2014-09-29 12:29:36 +02:00
Johannes Meyer b6b7814e8b Add GeneralConfig page
refs #7163
2014-09-29 12:29:13 +02:00
Johannes Meyer 5afda8a13e Add AuthBackend page
refs #7163
2014-09-29 12:28:12 +02:00
Johannes Meyer bd8f480cd0 Add LdapResource page
refs #7163
2014-09-29 12:27:58 +02:00
Johannes Meyer b782e790f4 Add DbResource page
refs #7163
2014-09-29 12:27:43 +02:00
Johannes Meyer 61f0ce65e0 Add preferences page
refs #7163
2014-09-29 12:27:26 +02:00
Johannes Meyer b1c32b1821 Add authentication page
refs #7163
2014-09-29 12:27:11 +02:00
Johannes Meyer a39c6a475a Add requirements page
refs #7163
2014-09-29 12:26:54 +02:00
Johannes Meyer 226575eddd Add welcome page
refs #7163
2014-09-29 12:26:27 +02:00
Johannes Meyer a5454e5702 Improve form element description 2014-09-29 11:24:23 +02:00
Johannes Meyer 2c44fe34a7 Fix that ldap auth validation does not send a BIND request 2014-09-29 11:22:43 +02:00
Johannes Meyer 7e00e83772 Make the loglevel ERROR being the default
refs #7163
2014-09-29 11:21:15 +02:00
Johannes Meyer 380ffe45b9 Add some redundancy to get more implicitness
Although this commit does not seem reasonable
at first the "big" picture proves its necessity!

refs #7163
2014-09-29 11:20:39 +02:00
Johannes Meyer 4f688fa544 Let the form decide where to get the resource configuration from
refs #7163
2014-09-29 11:06:16 +02:00
Johannes Meyer 0e92e333aa Make isValid* calls of configuration forms being static
This allows a more flexible usage as there is no need to access instance
formdata when validating such configuration.
2014-09-29 11:02:45 +02:00
Johannes Meyer c00dbf9f46 Write session on response
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
2014-09-24 10:46:35 +02:00
Johannes Meyer 80c42ce499 Fix autosubmit of Icinga\Form\Config\General\LoggingConfigForm 2014-09-24 10:46:35 +02:00
Johannes Meyer 71ccefac5e Add Cli command to generate and show setup tokens
One is now able to utilize `icingacli setup (show/generate)Token`

refs #7163
2014-09-24 10:46:35 +02:00
Johannes Meyer 98fbfe68a8 Redirect to /setup if necessary
A user gets now redirected to /setup in case he is not logged in, the token
file exists and no config.ini was found.

refs #7163
2014-09-24 10:46:34 +02:00
Eric Lippmann 44c4ec751d Deprecate monitoring module related methods in the `Util' view helper 2014-09-16 18:33:28 +02:00
Eric Lippmann 9e0d6657b7 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
2014-09-15 09:27:07 +02:00
Johannes Meyer 83772c6684 Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-09-09 16:03:22 +02:00
Matthias Jentsch 71f55e388f Only display custom menu renders on XHR requests and not in regular HTML
The main navigation should be rendered without a working backend.

fixes #7143
2014-09-09 15:33:42 +02:00
Matthias Jentsch 157818c8e7 Fix navigation reload
Activate the correct menu item with JavaScript after relaod and don't
 render it on server-side on XHR requests.
2014-09-09 13:57:48 +02:00
Johannes Meyer ceeb3a9ff8 Fix createElements() not returning self where applicable
refs #5525
2014-09-09 13:24:39 +02:00
Johannes Meyer 6bde740d21 Fix Icinga\Form\ConfigForm show config feature not available for modules
refs #5525
2014-09-09 13:22:51 +02:00
Johannes Meyer 31978e1236 Fix LdapBackendFormTest
refs #5525
2014-09-09 10:36:42 +02:00
Johannes Meyer c947ba3b18 Use the new view script to show INI configuration in case of failures 2014-09-09 09:46:57 +02:00
Matthias Jentsch 545db945da Auto refresh menu
Put the navigation into a container and reload it once every 15 seconds from a distinct menu action. Include the current
path into an URL param to still be able to mark the current menu item as active.

fixes #6955
2014-09-08 15:21:14 +02:00
Johannes Meyer f53519c54d Rename ConfigForm::setConfig() to ConfigForm::setIniConfig()
We do not want to override Zend_Form::setConfig() so this renaming is
required. set*Ini*Config() because ConfigForm::save() utilizes an ini-writer
to persist the configuration to disk.

refs #5525
2014-09-08 13:31:25 +02:00
Alexander Fuhr e8d526fcf9 StaticController: Fix img file inclusion 2014-09-08 12:59:22 +02:00
Alexander Fuhr 7386ae5ef5 Update Module img_ route to get image subfolders 2014-09-08 11:31:05 +02:00
Eric Lippmann 0e7ca591ec Merge branch 'master' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
Johannes Meyer 930e6e7d71 We shouldn't require Form::createElements() to return self
refs #5525
2014-09-08 09:24:53 +02:00
Johannes Meyer 7215e273f6 Fix AddUrlForm::createElements() not returning self 2014-09-08 09:10:59 +02:00
Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Preference/GeneralForm.php
2014-09-08 08:46:53 +02:00
Alexander Klimov e0dc972281 Use a `\' in the use statement
fixes #7095
2014-09-05 16:59:49 +02:00
Thomas Gelf 5a73f4b3c9 list: ooops 2014-09-05 15:33:34 +02:00
Thomas Gelf b034028ff8 Menu: do not show application log when none exists
Added new functions to the logger to get rid of distributed logging config
"knowledge".

fixes #7062
fixes #7098
2014-09-05 15:31:30 +02:00
Marius Hein 7b73adbf89 Timezone detection: Add discoverd value to preference form
refs #6078
2014-09-05 15:24:13 +02:00
Thomas Gelf 51366e2c22 layout: change header element order 2014-09-05 13:22:48 +02:00
Alexander Fuhr a2710ea8ef Fix namespace use for FormDateTime 2014-09-05 13:21:27 +02:00
Thomas Gelf d48f0ec453 static/gravatar: fetch smaller images 2014-09-05 12:00:29 +02:00
Johannes Meyer fc72ddfbc8 Adjust Preferences/GeneralForm to use handleRequest() &. Co.
refs #5525
2014-09-05 10:21:24 +02:00
Thomas Gelf 0f7f2f2d8b SearchDashboard: rename ::load() to ::search()
Function signature didn't match parent factory function

fixes #7081
2014-09-04 19:35:31 +02:00
Alexander Klimov 36a3c36c1b Rename Icinga\Protocol\File\Reader to ...\File\FileReader 2014-09-04 16:37:24 +02:00
Alexander Fuhr 70ac8077e6 Merge branch 'master' into feature/modules-search-capabilities-6495 2014-09-04 16:33:40 +02:00
Alexander Fuhr 1eacde0233 Implement modules self provided search configuration
refs #6495
2014-09-04 16:31:10 +02:00
Marius Hein 6fcf5ec88a DateTime: Remove global and user formattings
refs #6077
2014-09-04 16:02:10 +02:00
Eric Lippmann c3c0043307 Merge branch 'master' into bugfix/commands-6593 2014-09-03 23:23:20 +02:00
Eric Lippmann a4da3b61b3 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593 2014-09-03 23:23:02 +02:00
Eric Lippmann 2025fb3a2f lib: Let the date-and-time input control behave as defined in HTML5
refs #6593
2014-09-03 14:40:58 +02:00
Eric Lippmann 906de4e679 lib: Add the HTML5 attributes 'min', 'max' and 'step' to the number input control
refs #6593
2014-09-03 14:39:42 +02:00
Eric Lippmann de11131822 lib: Fix `DateFormat's `isUnixTimestamp' usage
refs #6593
2014-09-03 14:38:32 +02:00
Alexander Klimov f4b820aa57 Application log: don't use Icinga\Application\Config to get the log file name
refs #7060
2014-09-03 13:40:53 +02:00
Alexander Klimov 3b8fcb80a8 Application log: don't crash if logData === null
refs #7060
2014-09-03 12:44:23 +02:00
Johannes Meyer 54a834266c Form::createElements() should add elements instead of returning them
In case createElements() would still return the elements while requiring
the caller to add them to the form all form dependent configurations get
lost. (displaygroups, belongTo, ...) Wizards or parent forms can still
retrieve only input relevant fields by just calling createElements() and
getElements().

refs #5525
2014-09-03 12:21:31 +02:00
Eric Lippmann dd3901e891 `FormNumber': Fix "The use statement with non-compound name..."
refs #5525
2014-09-02 17:08:54 +02:00
Johannes Meyer 5ce9bef689 Replace usages of the `helptext' form element option with `description'
refs #5525
2014-09-02 17:03:51 +02:00
Eric Lippmann c7a4098c04 lib: Respect the disabled attribute in `FormNumber'
refs #5525
2014-09-02 16:54:43 +02:00
Johannes Meyer 95c839a8bd Remove remaining usages of the ElementWrapper- and HelpText-Decorator
refs #5525
2014-09-02 16:50:59 +02:00
Thomas Gelf 8577940e1e StaticController: cache gravatar images
fixes #7061
2014-09-02 16:31:38 +02:00
Johannes Meyer 5464321a1b ConfigController: Remove obsolete functionality 2014-09-02 16:25:03 +02:00
Johannes Meyer 1ba3df310c Remove BaseConfigController, User\Message and Widget\AlertMesageBox
refs #6758
2014-09-02 16:25:03 +02:00
Johannes Meyer 2d86e6ba3b Rename ResourceForm and make it use handleRequest() & Co.
refs #5525
2014-09-02 16:25:03 +02:00
Johannes Meyer 5b14d8fed3 Fix that the force_creation checkbox disappears after another error
Once the user enters invalid data after he tried to save a backend without
success (because the backend was not successfully validated) the shown
checkbox disappeared in this case regardless of whether it was checked
or not.

refs #5525
2014-09-02 16:25:03 +02:00
Johannes Meyer aedc8cc8b1 Fix spelling issue in german translation catalog 2014-09-02 16:19:45 +02:00
Johannes Meyer 39bb01b433 Rename Icinga\Web\Form::onShow() to onRequest()
onShow() is misleading because at the time this method is being called the
form is neither shown nor created.

refs #5525
2014-09-02 16:19:45 +02:00
Johannes Meyer deebb64869 Adjust Icinga\Form\Config\General* to use handleRequest() & Co.
refs #5525
2014-09-01 16:16:56 +02:00
Johannes Meyer 0e63e36ec0 Move Icinga\Form\Config\ConfirmRemovalForm to Icinga\Form
This is a generic form not necessarily being used just for configuration
purposes.

refs #5525
2014-09-01 15:11:09 +02:00
Marius Hein 751d2e6d11 ErrorController: Log exception and stacktrace
refe #5896
2014-09-01 10:00:04 +02:00
Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Config/Authentication/BaseBackendForm.php
	application/forms/Config/Authentication/DbBackendForm.php
	application/forms/Config/Authentication/LdapBackendForm.php
	application/forms/Config/Authentication/ReorderForm.php
	application/forms/Config/LoggingForm.php
	application/forms/Config/ResourceForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Config.php
	library/Icinga/Web/Form.php
	modules/monitoring/application/controllers/ConfigController.php
	modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
	modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
	modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
	modules/monitoring/application/forms/Config/SecurityForm.php
2014-08-29 16:05:56 +02:00
Johannes Meyer ae35650c7e Adjust authentication backend forms to suit.. some form implementation
refs #5525
2014-08-29 15:16:13 +02:00
Johannes Meyer 364c7c0858 Add base form class for configuration forms
refs #5525
2014-08-29 12:25:25 +02:00
Marius Hein e345aa257a Platform: Drop *Available function
Create a function extensionLoaded and change usages.

refs #5514
2014-08-28 12:14:55 +02:00
Marius Hein 436a4d2965 ResourceConfig: Chance createResouce to create
Not useful everywhere. Changed on the best suitable places.

refs #5514
2014-08-28 12:14:55 +02:00
Marius Hein 22e17e9901 ResourceFactory: Move available function to platform
refs #5514
2014-08-28 12:14:54 +02:00
Alexander Fuhr 66062c87b6 Remove unused use Zend_Config 2014-08-28 10:55:06 +02:00
Alexander Klimov 45638b218c Throw IcingaException rather than Exception
fixes #7014
2014-08-27 16:03:15 +02:00
Alexander Klimov 7ff51caed0 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
Eric Lippmann 1dea19504f Revert "Remove leading backslashes from the targets of use statements"
This reverts commit 87a5967501.

At least 'modules/doc/run.php' issues a warning about "The use statement with non-compound name 'Zend_Controller_Router_Route' has no effect"
2014-08-27 12:24:11 +02:00
Marius Hein 88698cb05d Hook/TopBar: Rework interface for monitoring top bar
refs #6929
2014-08-27 11:31:48 +02:00
Alexander Klimov 87a5967501 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
Alexander Fuhr af0cf48197 Add self provided configuration for dashlets
refs #6639
2014-08-26 10:34:35 +02:00
Alexander Fuhr 11127446e0 Update description if no dashlets available
refs #6639
2014-08-26 10:34:34 +02:00
Alexander Fuhr b60c3590b0 Deactivate addUrl to Dashboard
refs #6639
2014-08-26 10:34:34 +02:00
Thomas Gelf 5c46355474 translation: refresh de_DE 2014-08-22 17:58:53 +02:00
Johannes Meyer 7b221e2aba It should not be a form's responsibility how its submit button should look..
...in case it's a standard button. No need to be DRY here.

refs #5525
2014-08-22 15:20:54 +02:00
Johannes Meyer 403f745488 Remove obsolete loggingAction
refs #6933
2014-08-22 12:34:33 +02:00
Johannes Meyer a0b2c0b454 Fix another documentation block 2014-08-22 12:18:26 +02:00
Johannes Meyer 75a0c17933 Ensure that all forms have a name
refs #5525
2014-08-22 12:15:02 +02:00
Johannes Meyer 2b879b344f Do not populate using createElements() and fix documentation blocks
refs #5525
2014-08-22 12:04:14 +02:00
Alexander Fuhr 20cead67a6 Merge branch 'master' into bugfix/modules-menu-provider-6639 2014-08-22 11:44:10 +02:00
Alexander Fuhr f757f69bd1 Change Menu load from config ini files to self provided configuration
refs #6639
2014-08-22 11:10:17 +02:00
Johannes Meyer bc05d2ee64 Merge LoggingForm into GeneralForm
fixes #6933
2014-08-22 11:05:20 +02:00
Thomas Gelf af97db31d7 StaticController: fix gravatar sample img header 2014-08-21 19:10:53 +02:00
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
Thomas Gelf 736113c80c AuthenticationController: show friendlier hints...
...while not disclosing sensitive information. More to come once we
have our setup wizard.

fixes #6534
2014-08-19 18:55:58 +02:00
Alexander Fuhr 2f54ff4797 Fix the unrelated tabs
resolves #6934
2014-08-19 13:18:52 +02:00
Thomas Gelf 7334716d15 favicon: add link type
The favicon link tag was missing a type attribute.
2014-08-19 12:25:14 +02:00
Thomas Gelf 0d3fb9e7a5 LoginForm: explicitely remove renderLayout
Should prevent against rare race conditions.

refs #6584
2014-08-19 11:35:51 +02:00
Alexander Fuhr c69af6c5d2 Move "modules" to "System" menu
resolves #6934
2014-08-19 11:14:18 +02:00
Thomas Gelf f67d273bbd AuthenticationController: handle redirect parameter
This is a form field instead of a get parameter right now.

fixes #6584
2014-08-19 10:14:46 +02:00
Thomas Gelf 17b64f9dd5 layout: add favicon
fixes #6956
2014-08-19 10:13:19 +02:00
Thomas Gelf b5f336583f layout/body: protect containers from renderLayout
IMO this should be stripped before, this is just an additional
security measure.

refs #6935
2014-08-19 10:10:23 +02:00
Thomas Gelf 5a6b5172e6 Menu: ignore special params when comparing URLs
This fixes issues on login with dashboard != dashboard?renderLayout
and similar

refs #6699
2014-08-19 10:06:14 +02:00
Thomas Gelf 1cffbc9034 LoginForm: add "redirect" POST field
Instead of blindly trusting the redirect parameter in the URL this
creates a hidden form field and explicitely set's the form action
to the current URL without the redirect parameter.

refs #6584
2014-08-19 09:30:54 +02:00
Johannes Meyer 4ddc0e718b Report the default language also as being available for setting up the locale
fixes #6905
2014-08-14 10:48:52 +02:00
Johannes Meyer fe63ce664f Make use if 'ignore´ instead of explicitly unsetting array keys
refs #5525
2014-08-12 13:57:28 +02:00
Johannes Meyer e6bcda260d Redirect after a new resource has been created successfully
refs #5525
2014-08-12 10:42:28 +02:00
Johannes Meyer eea43e9a60 Adjust Icinga\Form\Dashboard\AddUrlForm to suit the new form interface
refs #5525
2014-08-12 09:49:27 +02:00