=== modified file 'uc_file/uc_file.install'
--- uc_file/uc_file.install	2009-01-07 18:43:50 +0000
+++ uc_file/uc_file.install	2009-01-22 10:55:23 +0000
@@ -23,7 +23,7 @@
         `fid` mediumint(9) NOT NULL,
         `uid` mediumint(9) NOT NULL,
         `pfid` mediumint(9) default NULL,
-        `key` varchar(32) NOT NULL,
+        `file_key` varchar(32) NOT NULL,
         `granted` int(11) NOT NULL,
         `accessed` smallint(5) unsigned NOT NULL default 0,
         `addresses` text,
@@ -116,3 +116,19 @@
   return $ret;
 }
 
+function uc_file_update_4() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("ALTER TABLE {uc_file_users} CHANGE `key` `file_key` VARCHAR(32) NOT NULL");
+      break;
+    case 'pgsql':
+      // ?
+      break;
+  }
+  
+  return $ret;
+}
+

=== modified file 'uc_file/uc_file.module'
--- uc_file/uc_file.module	2009-01-07 18:43:50 +0000
+++ uc_file/uc_file.module	2009-01-22 10:50:14 +0000
@@ -112,7 +112,7 @@
         $available_downloads = array();
         $available_files = array();
         while ($file_download = db_fetch_object($file_downloads)) {
-          $available_downloads[$file_download->key] = $file_download->filename;
+          $available_downloads[$file_download->file_key] = $file_download->filename;
         }
         while ($file = db_fetch_object($files)) {
           if (substr($file->filename, -1) != '/' && substr($file->filename, -1) != '\\') {
@@ -319,7 +319,7 @@
   $output = '';
   foreach ($file_downloads as $file_download) {
     $filename = basename(db_result(db_query("SELECT filename FROM {uc_files} WHERE fid = %d", $file_download->fid)));
-    $download_url = url('download/'. $file_download->fid .'/'. $file_download->key, NULL, NULL, TRUE);
+    $download_url = url('download/'. $file_download->fid .'/'. $file_download->file_key, NULL, NULL, TRUE);
     $output .= '<a href="'. $download_url .'">'. $download_url ."</a>\n";
   }
   return $output;
@@ -894,7 +894,7 @@
     array('data' => t('Downloads'), 'field' => 'u.accessed'),
   );
 
-  $sql = "SELECT granted, filename, accessed, description, `key`, f.fid FROM {uc_file_users} as u LEFT JOIN {uc_files} as f ON u.fid = f.fid LEFT JOIN {uc_file_products} as p ON p.pfid = u.pfid WHERE uid = %d";
+  $sql = "SELECT granted, filename, accessed, description, `file_key`, f.fid FROM {uc_file_users} as u LEFT JOIN {uc_files} as f ON u.fid = f.fid LEFT JOIN {uc_file_products} as p ON p.pfid = u.pfid WHERE uid = %d";
   $count_query = "SELECT COUNT(*) FROM {uc_file_users} WHERE uid = %d";
   $download_limit = variable_get('uc_file_download_limit_number', NULL);
   $file_ids = array();
@@ -909,14 +909,14 @@
     $onclick = array('onclick' => 'uc_file_update_download('. $row .', '. $file->accessed .', '. ((empty($download_limit)) ? -1 : $download_limit) .');', 'id' => 'link-'. $row);
 
     if (!$expiration) {
-      $file_link = l(basename($file->filename), 'download/'. $file->fid .'/'. $file->key, $onclick);
+      $file_link = l(basename($file->filename), 'download/'. $file->fid .'/'. $file->file_key, $onclick);
     }
     else {
       if (time() > $expiration) {
         $file_link = basename($file->filename);
       }
       else {
-        $file_link = l(basename($file->filename), 'download/'. $file->fid .'/'. $file->key, $onclick) .' ('. t('expires on @date', array('@date' => format_date($expiration, 'custom', variable_get('uc_date_format_default', 'm/d/Y')))) .')';
+        $file_link = l(basename($file->filename), 'download/'. $file->fid .'/'. $file->file_key, $onclick) .' ('. t('expires on @date', array('@date' => format_date($expiration, 'custom', variable_get('uc_date_format_default', 'm/d/Y')))) .')';
       }
     }
 
@@ -1026,7 +1026,7 @@
 
   // In case the $user doesn't exist (downloading with a Download Manager, or Anonymous) find the $user based on the URL given
   if (!$user->uid) {
-    $user_id = db_result(db_query("SELECT uid FROM {uc_file_users} WHERE fid = %d and key = '%s'", $fid, $key));
+    $user_id = db_result(db_query("SELECT uid FROM {uc_file_users} WHERE fid = %d and file_key = '%s'", $fid, $key));
     $user = user_load(array('uid' => $user_id));
   }
 
@@ -1034,7 +1034,7 @@
   $message_admin = t('Please contact the site administrator if this message has been received in error.');
 
   $message_user = ($user->uid) ? t('The user %username ', array('%username' => $user->name)) : t('The IP address %ip ', array('%ip' => $ip));
-  $file_download = db_fetch_object(db_query("SELECT * FROM {uc_file_users} WHERE fid = %d AND `key` = '%s'", $fid, $key));
+  $file_download = db_fetch_object(db_query("SELECT * FROM {uc_file_users} WHERE fid = %d AND `file_key` = '%s'", $fid, $key));
   $request_cache = cache_get('uc_file_'. $ip);
   $requests = ($request_cache) ? $request_cache->data + 1 : 1;
 
@@ -1528,8 +1528,8 @@
         foreach ($fids as $fid) {
           $values = array($arg1, $arg2, $arg3, '', $granted, 0, serialize(array()));
           $hash = _generate_hash($values);
-          db_query("INSERT INTO {uc_file_users} (fid, uid, pfid, `key`, granted, accessed, addresses) VALUES (%d, %d, %d, '%s', %d, %d, '%s')", $fid, $arg2, $arg3, $hash, $granted, 0, serialize(array()));
-          $output[] = db_fetch_object(db_query("SELECT * FROM {uc_file_users} WHERE uid = %d AND `key` = '%s'", $arg2, $hash));
+          db_query("INSERT INTO {uc_file_users} (fid, uid, pfid, `file_key`, granted, accessed, addresses) VALUES (%d, %d, %d, '%s', %d, %d, '%s')", $fid, $arg2, $arg3, $hash, $granted, 0, serialize(array()));
+          $output[] = db_fetch_object(db_query("SELECT * FROM {uc_file_users} WHERE uid = %d AND `file_key` = '%s'", $arg2, $hash));
         }
       }
       return (!is_null($output)) ? $output : FALSE;
@@ -1541,9 +1541,9 @@
           $addresses[] = $arg2;
         }
         $accessed = $arg1->accessed+1;
-        $values = array($arg1->fid, $arg1->uid, $arg1->pfid, $arg1->key, $arg1->granted, $accessed, serialize($addresses));
+        $values = array($arg1->fid, $arg1->uid, $arg1->pfid, $arg1->file_key, $arg1->granted, $accessed, serialize($addresses));
         $hash = _generate_hash($values);
-        db_query("UPDATE {uc_file_users} SET accessed = %d, addresses = '%s', `key` = '%s' WHERE fid = %d AND uid = %d AND `key` = '%s'", $accessed, serialize($addresses), $hash, $arg1->fid, $arg1->uid, $arg1->key);
+        db_query("UPDATE {uc_file_users} SET accessed = %d, addresses = '%s', `file_key` = '%s' WHERE fid = %d AND uid = %d AND `file_key` = '%s'", $accessed, serialize($addresses), $hash, $arg1->fid, $arg1->uid, $arg1->file_key);
       }
       break;
     case 'remove': //arg1 = file id, arg2 = user id, $arg3 = key
@@ -1558,7 +1558,7 @@
           db_query("DELETE FROM {uc_file_users} WHERE fid = %d AND uid = %d", $arg1, $arg2);
         }
         if (is_null($arg1) && !is_null($arg2) && !is_null($arg3)) { //Remove a certain file from a user
-          db_query("DELETE FROM {uc_file_users} WHERE uid = %d AND `key` = '%s'", $arg2, $arg3);
+          db_query("DELETE FROM {uc_file_users} WHERE uid = %d AND `file_key` = '%s'", $arg2, $arg3);
         }
       }
       break;