diff --git README.txt README.txt index d6442ff..8257144 100644 --- README.txt +++ README.txt @@ -1,34 +1,34 @@ -Module: Multiple Email Addresses +Module: Multiple E-mail Addresses Author: Joshua Benner Sponsor: Rock River Star (www.rockriverstar.com) -- My employer Please note this is a development release. More features and finishing will come with some time. -The Multiple Email module allows users to register additional emails for their -user accounts. Only one email address is considered to be the "primary" email +The Multiple E-mail module allows users to register additional e-mails for their +user accounts. Only one e-mail address is considered to be the "primary" e-mail address, and will continue to behave as normal. Non-primary accounts are mostly functionally meaningless, except that during user registration any -email address registered to a user cannot be used to create a new account. +e-mail address registered to a user cannot be used to create a new account. -Users may select any confirmed email address to become their primary email -address. This means that the user account edit page's email address field will -not change the user's email address. The default settings for the module will -actually hide the email address field on the user account edit page. +Users may select any confirmed e-mail address to become their primary email +address. This means that the user account edit page's e-mail address field will +not change the user's e-mail address. The default settings for the module will +actually hide the e-mail address field on the user account edit page. At this time, there is no administrator interface to manage per-user multiple -email address settings. That is to come! +e-mail address settings. That is to come! This module was written to fill a small need on the growing number of Drupal- based social network sites that allow users to "invite" other users based on -their email address. While this module does not implement any invitation code +their e-mail address. While this module does not implement any invitation code or integrate directly with any modules that do, it is my hope that these -connections between Multiple Email and other modules will develop to enhance +connections between Multiple E-mail and other modules will develop to enhance the usefulness of both. Once the module is installed, administration settings are available under Site -Configuration -> Multiple Email Settings. The configuration options are rather +Configuration -> Multiple E-mail Settings. The configuration options are rather straight-forward at this point and are documented in the field descriptions. -The module will create a menu item in the Navigation menu called 'My Email -Addresses' that links to the user's email management page. \ No newline at end of file +The module will create a menu item in the Navigation menu called 'My E-mail +Addresses' that links to the user's e-mail management page. diff --git multiple_email.info multiple_email.info index 0544030..8ec0cb7 100644 --- multiple_email.info +++ multiple_email.info @@ -1,3 +1,3 @@ ; $Id$ -name = "Multiple Email Addresses" -description = "Allows users to have more than one registered email address" \ No newline at end of file +name = "Multiple E-mail Addresses" +description = "Allows users to have more than one registered e-mail address" diff --git multiple_email.install multiple_email.install index e8f3d46..492ddfa 100644 --- multiple_email.install +++ multiple_email.install @@ -32,7 +32,7 @@ function multiple_email_install() { break; } - // Now import current users' emails + // Now import current users' e-mails db_query(" INSERT INTO {multiple_email} (uid, email, time_registered, confirmed) @@ -52,4 +52,4 @@ function multiple_email_install() { function multiple_email_uninstall() { db_query('DROP TABLE {multiple_email}'); } -?> \ No newline at end of file +?> diff --git multiple_email.module multiple_email.module index 6636d74..cd719eb 100644 --- multiple_email.module +++ multiple_email.module @@ -57,8 +57,8 @@ function multiple_email_enable() { variable_set("multiple_email_$var", $current); } - drupal_set_message(t("Multiple Email settings are available under !link", - array( '!link' => l('Administer > Site configuration > Multiple Email Settings ', 'admin/settings/multiple-email/settings' ) ) + drupal_set_message(t("Multiple E-mail settings are available under !link", + array( '!link' => l('Administer > Site configuration > Multiple E-mail Settings ', 'admin/settings/multiple-email/settings' ) ) )); } @@ -81,44 +81,44 @@ function multiple_email_menu($may_cache) { if ($may_cache) { $items[] = array( 'path' => 'admin/settings/multiple-email', - 'title' => t('Multiple Email Settings'), - 'description' => t('Control behavior of the Multiple Email Addresses module'), + 'title' => t('Multiple E-mail Settings'), + 'description' => t('Control behavior of the Multiple E-mail Addresses module'), 'callback' => 'drupal_get_form', 'callback arguments' => array('multiple_email_admin_settings'), 'access' => user_access('administer site configuration'), ); $items[] = array( 'path' => 'my-email-addresses', - 'title' => t('My Email Addresses'), - 'description' => t('Manage the email addresses associated with your account'), + 'title' => t('My E-mail Addresses'), + 'description' => t('Manage the e-mail addresses associated with your account'), 'callback' => 'multiple_email_addresses_page', 'type' => MENU_NORMAL_ITEM, 'access' => user_access('multiple emails'), ); $items[] = array( 'path' => 'my-email-addresses/add', - 'title' => t('Add Email Address'), + 'title' => t('Add E-mail Address'), 'callback' => 'multiple_email_add_page', 'type' => MENU_CALLBACK, 'access' => user_access('multiple emails'), ); $items[] = array( 'path' => 'my-email-addresses/delete', - 'title' => t('Delete Email Address'), + 'title' => t('Delete E-mail Address'), 'callback' => 'multiple_email_delete_page', 'type' => MENU_CALLBACK, 'access' => user_access('multiple emails'), ); $items[] = array( 'path' => 'my-email-addresses/make-primary', - 'title' => t('Make Email My Primary Address'), + 'title' => t('Make E-mail My Primary Address'), 'callback' => 'multiple_email_primary_page', 'type' => MENU_CALLBACK, 'access' => user_access('multiple emails'), ); $items[] = array( 'path' => 'my-email-addresses/confirm', - 'title' => t('Confirm Email Address'), + 'title' => t('Confirm E-mail Address'), 'callback' => 'multiple_email_confirm_page', 'type' => MENU_CALLBACK, 'access' => user_access('multiple emails'), @@ -141,13 +141,13 @@ function multiple_email_user($op, &$edit, &$account, $category = NULL) { case 'login': if (!$account->login) { // They've never logged in before, so we're assuming their - // email address is confirmed since they were able to login + // e-mail address is confirmed since they were able to login multiple_email_confirm_email($account->uid, $account->mail); } break; case 'insert': /** - * Add user's entered email to the email registry as an + * Add user's entered e-mail to the e-mail registry as an * unconfirmed address, to be confirmed upon first successful * login to the web site. */ @@ -162,7 +162,7 @@ function multiple_email_user($op, &$edit, &$account, $category = NULL) { unset($edit['mail']); break; case 'validate': - // Keep new users from taking registered email addresses + // Keep new users from taking registered e-mail addresses if (multiple_email_find_address($edit['mail'])) { form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password')))); } @@ -173,7 +173,7 @@ function multiple_email_user($op, &$edit, &$account, $category = NULL) { /** * Implementation of hook_form_alter() * - * Remove email field from profile edit -- this will be done in address + * Remove e-mail field from profile edit -- this will be done in address * management screen, now. * * @param string $form_id @@ -182,13 +182,13 @@ function multiple_email_user($op, &$edit, &$account, $category = NULL) { */ function multiple_email_form_alter($form_id, &$form) { if ($form_id == 'user_edit' && variable_get('multiple_email_hide_field', true)) { - // We can't remove the email field, but bcb_user_user()'s submit op + // We can't remove the e-mail field, but bcb_user_user()'s submit op // hook will catch the mail field and remove it before it's sent // to the database. So instead, we hide it. $form['account']['mail']['#prefix'] = '
'; $form['account']['mail']['#suffix'] = '
'; - // TODO: Put admin-only fields here for changing primary email - // ... or maybe a separate admin email management interface + // TODO: Put admin-only fields here for changing primary e-mail + // ... or maybe a separate admin e-mail management interface } } @@ -210,7 +210,7 @@ function multiple_email_cron() { WHERE confirmed=0"); $now = time(); while ($row = db_fetch_object($result)) { - watchdog('Multiple Email', print_r($row, true)); + watchdog('Multiple E-mail', print_r($row, true)); if (strtotime("+$deadline days", $row->time_code_generated) <= $now && !$row->primary_address) { multiple_email_expire_address($row->eid); } @@ -226,8 +226,8 @@ function multiple_email_cron() { function multiple_email_admin_settings() { $form['multiple_email_hide_field'] = array( '#type' => 'select', - '#title' => t('Hide Email Field'), - '#description' => t('Hides the email field when editing a user'), + '#title' => t('Hide E-mail Field'), + '#description' => t('Hides the e-mail field when editing a user'), '#options' => array('No', 'Yes'), '#default_value' => variable_get('multiple_email_hide_field', 1), ); @@ -242,14 +242,14 @@ function multiple_email_admin_settings() { '#type' => 'textfield', '#size' => 4, '#title' => t('Confirm Days'), - '#description' => t('How many days a user has to enter a confirmation code. If 0, emails pending confirmation do not expire.'), + '#description' => t('How many days a user has to enter a confirmation code. If 0, e-mails pending confirmation do not expire.'), '#default_value' => variable_get('multiple_email_confirm_deadline', 5), ); $vars = '!username, !site, !email, !confirm_code, !confirm_url, !confirm_deadline'; $form['multiple_email_confirmation_subject'] = array( '#type' => 'textfield', - '#title' => t('Confirmation Email Subject'), - '#description' => t('Customize the subject of the message to be sent when a user adds a new email to their account.') + '#title' => t('Confirmation E-mail Subject'), + '#description' => t('Customize the subject of the message to be sent when a user adds a new e-mail to their account.') . '
' . t('Available variables are:') . $vars, @@ -257,8 +257,8 @@ function multiple_email_admin_settings() { ); $form['multiple_email_confirmation_body'] = array( '#type' => 'textarea', - '#title' => t('Confirmation Email Body'), - '#description' => t('Customize the body of the message to be sent when a user adds a new email to their account.') + '#title' => t('Confirmation E-mail Body'), + '#description' => t('Customize the body of the message to be sent when a user adds a new e-mail to their account.') . '
' . t('Available variables are:') . $vars, @@ -266,8 +266,8 @@ function multiple_email_admin_settings() { ); $form['multiple_email_expire_subject'] = array( '#type' => 'textfield', - '#title' => t('Expire Email Subject'), - '#description' => t('Customize the subject of the message to be sent when an unconfirmed email address expires.') + '#title' => t('Expire E-mail Subject'), + '#description' => t('Customize the subject of the message to be sent when an unconfirmed e-mail address expires.') . '
' . t('Available variables are:') . $vars, @@ -275,8 +275,8 @@ function multiple_email_admin_settings() { ); $form['multiple_email_expire_body'] = array( '#type' => 'textarea', - '#title' => t('Expire Email Body'), - '#description' => t('Customize the body of the message to be sent when an unconfirmed email address expires.') + '#title' => t('Expire E-mail Body'), + '#description' => t('Customize the body of the message to be sent when an unconfirmed e-mail address expires.') . '
' . t('Available variables are:') . $vars, @@ -302,7 +302,7 @@ function multiple_email_admin_settings_validate($form_id, $form_values) { } /** - * Returns an array of information about the specified user's associated email + * Returns an array of information about the specified user's associated e-mail * addresses. * * Index 0 contains an associative array of all the addresses in @@ -343,7 +343,7 @@ function multiple_email_load_addresses($uid, $tablesortHeaders = null) { } /** - * Loads a single address from the email registry and returns it as an object. + * Loads a single address from the e-mail registry and returns it as an object. * * @param integer $eid * @return object @@ -373,8 +373,8 @@ function multiple_email_get_address($eid) { } /** - * Finds the specified email and returns an object containing its data. - * Returns false if email cannot be found. + * Finds the specified e-mail and returns an object containing its data. + * Returns false if e-mail cannot be found. * * @param string $email * @return mixed @@ -390,9 +390,9 @@ function multiple_email_find_address($email) { } /** - * Adds an unconfirmed email address to the email registry. + * Adds an unconfirmed e-mail address to the e-mail registry. * - * If you specify the 3rd parameter to be true, the email address will be + * If you specify the 3rd parameter to be true, the e-mail address will be * recorded as having been confirmed. * * Returns the email's eid on success, false on failure. @@ -426,14 +426,14 @@ function multiple_email_register_email($uid, $email, $confirmed = false) { } /** - * Marks an email address as confirmed in the email registry + * Marks an e-mail address as confirmed in the e-mail registry * * @param integer $uid * @param string $email * @return void */ function multiple_email_confirm_email($uid, $email) { - watchdog('Multiple Email', "Marking address '$email' confirmed for user $uid", l('edit', "user/$uid")); + watchdog('Multiple E-mail', "Marking address '$email' confirmed for user $uid", l('edit', "user/$uid")); db_query(" UPDATE {multiple_email} SET confirmed = 1 @@ -466,7 +466,7 @@ function multiple_email_code($length, $chars = 'abcdefghijklmnopqrstuvwxyzABCDEF } /** - * Deletes specified email from registry - no error checking! + * Deletes specified e-mail from registry - no error checking! * * @param integer $eid * @return mixed @@ -476,7 +476,7 @@ function multiple_email_delete_email($eid) { } /** - * Changes specified user's primary email - no error checking! + * Changes specified user's primary e-mail - no error checking! * * @param object $account * @param object $email @@ -486,7 +486,7 @@ function multiple_email_make_primary($account, $email) { } /** - * Sends the confirmation email for the specified address to the specified + * Sends the confirmation e-mail for the specified address to the specified * user account. * * @param object $account @@ -500,7 +500,7 @@ function multiple_email_send_confirmation($account, $email) { /** * Removes the specified address from the user who added it and sends their - * primary email account a message notifying them about the expiration. + * primary e-mail account a message notifying them about the expiration. * * @param integer $eid */ @@ -511,11 +511,11 @@ function multiple_email_expire_address($eid) { $body = multiple_email_message_part('body', 'expire', $account, $email); multiple_email_delete_email($eid); drupal_mail('multiple_email_expire', $account->mail, $subject, $body, variable_get('site_mail', ini_get('sendmail_from'))); - watchdog('Multiple Email', "{$email->email} ({$email->eid}) for {$account->name} ({$account->uid}) has expired and been removed"); + watchdog('Multiple E-mail', "{$email->email} ({$email->eid}) for {$account->name} ({$account->uid}) has expired and been removed"); } /** - * Returns the part of the specified email message based on site settings. + * Returns the part of the specified e-mail message based on site settings. * * @param string $part (subject or body) * @param string $type @@ -537,8 +537,8 @@ function multiple_email_message_part($part, $type, $account, $email) { */ function multiple_email_default_subject($type) { $subjects = array( - 'confirmation' => 'Confirm your email address at !site', - 'expire' => 'Your email address at !site has expired', + 'confirmation' => 'Confirm your e-mail address at !site', + 'expire' => 'Your e-mail address at !site has expired', ); return $subjects[$type]; } @@ -560,8 +560,8 @@ function multiple_email_default_body($type) { * Valid tokens: * !username (User's username) * !site (Site's name) - * !email (Email address in question) - * !confirm_code (Email's confirmation code) + * !email (E-mail address in question) + * !confirm_code (E-mail's confirmation code) * !confirm_url (URL to confirmation page for address) * !confirm_deadline (Human-readable time within which to confirm) * @@ -592,16 +592,16 @@ function multiple_email_default_confirmation_body() { $message = << \ No newline at end of file +?> diff --git multiple_email_add_page.inc multiple_email_add_page.inc index 0c33498..403dae1 100644 --- multiple_email_add_page.inc +++ multiple_email_add_page.inc @@ -1,11 +1,11 @@ 'textfield', - '#title' => t('Email Address'), + '#title' => t('E-mail Address'), '#required' => true, ); $form[] = array( @@ -53,7 +53,7 @@ function multiple_email_add_form($account) { */ function multiple_email_add_form_validate($form_id, $form_values) { if (!valid_email_address($form_values['email'])) { - form_set_error('email', t('You must enter a valid email address!')); + form_set_error('email', t('You must enter a valid e-mail address!')); } elseif (multiple_email_find_address($form_values['email'])) { form_set_error('email', t('Entered address is already registered on this site.')); } @@ -70,11 +70,11 @@ function multiple_email_add_form_submit($form_id, $form_values) { if ($eid = multiple_email_register_email($user->uid, $form_values['email'])) { multiple_email_send_confirmation($user, multiple_email_get_address($eid)); - drupal_set_message(t("The email address '%email' has been added to your account and is awaiting confirmation.", + drupal_set_message(t("The e-mail address '%email' has been added to your account and is awaiting confirmation.", array('%email'=>$form_values['email']))); } else { drupal_set_message(t("Error attempting to register '%email'", array('%email'=>$form_values['email']))); } drupal_goto('my-email-addresses'); } -?> \ No newline at end of file +?> diff --git multiple_email_addresses_page.inc multiple_email_addresses_page.inc index 3a6addc..4d556e0 100644 --- multiple_email_addresses_page.inc +++ multiple_email_addresses_page.inc @@ -1,12 +1,12 @@ t('Email Address'), + 'data' => t('E-mail Address'), 'field' => 'a.email', ); $headers[] = array( @@ -41,7 +41,7 @@ function multiple_email_addresses_page() { } /** - * Builds form which will output a table of email addresses with management + * Builds form which will output a table of e-mail addresses with management * links * * @ingroup forms @@ -52,7 +52,7 @@ function multiple_email_addresses_form($addresses, $headers) { $form['#headers'] = $headers; $form['#columns'] = array('email', 'confirmed', 'primary', 'delete'); - $form['add']['#value'] = l('Add Email Address', 'my-email-addresses/add'); + $form['add']['#value'] = l('Add E-mail Address', 'my-email-addresses/add'); foreach ($addresses as $eid=>$a) { $aid = "address_$eid"; @@ -114,4 +114,4 @@ function theme_multiple_email_addresses_form($form) { $out .= drupal_render($form); return $out; } -?> \ No newline at end of file +?> diff --git multiple_email_confirm_page.inc multiple_email_confirm_page.inc index 9a58823..38b3ea8 100644 --- multiple_email_confirm_page.inc +++ multiple_email_confirm_page.inc @@ -5,7 +5,7 @@ */ /** - * Renders the page to confirm an email address + * Renders the page to confirm an e-mail address * * If code is passed in on URL, then it will populate that value in the text * field. @@ -21,8 +21,8 @@ function multiple_email_confirm_page($eid, $code = null) { if ($email = multiple_email_get_address($eid)) { if ($email->uid != $user->uid) { - drupal_set_message(t('Email address not found')); - watchdog('Multiple Email', 'Unauthorized attempt to access email ' . $eid . ' by ' . $user->name . ' (' . $user->uid . ')'); + drupal_set_message(t('E-mail address not found')); + watchdog('Multiple E-mail', 'Unauthorized attempt to access e-mail ' . $eid . ' by ' . $user->name . ' (' . $user->uid . ')'); drupal_goto('my-email-addresses'); } elseif ($email->confirmed) { drupal_set_message(t("'%email' is already confirmed!", array('%email'=>$email->email))); @@ -31,8 +31,8 @@ function multiple_email_confirm_page($eid, $code = null) { $out .= drupal_get_form('multiple_email_confirm_form', $email, $code); } } else { - drupal_set_message(t('Email address not found')); - watchdog('Multiple Email', 'Error loading email ' . $eid, WATCHDOG_WARNING); + drupal_set_message(t('E-mail address not found')); + watchdog('Multiple E-mail', 'Error loading e-mail ' . $eid, WATCHDOG_WARNING); drupal_goto('my-email-addresses'); } @@ -40,7 +40,7 @@ function multiple_email_confirm_page($eid, $code = null) { } /** - * Builds email confirmation form + * Builds e-mail confirmation form * * @ingroup forms * @@ -57,7 +57,7 @@ function multiple_email_confirm_form($email, $confirm_code) { ); $form[] = array( '#prefix' => '

', - '#value' => t("The email address '%email' is awaiting confirmation. You should have received an email at that address with a confirmation code in it. Enter the code below and click confirm.", + '#value' => t("The e-mail address '%email' is awaiting confirmation. You should have received an e-mail at that address with a confirmation code in it. Enter the code below and click confirm.", array('%email'=>$email->email)), '#suffix' => '

', ); @@ -92,7 +92,7 @@ function multiple_email_confirm_form_submit($form_id, $form_values) { if ($email = multiple_email_get_address($form_values['eid'])) { if ($user->uid != $email->uid) { - watchdog('Multiple Email', "Attempted unauthorized access to email {$email->eid} by user {$user->name} ({$user->uid})"); + watchdog('Multiple E-mail', "Attempted unauthorized access to e-mail {$email->eid} by user {$user->name} ({$user->uid})"); } elseif ($email->confirmed) { drupal_set_message("'{$email->email}' is already confirmed!"); } elseif (trim($form_values['code']) != $email->confirm_code) { @@ -112,7 +112,7 @@ function multiple_email_confirm_form_submit($form_id, $form_values) { $email->eid ); multiple_email_send_confirmation($user, $email); - drupal_set_message('You have exhausted your allowed attempts at confirming this email address. A new confirmation code has been sent.'); + drupal_set_message('You have exhausted your allowed attempts at confirming this e-mail address. A new confirmation code has been sent.'); } else { db_query("UPDATE {multiple_email} SET attempts=%d WHERE eid=%d", $attempts, $email->eid); drupal_set_message('The confirmation code was incorrect'); @@ -124,8 +124,8 @@ function multiple_email_confirm_form_submit($form_id, $form_values) { drupal_goto('my-email-addresses'); } } else { - watchdog('Multiple Email', 'Error loading email ' . $form_values['eid'], WATCHDOG_WARNING); + watchdog('Multiple E-mail', 'Error loading e-mail ' . $form_values['eid'], WATCHDOG_WARNING); } drupal_goto("my-email-addresses/confirm/{$form_values['eid']}"); } -?> \ No newline at end of file +?> diff --git multiple_email_delete_page.inc multiple_email_delete_page.inc index 235ee1e..d0deadd 100644 --- multiple_email_delete_page.inc +++ multiple_email_delete_page.inc @@ -5,12 +5,12 @@ */ /** - * Shows confirmation that you want to delete the specified email address + * Shows confirmation that you want to delete the specified e-mail address * * If the second argument is true, then it will just go ahead and delete. * * @param integer $eid - * ID of the email to be deleted + * ID of the e-mail to be deleted * * @return string */ @@ -20,31 +20,31 @@ function multiple_email_delete_page($eid) { if ($email = multiple_email_get_address($eid)) { if ($user->uid == $email->uid) { if ($email->primary_address) { - drupal_set_message(t('You can not delete your primary email address!')); + drupal_set_message(t('You can not delete your primary e-mail address!')); } else { return drupal_get_form('multiple_email_delete_form', $email); } } else { - drupal_set_message(t('Email address not found')); - watchdog('Multiple Email', 'Attempted unauthorized access to email ' . $eid . ' by user ' . $user->uid); + drupal_set_message(t('E-mail address not found')); + watchdog('Multiple E-mail', 'Attempted unauthorized access to e-mail ' . $eid . ' by user ' . $user->uid); } } else { - drupal_set_message(t('Email address not found')); - watchdog('Multiple Email', 'Failed to load address ' . $eid, WATCHDOG_WARNING); + drupal_set_message(t('E-mail address not found')); + watchdog('Multiple E-mail', 'Failed to load address ' . $eid, WATCHDOG_WARNING); } drupal_goto('my-email-addresses'); } /** - * Form displayed to confirm deletion of an email address from the registry + * Form displayed to confirm deletion of an e-mail address from the registry * * @ingroup forms * @see multiple_email_delete_form_validate() * @see multiple_email_delete_form_submit() * * @param object $email - * Email object from the database + * E-mail object from the database * * @return string */ @@ -83,14 +83,14 @@ function multiple_email_delete_form_validate($form_id, $form_values) { if ($email = multiple_email_get_address($form_values['eid'])) { if ($user->uid != $email->uid) { - watchdog('Multiple Email', 'Attempted unauthorized access to email ' . $form_values['eid'] . ' by user ' . $user->uid); + watchdog('Multiple E-mail', 'Attempted unauthorized access to e-mail ' . $form_values['eid'] . ' by user ' . $user->uid); drupal_goto('my-email-addresses'); } elseif ($email->primary_address) { - drupal_set_message('You cannot delete your primary email address!'); + drupal_set_message('You cannot delete your primary e-mail address!'); drupal_goto('my-email-addresses'); } } else { - watchdog('Multiple Email', 'Invalid eid value: ' . $form_values['eid'], WATCHDOG_WARNING); + watchdog('Multiple E-mail', 'Invalid eid value: ' . $form_values['eid'], WATCHDOG_WARNING); drupal_goto('my-email-addresses'); } } @@ -106,7 +106,7 @@ function multiple_email_delete_form_validate($form_id, $form_values) { function multiple_email_delete_form_submit($form_id, $form_values) { $email = multiple_email_get_address($form_values['eid']); multiple_email_delete_email($form_values['eid']); - drupal_set_message("The email address '{$email->email}' has been removed from your account."); + drupal_set_message("The e-mail address '{$email->email}' has been removed from your account."); drupal_goto('my-email-addresses'); } -?> \ No newline at end of file +?> diff --git multiple_email_primary_page.inc multiple_email_primary_page.inc index dea05ba..f699ad6 100644 --- multiple_email_primary_page.inc +++ multiple_email_primary_page.inc @@ -1,7 +1,7 @@ uid); + watchdog('Multiple E-mail', 'Attempted unauthorized access to e-mail ' . $eid . ' by user ' . $user->uid); } } else { - watchdog('Multiple Email', 'Failed to load address ' . $eid, WATCHDOG_WARNING); + watchdog('Multiple E-mail', 'Failed to load address ' . $eid, WATCHDOG_WARNING); } drupal_goto('my-email-addresses'); } /** - * Builds form for confirming moving an email to primary status + * Builds form for confirming moving an e-mail to primary status * * @ingroup forms * @see multiple_email_primary_form_validate() * @see multiple_email_primary_form_submit() * * @param object $email - * And email object from the database + * And e-mail object from the database * * @return array */ @@ -48,7 +48,7 @@ function multiple_email_primary_form($email) { ); $form[]= array( '#prefix' => '

', - '#value' => "Are you sure you wish to make the address '{$email->email}' your primary email address?", + '#value' => "Are you sure you wish to make the address '{$email->email}' your primary e-mail address?", '#suffix' => '

', ); $form['confirm'] = array( @@ -76,14 +76,14 @@ function multiple_email_primary_form_validate($form_id, $form_values) { if ($email = multiple_email_get_address($form_values['eid'])) { if ($user->uid != $email->uid) { - watchdog('Multiple Email', 'Attempted unauthorized access to email ' . $form_values['eid'] . ' by user ' . $user->uid); + watchdog('Multiple E-mail', 'Attempted unauthorized access to e-mail ' . $form_values['eid'] . ' by user ' . $user->uid); drupal_goto('my-email-addresses'); } elseif ($email->primary_address) { drupal_set_message("'{$email->email}' is already your primary address!"); drupal_goto('my-email-addresses'); } } else { - watchdog('Multiple Email', 'Invalid eid value: ' . $form_values['eid'], WATCHDOG_WARNING); + watchdog('Multiple E-mail', 'Invalid eid value: ' . $form_values['eid'], WATCHDOG_WARNING); drupal_goto('my-email-addresses'); } } @@ -100,7 +100,7 @@ function multiple_email_primary_form_submit($form_id, $form_values) { $email = multiple_email_get_address($form_values['eid']); multiple_email_make_primary($user, $email); - drupal_set_message("'{$email->email}' is now your primary email address."); + drupal_set_message("'{$email->email}' is now your primary e-mail address."); drupal_goto('my-email-addresses'); } -?> \ No newline at end of file +?>