diff --git a/ChangeLog b/ChangeLog index 7f569204d..0980956ea 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,10 @@ $Source$ Georgi Georgiev . * lang/danish.inc.php3: updated thanks to Niels Oesten . + * sql.php3: codding standards (tabs). + * Documentation.html: fixed xhtml1.0 errors. + * config.inc.php3, lines 55-56: lowered the line size to avoid automatic + add of while ediding this file. 2002-01-24 Marc Delisle * merge patch 507338, thanks to Adam Ashley (fruitcak) diff --git a/Documentation.html b/Documentation.html index b488f0b95..7b1d99347 100755 --- a/Documentation.html +++ b/Documentation.html @@ -550,34 +550,38 @@
Since release 2.2.4 you can describe in a relation table which field - is a key in another table. phpMyAdmin currently uses this to make - clickable the data values that point to another table.

+ is a key in another table. phpMyAdmin currently uses this to make + clickable the data values that point to another table. +

- Currently, the keys must be numeric, and you must be running PHP 4.

+ Currently, the keys must be numeric, and you must be running PHP 4. +

To use this functionality you have to:
  • - create in the same database a table (for example 'relation') following this scheme:
    + create in the same database a table (for example 'relation') + following this scheme:
         CREATE TABLE `relation` (
           `src_table` varchar(32) NOT NULL default '',
    -        `src_column` varchar(32) NOT NULL default '',
    -        `dest_table` varchar(32) NOT NULL default '',
    -        `dest_column` varchar(32) NOT NULL default '',
    -        PRIMARY KEY (`src_table`,`src_column`)
    -         ) TYPE=MyISAM COMMENT='Table Relation';
    +        `src_column` varchar(32) NOT NULL default '',
    +        `dest_table` varchar(32) NOT NULL default '',
    +        `dest_column` varchar(32) NOT NULL default '',
    +        PRIMARY KEY (`src_table`,`src_column`)
    +      ) TYPE=MyISAM COMMENT='Table Relation';
  • - put the relation table name in + put the relation table name in $cfgServers[n]['relation']
  • - then manually fill the relation table with information - about the keys. + then manually fill the relation table with information about + the keys.

+
$cfgServerDefault integer
@@ -977,17 +981,16 @@
We recommend the following setup for Apache servers running in safe mode, to enable uploads of files while being reasonably secure: -
-
    -
  • create a separate directory for uploads: - mkdir /tmp/php
    • -
  • give ownership to the Apache server's user.group: - chown apache.apache /tmp/php
    • -
  • give proper permission: chmod 600 /tmp/php
    • -
  • put upload_tmp_dir = /tmp/php in php.ini
    • -
  • restart Apache
    • -

+
    +
  • create a separate directory for uploads: + mkdir /tmp/php
    • +
  • give ownership to the Apache server's user.group: + chown apache.apache /tmp/php
    • +
  • give proper permission: chmod 600 /tmp/php
    • +
  • put upload_tmp_dir = /tmp/php in php.ini
    • +
  • restart Apache
    • +

I'm having troubles when uploading files. In general file uploads don't @@ -1532,15 +1535,15 @@ CREDITS, in chronological order Thanks to those guy who send us some major improvements to merge into the code since version 2.1.0: -- Michal Cihar who implemented the enhanced - index creation/display feature. +- Michal Cihar <nijel at users.sourceforge.net> who implemented the + enhanced index creation/display feature. - Christophe Gesché from the "MySQL Form Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/) who suggested the patch for multiple table printviews. -- Garvin Hicking who builds the patch for vertical - display of table rows. -- Piotr Roszatycki and Dan Wilson, for the - Cookie authentication mode. +- Garvin Hicking <hicking at faktor-e.de> who builds the patch for + vertical display of table rows. +- Piotr Roszatycki <d3xter at users.sourceforge.net> and Dan Wilson, for + the Cookie authentication mode. And also to the following people who have contributed minor changes, enhancements, bugfixes or support for a new language since version 2.1.0: diff --git a/config.inc.php3 b/config.inc.php3 index 23621ab30..5b51b0c88 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -52,7 +52,8 @@ $cfgServers[1]['only_db'] = ''; // If set to a db-name, only this $cfgServers[1]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname $cfgServers[1]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support $cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support -$cfgServers[1]['relation'] = ''; // table to describe the relation between links (see doc) - leave blank for no relation-links support +$cfgServers[1]['relation'] = ''; // table to describe the relation between links (see doc) + // - leave blank for no relation-links support $cfgServers[2]['host'] = ''; $cfgServers[2]['port'] = ''; diff --git a/sql.php3 b/sql.php3 index 510d5f5ac..fa9af56bf 100755 --- a/sql.php3 +++ b/sql.php3 @@ -198,8 +198,8 @@ else { // Do append a "LIMIT" clause? if (isset($pos) && (!$cfgShowAll || $session_max_rows != 'all') - && $is_select - && !($is_count || $is_export) + && $is_select + && !($is_count || $is_export) && eregi('[[:space:]]FROM[[:space:]]', $sql_query) && !eregi('[[:space:]]LIMIT[ 0-9,]+$', $sql_query)) { @@ -257,13 +257,13 @@ else { } else if ($is_select) { // reads only the from-part of the query... - $sp='[[:space:]]'; + $sp='[[:space:]]'; $array = split( - $sp . 'from' . $sp .'|' . $sp . 'FROM' .$sp . + $sp . 'from' . $sp .'|' . $sp . 'FROM' .$sp . '|' . $sp .'order' . $sp . '|' . $sp . 'ORDER' . $sp . '|' . $sp .'having' . $sp . '|' . $sp . 'HAVING' . $sp . '|' . $sp .'limit' . $sp . '|' . $sp . 'LIMIT' . $sp . - '|' . $sp .'group' . $sp . 'by'. $sp . + '|' . $sp .'group' . $sp . 'by'. $sp . '|' . $sp . 'GROUP' . $sp . 'BY' . $sp, $sql_query); if (!empty($array[1])) { // ... and makes a count(*) to count the entries