diff --git a/ReportToolz/repgen.php b/ReportToolz/repgen.php index 1597feb..6e33ea7 100755 --- a/ReportToolz/repgen.php +++ b/ReportToolz/repgen.php @@ -5,7 +5,7 @@ /*** * Configuration options */ -$template = "templates/odt/blank_template_v1.0.odt"; +$template = "templates/odt/blank_template_v1.1.odt"; //$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt"; $vulnTemplate = "templates/odt/vuln_template_v0.2.xml"; @@ -102,7 +102,7 @@ // create vulns for odf $templateOrig = file_get_contents($vulnTemplate); -$Serious = $High = $Medium = $Low = $Informational = ""; +$Serious = $High = $Medium = $Low = $Info = ""; foreach ($vuln as $singlevuln) { $templateSource = $templateOrig; $togo = $singlevuln['risk']; @@ -187,7 +187,7 @@ </text:list>'; $value .= $Low; } -if(!empty($Informational)){ +if(!empty($Info)){ $value .= '<text:list text:continue-numbering="true" text:style-name="Outline"> <text:list-item> <text:list> @@ -197,7 +197,7 @@ </text:list> </text:list-item> </text:list>'; - $value .= $Informational; + $value .= $Info; } // add to template $source = file_get_contents("/tmp/$rand/content.xml"); diff --git a/ReportToolz/repgen.php b/ReportToolz/repgen.php index 1597feb..6e33ea7 100755 --- a/ReportToolz/repgen.php +++ b/ReportToolz/repgen.php @@ -5,7 +5,7 @@ /*** * Configuration options */ -$template = "templates/odt/blank_template_v1.0.odt"; +$template = "templates/odt/blank_template_v1.1.odt"; //$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt"; $vulnTemplate = "templates/odt/vuln_template_v0.2.xml"; @@ -102,7 +102,7 @@ // create vulns for odf $templateOrig = file_get_contents($vulnTemplate); -$Serious = $High = $Medium = $Low = $Informational = ""; +$Serious = $High = $Medium = $Low = $Info = ""; foreach ($vuln as $singlevuln) { $templateSource = $templateOrig; $togo = $singlevuln['risk']; @@ -187,7 +187,7 @@ </text:list>'; $value .= $Low; } -if(!empty($Informational)){ +if(!empty($Info)){ $value .= '<text:list text:continue-numbering="true" text:style-name="Outline"> <text:list-item> <text:list> @@ -197,7 +197,7 @@ </text:list> </text:list-item> </text:list>'; - $value .= $Informational; + $value .= $Info; } // add to template $source = file_get_contents("/tmp/$rand/content.xml"); diff --git a/ReportToolz/templates/odt/blank_template_v1.1.odt b/ReportToolz/templates/odt/blank_template_v1.1.odt new file mode 100755 index 0000000..cdcac09 --- /dev/null +++ b/ReportToolz/templates/odt/blank_template_v1.1.odt Binary files differ diff --git a/ReportToolz/repgen.php b/ReportToolz/repgen.php index 1597feb..6e33ea7 100755 --- a/ReportToolz/repgen.php +++ b/ReportToolz/repgen.php @@ -5,7 +5,7 @@ /*** * Configuration options */ -$template = "templates/odt/blank_template_v1.0.odt"; +$template = "templates/odt/blank_template_v1.1.odt"; //$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt"; $vulnTemplate = "templates/odt/vuln_template_v0.2.xml"; @@ -102,7 +102,7 @@ // create vulns for odf $templateOrig = file_get_contents($vulnTemplate); -$Serious = $High = $Medium = $Low = $Informational = ""; +$Serious = $High = $Medium = $Low = $Info = ""; foreach ($vuln as $singlevuln) { $templateSource = $templateOrig; $togo = $singlevuln['risk']; @@ -187,7 +187,7 @@ </text:list>'; $value .= $Low; } -if(!empty($Informational)){ +if(!empty($Info)){ $value .= '<text:list text:continue-numbering="true" text:style-name="Outline"> <text:list-item> <text:list> @@ -197,7 +197,7 @@ </text:list> </text:list-item> </text:list>'; - $value .= $Informational; + $value .= $Info; } // add to template $source = file_get_contents("/tmp/$rand/content.xml"); diff --git a/ReportToolz/templates/odt/blank_template_v1.1.odt b/ReportToolz/templates/odt/blank_template_v1.1.odt new file mode 100755 index 0000000..cdcac09 --- /dev/null +++ b/ReportToolz/templates/odt/blank_template_v1.1.odt Binary files differ diff --git a/ReportToolz/templates/odt/vuln_template_v0.2.xml b/ReportToolz/templates/odt/vuln_template_v0.2.xml index 3bd66d2..494758d 100644 --- a/ReportToolz/templates/odt/vuln_template_v0.2.xml +++ b/ReportToolz/templates/odt/vuln_template_v0.2.xml @@ -66,20 +66,20 @@ </text:list> </text:list-item> </text:list> -<table:table table:name="Table9" table:style-name="Table6"> - <table:table-column table:style-name="Table9.A"/> - <table:table-column table:style-name="Table9.B"/> - <table:table-column table:style-name="Table9.C"/> +<table:table table:name="Table99" table:style-name="Table6"> + <table:table-column table:style-name="Table99.A"/> + <table:table-column table:style-name="Table99.B"/> + <table:table-column table:style-name="Table99.C"/> <table:table-header-rows><table:table-row table:style-name="Table10.1"> - <table:table-cell table:style-name="Table9.A1" office:value-type="string"> + <table:table-cell table:style-name="Table99.A1" office:value-type="string"> <text:p text:style-name="Sapphire_20_Table_20_Header">Risk Level</text:p> </table:table-cell> - <table:table-cell table:style-name="Table9.C1" office:value-type="string"> + <table:table-cell table:style-name="Table99.C1" office:value-type="string"> <text:p text:style-name="Sapphire_20_Table_20_Header"> Impact </text:p> </table:table-cell> - <table:table-cell table:style-name="Table9.C1" office:value-type="string"> + <table:table-cell table:style-name="Table99.C1" office:value-type="string"> <text:p text:style-name="Sapphire_20_Table_20_Header"> <text:span >Remediation</text:span> </text:p> @@ -87,7 +87,7 @@ </table:table-row> </table:table-header-rows> <table:table-row> - <table:table-cell table:style-name="Table9.A2" office:value-type="string"> + <table:table-cell table:style-name="Table99.A2" office:value-type="string"> <text:p text:style-name="P59"> <draw:frame draw:style-name="fr5" draw:name="Image1" text:anchor-type="as-char" svg:width="0.741cm" svg:height="0.741cm" draw:z-index="40"> <draw:image xlink:href="Pictures/{risk_img}" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" loext:mime-type="image/png"/> @@ -95,12 +95,12 @@ </draw:frame> <text:s/>{risk}: {owasp}</text:p> </table:table-cell> - <table:table-cell table:style-name="Table9.B2" office:value-type="string"> + <table:table-cell table:style-name="Table99.B2" office:value-type="string"> <text:p text:style-name="P59"> <text:span >{impact}</text:span> </text:p> </table:table-cell> - <table:table-cell table:style-name="Table9.C2" office:value-type="string"> + <table:table-cell table:style-name="Table99.C2" office:value-type="string"> <text:p text:style-name="P30">{remediation}</text:p> </table:table-cell> </table:table-row>