Commit Graph

50 Commits

Author SHA1 Message Date
Alexander Klimov ba12d7b46c Use mt() in the monitoring module instead of just t()
fixes #7330
2014-10-21 17:22:16 +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 439d1895a7 Adjust Monitoring\BackendForm to use handleRequest() & Co.
refs #5525
2014-09-04 11:25:47 +02:00
Johannes Meyer 9d66cc9023 Adjust Monitoring\InstanceForm to use handleRequest() & Co.
refs #5525
2014-09-04 08:47:16 +02:00
Johannes Meyer 49562e75d7 Adjust ..\Monitoring\Form\Config\SecurityForm to use handleRequest()
refs #5525
2014-09-03 15:08:37 +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
Alexander Klimov c194c02435 Remove useless 'use \Exception' 2014-08-28 11:45:26 +02:00
Marius Hein fdef695896 Fix: The use statement with non-compound name 'Exception' has no effect 2014-08-28 11:34:08 +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 5028ec7b0b Avoid NIH
It's useless to have specific getters and setters if generic methods from the
baseclass can be used as well to accomplish the same task.

refs #6641
2014-08-22 12:30:13 +02:00
Johannes Meyer 75a0c17933 Ensure that all forms have a name
refs #5525
2014-08-22 12:15:02 +02:00
Alexander Klimov d1b1bc368f Monitoring_ConfigController: don't use SecurityForm::isSubmittedAndValid()
refs #5525
2014-08-21 11:51:49 +02:00
Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
Alexander Klimov 65473ac8ee Monitoring config: use SecurityForm
refs #6641
2014-08-19 14:04:00 +02:00
Alexander Klimov 6b468b7f9b Monitoring_ConfigController: make writeConfiguration's parameter `file' non-required
refs #6641
2014-08-19 13:51:10 +02:00
Alexander Klimov 0464099764 Monitoring: implement "Security" config tab 2014-08-19 11:19:30 +02:00
Johannes Meyer be14844fa8 Merge EditInstanceForm with CreateInstanceForm and rename it
As with the backend form, a user might like to change the name of an
instance. The new form and its actions are also adjusted to suit the new form interface.

refs #5525
2014-08-11 14:49:42 +02:00
Johannes Meyer 5a738112ea Remove isExistingBackend/-Instance
It is more efficient to access configuration files only once instead of
accessing them multiple times in different locations.

refs #5525
2014-07-25 16:02:13 +02:00
Johannes Meyer d7ed6bd249 Adjust removebackend-action to suit the new backend form interface
Drops additionally the ConfirmRemovalForm of the monitoring module
as there is already one in icingaweb2's form-set.

refs #5525
2014-07-25 16:00:38 +02:00
Johannes Meyer a78d11345b Adjust createbackend-action to suit the new backend form interface
refs #5525
2014-07-25 15:58:44 +02:00
Johannes Meyer b743cf8143 Adjust editbackend-action to suit the new backend-form interface
refs #5525
2014-07-25 14:55:36 +02:00
Johannes Meyer af5a3262be Revert backslash removal in front of namespace-less use statement 2014-07-25 09:12:12 +02:00
Johannes Meyer 5f7652133e Fix code-style and documentation 2014-07-25 08:39:27 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations
refs #6091
2014-06-30 13:59:58 +02:00
Thomas Gelf 2746b5ff9f ConfigController: switch over to new config tabs
Module configuration now takes place in module detail view and does no
longer pollute our config tabs. Modules are now able to provide a bunch
of own config tabs, we don't really care what they use them for.
2014-06-24 21:31:59 +02:00
Thomas Gelf ccdf1ca354 monitoring/ConfigController: use notifications 2014-06-24 21:28:01 +02:00
Thomas Gelf 2b2901524c ConfigController: useless use of render 2014-06-24 21:24:40 +02:00
Thomas Gelf f75a4430a6 monitoring/config: make use of Config()
Thee helper function supports lazy loading, requires less code and is
easier to read.
2014-06-24 21:22:38 +02:00
Thomas Gelf 66f68f4990 monitoring/config: tab doesn't get focus
Fixes this. Tab handling is rather strange right now and module tabs
will not scale. We need a better solution for the future.

fixes #6320
2014-06-20 23:22:07 +02:00
Johannes Meyer e2ba172a8e Make dashboard components using the ini writer class
fixes #5524
2014-04-29 11:30:53 +02:00
Alexander Klimov 5c3df3db15 Handle not readable monitoring config files more intelligent 2014-03-13 15:54:27 +01:00
Alexander Klimov 7d08636af4 Handle missing config files more intelligent 2014-03-11 15:43:41 +01:00
Alexander Klimov 9963a21236 Raise error if a configuration file is missing 2014-03-07 17:28:36 +01:00
Alexander Klimov be43014e0c Don't raise error if 'modules/monitoring/instances.ini' is missing 2014-03-07 16:08:54 +01:00
Matthias Jentsch cd0194e20f Fetch and clean user messages lazily, to ensure that only shown messages are removed
This will make the code of the ConfigController way easier, as messages can be
send from everywhere and there is no need to consider consquences of
redirections.

refs #5100
2013-11-26 10:41:51 +01:00
Matthias Jentsch 2a0add3ec3 Fix messages in ConfigController
Store messages in the current user session to be able to fetch messages from
other controllers, so that the use can be redirected back to the index, instead
of staying in the original action

refs #5100
2013-11-20 19:10:38 +01:00
Eric Lippmann ca1d50ae53 Rename Icinga 2 Web to Icinga Web 2 2013-10-23 15:11:06 +02:00
Eric Lippmann 1b858cbdb4 Monitoring: Fix remaining usages of namespace Monitoring without Icinga\Module prefix
refs #4586
2013-09-04 11:21:12 +02:00
Jannis Moßhammer d0ac97f335 Configure fixes, regression test for 4606
The configure routine still has to be improved, right now unused
authentication backends are commented out

refs #4491
refs #4606
refs #4640
2013-08-29 11:48:32 +02:00
Eric Lippmann edb06ea8ea CS: Fix viloations for touched files in branch feature/backend-configuration-ui-3776
refs #3776
2013-08-21 14:22:31 +02:00
Jannis Moßhammer cd1fb2e4b5 Capitalization, smaleler codestyle fixes
refs #3776
2013-08-21 14:22:30 +02:00
Jannis Moßhammer 83d053965f Implement monitoring instance and backend configuration forms
refs #3776
2013-08-21 14:22:30 +02:00
Jannis Moßhammer a6ff6ecadd Fix Codestyle/PHPDoc, fix configPath being Overwritten
Also removed possibility to disable debugging as there's no use case for this

refs #4525
refs #4598
2013-08-21 14:22:30 +02:00
Jannis Moßhammer 26a5018d16 Add Forms and conditional hidden
refs #3777
2013-08-21 14:18:53 +02:00
Jannis Moßhammer 392e568bf8 Code style fixes: License header, phpdoc tags, psr-2 compliance
refs #4530
2013-08-14 16:08:15 +02:00
Jannis Moßhammer be29b8ff8f Make ConfigController and PreferenceController extensible by convention
- Rename ConfigurationController to ConfigController
- ConfigController and PreferenceController are now subclasses of
  BaseConfigController and BasePreferenceController
- Module and Application Config/Preference Tabs are detected via
  the ControllerTabCollector
- Moved Controller classes to Icinga/Web/Controller (this is why
  so many files are modified)

refs #4530
2013-08-14 16:08:15 +02:00