X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=b06007483554d9c6ae06a4d583a042ca90b50c57;hb=796056a6feaf305dd9fb7c97bb43cdbc75ad0641;hp=8a0c66faf07e464d4e52b60c70142e238f84f898;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 8a0c66faf0..b060074835 100644 --- a/mod/match.php +++ b/mod/match.php @@ -5,10 +5,12 @@ use Friendica\App; use Friendica\Content\Widget; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Profile; +use Friendica\Util\Network; require_once 'include/text.php'; require_once 'mod/proxy.php'; @@ -43,7 +45,7 @@ function match_content(App $a) return; } if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { - notice(t('No keywords to match. Please add keywords to your default profile.') . EOL); + notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL); return; } @@ -57,9 +59,9 @@ function match_content(App $a) } if (strlen(Config::get('system', 'directory'))) { - $x = post_url(get_server().'/msearch', $params); + $x = Network::post(get_server().'/msearch', $params); } else { - $x = post_url(System::baseUrl() . '/msearch', $params); + $x = Network::post(System::baseUrl() . '/msearch', $params); } $j = json_decode($x); @@ -84,14 +86,14 @@ function match_content(App $a) $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url; $photo_menu = [ - 'profile' => [t("View Profile"), Profile::zrl($jj->url)], - 'follow' => [t("Connect/Follow"), $connlnk] + 'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)], + 'follow' => [L10n::t("Connect/Follow"), $connlnk] ]; $contact_details = Contact::getDetailsByURL($jj->url, local_user()); $entry = [ - 'url' => Profile::zrl($jj->url), + 'url' => Contact::magicLink($jj->url), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), 'name' => $jj->name, 'details' => $contact_details['location'], @@ -99,8 +101,8 @@ function match_content(App $a) 'about' => $contact_details['about'], 'account_type' => Contact::getAccountType($contact_details), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - 'inttxt' => ' ' . t('is interested in:'), - 'conntxt' => t('Connect'), + 'inttxt' => ' ' . L10n::t('is interested in:'), + 'conntxt' => L10n::t('Connect'), 'connlnk' => $connlnk, 'img_hover' => $jj->tags, 'photo_menu' => $photo_menu, @@ -115,12 +117,12 @@ function match_content(App $a) $o .= replace_macros( $tpl, [ - '$title' => t('Profile Match'), + '$title' => L10n::t('Profile Match'), '$contacts' => $entries, '$paginate' => paginate($a)] ); } else { - info(t('No matches') . EOL); + info(L10n::t('No matches') . EOL); } }