Changed ‘manday’ to ‘personday’

This commit is contained in:
skyanth
2017-05-15 10:25:41 +02:00
parent ddf2baf85e
commit ccef922626
11 changed files with 19 additions and 19 deletions

View File

@@ -38,8 +38,8 @@
<pentest_info> <pentest_info>
<!-- How long would you like the test to be? (in days) --> <!-- How long would you like the test to be? (in days) -->
<days>6</days> <days>6</days>
<!-- How many mandays (if you don't know, try days * number of assigned pentesters) --> <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
<mandays>12</mandays> <persondays>12</persondays>
<!-- Service execution (Use one of the following values: time-boxed, subscription) --> <!-- Service execution (Use one of the following values: time-boxed, subscription) -->
<nature>time-boxed</nature> <nature>time-boxed</nature>
<!-- Testing type (Use one of the following values: crystal-box, black-box, grey-box) --> <!-- Testing type (Use one of the following values: crystal-box, black-box, grey-box) -->

View File

@@ -151,7 +151,7 @@
<xs:element name="invoice_extra_field" type="xs:string"/> <xs:element name="invoice_extra_field" type="xs:string"/>
<xs:element name="duration" type="xs:nonNegativeInteger"/> <xs:element name="duration" type="xs:nonNegativeInteger"/>
<xs:element name="mandays" type="xs:nonNegativeInteger"/> <xs:element name="persondays" type="xs:nonNegativeInteger"/>
<xs:element name="test_planning" type="xs:string"/> <xs:element name="test_planning" type="xs:string"/>
<xs:element name="report_due" type="xs:string"/> <xs:element name="report_due" type="xs:string"/>
<xs:element name="nature" type="xs:string"/> <xs:element name="nature" type="xs:string"/>

View File

@@ -44,7 +44,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="duration"/> <xs:element ref="duration"/>
<xs:element ref="mandays"/> <xs:element ref="persondays"/>
<xs:element ref="test_planning"/> <xs:element ref="test_planning"/>
<xs:element ref="report_due"/> <xs:element ref="report_due"/>
<xs:element ref="nature"/> <xs:element ref="nature"/>
@@ -202,7 +202,7 @@
<xs:element name="t_app"/> <xs:element name="t_app"/>
<xs:element name="t_app_producer"/> <xs:element name="t_app_producer"/>
<xs:element name="p_duration"/> <xs:element name="p_duration"/>
<xs:element name="p_mandays"/> <xs:element name="p_persondays"/>
<xs:element name="p_boxtype"/> <xs:element name="p_boxtype"/>
<xs:element name="p_fee"/> <xs:element name="p_fee"/>
<xs:element name="p_testingduration"/> <xs:element name="p_testingduration"/>

View File

@@ -48,7 +48,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="duration"/> <xs:element ref="duration"/>
<xs:element ref="mandays"/> <xs:element ref="persondays"/>
<xs:element ref="test_planning"/> <xs:element ref="test_planning"/>
<xs:element ref="report_due"/> <xs:element ref="report_due"/>
<xs:element ref="nature"/> <xs:element ref="nature"/>

View File

@@ -42,7 +42,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="days"/> <xs:element ref="days"/>
<xs:element ref="mandays"/> <xs:element ref="persondays"/>
<xs:element ref="nature"/> <xs:element ref="nature"/>
<xs:element ref="type"/> <xs:element ref="type"/>
<xs:element ref="planning"/> <xs:element ref="planning"/>

View File

@@ -38,8 +38,8 @@
<pentest_info> <pentest_info>
<!-- How long would you like the test to be? (in days) --> <!-- How long would you like the test to be? (in days) -->
<days>0</days> <days>0</days>
<!-- How many mandays (if you don't know, try days * number of assigned pentesters) --> <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
<mandays>0</mandays> <persondays>0</persondays>
<!-- Service execution (Use one of the following values: time-boxed, subscription) --> <!-- Service execution (Use one of the following values: time-boxed, subscription) -->
<nature>time-boxed</nature> <nature>time-boxed</nature>
<!-- Testing type (Use one of the following values: crystal-box, black-box, grey-box) --> <!-- Testing type (Use one of the following values: crystal-box, black-box, grey-box) -->

View File

@@ -20,7 +20,7 @@
<company_short/> will test for the presence of the most common <company_short/> will test for the presence of the most common
vulnerabilities, using both publicly available vulnerability scanning vulnerabilities, using both publicly available vulnerability scanning
tools and manual testing. <company_short/> shall perform a tools and manual testing. <company_short/> shall perform a
<p_duration/>-day (<p_mandays/>-manday), <p_boxtype/>, intrusive test via the <p_duration/>-day (<p_persondays/>-personday), <p_boxtype/>, intrusive test via the
internet. internet.
</p> </p>

View File

@@ -20,7 +20,7 @@
<company_short/> zal testen op de aanwezigheid van de meest voorkomende <company_short/> zal testen op de aanwezigheid van de meest voorkomende
kwetsbaarheden, gebruik makend van zowel publiek beschikbare scanning tools, kwetsbaarheden, gebruik makend van zowel publiek beschikbare scanning tools,
als door handmatig testen. <company_short/> zal een grondige <p_duration/>-daagse als door handmatig testen. <company_short/> zal een grondige <p_duration/>-daagse
(<p_mandays/> mandagen), <p_boxtype/> test uitvoeren via internet. (<p_persondays/> persoondagen), <p_boxtype/> test uitvoeren via internet.
</p> </p>
<section todo="yes"> <section todo="yes">

View File

@@ -153,8 +153,8 @@
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_mandays"> <xsl:template match="p_persondays">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/mandays"/> <xsl:param name="placeholderElement" select="/*/meta/pentestinfo/persondays"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>

View File

@@ -89,10 +89,10 @@
<xsl:value-of select="/*/pentest_info/days"/> <xsl:value-of select="/*/pentest_info/days"/>
</duration> </duration>
<xsl:comment>duration of pentest, in working days</xsl:comment> <xsl:comment>duration of pentest, in working days</xsl:comment>
<mandays> <persondays>
<xsl:value-of select="/*/pentest_info/mandays"/> <xsl:value-of select="/*/pentest_info/persondays"/>
</mandays> </persondays>
<xsl:comment>duration of pentest, in mandays</xsl:comment> <xsl:comment>duration of pentest, in persondays</xsl:comment>
<test_planning> <test_planning>
<xsl:value-of select="/*/pentest_info/planning"/> <xsl:value-of select="/*/pentest_info/planning"/>
</test_planning> </test_planning>

View File

@@ -77,8 +77,8 @@
<!-- copy various variables from quickscope --> <!-- copy various variables from quickscope -->
<duration>2</duration> <duration>2</duration>
<xsl:comment>duration of pentest, in working days</xsl:comment> <xsl:comment>duration of pentest, in working days</xsl:comment>
<mandays>2</mandays> <persondays>2</persondays>
<xsl:comment>duration of pentest, in mandays</xsl:comment> <xsl:comment>duration of pentest, in persondays</xsl:comment>
<test_planning> <test_planning>
<xsl:choose> <xsl:choose>
<xsl:when test="/*/pentestinfo/test_planning"> <xsl:when test="/*/pentestinfo/test_planning">