diff options
| author | friendica <info@friendica.com> | 2015-03-19 15:56:30 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-19 15:56:30 -0700 |
| commit | b1fd6c53a5f86fd752db9c5394cae8f67492f07e (patch) | |
| tree | 552446b414bc8d5c21ce2518c5ebafd8f5813f03 /mod | |
| parent | 24ebaaf0f70f3452c72c0ac4017bff1144728da8 (diff) | |
| download | volse-hubzilla-b1fd6c53a5f86fd752db9c5394cae8f67492f07e.tar.gz volse-hubzilla-b1fd6c53a5f86fd752db9c5394cae8f67492f07e.tar.bz2 volse-hubzilla-b1fd6c53a5f86fd752db9c5394cae8f67492f07e.zip | |
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/regdir.php | 4 | ||||
| -rw-r--r-- | mod/zfinger.php | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mod/regdir.php b/mod/regdir.php index f12659dad..5331c1dd4 100644 --- a/mod/regdir.php +++ b/mod/regdir.php @@ -78,11 +78,11 @@ function regdir_init(&$a) { } else { - // We can put this in the sql without the condition after 31 march 2015 assuming + // We can put this in the sql without the condition after 31 april 2015 assuming // most directory servers will have updated by then // This just makes sure it happens if I forget - $sql_extra = ((datetime_convert() > datetime_convert('UTC','UTC','2015-03-31')) ? ' and site_valid = 1 ' : '' ); + $sql_extra = ((datetime_convert() > datetime_convert('UTC','UTC','2015-04-31')) ? ' and site_valid = 1 ' : '' ); if($dirmode == DIRECTORY_MODE_STANDALONE) { $r = array(array('site_url' => z_root())); } diff --git a/mod/zfinger.php b/mod/zfinger.php index f4b7efd96..e236a1e73 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -239,11 +239,6 @@ function zfinger_init(&$a) { if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL)) $ret['site']['directory_mode'] = 'normal'; - // downgrade mis-configured primaries - - if($dirmode == DIRECTORY_MODE_PRIMARY && z_root() != get_directory_primary()) - $dirmode = DIRECTORY_MODE_SECONDARY; - if($dirmode == DIRECTORY_MODE_PRIMARY) $ret['site']['directory_mode'] = 'primary'; elseif($dirmode == DIRECTORY_MODE_SECONDARY) |