Index: forward.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.module,v
retrieving revision 1.55.2.16
diff -u -p -r1.55.2.16 forward.module
--- forward.module	17 Dec 2008 22:56:00 -0000	1.55.2.16
+++ forward.module	22 Dec 2008 13:42:05 -0000
@@ -317,7 +317,7 @@ function forward_tracker() {
   $path = drupal_get_normal_path($_GET['path']);
   $args = explode('/', $path);
 
-  if (($args[0] == 'node') && (is_numeric($args[1]))) {
+  if (($args[0] == 'node') && (!empty($args[1])) && (is_numeric($args[1]))) {
     $nid = $args[1];
     db_query("UPDATE {forward_statistics} SET clickthrough_count = clickthrough_count+1 WHERE nid = %d", $nid);
   }
@@ -584,6 +584,8 @@ function forward_form_submit($form, &$fo
 
   if ((!$form_state['values']['path']) || ($form_state['values']['path'] == 'epostcard')) {
     $emailtype = 'postcard';
+    $content = '';
+    $returnurl = '';
   }
   else {
     $emailtype = 'email';
@@ -718,7 +720,7 @@ function forward_help($path) {
         break;
     }
     $attributes = array('title' => t('Forward this page to a friend'), 'class' => 'forward-page');
-    $query = 'path='. $_GET['q'];
+    $query = 'path='. $path;
     return '<span class="forward">'. l($title, 'forward', array('attributes' => $attributes, 'query' => $query, 'html' => $html)) .'</span>';
   }
 }
@@ -785,6 +787,9 @@ function forward_theme() {
     'forward_email' => array(
       'arguments' => array('vars' => NULL),
     ),
+    'forward_postcard' => array(
+      'arguments' => array('vars' => NULL),
+    ),
   );
 }
 
Index: forward.schema
===================================================================
RCS file: forward.schema
diff -N forward.schema
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ forward.schema	22 Dec 2008 13:42:05 -0000
@@ -0,0 +1,15 @@
+<?php
+/**
+* Implementation of hook_schema().
+*/
+function forward_schema() {
+  $schema['forward_log'] = array(
+    'fields' => array(
+      'nid'       => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'type'      => array('type' => 'varchar', 'not null' => TRUE, 'default' => 0, 'length' => 8),
+      'timestamp' => array('type' => 'int', 'not null' => TRUE, 'default' => 0)
+    ),
+    'index' => array('nid'),
+  );
+  return $schema;
+}
\ No newline at end of file
Index: forward.theme
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.theme,v
retrieving revision 1.7.2.1
diff -u -p -r1.7.2.1 forward.theme
--- forward.theme	4 Sep 2008 22:00:27 -0000	1.7.2.1
+++ forward.theme	22 Dec 2008 13:42:05 -0000
@@ -70,7 +70,6 @@ function theme_forward_email($vars) {
  *   An array of email variables
  */
 function theme_forward_postcard($vars) {
-
   $style = "<style>
      <!--
         html, body {margin:0; padding:0; background-color:#fff;}
@@ -102,7 +101,7 @@ function theme_forward_postcard($vars) {
         <div class="frm_title">'.t('Message from Sender').':</div>
         <div class="frm_txt">'.$vars['message'].'</div>';}
         $output .= '
-        <div class="links">'.l(t('Click here to visit our site'), 'forward/emailref/'.$vars['nid'],array('absolute' => TRUE)).'</div>
+        <div class="links">'.l(t('Click here to visit our site'), 'forward/emailref', array('absolute' => TRUE, 'query' => 'path='.variable_get('site_frontpage', 'node'))).'</div>
         <div class="dyn_content"><br />'.$vars['dynamic_content'].'</div>
         <div class="ad_footer"><br />'.$vars['forward_ad_footer'].'<br></div>
       </div>