From 1c93729c4624c7c8c27344f3c5139ff1c4e08d65 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 1 Dec 2015 08:12:05 +0100 Subject: [PATCH] Tab is added to "all friends" and "common friends" --- mod/allfriends.php | 16 +++--- mod/common.php | 30 ++++++----- mod/contacts.php | 68 +++++++++++++++---------- mod/crepair.php | 2 +- view/templates/viewcontact_template.tpl | 2 + 5 files changed, 69 insertions(+), 49 deletions(-) diff --git a/mod/allfriends.php b/mod/allfriends.php index 1be9550b10..3e825c0060 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -3,6 +3,7 @@ require_once('include/socgraph.php'); require_once('include/Contact.php'); require_once('include/contact_selectors.php'); +require_once('mod/contacts.php'); function allfriends_content(&$a) { @@ -25,19 +26,11 @@ function allfriends_content(&$a) { intval(local_user()) ); - $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( - '$name' => htmlentities($c[0]['name']), - '$photo' => $c[0]['photo'], - 'url' => z_root() . '/contacts/' . $cid - )); - - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - $a->page['aside'] .= $vcard_widget; - if(! count($c)) return; + $a->page['aside'] = ""; + profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"])); $r = all_friends(local_user(),$cid); @@ -86,10 +79,13 @@ function allfriends_content(&$a) { $entries[] = $entry; } + $tab_str = contacts_tab($a, $cid, 3); + $tpl = get_markup_template('viewcontact_template.tpl'); $o .= replace_macros($tpl,array( '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])), + '$tab_str' => $tab_str, '$contacts' => $entries, )); diff --git a/mod/common.php b/mod/common.php index 0860922297..66efaf62e0 100644 --- a/mod/common.php +++ b/mod/common.php @@ -3,6 +3,7 @@ require_once('include/socgraph.php'); require_once('include/Contact.php'); require_once('include/contact_selectors.php'); +require_once('mod/contacts.php'); function common_content(&$a) { @@ -29,23 +30,24 @@ function common_content(&$a) { intval($cid), intval($uid) ); - } - else { + $a->page['aside'] = ""; + profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"])); + } else { $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid) ); + + $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( + '$name' => htmlentities($c[0]['name']), + '$photo' => $c[0]['photo'], + 'url' => z_root() . '/contacts/' . $cid + )); + + if(! x($a->page,'aside')) + $a->page['aside'] = ''; + $a->page['aside'] .= $vcard_widget; } - $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( - '$name' => htmlentities($c[0]['name']), - '$photo' => $c[0]['photo'], - 'url' => z_root() . '/contacts/' . $cid - )); - - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - $a->page['aside'] .= $vcard_widget; - if(! count($c)) return; @@ -127,10 +129,14 @@ function common_content(&$a) { $entries[] = $entry; } + if($cmd === 'loc' && $cid && $uid == local_user()) + $tab_str = contacts_tab($a, $cid, 4); + $tpl = get_markup_template('viewcontact_template.tpl'); $o .= replace_macros($tpl,array( '$title' => t('Common Friends'), + '$tab_str' => $tab_str, '$contacts' => $entries, )); diff --git a/mod/contacts.php b/mod/contacts.php index 992f8ed6b2..8e1fb6f67b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -542,16 +542,16 @@ function contacts_content(&$a) { $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"])); - $common = count_common_friends(local_user(),$contact['id']); - $common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : ''); + //$common = count_common_friends(local_user(),$contact['id']); + //$common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : ''); $polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : ''); - $x = count_all_friends(local_user(), $contact['id']); - $all_friends = (($x) ? t('View all contacts') : ''); + //$x = count_all_friends(local_user(), $contact['id']); + //$all_friends = (($x) ? t('View all contacts') : ''); // tabs - $tab_str = contact_tabs($a, $contact_id, 2); + $tab_str = contacts_tab($a, $contact_id, 2); $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); @@ -812,7 +812,7 @@ function contacts_content(&$a) { return $o; } -function contact_tabs($a, $contact_id, $active_tab) { +function contacts_tab($a, $contact_id, $active_tab) { // tabs $tabs = array( array( @@ -830,40 +830,56 @@ function contact_tabs($a, $contact_id, $active_tab) { 'title' => t('Profile Details'), 'id' => 'status-tab', 'accesskey' => 'r', - ), - array( - 'label' => t('Repair'), + ) + ); + + $x = count_all_friends(local_user(), $contact_id); + if ($x) + $tabs[] = array('label'=>t('All Contacts'), + 'url' => "allfriends/".$contact_id, + 'sel' => (($active_tab == 3)?'active':''), + 'title' => t('View all contacts'), + 'id' => 'allfriends-tab', + 'accesskey' => ''); + + $common = count_common_friends(local_user(),$contact_id); + if ($common) + $tabs[] = array('label'=>t('Common Friends'), + 'url' => "common/loc/".local_user()."/".$contact_id, + 'sel' => (($active_tab == 4)?'active':''), + 'title' => t('View all common friends'), + 'id' => 'common-loc-tab', + 'accesskey' => ''); + + $tabs[] = array('label' => t('Repair'), 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, - 'sel' => (($active_tab == 3)?'active':''), + 'sel' => (($active_tab == 5)?'active':''), 'title' => t('Advanced Contact Settings'), 'id' => 'repair-tab', - 'accesskey' => 'r', - ), - array( - 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), + 'accesskey' => 'r'); + + + $tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', 'sel' => '', 'title' => t('Toggle Blocked status'), 'id' => 'toggle-block-tab', - 'accesskey' => 'b', - ), - array( - 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), + 'accesskey' => 'b'); + + $tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore', 'sel' => '', 'title' => t('Toggle Ignored status'), 'id' => 'toggle-ignore-tab', - 'accesskey' => 'i', - ), - array( - 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), + 'accesskey' => 'i'); + + $tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', 'sel' => '', 'title' => t('Toggle Archive status'), 'id' => 'toggle-archive-tab', - 'accesskey' => 'v', - ) - ); + 'accesskey' => 'v'); + $tab_tpl = get_markup_template('common_tabs.tpl'); $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs)); @@ -903,7 +919,7 @@ function contact_posts($a, $contact_id) { intval($a->pager['itemspage']) ); - $tab_str = contact_tabs($a, $contact_id, 1); + $tab_str = contacts_tab($a, $contact_id, 1); $header = $contact["name"]; diff --git a/mod/crepair.php b/mod/crepair.php index d16adf8c74..d927e36363 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -159,7 +159,7 @@ function crepair_content(&$a) { $update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS)); - $tab_str = contact_tabs($a, $contact['id'], 3); + $tab_str = contacts_tab($a, $contact['id'], 5); $header = $contact["name"]; diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index 205ad736d5..c4e2e643e6 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,6 +1,8 @@ {{include file="section_title.tpl"}} +{{$tab_str}} +
{{foreach $contacts as $contact}} {{include file="contact_template.tpl"}}