Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / hovercard.php

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 26c60625195dbbd73fb322cf35e64b60acb4b41c..5542fe5b9837738da8f93fec7b6d525b5c4ae746 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -9,9 +9,9 @@
  */
 
 use Friendica\App;
-
-require_once("include/socgraph.php");
-require_once("include/Contact.php");
+use Friendica\Core\Config;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Contact;
 
 function hovercard_init(App $a) {
        // Just for testing purposes
@@ -23,7 +23,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.
@@ -47,17 +47,17 @@ 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);
+               $contact = Contact::getDetailsByURL($nurl);
        }
        if(!is_array($contact))
                return;
 
        // Get the photo_menu - the menu if possible contact actions
        if(local_user())
-               $actions = contact_photo_menu($contact);
+               $actions = Contact::photoMenu($contact);
 
 
        // Move the contact data to the profile array so we can deliver it to
@@ -79,7 +79,7 @@ function hovercard_content() {
 //             'server_url' => $contact["server_url"],
                'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]),
 //             'generation' => $contact["generation"],
-               'account_type' => account_type($contact),
+               'account_type' => Contact::getAccountType($contact),
                'actions' => $actions,
        );
        if($datatype == "html") {