mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 22:55:13 +00:00
Merge branch 'dev'
This commit is contained in:
commit
fc6a5486bd
2 changed files with 7 additions and 8 deletions
|
@ -97,19 +97,18 @@ class Libzotdir {
|
||||||
|
|
||||||
static function get_directory_setting($observer, $setting) {
|
static function get_directory_setting($observer, $setting) {
|
||||||
|
|
||||||
|
|
||||||
if ($observer)
|
if ($observer)
|
||||||
$ret = get_xconfig($observer, 'directory', $setting);
|
$ret = get_xconfig($observer, 'directory', $setting);
|
||||||
else
|
else
|
||||||
$ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
|
$ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
|
||||||
|
|
||||||
if($ret === false)
|
if($ret === false) {
|
||||||
$ret = get_config('directory', $setting);
|
$ret = get_config('directory', $setting);
|
||||||
|
if($ret === false) {
|
||||||
|
$default = (in_array($setting,['globaldir','safemode']) ? 1 : 0);
|
||||||
// 'safemode' is the default if there is no observer or no established preference.
|
}
|
||||||
|
}
|
||||||
if($setting === 'safemode' && $ret === false)
|
|
||||||
$ret = 1;
|
|
||||||
|
|
||||||
if($setting === 'globaldir' && intval(get_config('system','localdir_hide')))
|
if($setting === 'globaldir' && intval(get_config('system','localdir_hide')))
|
||||||
$ret = 1;
|
$ret = 1;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
namespace Zotlabs\Module;
|
namespace Zotlabs\Module;
|
||||||
|
|
||||||
use Zotlabs\Lib\Zotfinger;
|
use Zotlabs\Lib\Zotfinger;
|
||||||
use Zotlabs\Zot6\HTTPSig;
|
use Zotlabs\Web\HTTPSig;
|
||||||
|
|
||||||
class Zot_probe extends \Zotlabs\Web\Controller {
|
class Zot_probe extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue