1 files changed, 24 insertions, 65 deletions

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index 87667d4de68..f46e7314098 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -1,73 +1,32 @@
 <?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 $data = $_POST['data'];
 $data = explode(',', $data);
 $data = end($data);
 $data = base64_decode($data);
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
-$nl="\r\n";
-$comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
-$data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-$lines = explode("\n", $data);
-unset($data);
-$comp=$uid=$cal=false;
-$cals=$uids=array();
-$i = 0;
-foreach($lines as $line) {
-	if(strpos($line, ':')!==false) {
-		list($attr, $val) = explode(':', strtoupper($line));
-		if ($attr == 'BEGIN' && $val == 'VCALENDAR') {
-			$cal = $i;
-			$cals[$cal] = array('first'=>$i,'last'=>$i,'end'=>$i);
-		} elseif ($attr =='BEGIN' && $cal!==false && isset($comps[$val])) {
-			$comp = $val;
-			$beginNo = $i;
-		} elseif ($attr == 'END' && $cal!==false && $val == 'VCALENDAR') {
-			if($comp!==false) {
-				unset($cals[$cal]); // corrupt calendar, unset it
-			} else {
-				$cals[$cal]['end'] = $i;
-			}
-			$comp=$uid=$cal=false; // reset calendar
-		} elseif ($attr == 'END' && $comp!==false && $val == $comp) {
-			if(! $uid) {
-				$uid = OC_Calendar_Object::createUID();
-			}
-			$uids[$uid][$beginNo] = array('end'=>$i, 'cal'=>$cal);
-			if ($cals[$cal]['first'] == $cal) {
-				$cals[$cal]['first'] = $beginNo;
-			}
-			$cals[$cal]['last'] = $i;
-			$comp=$uid=false; // reset component
-		} elseif ($attr =="UID" && $comp!==false) {
-			list($attr, $uid) = explode(':', $line);
-		}
-	}
-	$i++;
+$import = new OC_Calendar_Import($data);
+$import->setUserID(OCP\User::getUser());
+$import->setTimeZone(OC_Calendar_App::$tz);
+$import->disableProgressCache();
+if(!$import->isValid()){
+	OCP\JSON::error();
+	exit;
 }
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-$id = $calendars[0]['id'];
-foreach($uids as $uid) {
-	$prefix=$suffix=$content=array();
-	foreach($uid as $begin=>$details) {
-		$cal = $details['cal'];
-		if(!isset($cals[$cal])) {
-			continue; // from corrupt/incomplete calendar
-		}
-		$cdata = $cals[$cal];
-		// if we have multiple components from different calendar objects,
-		// we should really merge their elements (enhancement?) -- 1st one wins for now.
-		if(! count($prefix)) {
-			$prefix = array_slice($lines, $cal, $cdata['first'] - $cal);
-		}
-		if(! count($suffix)) {
-			$suffix = array_slice($lines, $cdata['last']+1, $cdata['end'] - $cdata['last']);
-		}
-		$content = array_merge($content, array_slice($lines, $begin, $details['end'] - $begin + 1));
-	}
-	if(count($content)) {
-		$import = join($nl, array_merge($prefix, $content, $suffix)) . $nl;
-		OC_Calendar_Object::add($id, $import);
-	}
-}
-OCP\JSON::success();
\ No newline at end of file
+$newcalendarname = strip_tags($import->createCalendarName());
+$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),$newcalendarname,'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
+$import->setCalendarID($newid);
+$import->import();
+$count = $import->getCount();
+if($count == 0){
+	OC_Calendar_Calendar::deleteCalendar($newid);
+	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your calendar.')));
+}else{
+	OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
+}
\ No newline at end of file