<?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) {
// Create a fake feed wrapper so simplepie doesn't choke
- $tpl = load_view_file('view/fake_feed.tpl');
+ $tpl = get_markup_template('fake_feed.tpl');
$base = substr($data,strpos($data,'<entry'));
// 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/phpsec');
- require_once('phpsec/Crypt/RSA.php');
+ require_once('library/phpsec/Crypt/RSA.php');
$key_info = explode('.',$key);
*
*/
- $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s')
+ $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
dbesc($author_link),
dbesc($author_link),
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) || ($r[0]['blocked']))) {
logger('mod-salmon: Ignoring this author.');
salmon_return(202);
// NOTREACHED
$hub = '';
- // consume_feed will only accept a follow activity from this person if there is no contact record.
+ /**
+ *
+ * anti-spam measure: consume_feed will accept a follow activity from
+ * this person (and nothing else) if there is no existing contact record.
+ *
+ */
$contact_rec = ((count($r)) ? $r[0] : null);