Eric Lippmann
15506941a6
Ini: Fix that directives could not contain a slash
...
We introtuced preg_quote not quoting the delimiter.
2014-11-20 13:47:27 +01:00
Thomas Gelf
fa44197947
Dashboard: fix complex urls
2014-11-19 16:45:15 +01:00
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
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
Johannes Meyer
7aae291f69
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 10:08:28 +01:00
Johannes Meyer
4992140326
Hardcode the access mode to use when creating files
...
refs #7163
2014-11-12 09:39:18 +01:00
Matthias Jentsch
c70f738236
Remove linebreaks from configuration keys and values
2014-11-11 15:10:50 +01:00
Matthias Jentsch
fdfad34e5c
Do not normalize configuration keys to nested arrays in IniWriter
...
More than one nesting level (the section) is no longer allowed in configuration files. Dots in keys are now
part of the key and will not lead to a nested configuration.
fixes #7120
2014-11-11 15:05:34 +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
7b99b74ae1
Prefer Icinga\Application\Config instead of Zend_Config
...
refs #7147
2014-11-07 13:53:03 +01:00
Eric Lippmann
a965017d73
INI writer: Support writing files which do not yet exist
2014-11-04 14:46:56 +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