diff --git a/db_readdump.php3 b/db_readdump.php3
index 61fd0d7ad..9e8e1cfc6 100755
--- a/db_readdump.php3
+++ b/db_readdump.php3
@@ -55,7 +55,7 @@ if ($sql_file != 'none') {
         }
     }
 }
-else if (get_magic_quotes_gpc() == 1) {
+else if (empty($id_bookmark) && get_magic_quotes_gpc() == 1) {
 	$sql_query = stripslashes($sql_query);
 }
 $sql_query = trim($sql_query);
@@ -97,9 +97,9 @@ if ($sql_query != '') {
             $a_sql_query = trim($pieces[$i]);
             if (!empty($a_sql_query) && $a_sql_query[0] != '#') {
                 $result = mysql_query($a_sql_query);
-                if ($result==false) { // readdump failed
-                	$my_die=$a_sql_query;
-                	break;
+                if ($result == FALSE) { // readdump failed
+                    $my_die = $a_sql_query;
+                    break;
                 }
             }
             if (!isset($reload) && eregi('^(DROP|CREATE) +(TABLE|DATABASE) (.+)', $a_sql_query)) {
@@ -116,7 +116,9 @@ if ($sql_query != '') {
 // Copy the original query back for display purposes
 $sql_query = $sql_query_cpy;
 include('./header.inc.php3');
-if (isset($my_die)) mysql_die('', $my_die);
+if (isset($my_die)) {
+    mysql_die('', $my_die);
+}
 $message   = $strSuccess;
 require('./db_details.php3');
 ?>
diff --git a/lib.inc.php3 b/lib.inc.php3
index 14bd8609c..26c92b98f 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -2,11 +2,11 @@
 /* $Id$ */
 
 
-
 if (!defined('__LIB_INC__')){
     define('__LIB_INC__', 1);
 
-    /* Order of sections for lib.inc.php3 
+    /**
+     * Order of sections for lib.inc.php3:
      *
      * in PHP3, functions and constants must be physically defined
      * before they are referenced
@@ -14,33 +14,37 @@ if (!defined('__LIB_INC__')){
      * some functions need the constants of defines.inc.php3
      *
      * the include of defines.inc.php3 must be after the connection to db
-     * 
+     *
      * the auth() function must be before the connection to db
      *
+     * the mysql_die() function must be before the connection to db but after
+     * mysql extension has been loaded
+     *
      * ... so the required order is:
      *
      * - definition of auth()
      * - parsing of the configuration file
      * - load of mysql extension (if necessary)
+     * - definition of mysql_die()
      * - db connection
      * - defines.inc.php3
      * - other functions, respecting dependencies 
      */
 
-    /* avoid undefined variables in PHP3
-     *
-     */
 
-     if (!isset($use_backquotes)) {
-	$use_backquotes=0;
-     }
-     if (!isset($pos)) {
-	$pos=0;
-     }
-     if (!isset($cfgProtectBlob)) {
-	$cfgProtectBlob=FALSE;
-     }
-    /* ---------------------- Advanced authentification -------------------- */
+    /**
+     * Avoids undefined variables in PHP3
+     */
+    if (!isset($use_backquotes)) {
+        $use_backquotes = 0;
+    }
+    if (!isset($pos)) {
+        $pos            = 0;
+    }
+    if (!isset($cfgProtectBlob)) {
+        $cfgProtectBlob = FALSE;
+    }
+
 
     /**
      * Advanced authentication work
@@ -72,6 +76,7 @@ if (!defined('__LIB_INC__')){
         exit();
     } // end of the 'auth()' function
 
+
     /**
      * Parses the configuration file
      */
@@ -111,6 +116,40 @@ if (!defined('__LIB_INC__')){
     } // end load mysql extension
 
 
+    /**
+     * Displays a MySQL error message in the right frame.
+     *
+     * @param   string   the error mesage
+     * @param   string   the sql query that failed
+     */
+    function mysql_die($error_message = '', $the_query = '')
+    {
+        global $sql_query;
+
+        if (empty($error_message)) {
+            $error_message = mysql_error();
+        }
+        if (empty($the_query)) {
+            $the_query     = $GLOBALS['sql_query'];
+        }
+
+        echo '<b>'. $GLOBALS['strError'] . '</b>' . "\n";
+        echo '<p>' . "\n";
+        if (!empty($the_query)) {
+            $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&server=' . urlencode($GLOBALS['server']) . '&db=' . urlencode($GLOBALS['db']) . '&sql_query=' . urlencode($the_query) . '&show_query=y">' . $GLOBALS['strEdit'] . '</a>';
+            echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;[' . $edit_link . ']<pre>' . htmlspecialchars($the_query) . '</pre>' . "\n";
+        }
+        echo '</p>' . "\n";
+        echo '<p>' . "\n";
+        echo '    ' . $GLOBALS['strMySQLSaid'] . '&nbsp;' . htmlspecialchars($error_message) . "\n";
+        echo '</p>' . "\n";
+        echo '<a href="javascript:history.go(-1)">' . $GLOBALS['strBack'] . '</a>';
+
+        include('./footer.inc.php3');
+        exit();
+    } // end of the 'mysql_die()' function
+
+
     /**
      * Use mysql_connect() or mysql_pconnect()?
      */
@@ -157,7 +196,7 @@ if (!defined('__LIB_INC__')){
             $dblist[] = $cfgServer['only_db'];
         }
 
-        // Advanced authentification is required
+        // Advanced authentication is required
         if ($cfgServer['adv_auth']) {
             // Grabs the $PHP_AUTH_USER variable whatever are the values of the
             // 'register_globals' and the 'variables_order' directives
@@ -197,7 +236,7 @@ if (!defined('__LIB_INC__')){
                 $old_usr = $HTTP_GET_VARS['old_usr'];
             }
 
-            // First load -> checks if authentification is required
+            // First load -> checks if authentication is required
             if (!isset($old_usr)) {
                 if (empty($PHP_AUTH_USER)) {
                     $do_auth = TRUE;
@@ -215,7 +254,7 @@ if (!defined('__LIB_INC__')){
                 }
             }
 
-            // Calls the authentification window or validates user's login
+            // Calls the authentication window or validates user's login
             if ($do_auth) {
                 auth();
             } else {
@@ -305,7 +344,7 @@ if (!defined('__LIB_INC__')){
             // Validation achived -> store user's login/password
             $cfgServer['user']     = $PHP_AUTH_USER;
             $cfgServer['password'] = $PHP_AUTH_PW;
-        } // end Advanced authentification
+        } // end Advanced authentication
 
         // Do connect to the user's database
         if (empty($cfgServer['port'])) {
@@ -322,6 +361,7 @@ if (!defined('__LIB_INC__')){
         echo $strHostEmpty;
     }
 
+
     /**
      * Gets constants that defines the PHP, MySQL... releases.
      * This include must be located physically before any code that
@@ -438,40 +478,6 @@ if (!defined('__LIB_INC__')){
     } // end of the 'count_records()' function
 
 
-    /**
-     * Displays a MySQL error message in the right frame.
-     *
-     * @param   string   the error mesage
-     * @param   string   the sql query that failed
-     */
-    function mysql_die($error_message = '', $the_query = '')
-    {
-        global $sql_query;
-
-        if (empty($error_message)) {
-            $error_message = mysql_error();
-        }
-        if (empty($the_query)) {
-            $the_query     = $GLOBALS['sql_query'];
-        }
-
-        echo '<b>'. $GLOBALS['strError'] . '</b>' . "\n";
-        echo '<p>' . "\n";
-        if (!empty($the_query)) {
-            $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&server=' . urlencode($GLOBALS['server']) . '&db=' . urlencode($GLOBALS['db']) . '&sql_query=' . urlencode($the_query) . '&show_query=y">' . $GLOBALS['strEdit'] . '</a>';
-            echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;[' . $edit_link . ']<pre>' . htmlspecialchars($the_query) . '</pre>' . "\n";
-        }
-        echo '</p>' . "\n";
-        echo '<p>' . "\n";
-        echo '    ' . $GLOBALS['strMySQLSaid'] . '&nbsp;' . htmlspecialchars($error_message) . "\n";
-        echo '</p>' . "\n";
-        echo '<a href="javascript:history.go(-1)">' . $GLOBALS['strBack'] . '</a>';
-
-        include('./footer.inc.php3');
-        exit();
-    } // end of the 'mysql_die()' function
-
-
     /**
      * Displays a message at the top of the "main" (right) frame
      *
@@ -1454,7 +1460,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
      * Last revision: 2nd August 2001 - Benjamin Gandon
      *
      * @param   string   the sql commands
-     * @param   char     the end of command line delimiter 
+     * @param   string   the end of command line delimiter 
      *
      * @return  array    the splitted sql commands
      */
@@ -1472,7 +1478,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
             $char = $sql[$i];
 
             // if delimiter found, add the parsed part to the returned array
-            if (($char == $delimiter) && !$in_string) {
+            if ($char == $delimiter && !$in_string) {
                 $ret[]     = substr($sql, 0, $i);
                 $sql       = substr($sql, $i + 1);
                 $i         = 0;
@@ -1480,7 +1486,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
             }
 
             if ($in_string) {
-                // we are in a string, first check for escaped backslashes
+                // We are in a string, first check for escaped backslashes
                 if ($char == '\\') {
                     if ($last_char != '\\') {
                         $escaped_backslash = FALSE;
@@ -1553,28 +1559,27 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
     /**
      * Defines the bookmark parameters for the current user
      *
+     * @return  array    the bookmark parameters for the current user
+     *
      * @global  array    the list of settings for the current server
      * @global  integer  the id of the current server
-     *
-     * @return  array    the bookmark parameters for the current user
      */
     function get_bookmarks_param()
     {
-     	global $cfgServer;
+        global $cfgServer;
         global $server;
-    	
-        $cfgBookmark=false;
-        $cfgBookmark="";
-    
-    	// No server selected -> no bookmark table
 
+        $cfgBookmark = FALSE;
+        $cfgBookmark = '';
+
+        // No server selected -> no bookmark table
         if ($server == 0) {
             return '';
-    	}
-        
-    	$cfgBookmark['user']=$cfgServer['user'];
-        $cfgBookmark['db']=$cfgServer['bookmarkdb'];
-    	$cfgBookmark['table']=$cfgServer['bookmarktable'];
+        }
+
+        $cfgBookmark['user']  = $cfgServer['user'];
+        $cfgBookmark['db']    = $cfgServer['bookmarkdb'];
+        $cfgBookmark['table'] = $cfgServer['bookmarktable'];
 
         return $cfgBookmark;
     } // end of the 'get_bookmarks_param()' function
@@ -1585,38 +1590,32 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
      *
      * @param   string   the current database name
      * @param   array    the bookmark parameters for the current user
-     * @global	link     a MySQL link identifier
      *
-     * @return  array    the bookmarks list
+     * @return  mixed    the bookmarks list if defined, false else
      */
     function list_bookmarks($db, $cfgBookmark)
     {
-    	global $dbh;
-    	
-        $query ='SELECT label, id FROM '.backquote($cfgBookmark['db']).'.'.backquote($cfgBookmark['table'])
-			.' WHERE dbase=\'' . str_replace('\'', '\\\'', $db) . '\''
-			.' AND user = \'' . str_replace('\'', '\\\'', $cfgBookmark['user']) . '\'';
+        $query  = 'SELECT label, id FROM '. backquote($cfgBookmark['db']) . '.' . backquote($cfgBookmark['table'])
+                . ' WHERE dbase = \'' . sql_addslashes($db) . '\''
+                . ' AND user = \'' . sql_addslashes($cfgBookmark['user']) . '\'';
+        if (isset($GLOBALS['dbh'])) {
+            $result = mysql_query($query, $GLOBALS['dbh']);
+        } else {
+            $result = mysql_query($query);
+        }
 
-        if(isset($dbh))
-            $result=mysql_query($query,$dbh);
-        else
-            $result=mysql_query($query);
-        
         // There is some bookmarks -> store them
-        if($result>0 && mysql_num_rows($result)>0)
-        {
+        if ($result > 0 && mysql_num_rows($result) > 0) {
             $flag = 1;
-            while($row = mysql_fetch_row($result))
-            {
-                $bookmark_list["$flag - ".$row[0]] = $row[1];
+            while ($row = mysql_fetch_row($result)) {
+                $bookmark_list[$flag . ' - ' . $row[0]] = $row[1];
                 $flag++;
-            }
-            
-            return	$bookmark_list;
+            } // end while
+            return $bookmark_list;
         }
         // No bookmarks for the current database
         else {
-        	return false;
+            return FALSE;
         }
     } // end of the 'list_bookmarks()' function
 
@@ -1627,58 +1626,43 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
      * @param   string   the current database name
      * @param   array    the bookmark parameters for the current user
      * @param   integer  the id of the bookmark to get
-     * @global	link     a MySQL link identifier
      *
      * @return  string   the sql query
      */
     function query_bookmarks($db, $cfgBookmark, $id)
     {
-        global $dbh;
-        
-        $query ='SELECT query FROM '.backquote($cfgBookmark['db']).'.'.backquote($cfgBookmark['table'])
-			.' WHERE dbase=\'' . str_replace('\'', '\\\'', $db) . '\''
-			.' AND user = \'' . str_replace('\'', '\\\'', $cfgBookmark['user']) . '\''
-			.' AND id = '.$id;
-		   
-        if(isset($dbh))
-	    	$result=mysql_query($query,$dbh);
-		else
-	        $result=mysql_query($query);
-		
-		$bookmark_query=mysql_result($result,0,"query");
-		$bookmark_query=urldecode($bookmark_query);
-		$bookmark_query=str_replace('\'', '\\\'', $bookmark_query);
+        $query          = 'SELECT query FROM ' . backquote($cfgBookmark['db']) . '.' . backquote($cfgBookmark['table'])
+                        . ' WHERE dbase = \'' . sql_addslashes($db) . '\''
+                        . ' AND user = \'' . sql_addslashes($cfgBookmark['user']) . '\''
+                        . ' AND id = ' . $id;
+        if (isset($GLOBALS['dbh'])) {
+            $result = mysql_query($query, $GLOBALS['dbh']);
+        } else {
+            $result = mysql_query($query);
+        }
+        $bookmark_query = mysql_result($result, 0, 'query');
 
-    	return $bookmark_query;
+        return $bookmark_query;
     } // end of the 'query_bookmarks()' function
-    
+
+
     /**
-     * Add a bookmark
+     * Adds a bookmark
      *
-     * @param   string   the current database name
+     * @param   array    the properties of the bookmark to add
      * @param   array    the bookmark parameters for the current user
-     * @param   integer  the id of the bookmark to get
-     * @global	link     a MySQL link identifier
-     *
-     * @return  string   the sql query
      */
     function add_bookmarks($fields, $cfgBookmark)
     {
-     	global $dbh;
-   
-     	$query ='INSERT INTO '.backquote($cfgBookmark['db']).'.'.backquote($cfgBookmark['table'])
-			.' (id, dbase, user, query, label) VALUES ('
-			.' \'\','
-			.' \''.str_replace('\'', '\\\'', $fields['dbase']).'\','
-			.' \''.str_replace('\'', '\\\'', $fields['user']).'\','
-			.' \''.str_replace('\'', '\\\'', $fields['query']).'\','
-			.' \''.str_replace('\'', '\\\'', $fields['label']).'\' )';
+        $query = 'INSERT INTO ' . backquote($cfgBookmark['db']) . '.' . backquote($cfgBookmark['table'])
+               . ' (id, dbase, user, query, label) VALUES (\'\', \'' . sql_addslashes($fields['dbase']) . '\', \'' . sql_addslashes($fields['user']) . '\', \'' . sql_addslashes(urldecode($fields['query'])) . '\', \'' . sql_addslashes($fields['label']) . '\')';
+        if (isset($GLOBALS['dbh'])) {
+            $result = mysql_query($query, $GLOBALS['dbh']);
+        } else {
+            $result = mysql_query($query);
+        }
+    } // end of the 'add_bookmarks()' function
 
-       	if(isset($dbh))
-    		$result=mysql_query($query,$dbh);
-    	else
-    		$result=mysql_query($query);
-    } // end of the 'add_bookmarks()' function    
 
     /**
      * Deletes a bookmark
@@ -1686,29 +1670,23 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
      * @param   string   the current database name
      * @param   array    the bookmark parameters for the current user
      * @param   integer  the id of the bookmark to get
-     * @global	link     a MySQL link identifier
-     *
-     * @return  string   the sql query
      */
     function delete_bookmarks($db, $cfgBookmark, $id)
     {
-    	global $dbh;
-    	
-    	$query ='DELETE FROM '.backquote($cfgBookmark['db']).'.'.backquote($cfgBookmark['table'])
-    	       .' WHERE user = \'' . str_replace('\'', '\\\'', $cfgBookmark['user']) . '\''
-			   .' AND id = '.$id;
-                
-        if(isset($dbh))
-        	$result=mysql_query($query,$dbh);
-        else
-        	$result=mysql_query($query);
+        $query  = 'DELETE FROM ' . backquote($cfgBookmark['db']) . '.' . backquote($cfgBookmark['table'])
+                . ' WHERE user = \'' . sql_addslashes($cfgBookmark['user']) . '\''
+                . ' AND id = ' . $id;
+        if (isset($GLOBALS['dbh'])) {
+            $result = mysql_query($query, $GLOBALS['dbh']);
+        } else {
+            $result = mysql_query($query);
+        }
     } // end of the 'delete_bookmarks()' function
 
 
-
-
     /* -------------------- End of functions definitions ------------------- */
 
+
     /**
      * Bookmark Support
      */
diff --git a/sql.php3 b/sql.php3
index ebd2fb0ef..60b1570ef 100755
--- a/sql.php3
+++ b/sql.php3
@@ -8,14 +8,19 @@
 require('./grab_globals.inc.php3');
 require('./lib.inc.php3');
 
+
 /**
- * Bookmark Add
+ * Bookmark add
  */
-if(isset($bookmarkthis)) {
-	add_bookmarks($fields, $cfgBookmark);
-	Header("Location: $goto");
+if (isset($store_bkm)) {
+    if (get_magic_quotes_gpc()) {
+        $fields['label'] = stripslashes($fields['label']);
+    }
+    add_bookmarks($fields, $cfgBookmark);
+    header('Location: ' . $goto);
 }
 
+
 /**
  * Gets the true sql query
  */
@@ -216,7 +221,6 @@ else {
                 }
                 echo '    <br /><br />' . "\n";
                 echo '    ' . $strBookmarkLabel . '&nbsp;:' . "\n";
-               
                 $goto = 'sql.php3'
                       . '?lang=' . $lang
                       . '&server=' . urlencode($server)
@@ -227,11 +231,10 @@ else {
                       . '&id_bookmark=1';
                 ?>
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
-    <input type="hidden" name="bookmarkthis" value="true" />
-    <input type="hidden" name="fields[dbase]" value="<?php echo $db;?>" />
-    <input type="hidden" name="fields[user]" value="<?php echo $cfgBookmark['user'];?>" />
-    <input type="hidden" name="fields[query]" value="<?php echo isset($sql_query) ? urlencode($sql_query)  : "";?>" />
-    <input type="text"   name="fields[label]" value="">
+    <input type="hidden" name="fields[dbase]" value="<?php echo $db; ?>" />
+    <input type="hidden" name="fields[user]" value="<?php echo $cfgBookmark['user']; ?>" />
+    <input type="hidden" name="fields[query]" value="<?php echo isset($sql_query) ? urlencode($full_sql_query) : ''; ?>" />
+    <input type="text" name="fields[label]" value="" />
     <input type="submit" name="store_bkm" value="<?php echo $strBookmarkThis; ?>" />
 </form>
                 <?php