aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-18 21:31:34 -0700
committerFriendika <info@friendika.com>2011-08-18 21:31:34 -0700
commitc05c20aa56eaba3102e6c56a0160999352619b61 (patch)
treea8dc136e90663953ee5347a54fb01f7dd784e634 /mod
parentd2c6c21a88239e956b7e6a3c5a41a8a819502991 (diff)
downloadvolse-hubzilla-c05c20aa56eaba3102e6c56a0160999352619b61.tar.gz
volse-hubzilla-c05c20aa56eaba3102e6c56a0160999352619b61.tar.bz2
volse-hubzilla-c05c20aa56eaba3102e6c56a0160999352619b61.zip
set writable (e.g. writeable) flag for Diaspora contacts
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_confirm.php15
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