diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.php | 28 | ||||
| -rw-r--r-- | include/poller.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 1 |
3 files changed, 17 insertions, 14 deletions
diff --git a/include/features.php b/include/features.php index b02d912cf..3cbbf5b7d 100644 --- a/include/features.php +++ b/include/features.php @@ -36,7 +36,7 @@ function get_feature_default($feature) { } -function get_features() { +function get_features($filtered = true) { $arr = array( @@ -98,20 +98,22 @@ function get_features() { // removed any locked features and remove the entire category if this makes it empty - foreach($arr as $k => $x) { - $has_items = false; - for($y = 0; $y < count($arr[$k]); $y ++) { - if(is_array($arr[$k][$y])) { - if($arr[$k][$y][4] === false) { - $has_items = true; - } - else { - unset($arr[$k][$y]); + if($filtered) { + foreach($arr as $k => $x) { + $has_items = false; + for($y = 0; $y < count($arr[$k]); $y ++) { + if(is_array($arr[$k][$y])) { + if($arr[$k][$y][4] === false) { + $has_items = true; + } + else { + unset($arr[$k][$y]); + } } } - } - if(! $has_items) { - unset($arr[$k]); + if(! $has_items) { + unset($arr[$k]); + } } } diff --git a/include/poller.php b/include/poller.php index 031fb4533..808b54ee5 100644 --- a/include/poller.php +++ b/include/poller.php @@ -205,7 +205,7 @@ function poller_run($argv, $argc){ $keep_reports = intval(get_config('system','expire_delivery_reports')); if($keep_reports === 0) - $keep_reports = 30; + $keep_reports = 10; q("delete from dreport where dreport_time < %s - INTERVAL %s", db_utcnow(), diff --git a/include/widgets.php b/include/widgets.php index 0f170fd52..a7d06d39e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1217,6 +1217,7 @@ function widget_admin($arr) { 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users'), 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), + 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), 'plugins' => array(z_root() . '/admin/plugins/', t('Plugins'), 'plugins'), 'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'), 'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'), |