diff options
| author | friendica <info@friendica.com> | 2014-07-16 22:21:29 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-16 22:21:29 -0700 |
| commit | 98e85917bb0c12765f5ca42c49c0e64a348952ea (patch) | |
| tree | 2c998bd63b8db10359b2dbb778c4fc3b89bb76d7 | |
| parent | feb23fc9bcf2b942d03931cc18728427cb43f4a3 (diff) | |
| download | volse-hubzilla-98e85917bb0c12765f5ca42c49c0e64a348952ea.tar.gz volse-hubzilla-98e85917bb0c12765f5ca42c49c0e64a348952ea.tar.bz2 volse-hubzilla-98e85917bb0c12765f5ca42c49c0e64a348952ea.zip | |
subdue archived connections in group editor and don't show at all in contact_block()
| -rwxr-xr-x | include/text.php | 4 | ||||
| -rw-r--r-- | mod/group.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 85c27265f..ee0127732 100755 --- a/include/text.php +++ b/include/text.php @@ -734,7 +734,7 @@ function contact_block() { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), - intval($abook_flags), + intval($abook_flags|ABOOK_FLAGS_ARCHIVED), intval($xchan_flags), intval($shown) ); @@ -795,7 +795,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( '$click' => (($contact['click']) ? $contact['click'] : ''), - '$class' => $class, + '$class' => $class . (($contact['archived']) ? ' archived' : ''), '$url' => $url, '$photo' => $contact['xchan_photo_s'], '$name' => $contact['xchan_name'], diff --git a/mod/group.php b/mod/group.php index d9bbec78b..0f265f6fb 100644 --- a/mod/group.php +++ b/mod/group.php @@ -203,6 +203,7 @@ function group_content(&$a) { $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); foreach($members as $member) { if($member['xchan_url']) { + $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); } @@ -221,6 +222,7 @@ function group_content(&$a) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['xchan_hash'],$preselected)) { + $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode); } |