merged activity_info and activityinfo, added planning dates

xml/source/ir_quickscope.xml

@@ -20,7 +20,7 @@
   </meta>
  
   <!-- ACTIVITY INFO -->
-  <activity_info>
+  <activityinfo>
     <organizational_readiness_assessment><!-- Delete complete organizational_readiness_assessment element if not needed! -->
       <rate denomination="eur">100000</rate><!-- flat rate! -->
       <team>
@@ -35,6 +35,6 @@
     <technical_artefact_analysis>
       <rate denomination="eur">250</rate><!-- rate per person-hour -->
     </technical_artefact_analysis>
-  </activity_info>
+  </activityinfo>
   
 </ir_quickscope>

xml/source/quickscope.xml

@@ -35,7 +35,7 @@
       <country>XXX</country>
   </third_party> -->
   <!-- ___________________________________ -->
-  <activity_info>
+  <activityinfo>
     <!-- How long would you like the test to be? (in days) -->
     <days>0</days>
     <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
@@ -59,5 +59,5 @@
 
     <!-- rate (to be filled in by ROS ;) -->
     <rate>0</rate>
-  </activity_info>
+  </activityinfo>
 </quickscope>

xml/source/tocsv.xsl

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="xs"
+    version="2.0">
+	<xsl:output method="text"/>
+	<xsl:variable name="delimiter">;</xsl:variable>
+	<xsl:template match="/">
+		<xsl:apply-templates select="//finding"/>
+	</xsl:template>
+
+	<!-- finding -->
+	<xsl:template match="finding">
+		<xsl:text>#</xsl:text><xsl:value-of select="substring(@id,2,2)"/><xsl:value-of select="$delimiter"/>
+		<xsl:value-of select="@type"/><xsl:value-of select="$delimiter"/>
+		<xsl:value-of select="@threatLevel"/><xsl:value-of select="$delimiter"/>
+		<xsl:value-of select="translate(description/p,$delimiter,',')"/><xsl:value-of select="$delimiter"/>
+		<xsl:choose>
+			<xsl:when test="string-length(recommendation/ul) &gt; 0">
+				<xsl:for-each select="recommendation/ul/li">
+					<xsl:value-of select="translate(.,$delimiter,',')"/>
+					<xsl:if test="position() &lt; last()">
+						<xsl:text> </xsl:text>
+					</xsl:if>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:when test="string-length(recommendation/p) &gt; 0">
+				<xsl:value-of select="translate(recommendation/p,$delimiter,',')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="translate(recommendation,$delimiter,',')"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:text>
+</xsl:text>
+	</xsl:template>
+
+
+</xsl:stylesheet>