basic poll support and patch to not call System::get_platform_name() within t() unless needed. Polls probably need refining and have not yet been fully tested after porting

3 files changed, 84 insertions, 4 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 07d43e660..45b2b4d80 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -408,7 +408,7 @@ function count_descendants($item) {
  * @return boolean
  */
 function visible_activity($item) {
-	$hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE ];
+	$hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE, 'Answer' ];
 
 	if(intval($item['item_notshown']))
 		return false;
@@ -419,6 +419,8 @@ function visible_activity($item) {
 		}
 	}
 
+
+
 	if(is_edit_activity($item))
 		return false;
 
diff --git a/include/language.php b/include/language.php
index e9d62e434..622b9614d 100644
--- a/include/language.php
+++ b/include/language.php
@@ -217,9 +217,10 @@ function t($s, $ctx = '') {
  */
 
 function translate_projectname($s) {
-
-	return str_replace(array('$projectname','$Projectname'),array(Zotlabs\Lib\System::get_platform_name(),ucfirst(Zotlabs\Lib\System::get_platform_name())),$s);
-
+	if(strpos($s,'rojectname') !== false) {
+		return str_replace(array('$projectname','$Projectname'),array(Zotlabs\Lib\System::get_platform_name(),ucfirst(Zotlabs\Lib\System::get_platform_name())),$s);
+	}
+	return $s;
 }
 
 
diff --git a/include/text.php b/include/text.php
index 1f0af08e3..caecae33e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1731,6 +1731,11 @@ function prepare_body(&$item,$attach = false,$opts = false) {
 		}
 	}
 
+	$poll = (($item['obj_type'] === 'Question' && in_array($item['verb'],[ 'Create','Update' ])) ? format_poll($item, $s, $opts) : false);
+	if ($poll) {
+		$s = $poll;
+	}
+
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false);
 
 	$prep_arr = [
@@ -1814,6 +1819,78 @@ function prepare_binary($item) {
 }
 
 
+function format_poll($item,$s,$opts) {
+
+	if (! is_array($item['obj'])) {
+		$act = json_decode($item['obj'],true);
+	}
+	else {
+		$act = $item['obj'];
+	}
+
+	if (! is_array($act)) {
+		return EMPTY_STR;
+	}
+
+	$commentable = can_comment_on_post(((local_channel()) ? get_observer_hash() : EMPTY_STR),$item);
+
+	//logger('format_poll: ' . print_r($item,true));
+	$activated = ((local_channel() && local_channel() == $item['uid']) ? true : false);
+	$output = $s . EOL. EOL;
+
+	if ($act['type'] === 'Question') {
+		if ($activated and $commentable) {
+			$output .= '<form id="question-form-' . $item['id'] . '" >';
+		}
+		if (array_key_exists('anyOf',$act) && is_array($act['anyOf'])) {
+			foreach ($act['anyOf'] as $poll) {
+				if (array_key_exists('name',$poll) && $poll['name']) {
+					$text = html2plain(purify_html($poll['name']),256);
+					if (array_path_exists('replies/totalItems',$poll)) {
+						$total = $poll['replies']['totalItems'];
+					}
+					else {
+						$total = 0;
+					}
+					if ($activated && $commentable) {
+						$output .= '<input type="checkbox" name="answer[]" value="' . htmlspecialchars($text) . '"> ' . $text . '</input>' . ' (' . $total . ')' . EOL;
+					}
+					else {
+						$output .= '[ ] ' . $text . ' (' . $total . ')' . EOL;
+					}
+				}
+			}
+		}
+		if (array_key_exists('oneOf',$act) && is_array($act['oneOf'])) {
+			foreach ($act['oneOf'] as $poll) {
+				if (array_key_exists('name',$poll) && $poll['name']) {
+					$text = html2plain(purify_html($poll['name']),256);
+					if (array_path_exists('replies/totalItems',$poll)) {
+						$total = $poll['replies']['totalItems'];
+					}
+					else {
+						$total = 0;
+					}
+					if ($activated && $commentable) {
+						$output .= '<input type="radio" name="answer" value="' . htmlspecialchars($text) . '"> ' . $text . '</input>' . ' (' . $total . ')' . EOL;
+					}
+					else {
+						$output .= '( ) ' . $text . ' (' . $total . ')' . EOL;
+					}
+				}
+			}
+		}
+		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>';
+		}
+
+	}
+	return $output;
+}
+
+
+
+
 /**
  * @brief Given a text string, convert from content_type to HTML.
  *