diff --git a/xml/doc/examples/exampleofferte.xml b/xml/doc/examples/exampleofferte.xml index 4db08ba..051f205 100644 --- a/xml/doc/examples/exampleofferte.xml +++ b/xml/doc/examples/exampleofferte.xml @@ -27,7 +27,7 @@ US - + 10 August 1st, 2016, lasting until August 13th, 2016 @@ -42,7 +42,7 @@ FishInABarrel - + ROS Writer diff --git a/xml/doc/offerte/Offerte Writing Procedure.md b/xml/doc/offerte/Offerte Writing Procedure.md index 7601890..4fc6268 100644 --- a/xml/doc/offerte/Offerte Writing Procedure.md +++ b/xml/doc/offerte/Offerte Writing Procedure.md @@ -113,11 +113,11 @@ Example: ### Pentest Info -The `` element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. +The `` element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. Example: - + 10 January 1st until January 12th, 2015 January 15th until January 20th, 2015 @@ -127,7 +127,7 @@ Example: 50000 FishInABarrel H4ckers 'R' Us - + ### Version History diff --git a/xml/doc/offerte/offerte.html b/xml/doc/offerte/offerte.html index 81fd727..5ef758a 100644 --- a/xml/doc/offerte/offerte.html +++ b/xml/doc/offerte/offerte.html @@ -66,9 +66,9 @@ <target>Sitting Duck's support staff</target> <targets>

Pentest Info

-

The <pentestinfo> element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.

+

The <activityinfo> element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.

Example:

-
<pentestinfo>
+
<activityinfo>
         <duration>10</duration><!-- duration of pentest, in working days -->
         <test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
         <report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -78,7 +78,7 @@
         <fee>50000</fee><!-- euro is added automatically in the document -->
         <target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) -->
         <target_application_producer>H4ckers 'R' Us</target_application_producer>
-    </pentestinfo>
+ </activityinfo>

Version History

The <version_history> element contains one or more <version> elements, one for each version of the document you create. Whenever you start a new version, add a <version> element to the list.

The <version> element should contain the following:

diff --git a/xml/doc/report/Report Writing - Procedure.md b/xml/doc/report/Report Writing - Procedure.md index d3312c3..7d92715 100644 --- a/xml/doc/report/Report Writing - Procedure.md +++ b/xml/doc/report/Report Writing - Procedure.md @@ -50,7 +50,7 @@ TODO - The document title, in the `` element - Client information, in the `<client>` element - Targets listing, in the `<targets>` element -- (Optionally) Pentest-related information, in the `<pentestinfo>` element +- (Optionally) Pentest-related information, in the `<activityinfo>` element - People who worked on the pentest and/or report, in the `<collaborators>` element - Document classification, in the `<classification>` element @@ -102,11 +102,11 @@ Example: ### Pentest Info -The `<pentestinfo>` element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. +The `<activityinfo>` element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. Example: - <pentestinfo> + <activityinfo> <duration>10</duration><!-- duration of pentest, in working days --> <test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> @@ -115,7 +115,7 @@ Example: <type>black-box</type><!-- please choose one of the following: black-box, grey-box, crystal-box --> <target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) --> <target_application_producer>H4ckers 'R' Us</target_application_producer> - </pentestinfo> + </activityinfo> ### Collaborators diff --git a/xml/doc/report/report.html b/xml/doc/report/report.html index 4eebbcf..691f31e 100644 --- a/xml/doc/report/report.html +++ b/xml/doc/report/report.html @@ -23,7 +23,7 @@ <li>The document title, in the <code><title></code> element</li> <li>Client information, in the <code><client></code> element</li> <li>Targets listing, in the <code><targets></code> element</li> -<li>(Optionally) Pentest-related information, in the <code><pentestinfo></code> element</li> +<li>(Optionally) Pentest-related information, in the <code><activityinfo></code> element</li> <li>People who worked on the pentest and/or report, in the <code><collaborators></code> element</li> <li>Document classification, in the <code><classification></code> element</li> <li>The document's version history, in the <code><version_history></code> element</li> @@ -53,9 +53,9 @@ <target>Sitting Duck's support staff</target> <targets></code></pre> <h3 id="pentest-info">Pentest Info</h3> -<p>The <code><pentestinfo></code> element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p> +<p>The <code><activityinfo></code> element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p> <p>Example:</p> -<pre><code><pentestinfo> +<pre><code><activityinfo> <duration>10</duration><!-- duration of pentest, in working days --> <test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> @@ -64,7 +64,7 @@ <type>black-box</type><!-- please choose one of the following: black-box, grey-box, crystal-box --> <target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) --> <target_application_producer>H4ckers 'R' Us</target_application_producer> - </pentestinfo></code></pre> + </activityinfo></code></pre> <h3 id="collaborators">Collaborators</h3> <p>The <code><collaborators></code> element contains three other elements, mandatory and in the listed order:</p> <ul> diff --git a/xml/dtd/offerte.xsd b/xml/dtd/offerte.xsd index 2afa1af..683f594 100644 --- a/xml/dtd/offerte.xsd +++ b/xml/dtd/offerte.xsd @@ -29,7 +29,7 @@ <xs:element ref="company"/> <xs:element ref="targets"/> <xs:element ref="permission_parties"/> - <xs:element ref="pentestinfo"/> + <xs:element ref="activityinfo"/> <xs:element ref="version_history"/> </xs:sequence> </xs:complexType> @@ -40,7 +40,7 @@ - <xs:element name="pentestinfo"> + <xs:element name="activityinfo"> <xs:complexType> <xs:sequence> <xs:element ref="duration"/> diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd index 4227440..ec11d0b 100644 --- a/xml/dtd/pentestreport.xsd +++ b/xml/dtd/pentestreport.xsd @@ -34,7 +34,7 @@ <xs:sequence> <xs:element ref="title"/> <xs:element ref="targets"/> - <xs:element ref="pentestinfo" minOccurs="0"/> + <xs:element ref="activityinfo" minOccurs="0"/> <xs:element ref="permission_parties"/> <xs:element ref="collaborators"/> <xs:element ref="classification"/> @@ -44,7 +44,7 @@ </xs:complexType> </xs:element> - <xs:element name="pentestinfo"> + <xs:element name="activityinfo"> <xs:complexType> <xs:sequence> <xs:element ref="duration"/> diff --git a/xml/templates/offerte/offerte_EN.xml b/xml/templates/offerte/offerte_EN.xml index 1334ea5..11024ef 100644 --- a/xml/templates/offerte/offerte_EN.xml +++ b/xml/templates/offerte/offerte_EN.xml @@ -17,12 +17,12 @@ <!-- PROJECT --> - <!-- <p_duration/> number of days; value taken from /offerte/meta/pentestinfo/duration --> - <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/pentestinfo/type --> - <!-- <p_fee/> fee value taken from /offerte/meta/pentestinfo/fee --> - <!-- <p_testingduration/> value taken from /offerte/meta/pentestinfo/test_planning --> - <!-- <p_reportwritingduration/> value taken from /offerte/meta/pentestinfo/report_writing --> - <!-- <p_reportdue/> value taken from /offerte/meta/pentestinfo/report_due --> + <!-- <p_duration/> number of days; value taken from /offerte/meta/activityinfo/duration --> + <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/activityinfo/type --> + <!-- <p_fee/> fee value taken from /offerte/meta/activityinfo/fee --> + <!-- <p_testingduration/> value taken from /offerte/meta/activityinfo/test_planning --> + <!-- <p_reportwritingduration/> value taken from /offerte/meta/activityinfo/report_writing --> + <!-- <p_reportdue/> value taken from /offerte/meta/activityinfo/report_due --> <!-- US --> @@ -64,7 +64,7 @@ </party> </permission_parties> - <pentestinfo> + <activityinfo> <duration>...</duration><!-- duration of pentest, in working DAYS --> <test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> @@ -74,7 +74,7 @@ <fee denomination="euro">0</fee><!-- euro is added automatically in the document --> <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) --> <target_app_producer>...</target_app_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) --> - </pentestinfo> + </activityinfo> <version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time --> <version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone --> <v_author>ROS Writer</v_author><!-- name of the author here --> diff --git a/xml/templates/offerte/offerte_NL.xml b/xml/templates/offerte/offerte_NL.xml index 3f0d8ea..398e862 100644 --- a/xml/templates/offerte/offerte_NL.xml +++ b/xml/templates/offerte/offerte_NL.xml @@ -18,12 +18,12 @@ <!-- PROJECT --> - <!-- <p_duration/> number of days; value taken from /offerte/meta/pentestinfo/duration --> - <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/pentestinfo/type --> - <!-- <p_fee/> fee value taken from /offerte/meta/pentestinfo/fee --> - <!-- <p_testingduration/> value taken from /offerte/meta/pentestinfo/test_planning --> - <!-- <p_reportwritingduration/> value taken from /offerte/meta/pentestinfo/report_writing --> - <!-- <p_reportdue/> value taken from /offerte/meta/pentestinfo/report_due --> + <!-- <p_duration/> number of days; value taken from /offerte/meta/activityinfo/duration --> + <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/activityinfo/type --> + <!-- <p_fee/> fee value taken from /offerte/meta/activityinfo/fee --> + <!-- <p_testingduration/> value taken from /offerte/meta/activityinfo/test_planning --> + <!-- <p_reportwritingduration/> value taken from /offerte/meta/activityinfo/report_writing --> + <!-- <p_reportdue/> value taken from /offerte/meta/activityinfo/report_due --> <!-- US --> @@ -63,7 +63,7 @@ <country>...</country> </party> </permission_parties> - <pentestinfo> + <activityinfo> <duration>...</duration><!-- duration of pentest, in working DAYS --> <test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> @@ -73,7 +73,7 @@ <fee denomination="euro">...</fee><!-- euro|dollar --> <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) --> <target_application_producer>...</target_application_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) --> - </pentestinfo> + </activityinfo> <version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time --> <version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone --> <v_author>ROS Writer</v_author><!-- name of the author here --> diff --git a/xml/xslt/generate_invoice.xsl b/xml/xslt/generate_invoice.xsl index 4eaf837..9dfd8ef 100644 --- a/xml/xslt/generate_invoice.xsl +++ b/xml/xslt/generate_invoice.xsl @@ -58,13 +58,13 @@ <!-- CONTENT --> <xsl:template name="invoice_from_offerte"> - <xsl:variable name="fee" select="/offerte/meta/pentestinfo/fee * 1"/> + <xsl:variable name="fee" select="/offerte/meta/activityinfo/fee * 1"/> <xsl:variable name="vat" select="$fee div 100 * 21"/> <xsl:variable name="denomination"> <xsl:choose> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'eur'">€</xsl:when> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'gbp'">£</xsl:when> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'usd'">$</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'eur'">€</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'gbp'">£</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'usd'">$</xsl:when> </xsl:choose> </xsl:variable> <xsl:call-template name="invoiceStart"> @@ -73,7 +73,7 @@ /> </xsl:call-template> <xsl:variable name="serviceDescription"> - <xsl:value-of select="/offerte/meta/pentestinfo/duration"/><xsl:text>-</xsl:text><xsl:call-template name="getString"><xsl:with-param + <xsl:value-of select="/offerte/meta/activityinfo/duration"/><xsl:text>-</xsl:text><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_days'" /></xsl:call-template> <xsl:value-of select="/offerte/meta/offered_service_short" diff --git a/xml/xslt/generate_offerte.xsl b/xml/xslt/generate_offerte.xsl index e63f7cb..9c1da9c 100644 --- a/xml/xslt/generate_offerte.xsl +++ b/xml/xslt/generate_offerte.xsl @@ -63,9 +63,9 @@ <xsl:variable name="denomination"> <xsl:choose> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'eur'">€</xsl:when> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'usd'">$</xsl:when> - <xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'gbp'">£</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'eur'">€</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'usd'">$</xsl:when> + <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'gbp'">£</xsl:when> </xsl:choose> </xsl:variable> diff --git a/xml/xslt/off2inv.xsl b/xml/xslt/off2inv.xsl index fd35214..68e757c 100644 --- a/xml/xslt/off2inv.xsl +++ b/xml/xslt/off2inv.xsl @@ -30,7 +30,7 @@ <xsl:value-of select="$lang"/> </xsl:attribute> <xsl:attribute name="denomination"> - <xsl:value-of select="/offerte/meta/pentestinfo/fee/@denomination"/> + <xsl:value-of select="/offerte/meta/activityinfo/fee/@denomination"/> </xsl:attribute> <meta> <xsl:element name="xi:include"> @@ -44,13 +44,13 @@ <xsl:comment>Add/delete <service> elements as needed</xsl:comment> <service> <description> - <xsl:value-of select="/offerte/meta/pentestinfo/duration" + <xsl:value-of select="/offerte/meta/activityinfo/duration" />-<xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_days'"/></xsl:call-template> <xsl:value-of select="/offerte/meta/offered_service_short" /> <xsl:value-of select="/offerte/meta/permission_parties/client/short_name"/> </description> <fee vat="yes"> - <xsl:value-of select="/offerte/meta/pentestinfo/fee"/> + <xsl:value-of select="/offerte/meta/activityinfo/fee"/> </fee> </service> </servicesdelivered> diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl index c1e5e62..92f381c 100644 --- a/xml/xslt/off2rep.xsl +++ b/xml/xslt/off2rep.xsl @@ -21,15 +21,15 @@ </xsl:copy> </xsl:for-each> </targets> - <pentestinfo> - <xsl:for-each select="/offerte/meta/pentestinfo/*"> + <activityinfo> + <xsl:for-each select="/offerte/meta/activityinfo/*"> <xsl:if test="not(self::fee)"> <xsl:copy> <xsl:copy-of select="node()"/> </xsl:copy> </xsl:if> </xsl:for-each> - </pentestinfo> + </activityinfo> <permission_parties> <xsl:element name="xi:include"> <xsl:attribute name="href">client_info.xml</xsl:attribute> diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt index ac91053..378b928 100644 --- a/xml/xslt/placeholders.xslt +++ b/xml/xslt/placeholders.xslt @@ -135,38 +135,38 @@ </xsl:template> <xsl:template match="t_app"> <xsl:param name="placeholderElement" - select="/offerte/meta/pentestinfo/target_application | /pentest_report/meta/pentestinfo/target_application"/> + select="/offerte/meta/activityinfo/target_application | /pentest_report/meta/activityinfo/target_application"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="t_app_producer"> <xsl:param name="placeholderElement" - select="/offerte/meta/pentestinfo/target_application_producer | /pentest_report/meta/pentestinfo/target_application_producer"/> + select="/offerte/meta/activityinfo/target_application_producer | /pentest_report/meta/activityinfo/target_application_producer"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="p_duration"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/duration"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/duration"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="p_persondays"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/persondays"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/persondays"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="p_boxtype"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/type"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/type"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="p_fee"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/fee"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/fee"/> <xsl:value-of select="$denomination"/> <xsl:text> </xsl:text> <xsl:call-template name="checkPlaceholder"> @@ -174,13 +174,13 @@ </xsl:call-template> </xsl:template> <xsl:template match="p_testingduration"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/test_planning"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/test_planning"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> </xsl:template> <xsl:template match="p_reportdue"> - <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/report_due"/> + <xsl:param name="placeholderElement" select="/*/meta/activityinfo/report_due"/> <xsl:call-template name="checkPlaceholder"> <xsl:with-param name="placeholderElement" select="$placeholderElement"/> </xsl:call-template> diff --git a/xml/xslt/qs2offerte.xsl b/xml/xslt/qs2offerte.xsl index 52e7350..2790bef 100644 --- a/xml/xslt/qs2offerte.xsl +++ b/xml/xslt/qs2offerte.xsl @@ -66,7 +66,7 @@ <targets> <!-- copy targets from quickscope --> <xsl:comment>one target element per target</xsl:comment> - <xsl:for-each select="/*/meta/targets/target"> + <xsl:for-each select="//targets/target"> <xsl:copy> <xsl:copy-of select="node()"/> </xsl:copy> @@ -83,7 +83,7 @@ </party> </xsl:for-each> </permission_parties> - <pentestinfo> + <activityinfo> <!-- copy various variables from quickscope --> <duration> <xsl:value-of select="/*/activity_info/days"/> @@ -119,7 +119,7 @@ <xsl:comment>name of application/service to be tested (if any; if none, DELETE target_application element)</xsl:comment> </xsl:if> - </pentestinfo> + </activityinfo> <version_history> <xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new <version> after each review; in that case, make sure to update the date/time</xsl:comment> <version number="auto"> diff --git a/xml/xslt/rep2off.xsl b/xml/xslt/rep2off.xsl index 36c2cc0..de6e145 100644 --- a/xml/xslt/rep2off.xsl +++ b/xml/xslt/rep2off.xsl @@ -73,7 +73,7 @@ </party> </xsl:for-each> </permission_parties> - <pentestinfo> + <activityinfo> <!-- copy various variables from quickscope --> <duration>2</duration> <xsl:comment>duration of pentest, in working days</xsl:comment> @@ -81,7 +81,7 @@ <xsl:comment>duration of pentest, in persondays</xsl:comment> <test_planning> <xsl:choose> - <xsl:when test="/*/pentestinfo/test_planning"> + <xsl:when test="/*/activityinfo/test_planning"> <xsl:value-of select="/*/activity_info/test_planning"/> </xsl:when> <xsl:otherwise>TBD</xsl:otherwise> @@ -90,7 +90,7 @@ <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment> <report_due> <xsl:choose> - <xsl:when test="/*/pentestinfo/report_due"> + <xsl:when test="/*/activityinfo/report_due"> <xsl:value-of select="/*/activity_info/report_due"/> </xsl:when> <xsl:otherwise>TBD</xsl:otherwise> @@ -99,7 +99,7 @@ <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment> <nature> <xsl:choose> - <xsl:when test="/*/pentestinfo/nature"> + <xsl:when test="/*/activityinfo/nature"> <xsl:value-of select="/*/activity_info/nature"/> </xsl:when> <xsl:otherwise>time-boxed</xsl:otherwise> @@ -107,7 +107,7 @@ </nature> <type> <xsl:choose> - <xsl:when test="/*/pentestinfo/type"> + <xsl:when test="/*/activityinfo/type"> <xsl:value-of select="/*/activity_info/type"/> </xsl:when> <xsl:otherwise>crystal-box</xsl:otherwise> @@ -121,7 +121,7 @@ <xsl:value-of select="/*/activity_info/target_application"/> </target_application> </xsl:if> - </pentestinfo> + </activityinfo> <version_history> <xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new <version> after each review; in that case, make sure to update the date/time</xsl:comment> <version number="auto">