From 6817c5d59ad578370a2b60dbdcdba16e43dbac65 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Mon, 5 Jul 2010 21:39:55 -0700 Subject: lots of work, 2way friends, comments... --- mod/contacts.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'mod/contacts.php') diff --git a/mod/contacts.php b/mod/contacts.php index 5435df7b2..fb4e6cf6b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -93,13 +93,13 @@ function contacts_content(&$a) { switch($sort_type) { case DIRECTION_BOTH : - $sql_extra = " AND `dfrn-id` != '' AND `ret-id` != '' "; + $sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' "; break; case DIRECTION_IN : - $sql_extra = " AND `dfrn-id` != '' AND `ret-id` = '' "; + $sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' "; break; case DIRECTION_OUT : - $sql_extra = " AND `dfrn-id` = '' AND `ret-id` != '' "; + $sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' "; break; case DIRECTION_ANY : default: @@ -118,22 +118,22 @@ function contacts_content(&$a) { if($rr['self']) continue; $direction = ''; - if(strlen($rr['dfrn-id'])) { - if(strlen($rr['ret-id'])) { + if(strlen($rr['issued-id'])) { + if(strlen($rr['dfrn-id'])) { $direction = DIRECTION_BOTH; $dir_icon = 'images/lrarrow.gif'; $alt_text = 'Mutual Friendship'; } else { - $direction = DIRECTION_OUT; - $dir_icon = 'images/rarrow.gif'; - $alt_text = 'You are a fan of'; + $direction = DIRECTION_IN; + $dir_icon = 'images/larrow.gif'; + $alt_text = 'is a fan of yours'; } } else { - $direction = DIRECTION_IN; - $dir_icon = 'images/larrow.gif'; - $alt_text = 'is a fan of yours'; + $direction = DIRECTION_OUT; + $dir_icon = 'images/rarrow.gif'; + $alt_text = 'you are a fan of'; } $o .= replace_macros($tpl, array( -- cgit v1.2.3