use backslash n instead of a real new line
This commit is contained in:
parent
872d301af3
commit
360778e520
|
@ -11,8 +11,7 @@ OC_Util::checkLoggedIn();
|
||||||
OC_Util::checkAppEnabled('calendar');
|
OC_Util::checkAppEnabled('calendar');
|
||||||
$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
|
$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
|
||||||
$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
|
$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
|
||||||
$nl = '
|
$nl = "\n";
|
||||||
';
|
|
||||||
if(isset($cal)){
|
if(isset($cal)){
|
||||||
$calendar = OC_Calendar_App::getCalendar($cal);
|
$calendar = OC_Calendar_App::getCalendar($cal);
|
||||||
$calobjects = OC_Calendar_Object::all($cal);
|
$calobjects = OC_Calendar_Object::all($cal);
|
||||||
|
|
|
@ -10,6 +10,7 @@ ob_start();
|
||||||
require_once ('../../lib/base.php');
|
require_once ('../../lib/base.php');
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
OC_Util::checkAppEnabled('calendar');
|
OC_Util::checkAppEnabled('calendar');
|
||||||
|
$nl = "\n";
|
||||||
$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
|
$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
|
||||||
if(is_writable('import_tmp/')){
|
if(is_writable('import_tmp/')){
|
||||||
$progressfopen = fopen($progressfile, 'w');
|
$progressfopen = fopen($progressfile, 'w');
|
||||||
|
@ -36,8 +37,7 @@ if(is_writable('import_tmp/')){
|
||||||
}
|
}
|
||||||
$searchfor = array('VEVENT', 'VTODO', 'VJOURNAL');
|
$searchfor = array('VEVENT', 'VTODO', 'VJOURNAL');
|
||||||
$parts = $searchfor;
|
$parts = $searchfor;
|
||||||
$filearr = explode('
|
$filearr = explode($nl, $file);
|
||||||
', $file);
|
|
||||||
$inelement = false;
|
$inelement = false;
|
||||||
$parts = array();
|
$parts = array();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
@ -64,8 +64,6 @@ if(is_writable('import_tmp/')){
|
||||||
fclose($progressfopen);
|
fclose($progressfopen);
|
||||||
}
|
}
|
||||||
$start = '';
|
$start = '';
|
||||||
$nl = '
|
|
||||||
';
|
|
||||||
for ($i = 0; $i < $parts[0]['begin']; $i++) {
|
for ($i = 0; $i < $parts[0]['begin']; $i++) {
|
||||||
if($i == 0){
|
if($i == 0){
|
||||||
$start = $filearr[0];
|
$start = $filearr[0];
|
||||||
|
|
|
@ -11,8 +11,7 @@ OC_Util::checkLoggedIn();
|
||||||
OC_Util::checkAppEnabled('contacts');
|
OC_Util::checkAppEnabled('contacts');
|
||||||
$book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
|
$book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
|
||||||
$contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
|
$contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
|
||||||
$nl = '
|
$nl = "\n";
|
||||||
';
|
|
||||||
if(isset($book)){
|
if(isset($book)){
|
||||||
$addressbook = OC_Contacts_App::getAddressbook($book);
|
$addressbook = OC_Contacts_App::getAddressbook($book);
|
||||||
if($addressbook['userid'] != OC_User::getUser()){
|
if($addressbook['userid'] != OC_User::getUser()){
|
||||||
|
|
Loading…
Reference in New Issue