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

1 files changed, 31 insertions, 3 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 0d8dab95c..02ec7614e 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1673,8 +1673,11 @@ class Activity {
 
 
 
-	static function update_poll($item,$mid,$content) {
+	static function update_poll($item,$post) {
 		$multi = false;
+		$mid = $post['mid'];
+		$content = $post['title'];
+		
 		if (! $item) {
 			return false;
 		}
@@ -1683,6 +1686,31 @@ class Activity {
 		if ($o && array_key_exists('anyOf',$o)) {
 			$multi = true;
 		}
+
+		$r = q("select mid, title from item where parent_mid = '%s' and author_xchan = '%s'",
+			dbesc($item['mid']),
+			dbesc($post['author_xchan'])
+		);
+
+		// prevent any duplicate votes by same author for oneOf and duplicate votes with same author and same answer for anyOf
+		
+		if ($r) {
+			if ($multi) {
+				foreach ($r as $rv) {
+					if ($rv['title'] === $content && $rv['mid'] !== $mid) {
+						return false;
+					}
+				}
+			}
+			else {
+				foreach ($r as $rv) {
+					if ($rv['mid'] !== $mid) {
+						return false;
+					}
+				}
+			}
+		}
+			
 		$answer_found = false;
 		$found = false;
 		if ($multi) {
@@ -1691,7 +1719,7 @@ class Activity {
 					$answer_found = true;
 					if (is_array($o['anyOf'][$c]['replies'])) {
 						foreach($o['anyOf'][$c]['replies'] as $reply) {
-							if(array_key_exists('id',$reply) && $reply['id'] === $mid) {
+							if(is_array($reply) && array_key_exists('id',$reply) && $reply['id'] === $mid) {
 								$found = true;
 							}
 						}
@@ -1710,7 +1738,7 @@ class Activity {
 					$answer_found = true;
 					if (is_array($o['oneOf'][$c]['replies'])) {
 						foreach($o['oneOf'][$c]['replies'] as $reply) {
-							if(array_key_exists('id',$reply) && $reply['id'] === $mid) {
+							if(is_array($reply) && array_key_exists('id',$reply) && $reply['id'] === $mid) {
 								$found = true;
 							}
 						}