From 3a2988c3fdd3c0c24940ade8aaf192934ed2cd3c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 7 May 2017 14:45:19 -0400 Subject: [PATCH] Rename include/Scrape to include/probe --- include/delivery.php | 2 +- include/diaspora.php | 2 +- include/event.php | 2 +- include/follow.php | 2 +- include/gprobe.php | 2 +- include/message.php | 2 +- include/notifier.php | 2 +- include/ostatus.php | 2 +- include/{Scrape.php => probe.php} | 0 include/socgraph.php | 2 +- include/update_gcontact.php | 2 +- mod/acctlink.php | 2 +- mod/contacts.php | 2 +- mod/dfrn_request.php | 4 ++-- mod/follow.php | 2 +- mod/item.php | 2 +- mod/ostatus_subscribe.php | 2 +- mod/probe.php | 2 +- mod/repair_ostatus.php | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename include/{Scrape.php => probe.php} (100%) diff --git a/include/delivery.php b/include/delivery.php index 7589b556d7..098e423d17 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -3,9 +3,9 @@ use Friendica\App; use Friendica\Core\Config; -require_once('include/Scrape.php'); require_once 'include/queue_fn.php'; require_once 'include/html2plain.php'; +require_once 'include/probe.php'; require_once 'include/diaspora.php'; require_once 'include/ostatus.php'; require_once 'include/dfrn.php'; diff --git a/include/diaspora.php b/include/diaspora.php index 51b496f86f..cc3f32e4a6 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -13,7 +13,7 @@ use Friendica\Core\Config; require_once 'include/items.php'; require_once 'include/bb2diaspora.php'; -require_once 'include/Scrape.php'; +require_once 'include/probe.php'; require_once 'include/Contact.php'; require_once 'include/Photo.php'; require_once 'include/socgraph.php'; diff --git a/include/event.php b/include/event.php index 9b49bdb40d..5ef8b010f3 100644 --- a/include/event.php +++ b/include/event.php @@ -87,7 +87,7 @@ function format_event_html($ev, $simple = false) { @TODO old-lost code found? function parse_event($h) { - require_once('include/Scrape.php'); + require_once 'include/probe.php'; require_once 'include/html2bbcode'; $h = '' . $h . ''; diff --git a/include/follow.php b/include/follow.php index f3dc793c27..cdeac6db2a 100644 --- a/include/follow.php +++ b/include/follow.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once("include/Scrape.php"); +require_once 'include/probe.php'; require_once 'include/socgraph.php'; require_once 'include/group.php'; require_once 'include/salmon.php'; diff --git a/include/gprobe.php b/include/gprobe.php index 46aec0d1d9..8e9ebd1227 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -2,7 +2,7 @@ use Friendica\Core\Config; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; require_once 'include/socgraph.php'; require_once 'include/datetime.php'; diff --git a/include/message.php b/include/message.php index b857bd604b..66e173d350 100644 --- a/include/message.php +++ b/include/message.php @@ -174,7 +174,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ $convid = 0; $reply = false; - require_once('include/Scrape.php'); + require_once 'include/probe.php'; $me = probe_url($replyto); diff --git a/include/notifier.php b/include/notifier.php index 1ae56bd05d..4f9b34d014 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -3,9 +3,9 @@ use Friendica\App; use Friendica\Core\Config; -require_once('include/Scrape.php'); require_once 'include/queue_fn.php'; require_once 'include/html2plain.php'; +require_once 'include/probe.php'; require_once 'include/diaspora.php'; require_once 'include/ostatus.php'; require_once 'include/salmon.php'; diff --git a/include/ostatus.php b/include/ostatus.php index cc9ee4c70b..d41974709d 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -5,7 +5,6 @@ use Friendica\App; use Friendica\Core\Config; -require_once("include/Scrape.php"); use Friendica\Network\Probe; require_once 'include/Contact.php'; @@ -17,6 +16,7 @@ require_once 'mod/share.php'; require_once 'include/enotify.php'; require_once 'include/socgraph.php'; require_once 'include/Photo.php'; +require_once 'include/probe.php'; require_once 'include/follow.php'; require_once 'include/api.php'; require_once 'mod/proxy.php'; diff --git a/include/Scrape.php b/include/probe.php similarity index 100% rename from include/Scrape.php rename to include/probe.php diff --git a/include/socgraph.php b/include/socgraph.php index 94924873d5..3de114fcab 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -9,10 +9,10 @@ use Friendica\App; use Friendica\Core\Config; -require_once("include/Scrape.php"); use Friendica\Network\Probe; require_once 'include/datetime.php'; +require_once 'include/probe.php'; require_once 'include/network.php'; require_once 'include/html2bbcode.php'; require_once 'include/Contact.php'; diff --git a/include/update_gcontact.php b/include/update_gcontact.php index 7a3e48937e..d283bd2689 100644 --- a/include/update_gcontact.php +++ b/include/update_gcontact.php @@ -5,7 +5,7 @@ use Friendica\Core\Config; function update_gcontact_run(&$argv, &$argc) { global $a; - require_once 'include/Scrape.php'; + require_once 'include/probe.php'; require_once 'include/socgraph.php'; logger('update_gcontact: start'); diff --git a/mod/acctlink.php b/mod/acctlink.php index bb59d7b94f..5e98ed32b6 100644 --- a/mod/acctlink.php +++ b/mod/acctlink.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; function acctlink_init(App $a) { diff --git a/mod/contacts.php b/mod/contacts.php index 57c96a1e3f..21a4f7446a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -3,10 +3,10 @@ use Friendica\App; use Friendica\Network\Probe; -require_once('include/Scrape.php'); require_once 'include/Contact.php'; require_once 'include/socgraph.php'; require_once 'include/contact_selectors.php'; +require_once 'include/probe.php'; require_once 'mod/proxy.php'; require_once 'include/Photo.php'; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index eadbb920db..c3b7a523d7 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -13,10 +13,10 @@ */ use Friendica\App; - -require_once('include/Scrape.php'); use Friendica\Network\Probe; + require_once 'include/enotify.php'; +require_once 'include/probe.php'; require_once 'include/group.php'; function dfrn_request_init(App $a) { diff --git a/mod/follow.php b/mod/follow.php index fbe4602f5b..45e017f088 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; require_once 'include/follow.php'; require_once 'include/Contact.php'; require_once 'include/contact_selectors.php'; diff --git a/mod/item.php b/mod/item.php index 151575e6bb..f2d7babcde 100644 --- a/mod/item.php +++ b/mod/item.php @@ -25,7 +25,7 @@ require_once 'include/files.php'; require_once 'include/threads.php'; require_once 'include/text.php'; require_once 'include/items.php'; -require_once 'include/Scrape.php'; +require_once 'include/probe.php'; require_once 'include/diaspora.php'; require_once 'include/Contact.php'; diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php index 28dc5f8668..0b399acf29 100644 --- a/mod/ostatus_subscribe.php +++ b/mod/ostatus_subscribe.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; require_once 'include/follow.php'; function ostatus_subscribe_content(App $a) { diff --git a/mod/probe.php b/mod/probe.php index 2911bc05c7..abeccef446 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; function probe_content(App $a) { diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index b9b94e5513..ff4c11a7a4 100755 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -2,7 +2,7 @@ use Friendica\App; -require_once('include/Scrape.php'); +require_once 'include/probe.php'; require_once 'include/follow.php'; function repair_ostatus_content(App $a) {