From 894acdf996b576ede60e2d81eed09daee4d19710 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Wed, 19 Feb 2025 10:21:19 +0100
Subject: [PATCH] msprc

---
 config.php                  |  2 +-
 scan.php                    |  2 +-
 stylesheets/hostDetails.xsl |  4 ++--
 stylesheets/lanTable.xsl    |  7 ++++---
 stylesheets/lib/toast.xsl   | 18 ++++++++----------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/config.php b/config.php
index b5cdd06..bcc0caa 100644
--- a/config.php
+++ b/config.php
@@ -15,7 +15,7 @@ $PRESETS           = [
     "lanScan" => [
         "-PS"          => "microsoft-ds",
         "-F"           => true,
-        "-T"           => 5,
+        "-T"           => 4,
         "--script"     => "http-info,smb-shares-size",
         "--stylesheet" => "lanTable.xsl",
     ],
diff --git a/scan.php b/scan.php
index 8cd4111..d22e4cc 100644
--- a/scan.php
+++ b/scan.php
@@ -112,7 +112,7 @@ if ($preset && isset($PRESETS[$preset])) {
     ], false);
 }
 
-$inputs['--stylesheet'] = "$BASEDIR/$STYLESHEETSDIR/{$inputs['--stylesheet']}?";
+$inputs['--stylesheet'] = "$STYLESHEETSDIR/{$inputs['--stylesheet']}?";
 if ($name) $inputs['--stylesheet'] .= "name=$name";
 
 $options = "";
diff --git a/stylesheets/hostDetails.xsl b/stylesheets/hostDetails.xsl
index 2a4536e..c5ddf20 100644
--- a/stylesheets/hostDetails.xsl
+++ b/stylesheets/hostDetails.xsl
@@ -249,11 +249,11 @@ $('.ui.dropdown').dropdown()
         </div>
       </div>
     </div>
-    <xsl:if test="service/@name='ftp' or service/@name='ssh' or service/@name='http' or service/@name='https' or service/@name='ms-wbt-server'">
+    <xsl:if test="service/@name='ftp' or service/@name='ssh' or service/@name='http' or service/@name='https' or service/@name='ms-wbt-server' or service/@name='msrpc'">
       <a class="ui {$color} button" target="_blank">
         <xsl:attribute name="href">
           <xsl:choose>
-            <xsl:when test="service/@name='ms-wbt-server'">
+            <xsl:when test="service/@name='ms-wbt-server' or service/@name='msrpc'">
               <xsl:text>rdp.php?v=</xsl:text>
               <xsl:value-of select="$hostAddress" />
               <xsl:text>&amp;p=</xsl:text>
diff --git a/stylesheets/lanTable.xsl b/stylesheets/lanTable.xsl
index d450bc2..5643bd5 100644
--- a/stylesheets/lanTable.xsl
+++ b/stylesheets/lanTable.xsl
@@ -249,7 +249,7 @@ $('.ui.dropdown').dropdown()
         <xsl:value-of select="@portid" />
       </xsl:attribute>
     </xsl:if>
-    <xsl:if test="service/@name='ms-wbt-server'">
+    <xsl:if test="service/@name='ms-wbt-server' or service/@name='msrpc'">
       <xsl:attribute name="href">
         <xsl:text>rdp.php?v=</xsl:text>
         <xsl:value-of select="$hostAddress" />
@@ -259,7 +259,7 @@ $('.ui.dropdown').dropdown()
     </xsl:if>
     <xsl:attribute name="title">
       <xsl:value-of select="@protocol" />
-:      <xsl:value-of select="@portid" />
+      <xsl:text>:</xsl:text><xsl:value-of select="@portid" />
     </xsl:attribute>
     <xsl:choose>
       <xsl:when test="service/@name='unknown'">
@@ -267,7 +267,8 @@ $('.ui.dropdown').dropdown()
           <xsl:when test="@protocol='tcp'">:</xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="substring(@protocol, 1, 1)" />
-:</xsl:otherwise>
+            <xsl:text>:</xsl:text>
+          </xsl:otherwise>
         </xsl:choose>
         <xsl:value-of select="@portid" />
       </xsl:when>
diff --git a/stylesheets/lib/toast.xsl b/stylesheets/lib/toast.xsl
index d8ed49a..d5ce0b8 100644
--- a/stylesheets/lib/toast.xsl
+++ b/stylesheets/lib/toast.xsl
@@ -1,13 +1,11 @@
 <?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"
-    version="1.1">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.1">
 
     <xsl:template match="runstats">
         <xsl:param name="init"/>
         <script>
-            <xsl:if test="$init/runstats/finished">
+            <xsl:if test="$init/runstats/finished and (finished/@timestr != $init/runstats/finished/@timestr)">
 $.toast({
     message    : 'Comparaison avec les résultats du ' + new Date("<xsl:value-of select="$init/runstats/finished/@timestr"/>").toLocaleString(),
     class      : 'info',
@@ -26,8 +24,8 @@ $.toast({
     closeIcon  : true,
     position   : 'bottom left',
 })
-            </xsl:if>
-            <xsl:if test="finished/@errormsg">
+        </xsl:if>
+        <xsl:if test="finished/@errormsg">
 $.toast({
     title      : '<xsl:value-of select="finished/@exit"/>',
     message    : `<xsl:value-of select="finished/@errormsg"/>`,
@@ -37,8 +35,8 @@ $.toast({
     closeIcon  : true,
     position   : 'bottom left',
 })
-            </xsl:if>
-        </script>
-    </xsl:template>
+    </xsl:if>
+</script>
+</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file