From b29bcf81e4a40ea0bde895799319e052c014e650 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Mon, 3 Jul 2017 15:11:20 +0200
Subject: [PATCH] Revert "Exec summary switch now generates report as well as
 executive summary (and not just the summary)"

This reverts commit ef1ff0542c8dc73752ff3da70f110b4f08196b74.
---
 xml/xslt/generate_report.xsl | 18 ++++++++----------
 xml/xslt/inline.xslt         |  3 +--
 xml/xslt/meta.xslt           |  6 ++----
 xml/xslt/numbering.xslt      |  3 +--
 xml/xslt/structure.xslt      |  6 ++----
 xml/xslt/toc.xslt            | 14 ++++++--------
 6 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/xml/xslt/generate_report.xsl b/xml/xslt/generate_report.xsl
index beebdc6..fbb4e43 100644
--- a/xml/xslt/generate_report.xsl
+++ b/xml/xslt/generate_report.xsl
@@ -58,28 +58,26 @@
     <!-- ROOT -->
     <xsl:template match="/">
 
-            <xsl:if test="$EXEC_SUMMARY = true()">
+        <xsl:choose>
+            <xsl:when test="$EXEC_SUMMARY = true()">
                 <xsl:result-document href="../target/execsummary.fo">
                     <fo:root xsl:use-attribute-sets="root-common">
 
                         <xsl:call-template name="layout-master-set"/>
-                        <xsl:call-template name="Content">
-                            <xsl:with-param name="execsummary" select="true()" tunnel="yes"/>
-                        </xsl:call-template>
+                        <xsl:call-template name="Content"/>
 
                     </fo:root>
                 </xsl:result-document>
-            </xsl:if>
+            </xsl:when>
+            <xsl:otherwise>
                 <fo:root xsl:use-attribute-sets="root-common">
 
                     <xsl:call-template name="layout-master-set"/>
-                    <xsl:call-template name="Content">
-                        <xsl:with-param name="execsummary" select="false()" tunnel="yes"/>
-                    </xsl:call-template>
+                    <xsl:call-template name="Content"/>
 
                 </fo:root>
-            
-        
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
 
diff --git a/xml/xslt/inline.xslt b/xml/xslt/inline.xslt
index 353b9cd..4140f29 100644
--- a/xml/xslt/inline.xslt
+++ b/xml/xslt/inline.xslt
@@ -4,7 +4,6 @@
     xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
 
     <xsl:template match="a">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:variable name="destination">
             <xsl:choose>
                 <xsl:when test="starts-with(@href, '#')">
@@ -21,7 +20,7 @@
                     DOCUMENT</fo:inline>
             </xsl:when>
             <xsl:when
-                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']]) or (starts-with(@href, '#') and $execsummary=true() and //*[@id = $destination][ancestor-or-self::*[not(@inexecsummary='yes')]])">
+                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']]) or (starts-with(@href, '#') and $EXEC_SUMMARY=true() and //*[@id = $destination][ancestor-or-self::*[not(@inexecsummary='yes')]])">
                 <fo:inline xsl:use-attribute-sets="errortext">WARNING: LINK TARGET IS
                     HIDDEN</fo:inline>
             </xsl:when>
diff --git a/xml/xslt/meta.xslt b/xml/xslt/meta.xslt
index ec114bd..fd6d87f 100644
--- a/xml/xslt/meta.xslt
+++ b/xml/xslt/meta.xslt
@@ -5,7 +5,6 @@
     version="2.0">
     
       <xsl:template match="meta">
-          <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:variable name="latestVersionNumber">
             <xsl:for-each select="version_history/version">
                 <xsl:sort select="xs:dateTime(@date)" order="descending"/>
@@ -21,7 +20,7 @@
         </fo:block>
         <fo:block xsl:use-attribute-sets="title-0">
             <xsl:choose>
-                <xsl:when test="$execsummary=true()">
+                <xsl:when test="$EXEC_SUMMARY=true()">
                     <xsl:text>PENETRATION TEST MANAGEMENT SUMMARY</xsl:text>
                 </xsl:when>
                 <xsl:otherwise><xsl:value-of select="upper-case(title)"/></xsl:otherwise>
@@ -62,7 +61,6 @@
     </xsl:template>
 
     <xsl:template name="DocProperties">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:variable name="latestVersionNumber">
             <xsl:for-each select="version_history/version">
                 <xsl:sort select="xs:dateTime(@date)" order="descending"/>
@@ -98,7 +96,7 @@
                         <fo:table-cell xsl:use-attribute-sets="td">
                             <fo:block>
                                 <xsl:choose>
-                <xsl:when test="$execsummary=true()">
+                <xsl:when test="$EXEC_SUMMARY=true()">
                     <xsl:text>PENETRATION TEST MANAGEMENT SUMMARY</xsl:text>
                 </xsl:when>
                 <xsl:otherwise><xsl:value-of select="upper-case(title)"/></xsl:otherwise>
diff --git a/xml/xslt/numbering.xslt b/xml/xslt/numbering.xslt
index 934b863..12232bd 100644
--- a/xml/xslt/numbering.xslt
+++ b/xml/xslt/numbering.xslt
@@ -36,9 +36,8 @@
     <xsl:template
         match="section[not(@visibility = 'hidden')] | appendix[not(@visibility = 'hidden')]"
         mode="number">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:choose>
-            <xsl:when test="$execsummary = true()">
+            <xsl:when test="$EXEC_SUMMARY = true()">
                 <xsl:choose>
                     <xsl:when test="self::appendix">
                         <fo:inline> Appendix&#160;<xsl:number
diff --git a/xml/xslt/structure.xslt b/xml/xslt/structure.xslt
index c9e451e..c945dc1 100644
--- a/xml/xslt/structure.xslt
+++ b/xml/xslt/structure.xslt
@@ -4,10 +4,9 @@
     xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
 
     <xsl:template match="section | appendix | finding | non-finding | annex">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:if test="not(@visibility = 'hidden')">
             <xsl:choose>
-                <xsl:when test="$execsummary = true()">
+                <xsl:when test="$EXEC_SUMMARY = true()">
                     <xsl:if test="ancestor-or-self::*/@inexecsummary = 'yes'">
                         <fo:block xsl:use-attribute-sets="section">
                             <xsl:if test="self::appendix or self::annex">
@@ -30,7 +29,6 @@
     </xsl:template>
 
     <xsl:template match="title[not(parent::biblioentry)]">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:variable name="LEVEL" select="count(ancestor::*) - 1"/>
         <xsl:variable name="CLASS">
             <!-- use title-x for all levels -->
@@ -43,7 +41,7 @@
                 <xsl:with-param name="CLASS" select="$CLASS"/>
             </xsl:call-template>
             <xsl:choose>
-                <xsl:when test="$execsummary = true()">
+                <xsl:when test="$EXEC_SUMMARY = true()">
                     <xsl:choose>
                         <xsl:when test="self::title[parent::appendix]">
                             <fo:inline> Appendix&#160;<xsl:number
diff --git a/xml/xslt/toc.xslt b/xml/xslt/toc.xslt
index 243eb64..6ca7c0c 100644
--- a/xml/xslt/toc.xslt
+++ b/xml/xslt/toc.xslt
@@ -25,9 +25,9 @@
     <xsl:template
         match="section[not(@visibility = 'hidden')] | finding | appendix[not(@visibility = 'hidden')] | non-finding"
         mode="toc">
-        <xsl:param name="execsummary" tunnel="yes"/>
+
         <xsl:choose>
-            <xsl:when test="$execsummary = true()">
+            <xsl:when test="$EXEC_SUMMARY = true()">
                 <xsl:if test="ancestor-or-self::*/@inexecsummary = 'yes'">
                     <xsl:call-template name="ToC"/>
                 </xsl:if>
@@ -40,7 +40,6 @@
     </xsl:template>
 
     <xsl:template name="ToC">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <fo:table-row>
             <fo:table-cell text-align-last="justify">
                 <fo:block>
@@ -67,7 +66,7 @@
             </fo:table-cell>
         </fo:table-row>
         <xsl:choose>
-            <xsl:when test="$execsummary = true()">
+            <xsl:when test="$EXEC_SUMMARY = true()">
                 <xsl:apply-templates
                     select="section[not(@visibility = 'hidden')][not(../@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes']"
                     mode="toc"/>
@@ -96,11 +95,10 @@
     </xsl:template>
 
     <xsl:template name="tocContent_Numbering">
-        <xsl:param name="execsummary" tunnel="yes"/>
         <xsl:choose>
             <xsl:when test="self::appendix[not(@visibility = 'hidden')]">
                 <xsl:choose>
-                    <xsl:when test="$execsummary = true()">
+                    <xsl:when test="$EXEC_SUMMARY = true()">
                         <fo:inline> Appendix&#160;<xsl:number
                                 count="appendix[not(@visibility = 'hidden')][@inexecsummary = 'yes']"
                                 level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/></fo:inline>
@@ -114,7 +112,7 @@
             </xsl:when>
             <xsl:when test="ancestor::appendix[not(@visibility = 'hidden')]">
                 <xsl:choose>
-                    <xsl:when test="$execsummary = true()">
+                    <xsl:when test="$EXEC_SUMMARY = true()">
                         <xsl:if test="ancestor::appendix[@inexecsummary = 'yes']">
                             <fo:inline> App&#160;<xsl:number
                                     count="appendix[not(@visibility = 'hidden')][@inexecsummary = 'yes']"
@@ -136,7 +134,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:choose>
-                    <xsl:when test="$execsummary = true()">
+                    <xsl:when test="$EXEC_SUMMARY = true()">
                         <xsl:number
                             count="section[not(@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes']"
                             level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/>