[Openvas-commits] r13226 - in trunk/gsa: . src src/html
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Apr 12 15:57:36 CEST 2012
Author: mattm
Date: 2012-04-12 15:57:36 +0200 (Thu, 12 Apr 2012)
New Revision: 13226
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/gsad_omp.c
trunk/gsa/src/html/gsad.xsl
trunk/gsa/src/html/omp.xsl
Log:
* src/gsad_omp.c (edit_target, get_target): Print pass through info
with g_markup_printf_escaped.
* src/html/omp.xsl (modify_target_response): New template.
* src/html/gsad.xsl (modify_task_response [response-indicator]): New
template.
(html-gsa-logo): Match modify_task_response for indicator.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2012-04-12 13:12:49 UTC (rev 13225)
+++ trunk/gsa/ChangeLog 2012-04-12 13:57:36 UTC (rev 13226)
@@ -1,5 +1,16 @@
2012-04-11 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/gsad_omp.c (edit_target, get_target): Print pass through info
+ with g_markup_printf_escaped.
+
+ * src/html/omp.xsl (modify_target_response): New template.
+
+ * src/html/gsad.xsl (modify_task_response [response-indicator]): New
+ template.
+ (html-gsa-logo): Match modify_task_response for indicator.
+
+2012-04-11 Matthew Mundell <matthew.mundell at greenbone.net>
+
Add editing of targets.
* src/gsad.c (init_validator, exec_omp_post): Add edit_target and
Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c 2012-04-12 13:12:49 UTC (rev 13225)
+++ trunk/gsa/src/gsad_omp.c 2012-04-12 13:57:36 UTC (rev 13226)
@@ -5488,7 +5488,7 @@
GString *xml;
gnutls_session_t session;
int socket;
- gchar *html;
+ gchar *html, *edit;
const char *target_id, *next, *filter, *first, *max;
target_id = params_value (params, "target_id");
@@ -5552,20 +5552,22 @@
if (extra_xml)
g_string_append (xml, extra_xml);
- g_string_append_printf (xml,
- "<edit_target>"
- "<target id=\"%s\"/>"
- /* Page that follows. */
- "<next>%s</next>"
- /* Passthroughs. */
- "<filters><term>%s</term></filters>"
- "<targets start=\"%s\" max=\"%s\"/>",
- target_id,
- next,
- filter,
- first,
- max);
+ edit = g_markup_printf_escaped ("<edit_target>"
+ "<target id=\"%s\"/>"
+ /* Page that follows. */
+ "<next>%s</next>"
+ /* Passthroughs. */
+ "<filters><term>%s</term></filters>"
+ "<targets start=\"%s\" max=\"%s\"/>",
+ target_id,
+ next,
+ filter,
+ first,
+ max);
+ g_string_append (xml, edit);
+ g_free (edit);
+
if (read_string (&session, &xml))
{
g_string_free (xml, TRUE);
@@ -5614,7 +5616,7 @@
GString *xml;
gnutls_session_t session;
int socket;
- gchar *html;
+ gchar *html, *end;
const char *target_id, *sort_field, *sort_order, *filter, *first, *max;
target_id = params_value (params, "target_id");
@@ -5651,12 +5653,13 @@
filter = params_value (params, "filter");
first = params_value (params, "first");
max = params_value (params, "max");
- g_string_append_printf (xml,
- "<filters><term>%s</term></filters>"
- "<targets start=\"%s\" max=\"%s\"/>",
- filter ? filter : "",
- first ? first : "",
- max ? max : "");
+ end = g_markup_printf_escaped ("<filters><term>%s</term></filters>"
+ "<targets start=\"%s\" max=\"%s\"/>",
+ filter ? filter : "",
+ first ? first : "",
+ max ? max : "");
+ g_string_append (xml, end);
+ g_free (end);
if (extra_xml)
g_string_append (xml, extra_xml);
Modified: trunk/gsa/src/html/gsad.xsl
===================================================================
--- trunk/gsa/src/html/gsad.xsl 2012-04-12 13:12:49 UTC (rev 13225)
+++ trunk/gsa/src/html/gsad.xsl 2012-04-12 13:57:36 UTC (rev 13226)
@@ -399,6 +399,14 @@
</xsl:call-template>
</xsl:template>
+<xsl:template match="modify_target_response" mode="response-indicator">
+ <xsl:call-template name="indicator">
+ <xsl:with-param name="status" select="@status"/>
+ <xsl:with-param name="status_text" select="@status_text"/>
+ <xsl:with-param name="command" select="'Save Target'"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="modify_task_response" mode="response-indicator">
<xsl:call-template name="indicator">
<xsl:with-param name="status" select="@status"/>
@@ -725,6 +733,8 @@
mode="response-indicator"/>
<xsl:apply-templates select="get_tasks/commands_response/modify_override_response"
mode="response-indicator"/>
+ <xsl:apply-templates select="modify_target_response"
+ mode="response-indicator"/>
<xsl:apply-templates select="get_tasks/commands_response/modify_task_response"
mode="response-indicator"/>
<xsl:apply-templates select="get_tasks/commands_response/start_task_response"
Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl 2012-04-12 13:12:49 UTC (rev 13225)
+++ trunk/gsa/src/html/omp.xsl 2012-04-12 13:57:36 UTC (rev 13226)
@@ -5174,6 +5174,18 @@
<!-- BEGIN TARGETS MANAGEMENT -->
+<xsl:template match="modify_target_response">
+ <xsl:call-template name="command_result_dialog">
+ <xsl:with-param name="operation">Save Target</xsl:with-param>
+ <xsl:with-param name="status">
+ <xsl:value-of select="@status"/>
+ </xsl:with-param>
+ <xsl:with-param name="msg">
+ <xsl:value-of select="@status_text"/>
+ </xsl:with-param>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="port_list" mode="select">
<option value="{@id}"><xsl:value-of select="name"/></option>
</xsl:template>
More information about the Openvas-commits
mailing list