diff options
| author | friendica <info@friendica.com> | 2013-10-01 22:20:09 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-01 22:20:09 -0700 |
| commit | 494090a3b7de23686d96530afd9509e50bff6362 (patch) | |
| tree | 05696be7002d053896637ce7533536f64fd7bc12 /mod/probe.php | |
| parent | bde20f81e6789511f0c7623abab06594dec83850 (diff) | |
| download | volse-hubzilla-494090a3b7de23686d96530afd9509e50bff6362.tar.gz volse-hubzilla-494090a3b7de23686d96530afd9509e50bff6362.tar.bz2 volse-hubzilla-494090a3b7de23686d96530afd9509e50bff6362.zip | |
in probe diagnostic - note https failure as diagnostic info - this also changes zot_finger so you can tell it not to fallback. This could be useful in corporate environments that are off the grid or other high security situations (as much as anything could be considered high security which relies on SSL).
Diffstat (limited to 'mod/probe.php')
| -rw-r--r-- | mod/probe.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mod/probe.php b/mod/probe.php index 397f571c5..bd792d52e 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -15,9 +15,16 @@ function probe_content(&$a) { if(x($_GET,'addr')) { $channel = $a->get_channel(); $addr = trim($_GET['addr']); - $res = zot_finger($addr,$channel); + $res = zot_finger($addr,$channel,false); $o .= '<pre>'; - $j = json_decode($res['body'],true); + if($res['success']) + $j = json_decode($res['body'],true); + else { + $o .= "<strong>https connection failed. Trying again with auto failover to http.</strong>\r\n\r\n"; + $res = zot_finger($addr,$channel,true); + if($res['success']) + $j = json_decode($res['body'],true); + } if($j && $j['permissions'] && $j['permissions']['iv']) $j['permissions'] = json_decode(aes_unencapsulate($j['permissions'],$channel['channel_prvkey']),true); $o .= str_replace("\n",'<br />',print_r($j,true)); |