jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change remote welcome message

Browse source
This commit is contained in:
Friendika 2010-11-25 18:22:54 -08:00
parent 847c264787
commit a1458f899a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/poller.php
View file

@ -19,10 +19,10 @@
$a->set_baseurl(get_config('system','url')); $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'); $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)); proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
$force = false; $force = false;

4
mod/dfrn_poll.php
View file

@ -49,7 +49,7 @@ function dfrn_poll_init(&$a) {
break; // NOTREACHED 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` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1", AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
@ -67,7 +67,7 @@ function dfrn_poll_init(&$a) {
if((int) $xml->status == 1) { if((int) $xml->status == 1) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
$_SESSION['visitor_id'] = $r[0]['id']; $_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. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;