* [FIX] Fixed issue when importing accounts from CSV file, the passwo…

…rd wasn't encrypted. Solves #373
nuxsmin · Jan 19, 2017 · bbe68a1 · bbe68a1
1 parent fba9b9c
commit bbe68a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 32 deletions.
diff --git a/inc/SP/Import/CsvImportBase.class.php b/inc/SP/Import/CsvImportBase.class.php
@@ -82,7 +82,7 @@ protected function processAccounts()
 
         foreach ($this->file->getFileContent() as $data) {
             $line++;
-            $fields = str_getcsv($data, $this->ImportParams->getCsvDelimiter());
+            $fields = str_getcsv($data, $this->ImportParams->getCsvDelimiter(), '"');
             $numfields = count($fields);
 
             // Comprobar el número de campos de la línea
@@ -94,13 +94,6 @@ protected function processAccounts()
                 );
             }
 
-            // Eliminar las " del principio/fin de los campos
-//            array_walk($fields,
-//                function (&$value, $key) {
-//                    $value = trim($value, '"');
-//                }
-//            );
-
             // Asignar los valores del array a variables
             list($accountName, $customerName, $categoryName, $url, $login, $password, $notes) = $fields;
 

diff --git a/js/app-main.js b/js/app-main.js
@@ -322,23 +322,19 @@ sysPass.Main = function () {
 
     // Función para habilitar la subida de archivos en una zona o formulario
     var fileUpload = function ($obj) {
-        var requestData = function () {
-            return {
-                actionId: $obj.data("action-id"),
-                itemId: $obj.data("item-id"),
-                sk: sk.get()
-            };
+        var requestData = {
+            actionId: $obj.data("action-id"),
+            itemId: $obj.data("item-id"),
+            sk: sk.get()
         };
 
         var options = {
             requestDoneAction: "",
             setRequestData: function (data) {
-                var req = requestData();
-
-                $.extend(req, data);
+                $.extend(requestData, data);
             },
             getRequestData: function () {
-                return requestData();
+                return requestData;
             },
             beforeSendAction: "",
             url: ""
@@ -355,10 +351,10 @@ sysPass.Main = function () {
             fd.append("inFile", file);
             fd.append("isAjax", 1);
 
-            var req = requestData();
+            requestData.sk = sk.get();
 
-            Object.keys(req).forEach(function (key) {
-                fd.append(key, req[key]);
+            Object.keys(requestData).forEach(function (key) {
+                fd.append(key, requestData[key]);
             });
 
             var opts = appRequests.getRequestOpts();
@@ -367,7 +363,7 @@ sysPass.Main = function () {
             opts.contentType = false;
             opts.data = fd;
 
-            appRequests.getActionPromise(opts, function (json) {
+            appRequests.getActionCall(opts, function (json) {
                 var status = json.status;
                 var description = json.description;
 

diff --git a/js/app-main.min.js b/js/app-main.min.js