nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #2031221 [auth] Links to version number on login screen

Browse Source
This commit is contained in:
Marc Delisle
2008-08-01 19:00:36 +00:00
parent 0a64d6222f
commit 2f81b47624
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -70,6 +70,9 @@ danbarry
+ [doc] Documentation for distributing phpMyAdmin in README.VENDOR. + [doc] Documentation for distributing phpMyAdmin in README.VENDOR.
+ [display] headwords for sorted column + [display] headwords for sorted column
2.11.9.0 (not yet released)
- bug #2031221 [auth] Links to version number on login screen
2.11.8.0 (2008-07-28) 2.11.8.0 (2008-07-28)
- patch #1987593 [interface] Table list pagination in navi, - patch #1987593 [interface] Table list pagination in navi,
thanks to Jason Day - jday29 thanks to Jason Day - jday29

13
libraries/auth/cookie.auth.lib.php
View File

@@ -199,7 +199,8 @@ if (top != self) {
// Displays the languages form // Displays the languages form
if (empty($GLOBALS['cfg']['Lang'])) { if (empty($GLOBALS['cfg']['Lang'])) {
require_once './libraries/display_select_lang.lib.php'; require_once './libraries/display_select_lang.lib.php';
PMA_select_language(true); // use fieldset, don't show doc link
PMA_select_language(true, false);
} }
// Displays the warning message and the login form // Displays the warning message and the login form
@@ -251,14 +252,8 @@ if (top != self) {
<legend> <legend>
<?php <?php
echo $GLOBALS['strLogin']; echo $GLOBALS['strLogin'];
echo '<a href="./Documentation.html" target="documentation" ' . // no real need to put a link to doc here, and it would reveal the
'title="' . $GLOBALS['strPmaDocumentation'] . '">'; // version number
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strPmaDocumentation'] . '" />';
} else {
echo '(*)';
}
echo '</a>';
?> ?>
</legend> </legend>

8
libraries/display_select_lang.lib.php
View File

@@ -26,7 +26,7 @@ function PMA_language_cmp(&$a, &$b) {
* *
* @access public * @access public
*/ */
function PMA_select_language($use_fieldset = FALSE) { function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) {
global $cfg, $lang; global $cfg, $lang;
?> ?>
@@ -42,11 +42,13 @@ function PMA_select_language($use_fieldset = FALSE) {
// not a proper word in the current language; we show it to help // not a proper word in the current language; we show it to help
// people recognize the dialog // people recognize the dialog
$language_title = $GLOBALS['strLanguage'] $language_title = $GLOBALS['strLanguage']
. ($GLOBALS['strLanguage'] != 'Language' ? ' - <em>Language</em>' : '') . ($GLOBALS['strLanguage'] != 'Language' ? ' - <em>Language</em>' : '');
. ' <a href="./translators.html" target="documentation">' . if ($show_doc) {
$language_title .= ' <a href="./translators.html" target="documentation">' .
($cfg['ReplaceHelpImg'] ($cfg['ReplaceHelpImg']
? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />'
: '(*)') . '</a>'; : '(*)') . '</a>';
}
if ($use_fieldset) { if ($use_fieldset) {
echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>'; echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
} else { } else {