extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* show maintenance release as version-number everywhere

Browse Source
This commit is contained in:
Ralf Becker 2019-01-09 10:39:02 +01:00
parent 3a18819fd1
commit 54bd5eac99
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Framework.php
View File

@ -404,7 +404,7 @@ abstract class Framework extends Framework\Extra
{ {
$var = Array( $var = Array(
'img_root' => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images', 'img_root' => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
'version' => $GLOBALS['egw_info']['server']['versions']['phpgwapi'] 'version' => $GLOBALS['egw_info']['server']['versions']['api']
); );
$var['page_generation_time'] = ''; $var['page_generation_time'] = '';
if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time']) if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
@ -421,9 +421,13 @@ abstract class Framework extends Framework\Extra
} }
$var['page_generation_time'] .= '</span></div>'; $var['page_generation_time'] .= '</span></div>';
} }
if (empty($GLOBALS['egw_info']['server']['versions']['maintenance_release']))
{
$GLOBALS['egw_info']['server']['versions']['maintenance_release'] = Api\Framework::api_version();
}
$var['powered_by'] = '<a href="http://www.egroupware.org/" target="_blank">'. $var['powered_by'] = '<a href="http://www.egroupware.org/" target="_blank">'.
lang('Powered by').' EGroupware '. lang('Powered by').' EGroupware '.
$GLOBALS['egw_info']['server']['versions']['api'].'</a>'; $GLOBALS['egw_info']['server']['versions']['maintenance_release'].'</a>';
return $var; return $var;
} }

4
api/src/Framework/About.php
View File

@ -112,8 +112,10 @@ EGroupware can be integrated easily into existing authentication solutions such
// fill content array for eTemplate // fill content array for eTemplate
$changelog = null; $changelog = null;
Api\Framework::api_version($changelog);
$content = array( $content = array(
'apiVersion' => '<p>'.lang('EGroupware version').' <b>'.Api\Framework::api_version($changelog).'</b></p>', 'apiVersion' => '<p>'.lang('EGroupware version').
' <b>'.$GLOBALS['egw_info']['server']['versions']['maintenance_release'].'</b></p>',
'applications' => $apps, 'applications' => $apps,
'text_content' => $text_content, 'text_content' => $text_content,
'changelog' => file_exists($changelog) ? file_get_contents($changelog) : 'not available', 'changelog' => file_exists($changelog) ? file_get_contents($changelog) : 'not available',

2
api/src/Framework/Updates.php
View File

@ -84,7 +84,7 @@ class Updates
*/ */
public static function notification() public static function notification()
{ {
$api = self::api_version(); $api = preg_replace('/ ?EPL$/', '', self::api_version());
$api_major = $matches = null; $api_major = $matches = null;
if (preg_match('/^(\d+\.\d+)\./', $api, $matches)) if (preg_match('/^(\d+\.\d+)\./', $api, $matches))
{ {

8
setup/inc/class.setup_html.inc.php
View File

@ -158,7 +158,8 @@ class setup_html
} }
$GLOBALS['setup_tpl']->set_var('lang_version',lang('version')); $GLOBALS['setup_tpl']->set_var('lang_version',lang('version'));
if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api'])) if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api']) ||
!isset($GLOBALS['setup_info']['api']['versions']) || !isset($GLOBALS['setup_info']['api']['versions']['maintenance_release']))
{ {
include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'); include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php');
} }
@ -166,7 +167,10 @@ class setup_html
{ {
$setup_info = $GLOBALS['setup_info']; $setup_info = $GLOBALS['setup_info'];
} }
$GLOBALS['setup_tpl']->set_var('pgw_ver', $setup_info['api']['version']); $GLOBALS['setup_tpl']->set_var('pgw_ver', $nologoutbutton ?
(double)$setup_info['api']['version'] : // without login only show main version, not maintenance release
$setup_info['api']['versions']['maintenance_release']);
$GLOBALS['setup_tpl']->set_var(array( $GLOBALS['setup_tpl']->set_var(array(
'logoutbutton' => $btn_logout, 'logoutbutton' => $btn_logout,
'indexbutton' => $index_btn, 'indexbutton' => $index_btn,