harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction

Browse Source
This commit is contained in:
redmatrix 2015-06-20 16:21:25 -07:00
parent ddbaabd62d
commit dd950baa82
2 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
include/Import/import_diaspora.php
View File

@ -11,10 +11,42 @@ function import_diaspora($data) {
if(! $account) if(! $account)
return false; return false;
$address = escape_tags($data['user']['username']);
if(! $address) {
notice( t('No username found in import file.') . EOL);
return false;
}
$r = q("select * from channel where channel_address = '%s' limit 1",
dbesc($address)
);
if($r) {
// try at most ten times to generate a unique address.
$x = 0;
$found_unique = false;
do {
$tmp = $address . mt_rand(1000,9999);
$r = q("select * from channel where channel_address = '%s' limit 1",
dbesc($tmp)
);
if(! $r) {
$address = $tmp;
$found_unique = true;
break;
}
$x ++;
} while ($x < 10);
if(! $found_unique) {
logger('import_diaspora: duplicate channel address. randomisation failed.');
notice( t('Unable to create a unique channel address. Import failed.') . EOL);
return;
}
}
$c = create_identity(array( $c = create_identity(array(
'name' => $data['user']['name'], 'name' => escape_tags($data['user']['name']),
'nickname' => $data['user']['username'], 'nickname' => $address,
'account_id' => $account['account_id'], 'account_id' => $account['account_id'],
'permissions_role' => 'social' 'permissions_role' => 'social'
)); ));
@ -45,24 +77,14 @@ function import_diaspora($data) {
); );
} }
if($data['user']['profile']['image_url']) {
$p = z_fetch_url($data['user']['profile']['image_url'],true);
$photos = import_profile_photo($data['user']['profile']['image_url'],$c['channel']['channel_hash']); if($p['success']) {
if($photos[4]) $rawbytes = $p['body'];
$photodate = NULL_DATE; $type = guess_image_type('dummyfile',$p['header']);
else import_channel_photo($rawbytes,$type,$c['channel']['channel_account_id'],$channel_id);
$photodate = $xchan['xchan_photo_date']; }
}
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s'
where xchan_hash = '%s'",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($photodate),
dbesc($c['channel']['channel_hash'])
);
$gender = escape_tags($data['user']['profile']['gender']); $gender = escape_tags($data['user']['profile']['gender']);
$about = diaspora2bb($data['user']['profile']['bio']); $about = diaspora2bb($data['user']['profile']['bio']);

2
version.inc
View File

@ -1 +1 @@
2015-06-19.1068 2015-06-20.1069