From 99bfd938faecab33cb3d362eb6b1c01c3b4beeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Sat, 16 Mar 2002 10:08:36 +0000 Subject: [PATCH] The '' is now required --- ChangeLog | 5 +++++ header.inc.php3 | 7 ++++--- lang/arabic.inc.php3 | 1 + lang/brazilian_portuguese.inc.php3 | 1 + lang/bulgarian-koi8.inc.php3 | 1 + lang/bulgarian-win1251.inc.php3 | 1 + lang/catala.inc.php3 | 1 + lang/chinese_big5.inc.php3 | 1 + lang/chinese_gb.inc.php3 | 1 + lang/czech-iso.inc.php3 | 1 + lang/czech-win1250.inc.php3 | 1 + lang/danish.inc.php3 | 3 ++- lang/dutch.inc.php3 | 1 + lang/english.inc.php3 | 1 + lang/estonian.inc.php3 | 4 +++- lang/finnish.inc.php3 | 1 + lang/french.inc.php3 | 1 + lang/galician.inc.php3 | 1 + lang/german.inc.php3 | 1 + lang/greek.inc.php3 | 3 ++- lang/hebrew.inc.php3 | 1 + lang/hungarian.inc.php3 | 1 + lang/italian.inc.php3 | 1 + lang/japanese-euc.inc.php3 | 1 + lang/japanese-sjis.inc.php3 | 1 + lang/korean.inc.php3 | 3 ++- lang/norwegian.inc.php3 | 1 + lang/polish.inc.php3 | 1 + lang/portuguese.inc.php3 | 1 + lang/romanian.inc.php3 | 1 + lang/russian-koi8.inc.php3 | 1 + lang/russian-win1251.inc.php3 | 1 + lang/slovak-iso.inc.php3 | 1 + lang/slovak-win1250.inc.php3 | 1 + lang/spanish.inc.php3 | 2 +- lang/swedish.inc.php3 | 1 + lang/thai.inc.php3 | 3 ++- lang/turkish.inc.php3 | 1 + lang/ukrainian-win1251.inc.php3 | 1 + libraries/common.lib.php3 | 26 ++++++++++++++++++++------ main.php3 | 14 ++------------ 41 files changed, 74 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 569f34f1998d..e36a2163eb13 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-03-16 Loïc Chapeaux + * header.inc.php3, line 76; main.php3, lines 13-24; lang/*; + libraries/common.lib.php3, lines 146-150 & 367-387: the + "$cfgPmaAbsoluteUri" is now required. + 2002-03-14 Steve Alberty * main.php3: fix warning with undefined $cfgPmaAbsoluteUri diff --git a/header.inc.php3 b/header.inc.php3 index 61532d7a0e15..7b03672da180 100755 --- a/header.inc.php3 +++ b/header.inc.php3 @@ -59,20 +59,21 @@ if (!empty($cfgPmaAbsoluteUri)) { diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3 index 427f4163cc7c..19a6cb1ea2e0 100644 --- a/lang/arabic.inc.php3 +++ b/lang/arabic.inc.php3 @@ -345,6 +345,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.'; $strLogin = 'Login'; $strLogPassword = 'Password:'; $strLogUsername = 'Username:'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strRowsModeVertical = 'vertical'; //to translate $strRowsModeHorizontal = 'horizontal'; //to translate $strRowsModeOptions = ' in %s mode and repeat headers after %s cells'; //to translate diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index 02eb53347325..351037cfcbaa 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -348,4 +348,5 @@ $strZip = '"compactado com zip"'; // To translate $strChangePassword = 'Change password'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/bulgarian-koi8.inc.php3 b/lang/bulgarian-koi8.inc.php3 index 7e8a78d8ee0f..eee108fcd84b 100644 --- a/lang/bulgarian-koi8.inc.php3 +++ b/lang/bulgarian-koi8.inc.php3 @@ -348,4 +348,5 @@ $strZip = '"zip- // To translate $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 31aa22b6db15..5f5f1bfdd479 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -348,4 +348,5 @@ $strZip = '"zip- // To translate $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index f8e743163265..2da95fdab7cc 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Si'; $strZip = '"comprimit amb zip"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 893f452ef989..5b09e958c0a2 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -349,4 +349,5 @@ $strYes = ' $strZip = '"zipped"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 3e7f0892e801..eca9fb9717c4 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -308,6 +308,7 @@ $strNoModification = 'No change'; $strNoQuery = 'No SQL query!'; //to translate $strPartialText = 'Partial Texts';//to translate $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strQueryOnDb = 'SQL-query on database %s:'; $strRowSize = ' Row size '; //to translate diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 392adaa0872f..63ccc5a1f81a 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index f0fe05205633..7638e09c5939 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index b17beb79c9fc..33bdaf6fcaad 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -341,10 +341,11 @@ $strAddToIndex = 'Add to index  %s column(s)'; $strCantRenameIdxToPrimary = 'Can\'t rename index to PRIMARY!'; $strChangePassword = 'Change password'; $strCreateIndex = 'Create an index on %s columns'; +$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strNoIndexPartsDefined = 'No index parts defined!'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; $strSelectADb = 'Please select a database'; $strSelectAll = 'Select All'; //to translate $strUnselectAll = 'Unselect All'; //to translate -$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index cc7a9db0bba6..dc084bc233b4 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -310,6 +310,7 @@ $strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%'; $strNoDropDatabases = '"DROP DATABASE" statements zijn niet mogelijk.'; //to translate $strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.'; $strNoQuery = 'No SQL query!'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRowsModeHorizontal = 'horizontal'; //to translate $strRowsModeOptions = 'in %s mode and repeat headers after %s cells'; //to translate diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 09167254a5fc..7184b265a093 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -224,6 +224,7 @@ $strPasswordEmpty = 'The password is empty!'; $strPasswordNotSame = 'The passwords aren\'t the same!'; $strPHPVersion = 'PHP Version'; $strPmaDocumentation = 'phpMyAdmin documentation'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPos1 = 'Begin'; $strPrevious = 'Previous'; $strPrimary = 'Primary'; diff --git a/lang/estonian.inc.php3 b/lang/estonian.inc.php3 index fe25e32ba2e4..e1cab6a8d8c4 100644 --- a/lang/estonian.inc.php3 +++ b/lang/estonian.inc.php3 @@ -203,7 +203,7 @@ $strNoModification = 'Ei muudetud'; $strNone = 'Ühtegi'; $strNoPassword = 'Ühtegi parooli'; $strNoPrivileges = 'Ühtegi privileegi'; -$strNoQuery = 'Ühtegi SQL päringut!'; //to translate +$strNoQuery = 'Ühtegi SQL päringut!'; $strNoRights = 'Teil pole piisavalt õigusi, et hetkel siin olla!'; $strNoTablesFound = 'Andmebaasist ei leitud tabeleid.'; $strNotNumber = 'See pole number!'; @@ -346,4 +346,6 @@ $strYes = 'Jah'; $strZip = '"zipitud"'; +// To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index 6429de7d0653..06743be0d358 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -352,4 +352,5 @@ $strZip = '"zip-pakattu"'; // To translate $strChangePassword = 'Vaihda salasanaa'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 4fe74d5c9c1a..fd57afd6e288 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -224,6 +224,7 @@ $strPasswordEmpty = 'Le mot de passe est vide'; $strPasswordNotSame = 'Les mots de passe doivent être identiques'; $strPHPVersion = 'Version de PHP'; $strPmaDocumentation = 'Documentation de phpMyAdmin'; +$strPmaUriError = 'Le paramètre $cfgPmaAbsoluteUri DOIT être renseigné dans votre fichier de configuration !'; $strPos1 = 'Début'; $strPrevious = 'Précédent'; $strPrimary = 'Primaire'; diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index 09d498756152..196010f2d1f6 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -351,4 +351,5 @@ $strCardinality = 'Cardinality'; $strLogin = 'Login'; $strLogPassword = 'Password:'; $strLogUsername = 'Username:'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index e1861b208ee8..20097f7642c2 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Ja'; $strZip = '"Zip komprimiert"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index aca2463d5316..d9dadd3262a7 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -297,6 +297,7 @@ $strChangePassword = 'Change password'; $strCookiesRequired = 'Cookies must be enabled past this point.'; $strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate +$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate @@ -314,6 +315,7 @@ $strMoveTableOK = 'Table %s has been moved to %s.'; $strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%'; $strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.'; $strNoQuery = 'No SQL query!'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRowsModeHorizontal = 'horizontal'; //to translate $strRowsModeOptions = 'in %s mode and repeat headers after %s cells'; //to translate @@ -348,5 +350,4 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate ?> diff --git a/lang/hebrew.inc.php3 b/lang/hebrew.inc.php3 index 53642a3d488f..67dcdce46895 100644 --- a/lang/hebrew.inc.php3 +++ b/lang/hebrew.inc.php3 @@ -347,4 +347,5 @@ $strZip = '"Zipped"'; // To translate $strChangePassword = 'Change password'; +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/hungarian.inc.php3 b/lang/hungarian.inc.php3 index dc093a560bea..5b4461bd1944 100644 --- a/lang/hungarian.inc.php3 +++ b/lang/hungarian.inc.php3 @@ -348,4 +348,5 @@ $strYes = 'Igen'; $strZip = '"zippel tömörítve"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 6838836e3d14..2d734b7fbc9e 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -350,4 +350,5 @@ $strZip = '"compresso con zip"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index facc19cb8676..ca681c384852 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -352,4 +352,5 @@ $strKanjiEncodConvert = ' $strXkana = 'Á´³Ñ¥«¥Ê¤ØÊÑ´¹¤¹¤ë'; // convert to X208-kana // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 8b71cde916e1..c7f388bf5232 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -352,4 +352,5 @@ $strKanjiEncodConvert = ' $strXkana = '‘SŠpƒJƒi‚Ö•ÏŠ·‚·‚é'; // convert to X208-kana // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index 8d9f566de4ea..11736dc9a59c 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -273,6 +273,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.'; $strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDatabasesStats = 'Databases statistics';//to translate +$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strDeletedRows = 'Deleted rows:'; $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strDisplayOrder = 'Display order:'; @@ -307,6 +308,7 @@ $strNoModification = 'No change'; // To translate $strNoQuery = 'No SQL query!'; //to translate $strPartialText = 'Partial Texts';//to translate $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strQueryOnDb = 'SQL-query on database %s:'; $strRowSize = ' Row size '; //to translate @@ -351,5 +353,4 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index 2fd5a041c46b..2e6e7c0280f8 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -346,4 +346,5 @@ $strYes = 'Ja'; $strZip = '"komprimert (zip)"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index 02ae90c2442b..8ac835f60871 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Tak'; $strZip = '".zip"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 47885e197541..22d30e41ccab 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -346,5 +346,6 @@ $strBzip = '"bzipped"'; //to translate $strChangePassword = 'Change password'; $strGzip = '"gzipped"'; //to translate $strHomepageSourceforge = 'Sourceforge phpMyAdmin Download Page'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strZip = '"zipped"'; //to translate ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index 46344a7b8e2e..7e29a37fc656 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -348,4 +348,5 @@ $strZip = '"zipped"'; // To translate $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index c295d8aaa21f..dfa7a888ead7 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -347,4 +347,5 @@ $strZip = ' // To translate $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index fe691fa9333f..185b6f367ebd 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -347,4 +347,5 @@ $strZip = ' // To translate $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index 81f194905ebe..39b28c900e2f 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -350,4 +350,5 @@ $strZip = '"zo zipovan // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/slovak-win1250.inc.php3 b/lang/slovak-win1250.inc.php3 index d5d0716a04ac..2f5588e75929 100644 --- a/lang/slovak-win1250.inc.php3 +++ b/lang/slovak-win1250.inc.php3 @@ -347,4 +347,5 @@ $strZip = '"zozipovan // To translate $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 95c781069bfc..80886252357b 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -345,5 +345,5 @@ $strZip = '"comprimido con zip"'; // To translate $strFlushTable = 'Flush the table ("FLUSH")';//to translate - +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 998293c0fc40..285eec1f4534 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Ja'; $strZip = '"zippad"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index dc7a9ca97773..0df1543440c1 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -273,6 +273,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.'; $strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDatabasesStats = 'Databases statistics';//to translate +$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strDeletedRows = 'Deleted rows:'; $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strDisplayOrder = 'Display order:'; @@ -308,6 +309,7 @@ $strNoModification = 'No change'; // To translate $strNoQuery = 'No SQL query!'; //to translate $strPartialText = 'Partial Texts';//to translate $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strQueryOnDb = 'SQL-query on database %s:'; $strRowSize = ' Row size '; //to translate @@ -352,5 +354,4 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate ?> diff --git a/lang/turkish.inc.php3 b/lang/turkish.inc.php3 index 3a19505fce11..30e8d4af8344 100644 --- a/lang/turkish.inc.php3 +++ b/lang/turkish.inc.php3 @@ -347,4 +347,5 @@ $strYes = 'Evet'; $strZip = '"ziplenmiþ"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/lang/ukrainian-win1251.inc.php3 b/lang/ukrainian-win1251.inc.php3 index b65d86c7bf0f..91f07523eaca 100644 --- a/lang/ukrainian-win1251.inc.php3 +++ b/lang/ukrainian-win1251.inc.php3 @@ -347,4 +347,5 @@ $strYes = ' $strZip = 'çàïàêóâàòè â "zip"'; // To translate +$strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; ?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 01fa4536e817..a7f16caf6a7f 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -143,12 +143,6 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ $cfgLeftFrameLight = TRUE; } - // Adds a trailing slash et the end of the phpMyAdmin uri if it does not - // exist - if ($cfgPmaAbsoluteUri != '' && substr($cfgPmaAbsoluteUri, -1) != '/') { - $cfgPmaAbsoluteUri .= '/'; - } - // Gets some constants include('./libraries/defines.lib.php3'); @@ -370,6 +364,26 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ } // end of the 'PMA_setFontSizes()' function + /** + * $cfgPmaAbsoluteUri is a required directive else cookies won't be set + * properly and, depending on browsers, inserting or updating a record + * record might fail + */ + if (empty($cfgPmaAbsoluteUri)) { + if (empty($GLOBALS['is_header_sent'])) { + include('./header.inc.php3'); + } + echo '

'. $strPmaUriError . '

' . "\n"; + include('./footer.inc.php3'); + exit(); + } + // Adds a trailing slash et the end of the phpMyAdmin uri if it does not + // exist + else if (substr($cfgPmaAbsoluteUri, -1) != '/') { + $cfgPmaAbsoluteUri .= '/'; + } + + /** * Use mysql_connect() or mysql_pconnect()? */ diff --git a/main.php3 b/main.php3 index 1ca002f063b2..945ea96a0bd1 100755 --- a/main.php3 +++ b/main.php3 @@ -10,18 +10,8 @@ require('./libraries/common.lib.php3'); // Puts the language to use in a cookie that will expire in 30 days if (!isset($pma_uri_parts)) { $pma_uri_parts = parse_url($cfgPmaAbsoluteUri); - if (isset($pma_uri_parts['path'])) { - $cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')); - } - else { - $cookie_path = ''; - } - if (isset($pma_uri_parts['scheme'])) { - $is_https = ($pma_uri_parts['scheme'] == 'https') ? 1 : 0; - } - else { - $is_https = 0; - } + $cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')); + $is_https = ($pma_uri_parts['scheme'] == 'https') ? 1 : 0; } setcookie('lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https); // Defines the "item" image depending on text direction