aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-08-02 22:49:30 -0700
committerzotlabs <mike@macgirvin.com>2018-08-02 22:49:30 -0700
commitd908f53607512b8bfa3fbf65cb6fc9623fab5c63 (patch)
tree245fcc2e40ec90568b7d3db08d6478db971874fa /Zotlabs/Module
parentc806279fa97aa6880e1e0542be00937406e79d27 (diff)
downloadvolse-hubzilla-d908f53607512b8bfa3fbf65cb6fc9623fab5c63.tar.gz
volse-hubzilla-d908f53607512b8bfa3fbf65cb6fc9623fab5c63.tar.bz2
volse-hubzilla-d908f53607512b8bfa3fbf65cb6fc9623fab5c63.zip
add app_options field
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Probe.php7
-rw-r--r--Zotlabs/Module/Zfinger.php4
2 files changed, 3 insertions, 8 deletions
diff --git a/Zotlabs/Module/Probe.php b/Zotlabs/Module/Probe.php
index 2e65f107c..2c67c6aae 100644
--- a/Zotlabs/Module/Probe.php
+++ b/Zotlabs/Module/Probe.php
@@ -27,12 +27,11 @@ class Probe extends \Zotlabs\Web\Controller {
$o .= '<pre>';
if(! $j['success']) {
- $o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
$o .= "<strong>https connection failed. Trying again with auto failover to http.</strong>\r\n\r\n";
$j = \Zotlabs\Zot\Finger::run($addr,$channel,true);
- if(! $j['success'])
- $o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
-
+ if(! $j['success']) {
+ return $o;
+ }
}
if($do_import && $j)
$x = import_xchan($j);
diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php
index 0f7f6a64b..6ed001df5 100644
--- a/Zotlabs/Module/Zfinger.php
+++ b/Zotlabs/Module/Zfinger.php
@@ -36,10 +36,6 @@ class Zfinger extends \Zotlabs\Web\Controller {
echo $ret;
killme();
-
-
-
- json_return_and_die($x);
}