X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=0ccad423878a3879edbfb1cb292ed64b7edad448;hb=afdb827bd7ed44a1c3028f287e101fa33e438332;hp=8fb19b57cdbac15675121b57c3a4b93879f836c8;hpb=7c0b591043b8c5183b1b697be9de772667f4778b;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 8fb19b57cd..0ccad42387 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,19 +1,34 @@
 <?php
 /**
- * @file include/common.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
-use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
-
-
-require_once 'include/dba.php';
+use Friendica\Util\Strings;
 
 function common_content(App $a)
 {
@@ -25,7 +40,7 @@ function common_content(App $a)
 	$zcid = 0;
 
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -41,23 +56,23 @@ function common_content(App $a)
 		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['id' => $cid, 'uid' => $uid]);
 
 		if (DBA::isResult($contact)) {
-			$a->page['aside'] = "";
-			Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
+			DI::page()['aside'] = "";
+			Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"]));
 		}
 	} else {
 		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
 		if (DBA::isResult($contact)) {
-			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
-				'$name'  => htmlentities($contact['name']),
+			$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
+				'$name'  => $contact['name'],
 				'$photo' => $contact['photo'],
 				'url'    => 'contact/' . $cid
 			]);
 
-			if (!x($a->page, 'aside')) {
-				$a->page['aside'] = '';
+			if (empty(DI::page()['aside'])) {
+				DI::page()['aside'] = '';
 			}
-			$a->page['aside'] .= $vcard_widget;
+			DI::page()['aside'] .= $vcard_widget;
 		}
 	}
 
@@ -66,11 +81,11 @@ function common_content(App $a)
 	}
 
 	if (!$cid && Model\Profile::getMyURL()) {
-		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL()), 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => Strings::normaliseLink(Model\Profile::getMyURL()), 'uid' => $uid]);
 		if (DBA::isResult($contact)) {
 			$cid = $contact['id'];
 		} else {
-			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL())]);
+			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Model\Profile::getMyURL())]);
 			if (DBA::isResult($gcontact)) {
 				$zcid = $gcontact['id'];
 			}
@@ -88,11 +103,11 @@ function common_content(App $a)
 	}
 
 	if ($total < 1) {
-		notice(L10n::t('No contacts in common.') . EOL);
+		notice(DI::l10n()->t('No contacts in common.') . EOL);
 		return $o;
 	}
 
-	$pager = new Pager($a->query_string);
+	$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
 	if ($cid) {
 		$common_friends = Model\GContact::commonFriends($uid, $cid, $pager->getStart(), $pager->getItemsPerPage());
@@ -118,11 +133,11 @@ function common_content(App $a)
 		$photo_menu = Model\Contact::photoMenu($common_friend);
 
 		$entry = [
-			'url'          => $common_friend['url'],
-			'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
+			'url'          => Model\Contact::magicLink($common_friend['url']),
+			'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
 			'name'         => $contact_details['name'],
 			'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-			'img_hover'    => htmlentities($contact_details['name']),
+			'img_hover'    => $contact_details['name'],
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
 			'about'        => $contact_details['about'],
@@ -137,14 +152,14 @@ function common_content(App $a)
 	$title = '';
 	$tab_str = '';
 	if ($cmd === 'loc' && $cid && local_user() == $uid) {
-		$tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
+		$tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
 	} else {
-		$title = L10n::t('Common Friends');
+		$title = DI::l10n()->t('Common Friends');
 	}
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl, [
+	$o .= Renderer::replaceMacros($tpl, [
 		'$title'    => $title,
 		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,