]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36e515e)
Rename include/Scrape to include/probe
authorHypolite Petovan <mrpetovan@gmail.com>
Sun, 7 May 2017 18:45:19 +0000 (14:45 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Sun, 7 May 2017 18:45:19 +0000 (14:45 -0400)
20 files changed:
include/Scrape.php [deleted file] patch | blob | history
include/delivery.php patch | blob | history
include/diaspora.php patch | blob | history
include/event.php patch | blob | history
include/follow.php patch | blob | history
include/gprobe.php patch | blob | history
include/message.php patch | blob | history
include/notifier.php patch | blob | history
include/ostatus.php patch | blob | history
include/probe.php [new file with mode: 0644] patch | blob
include/socgraph.php patch | blob | history
include/update_gcontact.php patch | blob | history
mod/acctlink.php patch | blob | history
mod/contacts.php patch | blob | history
mod/dfrn_request.php patch | blob | history
mod/follow.php patch | blob | history
mod/item.php patch | blob | history
mod/ostatus_subscribe.php patch | blob | history
mod/probe.php patch | blob | history
mod/repair_ostatus.php patch | blob | history

diff --git a/include/Scrape.php b/include/Scrape.php
deleted file mode 100644 (file)
index 2d52059..0000000
--- a/include/Scrape.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Friendica\Network\Probe;
-
-/**
- *
- * Probe a network address to discover what kind of protocols we need to communicate with it.
- *
- * Warning: this function is a bit touchy and there are some subtle dependencies within the logic flow.
- * Edit with care.
- *
- */
-
-/**
- *
- * PROBE_DIASPORA has a bias towards returning Diaspora information
- * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where
- * an address (such as a Friendica address) supports more than one type
- * of network.
- *
- */
-
-define('PROBE_NORMAL',   0);
-define('PROBE_DIASPORA', 1);
-
-function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
-
-       if ($mode == PROBE_DIASPORA)
-               $network = NETWORK_DIASPORA;
-       else
-               $network = "";
-
-       $data = Probe::uri($url, $network);
-
-       return $data;
-}
diff --git a/include/delivery.php b/include/delivery.php
index 7589b556d7d7d9efacfe7d921895f91267513b0d..098e423d170d9d6efb8dd7e3903fb6e6cc307e36 100644 (file)
--- 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 51b496f86f6e6157436bf4efeba5553d21e53c97..cc3f32e4a6006294ba7349f946558bb7e35ba176 100644 (file)
--- 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 9b49bdb40d39623014d99ea2b3523b03db2381f4..5ef8b010f32508ef706637d7058105118cf1ef00 100644 (file)
--- 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 = '<html><body>' . $h . '</body></html>';
diff --git a/include/follow.php b/include/follow.php
index f3dc793c275bd0b38a03bd6812b28baa7da46bd7..cdeac6db2a5bbe97861ad13a3cde5a5bf612fb42 100644 (file)
--- 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 46aec0d1d92e72dae137c778116e0b3ab6c5c8e9..8e9ebd1227eed389ca1abcda3fd8ab789e7385eb 100644 (file)
--- 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 b857bd604b9bafab31bfde24842563ec8fe21a42..66e173d3508971bb66289bc3636e3e0e89e5401e 100644 (file)
--- 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 1ae56bd05d5baf78a72fc2a89fc1128c57b0e70f..4f9b34d014df60ec649462625a755922ab47a839 100644 (file)
--- 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 cc9ee4c70b9b1ec13bd773cbaac16cb078ae9f96..d41974709dcf084366d32c7b25eeda1635db7976 100644 (file)
--- 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/probe.php b/include/probe.php
new file mode 100644 (file)
index 0000000..2d52059
--- /dev/null
+++ b/include/probe.php
@@ -0,0 +1,36 @@
+<?php
+
+use Friendica\Network\Probe;
+
+/**
+ *
+ * Probe a network address to discover what kind of protocols we need to communicate with it.
+ *
+ * Warning: this function is a bit touchy and there are some subtle dependencies within the logic flow.
+ * Edit with care.
+ *
+ */
+
+/**
+ *
+ * PROBE_DIASPORA has a bias towards returning Diaspora information
+ * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where
+ * an address (such as a Friendica address) supports more than one type
+ * of network.
+ *
+ */
+
+define('PROBE_NORMAL',   0);
+define('PROBE_DIASPORA', 1);
+
+function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
+
+       if ($mode == PROBE_DIASPORA)
+               $network = NETWORK_DIASPORA;
+       else
+               $network = "";
+
+       $data = Probe::uri($url, $network);
+
+       return $data;
+}
diff --git a/include/socgraph.php b/include/socgraph.php
index 94924873d5a6a930d278bcdfa94e5dbbe1ac0010..3de114fcabd9003ab252e27a7f62c96fedada763 100644 (file)
--- 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 7a3e48937ecc2241162c645d726464a976befbb8..d283bd268931093d08ad4237b6fb0051257f99f9 100644 (file)
--- 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 bb59d7b94f0feccaaad105f576d0b90a2d22eab9..5e98ed32b61da5d21eff1c5c8e8f4c0cca0bcaf2 100644 (file)
--- 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 57c96a1e3f91374fd4f63d76a41f56e3b593d8cd..21a4f7446aca19c319a328012f5626222649a816 100644 (file)
--- 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 eadbb920dbef4e477495fac9df4baee877042f67..c3b7a523d76ac9172c46a67fc259e8844c32937f 100644 (file)
--- 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 fbe4602f5b5b1082e89625acbbc9a7465375724a..45e017f088dd6f58f7de895c54d19d240a382c55 100644 (file)
--- 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 151575e6bb3d114c877ae7651c73981593dc1985..f2d7babcde243ae0bcbf52de907c31a6c853a6f5 100644 (file)
--- 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 28dc5f86687fd0795122be08585ce1553f310e27..0b399acf29475cb6e00edcc67ba2060b3ce76d0c 100644 (file)
--- 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 2911bc05c7fbbdecbd26517f2f39f2062ca759fc..abeccef446555f5f786db535fdb0dd2f7fd2580d 100644 (file)
--- 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 b9b94e55137107d3df74a74c417bcb174f478a26..ff4c11a7a4d7b5067a7b7727ea02649aaefa0172 100755 (executable)
--- 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) {
Unnamed repository; edit this file 'description' to name the repository.