Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 08:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move Model\Profile::getTabs to new Module\BaseProfile class

Browse source
This commit is contained in:
Hypolite Petovan 2020-01-26 09:49:11 -05:00
parent 0f5d6a009f
commit f2d917114f
10 changed files with 148 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Module/Profile/Contacts.php
View file

@ -2,7 +2,6 @@
namespace Friendica\Module\Profile;
use Friendica\BaseModule;
use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
@ -13,9 +12,10 @@ use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Module\BaseProfile;
use Friendica\Util\Proxy as ProxyUtils;
class Contacts extends BaseModule
class Contacts extends BaseProfile
{
public static function content(array $parameters = [])
{
@ -42,8 +42,7 @@ class Contacts extends BaseModule
$is_owner = $a->profile['uid'] == local_user();
// tabs
$o = Profile::getTabs($a, 'contacts', $is_owner, $nickname);
$o = self::getTabsHTML($a, 'contacts', $is_owner, $nickname);
if (!count($a->profile) || $a->profile['hide-friends']) {
notice(DI::l10n()->t('Permission denied.') . EOL);

6
src/Module/Profile/Index.php
View file

@ -2,7 +2,6 @@
namespace Friendica\Module\Profile;
use Friendica\BaseModule;
use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
use Friendica\Content\Nav;
@ -19,13 +18,14 @@ use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Module\BaseProfile;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
class Index extends BaseModule
class Index extends BaseProfile
{
public static function rawContent(array $parameters = [])
{
@ -82,7 +82,7 @@ class Index extends BaseModule
Nav::setSelected('home');
$is_owner = local_user() == $a->profile['uid'];
$o = Profile::getTabs($a, 'profile', $is_owner, $a->profile['nickname']);
$o = self::getTabsHTML($a, 'profile', $is_owner, $a->profile['nickname']);
if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact_id) {
notice(DI::l10n()->t('Access to this profile has been restricted.'));

6
src/Module/Profile/Status.php
View file

@ -2,7 +2,6 @@
namespace Friendica\Module\Profile;
use Friendica\BaseModule;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
@ -13,13 +12,14 @@ use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Profile as ProfileModel;
use Friendica\Model\User;
use Friendica\Module\BaseProfile;
use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Security;
use Friendica\Util\Strings;
use Friendica\Util\XML;
class Status extends BaseModule
class Status extends BaseProfile
{
public static function content(array $parameters = [])
{
@ -81,7 +81,7 @@ class Status extends BaseModule
return '';
}
$o .= ProfileModel::getTabs($a, 'status', $is_owner, $a->profile['nickname']);
$o .= self::getTabsHTML($a, 'status', $is_owner, $a->profile['nickname']);
$o .= Widget::commonFriendsVisitor($a->profile['uid']);