? .DS_Store
? tellafiend.20080703.patch
Index: tellafriend.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tellafriend/tellafriend.info,v
retrieving revision 1.10
diff -r1.10 tellafriend.info
1d0
< ; $Id: tellafriend.info,v 1.10 2008/06/12 22:41:07 thierrygd Exp $
3,9c2,3
< description = "Allows you to create a Tell-a-Friend page to spread the word about your site."
< 
< ; Information added by drupal.org packaging script on 2008-04-20
< version = "5.x-2.1"
< project = "tellafriend"
< datestamp = "1208727027"
< 
---
> description = Allows you to create a Tell-a-Friend page to spread the word about your site.
> core = 6.x
\ No newline at end of file
Index: tellafriend.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tellafriend/tellafriend.module,v
retrieving revision 1.11
diff -r1.11 tellafriend.module
2d1
< // $Id: tellafriend.module,v 1.11 2008/06/12 22:41:16 thierrygd Exp $
19,20c18,19
< function tellafriend_help($section) {
<   switch ($section) {
---
> function tellafriend_help($path, $arg) {
>   switch ($path) {
28c27
<       	l($base_url . urldecode('/?q=tellafriend'), 'tellafriend')));      
---
>       	l('tellafriend', $base_url . urldecode('/?q=tellafriend'))));      
45,46c44
<     $items[] = array(
<       'path' => 'admin/settings/tellafriend',
---
>     $items['admin/settings/tellafriend'] = array(
49,51c47,49
<       'callback' => 'drupal_get_form',
<       'callback arguments' => 'tellafriend_settings',
<       'access' => user_access('administer site configuration'),
---
>       'page callback' => 'drupal_get_form',
>       'page arguments' => array('tellafriend_settings'),
>       'access arguments' => array('administer site configuration'),
54,55c52
<     $items[] = array(
<       'path' => 'tellafriend',
---
>     $items['tellafriend'] = array(
57,59c54,56
<       'callback' => 'drupal_get_form',
<       'callback arguments' => 'tellafriend_page',
<       'access' => user_access('access tellafriend form'),
---
>       'page callback' => 'drupal_get_form',
>       'page arguments' => array('tellafriend_page'),
>       'access arguments' => array('access tellafriend form'),
219c216
<     	     $block['subject'] = variable_get('tellafriend_block_title', t("Spread the world..."));
---
>     	     $block['subject'] = variable_get('tellafriend_block_title', t("Spread the word..."));
229c226
< function tellafriend_page() {
---
> function tellafriend_page($form_state) {
231a229
>   $form_values = $form_state['values']; 
286c284,285
< function tellafriend_page_validate($form_id, $form_values) {
---
> function tellafriend_page_validate($form, &$form_state) {
>   $form_values = $form_state['values'];
325c324
< function tellafriend_page_submit($form_id, $form_values) {
---
> function tellafriend_page_submit($form, &$form_state) {
327,330c326
<   $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']);
<   $closing = variable_get('tellafriend_closing', 'Sincerely,');
<   //$from = variable_get('tellafriend_fromaddress', $form_values['tellafriend_email']);
<   $from = $form_values['tellafriend_name']. "<".$form_values['tellafriend_email']. ">";
---
>   $form_values = $form_state['values'];
332,339c328,329
<   $subject = stripslashes(t(variable_get('tellafriend_subject', t('!sendername has invited you to !sitename!')), $placeholder_values));
<  
<   if(strlen($form_values['tellafriend_personal'])) {
<     $body .= t("\nPersonal Message: ") . $form_values['tellafriend_personal'] . "\n----------------------\n\n";
<   }
<   $body .= t(variable_get('tellafriend_message', t('You are invited to check out !sitename at !sitelink')), $placeholder_values) ."\n$closing \n". $form_values['tellafriend_name'] ." - ". $form_values['tellafriend_email'];
<  
<   foreach ($addresses as $key => $mail) {
---
>   
>     foreach ($addresses as $key => $mail) {
341c331,333
<     drupal_mail('tellafriend-page-mail', $sendaddress[$key], $subject, $body, $from);
---
>     $params = array('account' => $account, 'tellafriend_form_values' => $form_values);
>     $language = user_preferred_language($account);
>     drupal_mail('tellafriend', 'tellafriend-page-mail', $sendaddress[$key], $language, $params);
344c336,338
<     drupal_mail('tellafriend-page-copy', $form_values['tellafriend_email'], $subject, $body, $from);
---
>   	$params = array('account' => $account, 'tellafriend_form_values' => $form_values);
>   	$language = user_preferred_language($account);
>     drupal_mail('tellafriend', 'tellafriend-page-copy', $form_values['tellafriend_email'], $language, $params);
355c349,365
< 
---
> function tellafriend_mail($key, &$message, $params) {  
>   global $base_url;
>   $tellafriend_form_values = $params['tellafriend_form_values']; 
  $variables = array(
    '!sitename' => variable_get('site_name', 'Drupal'),
>     '!sitelink' => $base_url,
>     '!sitemail' => variable_get('site_mail', ini_get('sendmail_from')),
  );
  $variables += array(
>     '!sendername' => $tellafriend_form_values['tellafriend_name'],
>     '!sendermail' => $tellafriend_form_values['tellafriend_email']
  );
>   
>   $closing = variable_get('tellafriend_closing', 'Sincerely,');
>   $from = $tellafriend_form_values['tellafriend_name']. "<".$tellafriend_form_values['tellafriend_email']. ">";
>  
  $subject = strtr(variable_get('tellafriend_subject', t('!sendername has invited you to !sitename!')), $variables);
>   
>   if(strlen($tellafriend_form_values['tellafriend_personal'])) {
>     $body = t("\nPersonal Message: ") . $tellafriend_form_values['tellafriend_personal'] . "\n----------------------\n\n";
>   }
> 
  $body .= t(variable_get('tellafriend_message', t('You are invited to check out !sitename at !sitelink')), $variables)."\n$closing \n". $tellafriend_form_values['tellafriend_name'] ." - ". $tellafriend_form_values['tellafriend_email'];;
    
>   $message['subject'] = $subject;
  $message['body'][] = $body;
}
\ No newline at end of file