Index: tellafriend.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tellafriend/tellafriend.module,v
retrieving revision 1.18
diff -r1.18 tellafriend.module
60,66d59
<   $items['tellafriend_block_form'] = array(
<     'title' => variable_get('tellafriend_blocktitle', 'Tell a friend'),
<     'page callback' => 'tellafriend_block_form',
<     'page arguments' => array('tellafriend_block_form'),
<     'access arguments' => array('access tellafriend block'),
<     'type' => MENU_CALLBACK,
<     );
275,287c268,278
<       $block = array();
<       if (user_access('access tellafriend form')) {  
<         //drupal_set_message('option = ' . variable_get('tellafriend_block_style'), 'error');       
<       
<         $block['subject'] = variable_get('tellafriend_block_title', t("Spread the world..."));      
<         if (variable_get('tellafriend_block_style', 0) == '0') { //Link       
<           $blockContent .= '<ul><li class="leaf">' . l(t(variable_get('tellafriend_block_linklabel', t("Tell a friend..."))), 'tellafriend') . '</li></ul>';
<           $block['content'] = $blockContent;
<       	}
<       	else { //email TextField(s) 
<           $block['content'] = drupal_get_form('tellafriend_block_form');
<       	}
<       }
---
>         $block = array();
>         if (user_access('access tellafriend form')) {  
>           $block['subject'] = variable_get('tellafriend_block_title', t("Spread the world..."));      
>           if (variable_get('tellafriend_block_style', 0) == '0') {       
>             $block['content'] = '<ul><li class="leaf">' . l(t(variable_get('tellafriend_block_linklabel', t("Tell a friend..."))), 'tellafriend') . '</li></ul>';
>           }
>           else { 
>             $block['content'] = drupal_get_form('tellafriend_block_form');
>           }
>         }
>         break;
330c321,328
<   $placeholder_values = array('!sitename' => variable_get('site_name', 'Drupal'),'!sitelink' => $base_url,'!sitemail' => variable_get('site_mail', ini_get('sendmail_from')), '!sendername' => $form_values['tellafriend_name'], '!sendermail' => $form_values['tellafriend_email']);
---
>   $placeholder_values = array(
>     '!sitename' => variable_get('site_name', 'Drupal'),
>     '!sitelink' => $base_url,
>     '!sitemail' => variable_get('site_mail', 
>     ini_get('sendmail_from')), 
>     '!sendername' => $form_values['tellafriend_name'],
>     '!sendermail' => $form_values['tellafriend_email'],
>   );
333c331,333
<   $form['tellafriend_information'] = array('#value' => filter_xss_admin(variable_get('tellafriend_topmessage', t('Spread the word about !site by telling your friend(s) about it!', array('!site' => variable_get('site_name', 'Drupal'))))));
---
>   $form['tellafriend_information'] = array(
>     '#value' => filter_xss_admin(variable_get('tellafriend_topmessage', t('Spread the word about !site by telling your friend(s) about it!', array('!site' => variable_get('site_name', 'Drupal')))))
>   );
374c374,375
<   $form['submit'] = array('#type' => 'submit',
---
>   $form['submit'] = array(
>     '#type' => 'submit',
387,389c388,390
<    if (!valid_email_address($form_state['values']['tellafriend_email'])) {
<         form_set_error("tellafriend_email", t('Email address is not valid!'));
<    }
---
>   if (!valid_email_address($form_state['values']['tellafriend_email'])) {
>     form_set_error("tellafriend_email", t('Email address is not valid!'));
>   }
393c394
<   if(count($addresses) > variable_get('tellafriend_address_limit', TELLAFRIEND_DEFAULT_MAX_EMAIL_ADDRESSES)) {
---
>   if (count($addresses) > variable_get('tellafriend_address_limit', TELLAFRIEND_DEFAULT_MAX_EMAIL_ADDRESSES)) {
395,396c396,398
<     t('You have exceeded the maximum number of %number email addresses per request.', 
<     array('%number' => variable_get('tellafriend_address_limit', TELLAFRIEND_DEFAULT_MAX_EMAIL_ADDRESSES))));
---
>       t('You have exceeded the maximum number of %number email addresses per request.', 
>       array('%number' => variable_get('tellafriend_address_limit', TELLAFRIEND_DEFAULT_MAX_EMAIL_ADDRESSES)))
>     );
400,401c402
<     $sendaddress = stripslashes(trim($mail));
<        	
---
>     $sendaddress = stripslashes(trim($mail));       	
427c428,434
<   $placeholder_values = array('!sitename' => variable_get('site_name', 'Drupal'),'!sitelink' => $base_url,'!sitemail' => variable_get('site_mail', ini_get('sendmail_from')), '!sendername' => $form_state['values']['tellafriend_name'], '!sendermail' => $form_state['values']['tellafriend_email']);
---
>   $placeholder_values = array(
>     '!sitename' => variable_get('site_name', 'Drupal'),
>     '!sitelink' => $base_url,
>     '!sitemail' => variable_get('site_mail', ini_get('sendmail_from')),
>     '!sendername' => $form_state['values']['tellafriend_name'],
>     '!sendermail' => $form_state['values']['tellafriend_email'],
>   );
429,430c436
<   //$from = variable_get('tellafriend_fromaddress', $form_state['values']['tellafriend_email']);
<   $from = $form_state['values']['tellafriend_name']. "<".$form_state['values']['tellafriend_email']. ">";
---
>   $from = $form_state['values']['tellafriend_email'];
434c440
<   if(strlen($form_state['values']['tellafriend_personal'])) {
---
>   if (strlen($form_state['values']['tellafriend_personal'])) {
439,440c445,448
<   foreach ($addresses as $key => $mail) {
<     $sendaddress[$key] = stripslashes(trim($mail));
---
>   $params = array(
>     'subject' => $subject,
>     'body' => $body,
>   );
442,453c450,451
<     $account = array(); // Set this as needed
<     $object = array(); // Replace this as needed
<     $context['subject'] = $subject;
<     $context['body'] = $body;
<     $params = array('account' => $account, 'object' => $object, 'context' => $context);
<     
<     $params = array(
<       'from' => $from,
<       'subject' => $subject,
<       'body' => $body,
<     );    
<         
---
>   foreach ($addresses as $key => $mail) {
>     $sendaddress[$key] = stripslashes(trim($mail));         
456,468c454
<   if ($form_state['values']['tellafriend_copy']) {
<     $account = array(); // Set this as needed
<     $object = array(); // Replace this as needed
<     $context['subject'] = $subject;
<     $context['body'] = $body;
<     $params = array('account' => $account, 'object' => $object, 'context' => $context);
< 
<     $params = array(
<       'from' => $from,
<       'subject' => $subject,
<       'body' => $body,
<     );    
<     
---
>   if ($form_state['values']['tellafriend_copy']) {  
477c463
<   drupal_goto(variable_get('tellafriend_success', variable_get('site_frontpage', 'node')));
---
>   drupal_goto(variable_get('tellafriend_success', ''));
481,482c467,468
< function tellafriend_send_mail() {
< }
---
> /*function tellafriend_send_mail() {
> }*/
488,493c474,482
<   $message['from'] .= $params['from'];
<   $message['subject'] = $params['subject'];
<   $message['body'] = $params['body'];
<   $message['headers'] = array_merge($message['headers'], isset($params['headers']) ? $params['headers'] : array());
<   $message['headers']['MIME-Version'] = '1.0';
<   $message['headers']['Content-Type'] = 'text/html; charset=utf-8';  
---
>   switch ($key) {
>     case 'tellafriend-page-mail':
>       $message['subject'] = $params['subject'];
>       $message['body'] = $params['body'];
>       $message['headers'] = array_merge($message['headers'], isset($params['headers']) ? $params['headers'] : array());
>       $message['headers']['MIME-Version'] = '1.0';
>       $message['headers']['Content-Type'] = 'text/html; charset=utf-8';  
>       break;
>   }