*/
use Friendica\App;
+use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
require_once 'include/text.php';
-require_once 'mod/proxy.php';
/**
* @brief Controller for /match.
$a->page['aside'] .= Widget::findPeople();
$a->page['aside'] .= Widget::follow();
- $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+ $_SESSION['return_path'] = $a->cmd;
$r = q(
"SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
if ($tags) {
+ $pager = new Pager($a->query_string);
+
$params['s'] = $tags;
- if ($a->pager['page'] != 1) {
- $params['p'] = $a->pager['page'];
+ if ($pager->getPage() != 1) {
+ $params['p'] = $pager->getPage();
}
if (strlen(Config::get('system', 'directory'))) {
- $x = Network::post(get_server().'/msearch', $params);
+ $x = Network::post(get_server().'/msearch', $params)->getBody();
} else {
- $x = Network::post(System::baseUrl() . '/msearch', $params);
+ $x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
}
$j = json_decode($x);
- if ($j->total) {
- $a->set_pager_total($j->total);
- $a->set_pager_itemspage($j->items_page);
- }
-
if (count($j->results)) {
+ $pager->setItemsPerPage($j->items_page);
+
$id = 0;
foreach ($j->results as $jj) {
- $match_nurl = normalise_link($jj->url);
+ $match_nurl = Strings::normaliseLink($jj->url);
$match = q(
"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
intval(local_user()),
$entry = [
'url' => Contact::magicLink($jj->url),
- 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
+ 'itemurl' => defaults($contact_details, 'addr', $jj->url),
'name' => $jj->name,
- 'details' => $contact_details['location'],
- 'tags' => $contact_details['keywords'],
- 'about' => $contact_details['about'],
+ 'details' => defaults($contact_details, 'location', ''),
+ 'tags' => defaults($contact_details, 'keywords', ''),
+ 'about' => defaults($contact_details, 'about', ''),
'account_type' => Contact::getAccountType($contact_details),
- 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+ 'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
'inttxt' => ' ' . L10n::t('is interested in:'),
'conntxt' => L10n::t('Connect'),
'connlnk' => $connlnk,
}
}
- $tpl = get_markup_template('viewcontact_template.tpl');
+ $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
- $o .= replace_macros(
- $tpl,
- [
- '$title' => L10n::t('Profile Match'),
+ $o .= Renderer::replaceMacros($tpl, [
+ '$title' => L10n::t('Profile Match'),
'$contacts' => $entries,
- '$paginate' => paginate($a)]
- );
+ '$paginate' => $pager->renderFull($j->total)
+ ]);
} else {
info(L10n::t('No matches') . EOL);
}