diff options
| author | friendica <info@friendica.com> | 2014-01-06 17:10:53 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-06 17:12:44 -0800 |
| commit | 41df51a8151a5c1f35abe3c04f94e43b673e29ff (patch) | |
| tree | 9e069c342fdfdba2db2bc1491032e44d2d3aff28 | |
| parent | 8dc22c564aee0a6edf590a9a47021ea1ceb4aecf (diff) | |
| download | volse-hubzilla-41df51a8151a5c1f35abe3c04f94e43b673e29ff.tar.gz volse-hubzilla-41df51a8151a5c1f35abe3c04f94e43b673e29ff.tar.bz2 volse-hubzilla-41df51a8151a5c1f35abe3c04f94e43b673e29ff.zip | |
add "self" to access control lists with special marking to indicate it's special (for instance you can't really deny access to yourself). But this lets us make something private to our eyes only; whatever it may be.
| -rw-r--r-- | mod/acl.php | 8 | ||||
| -rw-r--r-- | view/js/acl.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/mod/acl.php b/mod/acl.php index cd3e24367..ed9e935e9 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -51,7 +51,7 @@ function acl_init(&$a){ $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) and not (xchan_flags & %d ) $sql_extra2" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), + intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), intval(XCHAN_FLAGS_DELETED) ); $contact_count = (int)$r[0]['c']; @@ -127,11 +127,11 @@ function acl_init(&$a){ } if ($type=='' || $type=='c') { - $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms + $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) and not (xchan_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), + intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), intval(XCHAN_FLAGS_DELETED) ); @@ -214,7 +214,7 @@ function acl_init(&$a){ "xid" => $g['hash'], "link" => $g['nick'], "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), - "network" => '', + "self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''), "taggable" => (($g['abook_their_perms'] & PERMS_W_TAGWALL) ? 'taggable' : '') ); } diff --git a/view/js/acl.js b/view/js/acl.js index 906b28354..84b080de2 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -259,8 +259,8 @@ ACL.prototype.populate = function(data){ var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height); $(data.items).each(function(){ - html = "<div class='acl-list-item {4} {5} {7}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; - html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link, this.taggable ); + html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; + html = html.format( this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable ); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 325685607..f039b7374 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2441,3 +2441,7 @@ img.mail-list-sender-photo { margin-top: 8px; margin-right: 15px; } + +.abook-self { + background-color: #ffdddd; +}
\ No newline at end of file |