aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-18 18:29:53 -0800
committerfriendica <info@friendica.com>2013-12-18 18:29:53 -0800
commit2089a1379a57ba5c27e220e664cb76ffb0acc1dd (patch)
tree0c9800e591d2345007ef36ab55d71f8f5016b26d
parent22973357985bfa3a4803fe5c3e53d99117e615b1 (diff)
downloadvolse-hubzilla-2089a1379a57ba5c27e220e664cb76ffb0acc1dd.tar.gz
volse-hubzilla-2089a1379a57ba5c27e220e664cb76ffb0acc1dd.tar.bz2
volse-hubzilla-2089a1379a57ba5c27e220e664cb76ffb0acc1dd.zip
provide git revision in siteinfo if possible and if not instructed otherwise
-rw-r--r--mod/siteinfo.php20
-rwxr-xr-xview/tpl/siteinfo.tpl2
2 files changed, 17 insertions, 5 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index a64b5df20..9f65f59e4 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -27,8 +27,14 @@ function siteinfo_init(&$a) {
$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(
'version' => RED_VERSION,
+ 'commit' => $commit,
'url' => z_root(),
'plugins' => $visible_plugins,
'register_policy' => $register_policy[$a->config['system']['register_policy']],
@@ -47,11 +53,16 @@ function siteinfo_init(&$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 );
- else
- $version = "";
-
+ if(@is_dir('.git') && function_exists('shell_exec'))
+ $commit = @shell_exec('git log -1 --format="%h"');
+ if(! isset($commit) || strlen($commit) > 16)
+ $commit = '';
+ }
+ else {
+ $version = $commit = '';
+ }
$visible_plugins = array();
if(is_array($a->plugins) && count($a->plugins)) {
$r = q("select * from addon where hidden = 0");
@@ -81,6 +92,7 @@ function siteinfo_content(&$a) {
'$title' => t('Red'),
'$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'),
'$version' => $version,
+ '$commit' => $commit,
'$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.'),
'$bug_text' => t('Bug reports and issues: please visit'),
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index f6647110c..a60b406cf 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -2,7 +2,7 @@
<p></p>
<p>{{$description}}</p>
{{if $version}}
-<p>{{$version}}</p>
+<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
{{/if}}
<p>{{$web_location}}</p>
<p>{{$visit}}</p>