From b445d08ce172db2521b5c8a6a7e1ae3d795587c3 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Mon, 27 Jan 2025 18:47:38 +0100
Subject: [PATCH] outch

---
 config.php            |  8 ++++----
 index.php             | 30 ++++++++++++------------------
 scan.php              |  8 +++++++-
 templates/lanScan.xsl |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/config.php b/config.php
index c634b9c..e38b4c5 100644
--- a/config.php
+++ b/config.php
@@ -14,9 +14,9 @@ $presets = [
         '-PS'           => 'microsoft-ds',
         '-F'            => true,
         '-T'            => 5,
-        '--stylesheet'  => "lanScan.xsl",
+        '--stylesheet'  => "lanScan",
         'refreshPeriod' => 60,
-        'sudo'          => false,
+        #'sudo'          => false,
     ],
     "host" => [
         '-Pn'           => true,
@@ -24,8 +24,8 @@ $presets = [
         '-sV'           => true,
         '-T'            => 5,
         '--script'      => "http-info,smb-shares-size",
-        '--stylesheet'  => "hostScan.xsl",
+        '--stylesheet'  => "hostScan",
         'refreshPeriod' => 60,
-        'sudo'          => true,
+        #'sudo'          => true,
     ],
 ];
diff --git a/index.php b/index.php
index 4cc8488..07b9c6f 100755
--- a/index.php
+++ b/index.php
@@ -170,10 +170,7 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
           </div>
         </div>
 
-          <div class="title">
-            <i class="icon dropdown"></i>
-            Techniques de scan de ports
-          </div>
+          <div class="title"><i class="icon dropdown"></i>Techniques de scan de ports</div>
           <div class="content">
             <div class="field">
               <div class="fields">
@@ -269,10 +266,7 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
             </div>
           </div>
 
-          <div class="title">
-            <i class="icon dropdown"></i>
-            Spécifications des ports et ordre du scan
-          </div>
+          <div class="title"><i class="icon dropdown"></i>Spécifications des ports et ordre du scan</div>
           <div class="content">
           <div class="inline field">
             <div class="ui toggle checkbox" title="-sP">
@@ -586,11 +580,11 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
 foreach (scandir($TEMPLATESDIR) as $filename) {
   if (substr($filename, -4) === '.xsl') {
     $name = substr($filename, 0, -4);
-    $URL = rawurlencode($filename);
-    if (isset($options["--stylesheet"]) && $URL == $options["--stylesheet"]) {
-      echo "              <option value='$URL' selected>$name</option>\n";
+    #$URL = rawurlencode($filename);
+    if (isset($options["--stylesheet"]) && $name == $options["--stylesheet"]) {
+      echo "              <option value='$name' selected>$name</option>\n";
     } else {
-      echo "              <option value='$URL'>$name</option>\n";
+      echo "              <option value='$name'>$name</option>\n";
     }
   }
 }
@@ -599,19 +593,19 @@ foreach (scandir($TEMPLATESDIR) as $filename) {
           </div>
 
           <div class="field">
-            <label for="originalURLSelect">Comparer avec un précédent scan</label>
-            <select id="originalURLSelect" class="ui clearable dropdown" name="originalURL" value="<?= $options["originalURL"] ?? "" ?>">
+            <label for="originalSelect">Comparer avec un précédent scan</label>
+            <select id="originalSelect" class="ui clearable dropdown" name="original" value="<?= $options["original"] ?? "" ?>">
               <option value="">Précédent scan</option>
 <?php
 if (!file_exists($SCANSDIR)) mkdir($SCANSDIR);
 foreach (scandir($SCANSDIR) as $filename) {
   if (substr($filename, -4) === '.xml') {
     $name = substr($filename, 0, -4);
-    $URL = "$BASEDIR/$SCANSDIR/".rawurlencode($filename);
-    if (isset($options["originalURL"]) && $URL == $options["originalURL"]) {
-      echo "              <option value='$URL' selected>$name</option>\n";
+    #$URL = "$BASEDIR/$SCANSDIR/".rawurlencode($filename);
+    if (isset($options["original"]) && $name == $options["original"]) {
+      echo "              <option value='$name' selected>$name</option>\n";
     } else {
-      echo "              <option value='$URL'>$name</option>\n";
+      echo "              <option value='$name'>$name</option>\n";
     }
   }
 }
diff --git a/scan.php b/scan.php
index 197e013..29749f9 100755
--- a/scan.php
+++ b/scan.php
@@ -3,10 +3,16 @@
 include_once 'config.php';
 include_once 'filter_inputs.php';
 
-$options["--stylesheet"] = "$BASEDIR/$TEMPLATESDIR/${options["--stylesheet"]}?";
+$options["--stylesheet"] = "$BASEDIR/$TEMPLATESDIR/${options["--stylesheet"]}.xsl#";
 if (isset($options["name"])) {
     $options["--stylesheet"] .= "name=" . rawurlencode($options["name"]) . "&";
 }
+if (isset($options["original"])) {
+    $options["--stylesheet"] .= "original=" . rawurlencode($options["original"]) . "&";
+}
+if (isset($options["refreshPeriod"])) {
+    $options["--stylesheet"] .= "refreshPeriod={$options["refreshPeriod"]}&";
+}
 
 $args = "";
 foreach ($options as $option => $value) {
diff --git a/templates/lanScan.xsl b/templates/lanScan.xsl
index 7f0359e..5a2ad8f 100755
--- a/templates/lanScan.xsl
+++ b/templates/lanScan.xsl
@@ -16,7 +16,7 @@
     <xsl:param name="thisURL" select=""/>
     <xsl:param name="originalURL" select=""/>
     <xsl:param name="refreshPeriod" select="0"/>
-    <xsl:param name="sudo" select="false"/>
+    <xsl:param name="sudo" select="false()"/>
 
     <xsl:variable name="current" select="./nmaprun"/>
     <xsl:variable name="stylesheetURL" select="substring-before(substring-after(processing-instruction('xml-stylesheet'),'href=&quot;'), '?')"/>
@@ -51,7 +51,7 @@
                     <xsl:with-param name="sudo" select="$sudo"/>
                 </xsl:apply-templates>
 
-                <main class="ui main wide container">
+                <main class="ui main container">
                     <h1 class="ui header"><xsl:value-of select="$targets"/></h1>
 
                     <table id="scanResultsTable" style="width:100%" role="grid" class="ui sortable small table">