remove "smilie" expansion for Diaspora logo

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
old mode 100644 (file)
new mode 100755 (executable)
index 2da1a30..b12e071
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -27,6 +27,16 @@ function dfrn_poll_init(&$a) {
        }
 
        if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+               if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+                       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);
@@ -51,7 +61,7 @@ function dfrn_poll_init(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }
 
@@ -76,7 +86,9 @@ function dfrn_poll_init(&$a) {
                                        $_SESSION['authenticated'] = 1;
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
-                                       notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       $_SESSION['visitor_handle'] = $r[0]['addr'];
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;
@@ -89,7 +101,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());
 
        }
 
@@ -286,7 +298,7 @@ function dfrn_poll_post(&$a) {
                        $my_id = '0:' . $dfrn_id;
                        break;
                default:
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                        break; // NOTREACHED
        }
 
@@ -409,7 +421,7 @@ function dfrn_poll_content(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }
 
@@ -501,7 +513,8 @@ function dfrn_poll_content(&$a) {
                                        $_SESSION['authenticated'] = 1;
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
-                                       notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;