Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

7 files changed, 374 insertions, 12 deletions

diff --git a/include/cdav.php b/include/cdav.php
new file mode 100644
index 000000000..ef248a9fe
--- /dev/null
+++ b/include/cdav.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @brief Process CardDAV card
+ *
+ * @param array $f	fields
+ * @param obj	$vcard	SabreDAV object
+ * @param bool	$edit	update card
+ *
+ */
+
+function process_cdav_card($f, &$vcard, $edit = false) {
+
+	if($f['org'])
+		$vcard->ORG = $f['org'];
+	else
+		if($edit)
+			unset($vcard->ORG);
+
+
+	if($f['title'])
+		$vcard->TITLE = $f['title'];
+	else
+		if($edit)
+			unset($vcard->TITLE);
+
+	if($edit)
+		unset($vcard->TEL);
+	if($f['tel']) {
+		$i = 0;
+		foreach($f['tel'] as $item) {
+			if($item) {
+				$vcard->add('TEL', $item, ['type' => $f['tel_type'][$i]]);
+			}
+			$i++;
+		}
+	}
+
+	if($edit)
+		unset($vcard->EMAIL);
+	if($f['email']) {
+		$i = 0;
+		foreach($f['email'] as $item) {
+			if($item) {
+				$vcard->add('EMAIL', $item, ['type' => $f['email_type'][$i]]);
+			}
+			$i++;
+		}
+	}
+
+	if($edit)
+		unset($vcard->IMPP);
+	if($f['impp']) {
+		$i = 0;
+		foreach($f['impp'] as $item) {
+			if($item) {
+				$vcard->add('IMPP', $item, ['type' => $f['impp_type'][$i]]);
+			}
+			$i++;
+		}
+	}
+
+	if($edit)
+		unset($vcard->URL);
+	if($f['url']) {
+		$i = 0;
+		foreach($f['url'] as $item) {
+			if($item) {
+				$vcard->add('URL', $item, ['type' => $f['url_type'][$i]]);
+			}
+			$i++;
+		}
+	}
+
+	if($edit)
+		unset($vcard->ADR);
+	if($f['adr']) {
+		$i = 0;
+		foreach($f['adr'] as $item) {
+			if($item) {
+				$vcard->add('ADR', $item, ['type' => $f['adr_type'][$i]]);
+			}
+			$i++;
+		}
+	}
+
+	if($f['note']) {
+		$vcard->NOTE = $f['note'];
+	}
+	else
+		if($edit)
+			unset($vcard->NOTE);
+}
+
+
+/**
+ * @brief Import CardDAV or CalDAV card
+ *
+ * @param mixed	$id     card id
+ * @param str	$ext	card extension
+ * @param str	$table	name
+ * @param str	$column name
+ * @param obj	$objects
+ * @param str	$profile
+ * @param obj	$backend
+ * @param array	$ids
+ * @param bool	$notice
+ *
+ */
+
+function import_cdav_card($id, $ext, $table, $column, $objects, $profile, $backend, &$ids, $notice = false) {
+
+	$i = 0;
+	$newid = (count($ids) ? false : true); 
+
+	while ($object = $objects->getNext()) {
+
+		if($_REQUEST['a_upload'])
+			$object = $object->convert(\Sabre\VObject\Document::VCARD40);
+
+		$ret = $object->validate($profile & \Sabre\VObject\Node::REPAIR);
+
+		//level 3 Means that the document is invalid,
+		//level 2 means a warning. A warning means it's valid but it could cause interopability issues,
+		//level 1 means that there was a problem earlier, but the problem was automatically repaired.
+
+		if($ret[0]['level'] < 3) {
+
+			if($newid) {
+				do {
+					$duplicate = false;
+					$objectUri = random_string(40) . '.' . $ext;
+
+					$r = q("SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1",
+						dbesc($id),
+						dbesc($objectUri)
+					);
+					if (count($r))
+						$duplicate = true;
+				} while ($duplicate == true);
+				$ids[$i] = $objectUri;
+			}
+			else
+				$objectUri = $ids[$i];
+
+			$i++;
+
+			if($ext == 'ics')
+				$backend->createCalendarObject($id, $objectUri, $object->serialize());
+
+			if($ext == 'vcf')
+				$backend->createCard($id, $objectUri, $object->serialize());
+		}
+		else {
+			if($notice && $ext == 'ics') {
+				notice(
+					'<strong>' . t('INVALID EVENT DISMISSED!') . '</strong>' . EOL .
+					'<strong>' . t('Summary: ') . '</strong>' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL .
+					'<strong>' . t('Date: ') . '</strong>' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL .
+					'<strong>' . t('Reason: ') . '</strong>' . $ret[0]['message'] . EOL
+				);
+			}
+
+			if($notice && $exp == 'vcf') {
+				notice(
+					'<strong>' . t('INVALID CARD DISMISSED!') . '</strong>' . EOL .
+					'<strong>' . t('Name: ') . '</strong>' . (($object->FN) ? $object->FN : t('Unknown')) . EOL .
+					'<strong>' . t('Reason: ') . '</strong>' . $ret[0]['message'] . EOL
+				);
+			}
+		}
+	}
+}
+
+
+function get_cdav_id($principaluri, $uri, $table) {
+
+        $r = q("SELECT * FROM $table WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
+                dbesc($principaluri),
+                dbesc($uri)
+        );
+        if(! $r)
+                return false;
+
+        return $r[0];
+}
diff --git a/include/conversation.php b/include/conversation.php
index 327d89e53..62d4b405f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -625,11 +625,17 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 	$items = $cb['items'];
 
-	$conv_responses = array(
-		'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
-		'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), 
-		'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
-	);
+	$conv_responses = [
+		'like' => ['title' => t('Likes','title')],
+		'dislike' => ['title' => t('Dislikes','title')],
+		'agree' => ['title' => t('Agree','title')],
+		'disagree' => ['title' => t('Disagree','title')],
+		'abstain' => ['title' => t('Abstain','title')],
+		'attendyes' => ['title' => t('Attending','title')],
+		'attendno' => ['title' => t('Not attending','title')],
+		'attendmaybe' => ['title' => t('Might attend','title')],
+		'answer' => []
+	];
 
 
 	// array with html for each thread (parent+comments)
@@ -1136,7 +1142,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 
 	// if this item is a post or comment there's nothing for us to do here, just return.
 
-	if(activity_match($item['verb'],ACTIVITY_POST))
+	if(activity_match($item['verb'],ACTIVITY_POST) && $item['obj_type'] !== 'Answer')
 		return;
 
 	foreach($conv_responses as $mode => $v) {
@@ -1168,6 +1174,9 @@ function builtin_activity_puller($item, &$conv_responses) {
 			case 'attendmaybe':
 				$verb = ACTIVITY_ATTENDMAYBE;
 				break;
+			case 'answer':
+				$verb = ACTIVITY_POST;
+				break;
 			default:
 				return;
 				break;
@@ -1183,9 +1192,11 @@ function builtin_activity_puller($item, &$conv_responses) {
 			if(! $item['thr_parent'])
 				$item['thr_parent'] = $item['parent_mid'];
 
-
 			$conv_responses[$mode]['mids'][$item['thr_parent']][] = 'b64.' . base64url_encode($item['mid']);
 
+			if($item['obj_type'] === 'Answer')
+				continue;
+
 			if(! ((isset($conv_responses[$mode][$item['thr_parent'] . '-l'])) 
 				&& (is_array($conv_responses[$mode][$item['thr_parent'] . '-l']))))
 				$conv_responses[$mode][$item['thr_parent'] . '-l'] = array();
@@ -1282,7 +1293,7 @@ function hz_status_editor($a, $x, $popup = false) {
 	$feature_voting = feature_enabled($x['profile_uid'], 'consensus_tools');
 	if(x($x, 'hide_voting'))
 		$feature_voting = false;
-	
+
 	$feature_nocomment = feature_enabled($x['profile_uid'], 'disable_comments');
 	if(x($x, 'disable_comments'))
 		$feature_nocomment = false;
@@ -1430,6 +1441,11 @@ function hz_status_editor($a, $x, $popup = false) {
 		'$embedPhotosModalOK' => t('OK'),
 		'$setloc' => $setloc,
 		'$voting' => t('Toggle voting'),
+		'$poll' => t('Toggle poll'),
+		'$poll_option_label' => t('Option'),
+		'$poll_add_option_label' => t('Add option'),
+		'$poll_expire_unit_label' => [t('Minutes'), t('Hours'), t('Days')],
+		'$multiple_answers' => ['poll_multiple_answers', t("Allow multiple answers"), '', '', [t('No'), t('Yes')]],
 		'$feature_voting' => $feature_voting,
 		'$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0),
 		'$nocommenttitle' => t('Disable comments'),
diff --git a/include/features.php b/include/features.php
index 87df0c50d..c6cfcf822 100644
--- a/include/features.php
+++ b/include/features.php
@@ -299,6 +299,22 @@ function get_features($filtered = true, $level = (-1)) {
 			t('Network'),
 
 			[
+				'events_tab',
+				t('Events Filter'),
+				t('Ability to display only events'),
+				false,
+				get_config('feature_lock','events_tab')
+			],
+
+			[
+				'polls_tab',
+				t('Polls Filter'),
+				t('Ability to display only polls'),
+				false,
+				get_config('feature_lock','polls_tab')
+			],
+
+			[
 				'savedsearch',    
 				t('Saved Searches'),			
 				t('Save search terms for re-use'),
diff --git a/include/import.php b/include/import.php
index 6a3895b9f..bfe71963f 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1503,6 +1503,144 @@ function sync_files($channel, $files) {
 	}
 }
 
+
+/**
+ * @brief Synchronize addressbooks.
+ *
+ * @param array $channel
+ * @param array $data
+ */
+function sync_addressbook($channel, $data) {
+
+	if(! \Zotlabs\Lib\Apps::system_app_installed($channel['channel_id'], 'CardDAV'))
+		return;
+		
+	logger("debug: " . print_r($data,true), LOGGER_DEBUG);
+
+	require_once('include/cdav.php');
+
+	$principalUri = 'principals/' . $channel['channel_address'];
+	
+	if($data['action'] !== 'create') {
+	    $id = get_cdav_id($principalUri, $data['uri'], 'addressbooks');
+	    if(! $id)
+	        return;
+	}
+
+	$pdo = \DBA::$dba->db;
+
+	$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
+	$addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+	switch($data['action']) {
+
+		case 'create':
+			$carddavBackend->createAddressBook($principalUri, $data['uri'], $data['properties']);
+			break;
+
+		case 'drop':
+			$carddavBackend->deleteAddressBook($id);
+			break;
+
+		case 'edit':
+			$patch = new \Sabre\DAV\PropPatch($data['mutations']);
+			$carddavBackend->updateAddressBook($id, $patch);
+			$patch->commit();
+			break;
+
+		case 'delete_card':
+			$carddavBackend->deleteCard($id, $data['carduri']);
+			break;
+
+		case 'update_card':
+			$vcard = \Sabre\VObject\Reader::read($data['card']);
+			$object = $vcard->convert(\Sabre\VObject\Document::VCARD40);
+			$cardData = $vcard->serialize();
+			$carddavBackend->updateCard($id, $data['carduri'], $cardData);
+			break;
+
+		case 'import':
+			$objects = new \Sabre\VObject\Splitter\VCard($data['card']);
+			$profile = \Sabre\VObject\Node::PROFILE_CARDDAV;
+			import_cdav_card($id, 'vcf', 'cards', 'addressbookid', $objects, $profile, $carddavBackend, $data['ids']);
+			break;
+
+		default:
+			break;
+	}
+}
+
+
+/**
+ * @brief Synchronize calendars.
+ *
+ * @param array $channel
+ * @param array $data
+ */
+function sync_calendar($channel, $data) {
+
+	if(! \Zotlabs\Lib\Apps::system_app_installed($channel['channel_id'], 'Calendar'))
+		return;
+
+	logger("debug: " . print_r($data,true), LOGGER_DEBUG);
+
+	require_once('include/cdav.php');
+
+        $principalUri = 'principals/' . $channel['channel_address'];
+
+	if($data['action'] !== 'create') {
+		$x = get_cdav_id($principalUri, $data['uri'], 'calendarinstances');
+		if(! $x)
+			return;
+		$id = [ $x['id'], $x['calendarid'] ];
+	}
+
+	$pdo = \DBA::$dba->db;
+
+	$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+	$calendars = $caldavBackend->getCalendarsForUser($principalUri);
+
+	switch($data['action']) {
+
+		case 'create':
+			$id = $caldavBackend->createCalendar($principalUri, $data['uri'], $data['properties']);
+			set_pconfig($channel['channel_id'], 'cdav_calendar', $id[0], 1);
+			break;
+
+		case 'drop':
+			$caldavBackend->deleteCalendar($id);
+			break;
+
+		case 'edit':
+			$patch = new \Sabre\DAV\PropPatch($data['mutations']);
+			$caldavBackend->updateCalendar($id, $patch);
+			$patch->commit();
+			break;
+
+		case 'delete_card':
+			$caldavBackend->deleteCalendarObject($id, $data['carduri']);
+			break;
+
+		case 'update_card':
+			$caldavBackend->updateCalendarObject($id, $data['carduri'], $data['card']);			
+			break;
+
+		case 'switch':
+			set_pconfig($channel['channel_id'], 'cdav_calendar', $id[0], $data['switch']);
+			break;
+
+		case 'import':
+			$objects = new \Sabre\VObject\Splitter\ICalendar($data['card']);
+			$profile = \Sabre\VObject\Node::PROFILE_CALDAV;
+			import_cdav_card($id, 'ics', 'calendarobjects', 'calendarid', $objects, $profile, $caldavBackend, $data['ids']);
+			break;
+
+		default:
+			break;
+	}
+}
+
+
 /**
  * @brief Rename a key in an array.
  *
diff --git a/include/items.php b/include/items.php
index bf1ddee82..9768fdf23 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1950,7 +1950,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 				$arr['item_private'] = 0;
 
 			if(in_array($arr['obj_type'], ['Note','Answer']) && $r[0]['obj_type'] === 'Question' && intval($r[0]['item_wall'])) {
-				Activity::update_poll($r[0],$arr['mid'],$arr['title']);
+				Activity::update_poll($r[0],$arr);
 			}
 
 		}
diff --git a/include/text.php b/include/text.php
index 3dd0755a3..5d1cf6eff 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1731,7 +1731,7 @@ function prepare_body(&$item,$attach = false,$opts = false) {
 		}
 	}
 
-	$poll = (($item['obj_type'] === 'Question' && in_array($item['verb'],[ ACTIVITY_POST, ACTIVITY_UPDATE ])) ? format_poll($item, $s, $opts) : false);
+	$poll = (($item['obj_type'] === 'Question' && in_array($item['verb'],[ ACTIVITY_POST, ACTIVITY_UPDATE, ACTIVITY_SHARE ])) ? format_poll($item, $s, $opts) : false);
 	if ($poll) {
 		$s = $poll;
 	}
@@ -1881,7 +1881,7 @@ function format_poll($item,$s,$opts) {
 			}
 		}
 		if ($item['comments_closed'] > NULL_DATE) {
-			$t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d h:i');
+			$t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d H:i');
 			$closed = ((datetime_convert() > $item['comments_closed']) ? true : false);
 			if ($closed) {
 				$message = t('Poll has ended.');
@@ -1892,7 +1892,7 @@ function format_poll($item,$s,$opts) {
 			$output .= EOL . '<div>' . $message . '</div>';
 		}
 		if ($activated and $commentable) {
-			$output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="vote" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>';
+			$output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="' . t("Vote") . '" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>';
 		}
 
 	}
diff --git a/include/zot.php b/include/zot.php
index d08146287..5d5ac8424 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3611,6 +3611,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 		if(array_key_exists('app',$arr) && $arr['app'])
 			sync_apps($channel,$arr['app']);
 
+		if(array_key_exists('addressbook',$arr) && $arr['addressbook'])
+			sync_addressbook($channel,$arr['addressbook']);
+
+		if(array_key_exists('calendar',$arr) && $arr['calendar'])
+			sync_calendar($channel,$arr['calendar']);
+
 		if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
 			sync_chatrooms($channel,$arr['chatroom']);