From 4b9117dcb48590471bda9166f7781e0e3e9f222f Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Fri, 10 Feb 2023 20:20:26 +1100
Subject: [PATCH] Fix CSV import #175

---
 front/php/server/devices.php | 50 +++++++++++++++++++-----------------
 front/php/server/init.php    |  1 +
 front/php/server/util.php    |  5 +---
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index b5e39878..a78ac697 100755
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -11,10 +11,11 @@
   // External files
   require dirname(__FILE__).'/init.php';
 
-//------------------------------------------------------------------------------
-//  Action selector
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
+  //  Action selector
+  //------------------------------------------------------------------------------
   // Set maximum execution time to 15 seconds
+
   ini_set ('max_execution_time','30');
 
   // Action functions
@@ -478,34 +479,35 @@ function ImportCSV() {
 
     // sql
     $sql = 'DELETE FROM Devices';
+
     // execute sql
     $result = $db->query($sql);    
 
-    // Open the CSV file with read-only mode
-    $csvFile = fopen($file, 'r');
-
-    // Skip the first line
-    fgetcsv($csvFile);
+    $data = file_get_contents($file); 
+    $data = explode("\n", $data); 
 
     $columns = getDevicesColumns();
 
-    // Parse data from CSV file line by line (max 10000 lines)
-    while (($row = fgetcsv($csvFile, 10000, ",")) !== FALSE)
+    $rowArray = array();
+
+    // Parse data from CSV file line by line (max 10000 lines)    
+    foreach($data as $row)
     {
-      $sql = 'INSERT INTO Devices ('.implode(',', $columns).') VALUES ("' .implode('","', $row).'")';
-
-      $result = $db->query($sql);
-
-      // check result
-      if ($result != TRUE) {
-        $error = $db->lastErrorMsg();
-        // break the while loop on error
-        break;
-      } 
+      // Check if not empty and skipping first line
+      if(count(explode(',',$row)) == count($columns) && explode(',',$row)[0] != "\"dev_MAC\"")
+      {
+        $sql = "INSERT INTO Devices (".implode(',', $columns).") VALUES (" . $row.")";         
+        $result = $db->query($sql);
+        
+        // check result
+        if ($result != TRUE) {
+          $error = $db->lastErrorMsg();
+          // break the while loop on error
+          break;
+        } 
+      }
+      
     }
-
-    // Close opened CSV file
-    fclose($csvFile);
    
     if($error == "")
     {
@@ -515,7 +517,7 @@ function ImportCSV() {
     }
     else{
       // an error occurred while writing to the DB, display the last error message 
-      echo lang('BackDevices_DBTools_ImportCSVError')."\n\n$sql \n\n".$error;
+      echo lang('BackDevices_DBTools_ImportCSVError')."\n\n$sql \n\n".$result;
     }
     
    } else {
diff --git a/front/php/server/init.php b/front/php/server/init.php
index 9af4ab70..376875f4 100755
--- a/front/php/server/init.php
+++ b/front/php/server/init.php
@@ -3,3 +3,4 @@ require dirname(__FILE__).'/../templates/timezone.php';
 require dirname(__FILE__).'/db.php';
 require dirname(__FILE__).'/util.php';
 require dirname(__FILE__).'/../templates/language/lang.php';
+?>
diff --git a/front/php/server/util.php b/front/php/server/util.php
index fdd4f0e5..145f27ba 100755
--- a/front/php/server/util.php
+++ b/front/php/server/util.php
@@ -35,7 +35,6 @@ elseif ($FUNCTION  == 'cleanLog')
   cleanLog($SETTINGS);
 }
 
-
 //------------------------------------------------------------------------------
 // Formatting data functions
 //------------------------------------------------------------------------------
@@ -426,6 +425,4 @@ function setCache($key, $value, $expireMinutes = 5) {
 }
 
 
-?>
-
-
+?>
\ No newline at end of file