From 48b2eafcaaaa8cc05947c4b4b64c3e9daa78c2f4 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Mon, 20 Oct 2014 19:31:47 +0100
Subject: Prevent more than one instance of the poller running at a time.

---
 include/poller.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 61298b0ab..61d8b87cc 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -25,6 +25,15 @@ function poller_run($argv, $argc){
 	if(! $interval) 
 		$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
+	// Check for a logfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
+	$lockfile = 'store/[data]/poller';
+		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))) {
+			logger("poller: Already running");
+		return;
+                }
+	
+	// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
+	file_put_contents($lockfile, $x);
 
 	logger('poller: start');
 	
@@ -254,7 +263,7 @@ function poller_run($argv, $argc){
 	);
 
 
-	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
+	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel
 		FROM abook LEFT JOIN account on abook_account = account_id where 1
 		$sql_extra 
 		AND (( abook_flags & %d ) OR  ( abook_flags = %d )) 
@@ -310,17 +319,12 @@ function poller_run($argv, $argc){
 				// He's dead, Jim
 
 				if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {	
-					$n = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
-						dbesc($contact['abook_xchan'])
+					$r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
+						intval(ABOOK_FLAG_ARCHIVED),
+						intval($contact['abook_id'])
 					);
-					if($n && $n[0]['xchan_network'] == 'zot') {
-						$r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
-							intval(ABOOK_FLAG_ARCHIVED),
-							intval($contact['abook_id'])
-						);
-						$update = false;
-						continue;
-					}
+					$update = false;
+					continue;
 				}
 
 				if($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) {
@@ -375,7 +379,10 @@ function poller_run($argv, $argc){
 			}
 		}
 	}
-	
+
+	//All done - clear the lockfile	
+	@unlink($lockfile);
+
 	return;
 }
 
-- 
cgit v1.2.3


From 58431f948eb5e1d23548b537fdb92dea7d79e196 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Mon, 20 Oct 2014 19:35:02 +0100
Subject: Screwed up merge - put Mike's stuff back.

---
 include/poller.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 61d8b87cc..d18cb1ca6 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -263,7 +263,7 @@ function poller_run($argv, $argc){
 	);
 
 
-	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel
+	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
 		FROM abook LEFT JOIN account on abook_account = account_id where 1
 		$sql_extra 
 		AND (( abook_flags & %d ) OR  ( abook_flags = %d )) 
@@ -319,12 +319,17 @@ function poller_run($argv, $argc){
 				// He's dead, Jim
 
 				if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {	
-					$r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
-						intval(ABOOK_FLAG_ARCHIVED),
-						intval($contact['abook_id'])
+					$n = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
+						dbesc($contact['abook_xchan'])
 					);
-					$update = false;
-					continue;
+					if($n && $n[0]['xchan_network'] == 'zot') {
+						$r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
+							intval(ABOOK_FLAG_ARCHIVED),
+							intval($contact['abook_id'])
+						);
+						$update = false;
+						continue;
+					}
 				}
 
 				if($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) {
-- 
cgit v1.2.3


From cb15c73dae51c7001fa7277ef4d324645f72c5c3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 20 Oct 2014 16:47:58 -0700
Subject: move all theme initialisation to one place - just after calling
 module_init. Revert if there are serious issues, but please note the issues
 in as much detail as possible so we can work through them.

---
 include/RedDAV/RedBrowser.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index 6ec5c978d..21ea76aed 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -259,6 +259,7 @@ class RedBrowser extends DAV\Browser\Plugin {
 		$html .= $output;
 	
 		get_app()->page['content'] = $html;
+		load_pdl(get_app());
 		construct_page(get_app());
 	}
 
-- 
cgit v1.2.3


From 577d84b883b52dde84c18c659a8c4674abe4e94e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 20 Oct 2014 19:06:02 -0700
Subject: bb2diaspora wallwall comment - match both bits
 (ITEM_WALL|ITEM_ORIGIN)

---
 include/bb2diaspora.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 9a87de5b2..665fd4622 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -290,7 +290,7 @@ function bb2diaspora_itemwallwall(&$item) {
 	// We have to do something similar for wall-to-wall comments. ITEM_WALL|ITEM_ORIGIN indicates that it was posted on this site. 
 	// Regular matrix comments may have one of these bits set, but not both.
 
-	if(($item['mid'] != $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && ($item['item_flags'] & (ITEM_WALL|ITEM_ORIGIN)) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
+	if(($item['mid'] != $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (($item['item_flags'] & (ITEM_WALL|ITEM_ORIGIN)) == (ITEM_WALL|ITEM_ORIGIN)) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
 		logger('bb2diaspora_itemwallwall: wall to wall comment',LOGGER_DEBUG);
 		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
 		$item['body'] = "\n\n" 
-- 
cgit v1.2.3


From e8a7fb3d015b36af31312daf50739cf73f0f4368 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 20 Oct 2014 21:15:29 -0700
Subject: strip out the Diaspora quoted reshare markers

---
 include/bb2diaspora.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 665fd4622..5663ce9ef 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -116,6 +116,8 @@ function diaspora_mention_callback($matches) {
 function diaspora2bb($s,$use_zrl = false) {
 
 
+	$s = str_replace("&#xD;\n&gt;","",$s);
+
 	$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
 
 	// Too many new lines. So deactivated the following line
-- 
cgit v1.2.3


From 1fb2de6d55779c853e25d38f5b93133a5414d72a Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Tue, 21 Oct 2014 17:27:13 +0100
Subject: Typo

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index d18cb1ca6..f11618d37 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -25,7 +25,7 @@ function poller_run($argv, $argc){
 	if(! $interval) 
 		$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
-	// Check for a logfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
+	// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
 	$lockfile = 'store/[data]/poller';
 		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))) {
 			logger("poller: Already running");
-- 
cgit v1.2.3


From ed7712cfbf9835368de79f8686954b536c12e4d1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 21 Oct 2014 16:33:35 -0700
Subject: private forum issues

---
 include/identity.php | 3 ++-
 include/items.php    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/identity.php b/include/identity.php
index 07bfaebbd..8866b4811 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -389,7 +389,8 @@ function create_identity($arr) {
 				dbesc( t('Friends') )
 			);
 			if($r) {
-				q("update channel set channel_allow_gid = '%s' where channel_id = %d limit 1",
+				q("update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d limit 1",
+					dbesc($r[0]['hash']),
 					dbesc('<' . $r[0]['hash'] . '>'),
 					intval($newuid)
 				);
diff --git a/include/items.php b/include/items.php
index 40343d505..75eaecb20 100755
--- a/include/items.php
+++ b/include/items.php
@@ -98,6 +98,7 @@ function collect_recipients($item,&$private_envelope) {
 		}
 	}
 
+
 	// This is a somewhat expensive operation but important.
 	// Don't send this item to anybody who isn't allowed to see it
 
-- 
cgit v1.2.3


From d5edd89dd2bcfae198bb316c4f9be212937e9fa5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 21 Oct 2014 17:04:52 -0700
Subject: when removing a channel, check to see if there are any valid hublocs
 remaining before marking the xchan deleted. Issue #657

---
 include/Contact.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/Contact.php b/include/Contact.php
index 4440369dc..20e5e1a1e 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -245,11 +245,13 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
 			intval($channel_id)
 		);
 
+			
 		$r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s'",
 			intval(HUBLOC_FLAGS_DELETED),
 			dbesc($channel['channel_hash'])
 		);
 
+
 		$r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
 			intval(XCHAN_FLAGS_DELETED),
 			dbesc($channel['channel_hash'])
@@ -257,7 +259,6 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
 
 		proc_run('php','include/notifier.php','purge_all',$channel_id);
 
-
 	}
 
 	q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id));
@@ -291,11 +292,23 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
 		dbesc(z_root())
 	);
 
-	$r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' ",
-		intval(XCHAN_FLAGS_DELETED),
-		dbesc($channel['channel_hash'])
+	// Do we have any valid hublocs remaining?
+
+	$hublocs = 0;
+
+	$r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)",
+		dbesc($channel['channel_hash']),
+		intval(HUBLOC_FLAGS_DELETED)
 	);
+	if($r)
+		$hublocs = count($r);
 
+	if(! $hublocs) {
+		$r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' ",
+			intval(XCHAN_FLAGS_DELETED),
+			dbesc($channel['channel_hash'])
+		);
+	}
 
 	proc_run('php','include/directory.php',$channel_id);
 
-- 
cgit v1.2.3


From d7cb5c0436081214afefbd876a127173ebfa1b74 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 22 Oct 2014 16:41:06 -0700
Subject: you've gotta' be on your toes to catch this bug... though it's been
 here for about 2 1/2 years and even survived a rewrite. Symptoms are that the
 archive widget only lists one month (the month when you first posted), and
 only if your first post was written between the 28th and 31st of whatever
 month that was.

---
 include/items.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 75eaecb20..a0c81f5ae 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4131,7 +4131,7 @@ function list_post_dates($uid,$wall) {
 	if(intval(substr($dnow,8)) > 28)
 		$dnow = substr($dnow,0,8) . '28';
 	if(intval(substr($dthen,8)) > 28)
-		$dnow = substr($dthen,0,8) . '28';
+		$dthen = substr($dthen,0,8) . '28';
 
 	$ret = array();
 	// Starting with the current month, get the first and last days of every
@@ -4165,7 +4165,7 @@ function posted_dates($uid,$wall) {
 	if(intval(substr($dnow,8)) > 28)
 		$dnow = substr($dnow,0,8) . '28';
 	if(intval(substr($dthen,8)) > 28)
-		$dnow = substr($dthen,0,8) . '28';
+		$dthen = substr($dthen,0,8) . '28';
 
 	$ret = array();
 	// Starting with the current month, get the first and last days of every
-- 
cgit v1.2.3


From 902b5c52e5ca9359522f33bbecaf7f2f3c1ba90d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 22 Oct 2014 18:14:21 -0700
Subject: backtrack on attribution for wall-to-wall comments - triggered too
 often and unnecessarily.

---
 include/bb2diaspora.php | 18 +++++++++++-------
 include/reddav.php      |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 5663ce9ef..4f37e5aa8 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -292,14 +292,18 @@ function bb2diaspora_itemwallwall(&$item) {
 	// We have to do something similar for wall-to-wall comments. ITEM_WALL|ITEM_ORIGIN indicates that it was posted on this site. 
 	// Regular matrix comments may have one of these bits set, but not both.
 
-	if(($item['mid'] != $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (($item['item_flags'] & (ITEM_WALL|ITEM_ORIGIN)) == (ITEM_WALL|ITEM_ORIGIN)) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
-		logger('bb2diaspora_itemwallwall: wall to wall comment',LOGGER_DEBUG);
+	// Update: this is getting triggered way too often and unnecessarily. Commenting out until we find a better solution.
+	// It's not an easy problem. For now we'll live with the mis-attributions, as wall to wall comments are much less frequent
+	// than wall-to-wall posts. 
+
+//	if(($item['mid'] != $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (($item['item_flags'] & (ITEM_WALL|ITEM_ORIGIN)) == (ITEM_WALL|ITEM_ORIGIN)) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
+//		logger('bb2diaspora_itemwallwall: wall to wall comment',LOGGER_DEBUG);
 		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
-		$item['body'] = "\n\n" 
-			. '[img]' . $item['author']['xchan_photo_m'] . '[/img]' 
-			. '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n" 
-			. $item['body'];
-	}
+//		$item['body'] = "\n\n" 
+//			. '[img]' . $item['author']['xchan_photo_m'] . '[/img]' 
+//			. '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n" 
+//			. $item['body'];
+//	}
 
 	// $item['author'] might cause a surprise further down the line if it wasn't expected to be here.
  
diff --git a/include/reddav.php b/include/reddav.php
index 86b3a00e4..c16e08e27 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -50,7 +50,7 @@ function RedChannelList(&$auth) {
 	if ($r) {
 		foreach ($r as $rr) {
 			if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) {
-				logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DEBUG);
+				logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
 				// @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory
 				$ret[] = new RedDAV\RedDirectory('/cloud/' . $rr['channel_address'], $auth);
 			}
@@ -188,7 +188,7 @@ function RedCollectionData($file, &$auth) {
  * @throw \Sabre\DAV\Exception\Forbidden
  */
 function RedFileData($file, &$auth, $test = false) {
-	logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DEBUG);
+	logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
 
 	$x = strpos($file, '/cloud');
 	if ($x === 0) {
-- 
cgit v1.2.3


From 58c692e3897a7807fed23e2633496c4960f022ca Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 22 Oct 2014 20:39:49 -0700
Subject: improved wall-to-wall detection for comments so we can handle
 Diaspora signing and wall-to-wall attribution correctly. Do it at the point
 of submission. This also fixes a potential bug in yesterday's wall-to-wall
 permission setting, if it was a local comment to a remote post.

---
 include/items.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index a0c81f5ae..e3526b0a5 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2517,7 +2517,7 @@ function item_store_update($arr,$allow_exec = false) {
 	return $ret;
 }
 
-function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) {
+function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, $walltowall = false) {
 
 	// We won't be able to sign Diaspora comments for authenticated visitors 
 	// - we don't have their private key
@@ -2527,7 +2527,16 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id)
 	require_once('include/bb2diaspora.php');
 	$signed_body = bb2diaspora_itembody($datarray);
 
-	logger('mod_item: storing diaspora comment signature',LOGGER_DEBUG);
+	if($walltowall) {
+		logger('wall to wall comment',LOGGER_DEBUG);
+		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
+		$signed_body = "\n\n" 
+			. '[img]' . $datarray['author']['xchan_photo_m'] . '[/img]' 
+			. '[url=' . $datarray['author']['xchan_url'] . ']' . $datarray['author']['xchan_name'] . '[/url]' . "\n\n" 
+			. $signed_body;
+	}
+
+	logger('storing diaspora comment signature',LOGGER_DEBUG);
 
 	$diaspora_handle = $channel['channel_address'] . '@' . get_app()->get_hostname();
 
-- 
cgit v1.2.3


From 0ebfee8f87f73111b4de659ee5c97c12ad04b356 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 01:36:01 -0700
Subject: wrong permalink on remote events

---
 include/event.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/event.php b/include/event.php
index 1fe6e6f7f..03ecaa0a7 100644
--- a/include/event.php
+++ b/include/event.php
@@ -400,8 +400,7 @@ function event_store_item($arr,$event) {
 	}
 	else {
 
-		$z = q("select * from channel where channel_hash = '%s' and channel_id = %d limit 1",
-			dbesc($event['event_xchan']),
+		$z = q("select * from channel where channel_id = %d limit 1",
 			intval($arr['uid'])
 		);
 
@@ -413,7 +412,7 @@ function event_store_item($arr,$event) {
 			$item_arr['id'] = $item['id'];
 		}
 		else {
-			$wall = (($z) ? true : false);
+			$wall = (($z[0]['channel_hash'] == $event['event_xchan']) ? true : false);
 
 			$item_flags = ITEM_THREAD_TOP;
 			if($wall) {
@@ -455,7 +454,14 @@ function event_store_item($arr,$event) {
 
 		$item_arr['body']          = $prefix . format_event_bbcode($arr);
 
-		$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid'];
+		// if it's local send the permalink to the channel page.
+		// otherwise we'll fallback to /display/$message_id
+
+		if($wall)
+			$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid'];
+		else
+			$item_arr['plink'] = z_root() . '/display/' . $item_arr['mid'];
+
 
 		$x = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($arr['event_xchan'])
-- 
cgit v1.2.3


From f29c5a35f14f2a49b7c4a56fed577ebcf1010709 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Thu, 23 Oct 2014 21:50:53 +0100
Subject: Provide comment box for PERMS_AUTHED items.  Presently only
 commentable from owners wall.

---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index e3526b0a5..2805b9b21 100755
--- a/include/items.php
+++ b/include/items.php
@@ -214,6 +214,7 @@ function can_comment_on_post($observer_xchan,$item) {
 			break;
 		case 'any connections':
 		case 'contacts':
+		case 'authenticated':
 		case '':
 			if(array_key_exists('owner',$item)) {
 				if(($item['owner']['abook_xchan']) && ($item['owner']['abook_their_perms'] & PERMS_W_COMMENT))
-- 
cgit v1.2.3


From 1c4bbbd13e35e164c7da96674b3678bb1011b817 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 16:08:29 -0700
Subject: diaspora walltowall comment signature, force update.

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 2805b9b21..8d46f64c1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2526,7 +2526,7 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
 	// since Diaspora doesn't handle edits we can only do this for the original text and not update it.
 
 	require_once('include/bb2diaspora.php');
-	$signed_body = bb2diaspora_itembody($datarray);
+	$signed_body = bb2diaspora_itembody($datarray,$walltowall);
 
 	if($walltowall) {
 		logger('wall to wall comment',LOGGER_DEBUG);
-- 
cgit v1.2.3


From 241bb3b94059ac4edfcc3b66e907dbf493dd8b4a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 19:33:47 -0700
Subject: API: xchan get/create

---
 include/api.php    | 12 ++++++++
 include/hubloc.php | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 8b52253dd..9fe2ef47d 100644
--- a/include/api.php
+++ b/include/api.php
@@ -621,7 +621,19 @@ require_once('include/items.php');
 	api_register_func('api/red/group','api_group', true);
 
 
+	function api_red_xchan(&$a,$type) {
+		if(api_user() === false)
+			return false;
+		require_once('include/hubloc.php');
+		if($_SERVER['request_method'] === 'POST') {
+			$r = xchan_store($_REQUEST);
+		}
+		$r = xchan_fetch($_REQUEST);
+		json_return_and_die($r);
+	};
 
+	api_register_func('api/red/xchan','api_red_xchan',true);
+	
 
     function api_statuses_mediap(&$a, $type) {
 		if (api_user() === false) {
diff --git a/include/hubloc.php b/include/hubloc.php
index 04c29315a..df817329f 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -170,4 +170,82 @@ function hubloc_change_primary($hubloc) {
 	return true;
 
 }
-	
\ No newline at end of file
+	
+
+function xchan_store($arr) {
+
+	if(! $arr['hash'])
+		$arr['hash'] = $arr['guid'];
+	if(! $arr['hash'])
+		return false;
+
+	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+		dbesc($arr['hash'])
+	);
+	if($r)
+		return true;
+
+	if(! $arr['network'])
+		$arr['network'] = 'unknown';
+	if(! $arr['name'])
+		$arr['name'] = 'unknown';
+	if(! $arr['url'])
+		$arr['url'] = z_root();
+	if(! $arr['photo'])
+		$arr['photo'] = get_default_profile_photo();
+
+	$r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_instance_url, xchan_flags, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s','%s','%s','%s',%d,'%s') ",
+		dbesc($arr['hash']),
+		dbesc($arr['guid']),
+		dbesc($arr['guid_sig']),
+		dbesc($arr['pubkey']),
+		dbesc($arr['address']),
+		dbesc($arr['url']),
+		dbesc($arr['connurl']),
+		dbesc($arr['follow']),
+		dbesc($arr['connpage']),
+		dbesc($arr['name']),
+		dbesc($arr['network']),
+		dbesc($arr['instance_url']),
+		intval($arr['flags']),
+		dbesc(datetime_convert())
+	);
+	if(! $r)
+		return $r;
+
+	$photos = import_profile_photo($arr['photo'],$arr['hash']);
+	$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1",
+		dbesc(datetime_convert()),
+		dbesc($photos[0]),
+		dbesc($photos[1]),
+		dbesc($photos[2]),
+		dbesc($photos[3]),
+		dbesc($arr['hash'])
+	);
+	return $r;
+
+}
+
+
+function xchan_fetch($arr) {
+
+	$key = '';
+	if($arr['hash']) {
+		$key = 'xchan_hash';
+		$v = $arr['hash'];
+	}
+	elseif($arr['guid']) {
+		$key = 'xchan_guid';
+		$v = $arr['guid'];
+	}
+	elseif($arr['address']) {
+		$key = 'xchan_addr';
+		$v = $arr['address'];
+	}
+
+	if(! $key)
+		return false;
+
+	$r = q("select * from xchan where $key = '$v'");
+	return $r;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From f524fb1f20ec3edb0cf2c486d41f6bb65a60db6a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 19:41:42 -0700
Subject: generalise the output format of xchan_fetch so it matches the input
 format

---
 include/hubloc.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/hubloc.php b/include/hubloc.php
index df817329f..0a1b51331 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -247,5 +247,15 @@ function xchan_fetch($arr) {
 		return false;
 
 	$r = q("select * from xchan where $key = '$v'");
-	return $r;
+	if(! $r)
+		return false;
+
+	$ret = array();
+	foreach($r as $k => $v) {
+		if($k === 'xchan_addr')
+			$ret['address'] = $v;
+		else
+			$ret[str_replace('xchan_','',$k)] = $v;
+	}
+	return $ret;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 34781433c1fabd7a4992497da5ee475db0ada3a8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 21:20:12 -0700
Subject: I'm speechless. This is just reckless. Set a context flag in text
 using a context trigger character which is likely to be present in that text
 already. Without escaping any previous instances of that character. Grrr.

---
 include/html2bbcode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 6d6e6333b..9ffc85a82 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -16,7 +16,7 @@ function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 
 function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
-	$savestart = str_replace('$', '%', $startbb);
+	$savestart = str_replace('$', '\x01', $startbb);
 	$replace = false;
 
 	$xpath = new DomXPath($doc);
@@ -37,7 +37,7 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 
 		foreach ($attributes as $attribute => $value) {
 
-			$startbb = str_replace('%'.++$i, '$1', $startbb);
+			$startbb = str_replace('\x01'.++$i, '$1', $startbb);
 
 			if (strpos('*'.$startbb, '$1') > 0) {
 
-- 
cgit v1.2.3


From 1845ddc4c3d3f729dde3905f0f87741ac3d3bf66 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 24 Oct 2014 04:17:48 -0700
Subject: don't decrypt the message body more than once.

---
 include/bb2diaspora.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 4f37e5aa8..d094e33c2 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -340,8 +340,13 @@ function bb2diaspora_itembody($item,$force_update = false) {
 
 	if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
 		$key = get_config('system','prvkey');
-		$newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : '');
-		$newitem['body']  = (($item['body'])  ? crypto_unencapsulate(json_decode($item['body'],true),$key) : '');
+		$b = json_decode($item['title'],true);
+		// if called from diaspora_process_outbound, this decoding has already been done.
+		// Everything else that calls us will not yet be decoded.
+		if($b && is_array($b) && array_key_exists('iv',$b)) {
+			$newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : '');
+			$newitem['body']  = (($item['body'])  ? crypto_unencapsulate(json_decode($item['body'],true),$key) : '');
+		}
 	}
 
 	bb2diaspora_itemwallwall($newitem);
-- 
cgit v1.2.3


From cf05266b15e49020c217107fd81896171d5ef26b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 24 Oct 2014 14:04:32 -0700
Subject: should probably check the body since the title is only going to be
 rarely set.

---
 include/bb2diaspora.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index d094e33c2..8a178d1ac 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -340,7 +340,7 @@ function bb2diaspora_itembody($item,$force_update = false) {
 
 	if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
 		$key = get_config('system','prvkey');
-		$b = json_decode($item['title'],true);
+		$b = json_decode($item['body'],true);
 		// if called from diaspora_process_outbound, this decoding has already been done.
 		// Everything else that calls us will not yet be decoded.
 		if($b && is_array($b) && array_key_exists('iv',$b)) {
-- 
cgit v1.2.3


From ce8a891682a7d8ceca71ec762063367744428a53 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 24 Oct 2014 14:18:02 -0700
Subject: doh - this needs to be markdown, not bbcode

---
 include/items.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 8d46f64c1..41c211953 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2532,8 +2532,8 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
 		logger('wall to wall comment',LOGGER_DEBUG);
 		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
 		$signed_body = "\n\n" 
-			. '[img]' . $datarray['author']['xchan_photo_m'] . '[/img]' 
-			. '[url=' . $datarray['author']['xchan_url'] . ']' . $datarray['author']['xchan_name'] . '[/url]' . "\n\n" 
+			. '![' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_photo_m'] . ')'
+			. '[' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_url'] . ')' . "\n\n" 
 			. $signed_body;
 	}
 
-- 
cgit v1.2.3


From 655c3e1b4784f4bc37af1e1db0d7bcf313e71e66 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Oct 2014 19:32:12 -0700
Subject: put privacy role selector in settings page. Change visibility of
 various permissions items accordingly.

---
 include/permissions.php |  4 ++++
 include/widgets.php     | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/permissions.php b/include/permissions.php
index 61ac8aea3..4eead563f 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -734,6 +734,10 @@ function get_role_perms($role) {
 
 
 function role_selector($current) {
+
+	if(! $current)
+		$current = 'custom';
+
 	$roles = array(
 		'social' => array( t('Social Networking'), 
 			array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private'))),
diff --git a/include/widgets.php b/include/widgets.php
index 8905df59a..2e406aa77 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -430,6 +430,8 @@ function widget_settings_menu($arr) {
 
 	// Retrieve the 'self' address book entry for use in the auto-permissions link
 
+	$role = get_pconfig(local_user(),'system','permissions_role');
+
 	$abk = q("select abook_id from abook where abook_channel = %d and ( abook_flags & %d ) limit 1",
 		intval(local_user()),
 		intval(ABOOK_FLAG_SELF)
@@ -487,14 +489,15 @@ function widget_settings_menu($arr) {
 			'selected' => ''
 		),
 
-		array(
+	);
+
+	if($role === false || $role === 'custom') {
+		$tabs[] = array(
 			'label' => t('Automatic Permissions (Advanced)'),
 			'url' => $a->get_baseurl(true) . '/connedit/' . $abook_self_id,
 			'selected' => ''
-		),
-
-
-	);
+		);
+	}
 
 	if(feature_enabled(local_user(),'premium_channel')) {
 		$tabs[] = array(
-- 
cgit v1.2.3


From be8a01618e5577e8324ebc59230165f233a20e89 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Oct 2014 21:56:56 -0700
Subject: turn down the preview logging. Haven't needed that level of detail
 recently.

---
 include/conversation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index b22b570a1..48fe8af60 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -827,8 +827,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 		$threads = null;
 	}
 
-	if($page_mode === 'preview')
-		logger('preview: ' . print_r($threads,true));
+//	if($page_mode === 'preview')
+//		logger('preview: ' . print_r($threads,true));
 
 //  Do not un-comment if smarty3 is in use
 //	logger('page_template: ' . $page_template);
-- 
cgit v1.2.3


From 583b445bc02c988e808742b16196e0d80391b3cc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 27 Oct 2014 16:19:30 -0700
Subject: add "repository" permissions role and make sure we have a sane
 "accept" default for the custom role.

---
 include/permissions.php | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/permissions.php b/include/permissions.php
index 4eead563f..186ba32d8 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -460,6 +460,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -492,6 +493,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -524,6 +526,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_SPECIFIC;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -555,6 +558,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -586,6 +590,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -618,6 +623,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_SPECIFIC;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_CONTACTS;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_CONTACTS;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -649,6 +655,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_NETWORK;
@@ -681,6 +688,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = PERMS_CONTACTS;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -710,6 +718,7 @@ function get_role_perms($role) {
 			$ret['channel_w_chat']      = 0;
 			$ret['channel_a_delegate']  = 0;
 			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = 0;
 			$ret['channel_r_pages']     = PERMS_PUBLIC;
 			$ret['channel_w_pages']     = 0;
 			$ret['channel_a_republish'] = PERMS_SPECIFIC;
@@ -717,6 +726,40 @@ function get_role_perms($role) {
 			
 			break;
 
+		case 'repository':
+			$ret['perms_auto'] = true;
+			$ret['default_collection'] = false;
+			$ret['directory_publish'] = true;
+			$ret['online'] = false;
+			$ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
+				|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+				|PERMS_R_STORAGE|PERMS_W_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
+			$ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
+				|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+				|PERMS_R_STORAGE|PERMS_W_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
+			$ret['channel_r_stream']    = PERMS_PUBLIC;
+			$ret['channel_r_profile']   = PERMS_PUBLIC;
+			$ret['channel_r_photos']    = PERMS_PUBLIC; 			
+			$ret['channel_r_abook']     = PERMS_PUBLIC;
+			$ret['channel_w_stream']    = PERMS_CONTACTS;
+			$ret['channel_w_wall']      = PERMS_CONTACTS;
+			$ret['channel_w_tagwall']   = PERMS_CONTACTS;
+			$ret['channel_w_comment']   = PERMS_CONTACTS;
+			$ret['channel_w_mail']      = PERMS_CONTACTS;
+			$ret['channel_w_photos']    = PERMS_CONTACTS;
+			$ret['channel_w_chat']      = PERMS_CONTACTS;
+			$ret['channel_a_delegate']  = 0;
+			$ret['channel_r_storage']   = PERMS_PUBLIC;
+			$ret['channel_w_storage']   = PERMS_CONTACTS;
+			$ret['channel_r_pages']     = PERMS_PUBLIC;
+			$ret['channel_w_pages']     = PERMS_CONTACTS;
+			$ret['channel_a_republish'] = PERMS_SPECIFIC;
+			$ret['channel_w_like']      = PERMS_NETWORK;
+			
+			break;
+
+
+
 		default:
 			break;
 	
@@ -745,8 +788,8 @@ function role_selector($current) {
 			array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private'))),
 		'feed' => array( t('Feed Republish'), 
 			array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted'))),
-		'soapbox' => array( t('Celebrity/Soapbox'),
-			array('soapbox' => t('Mostly Public'))),
+		'special' => array( t('Special Purpose'),
+			array('soapbox' => t('Celebrity/Soapbox'), 'repository' => t('Group Repository'))),
 		'other' => array( t('Other'),
 			array('custom' => t('Custom/Expert Mode'))));
 	$o = '<select name="permissions_role" id="privacy-role-select">';
-- 
cgit v1.2.3


From 9cc76cb33da489c01731ecb5195f8bb3d51ce513 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 27 Oct 2014 19:21:41 -0700
Subject: several unrelated things - auto_follow wasn't working for new
 accounts, error returned in private mention to a collection, and added
 auto-completion to photo tags; though it only matches people so the hover
 text is now wrong. Also made the photo edit form XHTML (XML) compliant.

---
 include/follow.php   | 2 ++
 include/identity.php | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/follow.php b/include/follow.php
index c8bd3c500..14385d90d 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -13,6 +13,8 @@ require_once('include/zot.php');
 
 function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) {
 
+
+
 	$result = array('success' => false,'message' => '');
 
 	$a = get_app();
diff --git a/include/identity.php b/include/identity.php
index 8866b4811..9a574ea65 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -176,6 +176,7 @@ function create_identity($arr) {
 	// save this for auto_friending
 	$total_identities = $ret['total_identities'];
 
+
 	$nick = mb_strtolower(trim($arr['nickname']));
 	if(! $nick) {
 		$ret['message'] = t('Nickname is required.');
@@ -404,6 +405,7 @@ function create_identity($arr) {
 
 		$accts = get_config('system','auto_follow');
 		if(($accts) && (! $total_identities)) {
+			require_once('include/follow.php');
 			if(! is_array($accts))
 				$accts = array($accts);
 			foreach($accts as $acct) {
-- 
cgit v1.2.3


From d9c5823593400ec82ce7e547a1a0c9674aa1f248 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 28 Oct 2014 19:29:37 -0700
Subject: the default permissions for new connections when using a custom role
 is inadequate. Until we can make it configurable start off with something
 like a public social role. We're typically taking the person straight to the
 connection editor so they can change it before any privacy damage is done

---
 include/follow.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/follow.php b/include/follow.php
index 14385d90d..20fd7f5fc 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -66,7 +66,11 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 
 	if($is_red && $j) {
 
-		$my_perms = PERMS_W_STREAM|PERMS_W_MAIL;
+
+		// fixme - we need to be able to define these somewhere for the custom role
+		$my_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
+			|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+			|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE;
 
 		$role = get_pconfig($uid,'system','permissions_role');
 		if($role) {
-- 
cgit v1.2.3


From fc704d1f2f274dd8a4c2906b9c017187c34a4060 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Wed, 29 Oct 2014 14:29:38 +0100
Subject: if someone does not have permission to chat do not show the chatrooms
 tab

---
 include/conversation.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 48fe8af60..a531de9ba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1551,16 +1551,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		);
 	}
 
-	require_once('include/chat.php');
-	$has_chats = chatroom_list_count($uid);
-	if ($has_chats) {
-		$tabs[] = array(
-			'label' => t('Chatrooms'),
-			'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
-			'sel' 	=> ((argv(0) == 'chat') ? 'active' : '' ),
-			'title' => t('Chatrooms'),
-			'id'    => 'chat-tab',
-		);
+	if($p['chat']) {
+		require_once('include/chat.php');
+		$has_chats = chatroom_list_count($uid);
+		if ($has_chats) {
+			$tabs[] = array(
+				'label' => t('Chatrooms'),
+				'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
+				'sel' 	=> ((argv(0) == 'chat') ? 'active' : '' ),
+				'title' => t('Chatrooms'),
+				'id'    => 'chat-tab',
+			);
+		}
 	}
 
 	require_once('include/menu.php');
-- 
cgit v1.2.3


From 28a35261dbc8c21e27ca4a449ff5cd6cb0501c8a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 30 Oct 2014 19:15:03 -0700
Subject: What this checkin does is catch the case where a comment arrived and
 there's a missing top-level post to match it with. So we'll send a request
 back to the sender that you've never seen this thread and please send a fresh
 copy of the entire conversation to date. We could soon have posts in the
 matrix from different platforms from days gone by, which have been migrated
 into the modern world. We'll be polite and not deliver these to everybody.
 However, if someone comments on one of these antique threads we wouldn't be
 able to see it in our own matrix because we won't have a copy of the parent
 post. So this rectifies that situation. Be aware that item deletion may need
 to change to keep "hard deleted" items indefinitely so that they don't keep
 coming back. We'll have to null out the important data of the former item to
 accomplish the deletion aspect.

---
 include/deliver.php  | 23 ++++++++++++---
 include/items.php    | 21 +++++++++++--
 include/notifier.php | 35 ++++++++++++++++++++++
 include/onepoll.php  | 21 ++++++-------
 include/zot.php      | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 163 insertions(+), 20 deletions(-)

(limited to 'include')

diff --git a/include/deliver.php b/include/deliver.php
index f4fae6061..8f6ba543d 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -38,15 +38,30 @@ function deliver_run($argv, $argc) {
 				continue;
 			}
 
-			if($r[0]['outq_posturl'] === z_root() . '/post') {
+			$notify = json_decode($r[0]['outq_notify'],true);
+
+			$sendtoweb = false;
+			if(array_key_exists('iv',$notify) && (! $r[0]['outq_msg']))
+				$sendtoweb = true;
+
+			if(($r[0]['outq_posturl'] === z_root() . '/post') && (! $sendtoweb)) {
 				logger('deliver: local delivery', LOGGER_DEBUG);
 				// local delivery
 				// we should probably batch these and save a few delivery processes
 				// If there is no outq_msg, this is a refresh_all message which does not require local handling
+				// also send 'request' packets to the webservice so it can decode the packet
 				if($r[0]['outq_msg']) {
-					$msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true))))));
-
-					zot_import($msg,z_root());
+					$m = json_decode($r[0]['outq_msg'],true);
+					if(array_key_exists('message_list',$m)) {
+						foreach($m['message_list'] as $mm) {
+							$msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $mm)))));
+							zot_import($msg,z_root());
+						}
+					}	
+					else {	
+						$msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $m)))));
+						zot_import($msg,z_root());
+					}
 					$r = q("delete from outq where outq_hash = '%s' limit 1",
 						dbesc($argv[$x])
 					);
diff --git a/include/items.php b/include/items.php
index 41c211953..d173e1a98 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4249,14 +4249,24 @@ function fetch_post_tags($items,$link = false) {
 
 
 
-function zot_feed($uid,$observer_xchan,$mindate) {
+function zot_feed($uid,$observer_xchan,$arr) {
 
 
 	$result = array();
-	$mindate = datetime_convert('UTC','UTC',$mindate);
+	$mindate = null;
+	$message_id = null;
+
+	if(array_key_exists('mindate',$arr)) {
+		$mindate = datetime_convert('UTC','UTC',$arr['mindate']);
+	}
+
+	if(array_key_exists('message_id',$arr)) {
+		$message_id = $arr['message_id'];
+	}
+
+
 	if(! $mindate)
 		$mindate = NULL_DATE;
-
 	$mindate = dbesc($mindate);
 
 	logger('zot_feed: ' . $uid);
@@ -4278,6 +4288,11 @@ function zot_feed($uid,$observer_xchan,$mindate) {
 	else
 		$limit = " limit 0, 50 ";
 
+	if($message_id) {
+		$sql_extra .= " and mid = '" . dbesc($message_id) . "' ";
+		$limit = '';
+	}
+
 	$items = array();
 
 	if(is_sys_channel($uid)) {
diff --git a/include/notifier.php b/include/notifier.php
index 79a6886ad..57494885a 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -58,6 +58,7 @@ require_once('include/html2plain.php');
  *       expire                 channel_id
  *       relay					item_id (item was relayed to owner, we will deliver it as owner)
  *       location               channel_id
+ *       request                channel_id            xchan_hash             message_id
  *
  */
 
@@ -142,6 +143,7 @@ function notifier_run($argv, $argc){
 
 
 	$expire = false;
+	$request = false;
 	$mail = false;
 	$fsuggest = false;
 	$top_level = false;
@@ -174,6 +176,23 @@ function notifier_run($argv, $argc){
 		if($s)
 			$channel = $s[0];
 
+	}
+	elseif($cmd === 'request') {
+		$channel_id = $item_id;
+		$xchan = $argv[3];
+		$request_message_id = $argv[4];
+
+		$s = q("select * from channel where channel_id = %d limit 1",
+			intval($channel_id)
+		);
+		if($s)
+			$channel = $s[0];
+
+		$private = true;
+		$recipients[] = $xchan;
+		$packet_type = 'request';
+		$normal_mode = false;
+
 	}
 	elseif($cmd === 'expire') {
 
@@ -550,6 +569,7 @@ function notifier_run($argv, $argc){
 				'mail' => $mail,
 				'location' => $location,
 				'fsuggest' => $fsuggest,
+				'request' => $request,
 				'normal_mode' => $normal_mode,
 				'packet_type' => $packet_type,
 				'walltowall' => $walltowall
@@ -579,6 +599,21 @@ function notifier_run($argv, $argc){
 				dbesc('')
 			);
 		}
+		elseif($packet_type === 'request') {
+			$n = zot_build_packet($channel,'request',$env_recips,$hub['hubloc_sitekey'],$hash,array('message_id' => $request_message_id));
+			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+				dbesc($hash),
+				intval($channel['channel_account_id']),
+				intval($channel['channel_id']),
+				dbesc('zot'),
+				dbesc($hub['hubloc_callback']),
+				intval(1),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc($n),
+				dbesc('')
+			);
+		}
 		else {
 			$n = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
 			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
diff --git a/include/onepoll.php b/include/onepoll.php
index 98d52db93..7a81282b3 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -15,12 +15,6 @@ function onepoll_run($argv, $argc){
 
 	logger('onepoll: start');
 	
-	$manual_id  = 0;
-	$generation = 0;
-
-	$force      = false;
-	$restart    = false;
-
 	if(($argc > 1) && (intval($argv[1])))
 		$contact_id = intval($argv[1]);
 
@@ -28,7 +22,7 @@ function onepoll_run($argv, $argc){
 		logger('onepoll: no contact');
 		return;
 	}
-	
+
 	$d = datetime_convert();
 
 	$contacts = q("SELECT abook.*, xchan.*, account.*
@@ -90,7 +84,8 @@ function onepoll_run($argv, $argc){
 	$x = zot_refresh($contact,$importer);
 
 	$responded = false;
-	$updated = datetime_convert();
+	$updated   = datetime_convert();
+	$connected = datetime_convert();
 	if(! $x) {
 		// mark for death by not updating abook_connected, this is caught in include/poller.php
 		q("update abook set abook_updated = '%s' where abook_id = %d limit 1",
@@ -101,7 +96,7 @@ function onepoll_run($argv, $argc){
 	else {
 		q("update abook set abook_updated = '%s', abook_connected = '%s' where abook_id = %d limit 1",
 			dbesc($updated),
-			dbesc($updated),
+			dbesc($connected),
 			intval($contact['abook_id'])
 		);
 		$responded = true;
@@ -120,7 +115,9 @@ function onepoll_run($argv, $argc){
 		if($fetch_feed) {
 
 			$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
-			$x = z_fetch_url($feedurl . '?f=&mindate=' . urlencode($last_update));
+			$feedurl .= '?f=&mindate=' . urlencode($last_update);
+
+			$x = z_fetch_url($feedurl);
 
 			logger('feed_update: ' . print_r($x,true), LOGGER_DATA);
 
@@ -143,8 +140,8 @@ function onepoll_run($argv, $argc){
 		}
 	}
 			
-	// fetch some items
-	// set last updated timestamp
+
+	// update the poco details for this connection
 
 	if($contact['xchan_connurl']) {	
 		$r = q("SELECT xlink_id from xlink 
diff --git a/include/zot.php b/include/zot.php
index e96eae10d..3a5139755 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -104,7 +104,7 @@ function zot_get_hublocs($hash) {
  * @returns string json encoded zot packet
  */
 
-function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) {
+function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null, $extra = null) {
 
 	$data = array(
 		'type' => $type,
@@ -129,6 +129,12 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
 		$data['secret_sig'] = base64url_encode(rsa_sign($secret,$channel['channel_prvkey']));
 	}
 
+	if($extra) {
+		foreach($extra as $k => $v)
+			$data[$k] = $v;
+	}
+
+
 	logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA);
 
 	// Hush-hush ultra top-secret mode
@@ -1436,6 +1442,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
 			);
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
+
+				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
+				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
+
+				if(! $relay)
+					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
+
 				continue;
 			}
 			if($relay) {
@@ -2793,3 +2806,71 @@ function import_author_zot($x) {
 	return false;
 }
 
+function zot_process_message_request($data) {
+	$ret = array('success' => false);
+	if(! $data['message_id']) {
+		$ret['message'] = 'no message_id';
+		logger('no message_id');
+		return $ret;
+	}
+
+	$sender = $data['sender'];
+	$sender_hash = make_xchan_hash($sender['guid'],$sender['guid_sig']);
+
+	$arr = $data['recipients'][0];
+	$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
+	$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
+		dbesc($recip_hash)
+	);
+	if(! $c) {
+		logger('recipient channel not found.');
+		$ret['message'] .= 'recipient not found.' . EOL;
+		return $ret;
+	}
+	$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
+	if($messages) {
+		$env_recips = null;
+
+		$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host 
+			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)
+			and not (hubloc_status & %d) group by hubloc_sitekey",
+            intval(HUBLOC_FLAGS_DELETED),
+            intval(HUBLOC_OFFLINE)
+        );
+	    if(! $r) {
+	        logger('no hubs');
+    	    return $ret;
+    	}
+		$hubs = $r;
+		$hublist = array();
+		$keys = array();
+
+		$private = ((array_key_exists('flags',$messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
+		if($private)
+			$env_recips = array('guid' => $sender['guid'],'guid_sig' => $sender['guid_sig'],'hash' => $sender_hash);
+		$data_packet = json_encode(array('message_list' => $messages));
+		
+		foreach($hubs as $hub) {
+			$hash = random_string();
+			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
+			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
+				outq_created, outq_updated, outq_notify, outq_msg ) 
+				values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+				dbesc($hash),
+				intval($c[0]['channel_account_id']),
+				intval($c[0]['channel_id']),
+				dbesc('zot'),
+				dbesc($hub['hubloc_callback']),
+				intval(1),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc($n),
+				dbesc($data_packet)
+			);
+			proc_run('php','include/deliver.php',$hash);
+		}
+
+	}
+	$ret['success'] = true;
+	return $ret;
+}
-- 
cgit v1.2.3


From 5637d0713865a179ad997a75825d623f13155358 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 31 Oct 2014 04:59:30 -0700
Subject: flag notify packets that are sent in response to a message_id request
 and prevent them from recursing

---
 include/zot.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/zot.php b/include/zot.php
index 3a5139755..0cbef1ad3 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1081,6 +1081,7 @@ function zot_import($arr, $sender_url) {
 				continue;
 			}
 
+			$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
 
 			$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
 			$deliveries = null;
@@ -1182,7 +1183,7 @@ function zot_import($arr, $sender_url) {
 					logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA);
 
 					$relay = ((array_key_exists('flags',$i['message']) && in_array('relay',$i['message']['flags'])) ? true : false);
-					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay);
+					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay,false,$message_request);
 
 				}
 				elseif($i['message']['type'] === 'mail') {
@@ -1379,7 +1380,7 @@ function allowed_public_recips($msg) {
 }
 
 
-function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
+function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$request = false) {
 
 	$result = array();
 
@@ -1446,7 +1447,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
 				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
 
-				if(! $relay)
+				if((! $relay) && (! $request))
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
 
 				continue;
@@ -2852,7 +2853,7 @@ function zot_process_message_request($data) {
 		
 		foreach($hubs as $hub) {
 			$hash = random_string();
-			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
+			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
 			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
 				outq_created, outq_updated, outq_notify, outq_msg ) 
 				values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-- 
cgit v1.2.3


From 1cb45c30e9032794b7827738cc28f7728ac28677 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 31 Oct 2014 06:24:14 -0700
Subject: document request packets a bit more

---
 include/zot.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/zot.php b/include/zot.php
index 0cbef1ad3..c9a17562e 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1444,8 +1444,11 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
 
-				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
+				// We don't seem to have a copy of this conversation or at least the parent - so request a copy of the entire conversation to date.
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
+				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
+				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
+				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). 
 
 				if((! $relay) && (! $request))
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
-- 
cgit v1.2.3


From a659ac8952306b5a78a468051d3c318f50294bcf Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 1 Nov 2014 00:36:21 -0700
Subject: disable request message response until we work through this

---
 include/notifier.php | 1 -
 include/zot.php      | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/notifier.php b/include/notifier.php
index 57494885a..c193db116 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -192,7 +192,6 @@ function notifier_run($argv, $argc){
 		$recipients[] = $xchan;
 		$packet_type = 'request';
 		$normal_mode = false;
-
 	}
 	elseif($cmd === 'expire') {
 
diff --git a/include/zot.php b/include/zot.php
index c9a17562e..4c47d60b8 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2812,6 +2812,9 @@ function import_author_zot($x) {
 
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
+
+	return $ret;
+
 	if(! $data['message_id']) {
 		$ret['message'] = 'no message_id';
 		logger('no message_id');
-- 
cgit v1.2.3


From 50c16c394fe2d966c62d30930600212a4e33303e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 1 Nov 2014 01:52:27 -0700
Subject: check that we have valid data

---
 include/zot.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/zot.php b/include/zot.php
index 4c47d60b8..24ace9cbb 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2813,6 +2813,7 @@ function import_author_zot($x) {
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
 
+// note: disabled until the loops stop.
 	return $ret;
 
 	if(! $data['message_id']) {
-- 
cgit v1.2.3


From 4274a2d06c9ee2c28acba0dac3d5353e13776581 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 00:06:52 -0700
Subject: add some more safety checks before turning the conversation request
 messages back on

---
 include/photos.php | 2 +-
 include/zot.php    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/photos.php b/include/photos.php
index badbbd791..adb7c988a 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -178,7 +178,7 @@ function photo_upload($channel, $observer, $args) {
 	if($args['title'])
 		$p['title'] = $args['title'];
 	if($args['description'])
-		$p['desciprion'] = $args['description'];
+		$p['description'] = $args['description'];
 
 
 	$r1 = $ph->save($p);
diff --git a/include/zot.php b/include/zot.php
index 24ace9cbb..153fa28bf 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1448,11 +1448,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
 				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
 				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
-				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). 
+				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
+				// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
+				// this is just an exercise in futility.   
 
-				if((! $relay) && (! $request))
+				if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
-
+				}
 				continue;
 			}
 			if($relay) {
-- 
cgit v1.2.3


From 285d6f61e4bf8aeaa3294ac4b7af43366a1448e9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 15:28:20 -0800
Subject: I'm going to try again with the conversation request packets. I've
 looked this over and tested a lot of edge cases, and thought about from every
 angle I can think of to prevent looping. I don't *think* this can loop. I
 also doubt that this is the problem at friendicared.de, but I don't know for
 sure what that problem might be.

---
 include/deliver.php |  7 ++++--
 include/zot.php     | 66 ++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 60 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/deliver.php b/include/deliver.php
index 8f6ba543d..729018448 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -40,6 +40,10 @@ function deliver_run($argv, $argc) {
 
 			$notify = json_decode($r[0]['outq_notify'],true);
 
+			// Check if this is a conversation request packet. It won't have outq_msg
+			// but will be an encrypted packet - so will need to be handed off to
+			// web delivery rather than processed inline. 
+
 			$sendtoweb = false;
 			if(array_key_exists('iv',$notify) && (! $r[0]['outq_msg']))
 				$sendtoweb = true;
@@ -48,8 +52,7 @@ function deliver_run($argv, $argc) {
 				logger('deliver: local delivery', LOGGER_DEBUG);
 				// local delivery
 				// we should probably batch these and save a few delivery processes
-				// If there is no outq_msg, this is a refresh_all message which does not require local handling
-				// also send 'request' packets to the webservice so it can decode the packet
+
 				if($r[0]['outq_msg']) {
 					$m = json_decode($r[0]['outq_msg'],true);
 					if(array_key_exists('message_list',$m)) {
diff --git a/include/zot.php b/include/zot.php
index 153fa28bf..f18830e78 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1082,6 +1082,8 @@ function zot_import($arr, $sender_url) {
 			}
 
 			$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
+			if($message_request)
+				logger('processing message request');
 
 			$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
 			$deliveries = null;
@@ -1444,15 +1446,22 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
 
-				// We don't seem to have a copy of this conversation or at least the parent - so request a copy of the entire conversation to date.
-				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
-				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
-				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
-				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
-				// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
+				// We don't seem to have a copy of this conversation or at least the parent 
+				// - so request a copy of the entire conversation to date.
+				// Don't do this if it's a relay post as we're the ones who are supposed to 
+				// have the copy and we don't want the request to loop.
+				// Also don't do this if this comment came from a conversation request packet.
+				// It's possible that comments are allowed but posting isn't and that could
+				// cause a conversation fetch loop. We can detect these packets since they are 
+				// delivered via a 'notify' packet type that has a message_id element in the 
+				// initial zot packet (just like the corresponding 'request' packet type which 
+				// makes the request).
+				// We'll also check the send_stream permission - because if it isn't allowed,
+				// the top level post is unlikely to be imported and
 				// this is just an exercise in futility.   
 
-				if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
+				if((! $relay) && (! $request) && (! $public) 
+					&& perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
 				}
 				continue;
@@ -2812,12 +2821,25 @@ function import_author_zot($x) {
 	return false;
 }
 
+
+/**
+ * @function zot_process_message_request($data)
+ *    If a site receives a comment to a post but finds they have no parent to attach it with, they
+ * may send a 'request' packet containing the message_id of the missing parent. This is the handler
+ * for that packet. We will create a message_list array of the entire conversation starting with
+ * the missing parent and invoke delivery to the sender of the packet.
+ *
+ * include/deliver.php (for local delivery) and mod/post.php (for web delivery) detect the existence of 
+ * this 'message_list' at the destination and split it into individual messages which are 
+ * processed/delivered in order.  
+ *  
+ * Called from mod/post.php
+ */  
+
+
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
 
-// note: disabled until the loops stop.
-	return $ret;
-
 	if(! $data['message_id']) {
 		$ret['message'] = 'no message_id';
 		logger('no message_id');
@@ -2827,6 +2849,10 @@ function zot_process_message_request($data) {
 	$sender = $data['sender'];
 	$sender_hash = make_xchan_hash($sender['guid'],$sender['guid_sig']);
 
+	/*
+	 * Find the local channel in charge of this post (the first and only recipient of the request packet)
+	 */
+
 	$arr = $data['recipients'][0];
 	$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
 	$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
@@ -2837,13 +2863,20 @@ function zot_process_message_request($data) {
 		$ret['message'] .= 'recipient not found.' . EOL;
 		return $ret;
 	}
+
+	/*
+	 * fetch the requested conversation
+	 */
+
 	$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
+
 	if($messages) {
 		$env_recips = null;
 
 		$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host 
-			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)
+			from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)
 			and not (hubloc_status & %d) group by hubloc_sitekey",
+			dbesc($sender_hash),
             intval(HUBLOC_FLAGS_DELETED),
             intval(HUBLOC_OFFLINE)
         );
@@ -2858,10 +2891,16 @@ function zot_process_message_request($data) {
 		$private = ((array_key_exists('flags',$messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
 		if($private)
 			$env_recips = array('guid' => $sender['guid'],'guid_sig' => $sender['guid_sig'],'hash' => $sender_hash);
+
 		$data_packet = json_encode(array('message_list' => $messages));
 		
 		foreach($hubs as $hub) {
 			$hash = random_string();
+
+			/*
+			 * create a notify packet and drop the actual message packet in the queue for pickup
+			 */
+
 			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
 			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
 				outq_created, outq_updated, outq_notify, outq_msg ) 
@@ -2877,6 +2916,11 @@ function zot_process_message_request($data) {
 				dbesc($n),
 				dbesc($data_packet)
 			);
+
+			/*
+			 * invoke delivery to send out the notify packet
+			 */
+
 			proc_run('php','include/deliver.php',$hash);
 		}
 
-- 
cgit v1.2.3


From 0e4f318b71fc454c3a0ce6f0e073d9808ff00269 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 19:22:18 -0800
Subject: php warnings

---
 include/zot.php | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'include')

diff --git a/include/zot.php b/include/zot.php
index f18830e78..f1ff084ac 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -5,7 +5,7 @@ require_once('include/items.php');
 require_once('include/hubloc.php');
 
 /**
- * Red implementation of zot protocol. 
+ * Red implementation of zot protocol.
  *
  * https://github.com/friendica/red/wiki/zot
  * https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview
@@ -20,8 +20,8 @@ require_once('include/hubloc.php');
  *    Generates a unique string for use as a zot guid using our DNS-based url, the channel nickname and some entropy.
  *    The entropy ensures uniqueness against re-installs where the same URL and nickname are chosen.
  *    NOTE: zot doesn't require this to be unique. Internally we use a whirlpool hash of this guid and the signature
- *    of this guid signed with the channel private key. This can be verified and should make the probability of 
- *    collision of the verified result negligible within the constraints of our immediate universe.  
+ *    of this guid signed with the channel private key. This can be verified and should make the probability of
+ *    collision of the verified result negligible within the constraints of our immediate universe.
  *
  * @param string channel_nickname = unique nickname of controlling entity
  *
@@ -51,7 +51,7 @@ function make_xchan_hash($guid,$guid_sig) {
 
 /**
  * @function zot_get_hublocs($hash)
- *     Given a zot hash, return all distinct hubs. 
+ *     Given a zot hash, return all distinct hubs.
  *     This function is used in building the zot discovery packet
  *     and therefore should only be used by channels which are defined
  *     on this hub
@@ -71,7 +71,7 @@ function make_xchan_hash($guid,$guid_sig) {
  *    hubloc_connect     char(255)
  *    hubloc_sitekey     text
  *    hubloc_updated     datetime
- *    hubloc_connected   datetime 	
+ *    hubloc_connected   datetime
  *
  */
 
@@ -85,21 +85,21 @@ function zot_get_hublocs($hash) {
 	);
 	return $ret;
 }
-	 
+
 /**
  *
  * @function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null)
  *    builds a zot notification packet that you can either
- *    store in the queue with a message array or call zot_zot to immediately 
+ *    store in the queue with a message array or call zot_zot to immediately
  *    zot it to the other side
  *
  * @param array $channel     => sender channel structure
  * @param string $type       => packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check'
  * @param array $recipients  => envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
  * @param string $remote_key => optional public site key of target hub used to encrypt entire packet
- *    NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others 
+ *    NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others
  * @param string $secret     => random string, required for packets which require verification/callback
- *    e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification 
+ *    e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
  *
  * @returns string json encoded zot packet
  */
@@ -1071,7 +1071,7 @@ function zot_import($arr, $sender_url) {
 
 			if(array_key_exists('iv',$i['notify'])) {
 				$i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true);
-	  		}
+			}
 
 			logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA);
 
@@ -1107,7 +1107,7 @@ function zot_import($arr, $sender_url) {
 				// It's a specifically targetted post. If we were sent a public_scope hint (likely), 
 				// get rid of it so that it doesn't get stored and cause trouble. 
 
-				if(array_key_exists('message',$i) && array_key_exists('public_scope',$i['message']))
+				if(($i) && is_array($i) && array_key_exists('message',$i) && is_array($i['message']) && array_key_exists('public_scope',$i['message']))
 					unset($i['message']['public_scope']);
 
 				$deliveries = $r;
@@ -2460,8 +2460,8 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 
 		$channel = $r[0];
 
-	    $max_friends = service_class_fetch($channel['channel_id'],'total_channels');
-    	$max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds');
+		$max_friends = service_class_fetch($channel['channel_id'],'total_channels');
+		$max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds');
 
 
 		if($channel['channel_hash'] != $sender['hash']) {
@@ -2547,7 +2547,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 							continue;
 						}
 						$j = json_decode($f['body'],true);
-				        if(! ($j['success'] && $j['guid'])) {
+						if(! ($j['success'] && $j['guid'])) {
 							logger('process_channel_sync_delivery: probe failed.');
 							continue;
 						}
@@ -2646,8 +2646,8 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 						intval($channel['channel_id']),
 						intval($cl['visible']),
 						intval($cl['deleted']),
-           				dbesc($cl['name'])
-       				);
+						dbesc($cl['name'])
+					);
 				}
 
 				// now look for any collections locally which weren't in the list we just received.
@@ -2877,13 +2877,13 @@ function zot_process_message_request($data) {
 			from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)
 			and not (hubloc_status & %d) group by hubloc_sitekey",
 			dbesc($sender_hash),
-            intval(HUBLOC_FLAGS_DELETED),
-            intval(HUBLOC_OFFLINE)
-        );
-	    if(! $r) {
-	        logger('no hubs');
-    	    return $ret;
-    	}
+			intval(HUBLOC_FLAGS_DELETED),
+			intval(HUBLOC_OFFLINE)
+		);
+		if(! $r) {
+			logger('no hubs');
+			return $ret;
+		}
 		$hubs = $r;
 		$hublist = array();
 		$keys = array();
-- 
cgit v1.2.3


From ac858f4bd4fcb9c65cbc7b19288cdad0076aa072 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Nov 2014 01:06:02 -0800
Subject: provide example import script

---
 include/Import/Importer.php  |  94 +++++++++++++++
 include/Import/refimport.php | 282 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 376 insertions(+)
 create mode 100644 include/Import/Importer.php
 create mode 100644 include/Import/refimport.php

(limited to 'include')

diff --git a/include/Import/Importer.php b/include/Import/Importer.php
new file mode 100644
index 000000000..c42344236
--- /dev/null
+++ b/include/Import/Importer.php
@@ -0,0 +1,94 @@
+<?php /** @file */
+
+namespace Redmatrix\Import;
+
+
+class Import {
+
+	$credentials = null;
+	$itemlist    = null;
+	$src_items   = null;
+
+	$items       = null;
+
+	function get_credentials() {
+
+	}
+
+	function get_itemlist() {
+
+
+	}
+
+
+	function get_item_ident($item) {
+
+	}
+
+	function get_item($item_ident) {
+
+	}
+
+	function get_taxonomy($item_ident) {
+
+	}
+
+	function get_children($item_ident) {
+
+	}
+
+	function convert_item($item_ident) {
+
+	}
+
+	function convert_taxonomy($item_ident) {
+
+
+	}
+
+	function convert_child($child) {
+
+	}
+
+	function store($item,$update = false) {
+
+	}
+
+	function run() {
+
+		$this->credentials = $this->get_credentials();
+		$this->itemlist = $this->get_itemlist();
+		if($this->itemlist) {
+			$this->src_items = array();
+			$this->items = array();
+			$cnt = 0;
+			foreach($this->itemlist as $item) {
+				$ident = $item->get_item_ident($item);
+				$this->src_items[$ident]['item'] = $this->get_item($ident);
+				$this->src_items[$ident]['taxonomy'] = $this->get_taxonomy($ident);
+				$this->src_items[$ident]['children'] = $this->get_children($ident);
+				$this->items[$cnt]['item'] = $this->convert_item($ident);
+				$this->items[$cnt]['item']['term'] = $this->convert_taxonomy($ident);
+				if($this->src_items[$ident]['children']) {
+					$this->items[$cnt]['children'] = array();
+					foreach($this->src_items[$ident]['children'] as $child) {
+						$this[$cnt]['children'][] = $this->convert_child($child);
+					}
+				}
+				$cnt ++;
+			}
+
+
+
+
+		}
+
+
+
+
+
+
+	}
+
+
+}
\ No newline at end of file
diff --git a/include/Import/refimport.php b/include/Import/refimport.php
new file mode 100644
index 000000000..4f2572660
--- /dev/null
+++ b/include/Import/refimport.php
@@ -0,0 +1,282 @@
+<?php
+
+require_once('include/html2bbcode.php');
+require_once('include/hubloc.php');
+
+// Sample module for importing conversation data from Reflection CMS. Some preparation was used to 
+// dump relevant posts, categories and comments into individual JSON files, and also JSON dump of 
+// the user table to search for avatars. Importation was also batched in sets of 20 posts per page
+// visit so as to survive shared hosting process limits. This provides some clues as how to handle 
+// WordPress imports, which use a somewhat similar DB structure. The batching and individual files
+// might not be needed in VPS environments. As such this could be considered an extreme test case, but
+// the importation was successful in all regards using this code. The module URL was visited repeatedly
+// with a browser until all the posts had been imported.     
+
+
+
+
+define('REDMATRIX_IMPORTCHANNEL','mike');
+define('REFLECT_EXPORTUSERNAME','mike');
+define('REFLECT_BLOGNAME','Diary and Other Rantings');
+define('REFLECT_BASEURL','http://example.com/');
+define('REFLECT_USERFILE','user.json');
+
+// set to true if you need to process everything again
+define('REFLECT_OVERWRITE',false);
+
+// we'll only process a small number of posts at a time on a shared host.
+
+define('REFLECT_MAXPERRUN',30);
+
+function reflect_get_channel() {
+
+	// this will be the channel_address or nickname of the red channel
+
+	$c = q("select * from channel left join xchan on channel_hash = xchan_hash 
+		where channel_address = '%s' limit 1",
+		dbesc(REDMATRIX_IMPORTCHANNEL)
+	);
+	return $c[0];
+}
+
+
+function refimport_content(&$a) {
+
+	$channel = reflect_get_channel();
+
+	// load the user file. We need that to find the commenter's avatars
+
+	$u = file_get_contents(REFLECT_USERFILE);
+	if($u) {
+		$users = json_decode($u,true);
+	}
+
+	$ignored = 0;
+	$processed = 0;
+
+	$files = glob('article/*');
+	if(! $files) 
+		return;
+
+	foreach($files as $f) {
+		$s = file_get_contents($f);
+		$j = json_decode($s,true);
+
+		if(! $j)
+			continue;
+
+		$arr = array();
+
+		// see if this article was already processed
+		$r = q("select * from item where mid = '%s' and uid = %d limit 1",
+			dbesc($j['guid']),
+			intval($channel['channel_id'])
+		);
+		if($r) {
+			if(REFLECT_OVERWRITE)
+				$arr['id'] = $r[0]['id'];
+			else {
+				$ignored ++;
+				rename($f,str_replace('article','done',$f));
+				continue;
+			}
+		}
+
+		$arr['uid'] = $channel['channel_account_id'];
+		$arr['aid'] = $channel['channel_id'];
+		$arr['mid'] = $arr['parent_mid'] = $j['guid'];
+		$arr['created'] = $j['created'];
+		$arr['edited'] = $j['edited'];
+		$arr['author_xchan'] = $channel['channel_hash'];
+		$arr['owner_xchan'] = $channel['channel_hash'];
+		$arr['app'] = REFLECT_BLOGNAME;
+		$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+		$arr['verb'] = ACTIVITY_POST;
+
+		// this is an assumption
+		$arr['comment_policy'] = 'contacts';
+
+
+		// import content. In this case the content is XHTML.
+
+		$arr['title'] = html2bbcode($j['title']);
+		$arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false);
+
+
+		$arr['body'] = html2bbcode($j['body']);
+		$arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false);
+
+
+		// convert relative urls to other posts on that service to absolute url on our service.
+		$arr['body'] = preg_replace_callback("/\[url\=\/+article\/(.*?)\](.*?)\[url\]/",'reflect_article_callback',$arr['body']);
+
+		// also import any photos
+		$arr['body'] = preg_replace_callback("/\[img(.*?)\](.*?)\[\/img\]/",'reflect_photo_callback',$arr['body']);
+
+
+		// add categories
+
+		if($j['taxonomy'] && is_array($j['taxonomy']) && count($j['taxonomy'])) {
+			$arr['term'] = array();
+			foreach($j['taxonomy'] as $tax) {
+				$arr['term'][] = array(
+					'uid'   => $channel['channel_id'],
+					'type'  => TERM_CATEGORY,
+					'otype' => TERM_OBJ_POST,
+					'term'  => trim($tax['name']),
+            	    'url'   => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($tax['name']))
+				);
+			}
+		}
+
+		// store the item
+
+		if($arr['id'])
+			item_store_update($arr);
+		else
+			item_store($arr);
+
+		// if there are any comments, process them
+		// $comment['registered'] is somebody with an account on the system. Others are mostly anonymous
+
+		if($j['comments']) {
+			foreach($j['comments'] as $comment) {
+				$user = (($comment['registered']) ? reflect_find_user($users,$comment['author']) : null);
+				reflect_comment_store($channel,$arr,$comment,$user);
+			}
+		}
+		$processed ++;
+
+		if(REFLECT_MAXPERRUN && $processed > REFLECT_MAXPERRUN)
+			break;
+	}
+	return 'processed: ' . $processed . EOL . 'completed: ' . $ignored . EOL;
+
+}
+
+function reflect_article_callback($matches) {
+	return '[zrl=' . z_root() . '/display/'. $matches[1] . ']' . $matches[2] . '[/zrl]';
+}
+
+function reflect_photo_callback($matches) {
+
+	if(strpos($matches[2],'http') !== false)
+		return $matches[0];
+
+	$prefix = REFLECT_BASEURL;
+	$x = z_fetch_url($prefix.$matches[2],true);
+
+	$hash = basename($matches[2]);
+
+	if($x['success']) {
+		$channel = reflect_get_channel();
+		require_once('include/photos.php');
+		$p = photo_upload($channel,$channel,
+			array('data' => $x['body'],
+				'resource_id' => str_replace('-','',$hash),
+				'filename' => $hash . '.jpg',
+				'type' => 'image/jpeg',
+				'not_visible' => true
+			)
+		);
+
+		if($p['success'])
+			$newlink = $p['resource_id'] . '-0.jpg';
+	
+				
+		// import photo and locate the link for it.
+		return '[zmg]' . z_root() . '/photo/' . $newlink . '[/zmg]';
+
+	}		
+	// no replacement. Leave it alone.
+	return $matches[0];
+}
+
+function reflect_find_user($users,$name) {
+	if($users) {
+		foreach($users as $x) {
+			if($x['name'] === $name) {
+				return $x;
+			}
+		}
+	}
+
+	return false;
+
+}
+
+function reflect_comment_store($channel,$post,$comment,$user) {
+
+	// if the commenter was the channel owner, use their redmatrix xchan
+
+	if($comment['author'] === REFLECT_EXPORTUSERNAME && $comment['registered'])
+		$hash = $channel['xchan_hash'];
+	else {
+		// we need a unique hash for the commenter. We don't know how many may have supplied
+		// http://yahoo.com as their URL, so we'll use their avatar guid if they have one. 
+		// anonymous folks may get more than one xchan_hash if they commented more than once.
+
+		$hash = (($comment['registered'] && $user) ? $user['avatar'] : '');
+		if(! $hash)
+			$hash = random_string() . '.unknown';
+
+		// create an xchan for them which will also import their profile photo
+		// they will have a network type 'unknown'.
+
+		$x = array(
+			'hash' => $hash,
+			'guid' => $hash,
+			'url' => (($comment['url']) ? $comment['url'] : z_root()),
+			'photo' => (($user) ? REFLECT_BASEURL . $user['avatar'] : z_root() . '/' . get_default_profile_photo()),
+			'name' => $comment['author']
+		);
+		xchan_store($x);
+
+	}
+
+	$arr = array();
+
+	$r = q("select * from item where mid = '%s' and uid = %d limit 1",
+		dbesc($comment['guid']),
+		intval($channel['channel_id'])
+	);
+	if($r) {
+		if(REFLECT_OVERWRITE)
+			$arr['id'] = $r[0]['id'];
+		else
+			return;
+	}
+
+	// this is a lot like storing the post except for subtle differences, like parent_mid, flags, author_xchan,
+	// and we don't have a comment edited field so use creation date
+
+	$arr['uid'] = $channel['channel_account_id'];
+	$arr['aid'] = $channel['channel_id'];
+	$arr['mid'] = $comment['guid'];
+	$arr['parent_mid'] = $post['mid'];
+	$arr['created'] = $comment['created'];
+	$arr['edited'] = $comment['created'];
+	$arr['author_xchan'] = $hash;
+	$arr['owner_xchan'] = $channel['channel_hash'];
+	$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL;
+	$arr['verb'] = ACTIVITY_POST;
+	$arr['comment_policy'] = 'contacts';
+
+
+	$arr['title'] = html2bbcode($comment['title']);
+	$arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false);
+
+
+	$arr['body'] = html2bbcode($comment['body']);
+	$arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false);
+	$arr['body'] = preg_replace_callback("/\[url\=\/+article\/(.*?)\](.*?)\[url\]/",'reflect_article_callback',$arr['body']);
+	$arr['body'] = preg_replace_callback("/\[img(.*?)\](.*?)\[\/img\]/",'reflect_photo_callback',$arr['body']);
+
+	// logger('comment: ' . print_r($arr,true));
+
+	if($arr['id'])
+		item_store_update($arr);
+	else
+		item_store($arr);
+
+}
-- 
cgit v1.2.3


From 9984ff37e5df237ccdd0169387ade070babfd666 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Mon, 3 Nov 2014 15:33:59 +0000
Subject: innodb issue

---
 include/session.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/session.php b/include/session.php
index b531688e2..8500e2cd3 100644
--- a/include/session.php
+++ b/include/session.php
@@ -84,8 +84,9 @@ function ref_session_destroy ($id) {
 
 function ref_session_gc($expire) {
   q("DELETE FROM session WHERE expire < %d", dbesc(time()));
-  q("OPTIMIZE TABLE session");
-  return true;
+    if (! get_config('system','innodb'))
+        q("OPTIMIZE TABLE session");
+    return true;
 }
 
 $gc_probability = 50;
-- 
cgit v1.2.3


From a6d8c3193a6fc243f3e516118c793e5b871b8247 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Nov 2014 14:49:03 -0800
Subject: various UI issues related to having an enormous number of entries in
 the posted_date selector including years/months that had no posts

---
 include/items.php   |  7 +++++--
 include/widgets.php | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index d173e1a98..325947341 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4128,10 +4128,13 @@ function first_post_date($uid,$wall = false) {
  * current flat list of all representative dates.
  */
 
-function list_post_dates($uid,$wall) {
+function list_post_dates($uid,$wall,$mindate) {
 	$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
 
-	$dthen = first_post_date($uid,$wall);
+	if($mindate)
+		$dthen = datetime_convert('',date_default_timezone_get(),$mindate);
+	else
+		$dthen = first_post_date($uid,$wall);
 	if(! $dthen)
 		return array();
 
diff --git a/include/widgets.php b/include/widgets.php
index 2e406aa77..703bc07a8 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -330,19 +330,32 @@ function widget_archive($arr) {
 
 	$wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0);
 	$style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select');
+	$showend = ((get_pconfig($uid,'system','archive_show_end_date')) ? true : false);
+	$mindate = get_pconfig($uid,'system','archive_mindate');
+	$visible_years = get_pconfig($uid,'system','archive_visible_years');
+	if(! $visible_years)
+		$visible_years = 5;
+
+
 	$url = z_root() . '/' . $a->cmd;
 
 
-	$ret = list_post_dates($uid,$wall);
+	$ret = list_post_dates($uid,$wall,$mindate);
 
 	if(! count($ret))
 		return '';
 
+	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
+	$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
+
 	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
 		'$title' => t('Archives'),
-		'$size' => ((count($ret) > 6) ? 6 : count($ret)),
+		'$size' => $visible_years,
+		'$cutoff_year' => $cutoff_year,
+		'$cutoff' => $cutoff,
 		'$url' => $url,
 		'$style' => $style,
+		'$showend' => $showend,
 		'$dates' => $ret
 	));
 	return $o;
-- 
cgit v1.2.3


From d5d6158973ecb83b63d42c57c96dce849842c83b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 4 Nov 2014 17:11:02 -0800
Subject: ok heads up - potentially destabilising change. I've tried to sort
 out all the default connection permissions for those who don't have a
 predefined (or therefore have a "custom") permissions role. Unfortunately
 this includes most people that were using this software more than a month
 ago. The real changes are that the SELF address book entry no longer holds
 "auto-permissions" but instead holds your "default permissions" (if you have
 a pre-defined role, the defaults will be pulled from the role table).

The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.

What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.

With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
---
 include/diaspora.php | 19 +++++++++----------
 include/follow.php   | 10 ++--------
 include/identity.php | 17 ++++++++++++++++-
 include/widgets.php  |  2 +-
 include/zot.php      | 18 +++++++++---------
 5 files changed, 37 insertions(+), 29 deletions(-)

(limited to 'include')

diff --git a/include/diaspora.php b/include/diaspora.php
index c6d4b7423..d4e8a2802 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -673,16 +673,15 @@ function diaspora_request($importer,$xml) {
 		return;
 	}
 
-	$default_perms = 0;
-	// look for default permissions to apply in return - e.g. auto-friend
-	$z = q("select * from abook where abook_channel = %d and (abook_flags & %d) limit 1",
-		intval($importer['channel_id']),
-		intval(ABOOK_FLAG_SELF)
-	);
-
-	if($z)
-		$default_perms = intval($z[0]['abook_my_perms']);
-
+	$role = get_pconfig($channel['channel_id'],'system','permissions_role');
+	if($role) {
+		$x = get_role_perms($role);
+		if($x['perms_auto'])
+		$default_perms = $x['perms_accept'];
+	}
+	if(! $default_perms)
+		$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
+				
 	$their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES;
 
 	$r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags) values ( %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', %d )",
diff --git a/include/follow.php b/include/follow.php
index 20fd7f5fc..b5196834d 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -64,13 +64,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		$j = json_decode($ret['body'],true);
 	}
 
-	if($is_red && $j) {
-
+	$my_perms = get_channel_default_perms($uid);
 
-		// fixme - we need to be able to define these somewhere for the custom role
-		$my_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
-			|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
-			|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE;
+	if($is_red && $j) {
 
 		$role = get_pconfig($uid,'system','permissions_role');
 		if($role) {
@@ -141,7 +137,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			}
 		}
 
-		$my_perms = 0;
 		$their_perms = 0;
 		$xchan_hash = '';
 
@@ -168,7 +163,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		if($r) {
 			$xchan_hash = $r[0]['xchan_hash'];
 			$their_perms = 0;
-			$my_perms = PERMS_W_STREAM|PERMS_W_MAIL;
 			$role = get_pconfig($uid,'system','permissions_role');
 			if($role) {
 				$x = get_role_perms($role);
diff --git a/include/identity.php b/include/identity.php
index 9a574ea65..16e3eff0e 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -348,10 +348,13 @@ function create_identity($arr) {
 		dbesc($a->get_baseurl() . "/photo/profile/m/{$newuid}")
 	);
 
-	$myperms = 0;
 	if($role_permissions) {
 		$myperms = ((array_key_exists('perms_auto',$role_permissions) && $role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0);
 	}
+	else
+		$myperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
+			|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+			|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE;
 
 	$r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_closeness, abook_created, abook_updated, abook_flags, abook_my_perms )
 		values ( %d, %d, '%s', %d, '%s', '%s', %d, %d ) ",
@@ -1561,4 +1564,16 @@ function notifications_on($channel_id,$value) {
 		intval($channel_id)
 	);
 	return $x;
+}
+
+
+function get_channel_default_perms($uid) {
+
+	$r = q("select abook_my_perms from abook where abook_channel = %d and abook_flags & %d limit 1",
+		intval($uid),
+		intval(ABOOK_FLAG_SELF)
+	);
+	if($r)
+		return $r[0]['abook_my_perms'];
+	return 0;
 }
\ No newline at end of file
diff --git a/include/widgets.php b/include/widgets.php
index 703bc07a8..f678e40dd 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -506,7 +506,7 @@ function widget_settings_menu($arr) {
 
 	if($role === false || $role === 'custom') {
 		$tabs[] = array(
-			'label' => t('Automatic Permissions (Advanced)'),
+			'label' => t('Connection Default Permissions'),
 			'url' => $a->get_baseurl(true) . '/connedit/' . $abook_self_id,
 			'selected' => ''
 		);
diff --git a/include/zot.php b/include/zot.php
index f1ff084ac..9f22bc30b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -439,15 +439,15 @@ function zot_refresh($them,$channel = null, $force = false) {
 				}
 			}
 			else {
-				$default_perms = 0;
-				// look for default permissions to apply in return - e.g. auto-friend
-				$z = q("select * from abook where abook_channel = %d and (abook_flags & %d) limit 1",
-					intval($channel['channel_id']),
-					intval(ABOOK_FLAG_SELF)
-				);
-
-				if($z)
-					$default_perms = intval($z[0]['abook_my_perms']);		
+				$role = get_pconfig($channel['channel_id'],'system','permissions_role');
+				if($role) {
+					$x = get_role_perms($role);
+					if($x['perms_auto'])
+						$default_perms = $x['perms_accept'];
+				}
+				if(! $default_perms)
+					$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
+				
 
 				// Keep original perms to check if we need to notify them
 				$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
-- 
cgit v1.2.3


From 3b22e2f5f508cb5e45ae426210e5ca9fe9115417 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Nov 2014 16:21:03 -0800
Subject: some minor cleanup of unreported (and as yet undiscovered) issues
 with permissions toggling. No smoking guns and no obvious issues discovered
 here. Repeated and tried to duplicate zottell's issue as described without
 seeing any obvious problems.

---
 include/follow.php   | 5 +++--
 include/identity.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/follow.php b/include/follow.php
index b5196834d..421bdd083 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -203,8 +203,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			return $result;
 		}
 
-		$r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & ABOOK_FLAG_FEED )",
-			intval($aid)
+		$r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & %d )",
+			intval($aid),
+			intval(ABOOK_FLAG_FEED)
 		);
 		if($r)
 			$total_feeds = $r[0]['total'];
diff --git a/include/identity.php b/include/identity.php
index 16e3eff0e..b9ee00623 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -376,6 +376,8 @@ function create_identity($arr) {
 			set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']);
 			if(array_key_exists('online',$role_permissions))
 				set_pconfig($newuid,'system','hide_presence',1-intval($role_permissions['online']));
+			if(array_key_exists('perms_auto',$role_permissions))
+				set_pconfig($newuid,'system','autoperms',(($role_permissions['perms_auto']) ? $role_permissions['perms_accept'] : 0));
 		}
 
 		// Create a group with yourself as a member. This allows somebody to use it 
-- 
cgit v1.2.3


From 1237957dd54b47685269300ca128455463e0787c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Nov 2014 21:02:33 -0800
Subject: logging changes, untranslated string

---
 include/bb2diaspora.php | 6 +++---
 include/diaspora.php    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8a178d1ac..3c4f07568 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -277,7 +277,7 @@ function bb2diaspora_itemwallwall(&$item) {
 	}
 
 	if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author']))) {
-		logger('bb2diaspora_itemwallwall: author: ' . print_r($item['author'],true), LOGGER_DEBUG);
+		logger('bb2diaspora_itemwallwall: author: ' . print_r($item['author'],true), LOGGER_DATA);
 	}
 
 	if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
@@ -388,7 +388,7 @@ function bb2diaspora_itembody($item,$force_update = false) {
 		}
 	}
 
-	logger('bb2diaspora_itembody : ' . $body);
+//	logger('bb2diaspora_itembody : ' . $body, LOGGER_DATA);
 
 	return html_entity_decode($body);
 
@@ -462,7 +462,7 @@ function format_event_diaspora($ev) {
 
 	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
-	$o = 'Friendica event notification:' . "\n";
+	$o = t('Redmatrix event notification:') . "\n";
 
 	$o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) .  '**' . "\n";
 
diff --git a/include/diaspora.php b/include/diaspora.php
index d4e8a2802..7858fa203 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -58,7 +58,7 @@ function diaspora_dispatch($importer,$msg,$attempt=1) {
 
 	$xmlbase = $parsed_xml->post;
 
-	logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DATA);
+//	logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DATA);
 
 
 	if($xmlbase->request) {
-- 
cgit v1.2.3


From 4057e82bb46e7f30e8bccfb076be85ac9f91f256 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Nov 2014 01:24:04 -0800
Subject: category tagblock

---
 include/taxonomy.php | 22 ++++++++++++++++++++++
 include/widgets.php  | 11 +++++++++++
 2 files changed, 33 insertions(+)

(limited to 'include')

diff --git a/include/taxonomy.php b/include/taxonomy.php
index 35605da22..d683b24a6 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -216,6 +216,28 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$
 	return $o;
 }
 
+function catblock($uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$type = TERM_CATEGORY) {
+  $o = '';
+  $tab = 0;
+
+  $r = tagadelic($uid,$count,$authors,$flags,$restrict,$type);
+
+  if($r) {
+	$c = q("select channel_address from channel where channel_id = %d limit 1",
+		intval($uid)
+	);
+
+	$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
+	foreach($r as $rr) { 
+	  $o .= '<a href="channel/' . $c[0]['channel_address']. '?f=&cat=' . urlencode($rr[0]).'" class="tag'.$rr[2].'">'.$rr[0].'</a> ' . "\r\n";
+	}
+	$o .= '</div></div>';
+  }
+	return $o;
+}
+
+
+
 function dir_tagblock($link,$r) {
 	$o = '';
 	$tab = 0;
diff --git a/include/widgets.php b/include/widgets.php
index f678e40dd..dcad3eff6 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -400,6 +400,17 @@ function widget_tagcloud_wall($arr) {
 		return tagblock('search',$a->profile['profile_uid'],$limit,$a->profile['channel_hash'],ITEM_WALL);
 	return '';
 }
+function widget_catcloud_wall($arr) {
+	$a = get_app();
+	if((! $a->profile['profile_uid']) || (! $a->profile['channel_hash']))
+		return '';
+	if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_stream'))
+		return '';
+
+	$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
+	return catblock($a->profile['profile_uid'],$limit,$a->profile['channel_hash'],ITEM_WALL);
+	return '';
+}
 
 
 function widget_affinity($arr) {
-- 
cgit v1.2.3


From a23435540ef097eb6e718129004d259a5313ef6b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Nov 2014 01:32:47 -0800
Subject: make sure the "tagcloud" actually shows hashtags. So we don't confuse
 folks with categories.

---
 include/taxonomy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/taxonomy.php b/include/taxonomy.php
index d683b24a6..fab31c73d 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -209,7 +209,7 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$
   if($r) {
 	$o = '<div class="tagblock widget"><h3>' . t('Tags') . '</h3><div class="tags" align="center">';
 	foreach($r as $rr) { 
-	  $o .= '<a href="'.$link .'/' . '?f=&tag=' . urlencode($rr[0]).'" class="tag'.$rr[2].'">'.$rr[0].'</a> ' . "\r\n";
+	  $o .= '<span class="tag'.$rr[2].'">#</span><a href="'.$link .'/' . '?f=&tag=' . urlencode($rr[0]).'" class="tag'.$rr[2].'">'.$rr[0].'</a> ' . "\r\n";
 	}
 	$o .= '</div></div>';
   }
-- 
cgit v1.2.3


From 1f35d9432ff6391c183fe9e268cbf3b76ac8dd0d Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Thu, 6 Nov 2014 17:24:05 +0100
Subject: don't overwrite $x (contains import_xchan result) with role
 permissions

---
 include/zot.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/zot.php b/include/zot.php
index 9f22bc30b..bdc1f607f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -441,9 +441,9 @@ function zot_refresh($them,$channel = null, $force = false) {
 			else {
 				$role = get_pconfig($channel['channel_id'],'system','permissions_role');
 				if($role) {
-					$x = get_role_perms($role);
-					if($x['perms_auto'])
-						$default_perms = $x['perms_accept'];
+					$xx = get_role_perms($role);
+					if($xx['perms_auto'])
+						$default_perms = $xx['perms_accept'];
 				}
 				if(! $default_perms)
 					$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
-- 
cgit v1.2.3


From 1fbd1a79c7a19ff51b9e8ab4bad67ec0bf687839 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Nov 2014 17:27:28 -0800
Subject: Provide a way to mark photos as adult and hide them from the default
 album view. Still need a button or setting to enable "unsafe viewing". This
 has no effect anywhere but in the album views. They can still be viewed by
 flipping through the individual photos with 'prev' and 'next'. We probably
 need a comprehensive strategy for how to deal with n-s-f-w photos in albums
 so consider this a band-aid which requires additional work and integration
 with other facilities which access these photos. It is entirely optional.

---
 include/poller.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index f11618d37..1734af7d9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -123,8 +123,8 @@ function poller_run($argv, $argc){
 
 	if(($d2 != $d1) && ($h1 == $h2)) {
 
-	require_once('include/dir_fns.php');
-	check_upstream_directory();
+		require_once('include/dir_fns.php');
+		check_upstream_directory();
 
 		call_hooks('cron_daily',datetime_convert());
 
@@ -263,7 +263,7 @@ function poller_run($argv, $argc){
 	);
 
 
-	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
+	$contacts = q("SELECT abook_id, abook_flags, abook_network, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
 		FROM abook LEFT JOIN account on abook_account = account_id where 1
 		$sql_extra 
 		AND (( abook_flags & %d ) OR  ( abook_flags = %d )) 
@@ -305,6 +305,7 @@ function poller_run($argv, $argc){
 					$update = true;
 			}
 			else {
+
 				// if we've never connected with them, start the mark for death countdown from now
 
 				if($c == NULL_DATE) {
@@ -351,12 +352,17 @@ function poller_run($argv, $argc){
 					$update = true;
 				}
 
-
 			}
 
 			if((! $update) && (! $force))
 					continue;
 
+			// we handled feed contacts earlier - now filter out anything else that 
+			// doesn't require polling to keep the process count down.
+
+			if($contact['abook_network'] !== 'zot')
+				continue;
+
 			proc_run('php','include/onepoll.php',$contact['abook_id']);
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
-- 
cgit v1.2.3


From c4a07010f76a0cc7f4b3ed3d7e08912bce14dcb6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Nov 2014 18:05:02 -0800
Subject: visible flag reversed

---
 include/photos.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/photos.php b/include/photos.php
index adb7c988a..23c1ea826 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -431,7 +431,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 	// Create item container
 
 	$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
-	$item_restrict = (($visible) ? ITEM_HIDDEN : ITEM_VISIBLE);			
+	$item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);			
 
 	$title = '';
 	$mid = item_message_id();
-- 
cgit v1.2.3


From 961049f5faf04edcf3dc5485e76d81460b929efb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 7 Nov 2014 12:16:13 -0800
Subject: revert that bit

---
 include/poller.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 1734af7d9..026d84c62 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -263,7 +263,7 @@ function poller_run($argv, $argc){
 	);
 
 
-	$contacts = q("SELECT abook_id, abook_flags, abook_network, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
+	$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
 		FROM abook LEFT JOIN account on abook_account = account_id where 1
 		$sql_extra 
 		AND (( abook_flags & %d ) OR  ( abook_flags = %d )) 
@@ -357,12 +357,6 @@ function poller_run($argv, $argc){
 			if((! $update) && (! $force))
 					continue;
 
-			// we handled feed contacts earlier - now filter out anything else that 
-			// doesn't require polling to keep the process count down.
-
-			if($contact['abook_network'] !== 'zot')
-				continue;
-
 			proc_run('php','include/onepoll.php',$contact['abook_id']);
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
-- 
cgit v1.2.3


From 55f64c37364a1e4ac3e57a6af2953df196589c49 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 7 Nov 2014 13:06:56 -0800
Subject: tgroup_check - decrypt if obscured before checking body text for
 reshares

---
 include/items.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 325947341..7e2bb4f18 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2974,7 +2974,15 @@ function tgroup_check($uid,$item) {
 	// At this point we've determined that the person receiving this post was mentioned in it.
 	// Now let's check if this mention was inside a reshare so we don't spam a forum
 
-	$body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']);
+
+	$body = $item['body'];
+
+	if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED) && $body) {
+		$key = get_config('system','prvkey');
+		$body = crypto_unencapsulate(json_decode($body,true),$key);
+	}
+
+	$body = preg_replace('/\[share(.*?)\[\/share\]/','',$body);
 
 	$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/';
 
-- 
cgit v1.2.3