X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmatch.php;h=451821f9f1285a0969ee3ed5841cd5483166d0cd;hb=e9b05bd13f1bf3f74c63202f6f9f9fa2f65f19f1;hp=4119bf8e84315c8b8cbeed8b0dd0c337edf36820;hpb=4a473611163a12b48d3bbad71dc54765be8789f9;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 4119bf8e84..451821f9f1 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,11 +1,20 @@ page['aside'] .= findpeople_widget(); - $a->page['aside'] .= follow_widget(); + $a->page['aside'] .= Widget::findPeople(); + $a->page['aside'] .= Widget::follow(); + + $_SESSION['return_path'] = $a->cmd; - $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd; + $profile = Profile::getByUID(local_user()); - $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; + if (!DBA::isResult($profile)) { + return ''; } - if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { - notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); - return; + if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) { + notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL); + return ''; } - $params = array(); - $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']); + $params = []; + $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(get_config('system','directory'))) - $x = post_url(get_server().'/msearch', $params); - else - $x = post_url(App::get_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 = App::get_baseurl() . '/follow/?url=' . $jj->url; - $photo_menu = array( - 'profile' => array(t("View Profile"), zrl($jj->url)), - 'follow' => array(t("Connect/Follow"), $connlnk) - ); - - $contact_details = get_contact_details_by_url($jj->url, local_user()); - - $entry = array( - 'url' => 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' => account_type($contact_details), - 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - 'inttxt' => ' ' . t('is interested in:'), - 'conntxt' => t('Connect'), - 'connlnk' => $connlnk, - 'img_hover' => $jj->tags, - 'photo_menu' => $photo_menu, - 'id' => ++$id, - ); - $entries[] = $entry; - } - } + $start = defaults($_GET, 'start', 0); + $entries = []; + $paginate = ''; - $tpl = get_markup_template('viewcontact_template.tpl'); + if (!empty($msearch->results)) { + for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) { + $profile = $msearch->results[$i]; - $o .= replace_macros($tpl,array( - '$title' => t('Profile Match'), - '$contacts' => $entries, - '$paginate' => paginate($a), - )); + // Already known contact + if (Contact::getIdForURL($profile->url, local_user(), true)) { + continue; + } - } - else { - info( 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; }