X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=57e05226db678478fdf744c49c269eb4f511e8d4;hb=337e6066488e27d102bab5254d8af27e65141f19;hp=47b24e9f7e7582b60e63a029bc07d70be442e39c;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 47b24e9f7e..57e05226db 100644 --- a/mod/match.php +++ b/mod/match.php @@ -2,17 +2,19 @@ /** * @file mod/match.php */ + 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\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Profile; - -require_once 'include/text.php'; -require_once 'mod/proxy.php'; +use Friendica\Util\Network; +use Friendica\Util\Proxy as ProxyUtils; /** * @brief Controller for /match. @@ -22,108 +24,118 @@ require_once 'mod/proxy.php'; * * @param App $a App * - * @return void|string + * @return string + * @throws ImagickException + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws Exception */ function match_content(App $a) { - $o = ''; - if (! local_user()) { - return; + if (!local_user()) { + return ''; } $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", - intval(local_user()) - ); - if (! DBM::is_result($r)) { - return; + $profile = Profile::getByUID(local_user()); + + if (!DBA::isResult($profile)) { + return ''; } - if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { + if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) { notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL); - return; + return ''; } $params = []; - $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']); + $tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']); - if ($tags) { - $params['s'] = $tags; - if ($a->pager['page'] != 1) { - $params['p'] = $a->pager['page']; - } + $params['s'] = $tags; + $params['n'] = 100; - if (strlen(Config::get('system', 'directory'))) { - $x = post_url(get_server().'/msearch', $params); - } else { - $x = post_url(System::baseUrl() . '/msearch', $params); - } + if (strlen(Config::get('system', 'directory'))) { + $host = get_server(); + } else { + $host = System::baseUrl(); + } - $j = json_decode($x); + $msearch_json = Network::post($host . '/msearch', $params)->getBody(); - if ($j->total) { - $a->set_pager_total($j->total); - $a->set_pager_itemspage($j->items_page); - } + $msearch = json_decode($msearch_json); - if (count($j->results)) { - $id = 0; - - foreach ($j->results as $jj) { - $match_nurl = normalise_link($jj->url); - $match = q( - "SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", - intval(local_user()), - dbesc($match_nurl) - ); - - if (!count($match)) { - $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); - $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url; - $photo_menu = [ - 'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)], - 'follow' => [L10n::t("Connect/Follow"), $connlnk] - ]; - - $contact_details = Contact::getDetailsByURL($jj->url, local_user()); - - $entry = [ - 'url' => Profile::zrl($jj->url), - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), - 'name' => $jj->name, - 'details' => $contact_details['location'], - 'tags' => $contact_details['keywords'], - 'about' => $contact_details['about'], - 'account_type' => Contact::getAccountType($contact_details), - 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - 'inttxt' => ' ' . L10n::t('is interested in:'), - 'conntxt' => L10n::t('Connect'), - 'connlnk' => $connlnk, - 'img_hover' => $jj->tags, - 'photo_menu' => $photo_menu, - 'id' => ++$id, - ]; - $entries[] = $entry; - } + $start = defaults($_GET, 'start', 0); + $entries = []; + $paginate = ''; + + if (!empty($msearch->results)) { + for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) { + $profile = $msearch->results[$i]; + + // Already known contact + if (Contact::getIdForURL($profile->url, local_user(), true)) { + continue; } - $tpl = get_markup_template('viewcontact_template.tpl'); - - $o .= replace_macros( - $tpl, - [ - '$title' => L10n::t('Profile Match'), - '$contacts' => $entries, - '$paginate' => paginate($a)] - ); - } else { - info(L10n::t('No matches') . EOL); + // Workaround for wrong directory photo URL + $profile->photo = str_replace('http:///photo/', get_server() . '/photo/', $profile->photo); + + $connlnk = System::baseUrl() . '/follow/?url=' . $profile->url; + $photo_menu = [ + 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile->url)], + 'follow' => [L10n::t("Connect/Follow"), $connlnk] + ]; + + $contact_details = Contact::getDetailsByURL($profile->url, 0); + + $entry = [ + 'url' => Contact::magicLink($profile->url), + 'itemurl' => defaults($contact_details, 'addr', $profile->url), + 'name' => $profile->name, + 'details' => defaults($contact_details, 'location', ''), + 'tags' => defaults($contact_details, 'keywords', ''), + 'about' => defaults($contact_details, 'about', ''), + 'account_type' => Contact::getAccountType($contact_details), + 'thumb' => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB), + 'conntxt' => L10n::t('Connect'), + 'connlnk' => $connlnk, + 'img_hover' => $profile->tags, + 'photo_menu' => $photo_menu, + 'id' => $i, + ]; + $entries[] = $entry; } + + $data = [ + 'class' => 'pager', + 'first' => [ + 'url' => 'match', + 'text' => L10n::t('first'), + 'class' => 'previous' . ($start == 0 ? 'disabled' : '') + ], + 'next' => [ + 'url' => 'match?start=' . $i, + 'text' => L10n::t('next'), + 'class' => 'next' . ($i >= $msearch->total ? ' disabled' : '') + ] + ]; + + $tpl = Renderer::getMarkupTemplate('paginate.tpl'); + $paginate = Renderer::replaceMacros($tpl, ['pager' => $data]); } + if (empty($entries)) { + info(L10n::t('No matches') . EOL); + } + + $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$title' => L10n::t('Profile Match'), + '$contacts' => $entries, + '$paginate' => $paginate + ]); + return $o; }