From ed74cb4bfafe495775e56124c236d730769a4a96 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Jul 2002 13:18:02 +0000 Subject: [PATCH] for Loic --- ChangeLog | 13 +++++++++++++ Documentation.html | 20 ++++++++++---------- db_details.php3 | 1 - db_details_links.php3 | 1 + db_details_structure.php3 | 8 +++++--- libraries/charset_conversion.lib.php3 | 6 +++--- libraries/common.lib.php3 | 7 +++---- libraries/select_lang.lib.php3 | 4 ++-- tbl_change.php3 | 2 +- tbl_properties.php3 | 1 + tbl_properties_export.php3 | 4 +++- tbl_properties_structure.php3 | 2 +- tbl_query_box.php3 | 4 +--- tbl_select.php3 | 4 ++-- 14 files changed, 46 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f3cf65f9..8e5f0ea6a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,19 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-22 Loïc Chapeaux + * libraries/common.lib.php3, lines 198-200: open the documentation + link in the "documentation" window. + * libraries/charset_conversion.lib.php3; libraries/select_lang.lib.php3: + PHP3 fixes (don't use "require" inside a conditional statement). + * Documentation.html: XHTML fixes. + * db_details_structure.php3; tbl_properties.php3; + tbl_change.php3, line 336; tbl_properties_structure.php3; + tbl_select.php3, lines 122 & 127; tbl_query_box.php3: XHTML fixes. + * db_details.php3; db_details_links.php3; + tbl_properties_export.php3, lines 156-158: beautified generated + XHTML code. + 2002-07-21 Marc Delisle * Documentation.html, libraries/common.lib.php3: added a faq about mysql extension, and a link to it when the error occurs diff --git a/Documentation.html b/Documentation.html index dd3f61287..51df663ba 100755 --- a/Documentation.html +++ b/Documentation.html @@ -1603,8 +1603,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'

- I can't run the "display relations" feature because the script seems - not to know the font face I'm using! + I can't run the "display relations" feature because the script + seems not to know the font face I'm using!
The "FPDF" library we're using for this feature requires some special files to use font faces.
@@ -1615,19 +1615,19 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'

- I receive the error 'cannot load MySQL extension, please check - PHP Configuration'. + I receive the error "cannot load MySQL extension, please check + PHP Configuration".
To connect to a MySQL server, PHP needs a set of MySQL functions called "MySQL extension". - This extension may be part of the PHP server (compiled-in), otherwise - it needs to be loaded dynamically. phpMyAdmin tried to load the extension - but failed. + This extension may be part of the PHP server (compiled-in), otherwise it + needs to be loaded dynamically. phpMyAdmin tried to load the extension but + failed.

Usually, the problem is solved by installing a software package called "PHP-MySQL" or something similar. -

+

[Configuration]

@@ -2203,8 +2203,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' existing language, where do I start?
Always use the current cvs version of your language file. - For a new language, start from english-iso-8859-1.inc.php3. If you don't - know how to get the cvs version, please ask one of the developers. + For a new language, start from english-iso-8859-1.inc.php3. If you + don't know how to get the cvs version, please ask one of the developers.
Please note that we try not to use html entities like &eacute; in the translations, since we define the right character set in the file. diff --git a/db_details.php3 b/db_details.php3 index f3169b5b5..2bfcb96fa 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -45,7 +45,6 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get')) ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) // loic1: php 3.0.15 and lower bug -> always enabled : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize'))); - ?> diff --git a/db_details_links.php3 b/db_details_links.php3 index e355f27e5..6f1ff0a44 100644 --- a/db_details_links.php3 +++ b/db_details_links.php3 @@ -82,3 +82,4 @@ echo "\n";
+ diff --git a/db_details_structure.php3 b/db_details_structure.php3 index 913ca1f3b..45e738775 100644 --- a/db_details_structure.php3 +++ b/db_details_structure.php3 @@ -452,9 +452,11 @@ echo ' ' . ' ' . "\n"; 0 && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) { - echo '' . $strError . '
' . "\n"; + echo '
  • ' . "\n"; + echo ' ' . $strError . '
    ' . "\n"; $url_to_goto = ''; - echo sprintf($strRelationNotWorking, $url_to_goto, '') . "\n"; + echo ' ' . sprintf($strRelationNotWorking, $url_to_goto, '') . "\n"; + echo '
    • ' . "\n"; } // end if // is this OK to check for 'class' support? @@ -466,7 +468,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { - + ' - . '' - . $GLOBALS['strDocu'] . ''; + echo $strCantLoadMySQL . '
    ' . "\n" + . '' . $GLOBALS['strDocu'] . '' . "\n"; exit(); } } // end load mysql extension diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3 index 4e967a289..038bc0f7e 100644 --- a/libraries/select_lang.lib.php3 +++ b/libraries/select_lang.lib.php3 @@ -8,7 +8,7 @@ -if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')){ +if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) { define('PMA_SELECT_LANG_LIB_INCLUDED', 1); /** @@ -272,7 +272,7 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')){ // 5. Defines the associated filename and load the translation $lang_file = $lang_path . $available_languages[$lang][1] . '.inc.php3'; - require('./' . $lang_file); + include('./' . $lang_file); } // $__PMA_SELECT_LANG_LIB__ ?> diff --git a/tbl_change.php3 b/tbl_change.php3 index 4025895b3..1588ed3d5 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -333,7 +333,7 @@ for ($i = 0; $i < $fields_cnt; $i++) { echo ' ' . "\n"; if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) && $row_table_def['Null'] == 'YES') { - echo '
      + - +

      + +

      - + diff --git a/tbl_query_box.php3 b/tbl_query_box.php3 index 8cf49b018..ab21a7cfb 100755 --- a/tbl_query_box.php3 +++ b/tbl_query_box.php3 @@ -53,11 +53,9 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get')) : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize'))); ?> - - -
    • +
      onsubmit="return checkSqlQuery(this)" name="sqlform"> diff --git a/tbl_select.php3 b/tbl_select.php3 index b2f747458..ed430ea31 100755 --- a/tbl_select.php3 +++ b/tbl_select.php3 @@ -119,12 +119,12 @@ if (!isset($param) || $param[0] == '') { if (eregi('char|blob|text|set|enum', $fields_type[$i])) { while (list($k, $fc) = each($textfunctions)) { echo "\n" . ' ' - . ''; + . ''; } // end while } else { while (list($k, $fc) = each($numfunctions)) { echo "\n" . ' ' - . ''; + . ''; } // end while } // end if... else... echo "\n";