aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-06 18:39:12 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-06 18:39:12 -0700
commit75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6 (patch)
treec66d2a27b37c15d16095b6f1f720c70917d00c98 /include
parentf17c1f96944cd347296ede2a4d0afaee17b49234 (diff)
parenta1ed2bf2ac97c438b1b44bd96b8cb07a4eb81337 (diff)
downloadvolse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.gz
volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.bz2
volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include')
-rw-r--r--include/comanche.php12
-rwxr-xr-xinclude/diaspora.php15
2 files changed, 25 insertions, 2 deletions
diff --git a/include/comanche.php b/include/comanche.php
index c1a98ed6c..7115b5635 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -133,10 +133,11 @@ function comanche_get_channel_id() {
return $channel_id;
}
-function comanche_block($s) {
+function comanche_block($s, $class = '') {
$var = array();
$matches = array();
$name = $s;
+ $class = (($class) ? $class : 'bblock widget');
$cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
if($cnt) {
@@ -155,7 +156,7 @@ function comanche_block($s) {
dbesc($name)
);
if($r) {
- $o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock widget">');
+ $o .= (($var['wrap'] == 'none') ? '' : '<div class="' . $class . '">');
if($r[0]['title'])
$o .= '<h3>' . $r[0]['title'] . '</h3>';
@@ -238,6 +239,13 @@ function comanche_region(&$a, $s) {
}
}
+ $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],comanche_block(trim($mtch[2]),trim($mtch[1])),$s);
+ }
+ }
+
// need to modify this to accept parameters
$cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
diff --git a/include/diaspora.php b/include/diaspora.php
index 1ca3cebd3..acdddd0ef 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2427,6 +2427,20 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
}
*/
+ if($item['item_flags'] & ITEM_CONSENSUS) {
+ $poll = replace_macros(get_markup_template('diaspora_consensus.tpl'), array(
+ '$guid_q' => random_string(),
+ '$question' => '',
+ '$guid_y' => random_string(),
+ '$agree' => t('Agree'),
+ '$guid_n' => random_string(),
+ '$disagree' => t('Disagree'),
+ '$guid_a' => random_string(),
+ '$abstain' => t('Abstain')
+ ));
+ }
+ else
+ $poll = '';
$public = (($item['item_private']) ? 'false' : 'true');
@@ -2451,6 +2465,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
$msg = replace_macros($tpl, array(
'$body' => xmlify($body),
'$guid' => $item['mid'],
+ '$poll' => $poll,
'$handle' => xmlify($myaddr),
'$public' => $public,
'$created' => $created,