diff options
author | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
---|---|---|
committer | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
commit | cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa (patch) | |
tree | 2efc84f14303c5d8dd283a93b64f02851e969e3f /mod | |
parent | c5c99089ff363831f199e27c188410fec682fda5 (diff) | |
parent | 47f369e052d296f4a744c1508efc58f6168b7e8b (diff) | |
download | volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.gz volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.bz2 volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod')
-rw-r--r-- | mod/contacts.php | 7 | ||||
-rw-r--r-- | mod/follow.php | 9 | ||||
-rw-r--r-- | mod/poco.php | 4 | ||||
-rw-r--r-- | mod/viewcontacts.php | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 59dafd51c..51c6920d3 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -78,6 +78,7 @@ function contacts_post(&$a) { } } + $hidden = intval($_POST['hidden']); $priority = intval($_POST['poll']); if($priority > 5 || $priority < 0) @@ -85,11 +86,12 @@ function contacts_post(&$a) { $info = escape_tags(trim($_POST['info'])); - $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s' - WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s', + `hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($profile_id), intval($priority), dbesc($info), + intval($hidden), intval($contact_id), intval(local_user()) ); @@ -334,6 +336,7 @@ function contacts_content(&$a) { '$info' => $contact['info'], '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''), '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''), + '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')), '$photo' => $contact['photo'], '$name' => $contact['name'], '$dir_icon' => $dir_icon, diff --git a/mod/follow.php b/mod/follow.php index 0329d1eee..2d643400a 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -67,6 +67,8 @@ function follow_post(&$a) { } $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0); + $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0); + if($ret['network'] === NETWORK_MAIL) { $writeable = 1; @@ -101,8 +103,8 @@ function follow_post(&$a) { // create contact record $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + `writable`, `hidden`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ", intval(local_user()), dbesc(datetime_convert()), dbesc($ret['url']), @@ -120,7 +122,8 @@ function follow_post(&$a) { dbesc($ret['pubkey']), intval($new_relation), intval($ret['priority']), - intval($writeable) + intval($writeable), + intval($hidden) ); } diff --git a/mod/poco.php b/mod/poco.php index 6331131fa..dd8df6008 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -54,7 +54,7 @@ function poco_init(&$a) { and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) "); } else { - $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 + $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 $sql_extra ", intval($user['uid']) ); @@ -79,7 +79,7 @@ function poco_init(&$a) { } else { - $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 + $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 $sql_extra LIMIT %d, %d", intval($user['uid']), intval($startIndex), diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index f9510bd6b..cd8d100ed 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -25,13 +25,13 @@ function viewcontacts_content(&$a) { $o .= '<h3>' . t('View Contacts') . '</h3>'; - $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0", + $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 ", intval($a->profile['uid']) ); if(count($r)) $a->set_pager_total($r[0]['total']); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 ORDER BY `name` ASC LIMIT %d , %d ", intval($a->profile['uid']), intval($a->pager['start']), intval($a->pager['itemspage']) |