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

2002-07-04 Robin Johnson <robbat2@users.sourceforge.net>

Browse Source 
* config.inc.php3, libraries/common.lib.php3:
      Code for $cfg['PmaAbsoluteUri_DisableWarning']
This commit is contained in:
Robin Johnson
2002-07-04 07:19:47 +00:00
parent 52002e82da
commit 563b7444aa
3 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
ChangeLog
View File

@@ -5,8 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-07-04 Robin Johnson <robbat2@users.sourceforge.net>
* config.inc.php3, libraries/common.lib.php3:
Code for $cfg['PmaAbsoluteUri_DisableWarning']
2002-07-03 Marc Delisle <lem9@users.sourceforge.net> 2002-07-03 Marc Delisle <lem9@users.sourceforge.net>
* lang/japanese* updates, thanks to Yukihiro Kawada * lang/japanese* updates:, thanks to Yukihiro Kawada
* Documentation.html: explain the oslash symbol in the statistics * Documentation.html: explain the oslash symbol in the statistics
* left.php3: the - as first choice is not clear * left.php3: the - as first choice is not clear
* tbl_properties_table_info.php3, tbl_properties_links.php3: bug * tbl_properties_table_info.php3, tbl_properties_links.php3: bug
@@ -83,8 +87,8 @@ $Source$
2002-06-26 Marc Delisle <lem9@users.sourceforge.net> 2002-06-26 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: update the persons/towns/countries example * Documentation.html: update the persons/towns/countries example
* sql.php3, tbl_properties_table_info.php3: sub-page links on browse * sql.php3, tbl_properties_table_info.php3: sub-page links on browse
* lang/japanese* updates, thanks to Yukihiro Kawada * lang/japanese* updates: thanks to Yukihiro Kawada
* libraries/mysql_wrappers.lib.php3 patch #574009, charset * libraries/mysql_wrappers.lib.php3: patch #574009, charset
conversion for db names, thanks to Michal Cihar_ conversion for db names, thanks to Michal Cihar_
2002-06-26 Olivier L. M<>ller <om@omnis.ch> 2002-06-26 Olivier L. M<>ller <om@omnis.ch>
@@ -99,8 +103,8 @@ $Source$
* ChangeLog: Added a note about the older ChangeLogs at EoF. * ChangeLog: Added a note about the older ChangeLogs at EoF.
2002-06-25 Marc Delisle <lem9@users.sourceforge.net> 2002-06-25 Marc Delisle <lem9@users.sourceforge.net>
* lang/georgian-utf-8 updates, thanks to Kakha Mchedlidze * lang/georgian-utf-8 updates: thanks to Kakha Mchedlidze
* lang/ukrainian-win1251 updates, thanks to Markijan Baran * lang/ukrainian-win1251 updates: thanks to Markijan Baran
2002-06-25 Olivier L. M<>ller <om@omnis.ch> 2002-06-25 Olivier L. M<>ller <om@omnis.ch>
* lang/german.inc.php3: Du -> Sie * lang/german.inc.php3: Du -> Sie
@@ -109,7 +113,7 @@ $Source$
* lang/lithuanian.inc.php3: Removed line feed at EoF. * lang/lithuanian.inc.php3: Removed line feed at EoF.
2002-06-23 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-23 Robin Johnson <robbat2@users.sourceforge.net>
* lang/portuguese.inc.php3 updates, thanks to Lopo Pizarro * lang/portuguese.inc.php3 updates: thanks to Lopo Pizarro
2002-06-23 Alexander M. Turek <rabus@users.sourceforge.net> 2002-06-23 Alexander M. Turek <rabus@users.sourceforge.net>
* Revised some files in /lang/: * Revised some files in /lang/:
@@ -140,8 +144,8 @@ $Source$
- Fixed style="PAGE-BREAK-AFTER: always" from appearing on the - Fixed style="PAGE-BREAK-AFTER: always" from appearing on the
last <div>, to stop a blank page being printed last <div>, to stop a blank page being printed
- Moved <hr /> to just inside </div> - gets line on the same page - Moved <hr /> to just inside </div> - gets line on the same page
* lang/portuguese.inc.php3 updates, thanks to Lopo Pizarro * lang/portuguese.inc.php3 updates: thanks to Lopo Pizarro
* lang/chinese*.inc.php3 updates, thanks to Siu Sun * lang/chinese*.inc.php3 updates: thanks to Siu Sun
* lang/english*: $strSplitWordsWithSpace * lang/english*: $strSplitWordsWithSpace
- Fix spelling 'seperated' -> 'separated' - Fix spelling 'seperated' -> 'separated'
@@ -154,21 +158,21 @@ $Source$
2002-06-21 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-21 Robin Johnson <robbat2@users.sourceforge.net>
* lang/english*: $strSplitWordsWithSpace * lang/english*: $strSplitWordsWithSpace
- 'splitted' changed to 'seperated' - 'splitted' changed to 'seperated'
* lang/portuguese.inc.php3 updates, thanks to Lopo Pizarro * lang/portuguese.inc.php3 updates: thanks to Lopo Pizarro
* lang/polish.inc.php3 updates, thanks to Jakub Wilk * lang/polish.inc.php3 updates: thanks to Jakub Wilk
* db_details_links.php3, header.inc.php3, * db_details_links.php3, header.inc.php3,
tbl_properties_links.php3, libraries/common.lib.php3 tbl_properties_links.php3, libraries/common.lib.php3:
- Neater tab code by Michal Cihar (Patch #571837) - Neater tab code by Michal Cihar (Patch #571837)
2002-06-21 Marc Delisle <lem9@users.sourceforge.net> 2002-06-21 Marc Delisle <lem9@users.sourceforge.net>
* sql.php3: patch 565627 for the old bug 461192: wrong query count * sql.php3: patch 565627 for the old bug 461192: wrong query count
for groups, thanks to Svetlozar Kovachev for groups, thanks to Svetlozar Kovachev
* lang/czech* updates, thanks to Michal Cihar * lang/czech* updates: thanks to Michal Cihar
* lang/greek updates, thanks to Kyriakos Xagoraris * lang/greek updates: thanks to Kyriakos Xagoraris
* lang/norwegian updates, thanks to Sven-Erik Andersen * lang/norwegian updates: thanks to Sven-Erik Andersen
* tbl_properties_structure.php3, bug 572127: wrong back link, thanks * tbl_properties_structure.php3, bug 572127: wrong back link, thanks
to "nobody" to "nobody"
* tbl_addfield.php3, goback to the structure sub-page * tbl_addfield.php3: goback to the structure sub-page
2002-06-20 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-20 Robin Johnson <robbat2@users.sourceforge.net>
* tbl_qbe.php3: Using * for tables fields disables * tbl_qbe.php3: Using * for tables fields disables
@@ -176,11 +180,11 @@ $Source$
* db_details_links.php3: Added $args3, $args4 = '', for no tables case * db_details_links.php3: Added $args3, $args4 = '', for no tables case
2002-06-20 Marc Delisle <lem9@users.sourceforge.net> 2002-06-20 Marc Delisle <lem9@users.sourceforge.net>
* ChangeLog_till_2.2.6.gz removed from the distribution and copied * ChangeLog_till_2.2.6.gz: removed from the distribution and copied
to home page to home page
* lang/georgian-utf-8, thanks to Kakha Mchedlidze <kakha at qartuli.com> * lang/georgian-utf-8: thanks to Kakha Mchedlidze <kakha at qartuli.com>
* lang/polish updates, thanks to Jakub Wilk * lang/polish updates: thanks to Jakub Wilk
* lang/galician updates, thanks to Xos<6F> Calvo * lang/galician updates: thanks to Xos<6F> Calvo
2002-06-20 Alexander M. Turek <rabus@users.sourceforge.net> 2002-06-20 Alexander M. Turek <rabus@users.sourceforge.net>
* header.inc.php3, *_links.php3, libraries/common.lib.php3: Implemented * header.inc.php3, *_links.php3, libraries/common.lib.php3: Implemented
@@ -197,11 +201,11 @@ $Source$
2002-06-19 Marc Delisle <lem9@users.sourceforge.net> 2002-06-19 Marc Delisle <lem9@users.sourceforge.net>
* index.php3: missing header, thanks to Michal Cihar * index.php3: missing header, thanks to Michal Cihar
* lang/japanese* updates, thanks to Yukihiro Kawada * lang/japanese* updates: thanks to Yukihiro Kawada
* lang/spanish, catala updates, thanks to Xavier Navarro * lang/spanish, catala updates: thanks to Xavier Navarro
* lang/dutch updates, thanks to Ivo Teel. * lang/dutch updates: thanks to Ivo Teel.
* lang/swedish updates, thanks to Bj<42>rn T. Hallberg * lang/swedish updates: thanks to Bj<42>rn T. Hallberg
* lang/galician updates, thanks to Xos<6F> Calvo * lang/galician updates: thanks to Xos<6F> Calvo
* libraries/config_import.lib.php3, fixed 3 parse errors * libraries/config_import.lib.php3, fixed 3 parse errors
* common.lib.php3: due to formatting problems, bypass PMA_format_sql * common.lib.php3: due to formatting problems, bypass PMA_format_sql
for 2.3.0-rc1 for 2.3.0-rc1
@@ -210,15 +214,15 @@ $Source$
2002-06-19 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-19 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/charset_conversion.lib.php3, * libraries/charset_conversion.lib.php3,
libraries/common.lib.php3, libraries/common.lib.php3,
main.php3 main.php3:
- added isset() before some configuration variables - added isset() before some configuration variables
2002-06-18 Marc Delisle <lem9@users.sourceforge.net> 2002-06-18 Marc Delisle <lem9@users.sourceforge.net>
* lang/chinese* updates, thanks to Siu Sun * lang/chinese* updates: thanks to Siu Sun
* lang/lithuanian updates, thanks to Vilius Zigmantas * lang/lithuanian updates: thanks to Vilius Zigmantas
* lang/romanian updates, thanks to Valics Lehel * lang/romanian updates: thanks to Valics Lehel
* lang/thai updates, thanks to Arthit Suriyawongkul. * lang/thai updates: thanks to Arthit Suriyawongkul.
* lang/turkish updates, thanks to Bora Alioglu * lang/turkish updates: thanks to Bora Alioglu
* tbl_relation.php3, bug 570691: query was executed too many times * tbl_relation.php3, bug 570691: query was executed too many times
2002-06-18 Alexander M. Turek <rabus@users.sourceforge.net> 2002-06-18 Alexander M. Turek <rabus@users.sourceforge.net>
@@ -235,21 +239,21 @@ $Source$
- Last fix for $strConfigFileError done as well - Last fix for $strConfigFileError done as well
2002-06-17 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-17 Robin Johnson <robbat2@users.sourceforge.net>
* lang/finnish.inc.php3 updates, thanks to Visa Kopu (#569317) * lang/finnish.inc.php3 updates: thanks to Visa Kopu (#569317)
* lang/italian.inc.php3 update, thanks to Pietro Danesi (#569424) * lang/italian.inc.php3 update: thanks to Pietro Danesi (#569424)
2002-06-17 Marc Delisle <lem9@users.sourceforge.net> 2002-06-17 Marc Delisle <lem9@users.sourceforge.net>
* scripts/create-release.sh: the I option in tar for bzip output * scripts/create-release.sh: the I option in tar for bzip output
is deprecated and no longer works on sourceforge, use j is deprecated and no longer works on sourceforge, use j
* lang/french.inc.php3 updates * lang/french.inc.php3: updates
* user_password.php3 parse error as reported by Olivier * user_password.php3: parse error as reported by Olivier
* libraries/relation.lib.php3: pmadb can be left blank * libraries/relation.lib.php3: pmadb can be left blank
2002-06-16 Marc Delisle <lem9@users.sourceforge.net> 2002-06-16 Marc Delisle <lem9@users.sourceforge.net>
* lang/sync_lang.sh: new script thanks to Michal Cihar * lang/sync_lang.sh: new script thanks to Michal Cihar
* Documentation.html: typos * Documentation.html: typos
* lang/hebrew.inc.php3 updates, thanks to Yuval Sarna * lang/hebrew.inc.php3 updates: thanks to Yuval Sarna
* lang/turkish.inc.php3 updates, thanks to Bora Alioglu * lang/turkish.inc.php3 updates: thanks to Bora Alioglu
2002-06-15 Mike Beck <mikebeck@users.sourceforge.net> 2002-06-15 Mike Beck <mikebeck@users.sourceforge.net>
more changes because of new centralized db for pma more changes because of new centralized db for pma

16
config.inc.php3
View File

@@ -22,6 +22,14 @@ $old_error_rep = error_reporting(E_ALL);
* *
* It must contain characters that are valid for a URL, and the path is * It must contain characters that are valid for a URL, and the path is
* case sensitive on some Web servers, for example Unix-based servers. * case sensitive on some Web servers, for example Unix-based servers.
*
* In most cases you can leave this variable alone, as the correct value
* will be detected automatically. However, we recommened that you do
* test to see that the auto-detection code works in your system.
*
* If the auto-detection code does work properly, you can set the
* $cfg['PmaAbsoluteUri_DisableWarning'] variable at the bottom of
* this file.
*/ */
$cfg['PmaAbsoluteUri'] = ''; $cfg['PmaAbsoluteUri'] = '';
@@ -436,6 +444,14 @@ if($cfg['UseSyntaxColoring']) {
'SET' 'SET'
); );
} }
/**
* Disable the default warning about $cfg['PmaAbsoluteUri'] not being set
* You should use this if and ONLY if the PmaAbsoluteUri auto-detection
* works perfectly.
*/
$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
/** /**
* Unset magic_quotes_runtime - do not change! * Unset magic_quotes_runtime - do not change!
*/ */

12
libraries/common.lib.php3
View File

@@ -494,8 +494,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
if (empty($cfg['PmaAbsoluteUri'])) { if (empty($cfg['PmaAbsoluteUri'])) {
$DisplayPmaAbsoluteUriWarning = 1;
// Setup a default value to let the people and lazy syadmins work anyway, // Setup a default value to let the people and lazy syadmins work anyway,
// but display a big warning on the main.php3 page. --Olivier // but display a big warning on the main.php3 page. --Olivier
@@ -504,6 +502,16 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
. (!empty($HTTP_SERVER_VARS['SERVER_PORT']) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '') . (!empty($HTTP_SERVER_VARS['SERVER_PORT']) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '')
. substr($HTTP_SERVER_VARS['SCRIPT_NAME'], 0, strrpos($HTTP_SERVER_VARS['SCRIPT_NAME'], '/')+1); . substr($HTTP_SERVER_VARS['SCRIPT_NAME'], 0, strrpos($HTTP_SERVER_VARS['SCRIPT_NAME'], '/')+1);
// We display the warning by default, but not if it is disabled thru
// via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.
// This is intended for sysadmins that actually want the default behaviour
// of auto-detection due to their setup.
// See the mailing list message:
// http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141
if ($cfg['PmaAbsoluteUri_DisableWarning'] === FALSE) {
$DisplayPmaAbsoluteUriWarning = 1;
}
} }
// Adds a trailing slash et the end of the phpMyAdmin uri if it does not // Adds a trailing slash et the end of the phpMyAdmin uri if it does not
// exist // exist