clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused App parameter from Module\Contact::getTabsHTML

This commit is contained in:
Hypolite Petovan 2020-08-06 10:31:40 -04:00
parent b45ba63dbf
commit f5ea07c731
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/common.php
View File

@ -120,7 +120,7 @@ function common_content(App $a)
$title = ''; $title = '';
$tab_str = ''; $tab_str = '';
if ($cmd === 'loc' && $cid && local_user() == $uid) { if ($cmd === 'loc' && $cid && local_user() == $uid) {
$tab_str = Module\Contact::getTabsHTML($a, $contact, 5); $tab_str = Module\Contact::getTabsHTML($contact, 5);
} else { } else {
$title = DI::l10n()->t('Common Friends'); $title = DI::l10n()->t('Common Friends');
} }

2
src/Module/AllFriends.php
View File

@ -72,7 +72,7 @@ class AllFriends extends BaseModule
return DI::l10n()->t('No friends to display.'); return DI::l10n()->t('No friends to display.');
} }
$tab_str = Contact::getTabsHTML($app, $contact, 4); $tab_str = Contact::getTabsHTML($contact, 4);
$entries = []; $entries = [];
foreach ($friends as $friend) { foreach ($friends as $friend) {

10
src/Module/Contact.php
View File

@ -531,7 +531,7 @@ class Contact extends BaseModule
$nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol'])); $nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
// tabs // tabs
$tab_str = self::getTabsHTML($a, $contact, 3); $tab_str = self::getTabsHTML($contact, 3);
$lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : ''); $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : '');
@ -855,14 +855,14 @@ class Contact extends BaseModule
* *
* Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends' * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
* *
* @param App $a
* @param array $contact The contact array * @param array $contact The contact array
* @param int $active_tab 1 if tab should be marked as active * @param int $active_tab 1 if tab should be marked as active
* *
* @return string HTML string of the contact page tabs buttons. * @return string HTML string of the contact page tabs buttons.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/ */
public static function getTabsHTML($a, $contact, $active_tab) public static function getTabsHTML(array $contact, int $active_tab)
{ {
$cid = $pcid = $contact['id']; $cid = $pcid = $contact['id'];
$data = Model\Contact::getPublicAndUserContacID($contact['id'], local_user()); $data = Model\Contact::getPublicAndUserContacID($contact['id'], local_user());
@ -964,7 +964,7 @@ class Contact extends BaseModule
$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]); $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
if (!$update) { if (!$update) {
$o .= self::getTabsHTML($a, $contact, 1); $o .= self::getTabsHTML($contact, 1);
} }
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
@ -988,7 +988,7 @@ class Contact extends BaseModule
{ {
$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]); $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
$o = self::getTabsHTML($a, $contact, 2); $o = self::getTabsHTML($contact, 2);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
DI::page()['aside'] = ''; DI::page()['aside'] = '';

2
src/Module/Contact/Advanced.php
View File

@ -125,7 +125,7 @@ class Advanced extends BaseModule
$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')]; $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
} }
$tab_str = Contact::getTabsHTML(DI::app(), $contact, 6); $tab_str = Contact::getTabsHTML($contact, 6);
$tpl = Renderer::getMarkupTemplate('contact/advanced.tpl'); $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl');
return Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [