[Openvas-commits] r13738 - in branches/gsa-3.0: . src src/html

[scm-commit at wald.intevation.org]

Author: mattm
Date: 2012-07-16 17:54:01 +0200 (Mon, 16 Jul 2012)
New Revision: 13738

Modified:
   branches/gsa-3.0/ChangeLog
   branches/gsa-3.0/src/gsad.c
   branches/gsa-3.0/src/gsad_omp.c
   branches/gsa-3.0/src/html/omp.xsl
Log:
	Backport from trunk r13735.

	* src/gsad.c (init_validator): Add summary.

	* src/gsad_omp.c (save_report_format_omp): Get summary from "summary"
	instead of "comment", to all quotations in the summary.

	* src/html/omp.xsl (html-edit-report-format-form): Rename field to
	"summary".

Modified: branches/gsa-3.0/ChangeLog
===================================================================
--- branches/gsa-3.0/ChangeLog	2012-07-16 13:44:03 UTC (rev 13737)
+++ branches/gsa-3.0/ChangeLog	2012-07-16 15:54:01 UTC (rev 13738)
@@ -1,3 +1,15 @@
+2012-07-16  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	Backport from trunk r13735.
+
+	* src/gsad.c (init_validator): Add summary.
+
+	* src/gsad_omp.c (save_report_format_omp): Get summary from "summary"
+	instead of "comment", to all quotations in the summary.
+
+	* src/html/omp.xsl (html-edit-report-format-form): Rename field to
+	"summary".
+
 2012-07-09  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	* CMakeLists.txt: Print a more useful message if both libxslt and the

Modified: branches/gsa-3.0/src/gsad.c
===================================================================
--- branches/gsa-3.0/src/gsad.c	2012-07-16 13:44:03 UTC (rev 13737)
+++ branches/gsa-3.0/src/gsad.c	2012-07-16 15:54:01 UTC (rev 13738)
@@ -724,6 +724,7 @@
   openvas_validator_add (validator, "nvt:name",          "(?s)^.*$");
   openvas_validator_add (validator, "slave_id",   "^[a-z0-9\\-]+$");
   openvas_validator_add (validator, "slave_id_optional",   "^(--|[a-z0-9\\-]+)$");
+  openvas_validator_add (validator, "summary",    "^.{0,400}$");
   openvas_validator_add (validator, "target_id",  "^[a-z0-9\\-]+$");
   openvas_validator_add (validator, "target_id_optional",  "^(--|[a-z0-9\\-]+)$");
   openvas_validator_add (validator, "task_id",    "^[a-z0-9\\-]+$");

Modified: branches/gsa-3.0/src/gsad_omp.c
===================================================================
--- branches/gsa-3.0/src/gsad_omp.c	2012-07-16 13:44:03 UTC (rev 13737)
+++ branches/gsa-3.0/src/gsad_omp.c	2012-07-16 15:54:01 UTC (rev 13738)
@@ -12781,7 +12781,7 @@
   gnutls_session_t session;
   gchar *html;
 
-  if (params_value (params, "comment") == NULL
+  if (params_value (params, "summary") == NULL
       || params_value (params, "name") == NULL)
     return edit_report_format (credentials, params,
                                GSAD_MESSAGE_INVALID_PARAM
@@ -12892,7 +12892,7 @@
                                    "</modify_report_format>",
                                    params_value (params, "report_format_id"),
                                    params_value (params, "name"),
-                                   params_value (params, "comment"),
+                                   params_value (params, "summary"),
                                    params_value (params, "enable"));
 
   if (strcmp (params_value (params, "next"), "get_report_formats") == 0)

Modified: branches/gsa-3.0/src/html/omp.xsl
===================================================================
--- branches/gsa-3.0/src/html/omp.xsl	2012-07-16 13:44:03 UTC (rev 13737)
+++ branches/gsa-3.0/src/html/omp.xsl	2012-07-16 15:54:01 UTC (rev 13738)
@@ -11737,7 +11737,7 @@
           <tr>
             <td valign="top">Summary</td>
             <td>
-              <input type="text" name="comment" size="30" maxlength="400"
+              <input type="text" name="summary" size="30" maxlength="400"
                      value="{commands_response/get_report_formats_response/report_format/summary}"/>
             </td>
           </tr>