Unverified Commit 61f83595 authored by Parker Brown's avatar Parker Brown
Browse files

Remove wildcard from variable

parent f766ce77
Loading
Loading
Loading
Loading
+3 −19
Changes for email_domain_validate_mxr.module: 3 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
 */

define('EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_REPORTING_VIEW_PATH', 'admin/reports/email-domain-validate-mxr-failures');
define('EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_ERROR_MESSAGE', 'The email domain !email_domain that you have entered is not valid. Please enter an email address with a valid domain.');
define('EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_ERROR_MESSAGE', 'Enter an email address with a valid domain.');
define('EMAIL_DOMAIN_VALIDATE_MXR_EMAIL_DATA_TYPE', 'email');
define('EMAIL_DOMAIN_VALIDATE_MXR_FAIL_CODE', 11);

@@ -72,17 +72,6 @@ function email_domain_validate_mxr_help($path, $arg) {
      else {
        $output .= t('If you want this to be a multilingual, you have to install the i18n_variable module');
      }
      $output .= '<ul>';
      $output .= '<li><strong>';
      $output .= t('Wildcard');
      $output .= '</strong> - ';
      $output .= t('Use the wildcard !strong_open!email_domain!strong_close in the custom error message to show the offending email domain.!line_break',
        array(
          '!strong_open' => '<strong>',
          '!strong_close' => '</strong>',
          '!line_break' => '<br>',
        ));
      $output .= '</li></ul></li>';
      $output .= '</li>';

      $output .= '<li><strong>';
@@ -768,20 +757,15 @@ function email_domain_validate_mxr_webform_component_render_alter(array &$elemen
/**
 * Checks for translatable error message and returns string.
 *
 * Replaces the !email_domain wildcard.
 *
 * @param string $email_domain
 *   Email domain to replace the wildcard with.
 *
 * @return string
 *   Error string depending on if the i18n_variable module is enabled.
 */
function email_domain_validate_mxr_get_error_message(string $email_domain = '!email_domain') {
function email_domain_validate_mxr_get_error_message() {
  $langcode = $GLOBALS['i18n_language_variable']->language ?? 'en';

  $error_message = module_exists('i18n_variable') ?
    i18n_variable_get('email_domain_validate_mxr_error_message', $langcode, EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_ERROR_MESSAGE) :
    variable_get('email_domain_validate_mxr_error_message', EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_ERROR_MESSAGE);

  return str_replace('!email_domain', $email_domain, $error_message);
  return $error_message;
}
+0 −1
Changes for email_domain_validate_mxr.variable.inc: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@
function email_domain_validate_mxr_variable_info($options = array()) {
  $variables['email_domain_validate_mxr_error_message'] = array(
    'title' => t('Email Domain Validate MXR Error Message'),
    'description' => t('Use token "!email_domain" where you want to display the offending email domain.'),
    'type' => 'string',
    'default' => EMAIL_DOMAIN_VALIDATE_MXR_DEFAULT_ERROR_MESSAGE,
    'localize' => TRUE,