From b6900bc76a2542d45315f0f0c804e08871e2971c Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Fri, 18 Oct 2024 15:08:49 +0200
Subject: [PATCH] templates

---
 options.php              |  4 ++--
 templates/cards.xsl      | 33 ++++++++++++++++-----------------
 templates/compact.xsl    | 36 +++++++++++++++++-------------------
 templates/hostsTable.xsl | 27 +++++++++++++++++----------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/options.php b/options.php
index 20a6ac4..15216b4 100755
--- a/options.php
+++ b/options.php
@@ -397,10 +397,10 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
             <label for="stylesheetSelect" title="--stylesheet">Feuille de style</label>
             <select class="ui dropdown" id="stylesheetSelect" name="--stylesheet" value="<?= $options["--stylesheet"] ?? ""?>">
 <?php
-foreach (scandir('xslt') as $filename) {
+foreach (scandir('templates') as $filename) {
   if (substr($filename, -4) === '.xsl') {
     $name = substr($filename, 0, -4);
-    $URL = htmlentities("$BASEDIR/xslt/$filename", ENT_QUOTES);
+    $URL = htmlentities("$BASEDIR/templates/$filename", ENT_QUOTES);
     if (isset($options["--stylesheet"]) && $URL == $options["--stylesheet"]) {
       echo "              <option value='$URL' selected>$name</option>\n";
     } else {
diff --git a/templates/cards.xsl b/templates/cards.xsl
index efeef24..cb2c5e7 100755
--- a/templates/cards.xsl
+++ b/templates/cards.xsl
@@ -310,8 +310,8 @@ function hostScanning(link) {
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=400">orange</xsl:when>
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=200">green</xsl:when>
                     <xsl:when test="$currentPort/state/@state='open'">green</xsl:when>
-                    <xsl:when test="$currentPort/state/@state='filtered'">orange disabled</xsl:when>
-                    <xsl:otherwise>red disabled</xsl:otherwise>
+                    <xsl:when test="$currentPort/state/@state='filtered'">orange</xsl:when>
+                    <xsl:otherwise>red</xsl:otherwise>
                 </xsl:choose>
                 <xsl:choose>
                     <xsl:when test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table"> mini dropdown button share-size</xsl:when>
@@ -327,22 +327,21 @@ function hostScanning(link) {
                     <xsl:value-of select="@portid"/>
                 </xsl:attribute>
             </xsl:if>
-            <xsl:if test="service/@name='ms-wbt-server'">
-                <xsl:attribute name="href">
-                    <xsl:text>rdp.php?v=</xsl:text>
-                    <xsl:value-of select="$hostAddress"/>
-                    <xsl:text>&amp;p=</xsl:text>
+            <xsl:attribute name="title">
+                <xsl:value-of select="@portid"/>/<xsl:value-of select="@protocol"/>
+            </xsl:attribute>
+            <xsl:choose>
+                <xsl:when test="service/@name='unknown'">
+                    <xsl:choose>
+                        <xsl:when test="@protocol='tcp'">:</xsl:when>
+                        <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
+                    </xsl:choose>
                     <xsl:value-of select="@portid"/>
-                </xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="service/@name"/>
-            <div class="detail">
-                <xsl:choose>
-                    <xsl:when test="@protocol='tcp'">:</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
-                </xsl:choose>
-                <xsl:value-of select="@portid"/>
-            </div>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="service/@name"/>
+                </xsl:otherwise>
+            </xsl:choose>
             <xsl:if test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table">
                 <xsl:attribute name="style">
                     <xsl:for-each select="$currentHost/hostscript/script[@id='smb-shares-size']/table">
diff --git a/templates/compact.xsl b/templates/compact.xsl
index fa6af4a..248b2f3 100755
--- a/templates/compact.xsl
+++ b/templates/compact.xsl
@@ -301,27 +301,11 @@ function hostScanning(link) {
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=400">orange</xsl:when>
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=200">green</xsl:when>
                     <xsl:when test="$currentPort/state/@state='open'">green</xsl:when>
-                    <xsl:when test="$currentPort/state/@state='filtered'">orange disabled</xsl:when>
-                    <xsl:otherwise>red disabled</xsl:otherwise>
+                    <xsl:when test="$currentPort/state/@state='filtered'">orange</xsl:when>
+                    <xsl:otherwise>red</xsl:otherwise>
                 </xsl:choose>
                 <xsl:if test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table"> dropdown share-size</xsl:if>
             </xsl:attribute>
-            <xsl:attribute name="title">
-                <xsl:choose>
-                    <xsl:when test="@protocol='tcp'">:</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
-                </xsl:choose>
-                <xsl:value-of select="@portid"/>
-            </xsl:attribute>
-            <xsl:if test="service/@name='ftp' or service/@name='ssh' or service/@name='http' or service/@name='https'">
-                <xsl:attribute name="href">
-                    <xsl:value-of select="service/@name"/>
-                    <xsl:text>://</xsl:text>
-                    <xsl:value-of select="$hostAddress"/>
-                    <xsl:text>:</xsl:text>
-                    <xsl:value-of select="@portid"/>
-                </xsl:attribute>
-            </xsl:if>
             <xsl:if test="service/@name='ms-wbt-server'">
                 <xsl:attribute name="href">
                     <xsl:text>rdp.php?v=</xsl:text>
@@ -330,7 +314,21 @@ function hostScanning(link) {
                     <xsl:value-of select="@portid"/>
                 </xsl:attribute>
             </xsl:if>
-            <xsl:value-of select="service/@name"/>
+            <xsl:attribute name="title">
+                <xsl:value-of select="@portid"/>/<xsl:value-of select="@protocol"/>
+            </xsl:attribute>
+            <xsl:choose>
+                <xsl:when test="service/@name='unknown'">
+                    <xsl:choose>
+                        <xsl:when test="@protocol='tcp'">:</xsl:when>
+                        <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:value-of select="@portid"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="service/@name"/>
+                </xsl:otherwise>
+            </xsl:choose>
             <xsl:if test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table">
                 <xsl:attribute name="style">
                     <xsl:for-each select="$currentHost/hostscript/script[@id='smb-shares-size']/table">
diff --git a/templates/hostsTable.xsl b/templates/hostsTable.xsl
index ca1a905..be12d27 100755
--- a/templates/hostsTable.xsl
+++ b/templates/hostsTable.xsl
@@ -330,8 +330,8 @@ function hostScanning(link) {
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=400">orange</xsl:when>
                     <xsl:when test="$currentPort/script[@id='http-info']/elem[@key='status']>=200">green</xsl:when>
                     <xsl:when test="$currentPort/state/@state='open'">green</xsl:when>
-                    <xsl:when test="$currentPort/state/@state='filtered'">orange disabled</xsl:when>
-                    <xsl:otherwise>red disabled</xsl:otherwise>
+                    <xsl:when test="$currentPort/state/@state='filtered'">orange</xsl:when>
+                    <xsl:otherwise>red</xsl:otherwise>
                 </xsl:choose>
                 <xsl:choose>
                     <xsl:when test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table"> mini dropdown button share-size</xsl:when>
@@ -355,14 +355,21 @@ function hostScanning(link) {
                     <xsl:value-of select="@portid"/>
                 </xsl:attribute>
             </xsl:if>
-            <xsl:value-of select="service/@name"/>
-            <div class="detail" style="">
-                <xsl:choose>
-                    <xsl:when test="@protocol='tcp'">:</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
-                </xsl:choose>
-                <xsl:value-of select="@portid"/>
-            </div>
+            <xsl:attribute name="title">
+                <xsl:value-of select="@portid"/>/<xsl:value-of select="@protocol"/>
+            </xsl:attribute>
+            <xsl:choose>
+                <xsl:when test="service/@name='unknown'">
+                    <xsl:choose>
+                        <xsl:when test="@protocol='tcp'">:</xsl:when>
+                        <xsl:otherwise><xsl:value-of select="substring(@protocol, 1, 1)"/>:</xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:value-of select="@portid"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="service/@name"/>
+                </xsl:otherwise>
+            </xsl:choose>
             <xsl:if test="(service/@name='microsoft-ds' or service/@name='netbios-ssn') and ../../hostscript/script[@id='smb-shares-size']/table">
                 <xsl:attribute name="style">
                     <xsl:for-each select="$currentHost/hostscript/script[@id='smb-shares-size']/table">