Merge pull request #415 from 23n/patch-2

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
old mode 100755 (executable)
new mode 100644 (file)
index fe5cd49..f3c1454
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -26,21 +26,24 @@ function dfrn_poll_init(&$a) {
                $dfrn_id   = substr($dfrn_id,2);
        }
 
-       if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+       if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
                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();
+               $user = '';
+               if($a->argc > 1) {
+                       $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+                               dbesc($a->argv[1])
+                       );
+                       if((! count($r)) || (count($r) && $r[0]['hidewall']))
+                               killme();
+                       $user = $r[0]['nickname'];
+               }
  
-               logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+               logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
                header("Content-type: application/atom+xml");
-               $o = get_feed_for($a, '', $a->argv[1],$last_update);
-               echo $o;
+               echo get_feed_for($a, '', $user,$last_update);
                killme();
        }
 
@@ -425,11 +428,13 @@ function dfrn_poll_content(&$a) {
                                break; // NOTREACHED
                }
 
+               $nickname = $a->argv[1];
+
                $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
                        FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                        WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
                        AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-                       dbesc($a->argv[1])
+                       dbesc($nickname)
                );
 
                if(count($r)) {
@@ -438,7 +443,7 @@ function dfrn_poll_content(&$a) {
                        $encrypted_id = '';
                        $id_str = $my_id . '.' . mt_rand(1000,9999);
 
-                       if($r[0]['duplex'] && strlen($r[0]['pubkey'])) {
+                       if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
                                openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
                                openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
                        }
@@ -479,7 +484,7 @@ function dfrn_poll_content(&$a) {
                                ));
                        }
                        
-                       $profile = $r[0]['nickname'];
+                       $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
                        switch($destination_url) {
                                case 'profile':