⬇CSV Import work #808

front/js/common.js

@@ -342,6 +342,8 @@ function getLangCode() {
 // -----------------------------------------------------------------------------
 // String utilities
 // -----------------------------------------------------------------------------
+
+// ----------------------------------------------------
 function jsonSyntaxHighlight(json) {
   if (typeof json != 'string') {
        json = JSON.stringify(json, undefined, 2);
@@ -364,6 +366,7 @@ function jsonSyntaxHighlight(json) {
   });
 }
 
+// ----------------------------------------------------
 function isValidBase64(str) {
   // Base64 characters set
   var base64CharacterSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -373,7 +376,7 @@ function isValidBase64(str) {
   return invalidCharacters === '';
 }
 
-
+// ----------------------------------------------------
 function isValidJSON(jsonString) {
   try {
       JSON.parse(jsonString);
@@ -383,6 +386,7 @@ function isValidJSON(jsonString) {
   }
 }
 
+// ----------------------------------------------------
 // method to sanitize input so that HTML and other things don't break
 function encodeSpecialChars(str) {
   return str
@@ -392,7 +396,7 @@ function encodeSpecialChars(str) {
       .replace(/"/g, '"')
       .replace(/'/g, ''');
 }
-
+// ----------------------------------------------------
 function decodeSpecialChars(str) {
   return str
       .replace(/&/g, '&')
@@ -402,6 +406,16 @@ function decodeSpecialChars(str) {
       .replace(/'/g, '\'');
 }
 
+// ----------------------------------------------------
+// base64 conversion of UTF8 chars
+function utf8ToBase64(str) {
+  // Convert the string to a Uint8Array using TextEncoder
+  const utf8Bytes = new TextEncoder().encode(str);
+  
+  // Convert the Uint8Array to a base64-encoded string
+  return btoa(String.fromCharCode(...utf8Bytes));
+}
+
 
 // -----------------------------------------------------------------------------
 // General utilities

front/maintenance.php

@@ -473,12 +473,15 @@ function askImportPastedCSV() {
 function ImportPastedCSV()
 {   
   var csv = $('#modal-input-textarea').val();
-  csvBase64 = btoa(csv)
-  // Execute
+
+  csvBase64 = utf8ToBase64(csv);   
+
   $.post('php/server/devices.php?action=ImportCSV', { content: csvBase64 }, function(msg) {
-    showMessage(msg);
-    write_notification(`[Maintenance] Devices imported from pasted content`, 'info');
+      showMessage(msg);
+      write_notification(`[Maintenance] Devices imported from pasted content`, 'info');
   });
+
+
 }
 
 

front/php/server/devices.php

@@ -476,7 +476,11 @@ function ImportCSV() {
   if(isset ($_POST['content']) && !empty ($_POST['content']))
   {
     // Decode the Base64 string
-    $data = base64_decode($_POST['content']);
+    // $data = base64_decode($_POST['content']);
+    $data = base64_decode($_POST['content'], true);  // The second parameter ensures safe decoding
+
+    // // Ensure the decoded data is treated as UTF-8 text
+    // $data = mb_convert_encoding($data, 'UTF-8', 'UTF-8');
 
   } else if (file_exists($file)) { // try to get the data form the file
 
@@ -488,6 +492,12 @@ function ImportCSV() {
 
   if($data != "")
   {
+    // data cleanup - new lines breaking the CSV
+    $data = preg_replace_callback('/"([^"]*)"/', function($matches) {
+      // Replace all \n within the quotes with a space
+      return str_replace("\n", " ", $matches[0]); // Replace with a space
+    }, $data);
+
     $lines = explode("\n", $data); 
 
     // Get the column headers from the first line of the CSV

front/php/templates/security.php

@@ -25,7 +25,7 @@ $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https:
 $url = $protocol . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
 $isLogonPage = strpos($url, 'index.php') !== false;
 $authHeader = apache_request_headers()['Authorization'] ?? '';
-$sessionLogin = $_SESSION['login'] ?? 0;
+$sessionLogin = isset($_SESSION['login']) ? $_SESSION['login'] : 0;
 
 // Start session if not already started
 if (session_status() == PHP_SESSION_NONE) {