Commit Graph

198 Commits

Author SHA1 Message Date
Johannes Meyer 94f8745fc0 Fix authentication backend validation 2014-10-15 10:46:40 +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 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
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
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 0793033559 Add translation contexts to ambiguous form element labels 2014-10-02 16:34:44 +02:00
Johannes Meyer ab93969944 Add missing platform checks to DbResourceForm 2014-09-29 14:46: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 80c42ce499 Fix autosubmit of Icinga\Form\Config\General\LoggingConfigForm 2014-09-24 10:46:35 +02:00
Johannes Meyer ceeb3a9ff8 Fix createElements() not returning self where applicable
refs #5525
2014-09-09 13:24:39 +02:00
Johannes Meyer 31978e1236 Fix LdapBackendFormTest
refs #5525
2014-09-09 10:36:42 +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
Johannes Meyer 930e6e7d71 We shouldn't require Form::createElements() to return self
refs #5525
2014-09-08 09:24:53 +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
Johannes Meyer 5ce9bef689 Replace usages of the `helptext' form element option with `description'
refs #5525
2014-09-02 17:03:51 +02:00
Johannes Meyer 95c839a8bd Remove remaining usages of the ElementWrapper- and HelpText-Decorator
refs #5525
2014-09-02 16:50:59 +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 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
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
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 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
Alexander Klimov 87a5967501 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +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 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
Johannes Meyer bc05d2ee64 Merge LoggingForm into GeneralForm
fixes #6933
2014-08-22 11:05:20 +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
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 a627571b87 Drop obsolete button elements
refs #5525
2014-08-11 10:46:45 +02:00
Johannes Meyer f0a99274e6 Access backend information by using getValue() instead of getConfig()
refs #5525
2014-08-11 10:46:08 +02:00
Johannes Meyer 5203f82b80 Fix message translation 2014-08-11 10:44:21 +02:00
Johannes Meyer a37e65be52 Fix coding style 2014-08-11 10:43:54 +02:00
Johannes Meyer d260c3fb94 Do not overwrite __construct() in forms, there's init() for that purpose
refs #5525
2014-08-11 10:39:13 +02:00
Johannes Meyer c36e30af1e Remove DbBackendForm::getConfig as it's not used anywhere
refs #5525
2014-08-11 09:13:41 +02:00
Alexander Klimov 4e1e845675 DbBackendForm: replace create with createElements and getResources with __construct
refs #5525
2014-07-29 12:22:43 +02:00
Alexander Klimov 5e6ef57590 LdapBackendForm: replace create with createElements and getResources with __construct
refs #5525
2014-07-29 12:21:58 +02:00
Alexander Klimov ed10e49bb6 Add AutologinBackendForm
fixes #6434
2014-07-25 14:51:42 +02:00
Johannes Meyer 26a78dc387 Remove properties from ConfirmRemovalForm and update it
Which object should be removed needs not to be a part of a form but is
accessible from the url's query string which should be in the action of the
form.

refs #5525
2014-07-24 16:20:01 +02:00
Johannes Meyer 9c434fe8bf Make isValid more compact and fix coding style
refs #5525
2014-07-24 09:05:10 +02:00
Johannes Meyer edf49d091e Rewrite addForceCreationCheckbox and move it downwards
We should not instantiate form elements directly without any specific
reason.

refs #5525
2014-07-24 08:57:49 +02:00
Johannes Meyer d8b468cf12 Add addSubmitButton to BaseBackendForm
refs #5525
2014-07-24 08:49:47 +02:00
Johannes Meyer 235c4a8c52 Remove getConfig and add get/setBackendConfig instead
As for every configuration form, backend forms need special population
mechanisms as well.

refs #5525
2014-07-24 08:47:58 +02:00
Johannes Meyer 4fe46a2c6e Remove unnecessary properties and their getters/setters
This kind of data is mainly prepared in the controller's action now or
directly fetched in a concrete form implementation.

refs #5525
2014-07-24 08:45:38 +02:00
Johannes Meyer 936f65eb27 Adjust resource form to suit the new form builder implementation
refs #5525
2014-07-23 16:39:15 +02:00
Johannes Meyer 9cdd891866 Drop ReorderForm and handle its logic in the controller and view instead
refs #5525
2014-07-23 12:35:39 +02:00
Johannes Meyer a73e2ee654 Adjust general config form to suit the new form builder implementation
refs #5525
2014-07-21 14:33:52 +02:00
Johannes Meyer 7157b11f97 Adjust LoggingForm to suit the "final" form builder implementation
refs #5525
2014-07-18 10:29:23 +02:00
Johannes Meyer 1de2d0c14f Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Authentication/LoginForm.php
	library/Icinga/Test/BaseTestCase.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Form/Decorator/BootstrapForm.php
2014-07-17 13:15:42 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer 6690410c42 Adjust Icinga\Form\Config\LoggingForm to suit the new form builder
refs #5525
2014-07-10 11:16:31 +02:00
Matthias Jentsch 57f3023ec4 Fix coding style 2014-07-03 16:20:45 +02:00
Matthias Jentsch fd21ba4e4d Fix violation of coding guidelines 2014-06-30 18:20:19 +02:00
Johannes Meyer f2e5d8afa5 Remove @codeCoverageIgnoreStart/-Stop annotations
refs #6091
2014-06-30 13:58:37 +02:00
Johannes Meyer 7ff4890ab7 Remove language selection from the general configuration
refs #6073
2014-06-25 13:21:05 +02:00
Alexander Klimov 5974305647 Config: Remove path to preferences INI files setting 2014-06-25 11:59:09 +02:00
Alexander Klimov fdf74c5e18 Revert "Make preferences INI path NOT be configurable"
This reverts commit 219869607d.
2014-06-25 11:59:08 +02:00
Thomas Gelf 4199e642ef GeneralForm: reorganize use definitions 2014-06-24 21:53:44 +02:00
Thomas Gelf eccfb9b6bc GeneralForms: remove date/timeFormat settings
They are still in use throughout the code, but the sooner we get rid
of them the better it is.

refs #6077
2014-06-24 21:50:11 +02:00
Alexander Klimov 219869607d Make preferences INI path NOT be configurable
fixes #6567
2014-06-24 18:29:28 +02:00
Thomas Gelf 1efd1d183e GeneralForm: replace ignorant button
It makes no sense to add submit buttons without telling the form
that there is such, especially in combination with autosubmitting
elements.

refs #5967
2014-06-23 15:46:15 +02:00
Thomas Gelf 8d6e6421ea config/general: remove obsolete environment setting 2014-06-20 23:21:31 +02:00
Thomas Gelf 0e57887e9a Config/General: remove obsolete moduleFolder
refs #6158
2014-06-20 22:46:44 +02:00
Matthias Jentsch c42c7977be Call extended backend health checks when creating ldap authentication backends
fixes #6457
2014-06-11 15:09:36 +02:00
Thomas Gelf 55880cb5a3 packaging/config: rename ICINGA_APPDIR
Renamed ICINGA_APPDIR to ICINGAWEB_APPDIR for consistency. This way
it fits ICINGAWEB_CONFIGDIR.

refs #6400
2014-06-04 21:11:27 +00:00
Eric Lippmann 50e01d1284 Config: Rename `configPath' to `config_path'
We use underscore_case notation for all configuration keys.

refs #4952
2014-06-02 12:09:16 +02:00
Matthias Jentsch ced6e8f78f Initialize all empty ellements with their default values.
refs #6098
2014-05-12 15:49:38 +02:00
Matthias Jentsch 793a0a061f Add validation for application name.
refs #6129
2014-05-12 15:40:59 +02:00
Johannes Meyer 4e77ea2f88 Fix logging configuration form 2014-04-30 12:09:44 +02:00
Johannes Meyer a865d8874d Fix ResourceForm namespace
refs #6038
2014-04-30 11:59:40 +02:00
Johannes Meyer 4cf3044a53 Rename Icinga\Logger\Writer\StreamWriter to FileWriter
refs #6038
2014-04-30 11:59:22 +02:00
Johannes Meyer 0b3d3e9bb2 Adjust logging configuration to suit the new logger implementation
refs #6038
2014-04-30 11:33:36 +02:00
Johannes Meyer a5faa8bf25 Fix ResourceForm
refs #6038
2014-04-30 10:16:20 +02:00
Matthias Jentsch e1d8ad820e Fix include
refs #4788
2014-04-28 17:15:36 +02:00
Matthias Jentsch 085025ba7d Icingaweb shoul work without optional extensions when they are not used
When optional classes and php extensions like pgsql and additonal Zend-Pdos are
actually required by creating a new resource or authentication backend,
perform a check and display a warning instead of just throwing an exception.

refs #4788
2014-04-28 17:13:40 +02:00
Johannes Meyer 98ca15d1fb Mark less important or non-testable code as skipped for code coverage
refs #6011
2014-04-28 14:06:41 +02:00
Johannes Meyer 21b949758f Refactor ResourceForm tests
refs #6011
2014-04-28 14:06:38 +02:00
Johannes Meyer 3d44c45eb8 Rename EditResourceForm to ResourceForm
refs #6011
2014-04-28 14:06:38 +02:00
Johannes Meyer 656e6bd0fd Drop obsolete CreateResourceForm class
refs #6011
2014-04-28 14:06:38 +02:00
Johannes Meyer aaa6a56146 Refactor authentication config form tests and fix auth backend validation
refs #6011
fixes #5712
2014-04-28 14:06:38 +02:00
Johannes Meyer d658eff9b1 Add form field to set the database name for a resource of type db
fixes #5115
2014-04-07 09:55:19 +02:00
Johannes Meyer d109046bc0 Fix that the general and logging form cannot write configuration changes
fixes #5952
2014-04-07 09:27:37 +02:00
Michael Friedrich 773528342f Fix default log path in config form. 2014-03-09 15:57:50 +01:00