From 14564d3a605672b74f6a847be8f1ae2947bdefc6 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Tue, 4 Jun 2019 18:09:38 +0200
Subject: [PATCH] =?UTF-8?q?piechart=20sizing,=20forced=20=E2=80=98other?=
 =?UTF-8?q?=E2=80=99=20category?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xml/dtd/pentestreport.xsd |  4 ----
 xml/xslt/off2rep.xsl      |  4 ++--
 xml/xslt/piecharts.xslt   | 18 +++++-------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 27314e9..46a0ec2 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -188,17 +188,13 @@
     <xs:complexType>
       <xs:attribute ref="pieAttr" use="required"/>
       <xs:attribute ref="pieElem" use="required"/>
-      <xs:attribute ref="pieHeight" use="required"/>
       <xs:attribute ref="status" use="optional"/>
-      <xs:attribute ref="threshold" use="optional" default="1"/>
     </xs:complexType>
   </xs:element>
 
   <xs:attribute name="pieAttr" type="xs:string"/>
   <xs:attribute name="pieElem" type="xs:string"/>
-  <xs:attribute name="pieHeight" type="xs:integer"/>
   <xs:attribute name="status" type="xs:string"/>
-  <xs:attribute name="threshold" type="xs:integer"/>
 
   <xs:attribute name="inexecsummary">
     <xs:simpleType>
diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl
index 532c1db..9383c14 100644
--- a/xml/xslt/off2rep.xsl
+++ b/xml/xslt/off2rep.xsl
@@ -109,11 +109,11 @@
                     <xsl:comment> generated from Findings section </xsl:comment>
                     <section id="threatlevelpie">
                         <title>Findings by Threat Level</title>
-                        <generate_piechart pieAttr="threatLevel" pieElem="finding" pieHeight="200" threshold="1"/>
+                        <generate_piechart pieAttr="threatLevel" pieElem="finding"/>
                     </section>
                     <section id="typepie">
                         <title>Findings by Type</title>
-                        <generate_piechart pieAttr="type" pieElem="finding" pieHeight="200" threshold="2"/>
+                        <generate_piechart pieAttr="type" pieElem="finding"/>
                     </section>
                 </section>
                 <section id="recommendationSummary">
diff --git a/xml/xslt/piecharts.xslt b/xml/xslt/piecharts.xslt
index 5ba6e32..c46d26b 100644
--- a/xml/xslt/piecharts.xslt
+++ b/xml/xslt/piecharts.xslt
@@ -14,14 +14,7 @@
                 <xsl:call-template name="do_generate_piechart">
                     <xsl:with-param name="pieAttr" select="@pieAttr"/>
                     <xsl:with-param name="pieElem" select="@pieElem"/>
-                    <xsl:with-param name="pieHeight" select="@pieHeight"/>
                     <xsl:with-param name="status" select="@status"/>
-                    <xsl:with-param name="threshold">
-                        <xsl:choose>
-                            <xsl:when test="@threshold"><xsl:value-of select="@threshold"/></xsl:when>
-                            <xsl:otherwise>1</xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:with-param>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
@@ -38,9 +31,9 @@
         <!-- generate_piechart @type="type" or "threatLevel" -->
         <xsl:param name="pieAttr" select="@pieAttr"/>
         <xsl:param name="pieElem" select="@pieElem"/>
-        <xsl:param name="pieHeight" as="xs:integer" select="@pieHeight"/>
+        <xsl:param name="pieHeight" as="xs:integer" select="200"/>
         <xsl:param name="status" select="@status"/>
-        <xsl:param name="threshold" select="@threshold"/>
+        <xsl:param name="threshold" select="2"/>
         <xsl:variable name="statusSequence" as="item()*">
             <xsl:for-each select="$status">
                 <xsl:for-each select="tokenize(., ' ')">
@@ -158,7 +151,7 @@
         </xsl:variable>
         <xsl:variable name="pieTable_thresholdApplied">
             <xsl:choose>
-                <xsl:when test="$threshold &gt; 1">
+                <xsl:when test="not($pieAttr = 'threatLevel') and $sumBelowThreshold > 4">
                     <xsl:for-each
                         select="$sortedPieTable/pieEntry[child::pieEntryCount &gt;= $threshold]">
                         <pieEntry>
@@ -178,7 +171,7 @@
         </xsl:variable>
         <xsl:variable name="pieTable">
             <xsl:copy-of select="$pieTable_thresholdApplied" copy-namespaces="no"/>
-            <xsl:if test="$threshold &gt; 1">
+            <xsl:if test="not($pieAttr = 'threatLevel') and $sumBelowThreshold > 4">
                 <pieEntry>
                     <pieEntryLabel>
                         <xsl:text>Other</xsl:text>
@@ -206,8 +199,7 @@
         <xsl:param name="pieTotal"/>
         <xsl:param name="no_entries"/>
         <xsl:param name="pieHeightHalf"/>
-        <xsl:variable name="spacing_for_percentage_labels">40</xsl:variable>
-        <svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="-40 0 300 300">
+        <svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="-40 -20 300 300">
             <!-- The bit below tried to configure the piechart size but basically nobody ever changes it and it just makes it all way too difficult -->
             <!-- width and height of the viewport -->
             <!--<xsl:attribute name="width">