fix merge conflicts

diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
index 380db6a9437c46aae0ecc2546459d31c48f8bda5..e31908beb14c28d8ef5c9be678d52f78acdac9e7 100644 (file)
--- a/apps/calendar/ajax/calendar/activation.php
+++ b/apps/calendar/ajax/calendar/activation.php
@@ -20,4 +20,4 @@ $calendar = OC_Calendar_App::getCalendar($calendarid);
 OCP\JSON::success(array(
        'active' => $calendar['active'],
        'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
index 9e092f2df1d931d9c4cd9d32bb21db3460c8a412..4d6706f60028e8ef90dcb55c407f8e19f447e6df 100644 (file)
--- a/apps/calendar/ajax/calendar/delete.php
+++ b/apps/calendar/ajax/calendar/delete.php
@@ -21,5 +21,4 @@ if($del == true){
        OCP\JSON::success();
 }else{
        OCP\JSON::error(array('error'=>'dberror'));
-}
-?> 
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
index 77366809311ced6709508d3b0f0372eaccf2fc16..ae056a524bd817db0da8419e20c448a20b7ad9e4 100644 (file)
--- a/apps/calendar/ajax/calendar/edit.form.php
+++ b/apps/calendar/ajax/calendar/edit.form.php
@@ -17,4 +17,3 @@ $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
 $tmpl->printPage();
-?>

diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
index 516c9f6c765c81237ad0265720708e70d346bea8..82f18fe7f44a3dfb60e2e8b4df8d8ef0a30758c2 100644 (file)
--- a/apps/calendar/ajax/calendar/edit.php
+++ b/apps/calendar/ajax/calendar/edit.php
@@ -20,5 +20,4 @@ $tmpl = new OCP\Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
index ee46757f56b24325e65bc45dd535e6cbc0215abc..0783b6168f81c7255048cf416f5c67a4021be98f 100644 (file)
--- a/apps/calendar/ajax/calendar/new.form.php
+++ b/apps/calendar/ajax/calendar/new.form.php
@@ -19,5 +19,4 @@ $tmpl = new OCP\Template('calendar', 'part.editcalendar');
 $tmpl->assign('new', true);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
index 76dbef6b9df16fc02f286ab5b73b20e3cc195732..278c8e5520bb99d40b567b740e8942b37ee21ae1 100644 (file)
--- a/apps/calendar/ajax/calendar/new.php
+++ b/apps/calendar/ajax/calendar/new.php
@@ -34,4 +34,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
        'page' => $tmpl->fetchPage(),
        'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
index 96312537507caf41410b6c7cd5e791d427cb96a4..9d43364ffbf10df0000cb7ec20d6254547486e66 100644 (file)
--- a/apps/calendar/ajax/calendar/overview.php
+++ b/apps/calendar/ajax/calendar/overview.php
@@ -11,5 +11,4 @@ $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $output = new OCP\Template("calendar", "part.choosecalendar");
-$output -> printpage();
-?>
+$output -> printpage();
\ No newline at end of file

diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
index dce0027304aba8086bb16b80c1162ac205dc3bcb..5cf63d396f7253a48229f1b6902886f7c2c00f26 100644 (file)
--- a/apps/calendar/ajax/calendar/update.php
+++ b/apps/calendar/ajax/calendar/update.php
@@ -39,4 +39,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
        'page' => $tmpl->fetchPage(),
        'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));
\ No newline at end of file

diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
index 93e8c50954a2733fbc37ebc5347a0cf738367504..f0060cb23b29e65b66ea58c0caf8ccc0e91d3ff7 100644 (file)
--- a/apps/calendar/ajax/categories/rescan.php
+++ b/apps/calendar/ajax/categories/rescan.php
@@ -39,4 +39,4 @@ if(count($events) == 0) {
 OC_Calendar_App::scanCategories($events);
 $categories = OC_Calendar_App::getCategoryOptions();
 
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
+OCP\JSON::success(array('data' => array('categories'=>$categories)));
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
index cb30621af4d4c2d3defb8c7564ef25b161125dd1..f183d431afaddad95a33a8b272467263b5d31bef 100644 (file)
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -17,4 +17,4 @@ if($access != 'owner' && $access != 'rw'){
        exit;
 }
 $result = OC_Calendar_Object::delete($id);
-OCP\JSON::success();
+OCP\JSON::success();
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
index e615fb093de018035cbf12b2c603c034a6de856c..1c3babc3d90909ed0bde5fe43f98ab9da4b5ab32 100644 (file)
--- a/apps/calendar/ajax/event/edit.php
+++ b/apps/calendar/ajax/event/edit.php
@@ -42,5 +42,4 @@ if($errarr){
                OC_Calendar_Object::moveToCalendar($id, $cal);
        }
        OCP\JSON::success();
-}
-?>
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
index 8added69143b6a85c1064e2f862f074f074c29b5..04cf2fb0513065d65a2c07fcf659e31e01a91105 100644 (file)
--- a/apps/calendar/ajax/event/move.php
+++ b/apps/calendar/ajax/event/move.php
@@ -43,4 +43,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
index 91b85fff07f25dc0696e3cb81b58fd5abd8335ff..0b19e7e92f96495b90588cb148a2ce77538b750b 100644 (file)
--- a/apps/calendar/ajax/event/new.form.php
+++ b/apps/calendar/ajax/event/new.form.php
@@ -72,4 +72,4 @@ $tmpl->assign('repeat_count', '10');
 $tmpl->assign('repeat_weekofmonth', 'auto');
 $tmpl->assign('repeat_date', '');
 $tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
+$tmpl->printpage();
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
index 72d57be03bfb204a7d8b912b25dea94467d01192..30e2b0cae36f428df2cc01472c810eb0dd994c3c 100644 (file)
--- a/apps/calendar/ajax/event/new.php
+++ b/apps/calendar/ajax/event/new.php
@@ -21,5 +21,4 @@ if($errarr){
        $vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
        $result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
        OCP\JSON::success();
-}
-?>
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
index 0dc0a5fca7f800d7aca138fedb55a814921d2473..56b83205e851522e8238e61b151b2a4565a0749f 100644 (file)
--- a/apps/calendar/ajax/event/resize.php
+++ b/apps/calendar/ajax/event/resize.php
@@ -35,4 +35,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file

diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
index 3be02d2a6dbf32b907ac82045b448c8a7e744391..b99c32278c46c3c02f0f3c131966e1fff574935a 100644 (file)
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -12,5 +12,4 @@ OCP\App::checkAppEnabled('calendar');
 $tmpl = new OCP\Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
-?>
+$tmpl->printpage();
\ No newline at end of file

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 202af1eb46e02e3026eb8b929876ebf1d75a9cc5..18e93e67b4aed11a83356ea725ff2b48687e2e5a 100644 (file)
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -126,4 +126,4 @@ sleep(3);
 if(is_writable('import_tmp/')){
        unlink($progressfile);
 }
-OCP\JSON::success();
+OCP\JSON::success();
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
index 23b71bba043b3b150fdd4acfb6eed31247aa7b46..bc995f7d6e8ed0488e6242af88f6990ca23eb00a 100644 (file)
--- a/apps/calendar/ajax/settings/getfirstday.php
+++ b/apps/calendar/ajax/settings/getfirstday.php
@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
-OCP\JSON::encodedPrint(array('firstday' => $firstday));
-?> 
+OCP\JSON::encodedPrint(array('firstday' => $firstday));
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
index 13092777b78bdf54c9dc92850dfbb4a4b6dd7b2a..11c74631d4464e67cdcbe5326817e5bf56aa5d93 100644 (file)
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -24,4 +24,3 @@ if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timez
 OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
 $message = array('message'=> $l->t('New Timezone:') . $timezone);
 OCP\JSON::success($message);
-?>
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
index 373eeee796838ad8f1cebba4de35461d67dd737d..056a60375247cd22a0734718b5dba5de9d4e56cb 100644 (file)
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ b/apps/calendar/ajax/settings/setfirstday.php
@@ -12,6 +12,4 @@ if(isset($_POST["firstday"])){
        OCP\JSON::success();
 }else{
        OCP\JSON::error();
-}
-?> 
- 
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
index eae7be54e80ed2740b3b044f26bb866061fbd27e..8e95f6f3bf53142ca853d7b5ee7ab303e812b51f 100644 (file)
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ b/apps/calendar/ajax/settings/settimeformat.php
@@ -12,6 +12,4 @@ if(isset($_POST["timeformat"])){
        OCP\JSON::success();
 }else{
        OCP\JSON::error();
-}
-?> 
- 
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
index d2797a08aae6525769183050982926dcfec939f3..6d029a6643a506f9a8a71d799e061f587452f3a5 100644 (file)
--- a/apps/calendar/ajax/settings/settimezone.php
+++ b/apps/calendar/ajax/settings/settimezone.php
@@ -22,6 +22,4 @@ if( isset( $_POST['timezone'] ) ){
        OCP\JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
 }else{
        OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
-
-?>
+}
\ No newline at end of file

diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php
index 809164e870a50b5788fd9bbbf4a2c02eece349f2..eebb687dfac2be15d31d0caa495155d4b8be772a 100644 (file)
--- a/apps/calendar/ajax/settings/timeformat.php
+++ b/apps/calendar/ajax/settings/timeformat.php
@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
-OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
-?> 
+OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
\ No newline at end of file