xhtml fixes
This commit is contained in:
Loïc Chapeaux
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
|
2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
||||||
|
* Documentation.html: xhtml fixes.
|
||||||
|
|
||||||
2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
||||||
* ## created 2.2.7 branch into the CVS tree ##
|
* ## created 2.2.7 branch into the CVS tree ##
|
||||||
* lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen.
|
* lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen.
|
||||||
|
|||||||
@@ -343,7 +343,8 @@
|
|||||||
<tt>$cfg['Servers'][$i]['user']</tt> and
|
<tt>$cfg['Servers'][$i]['user']</tt> and
|
||||||
<tt>$cfg['Servers'][$i]['password']</tt> fields.<br />
|
<tt>$cfg['Servers'][$i]['password']</tt> fields.<br />
|
||||||
But you don't need to setup a "controluser" here:
|
But you don't need to setup a "controluser" here:
|
||||||
using the <tt>$cfg['Servers'][$i]['only_db']</tt> might be enough.<br />
|
using the <tt>$cfg['Servers'][$i]['only_db']</tt> might be enough.
|
||||||
|
<br />
|
||||||
In the ISP FAQ section, there is an entry explaining how to protect
|
In the ISP FAQ section, there is an entry explaining how to protect
|
||||||
your configuration file.<br /></li>
|
your configuration file.<br /></li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -389,14 +390,14 @@
|
|||||||
use such a kind of code:
|
use such a kind of code:
|
||||||
<pre>
|
<pre>
|
||||||
$cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
$cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
||||||
. $HTTP_HOST . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
|
. $HTTP_HOST . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
|
||||||
. substr($PHP_SELF, 0, strrpos($PHP_SELF, '/')+1);
|
. substr($PHP_SELF, 0, strrpos($PHP_SELF, '/')+1);
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
$cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
$cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
||||||
. $SERVER_NAME . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
|
. $SERVER_NAME . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
|
||||||
. substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/')+1);
|
. substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/')+1);
|
||||||
</pre>
|
</pre>
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
@@ -404,11 +405,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
<dd>
|
<dd>
|
||||||
Since version 1.4.2, phpMyAdmin supports the administration of multiple
|
Since version 1.4.2, phpMyAdmin supports the administration of multiple
|
||||||
MySQL servers.
|
MySQL servers.
|
||||||
Therefore, a $cfg['Servers']-array has been added which contains the login
|
Therefore, a $cfg['Servers']-array has been added which contains
|
||||||
information for the different servers. The first
|
the login information for the different servers. The first
|
||||||
<tt>$cfg['Servers'][$i]['host']</tt> contains the hostname of the first
|
<tt>$cfg['Servers'][$i]['host']</tt> contains the hostname of the first
|
||||||
server, the second <tt>$cfg['Servers'][$i]['host']</tt> the hostname of the
|
server, the second <tt>$cfg['Servers'][$i]['host']</tt> the hostname of
|
||||||
second server, etc.
|
the second server, etc.
|
||||||
If you have only one server to administer, simply leave free the
|
If you have only one server to administer, simply leave free the
|
||||||
hostname of the other $cfg['Server']-entries.
|
hostname of the other $cfg['Server']-entries.
|
||||||
<br /><br />
|
<br /><br />
|
||||||
@@ -469,7 +470,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
<br /><br />
|
<br /><br />
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
<dt><b>$cfg['Servers'][$i]['auth_type']</b> string <tt>['http'|'cookie'|'config']</tt> </dt>
|
<dt><b>$cfg['Servers'][$i]['auth_type']</b> string <tt>['http'|'cookie'|'config']</tt></dt>
|
||||||
<dd>
|
<dd>
|
||||||
Whether config or cookie or http authentication should be used for this
|
Whether config or cookie or http authentication should be used for this
|
||||||
server.
|
server.
|
||||||
@@ -563,9 +564,9 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
<li>
|
<li>
|
||||||
then complete the two variables
|
then complete the two variables
|
||||||
<tt>$cfg['Servers'][$i]['bookmarkdb']</tt> and
|
<tt>$cfg['Servers'][$i]['bookmarkdb']</tt> and
|
||||||
<tt>$cfg['Servers'][$i]['bookmarktable']</tt> with the database and
|
<tt>$cfg['Servers'][$i]['bookmarktable']</tt> with the database
|
||||||
table names you've choosen so phpMyAdmin will be able to find
|
and table names you've choosen so phpMyAdmin will be able to
|
||||||
the bookmarks.
|
find the bookmarks.
|
||||||
</li>
|
</li>
|
||||||
</ul><br />
|
</ul><br />
|
||||||
|
|
||||||
@@ -632,11 +633,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
<dt><b>$cfg['ServerDefault']</b> integer</dt>
|
<dt><b>$cfg['ServerDefault']</b> integer</dt>
|
||||||
<dd>
|
<dd>
|
||||||
If you have more than one server configured, you can set
|
If you have more than one server configured, you can set
|
||||||
<tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to that
|
<tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to
|
||||||
server when phpMyAdmin is started, or set it to 0 to be given a list of
|
that server when phpMyAdmin is started, or set it to 0 to be given a
|
||||||
servers without logging in.<br />
|
list of servers without logging in.<br />
|
||||||
If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST
|
If you have only one server configured, <tt>$cfg['ServerDefault']</tt>
|
||||||
be set to that server.
|
MUST be set to that server.
|
||||||
<br /><br />
|
<br /><br />
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
@@ -1194,8 +1195,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
systems, too.<br />
|
systems, too.<br />
|
||||||
If you encounter this bug together with another OS and/or MySQL version or
|
If you encounter this bug together with another OS and/or MySQL version or
|
||||||
you know how to work around it, please post a message into
|
you know how to work around it, please post a message into
|
||||||
<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=540671&group_id=23067&atid=377408"
|
<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=540671&group_id=23067&atid=377408" target="_blank">
|
||||||
target="_blank">our bug tracker</a> at SourceForge.
|
our bug tracker</a> at SourceForge.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
@@ -1284,8 +1285,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
table, an error 404 (page not found) is displayed or, with http or
|
table, an error 404 (page not found) is displayed or, with http or
|
||||||
cookie authentication, I'm asked to login again. What's wrong?</b>
|
cookie authentication, I'm asked to login again. What's wrong?</b>
|
||||||
<br />
|
<br />
|
||||||
Check the value you set for the <tt>$cfg['PmaAbsoluteUri']</tt> directive in
|
Check the value you set for the <tt>$cfg['PmaAbsoluteUri']</tt> directive
|
||||||
the phpMyAdmin configuration file.
|
in the phpMyAdmin configuration file.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<a name="faqlimitations"></a>
|
<a name="faqlimitations"></a>
|
||||||
@@ -1546,7 +1547,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
CREATE TABLE countries (<br />
|
CREATE TABLE countries (<br />
|
||||||
country_code char(1) NOT NULL default '',<br />
|
country_code char(1) NOT NULL default '',<br />
|
||||||
description varchar(10) NOT NULL default '',<br />
|
description varchar(10) NOT NULL default '',<br />
|
||||||
PRIMARY KEY (country_code)<br />
|
PRIMARY KEY (country_code)<br />
|
||||||
) TYPE=MyISAM;<br />
|
) TYPE=MyISAM;<br />
|
||||||
<br />
|
<br />
|
||||||
INSERT INTO countries VALUES ('C', 'Canada');<br />
|
INSERT INTO countries VALUES ('C', 'Canada');<br />
|
||||||
@@ -1556,7 +1557,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
person_name varchar(32) NOT NULL default '',<br />
|
person_name varchar(32) NOT NULL default '',<br />
|
||||||
town_code varchar(5) default '0',<br />
|
town_code varchar(5) default '0',<br />
|
||||||
country_code char(1) NOT NULL default '',<br />
|
country_code char(1) NOT NULL default '',<br />
|
||||||
PRIMARY KEY (id)<br />
|
PRIMARY KEY (id)<br />
|
||||||
) TYPE=MyISAM;<br />
|
) TYPE=MyISAM;<br />
|
||||||
<br />
|
<br />
|
||||||
INSERT INTO persons VALUES (11, 'Marc', 'S', '');<br />
|
INSERT INTO persons VALUES (11, 'Marc', 'S', '');<br />
|
||||||
@@ -1567,7 +1568,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
master_field varchar(32) NOT NULL default '',<br />
|
master_field varchar(32) NOT NULL default '',<br />
|
||||||
foreign_table varchar(32) NOT NULL default '',<br />
|
foreign_table varchar(32) NOT NULL default '',<br />
|
||||||
foreign_field varchar(32) NOT NULL default '',<br />
|
foreign_field varchar(32) NOT NULL default '',<br />
|
||||||
PRIMARY KEY (master_table,master_field)<br />
|
PRIMARY KEY (master_table,master_field)<br />
|
||||||
) TYPE=MyISAM;<br />
|
) TYPE=MyISAM;<br />
|
||||||
<br />
|
<br />
|
||||||
INSERT INTO relation VALUES ('persons', 'town_code', 'towns', 'town_code');<br />
|
INSERT INTO relation VALUES ('persons', 'town_code', 'towns', 'town_code');<br />
|
||||||
@@ -1576,7 +1577,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
CREATE TABLE towns (<br />
|
CREATE TABLE towns (<br />
|
||||||
town_code varchar(5) NOT NULL default '0',<br />
|
town_code varchar(5) NOT NULL default '0',<br />
|
||||||
description varchar(30) NOT NULL default '',<br />
|
description varchar(30) NOT NULL default '',<br />
|
||||||
PRIMARY KEY (town_code)<br />
|
PRIMARY KEY (town_code)<br />
|
||||||
) TYPE=MyISAM;<br />
|
) TYPE=MyISAM;<br />
|
||||||
<br />
|
<br />
|
||||||
INSERT INTO towns VALUES ('S', 'Sherbrooke');<br />
|
INSERT INTO towns VALUES ('S', 'Sherbrooke');<br />
|
||||||
@@ -1584,20 +1585,21 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
|
|||||||
</tt>
|
</tt>
|
||||||
<br />
|
<br />
|
||||||
Then test like this:
|
Then test like this:
|
||||||
<ul>
|
|
||||||
<li>Click on your db name in the left frame</li>
|
|
||||||
<li>Choose "Query by example"</li>
|
|
||||||
<li>Use tables: persons, towns, countries</li>
|
|
||||||
<li>Click "Update query"</li>
|
|
||||||
<li>In the fields row, choose persons.person_name and click the
|
|
||||||
"Show" tickbox </li>
|
|
||||||
<li>Do the same for towns.description and countries.descriptions in
|
|
||||||
the other 2 columns</li>
|
|
||||||
<li>Click "Update query" and you will see in the query box
|
|
||||||
that the correct joints have been generated</li>
|
|
||||||
<li>Click "Submit query"</li>
|
|
||||||
</ul>
|
|
||||||
</p>
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>Click on your db name in the left frame</li>
|
||||||
|
<li>Choose "Query by example"</li>
|
||||||
|
<li>Use tables: persons, towns, countries</li>
|
||||||
|
<li>Click "Update query"</li>
|
||||||
|
<li>In the fields row, choose persons.person_name and click the
|
||||||
|
"Show" tickbox </li>
|
||||||
|
<li>Do the same for towns.description and countries.descriptions in the
|
||||||
|
other 2 columns</li>
|
||||||
|
<li>Click "Update query" and you will see in the query box that
|
||||||
|
the correct joints have been generated</li>
|
||||||
|
<li>Click "Submit query"</li>
|
||||||
|
</ul>
|
||||||
|
<br />
|
||||||
|
|
||||||
<a name="faqproject"></a>
|
<a name="faqproject"></a>
|
||||||
<h3>[phpMyAdmin project]</h3>
|
<h3>[phpMyAdmin project]</h3>
|
||||||
|
|||||||
Reference in New Issue
Block a user