--- /home/drumm/project/drupal/contributions/modules/node_import/node_import.module	2003-12-04 04:41:21.000000000 -0800
+++ node_import.module	2004-05-14 13:03:41.000000000 -0700
@@ -1,71 +1,64 @@
 <?php 
 
+function node_import_help($section) {
+  switch ($section) {
+    case 'admin/system/modules#description':
+      return t('Import nodes from a CSV file');
+    case 'admin/system/modules/node_import':
+      return t('Import nodes from a CSV file');
+  }
+}
+
 function node_import_link($type) {
-  if ($type == 'system' && user_access('access node_import')) {
-    menu('node_import', t('node import'), 'page', 5);
+  if ($type == 'system' && user_access('import nodes')) {
+    menu('admin/node/node_import', t('import'), 'node_import_page', 5);
   }
 }
 
 function node_import_perm() {
-  return array('access node_import');  
+  return array('import nodes');  
 }
 
 function node_import_page() {
   global $error;
   $row = 1; 
-  print theme('header');
-  if (user_access('access node_import')) {
-    if ($path = $_FILES['edit']['tmp_name']['node_import_file']) {
-      $handle = fopen($path,"r");
-      while ($data = fgetcsv($handle, 10000, ",")) { 
-        if ($row == 1) {
-          $fields = $data;
+  if ($path = $_FILES['edit']['tmp_name']['node_import_file']) {
+    $handle = fopen($path,"r");
+    while ($data = fgetcsv($handle, 10000, ",")) { 
+      if ($row == 1) {
+        $fields = $data;
+      }
+      else {
+        for ($c=0; $c < count($fields); $c++) { 
+          $node->$fields[$c] = $data[$c]; 
         }
-        else {
-          for ($c=0; $c < count($fields); $c++) { 
-           $node->$fields[$c] = $data[$c]; 
-          }
-          $node = node_validate($node, $error);
-          if (!node_access("create", $node)) {
-            $error['access'] = message_access();
-          }
+        $node = node_validate($node, $error);
+        if (!node_access("create", $node)) {
+          $error['access'] = message_access();
+        }
+        if ($error) {
           print '<pre>';
-          if ($error) {
-            print_r($error);
-          }
-          else {
-            if ($_POST['op'] == t('Preview')) {
-              print_r($node);
-            } 
-            elseif ($nid = node_save($node)) {
-              print "saved $nid: ". l($node->title, "node/view/$nid");
-            }
-          }
+          print_r($error);
           print '</pre>';
         }
-        $row++;
-      } 
-      fclose ($handle);
-    }
-    $output .= form_file(t('CSV File'), "node_import_file", 64, t("Comma separated values file. "));
-    $output .= form_submit(t('Preview'));
-    $output .= form_submit(t('Import'));
-    $output = form($output, 'post', 0, array("enctype" => "multipart/form-data"));
-  }
-  else {
-    print message_access();  
-  }
-  print $output;
-  print theme('footer');
-}
-
-function node_import_help($section) {
-  switch ($section) {
-    case 'admin/system/modules#description':
-      return t('Import nodes from a CSV file');
-    case 'admin/system/modules/node_import':
-      return t('Import nodes from a CSV file');
+        else {
+          if ($_POST['op'] == t('Preview')) {
+            $output .= node_view($node);
+          } 
+          elseif ($nid = node_save($node)) {
+            $output .= t('saved %nid: ', array('%nid' => $nid)). l($node->title, "node/view/$nid") .'<br />';
+          }
+        }
+      }
+      $row++;
+    } 
+    fclose ($handle);
   }
+  $output .= form_file(t('CSV File'), "node_import_file", 64, t("Comma separated values file. "));
+  $output .= form_submit(t('Preview'));
+  $output .= form_submit(t('Import'));
+  $output = form($output, 'post', 0, array("enctype" => "multipart/form-data"));
+  print theme('page', $output);
 }
 
 ?>