Merge branch 'master' into share_api

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

7 files changed, 439 insertions, 6 deletions

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 1a13f2958c0..29e5ab5b0c8 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -9,7 +9,7 @@
  * This class manages our app actions
  */
 OC_Calendar_App::$l10n = new OC_L10N('calendar');
-OC_Calendar_App::$tz = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
 class OC_Calendar_App{
 	const CALENDAR = 'calendar';
 	const EVENT = 'event';
@@ -282,7 +282,17 @@ class OC_Calendar_App{
 	public static function getWeekofMonth(){
 		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
 	}
-	
+
+	/**
+	 * @return (string) $timezone as set by user or the default timezone
+	 */
+	public static function getTimezone() {
+		return OCP\Config::getUserValue(OCP\User::getUser(),
+						'calendar',
+						'timezone',
+						date_default_timezone_get());
+	}
+
 	/**
 	 * @brief checks the access for a calendar / an event
 	 * @param (int) $id - id of the calendar / event
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 128b55c48e9..7778242464c 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -267,8 +267,42 @@ class OC_Calendar_Calendar{
 			'url' => OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
 			'backgroundColor' => $calendar['calendarcolor'],
 			'borderColor' => '#888',
-			'textColor' => 'black',
+			'textColor' => self::generateTextColor($calendar['calendarcolor']),
 			'cache' => true,
 		);
 	}
+	
+	/*
+	 * @brief checks if a calendar name is available for a user
+	 * @param string $calendarname 
+	 * @param string $userid
+	 * @return boolean
+	 */
+	public static function isCalendarNameavailable($calendarname, $userid){
+		$calendars = self::allCalendars($userid);
+		foreach($calendars as $calendar){
+			if($calendar['displayname'] == $calendarname){
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/*
+	 * @brief generates the text color for the calendar
+	 * @param string $calendarcolor rgb calendar color code in hex format (with or without the leading #)
+	 * (this function doesn't pay attention on the alpha value of rgba color codes)
+	 * @return boolean
+	 */
+	public static function generateTextColor($calendarcolor){
+		if(substr_count($calendarcolor, '#') == 1){
+			$calendarcolor = substr($calendarcolor,1);
+		}
+		$red = hexdec(substr($calendarcolor,0,2));
+		$green = hexdec(substr($calendarcolor,2,2));
+		$blue = hexdec(substr($calendarcolor,2,2));
+		//recommendation by W3C
+		$computation = ((($red * 299) + ($green * 587) + ($blue * 114)) / 1000);
+		return ($computation > 130)?'#000000':'#FAFAFA';
+	}
 }
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
index 328d2951d23..bc0b02c62b8 100644
--- a/apps/calendar/lib/hooks.php
+++ b/apps/calendar/lib/hooks.php
@@ -11,7 +11,18 @@
  */
 class OC_Calendar_Hooks{
 	/**
-	 * @brief Deletes all Addressbooks of a certain user
+	 * @brief Creates default calendar for a user
+	 * @param paramters parameters from postCreateUser-Hook
+	 * @return array
+	 */
+	public static function createUser($parameters) {
+		OC_Calendar_Calendar::addCalendar($parameters['uid'],'Default calendar');
+
+		return true;
+	}
+
+	/**
+	 * @brief Deletes all calendars of a certain user
 	 * @param paramters parameters from postDeleteUser-Hook
 	 * @return array
 	 */
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
new file mode 100644
index 00000000000..d36891cb2b9
--- /dev/null
+++ b/apps/calendar/lib/import.php
@@ -0,0 +1,334 @@
+<?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.
+ */
+/*
+ * This class does import and converts all times to the users current timezone
+ */
+class OC_Calendar_Import{
+	/*
+	 * @brief counts the absolute number of parsed elements
+	 */
+	private $abscount;
+	
+	/*
+	 * @brief var saves if the percentage should be saved with OC_Cache
+	 */
+	private $cacheprogress;
+	
+	/*
+	 * @brief Sabre_VObject_Component_VCalendar object - for documentation see http://code.google.com/p/sabredav/wiki/Sabre_VObject_Component_VCalendar
+	 */
+	private $calobject;
+	
+	/*
+	 * @brief var counts the number of imported elements
+	 */
+	private $count;
+	
+	/*
+	 * @brief var to check if errors happend while initialization
+	 */
+	private $error;
+	
+	/*
+	 * @brief var saves the ical string that was submitted with the __construct function
+	 */
+	private $ical;
+	
+	/*
+	 * @brief calendar id for import
+	 */
+	private $id;
+	
+	/*
+	 * @brief var saves the percentage of the import's progress
+	 */
+	private $progress;
+	
+	/*
+	 * @brief var saves the key for the percentage of the import's progress
+	 */
+	private $progresskey;
+	
+	/*
+	 * @brief var saves the timezone the events shell converted to
+	 */
+	private $tz;
+	
+	/*
+	 * @brief var saves the userid
+	 */
+	private $userid;
+
+	/*
+	 * public methods 
+	 */
+	
+	/*
+	 * @brief does general initialization for import object
+	 * @param string $calendar content of ical file
+	 * @param string $tz timezone of the user
+	 * @return boolean
+	 */
+	public function __construct($ical){
+		$this->error = null;
+		$this->ical = $ical;
+		$this->abscount = 0;
+		$this->count = 0;
+		try{
+			$this->calobject = OC_VObject::parse($this->ical);
+		}catch(Exception $e){
+			//MISSING: write some log
+			$this->error = true;
+			return false;
+		}
+		return true;
+	}
+	
+	/*
+	 * @brief imports a calendar
+	 * @return boolean
+	 */
+	public function import(){
+		if(!$this->isValid()){
+			return false;
+		}
+		$numofcomponents = count($this->calobject->getComponents());
+		foreach($this->calobject->getComponents() as $object){
+			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
+				continue;
+			}
+			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object);
+			$object->DTSTART->getDateTime()->setTimezone(new DateTimeZone($this->tz));
+			$object->DTEND->setDateTime($dtend->getDateTime(), $object->DTSTART->getDateType());
+			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
+			$vcalendar = $this->createVCalendar($object->serialize());
+			$insertid = OC_Calendar_Object::add($this->id, $vcalendar);
+			$this->abscount++;
+			if($this->isDuplicate($insertid)){
+				OC_Calendar_Object::delete($insertid);
+			}else{
+				$this->count++;
+			}
+			$this->updateProgress(intval(($this->abscount / $numofcomponents)*100));
+		}
+		OC_Cache::remove($this->progresskey);
+		return true;
+	}
+	
+	/*
+	 * @brief sets the timezone
+	 * @return boolean
+	 */
+	public function setTimeZone($tz){
+		$this->tz = $tz;
+		return true;
+	}
+	
+	/*
+	 * @brief sets the progresskey
+	 * @return boolean
+	 */
+	public function setProgresskey($progresskey){
+		$this->progresskey = $progresskey;
+		return true;
+	}
+	
+	/*
+	 * @brief checks if something went wrong while initialization
+	 * @return boolean
+	 */
+	public function isValid(){
+		if(is_null($this->error)){
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * @brief returns the percentage of progress
+	 * @return integer
+	 */
+	public function getProgress(){
+		return $this->progress;
+	}
+	
+	/*
+	 * @brief enables the cache for the percentage of progress
+	 * @return boolean
+	 */
+	public function enableProgressCache(){
+		$this->cacheprogress = true;
+		return true;
+	}
+	
+	/*
+	 * @brief disables the cache for the percentage of progress
+	 * @return boolean
+	 */
+	public function disableProgressCache(){
+		$this->cacheprogress = false;
+		return false;
+	}
+	
+	/*
+	 * @brief generates a new calendar name
+	 * @return string
+	 */
+	public function createCalendarName(){	
+		$calendars = OC_Calendar_Calendar::allCalendars($this->userid);
+		$calendarname = $guessedcalendarname = !is_null($this->guessCalendarName())?($this->guessCalendarName()):(OC_Calendar_App::$l10n->t('New Calendar'));
+		$i = 1;
+		while(!OC_Calendar_Calendar::isCalendarNameavailable($calendarname, $this->userid)){
+			$calendarname = $guessedcalendarname . ' (' . $i . ')';
+			$i++;
+		}
+		return $calendarname;
+	}
+	
+	/*
+	 * @brief generates a new calendar color
+	 * @return string
+	 */
+	public function createCalendarColor(){
+		if(is_null($this->guessCalendarColor())){
+			return '#9fc6e7';
+		}
+		return $this->guessCalendarColor();
+	}
+	
+	/*
+	 * @brief sets the id for the calendar
+	 * @param integer $id of the calendar
+	 * @return boolean
+	 */
+	public function setCalendarID($id){
+		$this->id = $id;
+		return true;
+	}
+	
+	/*
+	 * @brief sets the userid to import the calendar
+	 * @param string $id of the user
+	 * @return boolean
+	 */
+	public function setUserID($userid){
+		$this->userid = $userid;
+		return true;
+	}
+	
+	/*
+	 * @brief returns the private 
+	 * @param string $id of the user
+	 * @return boolean
+	 */
+	public function getCount(){
+		return $this->count;
+	}
+
+	/*
+	 * private methods 
+	 */
+	
+	/*
+	 * @brief generates an unique ID 
+	 * @return string 
+	 */
+	//private function createUID(){
+	//	return substr(md5(rand().time()),0,10);
+	//}
+	
+	/*
+	 * @brief checks is the UID is already in use for another event
+	 * @param string $uid uid to check
+	 * @return boolean
+	 */
+	//private function isUIDAvailable($uid){
+	//	
+	//}
+	
+	/*
+	 * @brief generates a proper VCalendar string
+	 * @param string $vobject
+	 * @return string 
+	 */
+	private function createVCalendar($vobject){
+		if(is_object($vobject)){
+			$vobject = @$vobject->serialize();
+		}
+		$vcalendar = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
+		$vcalendar .= $vobject;
+		$vcalendar .= "END:VCALENDAR";
+		return $vcalendar;
+	}
+	
+	/*
+	 * @brief checks if an event already exists in the user's calendars
+	 * @param integer $insertid id of the new object
+	 * @return boolean
+	 */
+	private function isDuplicate($insertid){
+		$newobject = OC_Calendar_Object::find($insertid);
+		$stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=?');
+		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata']));
+		$result = $result->fetchRow();
+		if($result['count'] >= 2){
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * @brief updates the progress var
+	 * @param integer $percentage
+	 * @return boolean
+	 */
+	private function updateProgress($percentage){
+		$this->progress = $percentage;
+		if($this->cacheprogress){
+			OC_Cache::set($this->progresskey, $this->progress, 300);
+		}
+		return true;
+	}
+
+	/*
+	 * public methods for (pre)rendering of X-... Attributes
+	 */
+	
+	/*
+	 * @brief guesses the calendar color
+	 * @return mixed - string or boolean
+	 */
+	public function guessCalendarColor(){
+		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
+			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
+		}
+		return null;
+	}
+	
+	/*
+	 * @brief guesses the calendar description
+	 * @return mixed - string or boolean
+	 */
+	public function guessCalendarDescription(){
+		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
+			return $this->calobject->__get('X-WR-CALDESC');
+		}
+		return null;
+	}
+	
+	/*
+	 * @brief guesses the calendar name
+	 * @return mixed - string or boolean
+	 */
+	public function guessCalendarName(){
+		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
+			return $this->calobject->__get('X-WR-CALNAME');
+		}
+		return null;
+	}
+}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 140542bf4fb..34676830205 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -856,7 +856,7 @@ class OC_Calendar_Object{
 			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::DATE);
 			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::DATE);
 		}else{
-			$timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+			$timezone = OC_Calendar_App::getTimezone();
 			$timezone = new DateTimeZone($timezone);
 			$start = new DateTime($from.' '.$fromtime, $timezone);
 			$end = new DateTime($to.' '.$totime, $timezone);
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 560330f65e9..551489672b9 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -12,7 +12,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 		}else{
 			$searchquery[] = $query;
 		}
-		$user_timezone = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+		$user_timezone = OC_Calendar_App::getTimezone();
 		$l = new OC_l10n('calendar');
 		foreach($calendars as $calendar){
 			$objects = OC_Calendar_Object::all($calendar['id']);
diff --git a/apps/calendar/lib/share_backend.php b/apps/calendar/lib/share_backend.php
new file mode 100644
index 00000000000..f937c0d1c34
--- /dev/null
+++ b/apps/calendar/lib/share_backend.php
@@ -0,0 +1,44 @@
+<?php
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class OC_Share_Backend_Calendar extends OCP\Share_Backend {
+
+	public function getSource($item, $uid) {
+		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*calendar_calendars WHERE userid = ? AND displayname = ? LIMIT 1');
+		return $query->execute(array($uid, $item))->fetchAll();
+	}
+
+	public function generateTarget($item, $uid) {
+		
+	}
+
+	public function getItems($sources) {
+		
+	}
+
+}
+
+class OC_Share_Backend_Event extends OCP\Share_Backend {
+
+}
+
+
+?>
\ No newline at end of file