/[drupal]/contributions/modules/smtp/smtp.module

Diff of /contributions/modules/smtp/smtp.module

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

-revision 1.17.2.7,
Thu Jul 17 14:58:08 2008 UTC
+revision 1.17.2.8,
Tue Sep 23 22:03:01 2008 UTC
 Line 1
  <?php
- // $Id: smtp.module,v 1.17.2.6 2008/07/12 16:58:28 oadaeh Exp $
+ // $Id: smtp.module,v 1.17.2.7 2008/07/17 14:58:08 oadaeh Exp $
  /**
   * @file
 Line 175 
 function smtp_admin_settings() {
      $params['subject'] = t('Drupal test e-mail');
      $params['body']    = t('If you receive this message it means your site is capable of sending e-mail.');
      drupal_mail('smtp', 'smtp-test', $test_address, $language, $params);
-     drupal_set_message(t('A test e-mail has been sent to @email. You may want to !check for any error messages.', array('@email' => $test_address, '!check' => l(t('check the logs'), 'admin/reports/watchdog'))));
+     drupal_set_message(t('A test e-mail has been sent to @email. You may want to !check for any error messages.', array('@email' => $test_address, '!check' => l(t('check the logs'), 'admin/reports/dblog'))));
    }
    $form['email_test'] = array(
      '#type'  => 'fieldset',
 Line 231 
 function smtp_admin_settings_validate($f
   *   An array with at least the following elements: id, to, subject, body and
   *  headers.
   *
-  * @see http://api.drupal.org/api/function/drupal_mail_send/6
+  * @see drupal_mail_send()
   */
  function drupal_mail_wrapper($message) {
-   $id      = $message['id'];
+   $id       = $message['id'];
-   $to      = $message['to'];
+   $to       = $message['to'];
-   $from    = $message['from'];
+   $from     = $message['from'];
-   $header  = $message['headers'];
+   $language = $message['language'];
-   $subject = $message['subject'];
+   $subject  = $message['subject'];
-   $body    = $message['body'];
+   $body     = $message['body'];
+   $headers  = $message['headers'];
    // Include the PHPMailer class (which includes the SMTP class).
    require_once(drupal_get_path('module', 'smtp') .'/phpmailer/class.phpmailer.php');
-Line 247 
 function drupal_mail_wrapper($message) {
+Line 248 
 function drupal_mail_wrapper($message) {
    // Create a new PHPMailer object.
    $mail = new PHPMailer();
-   global $language;
-   if ($language) {
+   // Set the language PHPMailer is to use.
+   if (!$language) {
+     global $language;
+     if ($language) {
+       $mail->SetLanguage($language->language, drupal_get_path('module', 'smtp') .'/phpmailer/language/');
+     }
+   }
+   else {
      $mail->SetLanguage($language->language, drupal_get_path('module', 'smtp') .'/phpmailer/language/');
    }
+   // Turn in debugging, if requested.
    if (variable_get('smtp_debugging', 0) == 1) {
      $mail->SMTPDebug = TRUE;
    }
-   $username = variable_get('smtp_username', '');
-   $password = variable_get('smtp_password', '');
-   // Set the default name e-mails should be from.
+   // Set the from name and e-mail address.
-   // If value is not defined in settings, use site_name.
    if (variable_get('smtp_fromname', '') != '') {
      $from_name = variable_get('smtp_fromname', '');
    }
    else {
-     // Blank value will let the e-mail address appear.
+     // If value is not defined in settings, use site_name.
      $from_name = variable_get('site_name', '');
    }
-   // If from e-mail address is blank, use smtp_from config option.
+   // Blank value will let the e-mail address appear.
+   if ($from == NULL || $from == '') {
+     // If from e-mail address is blank, use smtp_from config option.
+     if ($from = variable_get('smtp_from', '') == '') {
+       // If smtp_from config option is blank, use site_email.
+       if ($from = variable_get('site_email', '') == '') {
+         drupal_set_message(t('There is no submitted from address.'), 'error');
+         watchdog('smtp', 'There is no submitted from address.', array(), WATCHDOG_ERROR);
+         return FALSE;
+       }
+     }
+   }
+ /*
    if ($from == NULL || $from == '') {
      if (variable_get('smtp_from', '') != '') {
        $from = variable_get('smtp_from', '');
-Line 279 
 function drupal_mail_wrapper($message) {
+Line 299 
 function drupal_mail_wrapper($message) {
        $from = variable_get('site_email', '');
      }
    }
+  */
    if (preg_match('/^".*"\s*<.*>$/', $from)) {
+     // . == Matches any single character except line break characters \r and \n.
+     // * == Repeats the previous item zero or more times.
      $from_name = preg_replace('/"(.*)"(.*)/i',   '$1', $from); // It gives: Name
      $from      = preg_replace("/(.*)\<(.*)\>/i", '$2', $from); // It gives: name@domain.tld
    }
-   else if (!valid_email_address($from)) {
+   elseif (!valid_email_address($from)) {
-     $from_error_message = t('The submitted from address (@from) is not valid.', array('@from' => $from));
+     drupal_set_message(t('The submitted from address (@from) is not valid.', array('@from' => $from)), 'error');
-     drupal_set_message($from_error_message, 'error');
+     watchdog('smtp', 'The submitted from address (@from) is not valid.', array('@from' => $from), WATCHDOG_ERROR);
-     watchdog('smtp', $from_error_message, WATCHDOG_ERROR);
+     return FALSE;
-     return false;
    }
    // Defines the From value to what we expect.
- // This should be done correctly by PHPMailer now.
- //  $mail->From     = '"'. $from_name .'" <'. $from .'>';
    $mail->From     = $from;
    $mail->FromName = $from_name;
    $mail->Sender   = $from;
-   // Decide whether to use SMTP Authorization.
-   if ($username != '' and $password != '') {
+   // Create the list of 'To:' recipients.
-     // Do so if username and password are given.
+   $torecipients = split(',', $to);
-     $auth = TRUE;
+   foreach ($torecipients as $torecipient) {
-   }
+     if (strpos($torecipient, '<') !== FALSE) {
-   else {
+       $toparts = explode(' <', $torecipient);
-     $auth = FALSE;
+       $toname = $toparts[0];
+       $toaddr = rtrim($toparts[1], '>');
+     }
+     else {
+       $toname = '';
+       $toaddr = $torecipient;
+     }
+     $mail->AddAddress($toaddr, $toname);
    }
-   // Force the initial value to be set to text/plain.
-   $mail->IsHTML(FALSE);
-   // Take care of the e-mail headers.
+   // Parse the headers of the message and set the PHPMailer object's settings
-   foreach ($header as $key => $value) {
+   // accordingly.
+   foreach ($headers as $key => $value) {
      //watchdog('error', 'Key: ' . $key . ' Value: ' . $value);
-     if (drupal_strtolower($key) == 'from') {
+     switch (drupal_strtolower($key)) {
-       if ($from == NULL or $from == '') {
+       case 'from':
-         // If a from value was already given, then set based on header.
+         if ($from == NULL or $from == '') {
-         // Should be the most common situation since drupal_mail moves the
+           // If a from value was already given, then set based on header.
-         // from to headers.
+           // Should be the most common situation since drupal_mail moves the
-         $from           = $value;
+           // from to headers.
-         $mail->From     = $value;
+           $from           = $value;
-         // then from can be out of sync with from_name !
+           $mail->From     = $value;
-         $mail->FromName = '';
+           // then from can be out of sync with from_name !
-         $mail->Sender   = $value;
+           $mail->FromName = '';
-       }
+           $mail->Sender   = $value;
+         }
+         break;
+       case 'content-type':
+         if (strpos(drupal_strtolower($value), 'text/plain') !== FALSE) {
+           // The message includes only a plain text part.
+           $mail->IsHTML(FALSE);
+           // Set the charset based on the provided value, if there is one.
+           $charset = _smtp_get_substring($value, 'charset', '=', ';');
+           if ($charset) {
+             $mail->CharSet = $charset;
+           }
+           $content_type = 'text/plain';
+         }
+         elseif (strpos(drupal_strtolower($value), 'text/html') !== FALSE) {
+           // The message includes only an HTML part.
+           $mail->IsHTML(TRUE);
+           $content_type = 'text/html';
+         }
+         elseif (strpos(drupal_strtolower($value), 'multipart/related') !== FALSE) {
+           // The message includes an HTML part w/inline attachments.
+           $mail->ContentType = $content_type = 'multipart/related';
+         }
+         elseif (strpos(drupal_strtolower($value), 'multipart/alternative') !== FALSE) {
+           // The message includes both a plain text and an HTML part.
+           $mail->ContentType = $content_type = 'multipart/alternative';
+           // Get the boundary ID from the Content-Type header.
+           $boundary = _smtp_get_substring($value, 'boundary', '"', '"');
+         }
+         elseif (strpos(drupal_strtolower($value), 'multipart/mixed') !== FALSE) {
+           // The message includes one or more attachments.
+           $mail->ContentType = $content_type = 'multipart/mixed';
+           // Get the boundary ID from the Content-Type header.
+           $boundary = _smtp_get_substring($value, 'boundary', '"', '"');
+         }
+         else {
+           // Everything else is unsuppored by PHPMailer.
+           drupal_set_message(t('The Content-Type of your message is not supported by PHPMailer and will be sent as text/plain instead.'), 'error');
+           watchdog('smtp', 'The Content-Type of your message is not supported by PHPMailer and will be sent as text/plain instead.', array(), WATCHDOG_ERROR);
+           // Force the Content-Type to be text/plain.
+           $mail->IsHTML(FALSE);
+           $content_type = 'text/plain';
+         }
+         break;
+       case 'reply-to':
+         // Only add a "reply-to" if it's not the same as "return-path".
+         if ($value != $headers['Return-Path']) {
+           $mail->AddReplyTo($value);
+         }
+         break;
+       case 'content-transfer-encoding':
+         $mail->Encoding = $value;
+         break;
+       case 'return-path':
+       case 'mime-version':
+       case 'x-mailer':
+         // Let PHPMailer specify these.
+         break;
+       case 'errors-to':
+         $mail->AddCustomHeader('Errors-To: '. $value);
+         break;
+       case 'cc':
+         $ccrecipients = split(',', $value);
+         foreach ($ccrecipients as $ccrecipient) {
+           if (strpos($ccrecipient, '<') !== FALSE) {
+             $ccparts = explode(' <', $ccrecipient);
+             $ccname = $ccparts[0];
+             $ccaddr = rtrim($ccparts[1], '>');
+           }
+           else {
+             $ccname = '';
+             $ccaddr = $ccrecipient;
+           }
+           $mail->AddBCC($ccaddr, $ccname);
+         }
+         break;
+       case 'bcc':
+         $bccrecipients = split(',', $value);
+         foreach ($bccrecipients as $bccrecipient) {
+           if (strpos($bccrecipient, '<') !== FALSE) {
+             $bccparts = explode(' <', $bccrecipient);
+             $bccname = $bccparts[0];
+             $bccaddr = rtrim($bccparts[1], '>');
+           }
+           else {
+             $bccname = '';
+             $bccaddr = $bccrecipient;
+           }
+           $mail->AddBCC($bccaddr, $bccname);
+         }
+         break;
+       default:
+         // The header key is not special - add it as is.
+         $mail->AddCustomHeader($key .': '. $value);
      }
-     else if (drupal_strtolower($key) == 'content-type' && strpos(drupal_strtolower($value), 'text/html') !== FALSE) {
+   }
-       $mail->IsHTML(TRUE);
+ /**
+  * TODO
+  * Need to figure out the following.
+   // Add one last header item, but not if it has already been added.
+   $errors_to = FALSE;
+   foreach ($mail->CustomHeader as $custom_header) {
+     if ($custom_header[0] = '') {
+       $errors_to = TRUE;
      }
-     else if (drupal_strtolower($key) == 'content-type' && strpos(drupal_strtolower($value), 'multipart/mixed') !== FALSE) {
+   }
-       // $body passed to smtp should already be formatted. Add multipart
+   if ($errors_to) {
-       // header and tell phpmailer to leave it alone
+     $mail->AddCustomHeader('Errors-To: '. $from);
-       $mail->AddCustomHeader($key .': '. $value);
+   }
-       $mail->message_type = "pre";
+  */
-       $mail->ContentType = 'multipart/mixed';
-     }
-     else if (drupal_strtolower($key) == 'reply-to') {
+   // Add the message's subject.
-       // Only add a "reply-to" if it's not the same as "return-path".
+   $mail->Subject = $subject;
-       if ($value != $header['Return-Path']) {
-         $mail->AddReplyTo($value);
+   // Processes the message's body.
+   switch ($content_type) {
+     case 'multipart/related':
+       $mail->Body = $body;
+ /**
+  * TODO
+  * Firgure out if there is anything more to handling this type.
+  */
+       break;
+     case 'multipart/alternative':
+       // Split the body based on the boundary ID.
+       $body_parts = _smtp_boundary_split($body, $boundary);
+       foreach ($body_parts as $body_part) {
+         // If plain/text within the body part, add it to $mail->AltBody.
+         if (strpos($body_part, 'text/plain')) {
+           // Clean up the text.
+           $body_part = trim(_smtp_remove_headers(trim($body_part)));
+           // Include it as part of the mail object.
+           $mail->AltBody = $body_part;
+         }
+         // If plain/html within the body part, add it to $mail->Body.
+         elseif (strpos($body_part, 'text/html')) {
+           // Clean up the text.
+           $body_part = trim(_smtp_remove_headers(trim($body_part)));
+           // Include it as part of the mail object.
+           $mail->Body = $body_part;
+         }
        }
-     }
+       break;
-     else if (drupal_strtolower($key) == 'return-path') {
-       if (trim($value) !=  '') {
+     case 'multipart/mixed':
- // This is be set by SmtpSend()
+       // Split the body based on the boundary ID.
- //        $mail->Sender = $value;
+       $body_parts = _smtp_boundary_split($body, $boundary);
+       // Determine if there is an HTML part for when adding the plain text part.
+       $text_plain = FALSE;
+       $text_html  = FALSE;
+       foreach ($body_parts as $body_part) {
+         if (strpos($body_part, 'text/plain')) {
+           $text_plain = TRUE;
+         }
+         if (strpos($body_part, 'text/html')) {
+           $text_html = TRUE;
+         }
        }
-     }
-     else if (drupal_strtolower($key) == 'content-transfer-encoding') {
+       foreach ($body_parts as $body_part) {
-       $mail->Encoding = $value;
+         // If test/plain within the body part, add it to either
-     }
+         // $mail->AltBody or $mail->Body, depending on whether there is
-     else if (drupal_strtolower($key) == 'mime-version') {
+         // also a text/html part ot not.
-       // Ommit MIME-Version, since it will be set by PHPMailer.
+         if (strpos($body_part, 'multipart/alternative')) {
-     }
+           // Clean up the text.
-     else if (drupal_strtolower($key) == 'x-mailer') {
+           $body_part = trim(_smtp_remove_headers(trim($body_part)));
-       // Ommit X-Mailer, since it will be set by PHPMailer.
+           // Get boundary ID from the Content-Type header.
-     }
+           $boundary2 = _smtp_get_substring($body_part, 'boundary', '"', '"');
-     else if (drupal_strtolower($key) == 'errors-to') {
+           // Split the body based on the boundary ID.
-       // Prefer to keep control on this one, it will be set by PHPMailer.
+           $body_parts2 = _smtp_boundary_split($body_part, $boundary2);
-     }
-     else if (drupal_strtolower($key) == 'bcc') {
+           foreach ($body_parts2 as $body_part2) {
-       $bccrecipients = split(",", $value);
+             // If plain/text within the body part, add it to $mail->AltBody.
-       foreach ($bccrecipients as $bccrecipient) {
+             if (strpos($body_part2, 'text/plain')) {
-         if (strpos($bccrecipient, '<') !== false) {
+               // Clean up the text.
-           $bccparts = explode(" <", $bccrecipient);
+               $body_part2 = trim(_smtp_remove_headers(trim($body_part2)));
-           $bccname = $bccparts[0];
+               // Include it as part of the mail object.
-           $bccaddr = rtrim($bccparts[1], ">");
+               $mail->AltBody = $body_part2;
+               $mail->ContentType = 'multipart/mixed';
+             }
+             // If plain/html within the body part, add it to $mail->Body.
+             elseif (strpos($body_part2, 'text/html')) {
+               // Clean up the text.
+               $body_part2 = trim(_smtp_remove_headers(trim($body_part2)));
+               // Include it as part of the mail object.
+               $mail->Body = $body_part2;
+               $mail->ContentType = 'multipart/mixed';
+             }
+           }
          }
-         else {
+         // If text/plain within the body part, add it to $mail->Body.
-           $bccname = "";
+         elseif (strpos($body_part, 'text/plain')) {
-           $bccaddr = $bccrecipient;
+           // Clean up the text.
+           $body_part = trim(_smtp_remove_headers(trim($body_part)));
+           if ($text_html) {
+             $mail->AltBody = $body_part;
+             $mail->IsHTML(TRUE);
+             $mail->ContentType = 'multipart/mixed';
+           }
+           else {
+             $mail->Body = $body_part;
+             $mail->IsHTML(FALSE);
+             $mail->ContentType = 'multipart/mixed';
+           }
+         }
+         // If text/html within the body part, add it to $mail->Body.
+         elseif (strpos($body_part, 'text/html')) {
+           // Clean up the text.
+           $body_part = trim(_smtp_remove_headers(trim($body_part)));
+           // Include it as part of the mail object.
+           $mail->Body = $body_part;
+           $mail->IsHTML(TRUE);
+           $mail->ContentType = 'multipart/mixed';
+         }
+         // Add the attachment.
+         elseif (strpos($body_part, 'Content-Disposition: attachment;')) {
+           $file_path     = _smtp_get_substring($body_part, 'filename=', '"', '"');
+           $file_name     = _smtp_get_substring($body_part, ' name=', '"', '"');
+           $file_encoding = _smtp_get_substring($body_part, 'Content-Transfer-Encoding', ' ', "\n");
+           $file_type     = _smtp_get_substring($body_part, 'Content-Type', ' ', ';');
+           if (file_exists($file_path)) {
+             if (!$mail->AddAttachment($file_path, $file_name, $file_encoding, $filetype)) {
+               drupal_set_message('Attahment could not be found or accessed.');
+             }
+           }
+           else {
+             // Clean up the text.
+             $body_part = trim(_smtp_remove_headers(trim($body_part)));
+             if (drupal_strtolower($file_encoding) == 'base64') {
+               $attachment = base64_decode($body_part);
+             }
+             elseif (drupal_strtolower($file_encoding) == 'quoted-printable') {
+               $attachment = quoted_printable_decode($body_part);
+             }
+             else {
+               $attachment = $body_part;
+             }
+             $attachment_new_filename = tempnam(realpath(file_directory_temp()), 'smtp');
+             $file_path               = file_save_data($attachment, $attachment_new_filename, FILE_EXISTS_RENAME);
+             if (!$mail->AddAttachment($file_path, $file_name)) { // , $file_encoding, $filetype);
+               drupal_set_message('Attachment could not be found or accessed.');
+             }
+           }
          }
-         $mail->AddBCC($bccaddr, $bccname);
        }
-     }
+       break;
-     // Else the header key is not special.
-     else {
+     default:
-       // Add header line.
+       $mail->Body = $body;
-       $mail->AddCustomHeader($key .': '. $value);
+       break;
-     }
+   }
+   // Set the authentication settings.
+   $username = variable_get('smtp_username', '');
+   $password = variable_get('smtp_password', '');
+   // If username and password are given, use SMTP authentication.
+   if ($username != '' && $password != '') {
+     $mail->SMTPAuth = TRUE;
+     $mail->Username = $username;
+     $mail->Password = $password;
    }
-   // Set the correct protocol prefix to append to the smtp host.
+   // Set the protocol prefix for the smtp host.
    switch (variable_get('smtp_protocol', 'standard')) {
-     case "ssl":
+     case 'ssl':
        $mail->SMTPSecure = 'ssl';
        break;
-     case "tls":
+     case 'tls':
        $mail->SMTPSecure = 'tls';
        break;
-     case "standard":
+     default:
        $mail->SMTPSecure = '';
    }
-   $mail->Host = variable_get('smtp_host', '') .';'. variable_get('smtp_hostbackup', '');
-   $mail->Port = variable_get('smtp_port', '25');
-   $mail->Mailer = 'smtp';
-   $mail->SMTPAuth = $auth;
-   $mail->Username = $username;
-   $mail->Password = $password;
-   $mail->CharSet = 'utf-8';
-   $mail->AddCustomHeader('Errors-To: '. $from);
-   $torecipients = split(',', $to);
+   // Set other connection settings.
-   foreach ($torecipients as $torecipient) {
+   $mail->Host   = variable_get('smtp_host', '') .';'. variable_get('smtp_hostbackup', '');
-     if (strpos($torecipient, '<') !== false) {
+   $mail->Port   = variable_get('smtp_port', '25');
-       $toparts = explode(' <', $torecipient);
+   $mail->Mailer = 'smtp';
-       $toname = $toparts[0];
-       $toaddr = rtrim($toparts[1], '>');
-     }
-     else {
-       $toname = '';
-       $toaddr = $torecipient;
-     }
-     $mail->AddAddress($toaddr, $toname);
-   }
-   $mail->Subject = $subject;
-   $mail->Body = $body;
+   // Let the people know what is going on.
    watchdog('smtp', 'Sending mail to: @to', array('@to' => $to));
    // Try to send e-mail. If it fails, set watchdog entry.
    if (!$mail->Send()) {
      watchdog('smtp', 'Error sending e-mail from @from to @to : !error_message', array('@from' => $from, '@to' => $to, '!error_message' => $mail->ErrorInfo), WATCHDOG_ERROR);
-     return false;
+     return FALSE;
    }
    $mail->SmtpClose();
-   return true;
+   return TRUE;
  }  //  End of drupal_mail_wrapper().
-Line 443 
 function smtp_mail($key, &$message, $par
+Line 685 
 function smtp_mail($key, &$message, $par
      $message['body']    = $params['body'];
    }
  }  //  End of smtp_mail().
+ /**
+  * Splits the input into parts based on the given boundary.
+  *
+  * Swiped from Mail::MimeDecode, with modifications based on Drupal's coding
+  * standards and this bug report: http://pear.php.net/bugs/bug.php?id=6495
+  *
+  * @param input
+  *   A string containing the body text to parse.
+  * @param boundary
+  *   A string with the boundary string to parse on.
+  * @return
+  *   An array containing the resulting mime parts
+  */
+ function _smtp_boundary_split($input, $boundary) {
+   $parts       = array();
+   $bs_possible = drupal_substr($boundary, 2, -2);
+   $bs_check    = '\"'. $bs_possible .'\"';
+   if ($boundary == $bs_check) {
+     $boundary = $bs_possible;
+   }
+   $tmp = explode('--'. $boundary, $input);
+   for ($i = 1; $i < count($tmp); $i++) {
+     if (trim($tmp[$i])) {
+       $parts[] = $tmp[$i];
+     }
+   }
+   return $parts;
+ }  //  End of _smtp_boundary_split().
+ /**
+  * Strips the headers from the body part.
+  *
+  * @param input
+  *   A string containing the body part to strip.
+  * @return
+  *   A string with the stripped body part.
+  */
+ function _smtp_remove_headers($input) {
+   $part_array = explode("\n", $input);
+   if (strpos($part_array[0], 'Content') !== FALSE) {
+     if (strpos($part_array[1], 'Content') !== FALSE) {
+       if (strpos($part_array[2], 'Content') !== FALSE) {
+           array_shift($part_array);
+           array_shift($part_array);
+           array_shift($part_array);
+       }
+       else {
+         array_shift($part_array);
+         array_shift($part_array);
+       }
+     }
+     else {
+       array_shift($part_array);
+     }
+   }
+   $output = implode("\n", $part_array);
+   return $output;
+ }  //  End of _smtp_remove_headers().
+ /**
+  * Returns a string that is contained within another string.
+  *
+  * Returns the string from within $source that is some where after $target
+  * and is between $beginning_character and $ending_character.
+  *
+  * @param $source
+  *   A string containing the text to look through.
+  * @param $target
+  *   A string containing the text in $source to start looking from.
+  * @param $beginning_character
+  *   A string containing the character just before the sought after text.
+  * @param $ending_character
+  *   A string containing the character just after the sought after text.
+  * @return
+  *   A string with the text found between the $beginning_character and the
+  *   $ending_character.
+  */
+ function _smtp_get_substring($source, $target, $beginning_character, $ending_character) {
+   $search_start     = strpos($source, $target) + 1;
+   $first_character  = strpos($source, $beginning_character, $search_start) + 1;
+   $second_character = strpos($source, $ending_character, $first_character) + 1;
+   $substring        = drupal_substr($source, $first_character, $second_character - $first_character);
+   $string_length    = drupal_strlen($substring) - 1;
+   if ($substring[$string_length] == $ending_character) {
+     $substring = drupal_substr($substring, 0, $string_length);
+   }
+   return $substring;
+ }  //  End of _smtp_get_substring().

 Legend:



Removed from v.1.17.2.7
 


changed lines


 
Added in v.1.17.2.8
 Legend:



Removed from v.1.17.2.7
 


changed lines


 
Added in v.1.17.2.8
-Removed from v.1.17.2.7
+Added in v.1.17.2.8

	ViewVC Help
Powered by ViewVC 1.1.2