Make it possible to import files using CR as eol.
This commit is contained in:
parent
747b7fbbfe
commit
197086a952
|
@ -10,6 +10,9 @@ ob_start();
|
|||
|
||||
OCP\JSON::checkLoggedIn();
|
||||
OCP\App::checkAppEnabled('contacts');
|
||||
session_write_close();
|
||||
|
||||
$cr = "\r";
|
||||
$nl = "\n";
|
||||
$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
|
||||
|
||||
|
@ -52,6 +55,10 @@ writeProgress('20');
|
|||
$searchfor = array('VCARD');
|
||||
$parts = $searchfor;
|
||||
$filearr = explode($nl, $file);
|
||||
if(count($filearr) == 1) { // Mac eol
|
||||
$filearr = explode($cr, $file);
|
||||
}
|
||||
|
||||
$inelement = false;
|
||||
$parts = array();
|
||||
$i = 0;
|
||||
|
|
Loading…
Reference in New Issue