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

[scm-commit at wald.intevation.org]

Author: mattm
Date: 2012-04-06 21:27:31 +0200 (Fri, 06 Apr 2012)
New Revision: 13208

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad_omp.c
   trunk/gsa/src/html/omp.xsl
Log:
	* src/gsad_omp.c (get_my_settings): Call OMP GET_SETTINGS.

	* src/html/omp.xsl (get_my_settings): Add Rows Per Page.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2012-04-06 19:25:31 UTC (rev 13207)
+++ trunk/gsa/ChangeLog	2012-04-06 19:27:31 UTC (rev 13208)
@@ -1,3 +1,9 @@
+2012-04-06  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/gsad_omp.c (get_my_settings): Call OMP GET_SETTINGS.
+
+	* src/html/omp.xsl (get_my_settings): Add Rows Per Page.
+
 2012-04-04  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	Split targets configuration help into three pages.

Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c	2012-04-06 19:25:31 UTC (rev 13207)
+++ trunk/gsa/src/gsad_omp.c	2012-04-06 19:27:31 UTC (rev 13208)
@@ -13771,9 +13771,61 @@
                  const char *extra_xml)
 {
   GString *xml;
+  gnutls_session_t session;
+  int socket;
+  gchar *html;
+
+  switch (manager_connect (credentials, &socket, &session, &html))
+    {
+      case 0:
+        break;
+      case -1:
+        if (html)
+          return html;
+        /* Fall through. */
+      default:
+        return gsad_message (credentials,
+                             "Internal error", __FUNCTION__, __LINE__,
+                             "An internal error occurred while getting the settings. "
+                             "Diagnostics: Failure to connect to manager daemon.",
+                             "/omp?cmd=get_tasks");
+    }
+
   xml = g_string_new ("<get_my_settings>");
+
   if (extra_xml)
     g_string_append (xml, extra_xml);
+
+  /* Get the settings. */
+
+  if (openvas_server_sendf (&session,
+                            "<get_settings"
+                            " sort_field=\"name\""
+                            " sort_order=\"ascending\"/>")
+      == -1)
+    {
+      g_string_free (xml, TRUE);
+      openvas_server_close (socket, session);
+      return gsad_message (credentials,
+                           "Internal error", __FUNCTION__, __LINE__,
+                           "An internal error occurred while getting the settings. "
+                           "The current list of settings is not available. "
+                           "Diagnostics: Failure to send command to manager daemon.",
+                           "/omp?cmd=get_tasks");
+    }
+
+  if (read_string (&session, &xml))
+    {
+      g_string_free (xml, TRUE);
+      openvas_server_close (socket, session);
+      return gsad_message (credentials,
+                           "Internal error", __FUNCTION__, __LINE__,
+                           "An internal error occurred while getting the settings. "
+                           "The current list of settings is not available. "
+                           "Diagnostics: Failure to receive response from manager daemon.",
+                           "/omp?cmd=get_tasks");
+    }
+
   g_string_append (xml, "</get_my_settings>");
   return xsl_transform_omp (credentials, g_string_free (xml, FALSE));
 }

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2012-04-06 19:25:31 UTC (rev 13207)
+++ trunk/gsa/src/html/omp.xsl	2012-04-06 19:27:31 UTC (rev 13208)
@@ -14813,6 +14813,11 @@
             <td>********</td>
             <td></td>
           </tr>
+          <tr>
+            <td>Rows Per Page</td>
+            <td><xsl:value-of select="get_settings_response/setting[name='Rows Per Page']/value"/></td>
+            <td></td>
+          </tr>
         </table>
       </div>
     </div>