Commit Graph

341 Commits

Author SHA1 Message Date
Eric Lippmann a2818bd937 Merge branch 'master' into feature/security-gui-5647 2014-11-19 14:13:26 +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
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
Marius Hein 80871313e4 Dashboard: Remove actions
refs #4537
2014-11-18 16:28:04 +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 1000b4661f AddToDashboard: Remove controller logic
refs #4537
2014-11-18 09:59:23 +01:00
Thomas Gelf da47c7fc7e Merge remote-tracking branch 'origin/master' into feature/redesign-7144 2014-11-14 21:32:57 +01:00
Johannes Meyer 775c20d9ad Rename namespace Icinga\Form to Icinga\Forms
refs #7553
2014-11-14 10:57:14 +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
Eric Lippmann cc161764ff Use 'Preferences' instead of 'General Settings'
refs #6073
2014-11-13 18:08:30 +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
Bernd Erk c98a6d5912 Fixes type in error message 2014-11-13 15:41:31 +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
Alexander Fuhr 8f6cac6a9e Add translation to preference tab title 2014-11-12 11:10:25 +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 8909bd5d59 Show warning on login page even if the configuration directory exists
refs #7163
2014-11-11 10:04:01 +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 79493592bb Do not use Installer anywhere.
"It's setup."

refs #7163
2014-11-10 10:30:52 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +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 d0fc38ce94 security: Add controller for creating, updating and removing permissions
refs #5647
2014-11-04 16:17:54 +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
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
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 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 b4a69792d8 Add note to login page when the configuration directory is missing
refs #7163
refs #7409
2014-10-21 16:11:49 +02:00
Eric Lippmann a2e1663e34 index: Don't drop query parameters when redirecting to dashboard 2014-10-20 13:27:33 +02:00
Johannes Meyer c0df55c079 Add progress bar
refs #7163
2014-10-14 16:14:28 +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 b50c780bcf Let the setup's view scripts be a bit more generic
refs #7163
2014-10-06 16:04:58 +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 9a57ddcfa6 Fix login redirects when AutologinBackend is used 2014-09-30 15:49:31 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Alexander Fuhr f7b7e0283a Translation: another bunch of translatable strings 2014-09-29 15:20:19 +02:00
Johannes Meyer 288ae6885b Show the web wizard, finally
refs #7163
2014-09-29 14:31:43 +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
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 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
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
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
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 1eacde0233 Implement modules self provided search configuration
refs #6495
2014-09-04 16:31:10 +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
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 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
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
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
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
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
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 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
Johannes Meyer e6bcda260d Redirect after a new resource has been created successfully
refs #5525
2014-08-12 10:42:28 +02:00