Merge pull request #1588 from netalertx/main

sync

Author: jokob-sk

.github/workflows/mkdocs.yml

@@ -18,14 +18,14 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install MkDocs
         run: |
           pip install \
             mkdocs==1.6.0 \
             mkdocs-material==9.5.21 \
-            mkdocs-github-admonitions-plugin==0.0.4
+            mkdocs-github-admonitions-plugin==0.1.1
 
       - name: Build MkDocs
         run: mkdocs build

front/js/settings_utils.js

@@ -789,7 +789,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
   let inputType = "text";
   let readOnly = "";
   let isMultiSelect = false;
-  let isOrdeable = false;
+  let isOrderable = false;
   let cssClasses = "";
   let placeholder = "";
   let suffix = "";
@@ -820,8 +820,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
     if (option.multiple === "true") {
       isMultiSelect = true;
     }
-    if (option.ordeable === "true") {
-      isOrdeable = true;
+    if (option.orderable === "true") {
+      isOrderable = true;
     }
     if (option.editable === "true") {
       editable = true;
@@ -877,7 +877,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
     inputType,
     readOnly,
     isMultiSelect,
-    isOrdeable,
+    isOrderable,
     cssClasses,
     placeholder,
     suffix,
@@ -1076,7 +1076,7 @@ function collectSetting(prefix, setCodeName, setType, settingsArray) {
       },
       array: () => {
           let temps = [];
-          if (opts.isOrdeable) {
+          if (opts.isOrderable) {
               temps = $(`#${setCodeName}`).val();
           } else {
               const sel = $(`#${setCodeName}`).attr("my-editable") === "true" ? "" : ":selected";
@@ -1189,7 +1189,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
       inputType,
       readOnly,
       isMultiSelect,
-      isOrdeable,
+      isOrderable,
       cssClasses,
       placeholder,
       suffix,
@@ -1225,7 +1225,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
     switch (elementType) {
       case 'select':
         const multi = isMultiSelect ? "multiple" : "";
-        const addCss = isOrdeable ? "select2 select2-hidden-accessible" : "";
+        const addCss = isOrderable ? "select2 select2-hidden-accessible" : "";
 
         inputHtml += `<select onChange="settingsChanged();${onChange}"
                               onfocusout="${focusout}"

front/lib/datatables/datatables.js

@@ -9059,6 +9059,11 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
 			// Convert response if prev dataType is non-auto and differs from current
 			} else if ( prev !== "*" && prev !== current ) {
 
+				// Mitigate possible XSS vulnerability (gh-2432)
+				if ( s.crossDomain && current === "script" ) {
+					continue;
+				}
+
 				// Seek a direct converter
 				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
 

front/multiEditCore.php

@@ -136,7 +136,7 @@ function getData(){
                     inputType,
                     readOnly,
                     isMultiSelect,
-                    isOrdeable,
+                    isOrderable,
                     cssClasses,
                     placeholder,
                     suffix,

front/php/templates/language/de_de.json

@@ -143,7 +143,7 @@
     "DevDetail_SessionTable_Duration": "Dauer",
     "DevDetail_SessionTable_IP": "IP",
     "DevDetail_SessionTable_Order": "Reihenfolge",
-    "DevDetail_Shortcut_CurrentStatus": "aktueller Status",
+    "DevDetail_Shortcut_CurrentStatus": "Status",
     "DevDetail_Shortcut_DownAlerts": "Down Meldungen",
     "DevDetail_Shortcut_Presence": "Anwesenheit",
     "DevDetail_Shortcut_Sessions": "Sitzungen",
@@ -211,7 +211,7 @@
     "Device_NextScan_In": "",
     "Device_NoData_Help": "",
     "Device_NoData_Scanning": "",
-    "Device_NoData_Title": "",
+    "Device_NoData_Title": "Noch keine Geräte gefunden",
     "Device_NoMatch_Title": "",
     "Device_Save_Failed": "",
     "Device_Save_Unauthorized": "",
@@ -239,8 +239,8 @@
     "Device_TableHead_Flapping": "",
     "Device_TableHead_GUID": "GUID",
     "Device_TableHead_Group": "Gruppe",
-    "Device_TableHead_IPv4": "",
-    "Device_TableHead_IPv6": "",
+    "Device_TableHead_IPv4": "IPv4",
+    "Device_TableHead_IPv6": "IPv6",
     "Device_TableHead_Icon": "Icon",
     "Device_TableHead_LastIP": "Letzte IP",
     "Device_TableHead_LastIPOrder": "Letzte erhaltene IP",
@@ -251,7 +251,7 @@
     "Device_TableHead_Name": "Name",
     "Device_TableHead_NetworkSite": "Netzwerkseite",
     "Device_TableHead_Owner": "Eigentümer",
-    "Device_TableHead_ParentRelType": "",
+    "Device_TableHead_ParentRelType": "Beziehungstyp",
     "Device_TableHead_Parent_MAC": "Übergeordneter Netzwerkknoten",
     "Device_TableHead_Port": "Port",
     "Device_TableHead_PresentLastScan": "Anwesenheit",
@@ -315,25 +315,25 @@
     "FakeMAC_hover": "",
     "FieldLock_Error": "",
     "FieldLock_Lock_Tooltip": "",
-    "FieldLock_Locked": "",
+    "FieldLock_Locked": "Feld gesperrt",
     "FieldLock_SaveBeforeLocking": "",
-    "FieldLock_Source_Label": "",
+    "FieldLock_Source_Label": "Quelle: ",
     "FieldLock_Unlock_Tooltip": "",
-    "FieldLock_Unlocked": "",
+    "FieldLock_Unlocked": "Feld entsperrt",
     "GRAPHQL_PORT_description": "Die Portnummer des GraphQL-Servers. Stellen Sie sicher, dass dieser Port von keiner anderen Anwendung oder NetAlertX Instanz verwendet wird.",
     "GRAPHQL_PORT_name": "GraphQL-Port",
     "Gen_Action": "Action",
     "Gen_Add": "Hinzufügen",
     "Gen_AddDevice": "Gerät hinzufügen",
     "Gen_Add_All": "Alle hinzufügen",
     "Gen_All_Devices": "Alle Geräte",
-    "Gen_Archived": "",
+    "Gen_Archived": "Archiviert",
     "Gen_AreYouSure": "Sind Sie sich sicher?",
     "Gen_Backup": "Sichern",
     "Gen_Cancel": "Abbrechen",
     "Gen_Change": "Ändern",
     "Gen_Copy": "Ausführen",
-    "Gen_CopyToClipboard": "",
+    "Gen_CopyToClipboard": "In die Zwischenablage kopieren",
     "Gen_DataUpdatedUITakesTime": "OK – Es kann einen Moment dauern, bis die Benutzeroberfläche aktualisiert wird, während ein Scan ausgeführt wird.",
     "Gen_Delete": "Löschen",
     "Gen_DeleteAll": "Alles löschen",
@@ -344,10 +344,10 @@
     "Gen_Flapping": "",
     "Gen_Generate": "Generieren",
     "Gen_InvalidMac": "Ungültige MAC-Adresse.",
-    "Gen_Invalid_Value": "",
+    "Gen_Invalid_Value": "Ein ungültiger Wert wurde eingegeben",
     "Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.",
-    "Gen_NetworkMask": "",
-    "Gen_New": "",
+    "Gen_NetworkMask": "Netzmaske",
+    "Gen_New": "Neu",
     "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
     "Gen_Online": "Online",
@@ -366,7 +366,7 @@
     "Gen_SelectToPreview": "Zur Vorschau auswählen",
     "Gen_Selected_Devices": "Ausgewählte Geräte:",
     "Gen_Sleeping": "",
-    "Gen_Subnet": "",
+    "Gen_Subnet": "Subnetz",
     "Gen_Switch": "Umschalten",
     "Gen_Upd": "Aktualisierung erfolgreich",
     "Gen_Upd_Fail": "Aktualisierung fehlgeschlagen",
@@ -878,4 +878,4 @@
     "settings_system_label": "System",
     "settings_update_item_warning": "",
     "test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen."
-}
+}

front/php/templates/language/fr_fr.json

@@ -208,7 +208,7 @@
     "Device_NoData_Help": "Si les appareils n'apparaissent pas après le scan, vérifiez vos paramètres SCAN_SUBNETS et la <a href=\"https://docs.netalertx.com/SUBNETS\" target=\"_blank\">documentation</a>.",
     "Device_NoData_Scanning": "En attente du premier scan - cela peut prendre quelques minutes après le premier paramétrage.",
     "Device_NoData_Title": "Aucun appareil trouvé pour le moment",
-    "Device_NoMatch_Title": "",
+    "Device_NoMatch_Title": "Aucun appareil ne correspond au filtre actuel",
     "Device_Save_Failed": "Erreur à l'enregistrement de l'appareil",
     "Device_Save_Unauthorized": "Non autorisé - Jeton d'API invalide",
     "Device_Saved_Success": "Appareil enregistré avec succès",
@@ -232,7 +232,7 @@
     "Device_TableHead_FQDN": "Nom de domaine FQDN",
     "Device_TableHead_Favorite": "Favori",
     "Device_TableHead_FirstSession": "Première session",
-    "Device_TableHead_Flapping": "",
+    "Device_TableHead_Flapping": "Flapping",
     "Device_TableHead_GUID": "GUID",
     "Device_TableHead_Group": "Groupe",
     "Device_TableHead_IPv4": "IPv4",
@@ -337,7 +337,7 @@
     "Gen_Down": "En panne",
     "Gen_Error": "Erreur",
     "Gen_Filter": "Filtrer",
-    "Gen_Flapping": "",
+    "Gen_Flapping": "Flapping",
     "Gen_Generate": "Générer",
     "Gen_InvalidMac": "Adresse MAC invalide.",
     "Gen_Invalid_Value": "Une valeur invalide a été renseignée",
@@ -591,8 +591,8 @@
     "PIALERT_WEB_PROTECTION_name": "Activer la connexion par login",
     "PLUGINS_KEEP_HIST_description": "Combien d'entrées de résultats de scan doivent être conservés dans l'historique des plugins (par plugin, pas par appareil).",
     "PLUGINS_KEEP_HIST_name": "Historique des plugins",
-    "PRAGMA_JOURNAL_SIZE_LIMIT_description": "",
-    "PRAGMA_JOURNAL_SIZE_LIMIT_name": "",
+    "PRAGMA_JOURNAL_SIZE_LIMIT_description": "Taille maximale du SQLite WAL (Write-Ahead Log) en Mo avant le déclenchement automatique des points de contrôle. Des valeurs basses (10-20 Mo) réduisent l'utilisation du disque/stockage mais augmentent l'utilisation du CPU durant ces scans. Des valeurs élevées (50-100 Mo) réduisent les pics CPU durant les opérations mais peuvent utiliser plus de RAM et d'espace disque. Par défaut, <code>50 Mo</code> est un compromis entre ces 2. Utilise pour les systèmes à ressources limitées comme des NAS avec des cartes SD. Redémarrer le serveur pour que le changement soit effective après avoir sauvegardé ce paramètre.",
+    "PRAGMA_JOURNAL_SIZE_LIMIT_name": "Limite de taille du WAL (Mo)",
     "Plugins_DeleteAll": "Tout supprimer (ne prend pas en compte les filtres)",
     "Plugins_Filters_Mac": "Filtrer par MAC",
     "Plugins_History": "Historique des événements",

front/php/templates/language/it_it.json

@@ -208,7 +208,7 @@
     "Device_NoData_Help": "Se i dispositivi non vengono visualizzati dopo la scansione, controlla l'impostazione SCAN_SUBNETS e la <a href=\"https://docs.netalertx.com/SUBNETS\" target=\"_blank\">documentazione</a>.",
     "Device_NoData_Scanning": "In attesa della prima scansione: potrebbero volerci diversi minuti dopo la configurazione iniziale.",
     "Device_NoData_Title": "Ancora nessun dispositivo trovato",
-    "Device_NoMatch_Title": "",
+    "Device_NoMatch_Title": "Nessun dispositivo corrisponde al filtro attuale",
     "Device_Save_Failed": "Impossibile salvare il dispositivo",
     "Device_Save_Unauthorized": "Non autorizzato: token API non valido",
     "Device_Saved_Success": "Dispositivo salvato correttamente",