diff --git a/ChangeLog b/ChangeLog
index 7f30352ed..eaea4ed1f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-29  Loïc Chapeaux  <lolo@phpheaven.net>
+	* db_details.php3, line 558: an urlencode call was missing.
+	* db_details.php3; db_stats.php3; index.php3; left.php3; lib.inc.php3;
+	  main.php3; sql.php3; tbl_properties.php3; tbl_select.php3;
+	  tbl_replace.php3: the $server variable do not need to be urlencoded (it's
+	  an integer).
+
 2001-08-28  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lang/galician.inc.php3, select_lang.inc.php3: new Galician lang thanks to
 	  Xose Calvo <xosecalvo@terra.es>.
diff --git a/db_details.php3 b/db_details.php3
index c298222a4..abfdf206d 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -109,7 +109,7 @@ else if (MYSQL_INT_VERSION >= 32300 && isset($tbl_cache)) {
         $table     = $sts_data['Name'];
         // Sets parameters for links
         $url_query = 'lang=' . $lang
-                   . '&server=' . urlencode($server)
+                   . '&server=' . $server
                    . '&db=' . urlencode($db)
                    . '&table=' . urlencode($table)
                    . '&goto=db_details.php3';
@@ -253,7 +253,7 @@ else {
         $table     = mysql_tablename($tables, $i);
         // Sets parameters for links
         $url_query = 'lang=' . $lang
-                   . '&server=' . urlencode($server)
+                   . '&server=' . $server
                    . '&db=' . urlencode($db)
                    . '&table=' . urlencode($table)
                    . '&goto=db_details.php3';
@@ -305,7 +305,7 @@ echo "\n";
  * Database work
  */
 $url_query = 'lang=' . $lang
-           . '&server=' . urlencode($server)
+           . '&server=' . $server
            . '&db=' . urlencode($db)
            . '&goto=db_details.php3';
 if (isset($show_query) && $show_query == 'y') {
@@ -555,7 +555,7 @@ if ($cfgAllowUserDropDatabase || $is_superuser) {
     ?>
     <!-- Drop database -->
     <li>
-        <a href="sql.php3?server=<?php echo $server; ?>&lang=<?php echo $lang; ?>&db=<?php echo $db; ?>&sql_query=<?php echo urlencode('DROP DATABASE ' . backquote($db)); ?>&zero_rows=<?php echo urlencode($strDatabase . ' ' . htmlspecialchars(backquote($db)) . ' ' . $strHasBeenDropped); ?>&goto=main.php3&back=db_details.php3&reload=true">
+        <a href="sql.php3?server=<?php echo $server; ?>&lang=<?php echo $lang; ?>&db=<?php echo urlencode($db); ?>&sql_query=<?php echo urlencode('DROP DATABASE ' . backquote($db)); ?>&zero_rows=<?php echo urlencode($strDatabase . ' ' . htmlspecialchars(backquote($db)) . ' ' . $strHasBeenDropped); ?>&goto=main.php3&back=db_details.php3&reload=true">
             <?php echo $strDropDB . ' ' . htmlspecialchars($db); ?></a>
         <?php echo show_docu('manual_Reference.html#DROP_DATABASE') . "\n"; ?>
     </li>
diff --git a/db_stats.php3 b/db_stats.php3
index 595fc9535..7ed0c483e 100644
--- a/db_stats.php3
+++ b/db_stats.php3
@@ -126,7 +126,7 @@ if ($num_dbs > 1) {
         $num_tables       = @mysql_numrows($tables);
         $tot_tables       += $num_tables;
         $common_url_query = 'lang=' . $lang
-                          . '&server=' . urlencode($server)
+                          . '&server=' . $server
                           . '&db=' . urlencode($db);
 
         // Gets size of data and indexes
@@ -136,18 +136,17 @@ if ($num_dbs > 1) {
         $tot_idx     = 0;
         $tot_all     = 0;
         $local_query = 'SHOW TABLE STATUS FROM ' . $db_clean;
-        if ($result = @mysql_query($local_query)) {
-            if (mysql_num_rows($result)) {
-                while ($row = mysql_fetch_array($result)) {
-                    $tot_data += $row['Data_length'];
-                    $tot_idx  += $row['Index_length'];
-                } 
-                $tot_all            = $tot_data + $tot_idx;
-                $big_tot_all        += $tot_all;
-                $big_tot_idx        += $tot_idx;
-                $big_tot_data       += $tot_data;
-                $results_array[$db] = $tot_all;
-            }
+        $result      = @mysql_query($local_query);
+        if (mysql_num_rows($result)) {
+            while ($row = mysql_fetch_array($result)) {
+                $tot_data += $row['Data_length'];
+                $tot_idx  += $row['Index_length'];
+            } 
+           $tot_all            = $tot_data + $tot_idx;
+           $big_tot_all        += $tot_all;
+           $big_tot_idx        += $tot_idx;
+           $big_tot_data       += $tot_data;
+           $results_array[$db] = $tot_all;
         }
 
         list($tot_data_format,$unit_data) = format_byte_down($tot_data,3,1);
diff --git a/index.php3 b/index.php3
index f439ed1c2..3f3a2ff22 100755
--- a/index.php3
+++ b/index.php3
@@ -17,7 +17,9 @@ if (empty($HTTP_HOST)) {
     else if (@getenv('HTTP_HOST')) {
         $HTTP_HOST = getenv('HTTP_HOST');
     }
-    else $HTTP_HOST="";
+    else {
+        $HTTP_HOST = '';
+    }
 }
 
 
@@ -25,7 +27,7 @@ if (empty($HTTP_HOST)) {
  * Defines the frameset
  */
 $url_query = 'lang=' . $lang
-           . '&server=' . urlencode($server)
+           . '&server=' . $server
            . (empty($db) ? '' : '&db=' . urlencode($db));
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "DTD/xhtml1-frameset.dtd">
diff --git a/left.php3 b/left.php3
index 087dfd233..00d593731 100755
--- a/left.php3
+++ b/left.php3
@@ -185,7 +185,7 @@ if ($num_dbs > 1) {
         $tables              = @mysql_list_tables($db);
         $num_tables          = @mysql_numrows($tables);
         $common_url_query    = 'lang=' . $lang
-                             . '&server=' . urlencode($server)
+                             . '&server=' . $server
                              . '&db=' . urlencode($db);
         if ($num_tables) {
             $num_tables_disp = $num_tables;
@@ -260,7 +260,7 @@ else if ($num_dbs == 1) {
     $tables              = @mysql_list_tables($db);
     $num_tables          = @mysql_numrows($tables);
     $common_url_query    = 'lang=' . $lang
-                         . '&server=' . urlencode($server)
+                         . '&server=' . $server
                          . '&db=' . urlencode($db);
     if ($num_tables) {
         $num_tables_disp = $num_tables;
diff --git a/lib.inc.php3 b/lib.inc.php3
index 9bf8711ec..b8c1daf39 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -998,7 +998,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
                     $sorted_sql_query = $unsorted_sql_query . $sort_order;
                 }
                 $url_query = 'lang=' . $lang
-                           . '&server=' . urlencode($server)
+                           . '&server=' . $server
                            . '&db=' . urlencode($db)
                            . '&table=' . urlencode($table)
                            . '&pos=' . $pos
@@ -1081,7 +1081,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
             $uva_condition     = urlencode(ereg_replace(' ?AND$', '', $uva_condition));
             
             $url_query  = 'lang=' . $lang
-                        . '&server=' . urlencode($server)
+                        . '&server=' . $server
                         . '&db=' . urlencode($db)
                         . '&table=' . urlencode($table)
                         . '&pos=' . $pos;
diff --git a/main.php3 b/main.php3
index 568c82e16..f736e4e16 100755
--- a/main.php3
+++ b/main.php3
@@ -143,7 +143,7 @@ if ($server > 0
     <?php
     echo "\n";
     
-    $common_url_query = 'lang=' . $lang . '&server=' . urlencode($server);
+    $common_url_query = 'lang=' . $lang . '&server=' . $server;
 
     // 1. With authentication
     if ($cfgServer['adv_auth'])
diff --git a/sql.php3 b/sql.php3
index 32c73772a..23cdf0a34 100755
--- a/sql.php3
+++ b/sql.php3
@@ -54,7 +54,7 @@ if (isset($btnDrop) || isset($navig)) {
 if (isset($goto) && $goto == 'sql.php3') {
     $goto = 'sql.php3'
           . '?lang=' . $lang
-          . '&server=' . urlencode($server)
+          . '&server=' . $server
           . '&db=' . urlencode($db)
           . '&table=' . urlencode($table)
           . '&pos=' . $pos
@@ -269,7 +269,7 @@ else {
             // Insert a new row
             if ($display != 'bkmOnly') {
                 $url_query = 'lang=' . $lang
-                           . '&server=' . urlencode($server)
+                           . '&server=' . $server
                            . '&db=' . urlencode($db)
                            . '&table=' . urlencode($table)
                            . '&pos=' . $pos
@@ -303,7 +303,7 @@ var errorMsg0 = '<?php echo(str_replace('\'', '\\\'', $strFormEmpty)); ?>';
                 echo '    ' . $strBookmarkLabel . '&nbsp;:' . "\n";
                 $goto = 'sql.php3'
                       . '?lang=' . $lang
-                      . '&server=' . urlencode($server)
+                      . '&server=' . $server
                       . '&db=' . urlencode($db)
                       . '&table=' . urlencode($table)
                       . '&pos=' . $pos
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 1b670a00a..3b46e45cb 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -60,7 +60,7 @@ if (empty($table) || !@mysql_numrows($is_table)) {
  * Set parameters for links
  */
 $url_query = 'lang=' . $lang
-           . '&server=' . urlencode($server)
+           . '&server=' . $server
            . '&db=' . urlencode($db)
            . '&table=' . urlencode($table)
            . '&goto=tbl_properties.php3';
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index 71908dce2..37f4d4784 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -19,7 +19,7 @@ if (isset($sql_query)) {
 if ($goto == 'sql.php3') {
     $goto  = 'sql.php3?'
            . 'lang=' . $lang
-           . '&server=' . urlencode($server)
+           . '&server=' . $server
            . '&db=' . urlencode($db)
            . '&table=' . urlencode($table)
            . '&pos=' . $pos
diff --git a/tbl_select.php3 b/tbl_select.php3
index b1c14e7a7..5d8a43125 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -171,7 +171,7 @@ else {
     } // end if
 
     $url_query = 'lang=' . $lang
-               . '&server=' . urlencode($server)
+               . '&server=' . $server
                . '&db=' . urlencode($db)
                . '&table=' . urlencode($table)
                . '&sql_query=' . urlencode($sql_query)