Only allow non top level posts to soap boxes

diff --git a/include/delivery.php b/include/delivery.php
index 51ffe48d7a7f445949a72b0a48e554937fac605a..cdd59451f0f2b0065cdc76b324ba6521fa6edb56 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -340,10 +340,10 @@ function delivery_run(&$argv, &$argc){
                                                $ssl_policy = get_config('system','ssl_policy');
                                                fix_contact_ssl_policy($x[0],$ssl_policy);
 
-                                               // If we are setup as a soapbox we aren't accepting input from this person
+                                               // If we are setup as a soapbox we aren't accepting top level posts from this person
 
-                                               //if($x[0]['page-flags'] == PAGE_SOAPBOX)
-                                               //      break;
+                                               if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
+                                                       break;
 
                                                require_once('library/simplepie/simplepie.inc');
                                                logger('mod-delivery: local delivery');

diff --git a/include/notifier.php b/include/notifier.php
index 79bf7d51c88c5bcb81a06d366139d2fa5b936656..9dac5f114b177d617956a9772d733194d13bd0f1 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -734,10 +734,10 @@ function notifier_run(&$argv, &$argc){
                                                        $ssl_policy = get_config('system','ssl_policy');
                                                        fix_contact_ssl_policy($x[0],$ssl_policy);
 
-                                                       // If we are setup as a soapbox we aren't accepting input from this person
+                                                       // If we are setup as a soapbox we aren't accepting top level posts from this person
 
-                                                       //if($x[0]['page-flags'] == PAGE_SOAPBOX)
-                                                       //      break;
+                                                       if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
+                                                               break;
 
                                                        require_once('library/simplepie/simplepie.inc');
                                                        logger('mod-delivery: local delivery');