Commit d0107d49 authored by webchick's avatar webchick

Issue #950534 by mparker17, mgifford, Mixologic, jbloomfield, erinclerico,...

Issue #950534 by mparker17, mgifford, Mixologic, jbloomfield, erinclerico, theMusician, wmostrey | zirvap: [policy] Consistently use email instead of e-mail in Drupal.
parent 95725e29
...@@ -115,7 +115,7 @@ Drupal 8.0, xxxx-xx-xx (development version) ...@@ -115,7 +115,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
forms for any configuration. forms for any configuration.
* Reworked Gettext PO support to use pluggable read/write handlers. * Reworked Gettext PO support to use pluggable read/write handlers.
* Added language select form element in the Form API. * Added language select form element in the Form API.
- Added E-mail field type to core. - Added Email field type to core.
- Added Link field type to core. - Added Link field type to core.
- Added Phone number field type to core. - Added Phone number field type to core.
- Added local image input filter, to enable secure image posting. - Added local image input filter, to enable secure image posting.
...@@ -223,7 +223,7 @@ Drupal 7.0, 2011-01-05 ...@@ -223,7 +223,7 @@ Drupal 7.0, 2011-01-05
user roles and permissions. user roles and permissions.
* Refactored the "access rules" component of user module: The user module * Refactored the "access rules" component of user module: The user module
now provides a simple interface for blocking single IP addresses. The now provides a simple interface for blocking single IP addresses. The
previous functionality in the user module for restricting certain e-mail previous functionality in the user module for restricting certain email
addresses and usernames is now available as a contributed module. Further, addresses and usernames is now available as a contributed module. Further,
IP address range blocking is no longer supported and should be implemented IP address range blocking is no longer supported and should be implemented
at the operating system level. at the operating system level.
...@@ -359,7 +359,7 @@ Drupal 6.0, 2008-02-13 ...@@ -359,7 +359,7 @@ Drupal 6.0, 2008-02-13
default in the default installation profile. default in the default installation profile.
* Extended the database log module so log messages can be filtered. * Extended the database log module so log messages can be filtered.
* Added syslog module: useful for monitoring large Drupal installations. * Added syslog module: useful for monitoring large Drupal installations.
- Added optional e-mail notifications when users are approved, blocked, or - Added optional email notifications when users are approved, blocked, or
deleted. deleted.
- Drupal works with error reporting set to E_ALL. - Drupal works with error reporting set to E_ALL.
- Added scripts/drupal.sh to execute Drupal code from the command line. Useful - Added scripts/drupal.sh to execute Drupal code from the command line. Useful
...@@ -541,7 +541,7 @@ Drupal 5.0, 2007-01-15 ...@@ -541,7 +541,7 @@ Drupal 5.0, 2007-01-15
* 'Blogapi new' and 'blogapi edit' nodeapi operations. * 'Blogapi new' and 'blogapi edit' nodeapi operations.
- User module: - User module:
* Added hook_profile_alter(). * Added hook_profile_alter().
* E-mail verification is made optional. * Email verification is made optional.
* Added mass editing and filtering on admin/user/user. * Added mass editing and filtering on admin/user/user.
- PHP Template engine: - PHP Template engine:
* Add the ability to look for a series of suggested templates. * Add the ability to look for a series of suggested templates.
...@@ -766,7 +766,7 @@ Drupal 4.6.0, 2005-04-15 ...@@ -766,7 +766,7 @@ Drupal 4.6.0, 2005-04-15
* Introduced forum configuration pages. * Introduced forum configuration pages.
* Added a 'add child page' link to book pages. * Added a 'add child page' link to book pages.
- Contact module: - Contact module:
* Added a simple contact module that allows users to contact each other using e-mail. * Added a simple contact module that allows users to contact each other using email.
- Multi-site configuration: - Multi-site configuration:
* Made it possible to run multiple sites from a single code base. * Made it possible to run multiple sites from a single code base.
- Added an image API: enables better image handling. - Added an image API: enables better image handling.
...@@ -1113,7 +1113,7 @@ Drupal 3.0.0, 2001-09-15 ...@@ -1113,7 +1113,7 @@ Drupal 3.0.0, 2001-09-15
* Improved scheduler: * Improved scheduler:
+ Content can be scheduled to be 'posted', 'queued' and 'hidden'. + Content can be scheduled to be 'posted', 'queued' and 'hidden'.
* Improved account module: * Improved account module:
+ Added "access control" to allow/deny certain usernames/e-mail addresses/hostnames. + Added "access control" to allow/deny certain usernames/email addresses/hostnames.
* Improved locale module: * Improved locale module:
+ Added new overview to easy the translation process. + Added new overview to easy the translation process.
* Improved comment module: * Improved comment module:
......
...@@ -406,7 +406,7 @@ MORE INFORMATION ...@@ -406,7 +406,7 @@ MORE INFORMATION
- For a list of security announcements, see the "Security advisories" page at - For a list of security announcements, see the "Security advisories" page at
http://drupal.org/security (available as an RSS feed). This page also http://drupal.org/security (available as an RSS feed). This page also
describes how to subscribe to these announcements via e-mail. describes how to subscribe to these announcements via email.
- For information about the Drupal security process, or to find out how to - For information about the Drupal security process, or to find out how to
report a potential security issue to the Drupal security team, see the report a potential security issue to the Drupal security team, see the
......
...@@ -279,7 +279,7 @@ Database Logging module ...@@ -279,7 +279,7 @@ Database Logging module
DateTime module DateTime module
- ? - ?
E-mail module Email module
- Nils Destoop 'zuuperman' https://drupal.org/user/361625 - Nils Destoop 'zuuperman' https://drupal.org/user/361625
Editor module Editor module
......
...@@ -349,13 +349,13 @@ function drupal_get_destination() { ...@@ -349,13 +349,13 @@ function drupal_get_destination() {
*/ */
/** /**
* Verifies the syntax of the given e-mail address. * Verifies the syntax of the given email address.
* *
* This uses the * This uses the
* @link http://php.net/manual/filter.filters.validate.php PHP e-mail validation filter. @endlink * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
* *
* @param $mail * @param $mail
* A string containing an e-mail address. * A string containing an email address.
* *
* @return * @return
* TRUE if the address is in a valid format. * TRUE if the address is in a valid format.
......
...@@ -2484,7 +2484,7 @@ function form_validate_email(&$element, &$form_state) { ...@@ -2484,7 +2484,7 @@ function form_validate_email(&$element, &$form_state) {
form_set_value($element, $value, $form_state); form_set_value($element, $value, $form_state);
if ($value !== '' && !valid_email_address($value)) { if ($value !== '' && !valid_email_address($value)) {
form_error($element, $form_state, t('The e-mail address %mail is not valid.', array('%mail' => $value))); form_error($element, $form_state, t('The email address %mail is not valid.', array('%mail' => $value)));
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/** /**
* @file * @file
* API functions for processing and sending e-mail. * API functions for processing and sending email.
*/ */
use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Html;
...@@ -10,32 +10,32 @@ ...@@ -10,32 +10,32 @@
use Drupal\Core\Site\Settings; use Drupal\Core\Site\Settings;
/** /**
* Composes and optionally sends an e-mail message. * Composes and optionally sends an email message.
* *
* Sending an e-mail works with defining an e-mail template (subject, text * Sending an email works with defining an email template (subject, text
* and possibly e-mail headers) and the replacement values to use in the * and possibly email headers) and the replacement values to use in the
* appropriate places in the template. Processed e-mail templates are * appropriate places in the template. Processed email templates are
* requested from hook_mail() from the module sending the e-mail. Any module * requested from hook_mail() from the module sending the email. Any module
* can modify the composed e-mail message array using hook_mail_alter(). * can modify the composed email message array using hook_mail_alter().
* Finally drupal_mail_system()->mail() sends the e-mail, which can * Finally drupal_mail_system()->mail() sends the email, which can
* be reused if the exact same composed e-mail is to be sent to multiple * be reused if the exact same composed email is to be sent to multiple
* recipients. * recipients.
* *
* Finding out what language to send the e-mail with needs some consideration. * Finding out what language to send the email with needs some consideration.
* If you send e-mail to a user, her preferred language should be fine, so * If you send email to a user, her preferred language should be fine, so
* use user_preferred_langcode(). If you send email based on form values * use user_preferred_langcode(). If you send email based on form values
* filled on the page, there are two additional choices if you are not * filled on the page, there are two additional choices if you are not
* sending the e-mail to a user on the site. You can either use the language * sending the email to a user on the site. You can either use the language
* used to generate the page or the site default language. See * used to generate the page or the site default language. See
* language_default(). The former is good if sending e-mail to the person * language_default(). The former is good if sending email to the person
* filling the form, the later is good if you send e-mail to an address * filling the form, the later is good if you send email to an address
* previously set up (like contact addresses in a contact form). * previously set up (like contact addresses in a contact form).
* *
* Taking care of always using the proper language is even more important * Taking care of always using the proper language is even more important
* when sending e-mails in a row to multiple users. Hook_mail() abstracts * when sending emails in a row to multiple users. Hook_mail() abstracts
* whether the mail text comes from an administrator setting or is * whether the mail text comes from an administrator setting or is
* static in the source code. It should also deal with common mail tokens, * static in the source code. It should also deal with common mail tokens,
* only receiving $params which are unique to the actual e-mail at hand. * only receiving $params which are unique to the actual email at hand.
* *
* An example: * An example:
* *
...@@ -85,23 +85,23 @@ ...@@ -85,23 +85,23 @@
* called to complete the $message structure which will already contain common * called to complete the $message structure which will already contain common
* defaults. * defaults.
* @param string $key * @param string $key
* A key to identify the e-mail sent. The final message ID for e-mail altering * A key to identify the email sent. The final message ID for email altering
* will be {$module}_{$key}. * will be {$module}_{$key}.
* @param string $to * @param string $to
* The e-mail address or addresses where the message will be sent to. The * The email address or addresses where the message will be sent to. The
* formatting of this string will be validated with the * formatting of this string will be validated with the
* @link http://php.net/manual/filter.filters.validate.php PHP e-mail validation filter. @endlink * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
* Some examples are: * Some examples are:
* - user@example.com * - user@example.com
* - user@example.com, anotheruser@example.com * - user@example.com, anotheruser@example.com
* - User <user@example.com> * - User <user@example.com>
* - User <user@example.com>, Another User <anotheruser@example.com> * - User <user@example.com>, Another User <anotheruser@example.com>
* @param string $langcode * @param string $langcode
* Language code to use to compose the e-mail. * Language code to use to compose the email.
* @param array $params * @param array $params
* (optional) Parameters to build the e-mail. * (optional) Parameters to build the email.
* @param string|null $reply * @param string|null $reply
* Optional e-mail address to be used to answer. * Optional email address to be used to answer.
* @param bool $send * @param bool $send
* If TRUE, drupal_mail() will call drupal_mail_system()->mail() to deliver * If TRUE, drupal_mail() will call drupal_mail_system()->mail() to deliver
* the message, and store the result in $message['result']. Modules * the message, and store the result in $message['result']. Modules
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
* @return * @return
* The $message array structure containing all details of the * The $message array structure containing all details of the
* message. If already sent ($send = TRUE), then the 'result' element * message. If already sent ($send = TRUE), then the 'result' element
* will contain the success indicator of the e-mail, failure being already * will contain the success indicator of the email, failure being already
* written to the watchdog. (Success means nothing more than the message being * written to the watchdog. (Success means nothing more than the message being
* accepted at php-level, which still doesn't guarantee it to be delivered.) * accepted at php-level, which still doesn't guarantee it to be delivered.)
*/ */
...@@ -144,7 +144,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -144,7 +144,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
'Content-Transfer-Encoding' => '8Bit', 'Content-Transfer-Encoding' => '8Bit',
'X-Mailer' => 'Drupal' 'X-Mailer' => 'Drupal'
); );
// To prevent e-mail from looking like spam, the addresses in the Sender and // To prevent email from looking like spam, the addresses in the Sender and
// Return-Path headers should have a domain authorized to use the // Return-Path headers should have a domain authorized to use the
// originating SMTP server. // originating SMTP server.
$headers['Sender'] = $headers['Return-Path'] = $site_mail; $headers['Sender'] = $headers['Return-Path'] = $site_mail;
...@@ -154,7 +154,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -154,7 +154,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
} }
$message['headers'] = $headers; $message['headers'] = $headers;
// Build the e-mail (get subject and body, allow additional headers) by // Build the email (get subject and body, allow additional headers) by
// invoking hook_mail() on this module. We cannot use // invoking hook_mail() on this module. We cannot use
// moduleHandler()->invoke() as we need to have $message by reference in // moduleHandler()->invoke() as we need to have $message by reference in
// hook_mail(). // hook_mail().
...@@ -162,7 +162,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -162,7 +162,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
$function($key, $message, $params); $function($key, $message, $params);
} }
// Invoke hook_mail_alter() to allow all modules to alter the resulting e-mail. // Invoke hook_mail_alter() to allow all modules to alter the resulting email.
\Drupal::moduleHandler()->alter('mail', $message); \Drupal::moduleHandler()->alter('mail', $message);
// Retrieve the responsible implementation for this message. // Retrieve the responsible implementation for this message.
...@@ -171,7 +171,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -171,7 +171,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
// Format the message body. // Format the message body.
$message = $system->format($message); $message = $system->format($message);
// Optionally send e-mail. // Optionally send email.
if ($send) { if ($send) {
// The original caller requested sending. Sending was canceled by one or // The original caller requested sending. Sending was canceled by one or
// more hook_mail_alter() implementations. We set 'result' to NULL, because // more hook_mail_alter() implementations. We set 'result' to NULL, because
...@@ -184,8 +184,8 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -184,8 +184,8 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
$message['result'] = $system->mail($message); $message['result'] = $system->mail($message);
// Log errors. // Log errors.
if (!$message['result']) { if (!$message['result']) {
watchdog('mail', 'Error sending e-mail (from %from to %to with reply-to %reply).', array('%from' => $message['from'], '%to' => $message['to'], '%reply' => $message['reply-to'] ? $message['reply-to'] : t('not set')), WATCHDOG_ERROR); watchdog('mail', 'Error sending email (from %from to %to with reply-to %reply).', array('%from' => $message['from'], '%to' => $message['to'], '%reply' => $message['reply-to'] ? $message['reply-to'] : t('not set')), WATCHDOG_ERROR);
drupal_set_message(t('Unable to send e-mail. Contact the site administrator if the problem persists.'), 'error'); drupal_set_message(t('Unable to send email. Contact the site administrator if the problem persists.'), 'error');
} }
} }
} }
...@@ -199,7 +199,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply = ...@@ -199,7 +199,7 @@ function drupal_mail($module, $key, $to, $langcode, $params = array(), $reply =
* @param string $module * @param string $module
* The module name which was used by drupal_mail() to invoke hook_mail(). * The module name which was used by drupal_mail() to invoke hook_mail().
* @param string $key * @param string $key
* A key to identify the e-mail sent. The final message ID for the e-mail * A key to identify the email sent. The final message ID for the email
* alter hook in drupal_mail() would have been {$module}_{$key}. * alter hook in drupal_mail() would have been {$module}_{$key}.
* *
* @return \Drupal\Core\Mail\MailInterface * @return \Drupal\Core\Mail\MailInterface
...@@ -448,7 +448,7 @@ function drupal_html_to_text($string, $allowed_tags = NULL) { ...@@ -448,7 +448,7 @@ function drupal_html_to_text($string, $allowed_tags = NULL) {
* Note that we are skipping MIME content header lines, because attached files, * Note that we are skipping MIME content header lines, because attached files,
* especially applications, could have long MIME types or long filenames which * especially applications, could have long MIME types or long filenames which
* result in line length longer than the 77 characters limit and wrapping that * result in line length longer than the 77 characters limit and wrapping that
* line will break the e-mail format. E.g., the attached file hello_drupal.docx * line will break the email format. E.g., the attached file hello_drupal.docx
* will produce the following Content-Type: * will produce the following Content-Type:
* Content-Type: * Content-Type:
* application/vnd.openxmlformats-officedocument.wordprocessingml.document; * application/vnd.openxmlformats-officedocument.wordprocessingml.document;
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* *
* @FieldType( * @FieldType(
* id = "email", * id = "email",
* label = @Translation("E-mail"), * label = @Translation("Email"),
* description = @Translation("An entity field containing an e-mail value."), * description = @Translation("An entity field containing an email value."),
* default_widget = "email_default", * default_widget = "email_default",
* default_formatter = "string" * default_formatter = "string"
* ) * )
...@@ -29,7 +29,7 @@ class EmailItem extends FieldItemBase { ...@@ -29,7 +29,7 @@ class EmailItem extends FieldItemBase {
*/ */
public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) { public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
$properties['value'] = DataDefinition::create('email') $properties['value'] = DataDefinition::create('email')
->setLabel(t('E-mail value')); ->setLabel(t('Email value'));
return $properties; return $properties;
} }
...@@ -60,7 +60,7 @@ public function getConstraints() { ...@@ -60,7 +60,7 @@ public function getConstraints() {
'value' => array( 'value' => array(
'Length' => array( 'Length' => array(
'max' => EMAIL_MAX_LENGTH, 'max' => EMAIL_MAX_LENGTH,
'maxMessage' => t('%name: the e-mail address can not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => EMAIL_MAX_LENGTH)), 'maxMessage' => t('%name: the email address can not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => EMAIL_MAX_LENGTH)),
) )
), ),
)); ));
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* @FieldWidget( * @FieldWidget(
* id = "email_default", * id = "email_default",
* label = @Translation("E-mail"), * label = @Translation("Email"),
* field_types = { * field_types = {
* "email" * "email"
* } * }
......
...@@ -135,9 +135,9 @@ public function buildForm(array $form, array &$form_state) { ...@@ -135,9 +135,9 @@ public function buildForm(array $form, array &$form_state) {
); );
$form['site_information']['site_mail'] = array( $form['site_information']['site_mail'] = array(
'#type' => 'email', '#type' => 'email',
'#title' => $this->t('Site e-mail address'), '#title' => $this->t('Site email address'),
'#default_value' => ini_get('sendmail_from'), '#default_value' => ini_get('sendmail_from'),
'#description' => $this->t("Automated e-mails, such as registration information, will be sent from this address. Use an address ending in your site's domain to help prevent these e-mails from being flagged as spam."), '#description' => $this->t("Automated emails, such as registration information, will be sent from this address. Use an address ending in your site's domain to help prevent these emails from being flagged as spam."),
'#required' => TRUE, '#required' => TRUE,
'#weight' => -15, '#weight' => -15,
); );
...@@ -149,7 +149,7 @@ public function buildForm(array $form, array &$form_state) { ...@@ -149,7 +149,7 @@ public function buildForm(array $form, array &$form_state) {
$form['admin_account']['account']['#tree'] = TRUE; $form['admin_account']['account']['#tree'] = TRUE;
$form['admin_account']['account']['mail'] = array( $form['admin_account']['account']['mail'] = array(
'#type' => 'email', '#type' => 'email',
'#title' => $this->t('E-mail address'), '#title' => $this->t('Email address'),
'#required' => TRUE, '#required' => TRUE,
); );
$form['admin_account']['account']['name'] = array( $form['admin_account']['account']['name'] = array(
...@@ -199,7 +199,7 @@ public function buildForm(array $form, array &$form_state) { ...@@ -199,7 +199,7 @@ public function buildForm(array $form, array &$form_state) {
'#title' => $this->t('Update notifications'), '#title' => $this->t('Update notifications'),
'#options' => array( '#options' => array(
1 => $this->t('Check for updates automatically'), 1 => $this->t('Check for updates automatically'),
2 => $this->t('Receive e-mail notifications'), 2 => $this->t('Receive email notifications'),
), ),
'#default_value' => array(1, 2), '#default_value' => array(1, 2),
'#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href="@drupal">Drupal.org</a>.', array('@drupal' => 'http://drupal.org')), '#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href="@drupal">Drupal.org</a>.', array('@drupal' => 'http://drupal.org')),
......
...@@ -36,20 +36,20 @@ public function format(array $message); ...@@ -36,20 +36,20 @@ public function format(array $message);
* *
* @param array $message * @param array $message
* Message array with at least the following elements: * Message array with at least the following elements:
* - id: A unique identifier of the e-mail type. Examples: 'contact_user_copy', * - id: A unique identifier of the email type. Examples: 'contact_user_copy',
* 'user_password_reset'. * 'user_password_reset'.
* - to: The mail address or addresses where the message will be sent to. * - to: The mail address or addresses where the message will be sent to.
* The formatting of this string will be validated with the * The formatting of this string will be validated with the
* @link http://php.net/manual/filter.filters.validate.php PHP e-mail validation filter. @endlink * @link http://php.net/manual/filter.filters.validate.php PHP email validation filter. @endlink
* Some examples: * Some examples:
* - user@example.com * - user@example.com
* - user@example.com, anotheruser@example.com * - user@example.com, anotheruser@example.com
* - User <user@example.com> * - User <user@example.com>
* - User <user@example.com>, Another User <anotheruser@example.com> * - User <user@example.com>, Another User <anotheruser@example.com>
* - subject: Subject of the e-mail to be sent. This must not contain any * - subject: Subject of the email to be sent. This must not contain any
* newline characters, or the mail may not be sent properly. * newline characters, or the mail may not be sent properly.
* - body: Message to be sent. Accepts both CRLF and LF line-endings. * - body: Message to be sent. Accepts both CRLF and LF line-endings.
* E-mail bodies must be wrapped. You can use drupal_wrap_mail() for * Email bodies must be wrapped. You can use drupal_wrap_mail() for
* smart plain text wrapping. * smart plain text wrapping.
* - headers: Associative array containing all additional mail headers not * - headers: Associative array containing all additional mail headers not
* defined by one of the other parameters. PHP's mail() looks for Cc and * defined by one of the other parameters. PHP's mail() looks for Cc and
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
class PhpMail implements MailInterface { class PhpMail implements MailInterface {
/** /**
* Concatenates and wraps the e-mail body for plain-text mails. * Concatenates and wraps the email body for plain-text mails.
* *
* @param array $message * @param array $message
* A message array, as described in hook_mail_alter(). * A message array, as described in hook_mail_alter().
...@@ -42,7 +42,7 @@ public function format(array $message) { ...@@ -42,7 +42,7 @@ public function format(array $message) {
} }
/** /**
* Sends an e-mail message. * Sends an email message.
* *
* @param array $message * @param array $message
* A message array, as described in hook_mail_alter(). * A message array, as described in hook_mail_alter().
...@@ -70,7 +70,7 @@ public function mail(array $message) { ...@@ -70,7 +70,7 @@ public function mail(array $message) {
$line_endings = Settings::get('mail_line_endings', PHP_EOL); $line_endings = Settings::get('mail_line_endings', PHP_EOL);
// Prepare mail commands. // Prepare mail commands.
$mail_subject = mime_header_encode($message['subject']); $mail_subject = mime_header_encode($message['subject']);
// Note: e-mail uses CRLF for line-endings. PHP's API requires LF // Note: email uses CRLF for line-endings. PHP's API requires LF
// on Unix and CRLF on Windows. Drupal automatically guesses the // on Unix and CRLF on Windows. Drupal automatically guesses the
// line-ending format appropriate for your system. If you need to // line-ending format appropriate for your system. If you need to
// override this, adjust $settings['mail_line_endings'] in settings.php. // override this, adjust $settings['mail_line_endings'] in settings.php.
......
...@@ -130,10 +130,10 @@ public function getPreferredAdminLangcode($default = NULL); ...@@ -130,10 +130,10 @@ public function getPreferredAdminLangcode($default = NULL);
public function getUsername(); public function getUsername();
/** /**
* Returns the e-mail address of this account. * Returns the email address of this account.
* *
* @return string * @return string
* The e-mail address. * The email address.
*/ */
public function getEmail(); public function getEmail();
......
...@@ -80,7 +80,7 @@ class UserSession implements AccountInterface { ...@@ -80,7 +80,7 @@ class UserSession implements AccountInterface {
protected $preferred_admin_langcode; protected $preferred_admin_langcode;
/** /**
* The e-mail address of this account. * The email address of this account.
* *
* @var string * @var string
*/ */
......
...@@ -102,7 +102,7 @@ public function registerDefinitions() { ...@@ -102,7 +102,7 @@ public function registerDefinitions() {
'type' => FALSE, 'type' => FALSE,
)); ));
$this->discovery->setDefinition('Email', array( $this->discovery->setDefinition('Email', array(
'label' => t('E-mail'), 'label' => t('Email'),