new network types

diff --git a/include/notifier.php b/include/notifier.php
index 39640e51a3f98d4dbad7abe98bfd3cc05fb84ec9..4efdad4ce4fd480b864932b7c7ee0f2f083ad35e 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -280,7 +280,7 @@
                                        );
                                }
                                break;
-                       default:
+                       case 'stat':
                                if($followup && $contact['notify']) {
                                        logger('notifier: slapdelivery: ' . $contact['name']);
                                        $deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -324,6 +324,11 @@
                                        }
                                }
                                break;
+                       case 'mail':
+                       case 'dspr':
+                       case 'feed':
+                       default:
+                               break;
                }
        }
                

diff --git a/include/poller.php b/include/poller.php
index fc45ff9c3e16865086a4ff8c4f67318e48cf1fe2..8234becbb92b95d7ec32dc3fef203f6314aa6abf 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -35,7 +35,7 @@
        // 'stat' clause is a temporary measure until we have federation subscriptions working both directions
        $contacts = q("SELECT * FROM `contact` 
                WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
-               OR ( `network` = 'stat' AND `poll` != '' ) ) 
+               OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) 
                AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
        if(! count($contacts))