diff options
| author | friendica <info@friendica.com> | 2014-08-17 19:06:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-17 19:06:56 -0700 |
| commit | 4a76925787672ede57e0d36c890ffb08b6d32ed4 (patch) | |
| tree | e61d21fbde2020027fd0c9dd132c0cb8f998d262 /include/dir_fns.php | |
| parent | de1198ccfe113c848482ba0ba21bc9f24caca8a8 (diff) | |
| download | volse-hubzilla-4a76925787672ede57e0d36c890ffb08b6d32ed4.tar.gz volse-hubzilla-4a76925787672ede57e0d36c890ffb08b6d32ed4.tar.bz2 volse-hubzilla-4a76925787672ede57e0d36c890ffb08b6d32ed4.zip | |
some more work on realms
Diffstat (limited to 'include/dir_fns.php')
| -rw-r--r-- | include/dir_fns.php | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 14e4c0a1d..815b6a197 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -64,26 +64,40 @@ function sync_directories($dirmode) { if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL) return; - $r = q("select * from site where (site_flags & %d) and site_url != '%s'", - intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), - dbesc(z_root()) - ); + $realm = get_directory_realm(); + if($realm == DIRECTORY_REALM) { + $r = q("select * from site where (site_flags & %d) and site_url != '%s' and ( site_realm = '%s' or site_realm = '') ", + intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), + dbesc(z_root()), + dbesc($realm) + ); + } + else { + $r = q("select * from site where (site_flags & %d) and site_url != '%s' and site_realm like '%s' ", + intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), + dbesc(z_root()), + dbesc(protect_sprintf('%' . $realm . '%')) + ); + } // If there are no directory servers, setup the fallback master + // FIXME - what to do if we're in a different realm? if((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) { $r = array( 'site_url' => DIRECTORY_FALLBACK_MASTER, 'site_flags' => DIRECTORY_MODE_PRIMARY, 'site_update' => '0000-00-00 00:00:00', - 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch' + 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch', + 'site_realm' => DIRECTORY_REALM ); - $x = q("insert into site ( site_url, site_flags, site_update, site_directory ) - values ( '%s', %d', '%s', '%s' ) ", + $x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm ) + values ( '%s', %d', '%s', '%s', '%s' ) ", dbesc($r[0]['site_url']), intval($r[0]['site_flags']), dbesc($r[0]['site_update']), - dbesc($r[0]['site_directory']) + dbesc($r[0]['site_directory']), + dbesc($r[0]['site_realm']) ); $r = q("select * from site where (site_flags & %d) and site_url != '%s'", |