X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhovercard.php;h=603c617ca4874107efb6833db9585405371f1570;hb=9f11476ca09c128e4489f702895f699b8158acc8;hp=01d9feb1e46fb4f1711e65e8d185e5b31293a5e1;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 01d9feb1e4..603c617ca4 100644
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -7,12 +7,16 @@
  * Author: Rabuzarus <https://github.com/rabuzarus>
  * License: GNU AFFERO GENERAL PUBLIC LICENSE (Version 3)
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 function hovercard_init(App $a)
 {
@@ -37,26 +41,47 @@ function hovercard_content()
 	if ($datatype == 'tpl') {
 		$templatecontent = get_template_content('hovercard.tpl');
 		echo $templatecontent;
-		killme();
+		exit();
 	}
 
 	// If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
 	// the contact. So we strip out the contact id from the internal url and look in the contact table for
 	// the real url (nurl)
-	$cid = 0;
-	if (local_user() && strpos($profileurl, 'redir/') === 0) {
+	if (strpos($profileurl, 'redir/') === 0) {
 		$cid = intval(substr($profileurl, 6));
-		$remote_contact = dba::selectFirst('contact', ['nurl'], ['id' => $cid]);
+		$remote_contact = DBA::selectFirst('contact', ['nurl'], ['id' => $cid]);
 		$profileurl = defaults($remote_contact, 'nurl', '');
 	}
 
 	$contact = [];
 	// if it's the url containing https it should be converted to http
-	$nurl = normalise_link(GContact::cleanContactUrl($profileurl));
-	if ($nurl) {
-		// Search for contact data
+	$nurl = Strings::normaliseLink(GContact::cleanContactUrl($profileurl));
+	if (!$nurl) {
+		return;
+	}
+
+	// Search for contact data
+	// Look if the local user has got the contact
+	if (local_user()) {
+		$contact = Contact::getDetailsByURL($nurl, local_user());
+	}
+
+	// If not then check the global user
+	if (!count($contact)) {
 		$contact = Contact::getDetailsByURL($nurl);
 	}
+
+	// Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
+	if (!count($contact) && local_user()) {
+		$nurl = Strings::normaliseLink($profileurl);
+		$contact = Contact::getDetailsByURL($nurl, local_user());
+	}
+
+	if (!count($contact)) {
+		$nurl = Strings::normaliseLink($profileurl);
+		$contact = Contact::getDetailsByURL($nurl);
+	}
+
 	if (!count($contact)) {
 		return;
 	}
@@ -64,28 +89,30 @@ function hovercard_content()
 	// Get the photo_menu - the menu if possible contact actions
 	if (local_user()) {
 		$actions = Contact::photoMenu($contact);
+	} else {
+		$actions = [];
 	}
 
 	// Move the contact data to the profile array so we can deliver it to
 	$profile = [
-		'name'     => $contact['name'],
-		'nick'     => $contact['nick'],
-		'addr'     => defaults($contact, 'addr', $contact['url']),
-		'thumb'    => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
-		'url'      => $cid ? ('redir/' . $cid) : Profile::zrl($contact['url']),
-		'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
-		'location' => $contact['location'],
-		'gender'   => $contact['gender'],
-		'about'    => $contact['about'],
-		'network'  => format_network_name($contact['network'], $contact['url']),
-		'tags'     => $contact['keywords'],
-		'bd'       => $contact['birthday'] <= '0001-01-01' ? '' : $contact['birthday'],
+		'name'         => $contact['name'],
+		'nick'         => $contact['nick'],
+		'addr'         => defaults($contact, 'addr', $contact['url']),
+		'thumb'        => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
+		'url'          => Contact::magicLink($contact['url']),
+		'nurl'         => $contact['nurl'], // We additionally store the nurl as identifier
+		'location'     => $contact['location'],
+		'gender'       => $contact['gender'],
+		'about'        => $contact['about'],
+		'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
+		'tags'         => $contact['keywords'],
+		'bd'           => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
 		'account_type' => Contact::getAccountType($contact),
-		'actions'  => $actions,
+		'actions'      => $actions,
 	];
 	if ($datatype == 'html') {
-		$tpl = get_markup_template('hovercard.tpl');
-		$o = replace_macros($tpl, [
+		$tpl = Renderer::getMarkupTemplate('hovercard.tpl');
+		$o = Renderer::replaceMacros($tpl, [
 			'$profile' => $profile,
 		]);
 
@@ -99,16 +126,19 @@ function hovercard_content()
  * @brief Get the raw content of a template file
  *
  * @param string $template The name of the template
- * @param string $root Directory of the template
+ * @param string $root     Directory of the template
  *
  * @return string|bool Output the raw content if existent, otherwise false
+ * @throws Exception
  */
 function get_template_content($template, $root = '')
 {
 	// We load the whole template system to get the filename.
 	// Maybe we can do it a little bit smarter if I get time.
-	$t = get_markup_template($template, $root);
-	$filename = $t->filename;
+	$templateEngine = Renderer::getTemplateEngine();
+	$template = $templateEngine->getTemplateFile($template, $root);
+
+	$filename = $template->filename;
 
 	// Get the content of the template file
 	if (file_exists($filename)) {