Fix error message on failed mail sending

yurabakhtin · yurabakhtin · commit f76b8a891e1a · 2019-07-05T09:27:12.000+03:00
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2019-07-04';
+$app_date = '2019-07-05';
 
 /**
  * Long version string for checking differences
diff --git a/htsrv/anon_unsubscribe.php b/htsrv/anon_unsubscribe.php
@@ -80,7 +80,7 @@
 			else
 			{
 				$Messages->add( T_('Sorry, could not send email.')
-							.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+							.'<br />'.get_send_mail_error(), 'error' );
 			}
 
 			$Messages->display();
diff --git a/htsrv/login.php b/htsrv/login.php
@@ -238,7 +238,7 @@
 			if( ! send_mail_to_User( $forgetful_User->ID, $subject, 'account_password_reset', $email_template_params, true ) )
 			{
 				$Messages->add( T_('Sorry, the email with the link to reset your password could not be sent.')
-					.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+					.'<br />'.get_send_mail_error(), 'error' );
 			}
 			else
 			{
@@ -563,7 +563,7 @@
 			else
 			{
 				$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')
-							.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+							.'<br />'.get_send_mail_error(), 'error' );
 			}
 		}
 		else
diff --git a/htsrv/message_send.php b/htsrv/message_send.php
@@ -564,7 +564,7 @@
 		else
 		{
 			$Messages->add( T_('Sorry, could not send email.')
-				.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+				.'<br />'.get_send_mail_error(), 'error' );
 		}
 	}
 }
diff --git a/htsrv/register.php b/htsrv/register.php
@@ -551,7 +551,7 @@
 			else
 			{
 				$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')
-					.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+					.'<br />'.get_send_mail_error(), 'error' );
 				// fp> TODO: allow to enter a different email address (just in case it's that kind of problem)
 			}
 		}
diff --git a/inc/_core/_misc.funcs.php b/inc/_core/_misc.funcs.php
@@ -3830,6 +3830,26 @@ function check_cron_job_emails_limit()
 }
 
 
+/**
+ * Get additional error message on failed mail sending
+ *
+ * @return string
+ */
+function get_send_mail_error()
+{
+	global $Settings;
+
+	if( $Settings->get( 'email_service' ) == 'smtp' && ! $Settings->get( 'force_email_sending' ) )
+	{	// Only SMTP is used:
+		return T_('Recipient email address does not seem to work.');
+	}
+	else
+	{	// PHP "mail" function is used by default or it was forced after failed SMTP sending:
+		return T_('Possible reason: the PHP mail() function may have been disabled on the server.');
+	}
+}
+
+
 /**
  * Sends an email, wrapping PHP's mail() function.
  * ALL emails sent by b2evolution must be sent through this function (for consistency and for logging)
diff --git a/inc/collections/_collections.init.php b/inc/collections/_collections.init.php
@@ -1478,7 +1478,7 @@ function handle_htsrv_action()
 					else
 					{
 						$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')
-							.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+							.'<br />'.get_send_mail_error(), 'error' );
 						// fp> TODO: allow to enter a different email address (just in case it's that kind of problem)
 					}
 				}
diff --git a/inc/email_campaigns/campaigns.ctrl.php b/inc/email_campaigns/campaigns.ctrl.php
@@ -441,7 +441,7 @@
 		if( ! $edited_EmailCampaign->send_email( $current_User->ID, $test_email_address, 'test' ) )
 		{ // Sending is failed
 			$Messages->add( T_('Sorry, the test email could not be sent.')
-				.'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );
+				.'<br />'.get_send_mail_error(), 'error' );
 			break;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@`
`80`	`80`	`else`
`81`	`81`	`{`
`82`	`82`	`$Messages->add( T_('Sorry, could not send email.')`
`83`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`83`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`$Messages->display();`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@`
`238`	`238`	`if( ! send_mail_to_User( $forgetful_User->ID, $subject, 'account_password_reset', $email_template_params, true ) )`
`239`	`239`	`{`
`240`	`240`	`$Messages->add( T_('Sorry, the email with the link to reset your password could not be sent.')`
`241`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`241`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`242`	`242`	`}`
`243`	`243`	`else`
`244`	`244`	`{`
`@@ -563,7 +563,7 @@`
`563`	`563`	`else`
`564`	`564`	`{`
`565`	`565`	`$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')`
`566`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`566`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`567`	`567`	`}`
`568`	`568`	`}`
`569`	`569`	`else`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@`
`564`	`564`	`else`
`565`	`565`	`{`
`566`	`566`	`$Messages->add( T_('Sorry, could not send email.')`
`567`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`567`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`568`	`568`	`}`
`569`	`569`	`}`
`570`	`570`	`}`
Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@`
`551`	`551`	`else`
`552`	`552`	`{`
`553`	`553`	`$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')`
`554`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`554`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`555`	`555`	`// fp> TODO: allow to enter a different email address (just in case it's that kind of problem)`
`556`	`556`	`}`
`557`	`557`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1478,7 +1478,7 @@ function handle_htsrv_action()`
`1478`	`1478`	`else`
`1479`	`1479`	`{`
`1480`	`1480`	`$Messages->add( T_('Sorry, the email with the link to activate your account could not be sent.')`
`1481`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`1481`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`1482`	`1482`	`// fp> TODO: allow to enter a different email address (just in case it's that kind of problem)`
`1483`	`1483`	`}`
`1484`	`1484`	`}`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@`
`441`	`441`	`if( ! $edited_EmailCampaign->send_email( $current_User->ID, $test_email_address, 'test' ) )`
`442`	`442`	`{ // Sending is failed`
`443`	`443`	`$Messages->add( T_('Sorry, the test email could not be sent.')`
`444`		`- .'<br />'.T_('Possible reason: the PHP mail() function may have been disabled on the server.'), 'error' );`
	`444`	`+ .'<br />'.get_send_mail_error(), 'error' );`
`445`	`445`	`break;`
`446`	`446`	`}`
`447`	`447`