Merge branch 'dev' into 'dev'

polls and other backend z6 compat work

See merge request hubzilla/core!1825

2 files changed, 190 insertions, 2 deletions

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 1a25e54df..8b4bbae91 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -718,7 +718,14 @@ class Item extends Controller {
 			// BBCODE alert: the following functions assume bbcode input
 			// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
 			// we may need virtual or template classes to implement the possible alternatives
-			
+
+			$obj = $this->extract_poll_data($body);
+			if ($obj) {
+				$datarray['obj'] = $obj;
+				$obj_type = 'Question';
+			}
+
+
 
 			if(strpos($body,'[/summary]') !== false) {
                 $match = '';
@@ -1387,5 +1394,57 @@ class Item extends Controller {
 		return $ret;
 	}
 	
-	
+	function extract_poll_data(&$body) {
+
+		$multiple = false;
+
+		if (strpos($body,'[/question]') === false && strpos($body,'[/answer]') === false) {
+			return false;
+		}
+		if (strpos($body,'[nobb]') !== false) {
+			return false;
+		}
+
+
+		$obj = [];
+		$ptr = [];
+		$matches = null;
+		$obj['type'] = 'Question';
+
+		if (preg_match_all('/\[answer\](.*?)\[\/answer\]/',$body,$matches,PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$ptr[] = [ 'name' => $match[1], 'type' => 'Note', 'replies' => [ 'type' => 'Collection', 'totalItems' => 0 ]];
+				$body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body);
+			}
+		}
+
+		$matches = null;
+
+		if (preg_match('/\[question\](.*?)\[\/question\]/',$body,$matches)) {
+			$obj['content'] = bbcode($matches[1]);
+			$body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body);
+			$obj['oneOf'] = $ptr;
+		}
+
+		$matches = null;
+		
+		if (preg_match('/\[question=multiple\](.*?)\[\/question\]/',$body,$matches)) {
+			$obj['content'] = bbcode($matches[1]);
+			$body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body);
+			$obj['anyOf'] = $ptr;
+		}
+
+		$matches = null;
+		
+		if (preg_match('/\[ends\](.*?)\[\/ends\]',$body,$matches)) {
+			$obj['endTime'] = datetime_convert(date_default_timezone_get(),'UTC', $matches[1],ATOM_TIME);
+			$body = str_replace('[ends]' . $match[1] . '[/ends]', EMPTY_STR, $body);
+		}
+
+		return $obj;
+
+	}
+
+
+
 }
diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php
new file mode 100644
index 000000000..52d6a4bea
--- /dev/null
+++ b/Zotlabs/Module/Vote.php
@@ -0,0 +1,129 @@
+<?php
+namespace Zotlabs\Module;
+
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Daemon\Master;
+use Zotlabs\Lib\Libsync;
+
+class Vote extends Controller {
+
+	function init() {
+
+		$ret = [ 'success' => false, 'message' => EMPTY_STR ];
+
+		$channel = App::get_channel();
+
+		if (! $channel) {
+			$ret['message'] = t('Permission denied.');
+			json_return_and_die($ret);
+		}
+
+
+		$fetch = null;
+		$id = argv(1);
+		$response = $_REQUEST['answer'];
+		
+		if ($id) {
+			$fetch = q("select * from item where id = %d limit 1",
+				intval($id)
+			);
+		}
+
+
+		if ($fetch && $fetch[0]['obj_type'] === 'Question') {
+			$obj = json_decode($fetch[0]['obj'],true);
+
+		}
+		else {
+			$ret['message'] = t('Poll not found.');
+			json_return_and_die($ret);
+		}
+
+		$valid = false;
+		
+		if ($obj['oneOf']) {
+			foreach($obj['oneOf'] as $selection) {
+				//		logger('selection: ' . $selection);
+				//		logger('response: ' . $response);
+				if($selection['name'] && $selection['name'] === $response) {
+					$valid = true;
+				}
+			}
+		}
+
+		$choices = [];
+		if ($obj['anyOf']) {
+			foreach ($obj['anyOf'] as $selection) {
+				$choices[] = $selection['name'];
+			}
+			foreach ($response as $res) {
+				if (! in_array($res,$choices)) {
+					$valid = false;
+					break;
+				}
+				$valid = true;
+			}
+		}
+
+		if (! $valid) {
+			$ret['message'] = t('Invalid response.');
+			json_return_and_die($ret);
+		}
+
+		if (! is_array($response)) {
+			$response = [ $response ];
+		}
+
+		foreach ($response as $res) {
+
+			$item = [];
+
+
+			$item['aid'] = $channel['channel_account_id'];
+			$item['uid'] = $channel['channel_id'];
+			$item['item_origin'] = true;
+			$item['parent'] = $fetch[0]['id'];
+			$item['parent_mid'] = $fetch[0]['mid'];
+			$item['uuid'] = new_uuid();
+			$item['mid'] = z_root() . '/item/' . $item['uuid'];
+			$item['verb'] = 'Answer';
+			$item['title'] = $res;
+			$item['author_xchan'] = $channel['channel_hash'];
+			$item['owner_xchan'] = $fetch[0]['author_xchan'];
+			
+			$item['obj'] = $obj;
+			$item['obj_type'] = 'Question';
+
+			$x = item_store($item); 
+
+			retain_item($fetch[0]['id']);
+
+			if($x['success']) {
+				$itemid = $x['item_id'];
+				Master::Summon( [ 'Notifier', 'like', $itemid ] );
+			}
+		
+			$r = q("select * from item where id = %d",
+				intval($itemid)
+			);
+			if ($r) {
+				xchan_query($r);
+				$sync_item = fetch_post_tags($r);
+				Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]);
+			}
+		}
+		$ret['success'] = true;
+		$ret['message'] = t('Response submitted. Updates may not appear instantly.');
+		json_return_and_die($ret);
+	}
+}
+
+
+
+
+
+
+
+