* coding standards\n* xhtml fixes
This commit is contained in:
@@ -10,6 +10,10 @@ $Source$
|
||||
Georgi Georgiev <chutz at chubaka.homeip.net>.
|
||||
* lang/danish.inc.php3: updated thanks to
|
||||
Niels Oesten <niels at oesten.dk>.
|
||||
* 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 <cr><lf> while ediding this file.
|
||||
|
||||
2002-01-24 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* merge patch 507338, thanks to Adam Ashley (fruitcak)
|
||||
|
@@ -550,34 +550,38 @@
|
||||
</dt>
|
||||
<dd>
|
||||
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.<br /><br />
|
||||
is a key in another table. phpMyAdmin currently uses this to make
|
||||
clickable the data values that point to another table.
|
||||
<br /><br />
|
||||
|
||||
Currently, the keys must be numeric, and you must be running PHP 4.<br /><br />
|
||||
Currently, the keys must be numeric, and you must be running PHP 4.
|
||||
<br /><br />
|
||||
|
||||
To use this functionality you have to:
|
||||
<ul>
|
||||
<li>
|
||||
create in the same database a table (for example 'relation') following this scheme:<br />
|
||||
create in the same database a table (for example 'relation')
|
||||
following this scheme:<br />
|
||||
<tt>
|
||||
CREATE TABLE `relation` (<br />
|
||||
`src_table` varchar(32) NOT NULL default '',<br />
|
||||
`src_column` varchar(32) NOT NULL default '',<br />
|
||||
`dest_table` varchar(32) NOT NULL default '',<br />
|
||||
`dest_column` varchar(32) NOT NULL default '',<br />
|
||||
PRIMARY KEY (`src_table`,`src_column`)<br />
|
||||
) TYPE=MyISAM COMMENT='Table Relation';<br />
|
||||
`src_column` varchar(32) NOT NULL default '',<br />
|
||||
`dest_table` varchar(32) NOT NULL default '',<br />
|
||||
`dest_column` varchar(32) NOT NULL default '',<br />
|
||||
PRIMARY KEY (`src_table`,`src_column`)<br />
|
||||
) TYPE=MyISAM COMMENT='Table Relation';<br />
|
||||
</tt>
|
||||
</li>
|
||||
<li>
|
||||
put the relation table name in
|
||||
put the relation table name in
|
||||
<tt>$cfgServers[n]['relation']</tt>
|
||||
</li>
|
||||
<li>
|
||||
then manually fill the relation table with information
|
||||
about the keys.
|
||||
then manually fill the relation table with information about
|
||||
the keys.
|
||||
</li>
|
||||
</ul><br />
|
||||
</dd>
|
||||
|
||||
<dt><b>$cfgServerDefault</b> integer</dt>
|
||||
<dd>
|
||||
@@ -977,17 +981,16 @@
|
||||
<br />
|
||||
We recommend the following setup for Apache servers running in safe mode,
|
||||
to enable uploads of files while being reasonably secure:
|
||||
<br />
|
||||
<ul>
|
||||
<li>create a separate directory for uploads:
|
||||
<tt>mkdir /tmp/php</tt></li>
|
||||
<li>give ownership to the Apache server's user.group:
|
||||
<tt>chown apache.apache /tmp/php</tt></li>
|
||||
<li>give proper permission: <tt>chmod 600 /tmp/php</tt></li>
|
||||
<li>put <tt>upload_tmp_dir = /tmp/php</tt> in php.ini</li>
|
||||
<li>restart Apache</li>
|
||||
</ul>
|
||||
</p>
|
||||
<ul>
|
||||
<li>create a separate directory for uploads:
|
||||
<tt>mkdir /tmp/php</tt></li>
|
||||
<li>give ownership to the Apache server's user.group:
|
||||
<tt>chown apache.apache /tmp/php</tt></li>
|
||||
<li>give proper permission: <tt>chmod 600 /tmp/php</tt></li>
|
||||
<li>put <tt>upload_tmp_dir = /tmp/php</tt> in php.ini</li>
|
||||
<li>restart Apache</li>
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
<b>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 <nijel at users.sourceforge.net> 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<63> from the "MySQL Form Generator for PHPMyAdmin"
|
||||
(http://sourceforge.net/projects/phpmysqlformgen/) who suggested the patch
|
||||
for multiple table printviews.
|
||||
- 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.
|
||||
- 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:
|
||||
|
@@ -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'] = '';
|
||||
|
10
sql.php3
10
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
|
||||
|
Reference in New Issue
Block a user