diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-22 13:56:08 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-22 13:56:08 +0200 |
| commit | d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75 (patch) | |
| tree | dbdc1dbffe5c56dcff18669e957f679b5ae37bb3 /mod/dfrn_confirm.php | |
| parent | afdc639f17f0f5e12f291b512ccc12b3df6b2acf (diff) | |
| parent | 564ade0685470158ac487d9a9f18a21079c729bb (diff) | |
| download | volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.tar.gz volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.tar.bz2 volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.zip | |
Merge branch 'master' into newui
Diffstat (limited to 'mod/dfrn_confirm.php')
| -rw-r--r-- | mod/dfrn_confirm.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 4088178c0..4dacb5d81 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -360,8 +360,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) { } $new_relation = $contact['rel']; - if($network === NETWORK_DIASPORA && $duplex) - $new_relation = CONTACT_IS_FRIEND; + $writable = $contact['writable']; + + if($network === NETWORK_DIASPORA) { + if($duplex) + $new_relation = CONTACT_IS_FRIEND; + if($new_relation != CONTACT_IS_FOLLOWER) + $writable = 1; + } $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($intro_id), @@ -380,6 +386,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { `blocked` = 0, `pending` = 0, `network` = '%s', + `writable` = %d, `rel` = %d WHERE `id` = %d LIMIT 1 ", @@ -392,6 +399,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { dbesc($notify), dbesc($poll), dbesc($network), + intval($writable), intval($new_relation), intval($contact_id) ); @@ -640,7 +648,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { `blocked` = 0, `pending` = 0, `duplex` = %d, - `network` = 'dfrn' WHERE `id` = %d LIMIT 1 + `network` = '%s' WHERE `id` = %d LIMIT 1 ", dbesc($photos[0]), dbesc($photos[1]), @@ -650,6 +658,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { dbesc(datetime_convert()), dbesc(datetime_convert()), intval($duplex), + dbesc(NETWORK_DFRN), intval($dfrn_record) ); if($r === false) { // indicates schema is messed up or total db failure |