Ticket #5255: vtiger-504-import-records.patch

modules/Import/ImportStep3.php

@@ -178 +178 @@
-
-$ret_value = 0;
-
+// Save the file for name for next round of import
+// http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/5255
+if(isset($_REQUEST['tmp_file'])) {
+        $_SESSION['tmp_file'] = $_REQUEST['tmp_file'];
+} else {
+        $_REQUEST['tmp_file'] = $_SESSION['tmp_file'];
+}
+// End
+
-if ($_REQUEST['source'] == 'act')
-{
-        $ret_value = parse_import_act($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
@@ -187 +196 @@
-        $ret_value = parse_import($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
-}
-
+// We should delete the data file only in the last step of import
+/* http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/5255
-if (file_exists($_REQUEST['tmp_file']))
-{
-        unlink($_REQUEST['tmp_file']);
-}
+*/
-
-$datarows = $ret_value['rows'];
-

modules/Import/ImportSteplast.php

@@ -56 +56 @@
-        $_REQUEST['return_action'] = '';
-}
-
+// Delete data file used for import
+// http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/5255
+if(isset($_REQUEST['tmp_file'])) {
+        $tmp_file = $_REQUEST['tmp_file'];
+} else if(isset($_SESSION['tmp_file'])) {
+        $tmp_file = $_SESSION['tmp_file'];
+}
+if(isset($tmp_file) && file_exists($tmp_file)) unlink($tmp_file);
+// End
+
+
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";