+++ /dev/null
-<?php
-/**
- * @file mod/viewcontacts.php
- */
-
-use Friendica\App;
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Nav;
-use Friendica\Content\Pager;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
-use Friendica\Util\Proxy as ProxyUtils;
-
-function viewcontacts_init(App $a)
-{
- if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
- throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
- }
-
- if ($a->argc < 2) {
- throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
- }
-
- Nav::setSelected('home');
-
- $user = DBA::selectFirst('user', [], ['nickname' => $a->argv[1], 'blocked' => false]);
- if (!DBA::isResult($user)) {
- throw new \Friendica\Network\HTTPException\NotFoundException();
- }
-
- $a->data['user'] = $user;
- $a->profile_uid = $user['uid'];
-
- Profile::load($a, $a->argv[1]);
-}
-
-function viewcontacts_content(App $a)
-{
- if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
- notice(L10n::t('Public access denied.') . EOL);
- return;
- }
-
- $is_owner = $a->profile['profile_uid'] == local_user();
-
- // tabs
- $o = Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
-
- if (!count($a->profile) || $a->profile['hide-friends']) {
- notice(L10n::t('Permission denied.') . EOL);
- return $o;
- }
-
- $condition = [
- 'uid' => $a->profile['uid'],
- 'blocked' => false,
- 'pending' => false,
- 'hidden' => false,
- 'archive' => false,
- 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]
- ];
-
- $total = DBA::count('contact', $condition);
-
- $pager = new Pager($a->query_string);
-
- $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-
- $contacts_stmt = DBA::select('contact', [], $condition, $params);
-
- if (!DBA::isResult($contacts_stmt)) {
- info(L10n::t('No contacts.') . EOL);
- return $o;
- }
-
- $contacts = [];
-
- while ($contact = DBA::fetch($contacts_stmt)) {
- /// @TODO This triggers an E_NOTICE if 'self' is not there
- if ($contact['self']) {
- continue;
- }
-
- $contact_details = Contact::getDetailsByURL($contact['url'], $a->profile['uid'], $contact);
-
- $contacts[] = [
- 'id' => $contact['id'],
- 'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']),
- 'photo_menu' => Contact::photoMenu($contact),
- 'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
- 'name' => substr($contact_details['name'], 0, 20),
- 'username' => $contact_details['name'],
- 'details' => $contact_details['location'],
- 'tags' => $contact_details['keywords'],
- 'about' => $contact_details['about'],
- 'account_type' => Contact::getAccountType($contact_details),
- 'url' => Contact::magicLink($contact['url']),
- 'sparkle' => '',
- 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $contact['url']),
- 'network' => ContactSelector::networkToName($contact['network'], $contact['url']),
- ];
- }
-
- DBA::close($contacts_stmt);
-
- $tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl");
- $o .= Renderer::replaceMacros($tpl, [
- '$title' => L10n::t('Contacts'),
- '$contacts' => $contacts,
- '$paginate' => $pager->renderFull($total),
- ]);
-
- return $o;
-}
$this->routeCollector->addRoute(['GET'], '/probe', Module\Debug\Probe::class);
$this->routeCollector->addGroup('/profile', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/{nickname}', Module\Profile::class);
+ $collector->addRoute(['GET'], '/{nickname}/contacts[/{type}]', Module\Profile\Contacts::class);
$collector->addRoute(['GET'], '/{profile:\d+}/view', Module\Profile::class);
});
$this->routeCollector->addGroup('/proxy', function (RouteCollector $collector) {
'pending' => false,
'hidden' => false,
'archive' => false,
- 'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA],
+ 'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::FEED],
]);
$contacts_title = L10n::t('No contacts');
[
'label' => L10n::t('Status'),
'url' => $url,
- 'sel' => !$tab && $a->argv[0] == 'profile' ? 'active' : '',
+ 'sel' => !$tab && $a->argv[0] == 'profile' && (empty($a->argv[2]) || $a->argv[2] !== 'contacts') ? 'active' : '',
'title' => L10n::t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
];
}
- if (!$is_owner && empty($a->profile['hide-friends'])) {
+ if ($is_owner || empty($a->profile['hide-friends'])) {
$tabs[] = [
'label' => L10n::t('Contacts'),
- 'url' => System::baseUrl() . '/viewcontacts/' . $nickname,
- 'sel' => !$tab && $a->argv[0] == 'viewcontacts' ? 'active' : '',
+ 'url' => System::baseUrl() . '/profile/' . $nickname . '/contacts',
+ 'sel' => !$tab && !empty($a->argv[2]) && $a->argv[2] == 'contacts' ? 'active' : '',
'title' => L10n::t('Contacts'),
'id' => 'viewcontacts-tab',
'accesskey' => 'k',
--- /dev/null
+<?php
+
+namespace Friendica\Module\Profile;
+
+use Friendica\BaseModule;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Nav;
+use Friendica\Content\Pager;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
+
+class Contacts extends BaseModule
+{
+ public static function content()
+ {
+ if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+ throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.'));
+ }
+
+ $a = self::getApp();
+
+ //@TODO: Get value from router parameters
+ $nickname = $a->argv[1];
+ $type = defaults($a->argv, 3, 'all');
+
+ Nav::setSelected('home');
+
+ $user = DBA::selectFirst('user', [], ['nickname' => $nickname, 'blocked' => false]);
+ if (!DBA::isResult($user)) {
+ throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.'));
+ }
+
+ $a->data['user'] = $user;
+ $a->profile_uid = $user['uid'];
+
+ Profile::load($a, $nickname);
+
+ $is_owner = $a->profile['profile_uid'] == local_user();
+
+ // tabs
+ $o = Profile::getTabs($a, $is_owner, $nickname);
+
+ if (!count($a->profile) || $a->profile['hide-friends']) {
+ notice(L10n::t('Permission denied.') . EOL);
+ return $o;
+ }
+
+ $condition = [
+ 'uid' => $a->profile['uid'],
+ 'blocked' => false,
+ 'pending' => false,
+ 'hidden' => false,
+ 'archive' => false,
+ 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED]
+ ];
+
+ switch ($type) {
+ case 'followers': $condition['rel'] = [1, 3]; break;
+ case 'following': $condition['rel'] = [2, 3]; break;
+ case 'mutuals': $condition['rel'] = 3; break;
+ }
+
+ $total = DBA::count('contact', $condition);
+
+ $pager = new Pager($a->query_string);
+
+ $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+
+ $contacts_stmt = DBA::select('contact', [], $condition, $params);
+
+ if (!DBA::isResult($contacts_stmt)) {
+ info(L10n::t('No contacts.') . EOL);
+ return $o;
+ }
+
+ $contacts = [];
+
+ while ($contact = DBA::fetch($contacts_stmt)) {
+ /// @TODO This triggers an E_NOTICE if 'self' is not there
+ if ($contact['self']) {
+ continue;
+ }
+
+ $contact_details = Contact::getDetailsByURL($contact['url'], $a->profile['uid'], $contact);
+
+ $contacts[] = [
+ 'id' => $contact['id'],
+ 'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']),
+ 'photo_menu' => Contact::photoMenu($contact),
+ 'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
+ 'name' => substr($contact_details['name'], 0, 20),
+ 'username' => $contact_details['name'],
+ 'details' => $contact_details['location'],
+ 'tags' => $contact_details['keywords'],
+ 'about' => $contact_details['about'],
+ 'account_type' => Contact::getAccountType($contact_details),
+ 'url' => Contact::magicLink($contact['url']),
+ 'sparkle' => '',
+ 'itemurl' => $contact_details['addr'] ? : $contact['url'],
+ 'network' => ContactSelector::networkToName($contact['network'], $contact['url']),
+ ];
+ }
+
+ DBA::close($contacts_stmt);
+
+ switch ($type) {
+ case 'followers': $title = L10n::tt('Follower (%s)', 'Followers (%s)', $total); break;
+ case 'following': $title = L10n::tt('Following (%s)', 'Following (%s)', $total); break;
+ case 'mutuals': $title = L10n::tt('Mutual friend (%s)', 'Mutual friends (%s)', $total); break;
+
+ case 'all': default: $title = L10n::tt('Contact (%s)', 'Contacts (%s)', $total); break;
+ }
+
+ $tpl = Renderer::getMarkupTemplate('profile/contacts.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$title' => $title,
+ '$nickname' => $nickname,
+ '$type' => $type,
+
+ '$all_label' => L10n::t('All contacts'),
+ '$followers_label' => L10n::t('Followers'),
+ '$following_label' => L10n::t('Following'),
+ '$mutuals_label' => L10n::t('Mutual friends'),
+
+ '$contacts' => $contacts,
+ '$paginate' => $pager->renderFull($total),
+ ]);
+
+ return $o;
+ }
+}
$author->appendChild($urls);
}
- XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]);
+ XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
if ($profile["publish"]) {
--- /dev/null
+<div class="generic-page-wrapper">
+ {{include file="section_title.tpl"}}
+
+ <ul role="menubar" class="tabs">
+ <li role="menuitem"><a href="profile/{{$nickname}}/contacts" class="tab button{{if !$type || $type == 'all'}} active{{/if}}">{{$all_label}}</a></li>
+ <li role="menuitem"><a href="profile/{{$nickname}}/contacts/followers" class="tab button{{if $type == 'followers'}} active{{/if}}">{{$followers_label}}</a></li>
+ <li role="menuitem"><a href="profile/{{$nickname}}/contacts/following" class="tab button{{if $type == 'following'}} active{{/if}}">{{$following_label}}</a></li>
+ <li role="menuitem"><a href="profile/{{$nickname}}/contacts/mutuals" class="tab button{{if $type == 'mutuals'}} active{{/if}}">{{$mutuals_label}}</a></li>
+ </ul>
+
+ <div id="viewcontact_wrapper-{{$id}}">
+{{foreach $contacts as $contact}}
+ {{include file="contact_template.tpl"}}
+{{/foreach}}
+ </div>
+ <div class="clear"></div>
+ <div id="view-contact-end"></div>
+
+ {{$paginate nofilter}}
+</div>
clear: both;
}
-
-#viewcontacts {
- margin-top: 15px;
-}
#profile-edit-default-desc {
color: #FF0000;
border: 1px solid #FF8888;
.manage-content-wrapper, .notes-content-wrapper,
.message-content-wrapper, .apps-content-wrapper,
#adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
-.viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
+.dfrn_request-content-wrapper,
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
.profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper,
.fsuggest-content-wrapper {
right: 10px;
}
- .generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
+ .generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
border-radius: 0;
padding: 10px;
}
--- /dev/null
+<div class="generic-page-wrapper">
+ {{include file="section_title.tpl"}}
+
+ <ul class="nav nav-tabs">
+ <li role="presentation"{{if !$type || $type == 'all'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts">{{$all_label}}</a></li>
+ <li role="presentation"{{if $type == 'followers'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/followers">{{$followers_label}}</a></li>
+ <li role="presentation"{{if $type == 'following'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/following">{{$following_label}}</a></li>
+ <li role="presentation"{{if $type == 'mutuals'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/mutuals">{{$mutuals_label}}</a></li>
+ </ul>
+
+ <ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
+{{foreach $contacts as $contact}}
+ <li>{{include file="contact_template.tpl"}}</li>
+{{/foreach}}
+ </ul>
+ <div class="clear"></div>
+ <div id="view-contact-end"></div>
+
+ {{$paginate nofilter}}
+</div>
clear: both;
}
-#viewcontacts {
- margin-top: 15px;
-}
-
.contact-entry-wrapper .contact-entry-photo-wrapper {
float: left;
margin-right: 10px;
projects / friendica.git / commitdiff