diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
deleted file mode 100644
index ada2e44547bcf6ca46ac987c5e86c9d980d45955..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/activation.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once ("../../../lib/base.php");
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$calendarid = $_POST['calendarid'];
-$calendar = OC_Calendar_App::getCalendar($calendarid);//access check
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$calendar = OC_Calendar_App::getCalendar($calendarid);
-OC_JSON::success(array(
-	'active' => $calendar['active'],
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/choosecalendar.php b/apps/calendar/ajax/choosecalendar.php
deleted file mode 100644
index 9281c8edbdcf5b1160be02998a2c7b7209cbe1e0..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/choosecalendar.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-$l10n = new OC_L10N('calendar');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$output = new OC_TEMPLATE("calendar", "part.choosecalendar");
-$output -> printpage();
-?>
diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
deleted file mode 100644
index 8d7b12f9b89550b60be9cd8c7d11403b09eb8b24..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/createcalendar.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-if(trim($_POST['name']) == ''){
-	OC_JSON::error(array('message'=>'empty'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name']){
-		OC_JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$userid = OC_User::getUser();
-$calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
-OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
-
-$calendar = OC_Calendar_Calendar::find($calendarid);
-$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-OC_JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/deletecalendar.php b/apps/calendar/ajax/deletecalendar.php
deleted file mode 100644
index 901cbbfcb08e95de7e1908e134a64ecf9b58a12a..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/deletecalendar.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$cal = $_POST["calendarid"];
-$calendar = OC_Calendar_App::getCalendar($cal);
-$del = OC_Calendar_Calendar::deleteCalendar($cal);
-if($del == true){
-	OC_JSON::success();
-}else{
-	OC_JSON::error(array('error'=>'dberror'));
-}
-?> 
diff --git a/apps/calendar/ajax/deleteevent.php b/apps/calendar/ajax/deleteevent.php
deleted file mode 100644
index b25a5af1a291921659db3b3a78a6d87918b44a9c..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/deleteevent.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-
-$l10n = new OC_L10N('calendar');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$id = $_POST['id'];
-$event_object = OC_Calendar_App::getEventObject($id);
-$result = OC_Calendar_Object::delete($id);
-OC_JSON::success();
-?> 
diff --git a/apps/calendar/ajax/editcalendar.php b/apps/calendar/ajax/editcalendar.php
deleted file mode 100644
index 7aeb5bbe30557223e49a0fccc461a15ad8c0c713..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/editcalendar.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
-$tmpl = new OC_Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
deleted file mode 100644
index 5a487da17588ff369ab380badfe8dd5921df627c..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/editevent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OC_JSON::error($errarr);
-	exit;
-}else{
-	$id = $_POST['id'];
-	$cal = $_POST['calendar'];
-	$data = OC_Calendar_App::getEventObject($id);
-	$vcalendar = OC_VObject::parse($data['calendardata']);
-
-	OC_Calendar_App::isNotModified($vcalendar->VEVENT, $_POST['lastmodified']);
-	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
-
-	$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-	if ($data['calendarid'] != $cal) {
-		OC_Calendar_Object::moveToCalendar($id, $cal);
-	}
-	OC_JSON::success();
-}
-?>
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
deleted file mode 100644
index 19f6a80a167c66bc8aea47da4a2ed005ec3b357e..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/editeventform.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
-$id = $_GET['id'];
-$data = OC_Calendar_App::getEventObject($id);
-$object = OC_VObject::parse($data['calendardata']);
-$vevent = $object->VEVENT;
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-switch($dtstart->getDateType()) {
-	case Sabre_VObject_Element_DateTime::LOCALTZ:
-	case Sabre_VObject_Element_DateTime::LOCAL:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = $dtstart->getDateTime()->format('H:i');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = $dtend->getDateTime()->format('H:i');
-		$allday = false;
-		break;
-	case Sabre_VObject_Element_DateTime::DATE:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = '';
-		$dtend->getDateTime()->modify('-1 day');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = '';
-		$allday = true;
-		break;
-}
-
-$summary = $vevent->getAsString('SUMMARY');
-$location = $vevent->getAsString('LOCATION');
-$categories = $vevent->getAsArray('CATEGORIES');
-$description = $vevent->getAsString('DESCRIPTION');
-foreach($categories as $category){
-	if (!in_array($category, $category_options)){
-		array_unshift($category_options, $category);
-	}
-}
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if ($last_modified){
-	$lastmodified = $last_modified->getDateTime()->format('U');
-}else{
-	$lastmodified = 0;
-}
-if($data['repeating'] == 1){
-	$rrule = explode(';', $vevent->getAsString('RRULE'));
-	$rrulearr = array();
-	foreach($rrule as $rule){
-		list($attr, $val) = explode('=', $rule);
-		$rrulearr[$attr] = $val;
-	}
-	if(!isset($rrulearr['INTERVAL']) || $rrulearr['INTERVAL'] == ''){
-		$rrulearr['INTERVAL'] = 1;
-	}
-	if(array_key_exists('BYDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYDAY'], ',') == 0){
-			if(strlen($rrulearr['BYDAY']) == 2){
-				$repeat['weekdays'] = array($rrulearr['BYDAY']);
-			}elseif(strlen($rrulearr['BYDAY']) == 3){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 1);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 1, 2));
-			}elseif(strlen($rrulearr['BYDAY']) == 4){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 2);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 2, 2));
-			}
-		}else{
-			$byday_days = explode(',', $rrulearr['BYDAY']);
-			foreach($byday_days as $byday_day){
-				if(strlen($byday_day) == 2){
-					$repeat['weekdays'][] = $byday_day;
-				}elseif(strlen($byday_day) == 3){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
-					$repeat['weekdays'][] = substr($byday_day , 1, 2);
-				}elseif(strlen($byday_day) == 4){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 2);
-					$repeat['weekdays'][] = substr($byday_day , 2, 2);
-				}
-			}
-		}
-	}
-	if(array_key_exists('BYMONTHDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYMONTHDAY'], ',') == 0){
-			$repeat['bymonthday'][] = $rrulearr['BYMONTHDAY'];
-		}else{
-			$bymonthdays = explode(',', $rrulearr['BYMONTHDAY']);
-			foreach($bymonthdays as $bymonthday){
-				$repeat['bymonthday'][] = $bymonthday;
-			}
-		}
-	}
-	if(array_key_exists('BYYEARDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYYEARDAY'], ',') == 0){
-			$repeat['byyearday'][] = $rrulearr['BYYEARDAY'];
-		}else{
-			$byyeardays = explode(',', $rrulearr['BYYEARDAY']);
-			foreach($byyeardays  as $yearday){
-				$repeat['byyearday'][] = $yearday;
-			}
-		}
-	}
-	if(array_key_exists('BYWEEKNO', $rrulearr)){
-		if(substr_count($rrulearr['BYWEEKNO'], ',') == 0){
-			$repeat['byweekno'][] = (string) $rrulearr['BYWEEKNO'];
-		}else{
-			$byweekno = explode(',', $rrulearr['BYWEEKNO']);
-			foreach($byweekno as $weekno){
-				$repeat['byweekno'][] = (string) $weekno;
-			}
-		}
-	}
-	if(array_key_exists('BYMONTH', $rrulearr)){
-		$months = OC_Calendar_App::getByMonthOptions();
-		if(substr_count($rrulearr['BYMONTH'], ',') == 0){
-			$repeat['bymonth'][] = $months[$month];
-		}else{
-			$bymonth = explode(',', $rrulearr['BYMONTH']);
-			foreach($bymonth as $month){
-				$repeat['bymonth'][] = $months[$month];
-			}
-		}
-	}
-	switch($rrulearr['FREQ']){
-		case 'DAILY':
-			$repeat['repeat'] = 'daily';
-			break;
-		case 'WEEKLY':
-			if($rrulearr['INTERVAL'] % 2 == 0){
-				$repeat['repeat'] = 'biweekly';
-				$rrulearr['INTERVAL'] = $rrulearr['INTERVAL'] / 2;
-			}elseif($rrulearr['BYDAY'] == 'MO,TU,WE,TH,FR'){
-				$repeat['repeat'] = 'weekday';
-			}else{
-				$repeat['repeat'] = 'weekly';
-			}
-			break;
-		case 'MONTHLY':
-			$repeat['repeat'] = 'monthly';
-			if(array_key_exists('BYDAY', $rrulearr)){
-				$repeat['month'] = 'weekday';
-			}else{
-				$repeat['month'] = 'monthday';
-			}
-			break;
-		case 'YEARLY':
-			$repeat['repeat'] = 'yearly';
-			if(array_key_exists('BYMONTH', $rrulearr)){
-				$repeat['year'] = 'bydaymonth';
-			}elseif(array_key_exists('BYWEEKNO', $rrulearr)){
-				$repeat['year'] = 'byweekno';
-			}else{
-				$repeat['year'] = 'byyearday';
-			}
-	}
-	$repeat['interval'] = $rrulearr['INTERVAL'];
-	if(array_key_exists('COUNT', $rrulearr)){
-		$repeat['end'] = 'count';
-		$repeat['count'] = $rrulearr['COUNT'];
-	}elseif(array_key_exists('UNTIL', $rrulearr)){
-		$repeat['end'] = 'date';
-		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
-		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
-		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
-		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
-	}else{
-		$repeat['end'] = 'never';
-	}
-	if(array_key_exists('weekdays', $repeat)){
-		$repeat_weekdays_ = array();
-		$days = OC_Calendar_App::getWeeklyOptions();
-		foreach($repeat['weekdays'] as $weekday){
-			$repeat_weekdays_[] = $days[$weekday];
-		}
-		$repeat['weekdays'] = $repeat_weekdays_;
-	}
-}else{
-	$repeat['repeat'] = 'doesnotrepeat';
-}
-
-$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-$category_options = OC_Calendar_App::getCategoryOptions();
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-$tmpl = new OC_Template('calendar', 'part.editevent');
-$tmpl->assign('id', $id);
-$tmpl->assign('lastmodified', $lastmodified);
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('category_options', $category_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('title', $summary);
-$tmpl->assign('location', $location);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('calendar', $data['calendarid']);
-$tmpl->assign('allday', $allday);
-$tmpl->assign('startdate', $startdate);
-$tmpl->assign('starttime', $starttime);
-$tmpl->assign('enddate', $enddate);
-$tmpl->assign('endtime', $endtime);
-$tmpl->assign('description', $description);
-
-$tmpl->assign('repeat', $repeat['repeat']);
-if($repeat['repeat'] != 'doesnotrepeat'){
-	$tmpl->assign('repeat_month', $repeat['month']);
-	$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
-	$tmpl->assign('repeat_interval', $repeat['interval']);
-	$tmpl->assign('repeat_end', $repeat['end']);
-	$tmpl->assign('repeat_count', $repeat['count']);
-	$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
-	$tmpl->assign('repeat_date', $repeat['date']);
-	$tmpl->assign('repeat_year', $repeat['year']);
-	$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
-	$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
-	$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
-	$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
-}
-else {
-	$tmpl->assign('repeat_month', 'monthday');
-	$tmpl->assign('repeat_weekdays', array());
-	$tmpl->assign('repeat_interval', 1);
-	$tmpl->assign('repeat_end', 'never');
-	$tmpl->assign('repeat_count', '10');
-	$tmpl->assign('repeat_weekofmonth', 'auto');
-	$tmpl->assign('repeat_date', '');
-	$tmpl->assign('repeat_year', 'bydate');
-}
-$tmpl->printpage();
-
-?>
diff --git a/apps/calendar/ajax/gettimezonedetection.php b/apps/calendar/ajax/gettimezonedetection.php
deleted file mode 100644
index ae58370712da2f0bcf12a3fbc15e7ffd5c6421b0..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/gettimezonedetection.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once ("../../../lib/base.php");
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-OC_JSON::success(array('detection' => OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/guesstimezone.php b/apps/calendar/ajax/guesstimezone.php
deleted file mode 100755
index 41aea26985ffd58799faf04ed82e2f6559180564..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/guesstimezone.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function make_array_out_of_xml ($xml){
-	$returnarray = array();
-	$xml = (array)$xml ;
-	foreach ($xml as $property => $value){
-		$value = (array)$value;
-		if(!isset($value[0])){
-			$returnarray[$property] = make_array_out_of_xml($value);
-		}else{
-			$returnarray[$property] = trim($value[0]);
-		}
-	}
-	return $returnarray;
-}
-require_once ("../../../lib/base.php");
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$l = new OC_L10N('calendar');
-$lat = $_GET['lat'];
-$long = $_GET['long'];
-if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'position') == $lat . '-' . $long && OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone') != null){
-	OC_JSON::success();
-	exit;
-}
-OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'position', $lat . '-' . $long);
-$geolocation = file_get_contents('http://ws.geonames.org/timezone?lat=' . $lat . '&lng=' . $long);
-//Information are by Geonames (http://www.geonames.org) and licensed under the Creative Commons Attribution 3.0 License
-$geoxml = simplexml_load_string($geolocation);
-$geoarray = make_array_out_of_xml($geoxml);
-if($geoarray['timezone']['timezoneId'] == OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone')){
-	OC_JSON::success();
-	exit;
-}
-if(in_array($geoarray['timezone']['timezoneId'], DateTimeZone::listIdentifiers())){
-	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $geoarray['timezone']['timezoneId']);
-	$message = array('message'=> $l->t('New Timezone:') . $geoarray['timezone']['timezoneId']);
-	OC_JSON::success($message);
-}else{
-	OC_JSON::error();
-}
-
-?>
diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
deleted file mode 100644
index f6b8453fc22593ba6bb47e1f876b03e0fd764728..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/importdialog.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
-$l10n = new OC_L10N('calendar');
-$tmpl = new OC_Template('calendar', 'part.import');
-$tmpl->assign('path', $_POST['path']);
-$tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
-?>
diff --git a/apps/calendar/ajax/moveevent.php b/apps/calendar/ajax/moveevent.php
deleted file mode 100644
index f2256d4eee6135ad4254c12402ad9fc362b066b4..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/moveevent.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-
-$id = $_POST['id'];
-
-$vcalendar = OC_Calendar_App::getVCalendar($id);
-$vevent = $vcalendar->VEVENT;
-
-$allday = $_POST['allDay'];
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$start_type = $dtstart->getDateType();
-$end_type = $dtend->getDateType();
-if ($allday && $start_type != Sabre_VObject_Element_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Element_DateTime::DATE;
-	$dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type);
-}
-if (!$allday && $start_type == Sabre_VObject_Element_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Element_DateTime::LOCALTZ;
-}
-$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
-$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
-
-$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/newcalendar.php b/apps/calendar/ajax/newcalendar.php
deleted file mode 100644
index af3ba4fbbeabdc84f17d82a34c23aaec81f56b3a..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/newcalendar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-$l10n = new OC_L10N('calendar');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = array(
-	'id' => 'new',
-	'displayname' => '',
-	'calendarcolor' => '',
-);
-$tmpl = new OC_Template('calendar', 'part.editcalendar');
-$tmpl->assign('new', true);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php
deleted file mode 100644
index c7c4d29943a0b3daf783b1801df20349197ff193..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/newevent.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-
-$l10n = new OC_L10N('calendar');
-
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OC_JSON::error($errarr);
-	exit;
-}else{
-	$cal = $_POST['calendar'];
-	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
-	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
-	OC_JSON::success();
-}
-?>
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
deleted file mode 100644
index 3870c879b0ed513dc586e5439474a08608a95f88..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/neweventform.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
-if (!isset($_POST['start'])){
-	OC_JSON::error();
-	die;
-}
-$start = $_POST['start'];
-$end = $_POST['end'];
-$allday = $_POST['allday'];
-
-if (!$end){
-	$duration = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'duration', '60');
-	$end = $start + ($duration * 60);
-}
-$start = new DateTime('@'.$start);
-$end = new DateTime('@'.$end);
-$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
-$start->setTimezone(new DateTimeZone($timezone));
-$end->setTimezone(new DateTimeZone($timezone));
-
-$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-$category_options = OC_Calendar_App::getCategoryOptions();
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-$tmpl = new OC_Template('calendar', 'part.newevent');
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('category_options', $category_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('startdate', $start->format('d-m-Y'));
-$tmpl->assign('starttime', $start->format('H:i'));
-$tmpl->assign('enddate', $end->format('d-m-Y'));
-$tmpl->assign('endtime', $end->format('H:i'));
-$tmpl->assign('allday', $allday);
-$tmpl->assign('repeat', 'doesnotrepeat');
-$tmpl->assign('repeat_month', 'monthday');
-$tmpl->assign('repeat_weekdays', array());
-$tmpl->assign('repeat_interval', 1);
-$tmpl->assign('repeat_end', 'never');
-$tmpl->assign('repeat_count', '10');
-$tmpl->assign('repeat_weekofmonth', 'auto');
-$tmpl->assign('repeat_date', '');
-$tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
-?>
diff --git a/apps/calendar/ajax/resizeevent.php b/apps/calendar/ajax/resizeevent.php
deleted file mode 100644
index 683479065299db7ac94a415d72c1c50045d5026c..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/resizeevent.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-
-$id = $_POST['id'];
-
-$vcalendar = OC_Calendar_App::getVCalendar($id);
-$vevent = $vcalendar->VEVENT;
-
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$end_type = $dtend->getDateType();
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
-$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
-
-$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/settimeformat.php b/apps/calendar/ajax/settimeformat.php
deleted file mode 100644
index 7805120ba5efd756c08102ec9eb3a74bd5c8946d..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/settimeformat.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-if(isset($_POST["timeformat"])){
-	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
-	OC_JSON::success();
-}else{
-	OC_JSON::error();
-}
-?> 
- 
diff --git a/apps/calendar/ajax/settimezone.php b/apps/calendar/ajax/settimezone.php
deleted file mode 100644
index c726a11471d2c3c11876d545fefa7d62018595ed..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/settimezone.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-require_once('../../../lib/base.php');
-
-$l=new OC_L10N('calendar');
-
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-// Get data
-if( isset( $_POST['timezone'] ) ){
-	$timezone=$_POST['timezone'];
-	OC_Preferences::setValue( OC_User::getUser(), 'calendar', 'timezone', $timezone );
-	OC_JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
-}else{
-	OC_JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
-
-?>
diff --git a/apps/calendar/ajax/timeformat.php b/apps/calendar/ajax/timeformat.php
deleted file mode 100644
index 3533adcf8e03303c80c34a389868c7e3e1263b61..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/timeformat.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-$timeformat = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24");
-OC_JSON::encodedPrint(array("timeformat" => $timeformat));
-?> 
diff --git a/apps/calendar/ajax/timezonedetection.php b/apps/calendar/ajax/timezonedetection.php
deleted file mode 100644
index 77e4c4f6ebe424be2e76b887601b042af426c683..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/timezonedetection.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once ("../../../lib/base.php");
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-if($_POST['timezonedetection'] == 'on'){
-	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezonedetection', 'true');
-}else{
-	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezonedetection', 'false');
-}
-OC_JSON::success();
-
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
deleted file mode 100644
index 20c225d8a2968e86042bb370553682ea414a9f9a..0000000000000000000000000000000000000000
--- a/apps/calendar/ajax/updatecalendar.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-require_once('../../../lib/base.php');
-
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('calendar');
-
-if(trim($_POST['name']) == ''){
-	OC_JSON::error(array('message'=>'empty'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name'] && $cal['id'] != $_POST['id']){
-		OC_JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$calendarid = $_POST['id'];
-$calendarcolor = $_POST['color'];
-if (preg_match('/^#?([0-9a-f]{6})/', $calendarcolor, $matches)) {
-	$calendarcolor = '#'.$matches[1];
-}
-else {
-	$calendarcolor = null;
-}
-
-$calendar = OC_Calendar_App::getCalendar($calendarid);//access check
-OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $calendarcolor);
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-
-$calendar = OC_Calendar_App::getCalendar($calendarid);
-$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-OC_JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));