From 0b221e8945ae785dc706d8ea9a9e8e25532c0096 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 28 Jun 2011 21:11:52 -0700
Subject: bug #96 move libraries to library - better alignment of like rotator

---
 mod/salmon.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mod/salmon.php')

diff --git a/mod/salmon.php b/mod/salmon.php
index c2f76aa0a..3ace417cd 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,14 +1,11 @@
 <?php
 
 
-// TODO: 
-// add relevant contacts so they can use this
-
 // There is a lot of debug stuff in here because this is quite a
 // complicated process to try and sort out. 
 
 require_once('include/salmon.php');
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
 
 function salmon_return($val) {
 
@@ -133,9 +130,9 @@ function salmon_post(&$a) {
 
 	// Setup RSA stuff to verify the signature
 
-	set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+	set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
 
-	require_once('phpsec/Crypt/RSA.php');
+	require_once('library/phpsec/Crypt/RSA.php');
 
 	$key_info = explode('.',$key);
 
-- 
cgit v1.2.3


From 9816f14d40a04867b2d96891c297252cc4a7006d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 1 Jul 2011 17:39:16 -0700
Subject: statusnet improvements

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

(limited to 'mod/salmon.php')

diff --git a/mod/salmon.php b/mod/salmon.php
index 3ace417cd..2a53e914b 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -183,7 +183,11 @@ function salmon_post(&$a) {
 	if(! count($r)) {
 		logger('mod-salmon: Author unknown to us.');
 	}	
-	if((count($r)) && ($r[0]['readonly'])) {
+
+	// is this a follower? Or have we ignored the person?
+	// If so we can not accept this post.
+
+	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP)) {
 		logger('mod-salmon: Ignoring this author.');
 		salmon_return(202);
 		// NOTREACHED
-- 
cgit v1.2.3


From c23657ab6eb99750fc271f9fd124ea8731180605 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 1 Jul 2011 17:45:00 -0700
Subject: also check for blocked

---
 mod/salmon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/salmon.php')

diff --git a/mod/salmon.php b/mod/salmon.php
index 2a53e914b..721eae437 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -187,7 +187,7 @@ function salmon_post(&$a) {
 	// is this a follower? Or have we ignored the person?
 	// If so we can not accept this post.
 
-	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP)) {
+	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
 		logger('mod-salmon: Ignoring this author.');
 		salmon_return(202);
 		// NOTREACHED
-- 
cgit v1.2.3