harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

siteinfo embellishments

Browse Source
This commit is contained in:
zotlabs 2018-01-22 20:07:08 -08:00
parent 5967360991
commit 4cfd7b65fb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Siteinfo.php
View File

@ -5,7 +5,6 @@ namespace Zotlabs\Module;
class Siteinfo extends \Zotlabs\Web\Controller { class Siteinfo extends \Zotlabs\Web\Controller {
function init() { function init() {
logger(print_r($_REQUEST,true));
if (argv(1) === 'json' || $_REQUEST['module_format'] === 'json') { if (argv(1) === 'json' || $_REQUEST['module_format'] === 'json') {
$data = get_site_info(); $data = get_site_info();
json_return_and_die($data); json_return_and_die($data);

4
include/network.php
View File

@ -1579,6 +1579,7 @@ function get_site_info() {
$channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat'));
$channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat'));
$local_posts_stat = intval(get_config('system','local_posts_stat')); $local_posts_stat = intval(get_config('system','local_posts_stat'));
$local_comments_stat = intval(get_config('system','local_comments_stat'));
$hide_in_statistics = intval(get_config('system','hide_in_statistics')); $hide_in_statistics = intval(get_config('system','hide_in_statistics'));
$site_expire = intval(get_config('system', 'default_expire_days')); $site_expire = intval(get_config('system', 'default_expire_days'));
@ -1612,13 +1613,14 @@ function get_site_info() {
'default_service_restrictions' => $service_class, 'default_service_restrictions' => $service_class,
'locked_features' => $locked_features, 'locked_features' => $locked_features,
'admin' => $admin, 'admin' => $admin,
'dbdriver' => DBA::$dba->getdriver(), 'dbdriver' => DBA::$dba->getdriver() . ' ' . ((ACTIVE_DBTYPE == DBTYPE_POSTGRES) ? 'postgres' : 'mysql'),
'lastpoll' => get_config('system','lastpoll'), 'lastpoll' => get_config('system','lastpoll'),
'info' => (($site_info) ? $site_info : ''), 'info' => (($site_info) ? $site_info : ''),
'channels_total' => $channels_total_stat, 'channels_total' => $channels_total_stat,
'channels_active_halfyear' => $channels_active_halfyear_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat,
'channels_active_monthly' => $channels_active_monthly_stat, 'channels_active_monthly' => $channels_active_monthly_stat,
'local_posts' => $local_posts_stat, 'local_posts' => $local_posts_stat,
'local_comments' => $local_comments_stat,
'hide_in_statistics' => $hide_in_statistics 'hide_in_statistics' => $hide_in_statistics
]; ];