diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-10 21:46:04 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-10 21:46:04 -0700 |
| commit | 4dd3839c41e18d9724855e7955d8737b6f52dcd6 (patch) | |
| tree | de4467d3f721ef1a507411647b2c2e7577786817 /Zotlabs/Module | |
| parent | 9caaa9397e2b7c9b9acde8cbab4bb97a77939d8a (diff) | |
| download | volse-hubzilla-4dd3839c41e18d9724855e7955d8737b6f52dcd6.tar.gz volse-hubzilla-4dd3839c41e18d9724855e7955d8737b6f52dcd6.tar.bz2 volse-hubzilla-4dd3839c41e18d9724855e7955d8737b6f52dcd6.zip | |
provide repository versions on admin summary page and an upgrade message if you're behind master
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Admin.php | 21 | ||||
| -rw-r--r-- | Zotlabs/Module/Siteinfo.php | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 0e3ee68c4..94482b39d 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') )); } diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index ccca6ab43..c65277004 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -13,7 +13,7 @@ class Siteinfo extends \Zotlabs\Web\Controller { - function get() { + function get() { if(! get_config('system','hidden_version_siteinfo')) { $version = sprintf( t('Version %s'), \Zotlabs\Project\System::get_project_version()); |