diff --git a/ChangeLog b/ChangeLog
index 03fec6f96..241db2cf1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,14 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2002-02-09 Loďc Chapeaux
+ * most of the scripts: removed tabs and/or trailing spaces.
+
2002-02-09 Marc Delisle
* main.php3, libraries/auth/cookie.auth.lib.php3, Patch
495360 (cookie with domain), experimental, thanks to
Piotr Roszatycki (d3xter) and Christoph (certelt).
- * tbl_properties.inc.php3: clarifications
+ * tbl_properties.inc.php3: clarifications.
* tbl_create.php3, tbl_addfield.php3, tbl_properties.inc.php3:
radio buttons for indexes.
diff --git a/Documentation.html b/Documentation.html
index d4be439e1..1029a5c06 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -229,7 +229,7 @@
information.
Open the file
<www.your-host.com>/<your-install-dir>/index.php3
- in your browser. phpMyAdmin should now display a welcome screen
+ in your browser. phpMyAdmin should now display a welcome screen
and your databases, or a login dialog if using http or cookie
authentication mode.
@@ -244,15 +244,15 @@
Using authentication modes:
-
Http and cookie authentication modes are recommended in a multi-user
- environment where you want to give users access to their own database
+
Http and cookie authentication modes are recommended in a multi-user
+ environment where you want to give users access to their own database
and don't want them to play around with others.
Http and cookie authentication modes are secure: the MySQL password
does not need to be set in the phpMyAdmin configuration file. (except
for the "standard user" -see the Configuration section-).
- In cookie mode, we send the password in a temporary cookie, so most
+ In cookie mode, we send the password in a temporary cookie, so most
browsers should not store the password in their cookie file.
@@ -302,7 +302,7 @@
What the user may now do is controlled entirely by the MySQL user
management system.
- With http or cookie auth mode, you don't need to fill the user/password
+ With http or cookie auth mode, you don't need to fill the user/password
fields inside the $cfgServers array.
@@ -376,7 +376,7 @@
$cfgServers array
Since version 1.4.2, phpMyAdmin supports the administration of multiple
- MySQL servers.
+ MySQL servers.
Therefore, a $cfgServers-array has been added which contains the login
information for the different servers. $cfgServers[1]['host']
contains the hostname of the first server,
@@ -1017,30 +1017,30 @@
I'm having troubles when uploading files. In general file uploads don't
work on my system and uploaded files have a Content-Type: header
- in the first line.
+ in the first line.
It's not really phpMyAdmin related but RedHat 7.0. You have a RedHat 7.0
- and you updated your php rpm to php-4.0.4pl1-3.i386.rpm, didn't you?
-
+ and you updated your php rpm to php-4.0.4pl1-3.i386.rpm, didn't you?
+
So the problem is that this package has a serious bug that was corrected
ages ago in php (2001-01-28: see
php's bug tracking system
for more details). The problem is that the bugged package is still
available though it was corrected (see
redhat's bugzilla
- for more details).
-
+ for more details).
+
So please download
the fixed package (4.0.4pl1-9)
- and the problem should go away.
+ and the problem should go away.
- And that fixes the \r\n problem with file uploads!
-
+ And that fixes the \r\n problem with file uploads!
+
I'm having troubles when uploading files with phpMyAdmin running on a
secure server. My browser is Internet Explorer and I'm using the Apache
- server.
+ server.
As suggested by "Rob M" in the phpWizard forum, add this line to
your httpd.conf:
@@ -1125,7 +1125,7 @@
I get errors about not being able to include a file in /lang
Check php.ini, or ask your sysadmin to check it. The
@@ -1256,7 +1256,7 @@
your table properties and add the other fields.
-
+
With Xitami 2.5b4, phpMyAdmin won't process form fields.
This is not a phpMyAdmin problem but a Xitami known bug: you'll face it
@@ -1264,7 +1264,7 @@
Upgrade or downgrade your Xitami server.
-
+
I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2)
With Konqueror 2.1.1: plain dumps, zip and gzip dumps work ok, except that
@@ -1343,7 +1343,7 @@
Since version 2.2.3, you have a checkbox for each field that can be null.
Before 2.2.3, you had to enter "null", without the quotes, as the
- field's value.
+ field's value.
[phpMyAdmin project]
@@ -1403,7 +1403,7 @@
have already contributed something useful to phpMyAdmin.
Also, have a look at the Developers section.
-
+
@@ -1429,11 +1429,11 @@
make phpMyAdmin a useful tool.
-
- If you're planning to contribute source, please read the following
+
+ If you're planning to contribute source, please read the following
information:
-
+
All files include header.inc.php3 (layout),
libraries/common.lib.php3 (common functions) and
@@ -1441,7 +1441,7 @@
All configuration data belongs in config.inc.php3. Please keep
it free from other code.
-
+
Commonly used functions should be added to
libraries/lib.inc.php3 and more specific ones may be added
within a library stored into the libraries sub-directory.
@@ -1460,7 +1460,7 @@
goes to tbl_*.php3, db-related code to db_*.php3 and so
on.
-
+
Please don't use verbose strings in your code, instead add the string
(at least) to english.inc.php3 and print() it out.
@@ -1468,7 +1468,7 @@
If you want to be really helpful, write an entry for the ChangeLog.
-
+
IMPORTANT: With 1.4.1, development has switched to CVS. The following
method is preferred for new developers:
diff --git a/config.inc.php3 b/config.inc.php3
index ceaef6597..b064531dd 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -68,7 +68,7 @@ $cfgServers[2]['only_db'] = '';
$cfgServers[2]['verbose'] = '';
$cfgServers[2]['bookmarkdb'] = '';
$cfgServers[2]['bookmarktable'] = '';
-$cfgServers[2]['relation'] = '';
+$cfgServers[2]['relation'] = '';
$cfgServers[3]['host'] = '';
$cfgServers[3]['port'] = '';
@@ -83,7 +83,7 @@ $cfgServers[3]['only_db'] = '';
$cfgServers[3]['verbose'] = '';
$cfgServers[3]['bookmarkdb'] = '';
$cfgServers[3]['bookmarktable'] = '';
-$cfgServers[3]['relation'] = '';
+$cfgServers[3]['relation'] = '';
// If you have more than one server configured, you can set $cfgServerDefault
// to any one of them to autoconnect to that server when phpMyAdmin is started,
@@ -104,7 +104,7 @@ $cfgExecTimeLimit = 300; // maximum execution time in seconds (0 for
$cfgSkipLockedTables = FALSE; // mark used tables, make possible to show
// locked tables (since MySQL 3.23.30)
$cfgShowSQL = TRUE; // show SQL queries as run
-$cfgAllowUserDropDatabase = FALSE; // show a 'Drop database' link to normal users
+$cfgAllowUserDropDatabase = FALSE; // show a 'Drop database' link to normal users
$cfgConfirm = TRUE; // confirm 'DROP TABLE' & 'DROP DATABASE'
$cfgLoginCookieRecall = TRUE; // recall previous login in cookie auth. mode or not
@@ -114,7 +114,7 @@ $cfgShowStats = TRUE; // allow to display statistics and space usa
$cfgShowTooltip = TRUE; // display table comment as tooltip in left frame
// Left frame setup
-$cfgLeftFrameLight = TRUE; // use a select-based menu and display only the
+$cfgLeftFrameLight = TRUE; // use a select-based menu and display only the
// current tables in the left frame. (experimental)
// In the main frame, at startup...
diff --git a/db_details.php3 b/db_details.php3
index 95cde4738..564d5f61f 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -338,7 +338,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) {
-
diff --git a/read_dump.php3 b/read_dump.php3
index 30a9e79a7..9aaf71f98 100644
--- a/read_dump.php3
+++ b/read_dump.php3
@@ -188,7 +188,7 @@ $err_url = $goto
/**
- * Set up default values for some variables and
+ * Set up default values for some variables
*/
$view_bookmark = 0;
$sql_bookmark = isset($sql_bookmark) ? $sql_bookmark : '';
diff --git a/sql.php3 b/sql.php3
index 0e224aa67..17fb13b4d 100755
--- a/sql.php3
+++ b/sql.php3
@@ -24,7 +24,7 @@ if (!isset($err_url)) {
}
-/**
+/**
* Check rights in case of DROP DATABASE
*
* This test may be bypassed if $is_js_confirmed = 1 (already checked with js)
diff --git a/tbl_addfield.php3 b/tbl_addfield.php3
index 6ee2cdf7d..b1235b089 100755
--- a/tbl_addfield.php3
+++ b/tbl_addfield.php3
@@ -28,19 +28,19 @@ $err_url = 'tbl_properties.php3'
if (isset($submit)) {
$query = '';
- // transform the radio button field_key into 3 arrays
+ // Transforms the radio button field_key into 3 arrays
$field_cnt = count($field_name);
for ($i = 0; $i < $field_cnt; ++$i) {
- if (${'field_key_'.$i} == 'primary_'.$i) {
- $field_primary[]=$i;
+ if (${'field_key_' . $i} == 'primary_' . $i) {
+ $field_primary[] = $i;
}
- if (${'field_key_'.$i} == 'index_'.$i) {
- $field_index[]=$i;
+ if (${'field_key_' . $i} == 'index_' . $i) {
+ $field_index[] = $i;
}
- if (${'field_key_'.$i} == 'unique_'.$i) {
- $field_unique[]=$i;
+ if (${'field_key_' . $i} == 'unique_' . $i) {
+ $field_unique[] = $i;
}
- }
+ } // end for
// Builds the field creation statement and alters the table
for ($i = 0; $i < $field_cnt; ++$i) {
if (get_magic_quotes_gpc()) {
@@ -132,7 +132,7 @@ if (isset($submit)) {
$sql_query_cpy .= "\n" . $sql_query . ';';
}
} // end if
-
+
// Builds the indexes statements and updates the table
$index = '';
if (isset($field_index)) {
@@ -148,7 +148,7 @@ if (isset($submit)) {
$sql_query_cpy .= "\n" . $sql_query . ';';
}
} // end if
-
+
// Builds the uniques statements and updates the table
$unique = '';
if (isset($field_unique)) {
@@ -164,7 +164,7 @@ if (isset($submit)) {
$sql_query_cpy .= "\n" . $sql_query . ';';
}
} // end if
-
+
// Builds the fulltext statements and updates the table
$fulltext = '';
diff --git a/tbl_change.php3 b/tbl_change.php3
index 8469e7040..b2aa1c5c4 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -247,41 +247,41 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// stored or retrieved" so it does not mean that the contents is
// binary
if ($cfgShowFunctionFields) {
- if ((($cfgProtectBinary && $is_blob)
- || ($cfgProtectBinary == 'all' && $is_binary))
- && !empty($data)) {
- echo '