diff -Nurp --exclude=.svn filemanager-4.7.x-1.x-dev/filemanager.info filemanager/filemanager.info
--- filemanager-4.7.x-1.x-dev/filemanager.info	1969-12-31 16:00:00.000000000 -0800
+++ filemanager/filemanager.info	2007-06-14 12:01:07.000000000 -0700
@@ -0,0 +1,3 @@
+; $Id$
+name = Filemanager
+description = Adds support for a managed file repository for other modules.
diff -Nurp --exclude=.svn filemanager-4.7.x-1.x-dev/filemanager.install filemanager/filemanager.install
--- filemanager-4.7.x-1.x-dev/filemanager.install	2007-06-14 11:47:56.000000000 -0700
+++ filemanager/filemanager.install	2007-06-13 10:11:11.000000000 -0700
@@ -13,43 +13,45 @@ function filemanager_update_1() {
  * Install the initial schema.
  */
 function filemanager_install() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      db_query(
-  <<<MYSQL_UPDATE
-        CREATE TABLE {file} (
-          fid int(10) unsigned NOT NULL,
-          area varchar(255) NOT NULL,
-          directory tinyint(3) NOT NULL,
-          filename varchar(255) NOT NULL,
-          mimetype varchar(255) NOT NULL,
-          size int(12) NOT NULL,
-          active char(1) NOT NULL,
-          working char(1) NOT NULL,
-          private char(1) NOT NULL,
-          PRIMARY KEY (fid)
-        ) /*!40100 DEFAULT CHARACTER SET utf8 */;
-MYSQL_UPDATE
-      );
-      break;
-
-    case 'pgsql':
-      db_query(
-<<<PGSQL_UPDATE
-        CREATE TABLE {file} (
-          fid serial PRIMARY KEY CONSTRAINT file_fid_positive CHECK (fid > 0),
-          area varchar(255) NOT NULL,
-          directory smallint NOT NULL,
-          filename varchar(255) NOT NULL,
-          mimetype varchar(255) NOT NULL,
-          size integer NOT NULL,
-          active char(1) NOT NULL,
-          working char(1) NOT NULL,
-          private char(1) NOT NULL
+  if( ! db_table_exists('file') ) {
+    switch ($GLOBALS['db_type']) {
+      case 'mysql':
+      case 'mysqli':
+        db_query(
+    <<<MYSQL_UPDATE
+          CREATE TABLE {file} (
+            fid int(10) unsigned NOT NULL,
+            area varchar(255) NOT NULL,
+            directory tinyint(3) NOT NULL,
+            filename varchar(255) NOT NULL,
+            mimetype varchar(255) NOT NULL,
+            size int(12) NOT NULL,
+            active char(1) NOT NULL,
+            working char(1) NOT NULL,
+            private char(1) NOT NULL,
+            PRIMARY KEY (fid)
+          ) /*!40100 DEFAULT CHARACTER SET utf8 */;
+  MYSQL_UPDATE
         );
-PGSQL_UPDATE
-      );
-      break;
+        break;
+  
+      case 'pgsql':
+        db_query(
+  <<<PGSQL_UPDATE
+          CREATE TABLE {file} (
+            fid serial PRIMARY KEY CONSTRAINT file_fid_positive CHECK (fid > 0),
+            area varchar(255) NOT NULL,
+            directory smallint NOT NULL,
+            filename varchar(255) NOT NULL,
+            mimetype varchar(255) NOT NULL,
+            size integer NOT NULL,
+            active char(1) NOT NULL,
+            working char(1) NOT NULL,
+            private char(1) NOT NULL
+          );
+  PGSQL_UPDATE
+        );
+        break;
+    }
   }
 }
diff -Nurp --exclude=.svn filemanager-4.7.x-1.x-dev/filemanager.module filemanager/filemanager.module
--- filemanager-4.7.x-1.x-dev/filemanager.module	2007-06-14 11:47:56.000000000 -0700
+++ filemanager/filemanager.module	2007-06-14 14:15:07.000000000 -0700
@@ -621,14 +621,22 @@ function filemanager_menu($may_cache) {
   $items = array();
 
   if ($may_cache) {
-    $items[] = array('path' => 'filemanager/active', 'title' => t('file download'),
+    $items[] = array('path' => 'filemanager/active', 'title' => t('File download'),
       'callback' => 'filemanager_download_active',
       'access' => TRUE,
       'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'filemanager/working', 'title' => t('file download'),
+    $items[] = array('path' => 'filemanager/working', 'title' => t('File download'),
       'callback' => 'filemanager_download_working',
       'access' => TRUE,
       'type' => MENU_CALLBACK);
+    $items[] = array( 
+      'path' => 'admin/settings/filemanager', 
+      'title' => t('Filemanager'),
+      'description' => t('Settings for Filemanger module'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('filemanager_admin_settings'),
+      'access' => user_access('administer site configuration'),
+      'type' => MENU_NORMAL_ITEM );
   }
 
   return $items;
@@ -663,8 +671,6 @@ function filemanager_download_working() 
 
 function filemanager_help($section) {
   switch ($section) {
-    case 'admin/modules#description':
-      return t('Adds support for a managed file repository for other modules.');
   }
 }
 
@@ -686,7 +692,7 @@ function _filemanager_settings_check_dir
 /**
  * Displays filemanager admin screen
  */
-function filemanager_settings() {
+function filemanager_admin_settings() {
   global $base_url;
 
   $form['filemanager_public_path'] = array(
@@ -780,24 +786,24 @@ function filemanager_settings() {
     );
   }
 
-  return $form;
+  return system_settings_form($form);
 }
 
 function theme_filemanager_fileareas_admin($form) {
-  $output = form_render($form['info']);
+  $output = drupal_render($form['info']);
 
   $header = array(t('Area'),t('Description'),t('Max size (Mb)'),t('Force Private'));
   foreach (element_children($form['areas']) as $key) {
     $row = array();
     $row[] = $form['areas'][$key]['#title'];
     $row[] = $form['areas'][$key]['#description'];
-    $row[] = form_render($form['areas'][$key]['limit']);
-    $row[] = form_render($form['areas'][$key]['force']);
+    $row[] = drupal_render($form['areas'][$key]['limit']);
+    $row[] = drupal_render($form['areas'][$key]['force']);
     $rows[] = $row;
   }
   $output .= theme('table', $header, $rows);
 
-  $output .= form_render($form);
+  $output .= drupal_render($form);
   return $output;
 }
 
@@ -808,7 +814,7 @@ function theme_filemanager_fileareas_adm
  * system_settings_form_submit can't handle all the values without some
  * pre-processing.
  */
-function filemanager_settings_form_submit($form_id, $values) {
+function filemanager_admin_settings_submit($form_id, $values) {
   // Flatten the fileareas array into $values
   foreach ($values['file_areas']['areas'] as $area => $settings) {
     foreach ($settings as $value_key => $value_array) {