mexon/friendica
1
0
Fork 0
Code Pull requests Activity

finish refactoring to Module\Contact

Browse source
This commit is contained in:
Jonny Tischbein 2018-10-13 11:35:51 +02:00
parent cdbddd0103
commit 738cb4ace6
3 changed files with 1142 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/update_contacts.php
View file

@ -14,7 +14,7 @@ function update_contacts_content(App $a)
echo "<section>"; echo "<section>";
if ($_GET["force"] == 1) { if ($_GET["force"] == 1) {
$text = Contacts::content($a, true); $text = Contact::content($a, true);
} else { } else {
$text = ''; $text = '';
} }

1136
src/Module/Contact.php Normal file
View file

File diff suppressed because it is too large Load diff

10
view/theme/frio/theme.php
View file

@ -16,8 +16,8 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Profile; use Friendica\Model;
use Friendica\Module\Contacts; use Friendica\Module\Contact;
$frio = 'view/theme/frio'; $frio = 'view/theme/frio';
@ -209,7 +209,7 @@ function frio_contact_photo_menu(App $a, &$args)
function frio_remote_nav($a, &$nav) function frio_remote_nav($a, &$nav)
{ {
// get the homelink from $_XSESSION // get the homelink from $_XSESSION
$homelink = Profile::getMyURL(); $homelink = Model\Profile::getMyURL();
if (!$homelink) { if (!$homelink) {
$homelink = defaults($_SESSION, 'visitor_home', ''); $homelink = defaults($_SESSION, 'visitor_home', '');
} }
@ -247,7 +247,7 @@ function frio_remote_nav($a, &$nav)
} elseif (!local_user() && remote_user()) { } elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
$nav['remote'] = L10n::t('Guest'); $nav['remote'] = L10n::t('Guest');
} elseif (Profile::getMyURL()) { } elseif (Model\Profile::getMyURL()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
WHERE `addr` = '%s' AND `network` = 'dfrn'", WHERE `addr` = '%s' AND `network` = 'dfrn'",
DBA::escape($webbie)); DBA::escape($webbie));
@ -333,7 +333,7 @@ function frio_acl_lookup(App $a, &$results)
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$contacts[] = Contacts::getContactTemplateVars($rr); $contacts[] = Model\Contact::getContactTemplateVars($rr);
} }
} }