Skip to content

Commit 24f1cce

Browse files
slackeroslackero
committed
Release phpwcms v1.10.6
Merge branch 'v1.10-dev'
2 parents 27130a1 + 928895d commit 24f1cce

File tree

25 files changed

+131
-145
lines changed

25 files changed

+131
-145
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
"algo26-matthias/idna-convert": "^v4.0.2",
1212
"enshrined/svg-sanitize": "^0.19.0",
1313
"netcarver/textile": "v4.1.1",
14-
"league/commonmark": "^2.5.1",
14+
"league/commonmark": "^2.5.3",
1515
"ezyang/htmlpurifier": "^v4.17.0",
1616
"openpsa/universalfeedcreator": "^v1.9.0",
1717
"phpmailer/phpmailer": "^v6.9.1",
1818
"phpoffice/phpspreadsheet": "^2.2.0",
1919
"simplepie/simplepie": "@dev",
20-
"html2text/html2text": "^4.3.1",
20+
"html2text/html2text": "^4.3.2",
2121
"php81_bc/strftime": "^0.7.5",
2222
"symfony/polyfill-php72": "v1.30.0",
2323
"symfony/polyfill-php73": "v1.30.0",

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

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

175173
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: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,9 +2010,7 @@
20102010
// get email addresses of recipients and senders
20112011
$cnt_form["target"] = convertStringToArray($cnt_form["target"], ';');
20122012
if(empty($cnt_form["subject"])) {
2013-
$cnt_form["alt_subj"] = str_replace('http://', '', $phpwcms['site']);
2014-
$cnt_form["alt_subj"] = substr($cnt_form["alt_subj"], 0, trim($phpwcms['site'], '/'));
2015-
$cnt_form["subject"] = 'Webform: '.$cnt_form["alt_subj"];
2013+
$cnt_form["subject"] = 'Webform: ' . parse_url($phpwcms['site'], PHP_URL_HOST);
20162014
}
20172015

20182016
// check for BCC Addresses
@@ -2075,14 +2073,6 @@
20752073
}
20762074
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
20772075
$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-
}
20862076
}
20872077
$mail->CharSet = $phpwcms["charset"];
20882078

@@ -2139,14 +2129,6 @@
21392129
}
21402130
if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
21412131
$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-
}
21502132
}
21512133
$mail->CharSet = $phpwcms["charset"];
21522134

‎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']);

‎include/inc_lib/revision/revision.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
*
1010
**/
1111

12-
const PHPWCMS_VERSION = '1.10.5';
13-
const PHPWCMS_RELEASE_DATE = '2024/08/10';
12+
const PHPWCMS_VERSION = '1.10.6';
13+
const PHPWCMS_RELEASE_DATE = '2024/08/24';
1414
const PHPWCMS_REVISION = '554';

‎include/vendor/composer/autoload_psr4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
2626
'League\\Config\\' => array($vendorDir . '/league/config/src'),
2727
'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
28-
'Html2Text\\' => array($vendorDir . '/html2text/html2text/src', $vendorDir . '/html2text/html2text/test'),
28+
'Html2Text\\' => array($vendorDir . '/html2text/html2text/src'),
2929
'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
3030
'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
3131
'Algo26\\IdnaConvert\\' => array($vendorDir . '/algo26-matthias/idna-convert/src'),

0 commit comments

Comments
 (0)