[Openvas-commits] r12153 - in trunk/gsa: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-21 20:31:15 +0100 (Mon, 21 Nov 2011)
New Revision: 12153

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad_omp.c
Log:
	* src/gsad_omp.c (get_report_omp): Set both overrides OMP flags from the
	URL param.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-21 19:18:27 UTC (rev 12152)
+++ trunk/gsa/ChangeLog	2011-11-21 19:31:15 UTC (rev 12153)
@@ -1,5 +1,10 @@
 2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/gsad_omp.c (get_report_omp): Set both overrides OMP flags from the
+	URL param.
+
+2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/html/omp.xsl (gsa:long-time, html-report-details): Add length check.
 	(html-report-table): Correct next_time check.
 	(report [assets]): Handle ISO time.

Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c	2011-11-21 19:18:27 UTC (rev 12152)
+++ trunk/gsa/src/gsad_omp.c	2011-11-21 19:31:15 UTC (rev 12153)
@@ -7789,7 +7789,7 @@
                                 " notes=\"%i\""
                                 " notes_details=\"1\""
                                 " apply_overrides=\"%i\""
-                                " overrides=\"1\""
+                                " overrides=\"%i\""
                                 " overrides_details=\"1\""
                                 " result_hosts_only=\"%i\""
                                 " report_id=\"%s\""
@@ -7804,6 +7804,7 @@
                                 " escalator_id=\"%s\"/>",
                                 strcmp (esc_notes, "0") ? 1 : 0,
                                 strcmp (esc_overrides, "0") ? 1 : 0,
+                                strcmp (esc_overrides, "0") ? 1 : 0,
                                 strcmp (esc_result_hosts_only, "0") ? 1 : 0,
                                 report_id,
                                 esc_first_result,
@@ -7898,7 +7899,7 @@
                             " notes=\"%i\""
                             " notes_details=\"1\""
                             " apply_overrides=\"%i\""
-                            " overrides=\"1\""
+                            " overrides=\"%i\""
                             " overrides_details=\"1\""
                             " result_hosts_only=\"%i\""
                             " report_id=\"%s\""
@@ -7924,6 +7925,7 @@
                             pos ? pos : "1",
                             strcmp (notes, "0") ? 1 : 0,
                             strcmp (overrides, "0") ? 1 : 0,
+                            strcmp (overrides, "0") ? 1 : 0,
                             strcmp (result_hosts_only, "0") ? 1 : 0,
                             (type && ((strcmp (type, "assets") == 0)
                                       || (strcmp (type, "prognostic") == 0)))