mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make it possible to import files using CR as eol.

This commit is contained in:
Thomas Tanghus 2012-07-08 18:28:55 +02:00
parent 747b7fbbfe
commit 197086a952
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/contacts/import.php
View File

@ -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;