Merge branch 'master' into calendar_export

apps/calendar/ajax/calendar/delete.php

@@ -22,4 +22,3 @@ if($del == true){
 }else{
 	OCP\JSON::error(array('error'=>'dberror'));
 }
-?> 

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();
-?>

apps/calendar/ajax/calendar/edit.php

@@ -21,4 +21,3 @@ $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
 $tmpl->printPage();
-?>

apps/calendar/ajax/calendar/new.form.php

@@ -20,4 +20,3 @@ $tmpl->assign('new', true);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
 $tmpl->printPage();
-?>

apps/calendar/ajax/calendar/overview.php

@@ -12,4 +12,3 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $output = new OCP\Template("calendar", "part.choosecalendar");
 $output -> printpage();
-?>

apps/calendar/ajax/event/edit.php

@@ -43,4 +43,3 @@ if($errarr){
 	}
 	OCP\JSON::success();
 }
-?>

apps/calendar/ajax/event/new.php

@@ -22,4 +22,3 @@ if($errarr){
 	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
 	OCP\JSON::success();
 }
-?>

apps/calendar/ajax/import/dialog.php

@@ -13,4 +13,3 @@ $tmpl = new OCP\Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
-?>

apps/calendar/ajax/import/dropimport.php

@@ -71,4 +71,3 @@ foreach($uids as $uid) {
 	}
 }
 OCP\JSON::success();
-?>

apps/calendar/ajax/settings/getfirstday.php

@@ -9,4 +9,3 @@
 OCP\JSON::checkLoggedIn();
 $firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
 OCP\JSON::encodedPrint(array('firstday' => $firstday));
-?> 

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

apps/calendar/ajax/settings/setfirstday.php

@@ -13,5 +13,3 @@ if(isset($_POST["firstday"])){
 }else{
 	OCP\JSON::error();
 }
-?> 
- 

apps/calendar/ajax/settings/settimeformat.php

@@ -13,5 +13,3 @@ if(isset($_POST["timeformat"])){
 }else{
 	OCP\JSON::error();
 }
-?> 
- 

apps/calendar/ajax/settings/settimezone.php

@@ -23,5 +23,3 @@ if( isset( $_POST['timezone'] ) ){
 }else{
 	OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
 }
-
-?>

apps/calendar/ajax/settings/timeformat.php

@@ -9,4 +9,3 @@
 OCP\JSON::checkLoggedIn();
 $timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
 OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
-?>