Skip to content

Commit 229a26d

Browse files
slackeroslackero
committed
Removed deprecated PHPMailer options
1 parent 2efbf2f commit 229a26d

9 files changed

Lines changed: 0 additions & 62 deletions

File tree

‎include/config/dist.conf.inc.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,5 @@
168168
$phpwcms['SMTP_SECURE'] = ''; // secure connection, phpMailer options: '', 'ssl' or 'tls'
169169
$phpwcms['SMTP_AUTH'] = 0; // SMTP authentication, ON=1/OFF=0
170170
$phpwcms['SMTP_AUTH_TYPE'] = ''; // sets SMTP auth type: LOGIN (default), PLAIN, NTLM, CRAM-MD5
171-
$phpwcms['SMTP_REALM'] = ''; // SMTP realm, used for NTLM auth type
172-
$phpwcms['SMTP_WORKSTATION'] = ''; // SMTP workstation, used for NTLM auth type
173171

174172
define('PHPWCMS_INCLUDE_CHECK', true);

‎include/inc_act/act_formmailer.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,14 +307,6 @@ function phpwcms_form_encode($in_str, $charset) {
307307
}
308308
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
309309
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
310-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
311-
if(!empty($phpwcms['SMTP_REALM'])) {
312-
$mail->Realm = $phpwcms['SMTP_REALM'];
313-
}
314-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
315-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
316-
}
317-
}
318310
}
319311
$mail->SMTPKeepAlive = true;
320312
$mail->CharSet = $phpwcms["charset"];

‎include/inc_act/act_sendnewsletter.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,6 @@
172172
}
173173
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
174174
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
175-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
176-
if(!empty($phpwcms['SMTP_REALM'])) {
177-
$mail->Realm = $phpwcms['SMTP_REALM'];
178-
}
179-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
180-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
181-
}
182-
}
183175
}
184176

185177
$mail->setFrom($newsletter['newsletter_vars']['from_email'], $newsletter['newsletter_vars']['from_name']);

‎include/inc_front/content/cnt12.article.inc.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,6 @@
215215
}
216216
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
217217
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
218-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
219-
if(!empty($phpwcms['SMTP_REALM'])) {
220-
$mail->Realm = $phpwcms['SMTP_REALM'];
221-
}
222-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
223-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
224-
}
225-
}
226218
}
227219
$mail->SMTPKeepAlive = false;
228220
$mail->CharSet = $phpwcms["charset"];

‎include/inc_front/content/cnt16.article.inc.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,6 @@
9393
}
9494
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
9595
$ecard["mailer"]->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
96-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
97-
if(!empty($phpwcms['SMTP_REALM'])) {
98-
$ecard["mailer"]->Realm = $phpwcms['SMTP_REALM'];
99-
}
100-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
101-
$ecard["mailer"]->Workstation = $phpwcms['SMTP_WORKSTATION'];
102-
}
103-
}
10496
}
10597

10698
if($phpwcms['default_lang'] && $phpwcms['default_lang'] !== 'en') {

‎include/inc_front/content/cnt23.article.inc.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,14 +2075,6 @@
20752075
}
20762076
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
20772077
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
2078-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
2079-
if(!empty($phpwcms['SMTP_REALM'])) {
2080-
$mail->Realm = $phpwcms['SMTP_REALM'];
2081-
}
2082-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
2083-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
2084-
}
2085-
}
20862078
}
20872079
$mail->CharSet = $phpwcms["charset"];
20882080

@@ -2139,14 +2131,6 @@
21392131
}
21402132
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
21412133
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
2142-
if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
2143-
if(!empty($phpwcms['SMTP_REALM'])) {
2144-
$mail->Realm = $phpwcms['SMTP_REALM'];
2145-
}
2146-
if(!empty($phpwcms['SMTP_WORKSTATION'])) {
2147-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
2148-
}
2149-
}
21502134
}
21512135
$mail->CharSet = $phpwcms["charset"];
21522136

‎include/inc_lib/general.inc.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -845,14 +845,6 @@ function sendEmail($data = array(
845845
}
846846
if (!empty($phpwcms['SMTP_AUTH_TYPE'])) {
847847
$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
848-
if ($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
849-
if (!empty($phpwcms['SMTP_REALM'])) {
850-
$mail->Realm = $phpwcms['SMTP_REALM'];
851-
}
852-
if (!empty($phpwcms['SMTP_WORKSTATION'])) {
853-
$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
854-
}
855-
}
856848
}
857849
$mail->CharSet = $phpwcms["charset"];
858850
$mail->isHTML($data['isHTML']);

‎setup/inc/setup.func.inc.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ function write_conf_file($val) {
301301
$conf_file .= "\$phpwcms['SMTP_SECURE'] = '" . escape_quote($val["SMTP_SECURE"]) . "'; // secure connection, phpMailer options: '', 'ssl' or 'tls'\n";
302302
$conf_file .= "\$phpwcms['SMTP_AUTH'] = " . intval($val["SMTP_AUTH"]) . "; // SMTP authentication, ON=1/OFF=0\n";
303303
$conf_file .= "\$phpwcms['SMTP_AUTH_TYPE'] = '" . escape_quote($val["SMTP_AUTH_TYPE"]) . "'; // sets SMTP auth type: LOGIN (default), PLAIN, NTLM, CRAM-MD5\n";
304-
$conf_file .= "\$phpwcms['SMTP_REALM'] = '" . escape_quote($val["SMTP_REALM"]) . "'; // SMTP realm, used for NTLM auth type\n";
305-
$conf_file .= "\$phpwcms['SMTP_WORKSTATION'] = '" . escape_quote($val["SMTP_WORKSTATION"]) . "'; // SMTP workstation, used for NTLM auth type\n";
306304

307305
$conf_file .= "\ndefine('PHPWCMS_INCLUDE_CHECK', true);\n";
308306

‎setup/setup.conf.inc.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,3 @@
168168
$phpwcms['SMTP_SECURE'] = ''; // secure connection, phpMailer options: '', 'ssl' or 'tls'
169169
$phpwcms['SMTP_AUTH'] = 0; // SMTP authentication, ON=1/OFF=0
170170
$phpwcms['SMTP_AUTH_TYPE'] = ''; // sets SMTP auth type: LOGIN (default), PLAIN, NTLM, CRAM-MD5
171-
$phpwcms['SMTP_REALM'] = ''; // SMTP realm, used for NTLM auth type
172-
$phpwcms['SMTP_WORKSTATION'] = ''; // SMTP workstation, used for NTLM auth type

0 commit comments

Comments
 (0)