diff options
| author | git-marijus <mario@mariovavti.com> | 2017-08-06 21:40:39 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-06 21:40:39 +0200 |
| commit | 68b32cd8f414fc3df1279a3458082b2d8dfc3430 (patch) | |
| tree | 40768e806965ade0f5157fcc0f53bb30578e93fc /Zotlabs | |
| parent | a618f70f56efdcaaf9da6dcfcab9cce6a933303b (diff) | |
| download | volse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.tar.gz volse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.tar.bz2 volse-hubzilla-68b32cd8f414fc3df1279a3458082b2d8dfc3430.zip | |
consolidate disable_discover_tab config if it was not yet set to either 1 or 0 in DB
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index c84708ba4..65edbedfa 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -174,7 +174,8 @@ class Cron { // pull in some public posts - if(! get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if(! $disable_discover_tab) Master::Summon(array('Externals')); $generation = 0; diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 1954df549..36ae7f047 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -409,8 +409,9 @@ class Network extends \Zotlabs\Web\Controller { } $abook_uids = " and abook.abook_channel = " . local_channel() . " "; - - if($firehose && (! get_config('system','disable_discover_tab'))) { + + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($firehose && (! $disable_discover_tab)) { require_once('include/channel.php'); $sys = get_sys_channel(); $uids = " and item.uid = " . intval($sys['channel_id']) . " "; diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index f38ed510e..1a76f4f7b 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -139,7 +139,8 @@ class Ping extends \Zotlabs\Web\Controller { db_utcnow(), db_quoteinterval('3 MINUTE') ); - $notify_pubs = local_channel() ? ($vnotify & VNOTIFY_PUBS) && ! get_config('system', 'disable_discover_tab') : ! get_config('system', 'disable_discover_tab'); + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + $notify_pubs = ((local_channel()) ? ($vnotify & VNOTIFY_PUBS) && !$disable_discover_tab : !$disable_discover_tab); if($notify_pubs) { $sys = get_sys_channel(); diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index d9054dc48..5db485d21 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -16,8 +16,8 @@ class Pubstream extends \Zotlabs\Web\Controller { return login(); } - - if(get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($disable_discover_tab) return; $item_normal = item_normal(); diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index f3b7997cd..eb31841ed 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -560,7 +560,7 @@ class Channel { '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), '$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no), '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), - '$vnotify13' => ((! get_config('system', 'disable_discover_tab')) ? array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no) : array()), + '$vnotify13' => ((!get_config('system', 'disable_discover_tab')) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), '$always_show_in_notices' => array('always_show_in_notices', t('Also show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), |