--- acidfree.module.orig	2009-03-11 23:44:38.000000000 -0500
+++ acidfree.module	2009-03-12 00:00:47.000000000 -0500
@@ -1678,8 +1678,10 @@
         $file->filepath = $fullpath;
         $file->filename = $file->basename;
         // echo "importing file $filename<br>\n";
-        if ($recursive && is_dir($fullpath)) {
-            $dirs[] = $file;
+        if (is_dir($fullpath)) {
+	    if ($recursive) {
+		$dirs[] = $file;
+	    }
             continue;
         }
         $file->filemime = acidfree_mime($file);
@@ -1804,7 +1806,7 @@
     $parent = $parent[0]['#default_value']; //Pachkov.Sergey
     $p = _album_from_tid($parent);
     if ($op == t('Import')) {
-        $tmpdir = $form['serverpath'];
+        $tmpdir = $form['#post']['serverpath'];
         if ($tmpdir && !is_dir($tmpdir)) {
             drupal_set_message(t('Could not find server-side directory %tmpdir', array('%tmpdir' => $tmpdir)), 'error');
         } elseif ($tmpdir) {
@@ -1899,7 +1901,9 @@
     //}
     $vocabs = array();
     $node = new stdClass();
-    $form['#id'] = 'node-form';
+    //$form['#id'] = 'node-form';
+    $form['#submit'][] = 'acidfree_mass_import_submit';
+
     foreach ($types as $type) {
         $node->type = $type;
         $form['#node'] = $node;
@@ -1985,6 +1989,7 @@
     $form['import']['import'] = array(
             '#type' => 'submit',
             '#value' => t('Import'),
+	    '#submit' => array('acidfree_mass_import_submit'),
         );
     $form['#attributes'] = array('enctype' => 'multipart/form-data');
     return $form;