diff options
| -rw-r--r-- | config/defaults.inc.php | 5 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_config.php | 6 | ||||
| -rw-r--r-- | skins/classic/templates/login.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/login.html | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php index f960945ce..cfd0d9e34 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -438,8 +438,9 @@ $config['login_rate_limit'] = 3; // Includes should be interpreted as PHP files $config['skin_include_php'] = false; -// display software version on login screen -$config['display_version'] = false; +// display product name and software version on login screen +// 0 - hide product name and version number, 1 - show product name only, 2 - show product name and version number +$config['display_product_info'] = 1; // Session lifetime in minutes $config['session_lifetime'] = 10; diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index 4ac687529..1fe155dbc 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -659,6 +659,12 @@ class rcube_config unset($props['preview_pane']); } + // translate old `display_version` settings to `display_product_info` + if (isset($props['display_version']) && !isset($props['display_product_info'])) { + $props['display_product_info'] = $props['display_version'] ? 2 : 1; + unset($props['display_version']); + } + return $props; } diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html index 0725373d3..938473956 100644 --- a/skins/classic/templates/login.html +++ b/skins/classic/templates/login.html @@ -26,7 +26,7 @@ </noscript> <div id="login-bottomline"> - <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" /> + <roundcube:var name="config:product_name" condition="config:display_product_info > 0"> <roundcube:object name="version" condition="config:display_product_info == 2" /> <roundcube:if condition="config:support_url" /> ● <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a> <roundcube:endif /> diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html index 2a45eda5c..a3300c211 100644 --- a/skins/larry/templates/login.html +++ b/skins/larry/templates/login.html @@ -26,7 +26,7 @@ </div> <div id="bottomline" role="contentinfo"> - <roundcube:object name="productname" /> <roundcube:object name="version" condition="config:display_version" /> + <roundcube:object name="productname" condition="config:display_product_info > 0" /> <roundcube:object name="version" condition="config:display_product_info == 2" /> <roundcube:if condition="config:support_url" /> ● <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a> <roundcube:endif /> |