Use consistent wording in SMTP setup/config

2 files changed, 15 insertions, 15 deletions

diff --git a/setup.php b/setup.php
index 6731eef218..b4b8ba482a 100644
--- a/setup.php
+++ b/setup.php
@@ -423,7 +423,7 @@ if (empty($_POST['smtpuser'  ])) $_POST['smtpuser'  ]='';
 if (empty($_POST['smtppass'  ])) $_POST['smtppass'  ]='';
 if (empty($_POST['smtpsmpl'  ])) $_POST['smtpsmpl'  ]=0;
 if (empty($_POST['smtpsecure'])) $_POST['smtpsecure']='none';
-if (empty($_POST['smtpfrom'  ])) $_POST['smtpfrom'  ]=empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME'];
+if (empty($_POST['smtpfrom'  ])) $_POST['smtpfrom'  ]='webmaster@localhost';
 if (empty($_POST['smtpsender'])) $_POST['smtpsender']=$_POST['smtpfrom'];
 
 if (empty($_POST['wtname']) || empty($_POST['wtuser']) || strlen($_POST['wtpass'])<6 || strlen($_POST['wtpass2'])<6 || empty($_POST['wtemail']) || $_POST['wtpass']<>$_POST['wtpass2']) {
@@ -520,7 +520,7 @@ if (empty($_POST['wtname']) || empty($_POST['wtuser']) || strlen($_POST['wtpass'
 		'>', i18n::translate('no'), '</option>',
 		'</select></td><td>',
 		'</td></tr><tr><td>',
-		i18n::translate('Use simple mail headers in external mails'), '</td><td>',
+		i18n::translate('Use simple mail headers'), '</td><td>',
 		'<select name="smtpsmpl"', $_POST['smtpuse']==1 ? '' : 'disabled', '>',
 		'<option value="yes" ',
 		$_POST['smtpsmpl'] ? 'selected="selected"' : '',
@@ -544,11 +544,11 @@ if (empty($_POST['wtname']) || empty($_POST['wtuser']) || strlen($_POST['wtpass'
 		'</select></td><td>',
 		i18n::translate('Most servers do not use secure connections.'),
 		'</td></tr><tr><td>',
-		i18n::translate('From domain'), '</td><td>',
+		i18n::translate('From email address'), '</td><td>',
 		'<input type="text" name="smtpfrom" value="', htmlspecialchars($_POST['smtpfrom']), '"', $_POST['smtpuse']==1 ? '' : 'disabled', ' /></td><td>',
 		i18n::translate('This is used in the "From:" header when sending mails.'),
 		'</td></tr><tr><td>',
-		i18n::translate('Sender domain'), '</td><td>',
+		i18n::translate('Sender email address'), '</td><td>',
 		'<input type="text" name="smtpsender" value="', htmlspecialchars($_POST['smtpsender']), '"', $_POST['smtpuse']==1 ? '' : 'disabled', ' /></td><td>',
 		i18n::translate('This is used in the "Sender:" header when sending mails.  It is often the same as the "From:" header.'),
 		'</td></tr><tr><td>',
diff --git a/siteconfig.php b/siteconfig.php
index 1dd6328d00..4acd70241f 100644
--- a/siteconfig.php
+++ b/siteconfig.php
@@ -156,28 +156,25 @@ echo
 	),
 	'</td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP server name'), help_link('SMTP_HOST'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Server'), help_link('SMTP_HOST'), '</td>',
 	'<td class="optionbox wrap"><input type="text" name="smtp_host" value="', get_site_setting('SMTP_HOST'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP server port'), help_link('SMTP_PORT'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Port'), help_link('SMTP_PORT'), '</td>',
 	'<td class="optionbox wrap"><input type="text" name="smtp_port" value="', get_site_setting('SMTP_PORT'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP sender email address'), help_link('SMTP_HELO'), '</td>',
-	'<td class="optionbox wrap"><input type="text" name="smtp_helo" value="', get_site_setting('SMTP_HELO'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
-	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('Use simple mail headers in external mails'), help_link('SMTP_SIMPLE_MAIL'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Use simple mail headers'), help_link('SMTP_SIMPLE_MAIL'), '</td>',
 	'<td class="optionbox wrap">', edit_field_yes_no('smtp_simple_mail', get_site_setting('SMTP_SIMPLE_MAIL'), $smtp_active=='external' ? '' : 'disabled'), '</td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP server needs authentication'), help_link('SMTP_AUTH'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Use password'), help_link('SMTP_AUTH'), '</td>',
 	'<td class="optionbox wrap">', edit_field_yes_no('smtp_auth', get_site_setting('SMTP_AUTH'), $smtp_active=='external' ? '' : 'disabled'), '</td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP user name'), help_link('SMTP_AUTH_USER'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Username'), help_link('SMTP_AUTH_USER'), '</td>',
 	'<td class="optionbox wrap"><input type="text" name="smtp_auth_user" value="', get_site_setting('SMTP_AUTH_USER'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP password'), help_link('SMTP_AUTH_PASS'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Password'), help_link('SMTP_AUTH_PASS'), '</td>',
 	'<td class="optionbox wrap"><input type="text" name="smtp_auth_pass" value="', get_site_setting('SMTP_AUTH_PASS'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP security type'), help_link('SMTP_SSL'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Security'), help_link('SMTP_SSL'), '</td>',
 	'<td class="optionbox wrap">',
 	select_edit_control(
 		'smtp_ssl',
@@ -192,9 +189,12 @@ echo
 	),
 	'</td>',
 	'</tr><tr>',
-	'<td class="descriptionbox width20 wrap">', i18n::translate('SMTP from email address'), help_link('SMTP_FROM_NAME'), '</td>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('From email address'), help_link('SMTP_FROM_NAME'), '</td>',
 	'<td class="optionbox wrap"><input type="text" name="smtp_from_name" value="', get_site_setting('SMTP_FROM_NAME'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
 	'</tr><tr>',
+	'<td class="descriptionbox width20 wrap">', i18n::translate('Sender email address'), help_link('SMTP_HELO'), '</td>',
+	'<td class="optionbox wrap"><input type="text" name="smtp_helo" value="', get_site_setting('SMTP_HELO'), '" ', $smtp_active=='external' ? '' : 'disabled', '/></td>',
+	'</tr><tr>',
 	'<td class="topbottombar" colspan="2"><input type="submit" value="', i18n::translate('Save'), '" /></td>',
 	'</tr></table></form>';