Merge remote-tracking branch 'upstream/master'

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index ef8469523dd92f86e8f458f7277d5dad274ab014..09f198b81465dc33a4cf3a87161b4bfd9734c114 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -31,6 +31,12 @@ function dfrn_poll_init(&$a) {
                        killme();
                }
 
+               $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+                       dbesc($a->argv[1])
+               );
+               if(count($r) && $r[0]['hidewall'])
+                       killme();
+ 
                logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
                header("Content-type: application/atom+xml");
                $o = get_feed_for($a, '', $a->argv[1],$last_update);
@@ -55,7 +61,7 @@ function dfrn_poll_init(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }
 
@@ -94,7 +100,7 @@ function dfrn_poll_init(&$a) {
                        $profile = $r[0]['nickname'];
                        goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
                }
-               goaway($a->get_baseurl());
+               goaway(z_root());
 
        }
 
@@ -291,7 +297,7 @@ function dfrn_poll_post(&$a) {
                        $my_id = '0:' . $dfrn_id;
                        break;
                default:
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                        break; // NOTREACHED
        }
 
@@ -414,7 +420,7 @@ function dfrn_poll_content(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }