clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

issues with friendship again

This commit is contained in:
Friendika 2010-11-06 22:56:39 -07:00
parent 36d286d062
commit a3ddbb5d7c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/dfrn_confirm.php
View File

@ -79,8 +79,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$dfrn_confirm = $contact['confirm']; $dfrn_confirm = $contact['confirm'];
$aes_allow = $contact['aes_allow']; $aes_allow = $contact['aes_allow'];
$network = ((strlen($contact['issued-id'])) ? 'dfrn' : 'stat');
if($contact['network'] === 'dfrn') { if($network === 'dfrn') {
// Generate a key pair for all further communications with this person. // Generate a key pair for all further communications with this person.
// We have a keypair for every contact, and a site key for unknown people. // We have a keypair for every contact, and a site key for unknown people.
@ -231,7 +232,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$photos = import_profile_photo($contact['photo'],$uid,$contact_id); $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
if($contact['network'] === 'dfrn') { if($network === 'dfrn') {
$new_relation = REL_VIP; $new_relation = REL_VIP;
if(($relation == REL_FAN) || ($duplex)) if(($relation == REL_FAN) || ($duplex))
@ -265,7 +266,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$notify = ''; $notify = '';
$poll = ''; $poll = '';
// $contact['network'] !== 'dfrn' // $network !== 'dfrn'
$arr = lrdd($contact['url']); $arr = lrdd($contact['url']);
if(count($arr)) { if(count($arr)) {
@ -282,6 +283,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
intval($uid) intval($uid)
); );
$r = q("UPDATE `contact` SET `photo` = '%s', $r = q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s', `thumb` = '%s',
`micro` = '%s', `micro` = '%s',
@ -291,7 +293,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`notify` = '%s', `notify` = '%s',
`poll` = '%s', `poll` = '%s',
`blocked` = 0, `blocked` = 0,
`pending` = 0 `pending` = 0,
`network` = 'stat'
WHERE `id` = %d LIMIT 1 WHERE `id` = %d LIMIT 1
", ",
dbesc($photos[0]), dbesc($photos[0]),
@ -455,6 +458,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$r = q("UPDATE `contact` SET $r = q("UPDATE `contact` SET
`photo` = '%s', `photo` = '%s',
`thumb` = '%s', `thumb` = '%s',
`micro` = '%s',
`rel` = %d, `rel` = %d,
`name-date` = '%s', `name-date` = '%s',
`uri-date` = '%s', `uri-date` = '%s',
@ -466,6 +470,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
", ",
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]),
intval($new_relation), intval($new_relation),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),