X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhovercard.php;h=5542fe5b9837738da8f93fec7b6d525b5c4ae746;hb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;hp=1420aae4ef0e118772fa367c2c278036eeb1a5f9;hpb=1c38540f20b3207a0fd09ef0802125e45e83bcf6;p=friendica.git diff --git a/mod/hovercard.php b/mod/hovercard.php index 1420aae4ef..5542fe5b98 100644 --- 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. @@ -39,26 +39,25 @@ 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 = q("SELECT `nurl`, `self` FROM `contact` WHERE `id` = '%d' LIMIT 1", intval($cid)); - $profileurl = ($r[0]["nurl"] ? $r[0]["nurl"] : ""); - $self = ($r[0]["self"] ? $r[0]["self"] : ""); + $r = dba::select('contact', array('nurl', 'self'), array('id' => $cid), array('limit' => 1)); + $profileurl = ($r["nurl"] ? $r["nurl"] : ""); + $self = ($r["self"] ? $r["self"] : ""); } // 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 @@ -80,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") {