[Xymon-developer] SF.net SVN: xymon:[7381] branches/4.3.15/web/acknowledge.c

[<st...@us...>]

Revision: 7381
          http://sourceforge.net/p/xymon/code/7381
Author:   storner
Date:     2014-01-27 16:56:50 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
acknowledge.cgi: Acks are enabled for all ALERTCOLORS, not just red and yellow

Modified Paths:
--------------
    branches/4.3.15/web/acknowledge.c

Modified: branches/4.3.15/web/acknowledge.c
===================================================================
--- branches/4.3.15/web/acknowledge.c	2014-01-27 16:55:41 UTC (rev 7380)
+++ branches/4.3.15/web/acknowledge.c	2014-01-27 16:56:50 UTC (rev 7381)
@@ -247,11 +247,20 @@
 			char *hostname, *pagename;
 			int gotfilter = 0, filtererror = 0;
 			sendreturn_t *sres = NULL;
+			int col, firstcolor = 1, alertcolors = colorset(xgetenv("ALERTCOLORS"), ((1 << COL_GREEN) | (1 << COL_BLUE)));
 
 			headfoot(stdout, "acknowledge", "", "header", COL_RED);
 
 			cmd = (char *)malloc(1024);
-			strcpy(cmd, "xymondboard color=red,yellow fields=hostname,testname,cookie");
+			strcpy(cmd, "xymondboard fields=hostname,testname,cookie color=");
+			for (col = 0; (col < COL_COUNT); col++) {
+				if ((1 << col) & alertcolors) {
+					if (!firstcolor) strcat(cmd, ",");
+					strcat(cmd, colorname(col));
+					firstcolor = 0;
+				}
+			}
+			// printf("<!-- cmd = %s -->\n", cmd);
 
 			if (obeycookies && !gotfilter && ((hostname = get_cookie("host")) != NULL)) {
 				if (*hostname) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.