Index: mailsave_to_imagefield/mailsave_to_imagefield.info
===================================================================
RCS file: /cvs/drupal/contributions/modules/mailsave/mailsave_to_imagefield/mailsave_to_imagefield.info,v
retrieving revision 1.1
diff -u -p -r1.1 mailsave_to_imagefield.info
--- mailsave_to_imagefield/mailsave_to_imagefield.info	17 Aug 2007 06:02:18 -0000	1.1
+++ mailsave_to_imagefield/mailsave_to_imagefield.info	9 Oct 2008 13:06:30 -0000
@@ -1,4 +1,6 @@
 name = Mailsave to CCK Imagefield
 description = Works with mailsave to create CCK imagefield items from attached images
-dependencies = mailsave imagefield
-package = "Mailsave"
\ No newline at end of file
+dependencies[] = mailsave
+dependencies[] = imagefield
+package = "Mailsave"
+core = 6.x
Index: mailsave_to_imagefield/mailsave_to_imagefield.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/mailsave/mailsave_to_imagefield/mailsave_to_imagefield.module,v
retrieving revision 1.3
diff -u -p -r1.3 mailsave_to_imagefield.module
--- mailsave_to_imagefield/mailsave_to_imagefield.module	27 Nov 2007 22:03:44 -0000	1.3
+++ mailsave_to_imagefield/mailsave_to_imagefield.module	9 Oct 2008 13:06:30 -0000
@@ -90,34 +90,43 @@ function _mailsave_to_imagefield_attempt
     if ( (trim($cck_image_extensions) == '' || strpos($cck_image_extensions, _file_ext($file['filename'])) !== FALSE ) && strpos(strtolower($file['filemime']), 'image/') === 0 )  {
 
       // Let's scale the image per the imagefield max settings
-      $file = _imagefield_scale_image($file, $field_info['widget']['max_resolution']);
+      if ($field_info['widget']['max_resolution']) {
+        $file = _imagefield_scale_image($file, $field_info['widget']['max_resolution']);
+      }
 
       // If there are tokenized as part of imagefield 2.x let's use them
       if (function_exists('token_replace')) {
         global $user;
-        $widget_image_path = token_replace($field_info['widget']['image_path'], 'user', $user);
+        $widget_image_path = token_replace($field_info['widget']['file_path'], 'user', $user);
       }
       else {
-        $widget_image_path = $field_info['widget']['image_path'];
+        $widget_image_path = $field_info['widget']['file_path'];
       }
 
       // Let's create the directory path if it hasn't been created already
-      imagefield_check_directory($widget_image_path);
+      $directory = file_create_path($widget_image_path);
+      file_check_directory($directory, FILE_CREATE_DIRECTORY);
+
+      $destination = file_destination(file_create_path($widget_image_path .'/'. $file['filename']), FILE_EXISTS_RENAME);
+      file_move($file['filepath'], $destination);
 
       // Build the array for the image found
-      $cckimageinfo = array(
-        'flags'    => array('delete' => '0'),
-        'alt'      => $file['filename'],
-        'title'    => '',
-        'filename' => $file['filename'],
-        'filepath' => $file['filepath'],
-        'filemime' => $file['filemime'],
-        'filesize' => $file['filesize'],
-        'fid'      => 'upload',
-      );
+      $file['list'] = 0;
+      $file['data'] = array('description' => '', 'alt' => $file['filename'], 'title' => '');
+      $file['uid'] = $node->uid;
+      $file['filepath'] = $destination;
+      $file['status'] = 1;
+      $file['timestamp'] = time();
+
+      drupal_write_record('files', $file);
+
+      foreach (module_implements('file_insert') as $module) {
+        $function = $module .'_file_insert';
+        $function((object) $file);
+      }
 
       // Add the image info to the imagefield array
-      $node->{$cck_imagefield}[] = $cckimageinfo;
+      $node->{$cck_imagefield}[] = $file;
 
       // Lets remove the CCK image we found from attachments
       // We will leave the temp file though, as imagefield will need it