--- acidfree.module.original    2007-08-16 12:39:03.000000000 +0100
+++ acidfree.module     2007-08-16 12:44:14.000000000 +0100
@@ -908,12 +908,49 @@
     return $nodes;
 }

-function theme_acidfree_block_contents($node_array) {
+function theme_acidfree_block_contents($node_array, $display="Thumb", $link="None") {
     $nodes =& $node_array[0];
     foreach ($nodes as $node) {
-        $output .= "<div class='block-cell'>";
-        $output .= theme("acidfree_print_thumb_{$node->type}", $node);
-        $output .= "</div>";
+        if($display=="Original" || $display=="Preview")
+        {
+ //            print("<--");
+ //            print_r($node);
+ //            print("-->");
+             $output .= "<div class='block-cell'>";
+
+             if($link=="Image")
+             {
+                 $output .= "<a href='".base_path()."node/{$node->nid}'>";
+             }
+             else if($link == "Album")
+             {
+                 $output .= "<a href='".base_path()."node/{$node->nid}'>";
+             }
+             else if($link == "Home")
+             {
+                 $output .= "<a href='".base_path()."'>";
+             }
+             if($display=="Preview")
+             {
+                 $output .= "<img src='" . base_path() . $node->images['preview'] . "' alt='AcidFree Image Preview'/>";
+             }
+             else
+             {
+                 $output .= "<img src='" . base_path() . $node->images['_original'] . "' alt='AcidFree Image'/>";
+             }
+             if($link != "None")
+             {
+                 $output .= "</a>";
+             }
+
+             $output .= "</div>";
+         }
+         else
+         {
+             $output .= "<div class='block-cell'>";
+             $output .= theme("acidfree_print_thumb_{$node->type}", $node);
+             $output .= "</div>";
+         }
     }
     $output .= "<div class='block-bottom'>&nbsp;</div>\n";
     return $output;
@@ -979,22 +1016,33 @@
                     break;
             }
             if ($delta >= 0 && $delta <= 2) {
-                $nodes = acidfree_get_block_nodes($order,
-                    variable_get("acidfree_block_{$delta}_items", 3), $albums);
-                $block['content'] = theme('acidfree_block_contents', array(&$nodes));
+                $nodes = acidfree_get_block_nodes($order, variable_get("acidfree_block_{$delta}_items", 3), $albums);
+                $block['content'] = theme('acidfree_block_contents', array(&$nodes), variable_get("acidfree_block_{$delta}_display", "Thumb"),variable_get("acidfree_block_{$delta}_link","None"));
             }
             return $block;
         }
     case 'configure':
         {
-            $fields = array();
-            if ($delta == 3)
-                return $fields;
-            $fields["acidfree_block_{$delta}_items"] = array(
+           $fields = array();
+           if ($delta == 3)
+               return $fields;
+           $fields["acidfree_block_{$delta}_items"] = array(
+                   '#type' => 'select',
+                   '#title' => t('Number of items'),
+                   '#default_value' => variable_get("acidfree_block_{$delta}_items", '5'),
+                   '#options' => drupal_map_assoc(range(1,20)),
+               );
+           $fields["acidfree_block_{$delta}_display"] = array(
+                    '#type' => 'select',
+                    '#title' => t('Display Items As'),
+                    '#default_value' => variable_get("acidfree_block_{$delta}_display", 'Thumb'),
+                    '#options' => drupal_map_assoc(array("Thumb","Original","Preview")),
+                );
+            $fields["acidfree_block_{$delta}_link"] = array(
                     '#type' => 'select',
-                    '#title' => t('Number of items'),
-                    '#default_value' => variable_get("acidfree_block_{$delta}_items", '5'),
-                    '#options' => drupal_map_assoc(range(1,20)),
+                    '#title' => t('Link To'),
+                    '#default_value' => variable_get("acidfree_block_{$delta}_link", 'None'),
+                    '#options' => drupal_map_assoc(array("None","Home","Image", "Album")),
                 );
             if ($delta == 2) {
                 drupal_add_js(drupal_get_path('module', 'acidfree').'/acidfree.js');
@@ -1018,6 +1066,8 @@
         if ($delta == 3)
             break;
         variable_set("acidfree_block_{$delta}_items", $edit["acidfree_block_{$delta}_items"]);
+        variable_set("acidfree_block_{$delta}_display", $edit["acidfree_block_{$delta}_display"]);
+        variable_set("acidfree_block_{$delta}_link", $edit["acidfree_block_{$delta}_link"]);
         if ($delta == 2) {
             variable_set('acidfree_block_2_random_albums', $edit['acidfree_block_2_random_albums']);
             variable_set('acidfree_block_2_all_albums', $edit['acidfree_block_2_all_albums'] == 1);