Index: forward.module
===================================================================
RCS file: /usr/local/cvsroot/stmarks/drupal/modules/forward/forward.module,v
retrieving revision 1.1
diff -u -r1.1 forward.module
--- forward.module	2006/11/11 19:26:38	1.1
+++ forward.module	2006/11/13 14:44:30
@@ -329,10 +329,15 @@
       '#required' => TRUE,
     );
     if ($emailtype == 'email') {
+    	if (variable_get('clean_url', 0)) {
+    		$the_url = $base_url.'/'.drupal_get_path_alias('node/'.$nid.'');
+    	} else {
+    		$the_url = $base_url.'/?q='.drupal_get_path_alias('node/'.$nid.'');
+    	}
       $form['message'][] = array(
         '#type' => 'item',
         '#title' => t('Page Being Sent'),
-        '#value' => $base_url.'/'.drupal_get_path_alias('node/'.$nid.''),
+        '#value' => $the_url,
       );
     }
     $form['message']['subject'] = array(
@@ -380,7 +385,7 @@
  * Generate nodeapi integration, foward signup
  */
 function forward_nodeapi(&$node, $op, $arg = 0){
-  if (variable_get('forward_form_type', 'link') == "form" && !$node->in_preview && variable_get('forward_display_'. $node->type, '0') == 1){
+  if (variable_get('forward_form_type', 'link') == "form" && !$node->in_preview && variable_get('forward_display_'. $node->type, '1') == 1){
     switch ($op) {
       case 'view':
         global $user;
@@ -587,7 +592,7 @@
 
   $headers = "From: ".$edit['yemail']."\n";
   $headers .= "MIME-Version: 1.0\n";
-  $headers .= "Content-type: text/html; charset=utf-8\n";
+  $headers .= "Content-Type: text/html; charset=utf-8\n";
 
   $recipients = trim($edit['recipients']);
   $recipients = str_replace(array("\r\n", "\n", "\r"), ', ', $recipients);
@@ -608,7 +613,7 @@
 
 function forward_mail($mail, $subject, $message, $header) {
   if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) {
-    include_once './' . variable_get('smtp_library', '');
+  	include_once './' . variable_get('smtp_library', '');
     return user_mail_wrapper($mail, $subject, $message, $header);
   }
   else {