diff options
| author | Friendika <info@friendika.com> | 2010-11-06 22:56:39 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2010-11-06 22:56:39 -0700 |
| commit | a3ddbb5d7c95f36724343a450418b388fff9454d (patch) | |
| tree | 2c24a0da448abc25b5bce027f65c4526d3a899f6 /mod | |
| parent | 36d286d062f993ad0596b81481c01f07c54e33bd (diff) | |
| download | volse-hubzilla-a3ddbb5d7c95f36724343a450418b388fff9454d.tar.gz volse-hubzilla-a3ddbb5d7c95f36724343a450418b388fff9454d.tar.bz2 volse-hubzilla-a3ddbb5d7c95f36724343a450418b388fff9454d.zip | |
issues with friendship again
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_confirm.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 4a5fe1114..fcfce90b9 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -79,8 +79,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $dfrn_confirm = $contact['confirm']; $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. // 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); - if($contact['network'] === 'dfrn') { + if($network === 'dfrn') { $new_relation = REL_VIP; if(($relation == REL_FAN) || ($duplex)) @@ -265,7 +266,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $notify = ''; $poll = ''; - // $contact['network'] !== 'dfrn' + // $network !== 'dfrn' $arr = lrdd($contact['url']); if(count($arr)) { @@ -282,6 +283,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($uid) ); + $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', @@ -291,7 +293,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) { `notify` = '%s', `poll` = '%s', `blocked` = 0, - `pending` = 0 + `pending` = 0, + `network` = 'stat' WHERE `id` = %d LIMIT 1 ", dbesc($photos[0]), @@ -455,6 +458,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', + `micro` = '%s', `rel` = %d, `name-date` = '%s', `uri-date` = '%s', @@ -466,6 +470,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { ", dbesc($photos[0]), dbesc($photos[1]), + dbesc($photos[2]), intval($new_relation), dbesc(datetime_convert()), dbesc(datetime_convert()), |