diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-12 19:00:54 -0700 |
| commit | 018e7022817fd73e904021ecf46f2c5839da9a62 (patch) | |
| tree | 0bc817910756931bcaa0b773d30d31ee3c8fa6ed /mod | |
| parent | 5386686a1e0e60623d6421cbd85a93814c74fb58 (diff) | |
| parent | 1e0e812440b8b87c39a88692e39eb0baca736b6e (diff) | |
| download | volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.gz volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.tar.bz2 volse-hubzilla-018e7022817fd73e904021ecf46f2c5839da9a62.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/nl/strings.php
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/probe.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mod/probe.php b/mod/probe.php index 8e0b60dcc..62a2227b0 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -15,6 +15,7 @@ function probe_content(&$a) { if(x($_GET,'addr')) { $channel = $a->get_channel(); $addr = trim($_GET['addr']); + $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false); $res = zot_finger($addr,$channel,false); $o .= '<pre>'; if($res['success']) @@ -29,6 +30,8 @@ function probe_content(&$a) { $o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n"); } + if($do_import && $j) + $x = import_xchan($j); if($j && $j['permissions'] && $j['permissions']['iv']) $j['permissions'] = json_decode(crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']),true); $o .= str_replace("\n",'<br />',print_r($j,true)); |