MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

send diaspora share notification back to originator for auto friending

Browse source
This commit is contained in:
friendica 2012-01-05 13:25:43 -08:00
parent 2f73be326e
commit 5b809328af
3 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INSTALL.txt
View file

@ -38,7 +38,7 @@ with the Diaspora network and improved security.
- PHP *command line* access with register_argc_argv set to true in the - PHP *command line* access with register_argc_argv set to true in the
php.ini file [or see 'poormancron' in section 8] php.ini file [or see 'poormancron' in section 8]
- curl, gd, mysql, mbstring, mcrypt, and openssl extensions - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
- some form of email server or email gateway such that PHP mail() works - some form of email server or email gateway such that PHP mail() works

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1216' ); define ( 'FRIENDICA_VERSION', '2.3.1217' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1115 ); define ( 'DB_UPDATE_VERSION', 1115 );

25
include/diaspora.php
View file

@ -610,6 +610,10 @@ function diaspora_request($importer,$xml) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact_record['id']) intval($contact_record['id'])
); );
$u = q("select * from user where id = %d limit 1",intval($importer['uid']));
if($u)
$ret = diaspora_share($u[0],$contact_record);
} }
return; return;
@ -1781,27 +1785,6 @@ function diaspora_profile($importer,$xml) {
} }
function diaspora_share($me,$contact) { function diaspora_share($me,$contact) {
$a = get_app(); $a = get_app();
$myaddr = $me['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); $myaddr = $me['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);