use backslash n instead of a real new line

This commit is contained in:
Georg Ehrke 2012-01-15 00:55:02 +01:00
parent 872d301af3
commit 360778e520
3 changed files with 4 additions and 8 deletions

View File

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

View File

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

View File

@ -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()){