diff --git a/apps/calendar/export.php b/apps/calendar/export.php index ce36116c4c..9886ad8e8c 100644 --- a/apps/calendar/export.php +++ b/apps/calendar/export.php @@ -11,8 +11,7 @@ OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL; $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL; -$nl = ' -'; +$nl = "\n"; if(isset($cal)){ $calendar = OC_Calendar_App::getCalendar($cal); $calobjects = OC_Calendar_Object::all($cal); diff --git a/apps/calendar/import.php b/apps/calendar/import.php index d1186e691e..b1c6f91df8 100644 --- a/apps/calendar/import.php +++ b/apps/calendar/import.php @@ -10,6 +10,7 @@ ob_start(); require_once ('../../lib/base.php'); OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); +$nl = "\n"; $progressfile = 'import_tmp/' . md5(session_id()) . '.txt'; if(is_writable('import_tmp/')){ $progressfopen = fopen($progressfile, 'w'); @@ -36,8 +37,7 @@ if(is_writable('import_tmp/')){ } $searchfor = array('VEVENT', 'VTODO', 'VJOURNAL'); $parts = $searchfor; -$filearr = explode(' -', $file); +$filearr = explode($nl, $file); $inelement = false; $parts = array(); $i = 0; @@ -64,8 +64,6 @@ if(is_writable('import_tmp/')){ fclose($progressfopen); } $start = ''; -$nl = ' -'; for ($i = 0; $i < $parts[0]['begin']; $i++) { if($i == 0){ $start = $filearr[0]; diff --git a/apps/contacts/export.php b/apps/contacts/export.php index d17b5e5514..fc2aa86500 100644 --- a/apps/contacts/export.php +++ b/apps/contacts/export.php @@ -11,8 +11,7 @@ OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('contacts'); $book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL; $contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL; -$nl = ' -'; +$nl = "\n"; if(isset($book)){ $addressbook = OC_Contacts_App::getAddressbook($book); if($addressbook['userid'] != OC_User::getUser()){