mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:15:11 +00:00
create site_store_lowlevel() to initialise data structures for the site table
This commit is contained in:
parent
a9bda2b12e
commit
50612565e9
4 changed files with 63 additions and 39 deletions
|
@ -185,26 +185,17 @@ function sync_directories($dirmode) {
|
||||||
/** @FIXME What to do if we're in a different realm? */
|
/** @FIXME What to do if we're in a different realm? */
|
||||||
|
|
||||||
if ((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) {
|
if ((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) {
|
||||||
$r = array();
|
|
||||||
$r[] = array(
|
|
||||||
'site_url' => DIRECTORY_FALLBACK_MASTER,
|
|
||||||
'site_flags' => DIRECTORY_MODE_PRIMARY,
|
|
||||||
'site_update' => NULL_DATE,
|
|
||||||
'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
|
|
||||||
'site_realm' => DIRECTORY_REALM,
|
|
||||||
'site_valid' => 1,
|
|
||||||
'site_crypto' => 'aes256cbc'
|
|
||||||
|
|
||||||
);
|
$x = site_store_lowlevel(
|
||||||
$x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid, site_crypto )
|
[
|
||||||
values ( '%s', %d, '%s', '%s', '%s', %d, '%s' ) ",
|
'site_url' => DIRECTORY_FALLBACK_MASTER,
|
||||||
dbesc($r[0]['site_url']),
|
'site_flags' => DIRECTORY_MODE_PRIMARY,
|
||||||
intval($r[0]['site_flags']),
|
'site_update' => NULL_DATE,
|
||||||
dbesc($r[0]['site_update']),
|
'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
|
||||||
dbesc($r[0]['site_directory']),
|
'site_realm' => DIRECTORY_REALM,
|
||||||
dbesc($r[0]['site_realm']),
|
'site_valid' => 1,
|
||||||
intval($r[0]['site_valid']),
|
'site_crypto' => 'aes256cbc'
|
||||||
dbesc($r[0]['site_crypto'])
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
$r = q("select * from site where site_flags in (%d, %d) and site_url != '%s' and site_type = %d ",
|
$r = q("select * from site where site_flags in (%d, %d) and site_url != '%s' and site_type = %d ",
|
||||||
|
|
|
@ -39,6 +39,33 @@ function hubloc_store_lowlevel($arr) {
|
||||||
return create_table_from_array('hubloc', $store);
|
return create_table_from_array('hubloc', $store);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function site_store_lowlevel($arr) {
|
||||||
|
|
||||||
|
$store = [
|
||||||
|
'site_url' => ((array_key_exists('site_url',$arr)) ? $arr['site_url'] : ''),
|
||||||
|
'site_access' => ((array_key_exists('site_access',$arr)) ? $arr['site_access'] : 0),
|
||||||
|
'site_flags' => ((array_key_exists('site_flags',$arr)) ? $arr['site_flags'] : 0),
|
||||||
|
'site_update' => ((array_key_exists('site_update',$arr)) ? $arr['site_update'] : NULL_DATE),
|
||||||
|
'site_pull' => ((array_key_exists('site_pull',$arr)) ? $arr['site_pull'] : NULL_DATE),
|
||||||
|
'site_sync' => ((array_key_exists('site_sync',$arr)) ? $arr['site_sync'] : NULL_DATE),
|
||||||
|
'site_directory' => ((array_key_exists('site_directory',$arr)) ? $arr['site_directory'] : ''),
|
||||||
|
'site_register' => ((array_key_exists('site_register',$arr)) ? $arr['site_register'] : 0),
|
||||||
|
'site_sellpage' => ((array_key_exists('site_sellpage',$arr)) ? $arr['site_sellpage'] : ''),
|
||||||
|
'site_location' => ((array_key_exists('site_location',$arr)) ? $arr['site_location'] : ''),
|
||||||
|
'site_realm' => ((array_key_exists('site_realm',$arr)) ? $arr['site_realm'] : ''),
|
||||||
|
'site_valid' => ((array_key_exists('site_valid',$arr)) ? $arr['site_valid'] : 0),
|
||||||
|
'site_dead' => ((array_key_exists('site_dead',$arr)) ? $arr['site_dead'] : 0),
|
||||||
|
'site_type' => ((array_key_exists('site_type',$arr)) ? $arr['site_type'] : 0),
|
||||||
|
'site_project' => ((array_key_exists('site_project',$arr)) ? $arr['site_project'] : ''),
|
||||||
|
'site_version' => ((array_key_exists('site_version',$arr)) ? $arr['site_version'] : ''),
|
||||||
|
'site_crypto' => ((array_key_exists('site_crypto',$arr)) ? $arr['site_crypto'] : '')
|
||||||
|
];
|
||||||
|
|
||||||
|
return create_table_from_array('site', $store);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function prune_hub_reinstalls() {
|
function prune_hub_reinstalls() {
|
||||||
|
|
|
@ -146,10 +146,14 @@ function queue_deliver($outq, $immediate = false) {
|
||||||
// your site has existed. Since we don't know for sure what these sites are,
|
// your site has existed. Since we don't know for sure what these sites are,
|
||||||
// call them unknown
|
// call them unknown
|
||||||
|
|
||||||
q("insert into site (site_url, site_update, site_dead, site_type, site_crypto) values ('%s','%s',0,%d,'') ",
|
site_store_lowlevel(
|
||||||
dbesc($base),
|
[
|
||||||
dbesc(datetime_convert()),
|
'site_url' => $base,
|
||||||
intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN)
|
'site_update' => datetime_convert(),
|
||||||
|
'site_dead' => 0,
|
||||||
|
'site_type' => intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
|
||||||
|
'site_crypto' => ''
|
||||||
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2897,22 +2897,24 @@ function import_site($arr, $pubkey) {
|
||||||
else {
|
else {
|
||||||
$update = true;
|
$update = true;
|
||||||
|
|
||||||
$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_type, site_project, site_version, site_crypto )
|
$r = site_store_lowlevel(
|
||||||
values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', %d, '%s', '%s', '%s' )",
|
[
|
||||||
dbesc($site_location),
|
'site_location' => $site_location,
|
||||||
dbesc($url),
|
'site_url' => $url,
|
||||||
intval($access_policy),
|
'site_access' => intval($access_policy),
|
||||||
intval($site_directory),
|
'site_flags' => intval($site_directory),
|
||||||
dbesc(datetime_convert()),
|
'site_update' => datetime_convert(),
|
||||||
dbesc($directory_url),
|
'site_directory' => $directory_url,
|
||||||
intval($register_policy),
|
'site_register' => intval($register_policy),
|
||||||
dbesc($sellpage),
|
'site_sellpage' => $sellpage,
|
||||||
dbesc($site_realm),
|
'site_realm' => $site_realm,
|
||||||
intval(SITE_TYPE_ZOT),
|
'site_type' => intval(SITE_TYPE_ZOT),
|
||||||
dbesc($site_project),
|
'site_project' => $site_project,
|
||||||
dbesc($site_version),
|
'site_version' => $site_version,
|
||||||
dbesc($site_crypto)
|
'site_crypto' => $site_crypto
|
||||||
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! $r) {
|
if(! $r) {
|
||||||
logger('import_site: record create failed. ' . print_r($arr,true));
|
logger('import_site: record create failed. ' . print_r($arr,true));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue