tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Move Probe to src

Browse source
This commit is contained in:
Hypolite Petovan 2017-05-07 14:44:30 -04:00
parent 82b423c5ac
commit 36e515ee6d
15 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/Contact.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
// 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
@ -363,7 +364,6 @@ 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);
@ -589,7 +589,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
return 0; return 0;
} }
require_once('include/Probe.php');
$data = Probe::uri($url); $data = Probe::uri($url);
// Last try in gcontact for unsupported networks // Last try in gcontact for unsupported networks

3
include/Scrape.php
View file

@ -1,5 +1,6 @@
<?php <?php
require_once('include/Probe.php');
use Friendica\Network\Probe;
/** /**
* *

1
include/bb2diaspora.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
use League\HTMLToMarkdown\HtmlConverter; use League\HTMLToMarkdown\HtmlConverter;

2
include/cronjobs.php
View file

@ -2,11 +2,11 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe;
function cronjobs_run(&$argv, &$argc){ function cronjobs_run(&$argv, &$argc){
global $a; global $a;
require_once('include/Probe.php');
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/ostatus.php'; require_once 'include/ostatus.php';
require_once 'include/post_update.php'; require_once 'include/post_update.php';

2
include/network.php
View file

@ -6,9 +6,9 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe;
require_once("include/xml.php"); require_once("include/xml.php");
require_once('include/Probe.php');
/** /**
* @brief Curl wrapper * @brief Curl wrapper

1
include/ostatus.php
View file

@ -6,6 +6,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once("include/Scrape.php"); require_once("include/Scrape.php");
use Friendica\Network\Probe;
require_once 'include/Contact.php'; require_once 'include/Contact.php';
require_once 'include/threads.php'; require_once 'include/threads.php';

3
include/salmon.php
View file

@ -1,7 +1,8 @@
<?php <?php
use Friendica\Network\Probe;
require_once 'include/crypto.php'; require_once 'include/crypto.php';
require_once('include/Probe.php');
function get_salmon_key($uri, $keyhash) { function get_salmon_key($uri, $keyhash) {
$ret = array(); $ret = array();

1
include/socgraph.php
View file

@ -10,6 +10,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once("include/Scrape.php"); require_once("include/Scrape.php");
use Friendica\Network\Probe;
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/network.php'; require_once 'include/network.php';

1
mod/contacts.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once 'include/Contact.php'; require_once 'include/Contact.php';

2
mod/dfrn_confirm.php
View file

@ -19,8 +19,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once('include/Probe.php');
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/group.php'; require_once 'include/group.php';

2
mod/dfrn_request.php
View file

@ -15,7 +15,7 @@
use Friendica\App; use Friendica\App;
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/Probe.php'); use Friendica\Network\Probe;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/group.php'; require_once 'include/group.php';

2
mod/photos.php
View file

@ -2,6 +2,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe;
require_once 'include/Photo.php'; require_once 'include/Photo.php';
require_once 'include/photos.php'; require_once 'include/photos.php';
@ -12,7 +13,6 @@ require_once 'include/security.php';
require_once 'include/redir.php'; require_once 'include/redir.php';
require_once 'include/tags.php'; require_once 'include/tags.php';
require_once 'include/threads.php'; require_once 'include/threads.php';
require_once 'include/Probe.php';
function photos_init(App $a) { function photos_init(App $a) {

2
mod/profiles.php
View file

@ -1,9 +1,9 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once 'include/Contact.php'; require_once 'include/Contact.php';
require_once('include/Probe.php');
function profiles_init(App $a) { function profiles_init(App $a) {

3
mod/webfinger.php
View file

@ -1,8 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once("include/Probe.php");
function webfinger_content(App $a) { function webfinger_content(App $a) {

5
include/Probe.php → src/Network/Probe.php
View file

@ -1,6 +1,9 @@
<?php <?php
namespace Friendica\Network;
/** /**
* @file include/Probe.php * @file src/Network/Probe.php
* @brief Functions for probing URL * @brief Functions for probing URL
* *
*/ */