X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhovercard.php;h=6160642762a4adcbc427d6f21b048fa62df60c19;hb=5e60fa8210b502797209de770780d6d7ba81b86c;hp=1c9766d49614c8a69bbe6d76c61e939ee81bf6f9;hpb=91facd2d0a2869e2c26a5943d8afe1849d3891f8;p=friendica.git

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 1c9766d496..6160642762 100644
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -16,6 +16,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 function hovercard_init(App $a)
 {
@@ -55,7 +56,7 @@ function hovercard_content()
 
 	$contact = [];
 	// if it's the url containing https it should be converted to http
-	$nurl = normalise_link(GContact::cleanContactUrl($profileurl));
+	$nurl = Strings::normaliseLink(GContact::cleanContactUrl($profileurl));
 	if (!$nurl) {
 		return;
 	}
@@ -73,12 +74,12 @@ function hovercard_content()
 
 	// Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
 	if (!count($contact) && local_user()) {
-		$nurl = normalise_link($profileurl);
+		$nurl = Strings::normaliseLink($profileurl);
 		$contact = Contact::getDetailsByURL($nurl, local_user());
 	}
 
 	if (!count($contact)) {
-		$nurl = normalise_link($profileurl);
+		$nurl = Strings::normaliseLink($profileurl);
 		$contact = Contact::getDetailsByURL($nurl);
 	}
 
@@ -104,14 +105,14 @@ function hovercard_content()
 		'location' => $contact['location'],
 		'gender'   => $contact['gender'],
 		'about'    => $contact['about'],
-		'network'  => format_network_name($contact['network'], $contact['url']),
+		'network'  => Strings::formatNetworkName($contact['network'], $contact['url']),
 		'tags'     => $contact['keywords'],
-		'bd'       => $contact['birthday'] <= '0001-01-01' ? '' : $contact['birthday'],
+		'bd'       => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
 		'account_type' => Contact::getAccountType($contact),
 		'actions'  => $actions,
 	];
 	if ($datatype == 'html') {
-		$tpl = get_markup_template('hovercard.tpl');
+		$tpl = Renderer::getMarkupTemplate('hovercard.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$profile' => $profile,
 		]);
@@ -134,7 +135,7 @@ 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);
+	$t = Renderer::getMarkupTemplate($template, $root);
 	$filename = $t->filename;
 
 	// Get the content of the template file