aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_confirm.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-29 00:23:05 -0800
committerfriendica <info@friendica.com>2011-12-29 00:23:05 -0800
commitc735582eadc05d566057d00c685ec60c6e1164d9 (patch)
tree4cd99ac286f517f08edf5591bf19ed2dcfcb41e4 /mod/dfrn_confirm.php
parentda21473c3434808f91953ba14f97c647b8dc8895 (diff)
downloadvolse-hubzilla-c735582eadc05d566057d00c685ec60c6e1164d9.tar.gz
volse-hubzilla-c735582eadc05d566057d00c685ec60c6e1164d9.tar.bz2
volse-hubzilla-c735582eadc05d566057d00c685ec60c6e1164d9.zip
hide contacts on approval
Diffstat (limited to 'mod/dfrn_confirm.php')
-rw-r--r--mod/dfrn_confirm.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index ce6f4f95f..1b0985cef 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -71,12 +71,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$dfrn_id = $handsfree['dfrn_id'];
$intro_id = $handsfree['intro_id'];
$duplex = $handsfree['duplex'];
+ $hidden = ((array_key_exists('hidden',$handsfree)) ? intval($handsfree['hidden']) : 0 );
}
else {
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : "");
$intro_id = ((x($_POST,'intro_id')) ? intval($_POST['intro_id']) : 0 );
$duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 );
$cid = ((x($_POST,'contact_id')) ? intval($_POST['contact_id']) : 0 );
+ $hidden = ((x($_POST,'hidden')) ? intval($_POST['hidden']) : 0 );
}
/**
@@ -122,7 +124,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$site_pubkey = $contact['site-pubkey'];
$dfrn_confirm = $contact['confirm'];
$aes_allow = $contact['aes_allow'];
-
+
$network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS);
if($contact['network'])
@@ -316,7 +318,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if(($relation == CONTACT_IS_SHARING) && ($duplex))
$duplex = 0;
- $r = q("UPDATE `contact` SET `photo` = '%s',
+ $r = q("UPDATE `contact` SET
+ `photo` = '%s',
`thumb` = '%s',
`micro` = '%s',
`rel` = %d,
@@ -326,6 +329,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`blocked` = 0,
`pending` = 0,
`duplex` = %d,
+ `hidden` = %d,
`network` = 'dfrn' WHERE `id` = %d LIMIT 1
",
dbesc($photos[0]),
@@ -336,6 +340,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($duplex),
+ intval($hidden),
intval($contact_id)
);
}
@@ -387,6 +392,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`pending` = 0,
`network` = '%s',
`writable` = %d,
+ `hidden` = %d,
`rel` = %d
WHERE `id` = %d LIMIT 1
",
@@ -400,6 +406,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($poll),
dbesc($network),
intval($writable),
+ intval($hidden),
intval($new_relation),
intval($contact_id)
);
@@ -423,7 +430,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($uid)
);
- if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
+ if((count($r)) && (! $hidden) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
if($r[0]['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');