tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,825 Commits 121 Branches 71 Tags 80 MiB
Commit Graph

1019 Commits

Author SHA1 Message Date
Eric Lippmann e26d360561 lib/Node: Remove method `findNodeBy()' 
The new `DocTree' class provides `getNode()'.
 2014-07-28 19:07:13 +02:00
Eric Lippmann bbcdcb4609 lib: Add `Identifiable' interface for objects that are identifiable by an ID of any type 2014-07-28 19:05:37 +02:00
Eric Lippmann a68ccecb28 Revert "Do not use htmlspecialchars in widgets" 
This reverts commit 2ff43abcf5.

`Widget::escape()' does not exist. But `Widget::view()::espcae()' does.
 2014-07-23 12:28:04 +02:00
Alexander Klimov 2ff43abcf5 Do not use htmlspecialchars in widgets 
refs #6759
 2014-07-23 12:12:05 +02:00
Eric Lippmann e005333806 Merge branch 'master' into feature/display-documentation-4820 2014-07-22 12:25:58 +02:00
Matthias Jentsch 0eaaaf2f29 Make bar charts thicker 2014-07-22 11:32:52 +02:00
Matthias Jentsch 4b8bb99fa1 Fix svg text rotation in firefox 
Use the SVG transform attribute instead of the writing-mode attribute to support firefox.
 2014-07-22 11:26:35 +02:00
Matthias Jentsch 0a500efd8a Determine the max value in LinearUnit dynamically 
The range between min and max should always be divisable by the amount of
ticks, to ensure that the vertical lines are always at a full discrete value.

fixes #6769
 2014-07-21 17:21:54 +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
Matthias Jentsch 091ddbe552 Partiall revert bfc54b7e 
Refactor Url->getParams() to return an instance of UrlParam instead of an array.

fixes #6760
 2014-07-21 09:22:19 +02:00
Alexander Klimov 5ea02b41ea Optimize variable names and positions, cast array direct to object 2014-07-18 17:35:24 +02:00
Thomas Gelf 2a204897b4 DbQuery: improve method description 
Not English mine this was, copy paste did I ;)
 2014-07-18 16:48:52 +02:00
Thomas Gelf 209894d857 DbQuery: add dummy isTimestamp function 
Not the best solution, but helps for now.

fixes #6675
 2014-07-18 16:35:29 +02:00
Matthias Jentsch bfc54b7e32 Fix array conversion of the Dashboard and its Components 
Do not omit the parameters when converting the dashboard components to
an array. Add an array conversion to the UrlParams class.

refs #6691
 2014-07-16 17:31:01 +02:00
Johannes Meyer 5c507d5d91 Fix notice that the session has been already started after retrieving its id 2014-07-16 15:39:40 +02:00
Johannes Meyer eb977b7a55 Fix wrong variable assignment causing preferred languages not being set 2014-07-16 15:17:14 +02:00
Johannes Meyer e5fdf78c98 Fix testing errors due to accessing the session id by using our container 2014-07-16 10:18:00 +02:00
Johannes Meyer e6dee9fe89 Protect login against CSRF 
refs #5626
 2014-07-16 09:55:23 +02:00
Johannes Meyer b40027b6c7 Purge session when logging out 
fixes #6739
 2014-07-16 09:55:22 +02:00
Johannes Meyer 19f05256a0 Only call session_start() when reading from session 
fixes #6383
 2014-07-16 09:55:22 +02:00
Johannes Meyer c7c2ad3790 Improve preference changeset calculation 
The calculation is still subject to the concrete writer implementation as its
parent Icinga\User\Preferences\PreferencesStore is only an abstraction
layer without any knowledge how the data is actually stored so it is not able
to determine how to handle differences.

fixes #6220
 2014-07-15 14:54:57 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files 
refs #6309
 2014-07-15 13:43:52 +02:00
Johannes Meyer e567ad67c5 Display statehistory summary vertically 
fixes #6636
 2014-07-14 15:26:35 +02:00
Eric Lippmann 906c132dc0 Merge branch 'master' into feature/display-documentation-4820 2014-07-11 16:05:09 +02:00
Johannes Meyer ab410de615 Make Icinga\Logger\Writer\FileWriter output more useful error messages 
fixes #6464
 2014-07-10 16:40:36 +02:00
Matthias Jentsch 3ed67c9af6 Determine the scale factor correctly 
Fix error in the logic of the context renderer, that lead to a wrong scale factor
when the width was bigger than the height
 2014-07-09 18:13:40 +02:00
Matthias Jentsch 8d697a3d8e Fix coding style 2014-07-09 18:13:40 +02:00
Matthias Jentsch ec3bafa026 Fix number formatting in chart classes 
Use explizit number formatting instead of implicit type conversions when
rendering SVGs, to prevent a change of the locale from breaking the charts.

fixes #6585
 2014-07-09 18:13:40 +02:00
Johannes Meyer 0fc2604af3 Use Icinga\Data\Db\DbConnection instead of Zend_Db_Select directly 
fixes #6218
 2014-07-09 10:41:54 +02:00
Thomas Gelf 49c679fe0f FilterEditor: hide "add" links 
They where there to show how this should look like. Removed for now as
they are not implemented yet.

refs #6668
 2014-07-08 17:21:36 +02:00
Johannes Meyer bb2c85f90b Remove forgotten ActionController::requiresConfig() call 
Should have been reverted by last commit but was not.
 2014-07-07 16:12:26 +02:00
Johannes Meyer 82d2f5ac9b Revert "Merge branch 'feature/install-wizard-6136'" 
This reverts commit 88d4262e7c, reversing
changes made to 6fae333048.

Conflicts:

	application/controllers/InstallController.php
	library/Icinga/Web/Controller/ActionController.php
 2014-07-07 15:09:03 +02:00
Johannes Meyer b3cb29d804 Make Icinga\Util\Tranlsator not only return locale codes with encodings 
refs #6602
 2014-07-07 09:09:22 +02:00
Thomas Gelf 0d4166b1bd ModuleActionController: fix reference, var removed 2014-07-04 12:39:23 +02:00
Thomas Gelf 3cfdf4c977 Web\Response: add redirection function 
The response now provides redirectAndExit(). One more step to clean up
our action controller. Please not that this is still unused right now.
 2014-07-04 12:35:33 +02:00
Thomas Gelf 3772b9c16f ActionController: set layout module name early 
Didn't work correctly before
 2014-07-04 12:33:49 +02:00
Matthias Jentsch 485e2168c1 Fix coding style 2014-07-04 11:42:24 +02:00
Matthias Jentsch 05139ae684 Fix a bug in the section map creation of the IniEditor 
Don't omit the first line when putting 'glued' comments into
the following section
 2014-07-04 11:38:30 +02:00
Matthias Jentsch 57f3023ec4 Fix coding style 2014-07-03 16:20:45 +02:00
Johannes Meyer 143a1e44fe Add a HTML renderer for Icinga\Web\Menu 
The menu was being rendered through recursive partials before. The
overhead this fact implicates is not as efficient as standard recursion
so there is now a special renderer for Icinga\Web\Menu utilizing
the RecursiveIteratorIterator

refs #6153
 2014-07-03 15:46:46 +02:00
Johannes Meyer be18af7e7e Merge Icinga\Web\MenuItem into Icinga\Web\Menu 
We do not need an additional class for the menu's root item just to
encapsulate our config handling, so these two classes were now merged
into a single one. Icinga\Web\Menu now also extends from
RecursiveIterator to be able to render the menu more efficient to html.

refs #6153
 2014-07-03 15:14:47 +02:00
Eric Lippmann 545a153490 Merge branch 'master' into bugfix/test-fix-6542 2014-07-02 10:57:08 +02:00
Johannes Meyer 920c027990 Ensure that the ini writer deletes properties properly 
The fix for #5958 introduced with commit 6aaff6b3 caused the property
deletion of the PreservingIniWriter be even more faulty than before. The
actual fix for this issue is an improved procedure for how properties are
deleted as the initial implementation suffered from a few
misunderstandings in how properties in Zend_Ini files need to be handled.

fixes #6599
fixes #6601
fixes #6600
fixes #6598
fixes #6614
 2014-07-01 14:55:45 +02:00
Johannes Meyer 87e72961e8 Revert "Fix that the ini writer produces invalid configuration files" 
This reverts commit 9bec8e3c27.
 2014-07-01 14:45:00 +02:00
Johannes Meyer 9bec8e3c27 Fix that the ini writer produces invalid configuration files 
fixes #6614
 2014-07-01 14:21:46 +02:00
Eric Lippmann db5c6631d9 Merge branch 'master' into feature/display-documentation-4820 
Conflicts:
	modules/doc/library/Doc/Controller.php
 2014-07-01 12:42:55 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:59:58 +02:00
Johannes Meyer f2e5d8afa5 Remove @codeCoverageIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:58:37 +02:00
Thomas Gelf 62928c48b0 helpers/timeSince: fix c&p error 2014-06-27 23:37:39 +02:00
Alexander Klimov 7ab984106a Replace Exception with Icinga\Exception\ProgrammingError in Icinga\Application\Loader 
refs #6542
 2014-06-27 15:20:56 +02:00
Alexander Klimov 4b72e1b54f Revert "Fix PHP Fatal error "Method Icinga\File\Csv::__toString() must not throw an exception in /vagrant/test/php/library/Icinga/File/CsvTest.php on line 35"" 
This reverts commit f2fdd7f39df759ff27c9c133f40bbcae14820708.
 2014-06-27 14:30:57 +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
Alexander Klimov 0065cbe998 Fix PHP Fatal error "Method Icinga\File\Csv::__toString() must not throw an exception in /vagrant/test/php/library/Icinga/File/CsvTest.php on line 35" 2014-06-27 14:30:57 +02:00
Johannes Meyer 9c1ee57628 Icinga\Util\File: throw an ErrorException with file and linenumber details 2014-06-27 09:54:17 +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
Johannes Meyer 3b191d36c4 Let Icinga\Util\File extend from SplFileObject 
We should extend SplFileObject as it provides already some of the
functionality Icinga\Util\File had and adds even more on top of that.
 2014-06-26 15:57:14 +02:00
Thomas Gelf 7112ed23f4 Chart\InlinePie: locale-ignorant cast for floats 
This has already been fixed with 92f454c3 and got broken again with be0c5d4b.
Time for a regression test I guess.

refs #6348
 2014-06-25 22:13:19 +02:00
Thomas Gelf 10d1520711 Widget\Limiter: show "all" 
In case we pass limit=0 we show this, still unsure whether we should
provide a link for "showing all" - might really hurt with millions of
history rows.
 2014-06-25 20:39:10 +02:00
Thomas Gelf 59dd80ed32 ActionController: benchmark should measure rendering 
We have been cheating a little bit, now the measurement should be more
precise.
 2014-06-25 20:37:17 +02:00
Matthias Jentsch d49f30ff77 Improve InlinePie performance 
Use str_replace instead of preg_replace
 2014-06-25 15:24:53 +02:00
Matthias Jentsch 7b19bd1d99 Improve interface of InlinePie 
Method setLabel can also accept a simple string and title is mandatory in constructor
 2014-06-25 15:21:12 +02:00
Matthias Jentsch 8839166090 Add number format 'none' to InlinePie 2014-06-25 14:53:39 +02:00
Matthias Jentsch 35a5431512 Revert "Refractor InlinePie and Perfdata helper" 
This reverts commit f003c38abd.
 2014-06-25 14:29:17 +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
Matthias Jentsch f003c38abd Refractor InlinePie and Perfdata helper 
Refractor InlinePie methods for better usability, fix several coding guideline
issues and fix some typos
 2014-06-25 12:41:17 +02:00
Johannes Meyer 2fc793096a Use the preferred language sent by the browser, not the configured one 
refs #6074
 2014-06-25 12:15:41 +02:00
Johannes Meyer 461b050718 Add locale negotiation to Icinga\Util\Translator 
Translator::getPreferredLocaleCode($header) can now be used with the
HTTP "Accept-Language" header to return the best matching locale using
the user's preferations reported by the browser and our available locale
stack. Additionally Translator::getLocale and Translator::getLanguage were
replaced by Translator::splitLocaleCode to provide a more flexible
implemenation in order to identify specific parts of a particular locale or
the current one.

refs #6074
 2014-06-25 12:15:41 +02:00
Alexander Klimov 53de3686a8 Bootstrap: Only replace config dir with its canonicalised absolute pathname when the dir exists 2014-06-25 11:59:09 +02:00
Alexander Klimov ab1d8655f9 Config: Hard-code path to preferences INI files 2014-06-25 11:59:09 +02:00
Alexander Klimov a18058e185 lib: Assume relative path for Config::resolvePath() 2014-06-25 11:59:09 +02:00
Alexander Klimov ebca81b040 Revert "Make preferences INI path NOT be configurable" 
This reverts commit f2693613d1.
 2014-06-25 11:59:08 +02:00
Alexander Klimov fdf74c5e18 Revert "Make preferences INI path NOT be configurable" 
This reverts commit 219869607d.
 2014-06-25 11:59:08 +02:00
Thomas Gelf fac3c9f3a6 Util\Translator: fix language list 
Reverted former redundant patch, got confused by legacy web modules
been translated with earlier versions. They had a different directory
structure and registered erraneous domain directories.

This patch fixes the list, does an additional safety check (dirname must
end with .UTF-8) and strips .UTF-8 from the locale name. Former regex
matched always and therefore blacklisted every translation.
 2014-06-25 11:43:15 +02:00
Thomas Gelf 20cdb6e0b8 Revert "Util\Translator: show correct language list" 
This reverts commit b7521f48b9.
 2014-06-25 11:37:37 +02:00
Thomas Gelf 4591297e56 SortBox: use POST instead of GET 
This avoids trouble with complex filter URLs

fixes #6556
 2014-06-25 11:00:10 +02:00
Thomas Gelf 7ebdb2d378 FilterQueryString: add hidden debug feature 
Might help to track down potential problems in the future, should
not be enabled by default
 2014-06-25 10:47:03 +02:00
Thomas Gelf 9359f527db FilterQueryString: fix issues with not 
NOT is a "chain" with just one subfilter and therefore behaves a little
bit different. Should work fine now.

fixes #6554
 2014-06-25 10:39:48 +02:00
Thomas Gelf 1dcf44b9cd FilterEditor: fix buggy dropdown boxes 
There were some issues with option names. Also cleaned up HTML a
little bit and added autosubmission.
 2014-06-25 10:37:06 +02:00
Thomas Gelf b40d0f6a1e FilterWidget: POST instead of GET 
Might have been a JS issue, but instead of messing with the URL just
POSTing is easier here - and works. Filters from the search box are
now added flawlessly to the filter tree.
 2014-06-25 10:34:09 +02:00
Thomas Gelf b7521f48b9 Util\Translator: show correct language list 
List was showing useless stuff such as LC_MESSAGES and no language
but the default one. We should have a look whether LC_MESSAGES is
really needed, it looks so ugly.
 2014-06-25 10:31:03 +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 b38bcfc19b Widget\FilterEditor: correct expression output 
Filter expressions should be filled into form fields exactly as we
expect them at parse time.

fixes #6568
 2014-06-24 21:00:01 +02:00
Thomas Gelf 47b893e1ea Widget\FilterEditor: handle custom vars 
There was an issue with custom vars as they made only partially part
of the column dropdown. Sorted columns and tried to beautify column
names.

fixes #6569
 2014-06-24 20:57:41 +02:00
Thomas Gelf 3f9f4bb9e1 ModuleActionController: module object shortcut 
This helps modules with the need to know more about themselves. No
more App -> Module Manager -> Module voodoo.
 2014-06-24 20:54:39 +02:00
Thomas Gelf 13ef06c700 Modules\Module: modules should register config tabs 
This allows modules to register their config tabs and provides a
convenient way to fetch a modules fully instanced config tabs.
 2014-06-24 20:47:03 +02:00
Thomas Gelf b7b99cfd67 Widget\AlertMessageBox: fix broken widget 
This widget is pretty useless as the error view script can to it's
job. Interestingly nobody missed it, even the render() call was wrong.

I guess we will remove this soon, but for now it's fixed. Looks ugly,
but works.
 2014-06-24 20:30:41 +02:00
Alexander Klimov 219869607d Make preferences INI path NOT be configurable 
fixes #6567
 2014-06-24 18:29:28 +02:00
Alexander Klimov f2693613d1 Make preferences INI path NOT be configurable 
refs #6567
 2014-06-24 18:00:40 +02:00
Alexander Klimov 3e31ff65a4 Prefer dirname rather than pathinfo 2014-06-24 15:57:13 +02:00
Alexander Klimov 6daccae30e Optimize IcingaConfig::resolvePath 2014-06-24 15:45:19 +02:00
Alexander Klimov 6e4bf73c36 Compute config file paths properly 
fixes #6564
fixes #6534
 2014-06-24 14:54:31 +02:00
Alexander Klimov 9bab7c0323 Signal that resolvePath doesn't support Windows 
refs #6564
 2014-06-24 13:22:43 +02:00
Alexander Klimov ff87588d96 Don't let config path seem absolute where it isn't 
refs #6534
 2014-06-24 10:12:07 +02:00
Johannes Meyer c563479888 Use Icinga\Util\File instead of fopen 2014-06-23 15:02:06 +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