[Openvas-commits] r6151 - in trunk/gsa: . src/html/src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Dec 16 18:26:55 CET 2009
Author: mattm
Date: 2009-12-16 18:26:52 +0100 (Wed, 16 Dec 2009)
New Revision: 6151
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/src/omp.xsl
Log:
* src/html/src/omp.xsl (html-report-details): Enable result pagination.
Split result page into three windows.
(get_report_response/report) [overview]: Add total column.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2009-12-16 17:20:47 UTC (rev 6150)
+++ trunk/gsa/ChangeLog 2009-12-16 17:26:52 UTC (rev 6151)
@@ -1,5 +1,11 @@
2009-12-16 Matthew Mundell <matthew.mundell at intevation.de>
+ * src/html/src/omp.xsl (html-report-details): Enable result pagination.
+ Split result page into three windows.
+ (get_report_response/report) [overview]: Add total column.
+
+2009-12-16 Matthew Mundell <matthew.mundell at intevation.de>
+
Separate credential name from credential login name.
* src/gsad.c (init_validator): Add credential_login.
@@ -12,7 +18,7 @@
* src/gsad_omp.c (create_lsc_credential_omp): Add login arg. Send to
manager as login entity.
- * src/gsad_omp.c: Update header.
+ * src/gsad_omp.h: Update header.
* src/html/src/omp.xsl (html-create-lsc-credential-form): Add Login field.
(html-lsc-credentials-table): Add Login heading.
Modified: trunk/gsa/src/html/src/omp.xsl
===================================================================
--- trunk/gsa/src/html/src/omp.xsl 2009-12-16 17:20:47 UTC (rev 6150)
+++ trunk/gsa/src/html/src/omp.xsl 2009-12-16 17:26:52 UTC (rev 6151)
@@ -92,284 +92,303 @@
</xsl:template>
<xsl:template name="html-report-details">
- <div class="gb_window_part_left"></div>
- <div class="gb_window_part_right"></div>
- <div class="gb_window_part_center">
- Scan report for task "<xsl:value-of select="report/task/name"/>"
- <a href="/help/view_report.html#viewreport"
- title="Help: View Report (View Report)">
- <img src="/img/help.png"/>
- </a>
- </div>
- <div class="gb_window_part_content">
- <xsl:variable name="levels">
- <xsl:value-of select="report/filters/text()"/>
- </xsl:variable>
- <div style="float:left;">
-<!-- TODO: activate properly
- <a href="?cmd=get_report&report_id={report/@id}&first_result={report/results/@start - 20}">
- <<
+ <div class="gb_window">
+ <div class="gb_window_part_left"></div>
+ <div class="gb_window_part_right"></div>
+ <div class="gb_window_part_center">
+ Report Summary
+ <a href="/help/view_report.html#viewreport"
+ title="Help: View Report (View Report)">
+ <img src="/img/help.png"/>
</a>
--->
- Results <xsl:value-of select="report/results/@start"/> -
- <xsl:value-of select="count(report/results/result)"/>
- of <xsl:value-of select="report/scan_result_count"/>
-<!-- TODO: activate properly
- <a href="?cmd=get_report&report_id={report/@id}&first_result={report/results/@start + 20}">
- >>
- </a>
--->
</div>
- <div style="float:right;">
- <a href="?cmd=get_status&task_id={report/task/@id}">Back to Task</a>
- </div>
- <br/>
- <div id="small_form" style="float:right;">
- <form action="" method="get">
- This report as:
- <input type="hidden" name="cmd" value="get_report"/>
- <input type="hidden" name="report_id" value="{report/@id}"/>
- <input type="hidden" name="levels" value="{$levels}"/>
- <input type="hidden"
- name="sort_field"
- value="{report/sort/field/text()}"/>
- <input type="hidden"
- name="sort_order"
- value="{report/sort/field/order}"/>
- <select name="format" style="margin-right:3px;" title="Download Format">
- <option value="pdf">PDF</option>
- <option value="html">HTML</option>
- <option value="xml">XML</option>
- <option value="nbe">NBE</option>
- </select>
- <input type="submit" value="Download" title="Download"/>
- </form>
- </div>
+ <div class="gb_window_part_content">
+ <div style="float:right;">
+ <a href="?cmd=get_status&task_id={report/task/@id}">Back to Task</a>
+ </div>
- <a name="summary"/>
- <h1>Report Summary</h1>
-
- <table>
- <tr>
- <td>Result of Task:</td>
- <td><xsl:value-of select="report/task/name"/></td>
- </tr>
- <tr>
- <td>Order of results:</td>
- <td>by host</td>
- </tr>
- <tr>
- <td>Scan started:</td>
- <td><xsl:value-of select="report/scan_start"/></td>
- </tr>
- <tr>
- <td>Scan ended:</td>
- <td><xsl:value-of select="report/scan_end"/></td>
- </tr>
- <tr>
- <td>Final scan run status:</td>
- <td><xsl:value-of select="report/scan_run_status"/></td>
- </tr>
- </table>
-
- <h1>Host Summary</h1>
- <xsl:apply-templates select="../all/get_report_response/report"
- mode="overview"/>
-
- <h1>Results per Host</h1>
-
- <!-- TODO: Move to template. -->
- <table>
+ <a name="summary"/>
+ <table>
<tr>
- <td colspan="2">
- Sorting:
- </td>
- <td colspan="4">
- <xsl:choose>
- <xsl:when test="report/sort/field/text()='port' and report/sort/field/order='ascending'">
- port ascending
- </xsl:when>
- <xsl:otherwise>
- <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=port&sort_order=ascending&levels={$levels}">
- port ascending
- </a>
- </xsl:otherwise>
- </xsl:choose>
- |
- <xsl:choose>
- <xsl:when test="report/sort/field/text()='port' and report/sort/field/order='descending'">
- port descending
- </xsl:when>
- <xsl:otherwise>
- <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=port&sort_order=descending&levels={$levels}">
- port descending
- </a>
- </xsl:otherwise>
- </xsl:choose>
- |
- <xsl:choose>
- <xsl:when test="report/sort/field/text()='type' and report/sort/field/order='ascending'">
- threat ascending
- </xsl:when>
- <xsl:otherwise>
- <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=type&sort_order=ascending&levels={$levels}">
- threat ascending
- </a>
- </xsl:otherwise>
- </xsl:choose>
- |
- <xsl:choose>
- <xsl:when test="report/sort/field/text()='type' and report/sort/field/order='descending'">
- threat descending
- </xsl:when>
- <xsl:otherwise>
- <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=type&sort_order=descending&levels={$levels}">
- threat descending
- </a>
- </xsl:otherwise>
- </xsl:choose>
- </td>
+ <td><b>Result of Task:</b></td>
+ <td><b><xsl:value-of select="report/task/name"/></b></td>
</tr>
- </table>
- <br/>
- <table>
- <xsl:variable name="sort_field">
- <xsl:value-of select="report/sort/field/text()"/>
- </xsl:variable>
- <xsl:variable name="sort_order">
- <xsl:value-of select="report/sort/field/order"/>
- </xsl:variable>
<tr>
- <td>Current View:</td>
- <td>
- <div id="small_form">
- <form action="" method="get">
- <table>
- <tr>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='High']">
- <input type="checkbox" disabled="1" checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" disabled="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/high.png" alt="High" title="High"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Medium']">
- <input type="checkbox" disabled="1" checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" disabled="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/medium.png" alt="Medium" title="Medium"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Low']">
- <input type="checkbox" disabled="1" checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" disabled="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/low.png" alt="Low" title="Low"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Log']">
- <input type="checkbox" disabled="1" checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" disabled="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/log.png" alt="Log" title="Log"/>
- </td>
- <td class="threat_info_table_h">
- </td>
- </tr>
- </table>
- </form>
- </div>
- </td>
+ <td>Order of results:</td>
+ <td>by host</td>
</tr>
<tr>
- <td>New Filter:</td>
- <td>
- <div id="small_form">
- <form action="" method="get">
- <input type="hidden" name="cmd" value="get_report"/>
- <input type="hidden" name="report_id" value="{report/@id}"/>
- <input type="hidden" name="sort_field" value="{$sort_field}"/>
- <input type="hidden" name="sort_order" value="{$sort_order}"/>
- <table>
- <tr>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='High']">
- <input type="checkbox" name="level_high" value="1"
- checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" name="level_high" value="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/high.png" alt="High" title="High"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Medium']">
- <input type="checkbox" name="level_medium" value="1"
- checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" name="level_medium" value="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/medium.png" alt="Medium" title="Medium"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Low']">
- <input type="checkbox" name="level_low" value="1"
- checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" name="level_low" value="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/low.png" alt="Low" title="Low"/>
- </td>
- <td class="threat_info_table_h">
- <xsl:choose>
- <xsl:when test="report/filters/filter[text()='Log']">
- <input type="checkbox" name="level_log" value="1"
- checked="1"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" name="level_log" value="1"/>
- </xsl:otherwise>
- </xsl:choose>
- <img src="/img/log.png" alt="Log" title="Log"/>
- </td>
- <td class="threat_info_table_h">
- <input type="submit" value="Apply" title="Apply"/>
- </td>
- </tr>
- </table>
- </form>
- </div>
- </td>
+ <td><b>Scan started:</b></td>
+ <td><b><xsl:value-of select="report/scan_start"/></b></td>
</tr>
- </table>
+ <tr>
+ <td>Scan ended:</td>
+ <td><xsl:value-of select="report/scan_end"/></td>
+ </tr>
+ <tr>
+ <td>Final scan run status:</td>
+ <td><xsl:value-of select="report/scan_run_status"/></td>
+ </tr>
+ </table>
- <xsl:apply-templates select="report" mode="details"/>
+ <h1>Result Summary</h1>
+ <xsl:apply-templates select="../all/get_report_response/report"
+ mode="overview"/>
+ </div>
</div>
+ <br/>
+ <div class="gb_window">
+ <div class="gb_window_part_left"></div>
+ <div class="gb_window_part_right"></div>
+ <div class="gb_window_part_center">
+ Result Filtering
+ <!--
+ <a href="/help/view_report.html#viewreport"
+ title="Help: View Report (Result Filtering)">
+ <img src="/img/help.png"/>
+ </a>
+ -->
+ </div>
+ <div class="gb_window_part_content">
+ <xsl:variable name="levels">
+ <xsl:value-of select="report/filters/text()"/>
+ </xsl:variable>
+ <!-- This must match the max value in exec_omp_get in gsad.c. -->
+ <xsl:variable name="increment">10</xsl:variable>
+ <xsl:variable name="last" select="report/results/@start + count(report/results/result) - 1"/>
+ <div style="float:left;">
+ <xsl:if test = "report/results/@start > 1">
+ <a href="?cmd=get_report&report_id={report/@id}&first_result={report/results/@start - $increment}&levels={$levels}&sort_field={report/sort/field/text()}&sort_order={report/sort/field/order}"><<</a>
+ </xsl:if>
+ Results <xsl:value-of select="report/results/@start"/> -
+ <xsl:value-of select="$last"/>
+ of <xsl:value-of select="report/scan_result_count/filtered"/>
+ <xsl:if test = "$last < report/scan_result_count/filtered">
+ <a href="?cmd=get_report&report_id={report/@id}&first_result={report/results/@start + $increment}&levels={$levels}&sort_field={report/sort/field/text()}&sort_order={report/sort/field/order}">>></a>
+ </xsl:if>
+ </div>
+ <div id="small_form" style="float:right;">
+ <form action="" method="get">
+ This report as:
+ <input type="hidden" name="cmd" value="get_report"/>
+ <input type="hidden" name="report_id" value="{report/@id}"/>
+ <input type="hidden" name="levels" value="{$levels}"/>
+ <input type="hidden"
+ name="sort_field"
+ value="{report/sort/field/text()}"/>
+ <input type="hidden"
+ name="sort_order"
+ value="{report/sort/field/order}"/>
+ <select name="format" style="margin-right:3px;" title="Download Format">
+ <option value="pdf">PDF</option>
+ <option value="html">HTML</option>
+ <option value="xml">XML</option>
+ <option value="nbe">NBE</option>
+ </select>
+ <input type="submit" value="Download" title="Download"/>
+ </form>
+ </div>
+
+ <!-- TODO: Move to template. -->
+ <table border="0" cellspacing="0" cellpadding="3" width="100%">
+ <tr>
+ <td colspan="2">
+ Sorting:
+ </td>
+ <td colspan="4">
+ <xsl:choose>
+ <xsl:when test="report/sort/field/text()='port' and report/sort/field/order='ascending'">
+ port ascending
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=port&sort_order=ascending&levels={$levels}">port ascending</a>
+ </xsl:otherwise>
+ </xsl:choose>
+ |
+ <xsl:choose>
+ <xsl:when test="report/sort/field/text()='port' and report/sort/field/order='descending'">
+ port descending
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=port&sort_order=descending&levels={$levels}">port descending</a>
+ </xsl:otherwise>
+ </xsl:choose>
+ |
+ <xsl:choose>
+ <xsl:when test="report/sort/field/text()='type' and report/sort/field/order='ascending'">
+ threat ascending
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=type&sort_order=ascending&levels={$levels}">threat ascending</a>
+ </xsl:otherwise>
+ </xsl:choose>
+ |
+ <xsl:choose>
+ <xsl:when test="report/sort/field/text()='type' and report/sort/field/order='descending'">
+ threat descending
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="/omp?cmd=get_report&report_id={report/@id}&sort_field=type&sort_order=descending&levels={$levels}">threat descending</a>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+ </table>
+ <br/>
+ <table>
+ <xsl:variable name="sort_field">
+ <xsl:value-of select="report/sort/field/text()"/>
+ </xsl:variable>
+ <xsl:variable name="sort_order">
+ <xsl:value-of select="report/sort/field/order"/>
+ </xsl:variable>
+ <tr>
+ <td>Current View:</td>
+ <td>
+ <div id="small_form">
+ <form action="" method="get">
+ <table>
+ <tr>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='High']">
+ <input type="checkbox" disabled="1" checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" disabled="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/high.png" alt="High" title="High"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Medium']">
+ <input type="checkbox" disabled="1" checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" disabled="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/medium.png" alt="Medium" title="Medium"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Low']">
+ <input type="checkbox" disabled="1" checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" disabled="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/low.png" alt="Low" title="Low"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Log']">
+ <input type="checkbox" disabled="1" checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" disabled="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/log.png" alt="Log" title="Log"/>
+ </td>
+ <td class="threat_info_table_h">
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>New Filter:</td>
+ <td>
+ <div id="small_form">
+ <form action="" method="get">
+ <input type="hidden" name="cmd" value="get_report"/>
+ <input type="hidden" name="report_id" value="{report/@id}"/>
+ <input type="hidden" name="sort_field" value="{$sort_field}"/>
+ <input type="hidden" name="sort_order" value="{$sort_order}"/>
+ <table>
+ <tr>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='High']">
+ <input type="checkbox" name="level_high" value="1"
+ checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" name="level_high" value="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/high.png" alt="High" title="High"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Medium']">
+ <input type="checkbox" name="level_medium" value="1"
+ checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" name="level_medium" value="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/medium.png" alt="Medium" title="Medium"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Low']">
+ <input type="checkbox" name="level_low" value="1"
+ checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" name="level_low" value="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/low.png" alt="Low" title="Low"/>
+ </td>
+ <td class="threat_info_table_h">
+ <xsl:choose>
+ <xsl:when test="report/filters/filter[text()='Log']">
+ <input type="checkbox" name="level_log" value="1"
+ checked="1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" name="level_log" value="1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <img src="/img/log.png" alt="Log" title="Log"/>
+ </td>
+ <td class="threat_info_table_h">
+ <input type="submit" value="Apply" title="Apply"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <br/>
+ <div class="gb_window">
+ <div class="gb_window_part_left"></div>
+ <div class="gb_window_part_right"></div>
+ <div class="gb_window_part_center">
+ Results per Host
+ <!--
+ <a href="/help/view_report.html#viewreport"
+ title="Help: View Report (Results per Host)">
+ <img src="/img/help.png"/>
+ </a>
+ -->
+ </div>
+ <div class="gb_window_part_content">
+ <xsl:apply-templates select="report" mode="details"/>
+ </div>
+ </div>
</xsl:template>
<xsl:template name="html-report-table">
@@ -2861,6 +2880,7 @@
<td><img src="/img/medium.png" alt="Medium" title="Medium"/></td>
<td><img src="/img/low.png" alt="Low" title="Low"/></td>
<td><img src="/img/log.png" alt="Log" title="Log"/></td>
+ <td>Total</td>
</tr>
<xsl:for-each select="host_start" >
<xsl:variable name="current_host" select="host/text()"/>
@@ -2880,6 +2900,9 @@
<td>
<xsl:value-of select="count(../results/result[host/text() = $current_host][threat/text() = 'Log'])"/>
</td>
+ <td>
+ <xsl:value-of select="count(../results/result[host/text() = $current_host])"/>
+ </td>
</tr>
</xsl:for-each>
<tr>
@@ -2896,6 +2919,9 @@
<td>
<xsl:value-of select="count(results/result[threat/text() = 'Log'])"/>
</td>
+ <td>
+ <xsl:value-of select="count(results/result)"/>
+ </td>
</tr>
</table>
</xsl:template>
More information about the Openvas-commits
mailing list