diff --git a/ChangeLog b/ChangeLog index a0b14c684..4980a888b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-02-14 Alexander M. Turek + * server_databases.php3, server_privileges.php3, lang/*.inc.php3: + Reimplemented "check privileges" feature. + TODO: bug #684984. + 2003-02-13 Robin Johnson * sql.php3: Fix simple little bug #685082 @@ -61,7 +66,6 @@ $Source$ * lang/italian.inc.php3: Updates, thanks to Pietro Danesi (danone). * server_databases.php3, server_links.inc.php3, lang/*.inc.php3: Reworte db_stats.php3 to be conform with the new server_ pages. - TODO: reimplement "check privileges" feature. 2003-02-07 Michal Cihar * lang/czech: Updated. diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index daf2750f0..e20f538ca 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -577,4 +577,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index 6809967e3..9a11efce9 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -578,4 +578,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index 30f20c3bc..04cdc2364 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -570,4 +570,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index 2cb23b605..dade92bf7 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -571,4 +571,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index a0fdbb558..4459e4fe5 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -592,4 +592,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index a768a3669..720565451 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -591,4 +591,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index faf2416fd..0700e1abb 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -591,4 +591,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index dd0ba2d4e..babd35e45 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -592,4 +592,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index ea9b32858..7131f4fe5 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 499d39929..3978ca1c3 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -591,4 +591,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index a2898473a..31a34ecf0 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index 3f3fc9053..52dc08b85 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -563,4 +563,7 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l $strZip = '"comprimit amb zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index 1653eba6e..9c87d2959 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -564,4 +564,7 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l $strZip = '"comprimit amb zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index f1d3ecff6..621d752d4 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index dbb9b7af1..398a659c2 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -589,4 +589,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index 20ab120b6..66bfe951b 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -67,4 +67,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index cd469e5b9..9b3ba64c7 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -587,4 +587,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 2b745acfa..12e48cf87 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index 19b2edc78..ccf6343e2 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -591,4 +591,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index 789f2dfc3..372d35584 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 08fc9bec6..1c2c0d7cd 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -569,4 +569,7 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipováno"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index 804147a4b..a3427c5c7 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -570,4 +570,7 @@ $strZeroRemovesTheLimit = 'Poznámka: Nastavení tÄ›chto parametrů na 0 (nulu) $strZip = '"zazipováno"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index e90f4517f..d39d0a83b 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -569,4 +569,7 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipováno"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index bc287e63e..bfc93cbc0 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -585,4 +585,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index 75d656248..bfa374ade 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -586,4 +586,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 12baed586..140d9a312 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -568,4 +568,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index bdf5a1f8c..10f274924 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -569,4 +569,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 0a263597a..3016c2221 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -562,4 +562,7 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 93f5660e4..413b63062 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -563,4 +563,7 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index 4e5bb9f7d..18f99c298 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index c37b4d667..73ed99796 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/farsi-utf-8.inc.php3 b/lang/farsi-utf-8.inc.php3 index c957761c3..a65c6e76f 100644 --- a/lang/farsi-utf-8.inc.php3 +++ b/lang/farsi-utf-8.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/farsi-windows-1256.inc.php3 b/lang/farsi-windows-1256.inc.php3 index 32a3a0b3f..cf610cc51 100644 --- a/lang/farsi-windows-1256.inc.php3 +++ b/lang/farsi-windows-1256.inc.php3 @@ -565,4 +565,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index 372b4c21d..848542925 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -587,4 +587,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index 7677755d3..079508f3e 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -588,4 +588,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index ba685947b..ba3d8eec1 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -566,4 +566,7 @@ $strZip = '"zipp $strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index 7e96f1707..36ed3ff52 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strZip = '"zippé"'; $strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 2aa1e7f4a..eaaefa5f0 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -567,4 +567,7 @@ $strYes = 'Si'; $strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.'; $strZip = 'comprimido no formato "zip"'; +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 9f4c3fa8f..6c398bc36 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -568,4 +568,7 @@ $strYes = 'Si'; $strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.'; $strZip = 'comprimido no formato "zip"'; +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index 2283762d5..ad6dc1b2a 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index e9b474f75..cfd89ba1d 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -144,6 +144,7 @@ $strDatabasesStatsDisable = 'Datenbankstatistiken deaktivieren'; $strDatabasesStatsEnable = 'Datenbankstatistiken aktivieren'; $strDatabasesStatsHeavyTraffic = 'Bitte beachten Sie: Das Aktivieren der Datenbankstatistiken kann starken Traffic zwischen dem Web- und dem MySQL-Server zur Folge haben.'; $strDbPrivileges = 'Datenbankspezifische Rechte'; +$strDbSpecific = 'datenbankspezifisch'; $strDefault = 'Standard'; $strDelete = 'Löschen'; $strDeleteAndFlush = 'Die Benutzer löschen und die Benutzertabellen anschließend neu laden.'; @@ -210,6 +211,7 @@ $strFunction = 'Funktion'; $strGenBy = 'Erstellt von'; $strGenTime = 'Erstellungszeit'; $strGeneralRelationFeat = 'Allgemeine Verknüpfungsfunktionen'; +$strGlobal = 'global'; $strGlobalPrivileges = 'Globale Rechte'; $strGlobalValue = 'Globaler Wert'; $strGo = 'OK'; @@ -547,6 +549,7 @@ $strUserName = 'Benutzername'; $strUserNotFound = 'Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden.'; $strUserOverview = 'Benutzerübersicht'; $strUsers = 'Benutzer'; +$strUsersHavingAccessToDb = 'Benutzer mit Zugriff auf "%s"'; $strUsersDeleted = 'Die gewählten Benutzer wurden gelöscht.'; $strUseTextField = 'Textfeld verwenden'; diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index ee23dd002..b4236261f 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -145,6 +145,7 @@ $strDatabasesStatsDisable = 'Datenbankstatistiken deaktivieren'; $strDatabasesStatsEnable = 'Datenbankstatistiken aktivieren'; $strDatabasesStatsHeavyTraffic = 'Bitte beachten Sie: Das Aktivieren der Datenbankstatistiken kann starken Traffic zwischen dem Web- und dem MySQL-Server zur Folge haben.'; $strDbPrivileges = 'Datenbankspezifische Rechte'; +$strDbSpecific = 'datenbankspezifisch'; $strDefault = 'Standard'; $strDelete = 'Löschen'; $strDeleteAndFlush = 'Die Benutzer löschen und die Benutzertabellen anschließend neu laden.'; @@ -211,6 +212,7 @@ $strFunction = 'Funktion'; $strGenBy = 'Erstellt von'; $strGenTime = 'Erstellungszeit'; $strGeneralRelationFeat = 'Allgemeine Verknüpfungsfunktionen'; +$strGlobal = 'global'; $strGlobalPrivileges = 'Globale Rechte'; $strGlobalValue = 'Globaler Wert'; $strGo = 'OK'; @@ -548,6 +550,7 @@ $strUserName = 'Benutzername'; $strUserNotFound = 'Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden.'; $strUserOverview = 'Benutzerübersicht'; $strUsers = 'Benutzer'; +$strUsersHavingAccessToDb = 'Benutzer mit Zugriff auf "%s"'; $strUsersDeleted = 'Die gewählten Benutzer wurden gelöscht.'; $strUseTextField = 'Textfeld verwenden'; diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index 2e2473f19..15925e66f 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -589,4 +589,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index 82431b035..532e3e5ea 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index e5d73d798..c1041547a 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -587,4 +587,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 9a48a5381..398951d7b 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -601,4 +601,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index cb41080c3..ed63e5aa2 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -575,4 +575,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index fd0415342..300d9f34c 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -576,4 +576,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 405c5ee84..c3a5ff6f0 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -563,4 +563,7 @@ $strZeroRemovesTheLimit = 'Perhatian: Merubah pilihan ini ke posisi 0 (zero) aka $strZip = '"Dikompress dengan Zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index ead383547..4ae6cdb23 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -564,4 +564,7 @@ $strZeroRemovesTheLimit = 'Perhatian: Merubah pilihan ini ke posisi 0 (zero) aka $strZip = '"Dikompress dengan Zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 0e92df179..f487dc4c7 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -568,4 +568,7 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.'; $strZip = '"compresso con zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index e952949b7..4e7cb5a96 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -569,4 +569,7 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.'; $strZip = '"compresso con zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 533c69c58..ee47a3cef 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -573,4 +573,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index af69052b8..92b148c49 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -573,4 +573,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index a24584aec..fd9072dc3 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -574,4 +574,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index 622f0a7d8..87b1eb6e7 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -589,4 +589,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index 29d789b77..5c30a2b4e 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -591,4 +591,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index ac1b837fd..4d7643275 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -590,4 +590,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index 94b877016..43d358655 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -564,4 +564,7 @@ $strZeroRemovesTheLimit = 'Pastaba: NÄ—ra jokių apribojimų jeigu reikÅ¡mÄ— nur $strZip = '"zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index fb3872498..0a2f7c0de 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -563,4 +563,7 @@ $strZeroRemovesTheLimit = 'Pastaba: N $strZip = '"zip"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index 7790d6525..c7a2ca82a 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -586,4 +586,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index 759dde641..e517136c8 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -587,4 +587,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 1eff37818..d9d38ec82 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 0a5b5af3a..8070927dd 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index a4f2b4938..7423c5160 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -563,4 +563,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index 7476695c0..1d0a4fb9b 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -564,4 +564,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index 0427cc3c3..18c9152f2 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -586,4 +586,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index 4aeab13ca..dc58828d0 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -587,4 +587,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index 680738a95..c9ea43d90 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -564,4 +564,7 @@ $strZeroRemovesTheLimit = 'Observatie: Prin setarea acestor optiuni la 0 (zero) $strZip = '"arhivat"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index 2a1f5bbb3..6be2f97d4 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -565,4 +565,7 @@ $strZeroRemovesTheLimit = 'Observatie: Prin setarea acestor optiuni la 0 (zero) $strZip = '"arhivat"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index bc8f363f6..bdbc0a718 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -573,4 +573,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index c72445c8f..1560a06d6 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -571,4 +571,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index d81eb6183..36dd2f044 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -572,4 +572,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index 92ba68f41..50b6a4b1f 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -571,4 +571,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3 index 89b0c4f0e..3f95aa356 100644 --- a/lang/serbian-utf-8.inc.php3 +++ b/lang/serbian-utf-8.inc.php3 @@ -593,4 +593,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3 index a252deb72..4ceda4483 100644 --- a/lang/serbian-windows-1250.inc.php3 +++ b/lang/serbian-windows-1250.inc.php3 @@ -592,4 +592,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index d67484c6f..7a61e8a04 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 307448b9b..6ecc5e3b3 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index 3a6955f11..586f0a627 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index 50d7f0d5c..f30f67ed5 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -566,4 +566,7 @@ $strZip = '"zipano"'; $strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index cbdd04997..3a6d0dc3d 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strZip = '"zipano"'; $strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index f4d4751f6..e5cf6922e 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -566,4 +566,7 @@ $strZip = '"zipano"'; $strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index 84aaf48bb..5549830f8 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -566,4 +566,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 1c1a5678a..52a259a8a 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -567,4 +567,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index f0fbfb178..7fff7f721 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -563,4 +563,7 @@ $strZeroRemovesTheLimit = 'Anm: Genom att s $strZip = '"zippad"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index c03ea454b..18837fd1c 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -564,4 +564,7 @@ $strZeroRemovesTheLimit = 'Anm: Genom att sätta dessa alternativ till 0 (noll) $strZip = '"zippad"'; // To translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index b4d74a886..0b7d745bb 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -574,4 +574,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index c133030d6..bd20f3655 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -575,4 +575,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index 754b41968..bd572d3bb 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -588,4 +588,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 6b4d25609..2069de387 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -589,4 +589,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index 202b83560..519f5539f 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -569,4 +569,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index 8338324ac..a53d63bae 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -568,4 +568,7 @@ $strJumpToDB = 'Jump to database "%s".'; //to translate $strDropSelectedDatabases = 'Drop Selected Databases'; //to translate $strNoDatabasesSelected = 'No databases selected.'; //to translate $strDatabasesDropped = '%s databases have been dropped successfully.'; //to translate +$strGlobal = 'global'; //to translate +$strDbSpecific = 'database-specific'; //to translate +$strUsersHavingAccessToDb = 'Users having access to "%s"'; //to translate ?> diff --git a/server_databases.php3 b/server_databases.php3 index 583bd190c..d6d89d743 100644 --- a/server_databases.php3 +++ b/server_databases.php3 @@ -262,7 +262,7 @@ if (count($statistics) > 0) { . ' ' . "\n"; } echo ' ' . "\n" - . ' '. "\n" + . ' '. "\n" . ' ' . $strCheckPrivs . "\n" . ' ' . "\n" . ' ' . "\n" diff --git a/server_privileges.php3 b/server_privileges.php3 index 03547c607..811e12876 100644 --- a/server_privileges.php3 +++ b/server_privileges.php3 @@ -727,7 +727,7 @@ require('./server_links.inc.php3'); /** * Displays the page */ -if (empty($adduser)) { +if (empty($adduser) && empty($checkprivs)) { if (!isset($username)) { // No username is given --> display the overview echo '

' . "\n" @@ -1082,7 +1082,7 @@ if (empty($adduser)) { } echo '' . "\n"; } -} else { +} else if (!empty($adduser)) { // Add a new user echo '

' . "\n" . ' ' . $strAddUser . "\n" @@ -1180,7 +1180,141 @@ if (empty($adduser)) { echo '
' . "\n" . ' ' . "\n" . '' . "\n"; -} // end if (empty($adduser)) ... else ... +} else { + // check the privileges for a particular database. + echo '

' . "\n" + . ' ' . sprintf($strUsersHavingAccessToDb, htmlspecialchars($checkprivs)) . "\n" + . '

' . "\n" + . '' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n"; + if (PMA_MYSQL_INT_VERSION >= 32211) { + echo ' ' . "\n"; + } + echo ' ' . "\n" + . ' ' . "\n"; + $useBgcolorOne = TRUE; + // now, we build the table... + if (PMA_MYSQL_INT_VERSION >= 40000) { + // Starting with MySQL 4.0.0, we may use UNION SELECTs and this makes + // the job much easier here! + $sql_query = '(SELECT `User`, `Host`, `Db`, `Select_priv`, `Insert_priv`, `Update_priv`, `Delete_priv`, `Create_priv`, `Drop_priv`, `Grant_priv`, `References_priv` FROM `db` WHERE `Db` = "' . $checkprivs . '" AND NOT (`Select_priv` = "N" AND `Insert_priv` = "N" AND `Update_priv` = "N" AND `Delete_priv` = "N" AND `Create_priv` = "N" AND `Drop_priv` = "N" AND `Grant_priv` = "N" AND `References_priv` = "N")) UNION (SELECT `User`, `Host`, "*" AS "Db", `Select_priv`, `Insert_priv`, `Update_priv`, `Delete_priv`, `Create_priv`, `Drop_priv`, `Grant_priv`, `References_priv` FROM `user` WHERE NOT (`Select_priv` = "N" AND `Insert_priv` = "N" AND `Update_priv` = "N" AND `Delete_priv` = "N" AND `Create_priv` = "N" AND `Drop_priv` = "N" AND `Grant_priv` = "N" AND `References_priv` = "N")) ORDER BY `User` ASC, `Host` ASC, `Db` ASC;'; + $res = PMA_mysql_query($sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), $sql_query); + $row1 = PMA_mysql_fetch_array($res, MYSQL_ASSOC); + $row2 = PMA_mysql_fetch_array($res, MYSQL_ASSOC); + } else { + // With MySQL 3, we need 2 seperate queries here. + $sql_query = 'SELECT * FROM `user` WHERE NOT (`Select_priv` = "N" AND `Insert_priv` = "N" AND `Update_priv` = "N" AND `Delete_priv` = "N" AND `Create_priv` = "N" AND `Drop_priv` = "N" ' . (PMA_MYSQL_INT_VERSION >= 32211 ? 'AND `Grant_priv` = "N" ' : '') . 'AND `References_priv` = "N") ORDER BY `User` ASC, `Host` ASC;'; + $res1 = PMA_mysql_query($sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), $sql_query); + $row1 = PMA_mysql_fetch_array($res1, MYSQL_ASSOC); + $sql_query = 'SELECT * FROM `db` WHERE `Db` = "' . $checkprivs . '" AND NOT (`Select_priv` = "N" AND `Insert_priv` = "N" AND `Update_priv` = "N" AND `Delete_priv` = "N" AND `Create_priv` = "N" AND `Drop_priv` = "N" ' . (PMA_MYSQL_INT_VERSION >= 32211 ? 'AND `Grant_priv` = "N" ' : '') . 'AND `References_priv` = "N") ORDER BY `User` ASC, `Host` ASC;'; + $res2 = PMA_mysql_query($sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), $sql_query); + $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC); + } // end if (PMA_MYSQL_INT_VERSION >= 40000) ... else ... + while (!empty($row1) || !empty($row2)) { + echo ' ' . "\n"; + if (!empty($row1) && !empty($row2) && $row1['User'] == $row2['User'] && $row1['Host'] == $row2['Host']) { + $useRow1 = $useRow2 = TRUE; + echo ' ' . "\n" + . ' ' . "\n"; + } else if (PMA_MYSQL_INT_VERSION >= 40000 || empty($row2) || $row1['User'] < $row2['User'] || ($row1['User'] == $row2['User'] && $row1['Host'] < $row2['Host'])) { + $useRow1 = TRUE; + $useRow2 = FALSE; + echo ' ' . "\n" + . ' ' . "\n"; + } else { + $useRow1 = FALSE; + $useRow2 = TRUE; + echo ' ' . "\n" + . ' ' . "\n"; + } + if ($useRow1) { + echo ' ' . "\n" + . ' ' . "\n"; + if (PMA_MYSQL_INT_VERSION >= 32211) { + echo ' ' . "\n"; + } + echo ' ' . "\n" + . ' ' . "\n"; + if (PMA_MYSQL_INT_VERSION < 40000) { + $row1 = PMA_mysql_fetch_array($res1, MYSQL_ASSOC); + } + } + if ($useRow2) { + if ($useRow1) { + echo ' ' . "\n"; + } + echo ' ' . "\n" + . ' ' . "\n"; + if (PMA_MYSQL_INT_VERSION >= 32211) { + echo ' ' . "\n"; + } + echo ' ' . "\n" + . ' ' . "\n"; + if (PMA_MYSQL_INT_VERSION < 40000) { + $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC); + } else { + $row1 = PMA_mysql_fetch_array($res, MYSQL_ASSOC); + $row2 = PMA_mysql_fetch_array($res, MYSQL_ASSOC); + } + } else if (PMA_MYSQL_INT_VERSION >= 40000) { + $row1 = $row2; + $row2 = PMA_mysql_fetch_array($res, MYSQL_ASSOC); + } + $useBgcolorOne = !$useBgcolorOne; + } +} // end if (empty($adduser) && empty($checkprivs)) ... else if ... else ... /**
' . "\n" + . '  ' . $strUser . ' ' . "\n" + . ' ' . "\n" + . '  ' . $strHost . ' ' . "\n" + . ' ' . "\n" + . '  ' . $strType . ' ' . "\n" + . ' ' . "\n" + . '  ' . $strPrivileges . ' ' . "\n" + . ' ' . "\n" + . '  ' . $strGrantOption . ' ' . "\n" + . ' ' . "\n" + . '  ' . $strAction . ' ' . "\n" + . '
' . "\n" + . ' ' . (empty($row1['User']) ? '' . $strAny . '' : htmlspecialchars($row1['User'])) . "\n" + . ' ' . "\n" + . ' ' . htmlspecialchars($row1['Host']) . "\n" + . ' ' . "\n" + . ' ' . (empty($row1['User']) ? '' . $strAny . '' : htmlspecialchars($row1['User'])) . "\n" + . ' ' . "\n" + . ' ' . htmlspecialchars($row1['Host']) . "\n" + . ' ' . "\n" + . ' ' . (empty($row2['User']) ? '' . $strAny . '' : htmlspecialchars($row2['User'])) . "\n" + . ' ' . "\n" + . ' ' . htmlspecialchars($row2['Host']) . "\n" + . ' ' . "\n" + . ' ' . $strGlobal . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($row1, TRUE)) . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . ($row1['Grant_priv'] == 'Y' ? $strYes : $strNo) . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . $strEdit . "\n" + . ' ' . "\n" + . '
' . "\n" + . ' ' . $strDbSpecific . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($row2, TRUE)) . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . ($row2['Grant_priv'] == 'Y' ? $strYes : $strNo) . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . $strEdit . "\n" + . ' ' . "\n" + . '