diff options
| -rwxr-xr-x | mod/contacts.php | 19 | ||||
| -rwxr-xr-x | view/contacts-top.tpl | 3 |
2 files changed, 16 insertions, 6 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 206128f9d..aaa2ff961 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) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""), diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl index 4dffda1ce..b8972834c 100755 --- a/view/contacts-top.tpl +++ b/view/contacts-top.tpl @@ -14,5 +14,6 @@ $finding <div id="contacts-main" > -<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a> +<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a><br /> +<a href="$all_url" id="contacts-show-all-link">$all_text</a><br /> </div> |