keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Probe::uri instead of probe_url()

Browse source 
- Moved file inclusion to enable lazy loading
This commit is contained in:
Hypolite Petovan 2017-03-06 06:01:08 -05:00
parent ff64beeb4e
commit 116b9e1c1f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/Contact.php
View file

@ -1,7 +1,5 @@
<?php <?php
require_once('include/Probe.php');
// Included here for completeness, but this is a very dangerous operation. // Included here for completeness, but this is a very dangerous operation.
// It is the caller's responsibility to confirm the requestor's intent and // It is the caller's responsibility to confirm the requestor's intent and
// authorisation to do this. // authorisation to do this.
@ -355,6 +353,7 @@ function get_contact_details_by_addr($addr, $uid = -1) {
dbesc($addr)); dbesc($addr));
if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
require_once('include/Probe.php');
$data = Probe::uri($addr); $data = Probe::uri($addr);
$profile = get_contact_details_by_url($data['url'], $uid); $profile = get_contact_details_by_url($data['url'], $uid);
@ -530,8 +529,6 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
* @return integer Contact ID * @return integer Contact ID
*/ */
function get_contact($url, $uid = 0, $no_update = false) { function get_contact($url, $uid = 0, $no_update = false) {
require_once "include/Scrape.php";
logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);; logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
$data = array(); $data = array();
@ -558,7 +555,8 @@ function get_contact($url, $uid = 0, $no_update = false) {
return 0; return 0;
} }
$data = probe_url($url); require_once('include/Probe.php');
$data = Probe::uri($url);
if (!$data['url']) { if (!$data['url']) {
return 0; return 0;
} }