From f4b595ee3fe6698d8154a89ca7bf57ad3e66277f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 28 Oct 2009 16:34:05 +0000
Subject: [PATCH] Fix: Import of MAC files
---
htdocs/includes/modules/import/import_csv.modules.php | 2 ++
htdocs/includes/modules/modImport.class.php | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php
index 6b52d62522f..400b7470691 100644
--- a/htdocs/includes/modules/import/import_csv.modules.php
+++ b/htdocs/includes/modules/import/import_csv.modules.php
@@ -168,6 +168,8 @@ class ImportCsv extends ModeleImports
dol_syslog("ImportCsv::open_file file=".$file);
+ ini_set('auto_detect_line_endings',1); // For MAC compatibility
+
$newfile=utf8_check($file)?utf8_decode($file):$file; // fopen need ISO file name
$this->handle = fopen($newfile, "r");
if (! $this->handle)
diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php
index 017dc3764c1..c51f843d582 100644
--- a/htdocs/includes/modules/modImport.class.php
+++ b/htdocs/includes/modules/modImport.class.php
@@ -65,7 +65,7 @@ class modImport extends DolibarrModules
// D�pendances
$this->depends = array();
$this->requiredby = array();
- $this->phpmin = array(4,2,0);
+ $this->phpmin = array(4,3,0); // Need auto_detect_line_endings php option to solve MAC pbs.
$this->phpmax = array();
$this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module
$this->need_javascript_ajax = 1;
--
GitLab