diff --git a/ChangeLog b/ChangeLog
index aceb11aee..221ee839b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,17 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/grab_globals.lib.php: just to be sure:
+      - clean/empty $GLOBALS with $variables_whitelist
+      - unset some vars after use
+      - check all superglobals that could be imported by register_globals=on
+        for GLOBALS key (not only _REQUEST and _FILES )
+      - added $import_blacklist
+      - rewrote PMA_gpc_extract()
+        - use $import_blacklist
+        - documentation
+
 2005-11-16 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_links.php: missing menu tabs
     * Documentation.html, config.default.php, footer.inc.php,
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index 48bc9a2ed..dbf57e96c 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -11,48 +11,91 @@
  *
  * loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
  */
- 
+
+// just to be sure there was no import (registering) before here
+$variables_whitelist = array (
+    'GLOBALS',
+    '_SERVER',
+    '_GET',
+    '_POST',
+    '_REQUEST',
+    '_FILES',
+    '_ENV',
+    '_COOKIE',
+);
+
+foreach ( get_defined_vars() as $key => $value ) {
+    if ( ! in_array( $key, $variables_whitelist )  ) {
+        unset( $$key );
+    }
+}
+unset( $key, $value );
+
+
 // protect against older PHP versions' bug about GLOBALS overwrite
 // (no need to translate this one :) )
-if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-    die("GLOBALS overwrite attempt");
+// but what if script.php?GLOABLS[admin]=1&GLOBALS[_REQUEST]=1 ???
+if ( isset( $_REQUEST['GLOBALS'] ) || isset( $_FILES['GLOBALS'] )
+  || isset( $_SERVER['GLOBALS'] ) || isset( $_COOKIE['GLOBALS'] )
+  || isset( $_ENV['GLOBALS'] ) ) {
+    die( 'GLOBALS overwrite attempt' );
 }
 
 require_once './libraries/session.inc.php';
 
+/**
+ * @var array $import_blacklist variable names that should NEVER be imported
+ *                              from superglobals
+ */
+$import_blacklist = array(
+    '/^cfg$/',      // PMA configuration
+    '/^GLOBALS$/',  // the global scope
+    '/^str.*$/',    // PMA strings
+    '/^_.*$/',      // PMA does not use variables starting with _ from extern
+    '/^.*\s+.*$/',  // no whitespaces anywhere
+    '/^[0-9]+.*$/', // numeric variable names
+);
+
+/**
+ * copy values from one array to another, usally from a superglobal into $GLOBALS
+ *
+ * @uses    $GLOBALS['import_blacklist']
+ * @uses    preg_replace()
+ * @uses    array_keys()
+ * @uses    array_unique()
+ * @uses    get_magic_quotes_gpc()  to check wether stripslashes or not
+ * @uses    stripslashes()
+ * @param   array   $array      values from
+ * @param   array   $target     values to
+ * @param   boolean $sanitize   prevent importing key names in $import_blacklist
+ */
 function PMA_gpc_extract($array, &$target, $sanitize = TRUE) {
     if (!is_array($array)) {
         return FALSE;
     }
+
+    $valid_variables = preg_replace( $GLOBALS['import_blacklist'], '',
+        array_keys( $array ) );
+    $valid_variables = array_unique( $valid_variables );
+
     $is_magic_quotes = get_magic_quotes_gpc();
-    foreach ($array AS $key => $value) {
-        /**
-         * 2005-02-22, rabus:
-         *
-         * This is just an ugly hotfix to avoid changing internal config
-         * parameters.
-         *
-         * Currently, the following variable names are rejected when found in
-         * $_GET or $_POST: cfg, GLOBALS, str* and _*
-         */
-        if ($sanitize && is_string($key) && (
-            $key == 'cfg'
-            || $key == 'GLOBALS'
-            || substr($key, 0, 3) == 'str'
-            || $key{0} == '_')) {
+
+    foreach ( $valid_variables as $key ) {
+
+        if ( empty( $key ) ) {
             continue;
         }
 
-        if (is_array($value)) {
+        if ( is_array( $array[$key] ) ) {
             // there could be a variable coming from a cookie of
             // another application, with the same name as this array
             unset($target[$key]);
 
-            PMA_gpc_extract($value, $target[$key], FALSE);
-        } else if ($is_magic_quotes) {
-            $target[$key] = stripslashes($value);
+            PMA_gpc_extract($array[$key], $target[$key], FALSE);
+        } elseif ($is_magic_quotes) {
+            $target[$key] = stripslashes($array[$key]);
         } else {
-            $target[$key] = $value;
+            $target[$key] = $array[$key];
         }
     }
     return TRUE;
@@ -66,11 +109,12 @@ if ( isset( $_POST['usesubform'] ) ) {
     $subform_id = key( $_POST['usesubform'] );
     $subform    = $_POST['subform'][$subform_id];
     $_POST      = $subform;
-    if ( isset( $_POST['redirect'] ) 
+    if ( isset( $_POST['redirect'] )
       && $_POST['redirect'] != basename( $_SERVER['PHP_SELF'] ) ) {
         $__redirect = $_POST['redirect'];
         unset( $_POST['redirect'] );
     } // end if ( isset( $_POST['redirect'] ) )
+    unset( $subform_id, $subform );
 } // end if ( isset( $_POST['usesubform'] ) )
 // end check if a subform is submitted
 
@@ -88,11 +132,12 @@ if (!empty($_FILES)) {
         ${$name . '_name'} = $value['name'];
     }
 } // end if
+unset( $name, $value );
 
 if (!empty($_SERVER)) {
     $server_vars = array('PHP_SELF', 'HTTP_ACCEPT_LANGUAGE', 'HTTP_AUTHORIZATION');
     foreach ( $server_vars as $current ) {
-        // its not important HOW we detect html tags 
+        // its not important HOW we detect html tags
         // its more important to prevent XSS
         // so its not important if we result in an invalid string,
         // its even better than a XSS capable string
@@ -111,6 +156,8 @@ if (isset($goto) && strpos(' ' . $goto, '/') > 0 && substr($goto, 0, 2) != './')
     unset($goto);
 } // end if
 
+unset( $import_blacklist );
+
 if ( ! empty( $__redirect ) ) {
     // TODO: ensure that PMA_securePath() is defined and available
     // for this script. Meanwhile we duplicate what this function does: