--- modules/inline/inline.cvs	2006-05-04 03:03:00.000000000 +0200
+++ modules/inline/inline.module	2006-05-10 06:33:51.727387100 +0200
@@ -109,7 +109,7 @@
 }
 
 function inline_nodeapi(&$node, $op, $arg) {
-  if(is_array($node->files) && $op == 'view') {
+  if((is_array($node->files) || is_array($node->attachments)) && $op == 'view') {
     //TODO: we should *really* us the filter hooks for this, not?
     $node->teaser = _inline_substitute_tags($node, 'teaser');
     $node->body = _inline_substitute_tags($node, 'body');
@@ -119,34 +119,104 @@
   }
 }
 
+/**
+ * Create $file object for further use.
+ * For use with attachment module we're fetching some variables
+ * from filemanager module to accompany with regular file object
+ * provided by the upload module.
+ * 
+ * @param object $node The currently processed node.
+ * @param mixed $id Either an image id or filename to display inline.
+ * @return object $file An object holding all necessary information
+ *   about the attached file.
+ */
 function _inline_fileobj(&$node, $id) {
   if (is_numeric($id)) {
+  	// numeric attachment parameter
+    // upload module
     $n=1;
     foreach ($node->files as $file) {
       if ($n == $id) {
+        $file->url = file_create_url($file->filepath);
         return $file;
       }
       ++$n;
     }
+    // attachment module
+    $n=1;
+    foreach ($node->attachments as $file) {
+      if ($n == $id) {
+        if (function_exists('filemanager_url')) {
+          $file['url'] = filemanager_url($file);
+          $file['filepath'] = filemanager_create_path($file['fid']);
+          $file['filesize'] = $file['size'];
+          $attachment = filemanager_get_file_info($file['fid']);
+          $file['filemime'] = $attachment->mimetype;
+        }
+        return (object)$file;
+      }
+      ++$n;
+    }
     return NULL;
   }
   else
   {
+    // named attachment parameter
+    // upload module
     foreach ($node->files as $file) {
       if ($file->filename == $id) {
-        //return array($file->filename, $file->filepath);
+        $file->url = file_create_url($file->filepath);
         return $file;
       }
     }
+    // attachment module
+    foreach ($node->attachments as $file) {
+      if ($file['filename'] == $id) {
+        if (function_exists('filemanager_url')) {
+          $file['url'] = filemanager_url($file);
+          $file['filepath'] = filemanager_create_path($file['fid']);
+          $file['filesize'] = $file['size'];
+          $attachment = filemanager_get_file_info($file['fid']);
+          $file['filemime'] = $attachment->mimetype;
+        }
+        return (object)$file;
+      }
+    }
     return NULL;
   }
 }
 
+/**
+ * Theme $file as inline link.
+ * Displays file type icon if exists in ./themes/<template>/mime/<mime-type>.png.
+ * Mime types are converted to simple extensions, i.e. 'application/zip' becomes
+ * 'zip', 'image/jpeg' => 'jpeg'. If no corresponding mime file type icon is present,
+ * double quotes are preprended.
+ * 
+ * @param object $file The file object holding file information.
+ * @return Themed inline file link.
+ */
 function theme_inline_as_link($file) {
-  return l(($file->description ? $file->description : $file->name),
-    file_create_url($file->filepath),
-    array('title' => t('Download: %name (%size)',
-      array('%name' => $file->filename, '%size' => format_size($file->filesize)))));
+  // preprend file type icon or marker
+  $mimeimg = base_path() . path_to_theme() .'/mime/'. array_pop(explode('/', $file->filemime)) .'.png';
+  if (file_exists( '.'. $mimeimg )) {
+    $linktext = '<img src="'. $mimeimg .'" alt="'. $file->filemime .'" style="vertical-align: bottom;" />';
+  } else {
+    $linktext = '&raquo;';
+  }
+  // prepare link text with title or filename
+  // $file->title for attachment module support.
+  $linktext.= '&nbsp;'. ($file->title ? $file->title : $file->name);
+  
+  // prepare link
+  $link = l($linktext, $file->url, array('title' => t('Download: %name (%size)', array('%name' => $file->filename, '%size' => format_size($file->filesize)))), NULL, NULL, TRUE, TRUE);
+  
+  // generate output
+  $output = '<dl class="file">';
+  $output.= '<dt>'. $link .' <small>('. format_size($file->filesize) .')</small></dt>';
+  $output.= ($file->description ? '<dd><small>'. $file->description .'</small></dd>' : '');
+  $output.= '</dl>';
+  return $output;
 }
 
 function theme_inline_img($file) {