/[drupal]/contributions/modules/tellafriend/tellafriend.module
ViewVC logotype

Diff of /contributions/modules/tellafriend/tellafriend.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.14, Thu Dec 4 07:52:02 2008 UTC revision 1.15, Sun Dec 7 00:46:04 2008 UTC
# Line 313  function tellafriend_page_validate($form Line 313  function tellafriend_page_validate($form
313    if (!flood_is_allowed('tellafriend', $my_threshold)) {    if (!flood_is_allowed('tellafriend', $my_threshold)) {
314      $tellafriend_validated = 1;      $tellafriend_validated = 1;
315      form_set_error('', t("You can't make more than %number mail requests per hour. Please try again later.", array('%number' => variable_get('tellafriend_hourly_threshold', TELLAFRIEND_DEFAULT_HOURLY_THRESHOLD))));      form_set_error('', t("You can't make more than %number mail requests per hour. Please try again later.", array('%number' => variable_get('tellafriend_hourly_threshold', TELLAFRIEND_DEFAULT_HOURLY_THRESHOLD))));
316      watchdog('mail', t('%name has attempted to surpass the flood control for tellafriend.module', array('%name' => $user->name)));      watchdog('mail', '%name has attempted to surpass the flood control for tellafriend.module', array('%name' => $user->name));
317    }    }
318  }  }
319    
# Line 322  function tellafriend_page_validate($form Line 322  function tellafriend_page_validate($form
322   */   */
323  function tellafriend_page_submit($form, &$form_state) {  function tellafriend_page_submit($form, &$form_state) {
324    global $base_url;    global $base_url;
325      global $language;
326    
327    $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']);
328    $closing = variable_get('tellafriend_closing', 'Sincerely,');    $closing = variable_get('tellafriend_closing', 'Sincerely,');
329    //$from = variable_get('tellafriend_fromaddress', $form_state['values']['tellafriend_email']);    //$from = variable_get('tellafriend_fromaddress', $form_state['values']['tellafriend_email']);
# Line 337  function tellafriend_page_submit($form, Line 339  function tellafriend_page_submit($form,
339    foreach ($addresses as $key => $mail) {    foreach ($addresses as $key => $mail) {
340      $sendaddress[$key] = stripslashes(trim($mail));      $sendaddress[$key] = stripslashes(trim($mail));
341    
 //    drupal_mail('tellafriend-page-mail', $sendaddress[$key], $subject, $body, $from);  
     /* TODO Create a hook_mail($key, &$message, $params) function to generate  
     the message body when called by drupal_mail. */  
342      $account = array(); // Set this as needed      $account = array(); // Set this as needed
     $language = user_preferred_language($account);  
343      $object = array(); // Replace this as needed      $object = array(); // Replace this as needed
344      $context['subject'] = $subject;      $context['subject'] = $subject;
345      $context['body'] = $body;      $context['body'] = $body;
346      $params = array('account' => $account, 'object' => $object, 'context' => $context);      $params = array('account' => $account, 'object' => $object, 'context' => $context);
347      drupal_mail('', 'tellafriend-page-mail', $sendaddress[$key], $language, $params, $from);  
348        $params = array(
349          'from' => $from,
350          'subject' => $subject,
351          'body' => $body,
352        );
353    
354        drupal_mail('tellafriend', 'tellafriend-page-mail', $sendaddress[$key], $language, $params, $from);
355    }    }
356    if ($form_state['values']['tellafriend_copy']) {    if ($form_state['values']['tellafriend_copy']) {
 //    drupal_mail('tellafriend-page-copy', $form_state['values']['tellafriend_email'], $subject, $body, $from);  
     /* TODO Create a hook_mail($key, &$message, $params) function to generate  
     the message body when called by drupal_mail. */  
357      $account = array(); // Set this as needed      $account = array(); // Set this as needed
     $language = user_preferred_language($account);  
358      $object = array(); // Replace this as needed      $object = array(); // Replace this as needed
359      $context['subject'] = $subject;      $context['subject'] = $subject;
360      $context['body'] = $body;      $context['body'] = $body;
361      $params = array('account' => $account, 'object' => $object, 'context' => $context);      $params = array('account' => $account, 'object' => $object, 'context' => $context);
362      drupal_mail('', 'tellafriend-page-copy', $form_state['values']['tellafriend_email'], $language, $params, $from);  
363        $params = array(
364          'from' => $from,
365          'subject' => $subject,
366          'body' => $body,
367        );
368    
369        drupal_mail('tellafriend', 'tellafriend-page-copy', $form_state['values']['tellafriend_email'], $language, $params, $from);
370    }    }
371    
372    flood_register_event('tellafriend');    flood_register_event('tellafriend');
373    
374    $addresses = implode(', ', $sendaddress);    $addresses = implode(', ', $sendaddress);
375    watchdog('mail', t('%sender sent an e-mail to %recepient using <em>Tell a friend</em> form.', array('%sender' => $form_values['tellafriend_name'], '%recepient' => $addresses)));    watchdog('mail', '%sender sent an e-mail to %recepient using <em>Tell a friend</em> form.', array('%sender' => $form_state['values']['tellafriend_name'], '%recepient' => $addresses));
376    drupal_set_message(t('Thank you! Your message has been sent to: !recepient', array('!recepient' => $addresses)));    drupal_set_message(t('Thank you! Your message has been sent to: !recepient', array('!recepient' => $addresses)));
377    drupal_goto(variable_get('tellafriend_success', variable_get('site_frontpage', 'node')));    drupal_goto(variable_get('tellafriend_success', variable_get('site_frontpage', 'node')));
378  }  }
379    
380    
381    
382    
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
  ViewVC Help
Powered by ViewVC 1.1.2