diff --git a/modules/oauth20/cms_oauth_20_email_service.e b/modules/oauth20/cms_oauth_20_email_service.e index 9ac7c49..de2f7e6 100644 --- a/modules/oauth20/cms_oauth_20_email_service.e +++ b/modules/oauth20/cms_oauth_20_email_service.e @@ -34,19 +34,6 @@ feature -- Access feature -- Basic Operations - send_contact_email (a_to, a_content: READABLE_STRING_8) - -- Send successful contact message `a_token' to `a_to'. - require - attached_to: a_to /= Void - local - l_message: STRING - do - create l_message.make_from_string (parameters.account_activation) - l_message.replace_substring_all ("$link", a_content) - send_message (contact_email, a_to, parameters.contact_subject_register, l_message) - end - - send_contact_welcome_email (a_to, a_content: READABLE_STRING_8) -- Send successful contact message `a_token' to `a_to'. require @@ -56,8 +43,7 @@ feature -- Basic Operations do create l_message.make_from_string (parameters.account_welcome) l_message.replace_substring_all ("$link", a_content) - send_message (contact_email, a_to, parameters.contact_subject_oauth, l_message) + send_message (contact_email, a_to, parameters.contact_subject_register, l_message) end - end diff --git a/modules/oauth20/cms_oauth_20_email_service_parameters.e b/modules/oauth20/cms_oauth_20_email_service_parameters.e index 824d905..3bc9dc0 100644 --- a/modules/oauth20/cms_oauth_20_email_service_parameters.e +++ b/modules/oauth20/cms_oauth_20_email_service_parameters.e @@ -71,23 +71,6 @@ feature {NONE} -- Initialization else contact_subject_register := "Thank you for registering with us." end - - if l_subject_activate /= Void then - contact_subject_activate := l_subject_activate - else - contact_subject_activate := "New account activation token." - end - if l_subject_password /= Void then - contact_subject_password := l_subject_password - else - contact_subject_password := "Password Recovery." - end - if l_subject_oauth /= Void then - contact_subject_oauth := l_subject_oauth - else - contact_subject_oauth := "Welcome." - end - end feature -- Access @@ -100,27 +83,6 @@ feature -- Access -- Contact email. contact_subject_register: IMMUTABLE_STRING_8 - contact_subject_activate: IMMUTABLE_STRING_8 - contact_subject_password: IMMUTABLE_STRING_8 - contact_subject_oauth: IMMUTABLE_STRING_8 - - account_activation: STRING - -- Account activation template email message. - do - Result := template_string ("account_activation.html", default_template_account_activation) - end - - account_re_activation: STRING - -- Account re_activation template email message. - do - Result := template_string ("accunt_re_activation.html", default_template_account_re_activation) - end - - account_password: STRING - -- Account password template email message. - do - Result := template_string ("account_new_password.html", default_template_account_new_password) - end account_welcome: STRING -- Account welcome template email message. @@ -174,72 +136,6 @@ feature {NONE} -- Implementation feature {NONE} -- Message email - default_template_account_activation: STRING = "[ - - - - - Activation - - - - - -

Thank you for registering at ROC CMS

- -

To complete your registration, please click on the following link to activate your account:

- -

$link

-

Thank you for joining us.

- - - ]" - - - default_template_account_re_activation: STRING = "[ - - - - - New Activation - - - - - -

You have requested a new activation token at ROC CMS

- -

To complete your registration, please click on the following link to activate your account:

- -

$link

-

Thank you for joining us.

- - - ]" - - - - default_template_account_new_password: STRING = "[ - - - - - New Password - - - - - -

You have required a new password at ROC CMS

- -

To complete your request, please click on this link to generate a new password:

- -

$link

- - - ]" - - default_template_account_welcome: STRING = "[ diff --git a/modules/openid/cms_openid_email_service.e b/modules/openid/cms_openid_email_service.e index cc514fd..17ae263 100644 --- a/modules/openid/cms_openid_email_service.e +++ b/modules/openid/cms_openid_email_service.e @@ -34,18 +34,6 @@ feature -- Access feature -- Basic Operations - send_contact_email (a_to, a_content: READABLE_STRING_8) - -- Send successful contact message `a_token' to `a_to'. - require - attached_to: a_to /= Void - local - l_message: STRING - do - create l_message.make_from_string (parameters.account_activation) - l_message.replace_substring_all ("$link", a_content) - send_message (contact_email, a_to, parameters.contact_subject_register, l_message) - end - send_contact_welcome_email (a_to, a_content: READABLE_STRING_8) -- Send successful contact message `a_token' to `a_to'. diff --git a/modules/openid/cms_openid_email_service_parameters.e b/modules/openid/cms_openid_email_service_parameters.e index a4ec81a..030678a 100644 --- a/modules/openid/cms_openid_email_service_parameters.e +++ b/modules/openid/cms_openid_email_service_parameters.e @@ -84,24 +84,6 @@ feature -- Access contact_subject_register: IMMUTABLE_STRING_8 - account_activation: STRING - -- Account activation template email message. - do - Result := template_string ("account_activation.html", default_template_account_activation) - end - - account_re_activation: STRING - -- Account re_activation template email message. - do - Result := template_string ("accunt_re_activation.html", default_template_account_re_activation) - end - - account_password: STRING - -- Account password template email message. - do - Result := template_string ("account_new_password.html", default_template_account_new_password) - end - account_welcome: STRING -- Account welcome template email message. do @@ -154,72 +136,6 @@ feature {NONE} -- Implementation feature {NONE} -- Message email - default_template_account_activation: STRING = "[ - - - - - Activation - - - - - -

Thank you for registering at ROC CMS

- -

To complete your registration, please click on the following link to activate your account:

- -

$link

-

Thank you for joining us.

- - - ]" - - - default_template_account_re_activation: STRING = "[ - - - - - New Activation - - - - - -

You have requested a new activation token at ROC CMS

- -

To complete your registration, please click on the following link to activate your account:

- -

$link

-

Thank you for joining us.

- - - ]" - - - - default_template_account_new_password: STRING = "[ - - - - - New Password - - - - - -

You have required a new password at ROC CMS

- -

To complete your request, please click on this link to generate a new password:

- -

$link

- - - ]" - - default_template_account_welcome: STRING = "[