aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-05 18:36:26 -0800
committerfriendica <info@friendica.com>2011-12-05 18:36:26 -0800
commit47f369e052d296f4a744c1508efc58f6168b7e8b (patch)
tree8cf84b2e8b409aed461e4f1e12c48d8cb2fe13d5
parentd2e110abf5c530b6e4f2e32bf8812faa3fa131f2 (diff)
downloadvolse-hubzilla-47f369e052d296f4a744c1508efc58f6168b7e8b.tar.gz
volse-hubzilla-47f369e052d296f4a744c1508efc58f6168b7e8b.tar.bz2
volse-hubzilla-47f369e052d296f4a744c1508efc58f6168b7e8b.zip
hide some contacts from others
-rw-r--r--mod/contacts.php7
-rw-r--r--mod/follow.php9
-rw-r--r--view/contact_edit.tpl2
-rw-r--r--view/theme/duepuntozero/style.css1
4 files changed, 13 insertions, 6 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/view/contact_edit.tpl b/view/contact_edit.tpl
index fc6c17981..fc1a3d47b 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -59,7 +59,7 @@
{{ endif }}
<div id="contact-edit-end" ></div>
-
+ {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
<div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0150eb176..1127f1145 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1461,6 +1461,7 @@ input#dfrn-url {
#contact-edit-end {
clear: both;
+ margin-top: 15px;
}
#contact-profile-selector {