tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-04-02 Junichi Satoh <junichi@rworks.jp> 

* lib/PandoraFMS/Core.pm: Added group ACL to 'Special days list'.
	It is applied when group id is 0 (All) or the same as alert
	template's group id.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7909 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2013-04-02 06:38:43 +00:00
parent 98a4e05c94
commit 7d71091631
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-02 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Added group ACL to 'Special days list'.
It is applied when group id is 0 (All) or the same as alert
template's group id.
2013-04-01 Sancho Lerena <slerena@artica.es> 2013-04-01 Sancho Lerena <slerena@artica.es>
* DEBIAN/postinst, * DEBIAN/postinst,

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -321,7 +321,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$) {
my $date = sprintf("%4d%02d%02d", $year + 1900, $mon + 1, $mday); my $date = sprintf("%4d%02d%02d", $year + 1900, $mon + 1, $mday);
# '0001' means every year. # '0001' means every year.
my $date_every_year = sprintf("0001%02d%02d", $mon + 1, $mday); my $date_every_year = sprintf("0001%02d%02d", $mon + 1, $mday);
my $special_day = get_db_value ($dbh, 'SELECT same_day FROM talert_special_days WHERE date = ? OR date = ? ORDER BY date DESC', $date, $date_every_year); my $special_day = get_db_value ($dbh, 'SELECT same_day FROM talert_special_days WHERE (date = ? OR date = ?) AND (id_group = 0 OR id_group = ?) ORDER BY date DESC', $date, $date_every_year, $alert->{'id_group'});
if ($special_day ne '') { if ($special_day ne '') {
logger ($pa_config, $date . " is a special day for " . $alert->{'name'} . ". (as a " . $special_day . ")", 10); logger ($pa_config, $date . " is a special day for " . $alert->{'name'} . ". (as a " . $special_day . ")", 10);
return 1 if ($alert->{$special_day} != 1); return 1 if ($alert->{$special_day} != 1);