2 files changed, 49 insertions, 34 deletions
diff --git a/include/api.php b/include/api.php
index aab7d102f..1864d511e 100644
--- a/include/api.php
+++ b/include/api.php
@@ -515,41 +515,9 @@
 			return false;
 		}
 
-		$ret = array();
-		$r = q("select * from channel where channel_id = %d limit 1",
-			intval(local_user())
-		);
-		if($r)
-			$ret['channel'] = $r[0];
-
-		$r = q("select * from profile where uid = %d",
-			intval(local_user())
-		);
-		if($r)
-			$ret['profile'] = $r;
-
-		$xchans = array();
-		$r = q("select * from abook where abook_channel = %d ",
-			intval(local_user())
-		);
-		if($r) {
-			$ret['abook'] = $r;
-
-			foreach($r as $rr)
-				$xchans[] = $rr['abook_xchan'];
-			stringify_array_elms($xchans);
-		}
+		require_once('include/identity.php');
 
-		if($xchans) {
-			$r = q("select * from xchan where xchan_hash in ( " . implode(',',$xchans) . " ) ");
-			if($r)
-				$ret['xchan'] = $r;
-		
-			$r = q("select * from hubloc where hubloc_hash in ( " . implode(',',$xchans) . " ) ");
-			if($r)
-				$ret['hubloc'] = $r;
-		}
-		json_return_and_die($ret);
+		json_return_and_die(identity_basic_export(api_user()));	
 	}
 	api_register_func('api/export/basic','api_export_basic', true);
 
diff --git a/include/identity.php b/include/identity.php
index 2c3730cbc..94de192c6 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -194,3 +194,50 @@ function set_default_login_identity($account_id,$channel_id,$force = true) {
 	}
 }
 
+function identity_basic_export($channel_id) {
+
+	/*
+	 * Red basic channel export
+	 */
+
+	$ret = array();
+	$r = q("select * from channel where channel_id = %d limit 1",
+		intval($channel_id)
+	);
+	if($r)
+		$ret['channel'] = $r[0];
+
+	$r = q("select * from profile where uid = %d",
+		intval($channel_id)
+	);
+	if($r)
+		$ret['profile'] = $r;
+
+	$xchans = array();
+	$r = q("select * from abook where abook_channel = %d ",
+		intval($channel_id)
+	);
+	if($r) {
+		$ret['abook'] = $r;
+
+		foreach($r as $rr)
+			$xchans[] = $rr['abook_xchan'];
+		stringify_array_elms($xchans);
+	}
+
+	if($xchans) {
+		$r = q("select * from xchan where xchan_hash in ( " . implode(',',$xchans) . " ) ");
+		if($r)
+			$ret['xchan'] = $r;
+		
+		$r = q("select * from hubloc where hubloc_hash in ( " . implode(',',$xchans) . " ) ");
+		if($r)
+			$ret['hubloc'] = $r;
+	}
+
+	return $ret;
+}
+
+
+
+