144 Commits

Author SHA1 Message Date
Johannes Meyer
124f64ad89 Merge branch 'master' into bugfix/drop-zend-config-7147 2014-11-07 14:07:15 +01:00
Johannes Meyer
7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Matthias Jentsch
54eda31633 Allow connect to hosts with no anonymous access
Do not throw exceptions on failed ldap connects during capability discovery

fixes #7325
2014-11-06 17:04:56 +01:00
Eric Lippmann
16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01: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
Alexander Klimov
051128b967 Icinga\Protocol\File\FileReader: don't use Icinga\Util\Enumerate 2014-10-02 13:59:53 +02:00
Alexander Klimov
e192b939c2 Icinga\Protocol\File\FileIterator: extend EnumeratingFilterIterator 2014-10-02 13:59:52 +02:00
Eric Lippmann
0e7ca591ec Merge branch 'master' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
Alexander Klimov
52c1d98beb Icinga\Protocol\File\FileReader: use Icinga\Util\Enumerate 2014-09-05 13:49:28 +02:00
Alexander Klimov
70146c43e7 Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, and Countable 2014-09-04 16:59:37 +02:00
Alexander Klimov
3c4a719feb Revert "Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, ...\Fetchable and Countable"
This reverts commit 7edbb8f27216e6faa0d0dc5a71b407748e9dd535.
2014-09-04 16:55:02 +02:00
Alexander Klimov
876b94cccf Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, ...\Fetchable and Countable 2014-09-04 16:54:14 +02:00
Alexander Klimov
f0969e0b2e Split Icinga\Protocol\File\FileReader into ...\FileReader and ...\FileIterator 2014-09-04 16:37:26 +02:00
Alexander Klimov
fcd12073f8 Rename Icinga\Protocol\File\Query to ...\File\FileQuery 2014-09-04 16:37:25 +02:00
Alexander Klimov
36a3c36c1b Rename Icinga\Protocol\File\Reader to ...\File\FileReader 2014-09-04 16:37:24 +02:00
Eric Lippmann
c3c0043307 Merge branch 'master' into bugfix/commands-6593 2014-09-03 23:23:20 +02:00
Alexander Klimov
ede5b8f0b9 Icinga\Protocol\File\Reader::fetchPairs(): increase $index manually as the iterator's one makes trouble
refs #7060
2014-09-03 18:36:59 +02:00
Alexander Klimov
e45f50408a Icinga\Protocol\File\Reader::fetchPairs(): rename variables
$skipLines -> $skip
$readLines -> $read

refs #7060
2014-09-03 16:14:14 +02:00
Alexander Klimov
88dde47b7a Foreach: add $value so that the value won't be assigned to $key
refs #7060
2014-09-03 15:39:25 +02:00
Alexander Klimov
3ade6da44d FileReaderException: extend IcingaException 2014-09-03 11:14:22 +02:00
Marius Hein
ee6145a173 Ldap/Query: Remove __toString()
This is needed because of exception handling. Exceptions can now bubble
up for default handling. Method render() was renamed to create() because
the method create a query. Adjust the test for method create().

refs #5536
2014-09-02 10:17:01 +02:00
Marius Hein
baf768040f LdapQuery: Use Ldap/Exception for errors
refs #5536
2014-09-02 09:55:57 +02:00
Eric Lippmann
a01ee00c27 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
Conflicts:
	library/Icinga/Protocol/Commandpipe/Transport/Transport.php
2014-08-29 17:24:44 +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 87a59675011a4cf284d8e44c4fb66042ad84c39f.

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
Eric Lippmann
6b88f1c98e Move Commandpipe/* classes from Icinga Web 2's library to the monitoring module
refs #6593
2014-08-26 16:35:30 +02:00
Alexander Klimov
1f7d4cb61b Merge branch 'master' into bugfix/exceptions-with-printf-params-6931 2014-08-26 11:24:33 +02:00
Alexander Klimov
febb2d1ae2 ProgrammingError: extend IcingaException
refs #6931
2014-08-26 11:15:19 +02:00
Alexander Klimov
4ec6dbe3f0 Prefer single quotes ' rather than double quotes " 2014-08-26 10:41:17 +02:00
Alexander Klimov
f754531e4d Fix grammatical error 2014-08-26 10:22:14 +02:00
Alexander Klimov
9c5878cbbe ConfigurationError: extend IcingaException
refs #6931
2014-08-22 11:46:11 +02:00
Johannes Meyer
dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +02:00
Alexander Klimov
cebd71b2ff Fix "Fatal error: Interface 'Icinga\Data\DatasourceInterface' not found in Icinga\Protocol\File\Reader"
fixes #6722
2014-07-21 14:14:13 +02:00
Alexander Klimov
c5ecbf250d lib: add FileReaderException for file reader specific errors
refs #6722
2014-07-21 14:11:08 +02:00
Alexander Klimov
6df7be7ee5 File/Query: Fix applyFilter' and order' not matching SimpleQuery's interfaces
refs #6722
2014-07-21 14:09:40 +02:00
Alexander Klimov
5ea02b41ea Optimize variable names and positions, cast array direct to object 2014-07-18 17:35:24 +02:00
Johannes Meyer
3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Alexander Klimov
22e13ce282 Replace DatasourceInterface with Selectable in Icinga/Protocol/Statusdat/Reader
refs #6542
2014-06-27 14:30:57 +02:00
Alexander Klimov
c0b44c3248 Revert "Fix PHP Fatal error "Interface Icinga\Data\DatasourceInterface not found in /vagrant/library/Icinga/Protocol/Statusdat/Reader.php on line 41""
This reverts commit 35e12c2053685a6951765a007a0e3f8c7999734f.
2014-06-27 14:30:57 +02:00
Alexander Klimov
b04f9b91be Fix PHP Fatal error "Interface Icinga\Data\DatasourceInterface not found in /vagrant/library/Icinga/Protocol/Statusdat/Reader.php on line 41" 2014-06-27 14:30:57 +02:00
Johannes Meyer
7f99be73fd Adjust usages of Icinga\Util\File to suit the new interface introduced earlier 2014-06-26 15:57:14 +02:00
Matthias Jentsch
c18b6f26f0 Throw Ldap\Exception when something goes wrong in a Ldap connection 2014-06-25 12:41:17 +02:00
Matthias Jentsch
e7548b6fc7 Return null for empty DNS query results 2014-06-25 12:41:17 +02:00
Johannes Meyer
9066a0c2fa Fix deadlock when writing to the command pipe while noone is listening 2014-06-23 15:02:06 +02:00
Matthias Jentsch
010466f8f9 Replace sizeof with count
Do not use sizeof to get the length of an array, as the function name 'sizeof'
is misleading
2014-06-23 14:19:55 +02:00
Matthias Jentsch
77a9dd1e6e Throw exception on fetchDN, when no row exists
Instead of fetchDN, authentication now uses hasUser to check if the user
exists before querying the password, to prevent the exception from messing
up the whole authentication process
2014-06-23 14:02:45 +02:00
Thomas Gelf
c0c7a815f8 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-06-20 19:18:38 +02:00
Matthias Jentsch
521cc0cac4 Refactor Ldap and Dns utility functions and conform to coding guidelines
refs #6507
2014-06-18 14:38:44 +02:00