diff options
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | mod/admin.php | 29 | ||||
| -rw-r--r-- | view/tpl/admin_summary.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/admin_summary.tpl | 2 |
4 files changed, 9 insertions, 26 deletions
diff --git a/include/nav.php b/include/nav.php index bbf803390..5490d6cd4 100644 --- a/include/nav.php +++ b/include/nav.php @@ -74,7 +74,7 @@ EOT; $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Status'), "", t('Your posts and conversations')); $nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page')); if(feature_enabled(local_user(),'multi_profiles')) - $nav['usermenu'] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles')); + $nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles')); $nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos')); // $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); diff --git a/mod/admin.php b/mod/admin.php index 13ecf7eef..9a8a58cfc 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -166,18 +166,18 @@ function admin_page_summary(&$a) { // list total user accounts, expirations etc. + $r = q("SELECT COUNT(account_id) as total FROM `account`"); + $users = $r[0]['total']; + $r = q("SELECT COUNT(id) as `count` FROM `register`"); $pending = $r[0]['count']; - - $r = q("select count(*) as total from deliverq where 1"); - $deliverq = (($r) ? $r[0]['total'] : 0); - $r = q("select count(*) as total from queue where 1"); + $r = q("select count(*) as total from outq"); $queue = (($r) ? $r[0]['total'] : 0); // We can do better, but this is a quick queue status - - $queues = array( 'label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue ); + + $queues = array( 'label' => t('Message queues'), 'queue' => $queue ); $t = get_markup_template("admin_summary.tpl"); @@ -223,11 +223,6 @@ function admin_page_site_post(&$a){ $block_public = ((x($_POST,'block_public')) ? True : False); $force_publish = ((x($_POST,'publish_all')) ? True : False); $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); - $thread_allow = ((x($_POST,'thread_allow')) ? True : False); - $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); - $no_openid = !((x($_POST,'no_openid')) ? True : False); - $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); - $no_utf = !((x($_POST,'no_utf')) ? True : False); $no_community_page = !((x($_POST,'no_community_page')) ? True : False); $verifyssl = ((x($_POST,'verifyssl')) ? True : False); @@ -236,10 +231,6 @@ function admin_page_site_post(&$a){ $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); - $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); - $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); - $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); - $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); /* if($ssl_policy != intval(get_config('system','ssl_policy'))) { @@ -314,20 +305,12 @@ function admin_page_site_post(&$a){ set_config('system','directory_submit_url', $global_directory); } - set_config('system','thread_allow', $thread_allow); - - set_config('system','block_extended_register', $no_multi_reg); - set_config('system','no_openid', $no_openid); - set_config('system','no_regfullname', $no_regfullname); set_config('system','no_community_page', $no_community_page); set_config('system','no_utf', $no_utf); set_config('system','verifyssl', $verifyssl); set_config('system','proxyuser', $proxyuser); set_config('system','proxy', $proxy); set_config('system','curl_timeout', $timeout); - set_config('system','dfrn_only', $dfrn_only); - set_config('system','ostatus_disabled', $ostatus_disabled); - set_config('system','diaspora_enabled', $diaspora_enabled); info( t('Site settings updated.') . EOL); goaway($a->get_baseurl(true) . '/admin/site' ); diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 4efe1960c..99221c13e 100644 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -3,7 +3,7 @@ <dl> <dt>$queues.label</dt> - <dd>$queues.deliverq - $queues.queue</dd> + <dd>$queues.queue</dd> </dl> <dl> <dt>$pending.0</dt> diff --git a/view/tpl/smarty3/admin_summary.tpl b/view/tpl/smarty3/admin_summary.tpl index b3b42a139..76ac23d29 100644 --- a/view/tpl/smarty3/admin_summary.tpl +++ b/view/tpl/smarty3/admin_summary.tpl @@ -8,7 +8,7 @@ <dl> <dt>{{$queues.label}}</dt> - <dd>{{$queues.deliverq}} - {{$queues.queue}}</dd> + <dd>{{$queues.queue}}</dd> </dl> <dl> <dt>{{$pending.0}}</dt> |