From da946bb9b0905a2126e7234c6c85157bd7978102 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 03:07:15 -0800 Subject: [PATCH] bug #278 show only blocked contacts --- mod/contacts.php | 19 ++++++++++++++----- view/contacts-top.tpl | 3 ++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 206128f9d0..aaa2ff9613 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -356,20 +356,29 @@ function contacts_content(&$a) { } + $blocked = false; + $_SESSION['return_url'] = $a->query_string; if(($a->argc == 2) && ($a->argv[1] === 'all')) $sql_extra = ''; - else - $sql_extra = " AND `blocked` = 0 "; - + else { + if(($a->argc == 2) && ($a->argv[1] === 'blocked')) { + $sql_extra = " AND `blocked` = 1 "; + $blocked = true; + } + else + $sql_extra = " AND `blocked` = 0 "; + } $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); $tpl = get_markup_template("contacts-top.tpl"); $o .= replace_macros($tpl,array( '$header' => t('Contacts'), - '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ), - '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')), + '$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'), + '$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')), + '$all_url' => 'contacts/all', + '$all_text' => t('Show All Contacts'), '$search' => $search, '$desc' => t('Search your contacts'), '$finding' => (strlen($search) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : ""), diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl index 4dffda1ce4..b8972834c7 100755 --- a/view/contacts-top.tpl +++ b/view/contacts-top.tpl @@ -14,5 +14,6 @@ $finding
-$hide_text +$hide_text
+$all_text