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

[scm-commit at wald.intevation.org]

Author: mattm
Date: 2012-07-16 12:10:44 +0200 (Mon, 16 Jul 2012)
New Revision: 13735

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad.c
   trunk/gsa/src/gsad_omp.c
   trunk/gsa/src/html/omp.xsl
Log:
	* 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: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2012-07-16 06:16:20 UTC (rev 13734)
+++ trunk/gsa/ChangeLog	2012-07-16 10:10:44 UTC (rev 13735)
@@ -1,3 +1,13 @@
+2012-07-16  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* 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-12  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
 	* src/html/help.xsl (tasks.html): Added hint that paused scans will have
@@ -105,7 +115,7 @@
 
 2012-06-14  Matthew Mundell <matthew.mundell at greenbone.net>
 
-	* src/html/omp.xsl (html-edit-target-form): If the port is empty make is
+	* src/html/omp.xsl (html-edit-target-form): If the port is empty make it
 	22.
 
 2012-06-14  Matthew Mundell <matthew.mundell at greenbone.net>

Modified: trunk/gsa/src/gsad.c
===================================================================
--- trunk/gsa/src/gsad.c	2012-07-16 06:16:20 UTC (rev 13734)
+++ trunk/gsa/src/gsad.c	2012-07-16 10:10:44 UTC (rev 13735)
@@ -743,6 +743,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: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c	2012-07-16 06:16:20 UTC (rev 13734)
+++ trunk/gsa/src/gsad_omp.c	2012-07-16 10:10:44 UTC (rev 13735)
@@ -13572,7 +13572,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
@@ -13683,7 +13683,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: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2012-07-16 06:16:20 UTC (rev 13734)
+++ trunk/gsa/src/html/omp.xsl	2012-07-16 10:10:44 UTC (rev 13735)
@@ -12375,7 +12375,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>