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

Merge branch '3.0RC'

Browse Source
This commit is contained in:
Mario
2018-01-09 09:00:20 +01:00
parent 22c89b6c66 8fde0f01b8
commit 4f4d0e416e
2308 changed files with 508179 additions and 508426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
include/import.php
View File

@@ -163,13 +163,17 @@ function import_profiles($channel, $profiles) {
convert_oldfields($profile,'work','employment');
/**
* @TODO we are going to reset all profile photos to the original
* somebody will have to fix this later and put all the applicable
* photos into the export.
* @TODO put all the applicable photos into the export.
*/
$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
if((strpos($profile['thumb'],'/photo/profile/l/') !== false) || intval($profile['is_default'])) {
$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
}
else {
$profile['photo'] = z_root() . '/photo/' . basename($profile['photo']);
$profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']);
}
create_table_from_array('profile', $profile);
}
@@ -1082,6 +1086,7 @@ function sync_files($channel, $files) {
logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG);
if($x['success']) {
$orig_attach = $x[0];
$attach_exists = true;
$attach_id = $x[0]['id'];
}
@@ -1146,12 +1151,18 @@ function sync_files($channel, $files) {
// If the hash ever contains any escapable chars this could cause
// problems. Currently it does not.
/// @TODO implement os_path
if(!isset($att['os_path']))
$att['os_path'] = '';
if($attach_exists) {
logger('sync_files attach exists: ' . print_r($att,true), LOGGER_DEBUG);
// process/sync a remote rename/move operation
if($orig_attach['content'] !== $newfname) {
rename($orig_attach['content'],$newfname);
}
if(! dbesc_array($att))
continue;
@@ -1200,7 +1211,14 @@ function sync_files($channel, $files) {
continue;
}
$redirects = 0;
$x = z_post_url($fetch_url,$parr,$redirects,array('filep' => $fp));
$headers = [];
$headers['Accept'] = 'application/x-zot+json' ;
$headers['Sigtoken'] = random_string();
$headers = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,true,'sha512');
$x = z_post_url($fetch_url,$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]);
fclose($fp);
if($x['success']) {
@@ -1250,10 +1268,43 @@ function sync_files($channel, $files) {
);
}
if($p['imgscale'] === 0 && $p['os_storage'])
if(intval($p['imgscale']) === 0 && $p['os_storage'])
$p['content'] = $store_path;
else
$p['content'] = base64_decode($p['content']);
$p['content'] = (($p['content'])? base64_decode($p['content']) : '');
if(intval($p['imgscale']) && (! $p['content'])) {
$time = datetime_convert();
$parr = array('hash' => $channel['channel_hash'],
'time' => $time,
'resource' => $att['hash'],
'revision' => 0,
'signature' => base64url_encode(rsa_sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey'])),
'resolution' => $p['imgscale']
);
$stored_image = $newfname . '-' . intval($p['imgscale']);
$fp = fopen($stored_image,'w');
if(! $fp) {
logger('failed to open storage file.',LOGGER_NORMAL,LOG_ERR);
continue;
}
$redirects = 0;
$headers = [];
$headers['Accept'] = 'application/x-zot+json' ;
$headers['Sigtoken'] = random_string();
$headers = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,true,'sha512');
$x = z_post_url($fetch_url,$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]);
fclose($fp);
$p['content'] = file_get_contents($stored_image);
unlink($stored_image);
}
if(!isset($p['display_path']))
$p['display_path'] = '';
@@ -1282,6 +1333,9 @@ function sync_files($channel, $files) {
}
}
}
\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $att['hash'] ]);
if($f['item']) {
sync_items($channel,$f['item'],
['channel_address' => $original_channel,'url' => $oldbase]