Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

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));