Commit Graph

45 Commits

Author SHA1 Message Date
Alexander A. Klimov 15bc83ec14 IniParser::parseIniFile(): parse as ::parseIni() would do
refs #3357
2018-04-04 13:58:19 +02:00
Alexander A. Klimov 5616e9d508 IniParser: include the file location in parsing exceptions
refs #3252
2018-01-19 09:47:15 +01:00
Alexander A. Klimov 56d71c5cb6 Use parse_ini_string() where IniParser::parseIni() is not needed
refs #2766
2017-02-23 15:45:57 +01:00
Johannes Meyer 181e2ef05c Swag: Fix swag (aka a whole bunch of code style issues..) 2017-01-27 14:48:59 +01:00
Alexander A. Klimov 9bb798c18b IniWriter: don't persist a section key if the value is null
refs #11743
2016-10-12 11:06:04 +02:00
Alexander A. Klimov 474803fee4 Change all license headers to only reflect a file's year of creation
refs #11000
2016-02-08 15:41:00 +01:00
Alexander A. Klimov 8dc9928cb3 IniParser::parseIniFile(): return a Config instance
refs #10150
2015-09-25 12:04:13 +02:00
Alexander A. Klimov a090907373 Conform to coding guidelines 2015-09-25 11:37:06 +02:00
Alexander A. Klimov acb93ce1ae Implement Document::toArray()
refs #10150
2015-09-22 14:50:49 +02:00
Alexander A. Klimov 777c4d0baf Implement Section::toArray()
refs #10150
2015-09-22 14:50:49 +02:00
Alexander A. Klimov b441156934 Implement IniParser::parseIniFile()
refs #10150
2015-09-22 14:50:49 +02:00
Matthias Jentsch 438f2650db Conform to coding guidelines
Use exclusively getters and setters for accessing class variables. Add better documentation to INI parser and writer classes.
2015-08-10 15:15:40 +02:00
Matthias Jentsch fe805c82ca Support multi line values in INI files 2015-08-10 15:15:40 +02:00
Matthias Jentsch aa3cc9847d Fix issue that bricked the dashboard when quotes in dashlets
Escape more special chars in IniWriter, support reading escaped readers in IniParser and add tests for all important escape cases.
2015-08-07 12:55:19 +02:00
Matthias Jentsch 308c8ccf79 Fix issue that caused exceptions when using sections with trailing or leading whitespaces
Trim all incoming section identifier to prevent ambiguities between parsd sections and input sections.
2015-08-07 09:26:50 +02:00
Matthias Jentsch eebd8be746 Prevent configuration changes that would break PHP lib ini parser 2015-08-06 17:39:46 +02:00
Matthias Jentsch 9b373e9d10 Fix issue that caused IniWriter to fail on empty configs 2015-08-06 17:21:52 +02:00
Matthias Jentsch f8e2dc850c Drop IniEditor and clean up IniWriter
Replace the ini editor code with a new parser implementation that manipulates a DOM. Do not support capabillities that are no longer needed, like nested configurations, section inheritance, section-less properties.
2015-08-05 18:10:17 +02:00
Matthias Jentsch 28e1b3119c Remove unused "extends"-code 2015-08-04 15:14:10 +02:00
Matthias Jentsch 7095ad5bc7 Improve ini editor and dashlet input validation 2015-08-04 13:23:30 +02:00
Matthias Jentsch d88c628b6b Escape section names before applying regex
refs #9530
2015-08-04 13:14:46 +02:00
Matthias Jentsch 3600e1088c Fix key and value sanitazion in ini writer 2015-06-08 13:11:40 +02:00
Matthias Jentsch ddba1d86fa Fix spacing in ini files
refs #8706
2015-06-08 13:11:40 +02:00
Matthias Jentsch 6661d49bd2 Use ltrim instead of a manual loop to remove trailing lines in ini writer
refs #8706
2015-06-01 17:00:43 +02:00
Matthias Jentsch 1901f0af98 Improve .ini file formatting
End every file with a newline, and only display 1 empty line between each section, to improve readabillity.

fixes #8706
2015-06-01 16:12:02 +02:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba.
2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Eric Lippmann 7fc70c5a02 IniWriter: Don't allow read for others on new files 2015-01-19 11:43:38 +01:00
Eric Lippmann fbe252063b IniWriter: Do not use umask(0)
chmod is not affected in any way by the umask.
2014-12-30 15:39:03 +01:00
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