aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Admin.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-11 05:54:20 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-11 05:54:20 -0400
commitd968fc51eab8b0fb259ecbeae517056b99554017 (patch)
tree10e551cff9fefbefbfd7e5031b57320116bb7fce /Zotlabs/Module/Admin.php
parentc7698e4dc388b7d9a9db368672cb057c1d4d3a01 (diff)
parent4dd3839c41e18d9724855e7955d8737b6f52dcd6 (diff)
downloadvolse-hubzilla-d968fc51eab8b0fb259ecbeae517056b99554017.tar.gz
volse-hubzilla-d968fc51eab8b0fb259ecbeae517056b99554017.tar.bz2
volse-hubzilla-d968fc51eab8b0fb259ecbeae517056b99554017.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Admin.php')
-rw-r--r--Zotlabs/Module/Admin.php21
1 files changed, 15 insertions, 6 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 4b697d0de..e77cf0fc7 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -107,7 +107,7 @@ class Admin extends \Zotlabs\Web\Controller {
* @param App &$a
* @return string
*/
- function get() {
+ function get() {
logger('admin_content', LOGGER_DEBUG);
@@ -229,18 +229,27 @@ class Admin extends \Zotlabs\Web\Controller {
. '<br>PHP 5.3 has reached its <a href="http://php.net/eol.php" class="alert-link">End of Life (EOL)</a> in August 2014.'
. ' A list about current PHP versions can be found <a href="http://php.net/supported-versions.php" class="alert-link">here</a>.';
}
-
+
+ $vmaster = get_repository_version('master');
+ $vdev = get_repository_version('dev');
+
+ $upgrade = ((version_compare(STD_VERSION,$vmaster) < 0) ? t('Your software should be updated') : '');
+
+
$t = get_markup_template('admin_summary.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Summary'),
'$adminalertmsg' => $alertmsg,
- '$queues' => $queues,
+ '$queues' => $queues,
'$accounts' => array( t('Registered accounts'), $accounts),
- '$pending' => array( t('Pending registrations'), $pending),
+ '$pending' => array( t('Pending registrations'), $pending),
'$channels' => array( t('Registered channels'), $channels),
- '$plugins' => array( t('Active plugins'), $plugins ),
- '$version' => array( t('Version'), STD_VERSION),
+ '$plugins' => array( t('Active plugins'), $plugins ),
+ '$version' => array( t('Version'), STD_VERSION),
+ '$vmaster' => array( t('Repository version (master)'), $vmaster),
+ '$vdev' => array( t('Repository version (dev)'), $vdev),
+ '$upgrade' => $upgrade,
'$build' => get_config('system', 'db_version')
));
}