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

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-09-14 19:17:36 -07:00
commit 7099e09a5c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/siteinfo.php
View File

@ -150,6 +150,9 @@ function siteinfo_content(&$a) {
if(file_exists('doc/site_donate.html')) if(file_exists('doc/site_donate.html'))
$donate .= file_get_contents('doc/site_donate.html'); $donate .= file_get_contents('doc/site_donate.html');
if(function_exists('sys_getloadavg'))
$loadavg = sys_getloadavg();
$o = replace_macros(get_markup_template('siteinfo.tpl'), array( $o = replace_macros(get_markup_template('siteinfo.tpl'), array(
'$title' => t('$Projectname'), '$title' => t('$Projectname'),
'$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'), '$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'),
@ -158,6 +161,8 @@ function siteinfo_content(&$a) {
'$tag' => $tag, '$tag' => $tag,
'$polled' => t('Last background fetch: '), '$polled' => t('Last background fetch: '),
'$lastpoll' => get_poller_runtime(), '$lastpoll' => get_poller_runtime(),
'$load_average' => t('Current load average: '),
'$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2],
'$commit' => $commit, '$commit' => $commit,
'$web_location' => t('Running at web location') . ' ' . z_root(), '$web_location' => t('Running at web location') . ' ' . z_root(),
'$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'), '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'),

1
view/tpl/siteinfo.tpl
View File

@ -10,6 +10,7 @@
{{if $polled}} {{if $polled}}
<p>{{$polled}} {{$lastpoll}}</p> <p>{{$polled}} {{$lastpoll}}</p>
{{/if}} {{/if}}
<p>{{$load_average}} {{$loadavg_all}}</p>
<p>{{$web_location}}</p> <p>{{$web_location}}</p>
<p>{{$visit}}</p> <p>{{$visit}}</p>
<p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p>