1 files changed, 313 insertions, 49 deletions

diff --git a/include/event.php b/include/event.php
index 134c23aa2..6670bc53b 100644
--- a/include/event.php
+++ b/include/event.php
@@ -63,9 +63,9 @@ function ical_wrapper($ev) {
 		return '';
 
 	$o .= "BEGIN:VCALENDAR";
-	$o .= "\nVERSION:2.0";
-	$o .= "\nMETHOD:PUBLISH";
-	$o .= "\nPRODID:-//" . get_config('system','sitename') . "//" . PLATFORM_NAME . "//" . strtoupper(get_app()->language). "\n";
+	$o .= "\r\nVERSION:2.0";
+	$o .= "\r\nMETHOD:PUBLISH";
+	$o .= "\r\nPRODID:-//" . get_config('system','sitename') . "//" . PLATFORM_NAME . "//" . strtoupper(get_app()->language). "\r\n";
 	if(array_key_exists('start', $ev))
 		$o .= format_event_ical($ev);
 	else {
@@ -73,38 +73,84 @@ function ical_wrapper($ev) {
 			$o .= format_event_ical($e);
 		}
 	}
-	$o .= "\nEND:VCALENDAR\n";
+	$o .= "\r\nEND:VCALENDAR\r\n";
 
 	return $o;
 }
 
 function format_event_ical($ev) {
 
+	if($ev['type'] === 'task')
+		return format_todo_ical($ev);
+
+	$o = '';
+
+	$o .= "\r\nBEGIN:VEVENT";
+
+	$o .= "\r\nCREATED:" . datetime_convert('UTC','UTC', $ev['created'],'Ymd\\THis\\Z');
+	$o .= "\r\nLAST-MODIFIED:" . datetime_convert('UTC','UTC', $ev['edited'],'Ymd\\THis\\Z');
+	$o .= "\r\nDTSTAMP:" . datetime_convert('UTC','UTC', $ev['edited'],'Ymd\\THis\\Z');
+	if($ev['start']) 
+		$o .= "\r\nDTSTART:" . datetime_convert('UTC','UTC', $ev['start'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
+	if($ev['finish'] && ! $ev['nofinish']) 
+		$o .= "\r\nDTEND:" . datetime_convert('UTC','UTC', $ev['finish'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
+	if($ev['summary']) 
+		$o .= "\r\nSUMMARY:" . format_ical_text($ev['summary']);
+	if($ev['location'])
+		$o .= "\r\nLOCATION:" . format_ical_text($ev['location']);
+	if($ev['description']) 
+		$o .= "\r\nDESCRIPTION:" . format_ical_text($ev['description']);
+	if($ev['event_priority'])
+		$o .= "\r\nPRIORITY:" . intval($ev['event_priority']);
+	$o .= "\r\nUID:" . $ev['event_hash'] ;
+	$o .= "\r\nEND:VEVENT\r\n";
+	
+	return $o;
+}
+
+
+function format_todo_ical($ev) {
+
 	$o = '';
 
-	$o .= "\nBEGIN:VEVENT";
+	$o .= "\r\nBEGIN:VTODO";
+	$o .= "\r\nCREATED:" . datetime_convert('UTC','UTC', $ev['created'],'Ymd\\THis\\Z');
+	$o .= "\r\nLAST-MODIFIED:" . datetime_convert('UTC','UTC', $ev['edited'],'Ymd\\THis\\Z');
+	$o .= "\r\nDTSTAMP:" . datetime_convert('UTC','UTC', $ev['edited'],'Ymd\\THis\\Z');
 	if($ev['start']) 
-		$o .= "\nDTSTART:" . datetime_convert('UTC','UTC', $ev['start'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
+		$o .= "\r\nDTSTART:" . datetime_convert('UTC','UTC', $ev['start'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
 	if($ev['finish'] && ! $ev['nofinish']) 
-		$o .= "\nDTEND:" . datetime_convert('UTC','UTC', $ev['finish'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
+		$o .= "\r\nDUE:" . datetime_convert('UTC','UTC', $ev['finish'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
 	if($ev['summary']) 
-		$o .= "\nSUMMARY:" . format_ical_text($ev['summary']);
+		$o .= "\r\nSUMMARY:" . format_ical_text($ev['summary']);
+	if($ev['event_status']) {
+		$o .= "\r\nSTATUS:" . $ev['event_status'];
+		if($ev['event_status'] === 'COMPLETED')
+			$o .= "\r\nCOMPLETED:" . datetime_convert('UTC','UTC', $ev['event_status_date'],'Ymd\\THis\\Z');
+	}
+	if(intval($ev['event_percent']))
+		$o .= "\r\nPERCENT-COMPLETE:" . $ev['event_percent'];		
+	if(intval($ev['event_sequence'])) 
+		$o .= "\r\nSEQUENCE:" . $ev['event_sequence'];
 	if($ev['location'])
-		$o .= "\nLOCATION:" . format_ical_text($ev['location']);
+		$o .= "\r\nLOCATION:" . format_ical_text($ev['location']);
 	if($ev['description']) 
-		$o .= "\nDESCRIPTION:" . format_ical_text($ev['description']);
-	$o .= "\nUID:" . $ev['event_hash'] ;
-	$o .= "\nEND:VEVENT\n";
+		$o .= "\r\nDESCRIPTION:" . format_ical_text($ev['description']);
+	$o .= "\r\nUID:" . $ev['event_hash'] ;
+	if($ev['event_priority'])
+		$o .= "\r\nPRIORITY:" . intval($ev['event_priority']);
+	$o .= "\r\nEND:VTODO\r\n";
 
 	return $o;
 }
 
 
+
 function format_ical_text($s) {
 	require_once('include/bbcode.php');
 	require_once('include/html2plain.php');
 
-	return(wordwrap(str_replace(',','\\,',html2plain(bbcode($s))),72,"\n ",true));
+	return(wordwrap(str_replace(array(',',';','\\'),array('\\,','\\;','\\\\'),html2plain(bbcode($s))),72,"\r\n ",true));
 }
 
 
@@ -218,12 +264,18 @@ function ev_compare($a, $b) {
 
 function event_store_event($arr) {
 
-	$arr['created']     = (($arr['created'])     ? $arr['created']     : datetime_convert());
-	$arr['edited']      = (($arr['edited'])      ? $arr['edited']      : datetime_convert());
-	$arr['type']        = (($arr['type'])        ? $arr['type']        : 'event' );
-	$arr['event_xchan'] = (($arr['event_xchan']) ? $arr['event_xchan'] : '');
+	$arr['created']        = (($arr['created'])        ? $arr['created']        : datetime_convert());
+	$arr['edited']         = (($arr['edited'])         ? $arr['edited']         : datetime_convert());
+	$arr['type']           = (($arr['type'])           ? $arr['type']           : 'event' );
+	$arr['event_xchan']    = (($arr['event_xchan'])    ? $arr['event_xchan']    : '');
+	$arr['event_priority'] = (($arr['event_priority']) ? $arr['event_priority'] : 0);
 
 
+	if(array_key_exists('event_status_date',$arr))
+		$arr['event_status_date'] = datetime_convert('UTC','UTC', $arr['event_status_date']);
+	else
+		$arr['event_status_date'] = NULL_DATE;
+
 	// Existing event being modified
 
 	if($arr['id'] || $arr['event_hash']) {
@@ -265,6 +317,12 @@ function event_store_event($arr) {
 			`type` = '%s',
 			`adjust` = %d,
 			`nofinish` = %d,
+			`event_status` = '%s',
+			`event_status_date` = '%s',
+			`event_percent` = %d,
+			`event_repeat` = '%s',
+			`event_sequence` = %d,
+			`event_priority` = %d,
 			`allow_cid` = '%s',
 			`allow_gid` = '%s',
 			`deny_cid` = '%s',
@@ -280,6 +338,12 @@ function event_store_event($arr) {
 			dbesc($arr['type']),
 			intval($arr['adjust']),
 			intval($arr['nofinish']),
+			dbesc($arr['event_status']),
+			dbesc($arr['event_status_date']),
+			intval($arr['event_percent']),
+			dbesc($arr['event_repeat']),
+			intval($arr['event_sequence']),
+			intval($arr['event_priority']),
 			dbesc($arr['allow_cid']),
 			dbesc($arr['allow_gid']),
 			dbesc($arr['deny_cid']),
@@ -298,8 +362,8 @@ function event_store_event($arr) {
 			$hash = random_string() . '@' . get_app()->get_hostname();
 
 		$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary,description,location,type,
-			adjust,nofinish,allow_cid,allow_gid,deny_cid,deny_gid)
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
+			adjust,nofinish, event_status, event_status_date, event_percent, event_repeat, event_sequence, event_priority, allow_cid,allow_gid,deny_cid,deny_gid)
+			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
 			intval($arr['uid']),
 			intval($arr['account']),
 			dbesc($arr['event_xchan']),
@@ -314,6 +378,12 @@ function event_store_event($arr) {
 			dbesc($arr['type']),
 			intval($arr['adjust']),
 			intval($arr['nofinish']),
+			dbesc($arr['event_status']),
+			dbesc($arr['event_status_date']),
+			intval($arr['event_percent']),
+			dbesc($arr['event_repeat']),
+			intval($arr['event_sequence']),
+			intval($arr['event_priority']),
 			dbesc($arr['allow_cid']),
 			dbesc($arr['allow_gid']),
 			dbesc($arr['deny_cid']),
@@ -399,9 +469,15 @@ require_once('vendor/autoload.php');
 	$ical = VObject\Reader::read($s);
 
 	if($ical) {
-		foreach($ical->VEVENT as $event) {
-			event_import_ical($event,$uid);
-
+		if($ical->VEVENT) {
+			foreach($ical->VEVENT as $event) {
+				event_import_ical($event,$uid);
+			}
+		}
+		if($ical->VTODO) {
+			foreach($ical->VTODO as $event) {
+				event_import_ical_task($event,$uid);
+			}
 		}
 	}
 
@@ -475,6 +551,8 @@ function event_import_ical($ical, $uid) {
 		$ev['description'] = (string) $ical->DESCRIPTION;
 	if(isset($ical->SUMMARY))
 		$ev['summary'] = (string) $ical->SUMMARY;
+	if(isset($ical->PRIORITY))
+		$ev['event_priority'] = intval((string) $ical->PRIORITY);
 
 	if(isset($ical->UID)) {
 		$evuid = (string) $ical->UID;
@@ -507,6 +585,138 @@ function event_import_ical($ical, $uid) {
 
 }
 
+function event_import_ical_task($ical, $uid) {
+
+	$c = q("select * from channel where channel_id = %d limit 1",
+		intval($uid)
+	);
+
+	if(! $c)
+		return false;
+
+	$channel = $c[0];
+	$ev = array();
+
+
+	if(! isset($ical->DTSTART)) {
+		logger('no event start');
+		return false;
+	}
+
+	$dtstart = $ical->DTSTART->getDateTime();
+
+//	logger('dtstart: ' . var_export($dtstart,true));
+
+	if(($dtstart->timezone_type == 2) || (($dtstart->timezone_type == 3) && ($dtstart->timezone === 'UTC'))) {
+		$ev['adjust'] = 1;
+	}
+	else {
+		$ev['adjust'] = 0;
+	}
+	
+	$ev['start'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
+		$dtstart->format(\DateTime::W3C));
+
+
+	if(isset($ical->DUE)) {
+		$dtend = $ical->DUE->getDateTime();
+		$ev['finish'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
+			$dtend->format(\DateTime::W3C));
+	}
+	else
+		$ev['nofinish'] = 1;
+
+
+	if($ev['start'] === $ev['finish'])
+		$ev['nofinish'] = 1;
+
+	if(isset($ical->CREATED)) {
+		$created = $ical->CREATED->getDateTime();
+		$ev['created'] = datetime_convert('UTC','UTC',$created->format(\DateTime::W3C));
+	}
+
+	if(isset($ical->{'DTSTAMP'})) {
+		$edited = $ical->{'DTSTAMP'}->getDateTime();
+		$ev['edited'] = datetime_convert('UTC','UTC',$edited->format(\DateTime::W3C));
+	}
+
+	if(isset($ical->{'LAST-MODIFIED'})) {
+		$edited = $ical->{'LAST-MODIFIED'}->getDateTime();
+		$ev['edited'] = datetime_convert('UTC','UTC',$edited->format(\DateTime::W3C));
+	}
+
+	if(isset($ical->LOCATION))
+		$ev['location'] = (string) $ical->LOCATION;
+	if(isset($ical->DESCRIPTION))
+		$ev['description'] = (string) $ical->DESCRIPTION;
+	if(isset($ical->SUMMARY))
+		$ev['summary'] = (string) $ical->SUMMARY;
+	if(isset($ical->PRIORITY))
+		$ev['event_priority'] = intval((string) $ical->PRIORITY);
+
+	$stored_event = null;
+
+	if(isset($ical->UID)) {
+		$evuid = (string) $ical->UID;
+		$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+			dbesc($evuid),
+			intval($uid)
+		);
+		if($r) {
+			$ev['event_hash'] = $evuid;
+			$stored_event = $r[0];
+		}
+		else {
+			$ev['external_id'] = $evuid;
+		}
+	}
+
+	if(isset($ical->SEQUENCE)) {
+		$ev['event_sequence'] = (string) $ical->SEQUENCE;
+		// see if our stored event is more current than the one we're importing
+		if((intval($ev['event_sequence']) <= intval($stored_event['event_sequence'])) 
+			&& ($ev['edited'] <= $stored_event['edited']))
+			return false;
+	}
+
+	if(isset($ical->STATUS)) {
+		$ev['event_status'] = (string) $ical->STATUS;
+	}
+
+	if(isset($ical->{'COMPLETED'})) {
+		$completed = $ical->{'COMPLETED'}->getDateTime();
+		$ev['event_status_date'] = datetime_convert('UTC','UTC',$completed->format(\DateTime::W3C));
+	}
+
+	if(isset($ical->{'PERCENT-COMPLETE'})) {
+		$ev['event_percent'] = (string) $ical->{'PERCENT-COMPLETE'} ;
+	}
+
+	$ev['type'] = 'task';
+
+	if($ev['summary'] && $ev['start']) {
+		$ev['event_xchan'] = $channel['channel_hash'];
+		$ev['uid']         = $channel['channel_id'];
+		$ev['account']     = $channel['channel_account_id'];
+		$ev['private']     = 1;
+		$ev['allow_cid']   = '<' . $channel['channel_hash'] . '>';
+
+		logger('storing event: ' . print_r($ev,true), LOGGER_ALL);		
+		$event = event_store_event($ev);
+		if($event) {
+			$item_id = event_store_item($ev,$event);
+			return true;
+		}
+	}
+
+	return false;
+
+}
+
+
+
+
+
 
 function event_store_item($arr, $event) {
 
@@ -568,7 +778,12 @@ function event_store_item($arr, $event) {
 
 		$private = (($arr['allow_cid'] || $arr['allow_gid'] || $arr['deny_cid'] || $arr['deny_gid']) ? 1 : 0);
 
-		q("UPDATE item SET title = '%s', body = '%s', object = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', edited = '%s', item_flags = %d, item_private = %d, obj_type = '%s'  WHERE id = %d AND uid = %d",
+		// @FIXME can only update sig if we have the author's channel on this site
+		// Until fixed, set it to nothing so it won't give us signature errors
+
+		$sig = '';
+
+		q("UPDATE item SET title = '%s', body = '%s', object = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', edited = '%s', sig = '%s', item_flags = %d, item_private = %d, obj_type = '%s'  WHERE id = %d AND uid = %d",
 			dbesc($arr['summary']),
 			dbesc($prefix . format_event_bbcode($arr)),
 			dbesc($object),
@@ -577,6 +792,7 @@ function event_store_item($arr, $event) {
 			dbesc($arr['deny_cid']),
 			dbesc($arr['deny_gid']),
 			dbesc($arr['edited']),
+			dbesc($sig),
 			intval($r[0]['item_flags']),
 			intval($private),
 			dbesc(ACTIVITY_OBJ_EVENT),
@@ -615,48 +831,61 @@ function event_store_item($arr, $event) {
 
 		$private = (($arr['allow_cid'] || $arr['allow_gid'] || $arr['deny_cid'] || $arr['deny_gid']) ? 1 : 0);
 
+		$item_wall = 0;
+		$item_origin = 0;
+		$item_thread_top = 0;				
+
 		if($item) {
 			$item_arr['id'] = $item['id'];
 		}
 		else {
 			$wall = (($z[0]['channel_hash'] == $event['event_xchan']) ? true : false);
-
-			$item_flags = ITEM_THREAD_TOP;
+			$item_thread_top = 1;
 			if($wall) {
-				$item_flags |= ITEM_WALL;
-				$item_flags |= ITEM_ORIGIN;
+				$item_wall = 1;
+				$item_origin = 1;
 			}
-			$item_arr['item_flags'] = $item_flags;
 		}
 
 		if(! $arr['mid'])
 			$arr['mid'] = item_message_id();
 
-		$item_arr['aid']           = $z[0]['channel_account_id'];
-		$item_arr['uid']           = $arr['uid'];
-		$item_arr['author_xchan']  = $arr['event_xchan'];
-		$item_arr['mid']           = $arr['mid'];
-		$item_arr['parent_mid']    = $arr['mid'];
-
-		$item_arr['owner_xchan']   = (($wall) ? $z[0]['channel_hash'] : $arr['event_xchan']);
-		$item_arr['author_xchan']  = $arr['event_xchan'];
-		$item_arr['title']         = $arr['summary'];
-		$item_arr['allow_cid']     = $arr['allow_cid'];
-		$item_arr['allow_gid']     = $arr['allow_gid'];
-		$item_arr['deny_cid']      = $arr['deny_cid'];
-		$item_arr['deny_gid']      = $arr['deny_gid'];
-		$item_arr['item_private']  = $private;
-		$item_arr['verb']          = ACTIVITY_POST;
+		$item_arr['aid']             = $z[0]['channel_account_id'];
+		$item_arr['uid']             = $arr['uid'];
+		$item_arr['author_xchan']    = $arr['event_xchan'];
+		$item_arr['mid']             = $arr['mid'];
+		$item_arr['parent_mid']      = $arr['mid'];
+		$item_arr['owner_xchan']     = (($wall) ? $z[0]['channel_hash'] : $arr['event_xchan']);
+		$item_arr['author_xchan']    = $arr['event_xchan'];
+		$item_arr['title']           = $arr['summary'];
+		$item_arr['allow_cid']       = $arr['allow_cid'];
+		$item_arr['allow_gid']       = $arr['allow_gid'];
+		$item_arr['deny_cid']        = $arr['deny_cid'];
+		$item_arr['deny_gid']        = $arr['deny_gid'];
+		$item_arr['item_private']    = $private;
+		$item_arr['verb']            = ACTIVITY_POST;
+		$item_arr['item_wall']       = $item_wall;
+		$item_arr['item_origin']     = $item_origin;
+		$item_arr['item_thread_top'] = $item_thread_top;;
+
+		$attach = array(array(
+			'href' => z_root() . '/events/ical/' .  urlencode($event['event_hash']),
+			'length' => 0,
+			'type' => 'text/calendar',
+			'title' => t('event') . '-' . $event['event_hash'],
+			'revision' => ''
+		));
 
-		if(array_key_exists('term', $arr))
-			$item_arr['term'] = $arr['term'];
+		$item_arr['attach'] = $attach;
 
-		$item_arr['resource_type'] = 'event';
-		$item_arr['resource_id']   = $event['event_hash'];
 
-		$item_arr['obj_type']      = ACTIVITY_OBJ_EVENT;
+		if(array_key_exists('term', $arr))
+			$item_arr['term'] = $arr['term'];
 
-		$item_arr['body']          = $prefix . format_event_bbcode($arr);
+		$item_arr['resource_type']   = 'event';
+		$item_arr['resource_id']     = $event['event_hash'];
+		$item_arr['obj_type']        = ACTIVITY_OBJ_EVENT;
+		$item_arr['body']            = $prefix . format_event_bbcode($arr);
 
 		// if it's local send the permalink to the channel page.
 		// otherwise we'll fallback to /display/$message_id
@@ -696,3 +925,38 @@ function event_store_item($arr, $event) {
 		return $item_id;
 	}
 }
+
+
+function todo_stat() {
+	return array(
+		''             => t('Not specified'),
+		'NEEDS-ACTION' => t('Needs Action'),
+		'COMPLETED'    => t('Completed'),
+		'IN-PROCESS'   => t('In Process'),
+		'CANCELLED'    => t('Cancelled')
+	);
+}
+
+
+function tasks_fetch($arr) {
+
+   if(! local_channel())
+        return;
+
+    $ret = array();
+    $sql_extra = " and event_status != 'COMPLETED' ";
+    if($arr && $arr['all'] == 1)
+        $sql_extra = '';
+
+    $r = q("select * from event where type = 'task' and uid = %d $sql_extra order by created desc",
+        intval(local_channel())
+    );
+
+    $ret['success'] = (($r) ? true : false);
+    if($r) {
+        $ret['tasks'] = $r;
+    }
+
+	return $ret;
+
+}
\ No newline at end of file