← All changes | src/includes/classes/email-configs.inc.php +3 -14 260805 → 260917 View file →

		@@ -193,9 +193,9 @@
193	193	foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
194	194	do_action('ws_plugin__s2member_before_reset_pass_resend_new_user_notification', get_defined_vars ());
195	195	unset($__refs, $__v); // Housekeeping.
196	196
197		- $user_id = (integer)$user_id;
	197	+ $user_id = (int)$user_id;
198	198	$user_pass = (string)$user_pass;
199	199	$notify = (array)$notify;
200	200	$user_email = (string)$user_email;
201	201
		@@ -227,9 +227,9 @@
227	227	foreach(array_keys(get_defined_vars())as$__v)$__refs[$__v]=&$$__v;
228	228	do_action('ws_plugin__s2member_before_new_user_notification', get_defined_vars ());
229	229	unset($__refs, $__v); // Housekeeping.
230	230
231		- $user_id = (integer)$user_id;
	231	+ $user_id = (int)$user_id;
232	232	$user_pass = (string)$user_pass;
233	233	$notify = (array)$notify;
234	234	$user_email = (string)$user_email;
235	235
		@@ -345,13 +345,8 @@
345	345	break; // Empty; we can stop here.
346	346
347	347	if (($sbj = trim (preg_replace ('/%%(.+?)%%/i', '', $sbj))) && ($msg = trim (preg_replace ('/%%(.+?)%%/i', '', $msg))))
348	348	{
349		- if (!is_multisite () || !c_ws_plugin__s2member_utils_conds::is_multisite_farm () || is_main_site ())
350		- {
351		- $sbj = c_ws_plugin__s2member_utilities::evl($sbj, get_defined_vars());
352		- $msg = c_ws_plugin__s2member_utilities::evl($msg, get_defined_vars());
353		- }
354	349	//250617 HTML email support.
355	350	if (empty($GLOBALS['WS_PLUGIN__']['s2member']['o']['html_emails_enabled'])) {
356	351	c_ws_plugin__s2member_email_configs::email_config () . wp_mail ($user->user_email, apply_filters('ws_plugin__s2member_welcome_email_sbj', $sbj, get_defined_vars()), apply_filters('ws_plugin__s2member_welcome_email_msg', $msg, get_defined_vars()), 'From: "' . preg_replace ('/"/', "'", $GLOBALS['WS_PLUGIN__']['s2member']['o']['reg_email_from_name']) . '" <' . $GLOBALS['WS_PLUGIN__']['s2member']['o']['reg_email_from_email'] . '>'."\r\n".'Content-Type: text/plain; charset=UTF-8') . c_ws_plugin__s2member_email_configs::email_config_release ();;
357	352	} else {
		@@ -451,15 +446,9 @@
451	446	break; // Empty; we can stop here.
452	447
453	448	if (($rec = trim (preg_replace ('/%%(.+?)%%/i', '', $rec))) && ($sbj = trim (preg_replace ('/%%(.+?)%%/i', '', $sbj))) && ($msg = trim (preg_replace ('/%%(.+?)%%/i', '', $msg))))
454	449	{
455		- if (!is_multisite () || !c_ws_plugin__s2member_utils_conds::is_multisite_farm () || is_main_site ())
456		- {
457		- $rec = c_ws_plugin__s2member_utilities::evl($rec, get_defined_vars());
458		- $sbj = c_ws_plugin__s2member_utilities::evl($sbj, get_defined_vars());
459		- $msg = c_ws_plugin__s2member_utilities::evl($msg, get_defined_vars());
460		- }
461		- foreach (c_ws_plugin__s2member_utils_strings::parse_emails ($rec) as $recipient) // A list of receipients.
	450	+ foreach (c_ws_plugin__s2member_utils_strings::parse_emails (apply_filters('ws_plugin__s2member_admin_new_user_email_recipients', $rec, get_defined_vars())) as $recipient) // A list of receipients.
462	451	{
463	452	//250617 HTML email support.
464	453	if (empty($GLOBALS['WS_PLUGIN__']['s2member']['o']['html_emails_enabled'])) {
465	454	wp_mail ($recipient, apply_filters('ws_plugin__s2member_admin_new_user_email_sbj', $sbj, get_defined_vars()), apply_filters('ws_plugin__s2member_admin_new_user_email_msg', $msg, get_defined_vars()), 'Content-Type: text/plain; charset=UTF-8');