Some changes to let pumpio react similar to facebook.

diff --git a/include/bbcode.php b/include/bbcode.php
index a536b53649523fbfd37efdc9962f4a8f0ddd760d..ca09cffec59c17e7c55b123d0689c582df663d75 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -36,7 +36,8 @@ function stripcode_br_cb($s) {
 
 function tryoembed($match){
        $url = ((count($match)==2)?$match[1]:$match[2]);
-//     logger("tryoembed: $url");
+
+       //logger("tryoembed: $url");
 
        $o = oembed_fetch_url($url);
 

diff --git a/include/delivery.php b/include/delivery.php
index d89cded9eb10ed7ecf082d25f0dbef8989109e45..5e37ad2e0cf05fa3854163da74b7b276940679dc 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -542,7 +542,7 @@ function delivery_run(&$argv, &$argc){
 
                                        diaspora_send_relay($target_item,$owner,$contact,$public_message);
                                        break;
-                               }               
+                               }
                                elseif(($top_level) && (! $walltowall)) {
                                        // currently no workable solution for sending walltowall
                                        logger('delivery: diaspora status: ' . $loc);
@@ -558,6 +558,9 @@ function delivery_run(&$argv, &$argc){
                        case NETWORK_FACEBOOK :
                                if(get_config('system','dfrn_only'))
                                        break;
+                       case NETWORK_PUMPIO :
+                               if(get_config('system','dfrn_only'))
+                                       break;
                        default:
                                break;
                }

diff --git a/include/notifier.php b/include/notifier.php
index a3286355ddabb371578c990abbae967dda6764de..74597c30d2adf516576fad9b0a894a838de8fb83 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -881,12 +881,15 @@ function notifier_run(&$argv, &$argc){
                                case NETWORK_FACEBOOK:
                                        if(get_config('system','dfrn_only'))
                                                break;
+                               case NETWORK_PUMPIO:
+                                       if(get_config('system','dfrn_only'))
+                                               break;
                                default:
                                        break;
                        }
                }
        }
-               
+
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
        if($slap && count($url_recipients) && ($followup || $top_level) && $public_message && (! $expire)) {

diff --git a/include/onepoll.php b/include/onepoll.php
index f38f6b4c61d88fbf54528267d3940e52f64530d5..e7cae773cad5a81fff7a36ab8cb586885a40ba08 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -76,7 +76,7 @@ function onepoll_run(&$argv, &$argc){
 
        $contacts = q("SELECT `contact`.* FROM `contact` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-               AND NOT `network` IN ( '%s', '%s' )
+               AND NOT `network` IN ( '%s', '%s', '%s' )
                AND `contact`.`id` = %d
                AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
                AND `contact`.`archive` = 0 LIMIT 1",
@@ -84,6 +84,7 @@ function onepoll_run(&$argv, &$argc){
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA),
                dbesc(NETWORK_FACEBOOK),
+               dbesc(NETWORK_PUMPIO),
                intval($contact_id)
        );
 
@@ -526,6 +527,9 @@ function onepoll_run(&$argv, &$argc){
        elseif($contact['network'] === NETWORK_FACEBOOK) {
                // This is picked up by the Facebook plugin on a cron hook.
                // Ignored here.
+       } elseif($contact['network'] === NETWORK_PUMPIO) {
+               // This is picked up by the pump.io plugin on a cron hook.
+               // Ignored here.
        }
 
        if($xml) {
@@ -544,7 +548,7 @@ function onepoll_run(&$argv, &$argc){
 
 
                // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
-       
+
                consume_feed($xml,$importer,$contact,$hub,1,2);
 
                $hubmode = 'subscribe';

diff --git a/include/poller.php b/include/poller.php
index e927430ea9e7ef6ab2831a2b35869c85d7fb7503..9ba9c782b7865e54b772923234641978845bd436 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -173,7 +173,7 @@ function poller_run(&$argv, &$argc){
 
        $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-               AND NOT `network` IN ( '%s', '%s' )
+               AND NOT `network` IN ( '%s', '%s', '%s' )
                $sql_extra 
                AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
                AND `contact`.`archive` = 0 
@@ -181,7 +181,8 @@ function poller_run(&$argv, &$argc){
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA),
-               dbesc(NETWORK_FACEBOOK)
+               dbesc(NETWORK_FACEBOOK),
+               dbesc(NETWORK_PUMPIO)
        );
 
        if(! count($contacts)) {