disconnect

4 files changed, 22 insertions, 12 deletions

diff --git a/doc/features.bb b/doc/features.bb
index 9a9de0c59..e2ca648bd 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -8,7 +8,7 @@ Redmatrix provides distributed web publishing and social communications with [b]
 

 So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.

 

-Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; but leaving privacy in the control of the original publisher. 

+Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher. 

 

 Redmatrix is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools. 

 

diff --git a/include/notifier.php b/include/notifier.php
index bec18142a..b82fb41cc 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -343,6 +343,11 @@ function notifier_run($argv, $argc){
 			$deleted_item = true;
 		}
 
+		if(strpos($target_item['postopts'],'nodeliver') !== false) {
+			logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+			return;
+		}
+
 		$unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
 		if($target_item['item_restrict'] & $unforwardable) {
 			logger('notifier: target item not forwardable: flags ' . $target_item['item_restrict'], LOGGER_DEBUG);
@@ -373,6 +378,12 @@ function notifier_run($argv, $argc){
 
 			if(! $r)
 				return;
+
+			if(strpos($r[0]['postopts'],'nodeliver') !== false) {
+				logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+				return;
+			}
+
 			xchan_query($r);
 			$r = fetch_post_tags($r);
 		
@@ -591,16 +602,13 @@ function notifier_run($argv, $argc){
 
 	foreach($dhubs as $hub) {
 
-		if(defined('DIASPORA_RELIABILITY_EMULATION')) {
-			$cointoss = mt_rand(0,2);
-			if($cointoss == 2) {
+		if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
+			if(! get_config('system','diaspora_enabled'))
 				continue;
-			}
-		}
 
+			// allow this to be set per message
 
-		if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
-			if(! get_config('system','diaspora_enabled'))
+			if(strpos($target_item['postopts'],'nodspr') !== false)
 				continue;
 
 			require_once('include/diaspora.php');
diff --git a/mod/manage.php b/mod/manage.php
index 54a65dbbf..3712be6f1 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -149,14 +149,16 @@ function manage_content(&$a) {
 		intval(local_channel()),
 		intval(PERMS_A_DELEGATE)
 	);
-	if(! $delegates)
-		$delegates = null;
 
 	if($delegates) {
 		for($x = 0; $x < count($delegates); $x ++) {
-				$delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) . '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
+			$delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) 
+			. '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
 		}
 	}
+	else {
+		$delegates = null;
+	}
 
 
 
diff --git a/version.inc b/version.inc
index 9f9bd7ea6..40d21a68d 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-22.1010
+2015-04-23.1011