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

Move some messages to places where they belong.

Browse Source 
This is bascially just test that everything works as expected, much more
messages should follow.
This commit is contained in:
Michal Čihař
2010-03-11 23:58:38 +01:00
parent b33cbac41e
commit 8781e81c5e
61 changed files with 92826 additions and 92829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/auth/config.auth.lib.php
View File

@@ -104,7 +104,7 @@ function PMA_auth_fails()
} else {
// Check whether user has configured something
if ($GLOBALS['PMA_Config']->source_mtime == 0) {
echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="setup/">', '</a>') . '</p>' . "\n";
echo '<p>' . sprintf(__('You probably did not create a configuration file. You might want to use the %1$ssetup script%2$s to create one.'), '<a href="setup/">', '</a>') . '</p>' . "\n";
} elseif (!isset($GLOBALS['errno']) || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002) && $GLOBALS['errno'] != 2003) {
// if we display the "Server not responding" error, do not confuse users
// by telling them they have a settings problem
@@ -113,7 +113,7 @@ function PMA_auth_fails()
// rejected the connection, which is not really what happened)
// 2002 is the error given by mysqli
// 2003 is the error given by mysql
trigger_error($GLOBALS['strAccessDeniedExplanation'], E_USER_WARNING);
trigger_error(__('phpMyAdmin tried to connect to the MySQL server, and the server rejected the connection. You should check the host, username and password in your configuration and make sure that they correspond to the information given by the administrator of the MySQL server.'), E_USER_WARNING);
}
PMA_mysqlDie($conn_error, '', true, '', false);
}