change remote welcome message

diff --git a/include/poller.php b/include/poller.php
index cf099286cd468fd069b4a3d06941b447b934d36f..81a23c66fb91928a53ac1d726163350428961e85 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -19,10 +19,10 @@
        $a->set_baseurl(get_config('system','url'));
 
 
-               // run queue delivery process in the background
+       // run queue delivery process in the background
 
-               $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-               proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+       $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+       proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
 
 
        $force = false;

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 8a573c9565ddeef689e89e6f0264fecf1a07023f..35b9861a52af4d2653fa30e8f8e4640f03a21a5a 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -49,7 +49,7 @@ function dfrn_poll_init(&$a) {
                                break; // NOTREACHED
                }
 
-               $r = q("SELECT `contact`.*, `user`.`nickname` 
+               $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",
@@ -67,7 +67,7 @@ function dfrn_poll_init(&$a) {
                                if((int) $xml->status == 1) {
                                        $_SESSION['authenticated'] = 1;
                                        $_SESSION['visitor_id'] = $r[0]['id'];
-                                       notice( t('Hi ') . $r[0]['name'] . EOL);
+                                       notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;