X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmatch.php;h=829ca39878013add74285641a4ad6c5d241ef18f;hb=c22920edba4f80fee2d828a9fe265a9cb702e81c;hp=33e07c91ce40fbcf9614d0aca83040756c49c8b0;hpb=d489ba1510a2dcfaa7851d937d3c37a9541544c9;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 33e07c91ce..829ca39878 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,5 +1,9 @@
 <?php
-include_once('include/text.php');
+
+use Friendica\App;
+use Friendica\Core\System;
+
+require_once('include/text.php');
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 require_once('mod/proxy.php');
@@ -10,25 +14,27 @@ require_once('mod/proxy.php');
  * It takes keywords from your profile and queries the directory server for
  * matching keywords from other profiles.
  *
- * @param App &$a
+ * @param App $a
  * @return void|string
  */
-function match_content(&$a) {
+function match_content(App $a) {
 
 	$o = '';
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$a->page['aside'] .= findpeople_widget();
 	$a->page['aside'] .= follow_widget();
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		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;
@@ -45,7 +51,7 @@ function match_content(&$a) {
 		if(strlen(get_config('system','directory')))
 			$x = post_url(get_server().'/msearch', $params);
 		else
-			$x = post_url($a->get_baseurl() . '/msearch', $params);
+			$x = post_url(System::baseUrl() . '/msearch', $params);
 
 		$j = json_decode($x);
 
@@ -66,7 +72,7 @@ function match_content(&$a) {
 
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+					$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
 					$photo_menu = array(
 						'profile' => array(t("View Profile"), zrl($jj->url)),
 						'follow' => array(t("Connect/Follow"), $connlnk)