that should be the last critical piece. Everything else is gravy.

2 files changed, 53 insertions, 4 deletions

diff --git a/include/Photo.php b/include/Photo.php
index 6ba973dce..de3d30c39 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -717,3 +717,52 @@ function import_profile_photo($photo,$xchan) {
 	return(array($photo,$thumb,$micro,$type));
 
 }
+
+
+
+function import_channel_photo($photo,$type,$aid,$uid) {
+
+	$a = get_app();
+
+	logger('import_channel_photo: importing channel photo for ' . $uid, LOGGER_DEBUG);
+
+	$hash = photo_new_resource();
+
+	$photo_failure = false;
+
+
+	$filename = $hash;
+
+	$img = new Photo($photo, $type);
+	if($img->is_valid()) {
+
+		$img->scaleImageSquare(175);
+
+		$r = $img->store($aid,$uid,'', $hash, $filename, t('Profile Photos'), 4, true);
+
+		if($r === false)
+			$photo_failure = true;
+
+		$img->scaleImage(80);
+
+		$r = $img->store($aid,$uid,'', $hash, $filename, t('Profile Photos'), 5, true);
+
+		if($r === false)
+			$photo_failure = true;
+
+		$img->scaleImage(48);
+
+		$r = $img->store($aid,$uid,'', $hash, $filename, t('Profile Photos'), 6, true);
+
+		if($r === false)
+			$photo_failure = true;
+
+	}
+	else {
+		logger('import_channel_photo: invalid image.');
+		$photo_failure = true;
+	}
+
+	return(($photo_failure)? false : true);
+
+}
diff --git a/mod/import.php b/mod/import.php
index 5c778e2b2..a2b5132db 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -113,10 +113,10 @@ function import_post(&$a) {
 	// reset
 	$channel = $r[0];
 
-
-// FIXME - import the default profile photo (it has now been exported as a base64 blob)
-
-
+	if($data['photo']) {
+		require_once('include/Photo.php');
+		import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id,$channel['channel_id']);
+	}
 
 	$profiles = $data['profile'];
 	if($profiles) {