diff options
| -rw-r--r-- | Zotlabs/Module/Import.php | 40 | ||||
| -rw-r--r-- | include/network.php | 12 |
2 files changed, 21 insertions, 31 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index b69daa2ff..6de7c85a2 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -247,25 +247,27 @@ class Import extends \Zotlabs\Web\Controller { $r = q("delete from xchan where xchan_hash = '%s'", 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_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_orphan, xchan_censored, xchan_selfcensored, xchan_system, xchan_pubforum, xchan_deleted ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d )", - dbesc($channel['channel_hash']), - dbesc($channel['channel_guid']), - dbesc($channel['channel_guid_sig']), - dbesc($channel['channel_pubkey']), - dbesc(z_root() . "/photo/profile/l/" . $channel['channel_id']), - dbesc(z_root() . "/photo/profile/m/" . $channel['channel_id']), - dbesc(z_root() . "/photo/profile/s/" . $channel['channel_id']), - dbesc(channel_reddress($channel)), - dbesc(z_root() . '/channel/' . $channel['channel_address']), - dbesc(z_root() . '/follow?f=&url=%s'), - dbesc(z_root() . '/poco/' . $channel['channel_address']), - dbesc($channel['channel_name']), - dbesc('zot'), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - 0,0,0,0,0,0,0 - ); + + + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $channel['channel_hash'], + 'xchan_guid' => $channel['channel_guid'], + 'xchan_guid_sig' => $channel['channel_guid_sig'], + 'xchan_pubkey' => $channel['channel_pubkey'], + 'xchan_photo_l' => z_root() . "/photo/profile/l/" . $channel['channel_id'], + 'xchan_photo_m' => z_root() . "/photo/profile/m/" . $channel['channel_id'], + 'xchan_photo_s' => z_root() . "/photo/profile/s/" . $channel['channel_id'], + 'xchan_addr' => channel_reddress($channel), + 'xchan_url' => z_root() . '/channel/' . $channel['channel_address'], + 'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'], + 'xchan_follow' => z_root() . '/follow?f=&url=%s', + 'xchan_name' => $channel['channel_name'], + 'xchan_network' => 'zot', + 'xchan_photo_date' => datetime_convert(), + 'xchan_name_date' => datetime_convert() + ] + ); } logger('import step 6'); $_SESSION['import_step'] = 6; diff --git a/include/network.php b/include/network.php index 73fd417ea..9049d016b 100644 --- a/include/network.php +++ b/include/network.php @@ -1450,7 +1450,6 @@ function discover_by_webbie($webbie) { ); } else { - $r = xchan_store_lowlevel( [ 'xchan_hash' => $address, @@ -1463,17 +1462,6 @@ function discover_by_webbie($webbie) { 'xchan_network' => $network ] ); - - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", - dbesc($address), - dbesc(($diaspora_guid) ? $diaspora_guid : $location), - dbesc($pubkey), - dbesc($address), - dbesc($location), - dbesc($fullname), - dbesc($network), - dbescdate(datetime_convert()) - ); } $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", |