PortableContact created

[friendica.git] / mod / hovercard.php

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 5c9ef61fc9ec409b0ceeb46394798d494244f47f..a5a41e26357756b6c0bf9e389fffb436ee5def2a 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -9,9 +9,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Model\GlobalContact;
 
-require_once("include/socgraph.php");
-require_once("include/Contact.php");
+require_once "include/Contact.php";
 
 function hovercard_init(App $a) {
        // Just for testing purposes
@@ -23,7 +24,7 @@ function hovercard_content() {
        $datatype       =       (x($_REQUEST,'datatype')        ?$_REQUEST['datatype']          : "json");
 
        // Get out if the system doesn't have public access allowed
-       if(intval(get_config('system','block_public')))
+       if(intval(Config::get('system','block_public')))
                http_status_exit(401);
 
        // Return the raw content of the template. We use this to make templates usable for js functions.
@@ -39,7 +40,7 @@ function hovercard_content() {
        // 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)
-       if(local_user() && strpos($profileurl, "redir/") === 0) {
+       if (local_user() && strpos($profileurl, "redir/") === 0) {
                $cid = intval(substr($profileurl, 6));
                $r = dba::select('contact', array('nurl', 'self'), array('id' => $cid), array('limit' => 1));
                $profileurl = ($r["nurl"] ? $r["nurl"] : "");
@@ -47,12 +48,11 @@ function hovercard_content() {
        }
 
        // if it's the url containing https it should be converted to http
-       $nurl = normalise_link(clean_contact_url($profileurl));
+       $nurl = normalise_link(GlobalContact::cleanContactUrl($profileurl));
        if($nurl) {
                // Search for contact data
                $contact = get_contact_details_by_url($nurl);
        }
-
        if(!is_array($contact))
                return;