mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 03:35:13 +00:00
if changing primary hub during an import operation - remove the old xchan and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size.
This commit is contained in:
parent
20f3d09708
commit
2e14dc242e
3 changed files with 27 additions and 2 deletions
|
@ -206,10 +206,35 @@ function import_post(&$a) {
|
|||
|
||||
// import xchans and contact photos
|
||||
|
||||
if($seize) {
|
||||
|
||||
// replace our existing xchan if we're seizing control
|
||||
|
||||
$r = q("delete from xchan where xchan_hash = '%s' limit 1",
|
||||
dbesc($channel['channel_hash'])
|
||||
);
|
||||
|
||||
$r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
|
||||
dbesc($channel['channel_hash']),
|
||||
dbesc($channel['channel_guid']),
|
||||
dbesc($channel['channel_guid_sig']),
|
||||
dbesc($channel['channel_pubkey']),
|
||||
dbesc($a->get_baseurl() . "/photo/profile/l/" . $channel['channel_id']),
|
||||
dbesc($a->get_baseurl() . "/photo/profile/m/" . $channel['channel_id']),
|
||||
dbesc($a->get_baseurl() . "/photo/profile/s/" . $channel['channel_id']),
|
||||
dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()),
|
||||
dbesc(z_root() . '/channel/' . $channel['channel_address']),
|
||||
dbesc($channel['channel_name']),
|
||||
dbesc('zot'),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert())
|
||||
);
|
||||
}
|
||||
|
||||
$xchans = $data['xchan'];
|
||||
if($xchans) {
|
||||
foreach($xchans as $xchan) {
|
||||
|
||||
$r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
|
||||
dbesc($xchan['xchan_hash'])
|
||||
);
|
||||
|
|
|
@ -1 +1 @@
|
|||
2013-08-18.409
|
||||
2013-08-19.410
|
||||
|
|
|
@ -64,7 +64,7 @@ $a->config['system']['max_import_size'] = 200000;
|
|||
|
||||
// maximum size of uploaded photos
|
||||
|
||||
$a->config['system']['maximagesize'] = 800000;
|
||||
$a->config['system']['maximagesize'] = 3000000;
|
||||
|
||||
// Location of PHP command line processor
|
||||
|
||||
|
|
Loading…
Reference in a new issue