Index: filemanager.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filemanager/filemanager.module,v
retrieving revision 1.13
diff -u -r1.13 filemanager.module
--- filemanager.module	16 Feb 2006 07:46:40 -0000	1.13
+++ filemanager.module	21 Feb 2006 04:44:51 -0000
@@ -178,7 +178,7 @@
       file_delete(filemanager_create_path($file, TRUE));
     }
     $file->working = FALSE;
-    $update = true;
+    $update = TRUE;
     // We don't update the size for existing files until they are promoted
   }
 
@@ -209,10 +209,10 @@
 
     // Save database record
     if ($update) {
-      db_query("UPDATE {file} SET working='%s' WHERE fid=%d", $file->working, $file->fid);
+      db_query("UPDATE {file} SET working=%d WHERE fid=%d", $file->working, $file->fid);
     }
     else {
-      db_query("INSERT INTO {file} (fid, area, directory, filename, mimetype, size, active, working, private) VALUES (%d,'%s',%d,'%s','%s',%d,'%s','%s','%s')",
+      db_query("INSERT INTO {file} (fid, area, directory, filename, mimetype, size, active, working, private) VALUES (%d,'%s',%d,'%s','%s',%d,%d,%d,%d)",
                $file->fid, $file->area, $file->directory, $file->filename, $file->mimetype, $file->size, $file->active, $file->working, $file->private);
     }
 
@@ -274,13 +274,7 @@
 function filemanager_set_private($file, $private) {
     $file = filemanager_get_file_info($file);
 
-    // The  private column is a char, adjust the flag to match
-    if ($private) {
-        $private = '1';
-    }
-    else {
-        $private = '';
-    }
+    $private = (boolean) $private;
 
     // Exit immediately if file is already in the right state
     if (! $file || $file->private == $private) {
@@ -297,7 +291,7 @@
     $updated = _filemanager_update_file($file, $oldworking, $oldactive);
 
     if ($file != false) {
-        db_query("UPDATE {file} SET private='%s', directory = '%d' WHERE fid=%d", $file->private, $file->directory, $file->fid);
+        db_query("UPDATE {file} SET private=%d, directory=%d WHERE fid=%d", $file->private, $file->directory, $file->fid);
     }
     _filemanager_unlock($lock);
     return $file;
@@ -488,7 +482,7 @@
       $file->working = FALSE;
       $file->active = TRUE;
       $file->size = $size;
-      db_query("UPDATE {file} SET working='%s', active='%s', size=%d WHERE fid=%d", $file->working, $file->active, $file->size, $file->fid);
+      db_query("UPDATE {file} SET working=%d, active=%d, size=%d WHERE fid=%d", $file->working, $file->active, $file->size, $file->fid);
       return $file;
     }
   }
@@ -506,7 +500,7 @@
 
   file_delete(filemanager_create_path($file, TRUE));
   if ($file->active) {
-    db_query("UPDATE {file} SET working = '%s' WHERE fid = %d", FALSE, $file->fid);
+    db_query("UPDATE {file} SET working = %d WHERE fid = %d", FALSE, $file->fid);
   }
   else {
     db_query("DELETE FROM {file} WHERE fid = %d", $file->fid);
@@ -774,7 +768,7 @@
 function _filemanager_find_directory(&$file) {
     // Find a directory that is not already full and does not contain our files
     $file->directory = 0;
-    $directories = db_query("SELECT directory, count(1) filecount FROM {file} WHERE private = '%s' GROUP BY directory ORDER BY directory ASC", $file->private);
+    $directories = db_query("SELECT directory, count(1) filecount FROM {file} WHERE private = %d GROUP BY directory ORDER BY directory ASC", $file->private);
 
     // this while loop requires the $directories array to be ordered in ascending order
     while ($directory = db_fetch_object($directories)) {