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

dfrn friendship issue

Browse source
This commit is contained in:
Friendika 2011-08-18 16:47:45 -07:00
parent 012e039dae
commit bc5935061b
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1075' ); define ( 'FRIENDIKA_VERSION', '2.2.1076' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1081 ); define ( 'DB_UPDATE_VERSION', 1081 );

2
include/security.php
View file

@ -28,7 +28,7 @@ function can_write_wall(&$a,$owner) {
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1", AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
intval($owner), intval($owner),
intval(remote_user()), intval(remote_user()),
intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
intval(PAGE_COMMUNITY) intval(PAGE_COMMUNITY)
); );

30
mod/dfrn_request.php
View file

@ -12,10 +12,6 @@
if(! function_exists('dfrn_request_init')) { if(! function_exists('dfrn_request_init')) {
function dfrn_request_init(&$a) { function dfrn_request_init(&$a) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
}
if($a->argc > 1) if($a->argc > 1)
$which = $a->argv[1]; $which = $a->argv[1];
@ -147,8 +143,8 @@ function dfrn_request_post(&$a) {
*/ */
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `aes_allow`) `request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`)
VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
intval(local_user()), intval(local_user()),
datetime_convert(), datetime_convert(),
dbesc($dfrn_url), dbesc($dfrn_url),
@ -160,6 +156,7 @@ function dfrn_request_post(&$a) {
$parms['dfrn-confirm'], $parms['dfrn-confirm'],
$parms['dfrn-notify'], $parms['dfrn-notify'],
$parms['dfrn-poll'], $parms['dfrn-poll'],
dbesc(NETWORK_DFRN),
intval($aes_allow) intval($aes_allow)
); );
} }
@ -298,7 +295,7 @@ function dfrn_request_post(&$a) {
} }
if($network === 'dfrn') { if($network === NETWORK_DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid), intval($uid),
dbesc($url) dbesc($url)
@ -373,8 +370,8 @@ function dfrn_request_post(&$a) {
dbesc_array($parms); dbesc_array($parms);
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll` ) `request`, `confirm`, `notify`, `poll`, `network` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($uid), intval($uid),
datetime_convert(), datetime_convert(),
$parms['url'], $parms['url'],
@ -386,7 +383,8 @@ function dfrn_request_post(&$a) {
$parms['dfrn-request'], $parms['dfrn-request'],
$parms['dfrn-confirm'], $parms['dfrn-confirm'],
$parms['dfrn-notify'], $parms['dfrn-notify'],
$parms['dfrn-poll'] $parms['dfrn-poll'],
dbesc(NETWORK_DFRN)
); );
// find the contact record we just created // find the contact record we just created
@ -437,15 +435,16 @@ function dfrn_request_post(&$a) {
. (($aes_allow) ? "&aes_allow=1" : "") . (($aes_allow) ? "&aes_allow=1" : "")
); );
// NOTREACHED // NOTREACHED
// END $network === 'dfrn' // END $network === NETWORK_DFRN
} }
elseif($network === 'stat') { elseif($network === NETWORK_OSTATUS) {
/** /**
* *
* OStatus network * OStatus network
* Check contact existence * Check contact existence
* Try and scrape together enough information to create a contact record, with us as CONTACT_IS_FOLLOWER * Try and scrape together enough information to create a contact record,
* with us as CONTACT_IS_FOLLOWER
* Substitute our user's feed URL into $url template * Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe * Send the subscriber home to subscribe
* *
@ -454,7 +453,7 @@ function dfrn_request_post(&$a) {
$url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url); $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
goaway($url); goaway($url);
// NOTREACHED // NOTREACHED
// END $network === 'stat' // END $network === NETWORK_OSTATUS
} }
} return; } return;
@ -466,8 +465,6 @@ function dfrn_request_post(&$a) {
if(! function_exists('dfrn_request_content')) { if(! function_exists('dfrn_request_content')) {
function dfrn_request_content(&$a) { function dfrn_request_content(&$a) {
if(($a->argc != 2) || (! count($a->profile))) if(($a->argc != 2) || (! count($a->profile)))
return ""; return "";
@ -578,6 +575,7 @@ function dfrn_request_content(&$a) {
); );
} }
} }
killme(); killme();
return; // NOTREACHED return; // NOTREACHED
} }