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

provide git revision in siteinfo if possible and if not instructed otherwise

Browse Source
This commit is contained in:
friendica 2013-12-18 18:29:53 -08:00
parent 2297335798
commit 2089a1379a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod/siteinfo.php
View File

@ -27,8 +27,14 @@ function siteinfo_init(&$a) {
$visible_plugins[] = $rr['name']; $visible_plugins[] = $rr['name'];
} }
if(@is_dir('.git') && function_exists('shell_exec'))
$commit = @shell_exec('git log -1 --format="%h"');
if(! isset($commit) || strlen($commit) > 16)
$commit = '';
$data = Array( $data = Array(
'version' => RED_VERSION, 'version' => RED_VERSION,
'commit' => $commit,
'url' => z_root(), 'url' => z_root(),
'plugins' => $visible_plugins, 'plugins' => $visible_plugins,
'register_policy' => $register_policy[$a->config['system']['register_policy']], 'register_policy' => $register_policy[$a->config['system']['register_policy']],
@ -47,11 +53,16 @@ function siteinfo_init(&$a) {
function siteinfo_content(&$a) { function siteinfo_content(&$a) {
if(! get_config('system','hidden_version_siteinfo')) if(! get_config('system','hidden_version_siteinfo')) {
$version = sprintf( t('Version %s'), RED_VERSION ); $version = sprintf( t('Version %s'), RED_VERSION );
else if(@is_dir('.git') && function_exists('shell_exec'))
$version = ""; $commit = @shell_exec('git log -1 --format="%h"');
if(! isset($commit) || strlen($commit) > 16)
$commit = '';
}
else {
$version = $commit = '';
}
$visible_plugins = array(); $visible_plugins = array();
if(is_array($a->plugins) && count($a->plugins)) { if(is_array($a->plugins) && count($a->plugins)) {
$r = q("select * from addon where hidden = 0"); $r = q("select * from addon where hidden = 0");
@ -81,6 +92,7 @@ function siteinfo_content(&$a) {
'$title' => t('Red'), '$title' => t('Red'),
'$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'), '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'),
'$version' => $version, '$version' => $version,
'$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="http://getzot.com">GetZot.com</a> to learn more about the Red Matrix.'), '$visit' => t('Please visit <a href="http://getzot.com">GetZot.com</a> to learn more about the Red Matrix.'),
'$bug_text' => t('Bug reports and issues: please visit'), '$bug_text' => t('Bug reports and issues: please visit'),

2
view/tpl/siteinfo.tpl
View File

@ -2,7 +2,7 @@
<p></p> <p></p>
<p>{{$description}}</p> <p>{{$description}}</p>
{{if $version}} {{if $version}}
<p>{{$version}}</p> <p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
{{/if}} {{/if}}
<p>{{$web_location}}</p> <p>{{$web_location}}</p>
<p>{{$visit}}</p> <p>{{$visit}}</p>