--- D:/xampp/htdocs/tao_testing/sites/all/modules/email/email.module.org	Mon Feb 12 09:32:54 2007
+++ D:/xampp/htdocs/tao_testing/sites/all/modules/email/email.module	Wed Feb 14 22:34:32 2007
@@ -60,10 +60,14 @@
       'label' => 'Default Email-Link',
       'field types' => array('email'),
     ),
-    'invisi' => array(
+    'invisimail' => array(
       'label' => 'Email-Invisimail',
       'field types' => array('email'),
     ),
+    'spamspan' => array(
+      'label' => 'Email-SpamSpan',
+      'field types' => array('email'),
+    ),
     'contact' => array(
       'label' => 'Email-Contact Form',
       'field types' => array('email'),
@@ -79,7 +83,7 @@
     if ($field['widget']['link_type'] == 'form' || $formatter == 'contact') {
       $mailto = l(t('Email Contact Form'), 'email/'.$node->nid.'/'.$field['field_name']);
     }
-    elseif (($field['widget']['link_type'] == 'mailto_encrypt' || $formatter == 'invisi') && module_exists('invisimail')) {
+    elseif (($field['widget']['link_type'] == 'mailto_encrypt_inivismail' || $formatter == 'invisimail') && module_exists('invisimail')) {
       $format = $GLOBALS['invisimail_format'];
       if (!(variable_get('invisimail_link_'.$format, TRUE))) {     
         variable_set('invisimail_link_'.$format, TRUE);
@@ -87,6 +91,15 @@
       }
       $mailto = invisimail_ascii_encode($item['email']);
     }
+    elseif (($field['widget']['link_type'] == 'mailto_encrypt_spamspan' || $formatter == 'spamspan') && module_exists('spamspan')) {
+      $format = $GLOBALS['spamspan_format'];
+      if (!(variable_get('spamspan_userclass_'.$format, TRUE))) {     
+        variable_set('spamspan_userclass_'.$format, TRUE);
+        variable_set('spam_span_at_'.$format, TRUE);
+        variable_set('spam_span_domainclass_'.$format, TRUE);
+      }
+      $mailto = spamspan_encode($item['email']);
+    }
     else {
       $mailto =  '<a href="mailto:'. $item['email']. '">'. check_plain($item['email']) .'</a>';
     }
@@ -128,7 +141,10 @@
         'form' => t('Contact form'), 
       );
       if (module_exists('invisimail')) {
-        $options += array('mailto_encrypt' => t('Mailto: Direct link with invisimail encryption'));
+        $options += array('mailto_encrypt_invismail' => t('Mailto: Direct link with invisimail encryption'));
+      }
+      if (module_exists('spamspan')) {
+        $options += array('mailto_encrypt_spamspan' => t('Mailto: Direct link with SpamSpan encryption'));
       }
       $form['link_type'] = array(
         '#type' => 'radios',