Release phpwcms v1.10.6

Merge branch 'v1.10-dev'
slackero · Aug 24, 2024 · 24f1cce · 24f1cce
2 parents 27130a1 + 928895d
commit 24f1cce
Show file tree

Hide file tree

Showing 25 changed files with 131 additions and 145 deletions.
diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
         "algo26-matthias/idna-convert": "^v4.0.2",
         "enshrined/svg-sanitize": "^0.19.0",
         "netcarver/textile": "v4.1.1",
-        "league/commonmark": "^2.5.1",
+        "league/commonmark": "^2.5.3",
         "ezyang/htmlpurifier": "^v4.17.0",
         "openpsa/universalfeedcreator": "^v1.9.0",
         "phpmailer/phpmailer": "^v6.9.1",
         "phpoffice/phpspreadsheet": "^2.2.0",
         "simplepie/simplepie": "@dev",
-        "html2text/html2text": "^4.3.1",
+        "html2text/html2text": "^4.3.2",
         "php81_bc/strftime": "^0.7.5",
         "symfony/polyfill-php72": "v1.30.0",
         "symfony/polyfill-php73": "v1.30.0",

diff --git a/include/config/dist.conf.inc.php b/include/config/dist.conf.inc.php
@@ -169,7 +169,5 @@
 $phpwcms['SMTP_SECURE']          = ''; // secure connection, phpMailer options: '', 'ssl' or 'tls'
 $phpwcms['SMTP_AUTH']            = 0; // SMTP authentication, ON=1/OFF=0
 $phpwcms['SMTP_AUTH_TYPE']       = ''; // sets SMTP auth type: LOGIN (default), PLAIN, NTLM, CRAM-MD5
-$phpwcms['SMTP_REALM']           = ''; // SMTP realm, used for NTLM auth type
-$phpwcms['SMTP_WORKSTATION']     = ''; // SMTP workstation, used for NTLM auth type
 
 define('PHPWCMS_INCLUDE_CHECK', true);
diff --git a/include/inc_act/act_formmailer.php b/include/inc_act/act_formmailer.php
@@ -307,14 +307,6 @@ function phpwcms_form_encode($in_str, $charset) {
 	}
 	if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
 		$mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-		if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-			if(!empty($phpwcms['SMTP_REALM'])) {
-				$mail->Realm = $phpwcms['SMTP_REALM'];
-			}
-			if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-				$mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-			}
-		}
 	}
 	$mail->SMTPKeepAlive 	= true;
 	$mail->CharSet	 		= $phpwcms["charset"];

diff --git a/include/inc_act/act_sendnewsletter.php b/include/inc_act/act_sendnewsletter.php
@@ -172,14 +172,6 @@
         }
         if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
             $mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-            if($phpwcms['SMTP_AUTH_TYPE'] == 'NTLM') {
-                if(!empty($phpwcms['SMTP_REALM'])) {
-                    $mail->Realm = $phpwcms['SMTP_REALM'];
-                }
-                if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-                    $mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-                }
-            }
         }
 
         $mail->setFrom($newsletter['newsletter_vars']['from_email'], $newsletter['newsletter_vars']['from_name']);

diff --git a/include/inc_front/content/cnt12.article.inc.php b/include/inc_front/content/cnt12.article.inc.php
@@ -215,14 +215,6 @@
         }
         if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
             $mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-            if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-                if(!empty($phpwcms['SMTP_REALM'])) {
-                    $mail->Realm = $phpwcms['SMTP_REALM'];
-                }
-                if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-                    $mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-                }
-            }
         }
         $mail->SMTPKeepAlive    = false;
         $mail->CharSet          = $phpwcms["charset"];

diff --git a/include/inc_front/content/cnt16.article.inc.php b/include/inc_front/content/cnt16.article.inc.php
@@ -93,14 +93,6 @@
 		}
 		if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
 			$ecard["mailer"]->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-			if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-				if(!empty($phpwcms['SMTP_REALM'])) {
-					$ecard["mailer"]->Realm = $phpwcms['SMTP_REALM'];
-				}
-				if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-					$ecard["mailer"]->Workstation = $phpwcms['SMTP_WORKSTATION'];
-				}
-			}
 		}
 
         if($phpwcms['default_lang'] && $phpwcms['default_lang'] !== 'en') {

diff --git a/include/inc_front/content/cnt23.article.inc.php b/include/inc_front/content/cnt23.article.inc.php
@@ -2010,9 +2010,7 @@
     // get email addresses of recipients and senders
     $cnt_form["target"] = convertStringToArray($cnt_form["target"], ';');
     if(empty($cnt_form["subject"])) {
-        $cnt_form["alt_subj"] = str_replace('http://', '', $phpwcms['site']);
-        $cnt_form["alt_subj"] = substr($cnt_form["alt_subj"], 0, trim($phpwcms['site'], '/'));
-        $cnt_form["subject"]  = 'Webform: '.$cnt_form["alt_subj"];
+        $cnt_form["subject"]  = 'Webform: ' . parse_url($phpwcms['site'], PHP_URL_HOST);
     }
 
     // check for BCC Addresses
@@ -2075,14 +2073,6 @@
             }
             if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
                 $mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-                if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-                    if(!empty($phpwcms['SMTP_REALM'])) {
-                        $mail->Realm = $phpwcms['SMTP_REALM'];
-                    }
-                    if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-                        $mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-                    }
-                }
             }
             $mail->CharSet = $phpwcms["charset"];
 
@@ -2139,14 +2129,6 @@
             }
             if(!empty($phpwcms['SMTP_AUTH_TYPE'])) {
                 $mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-                if($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-                    if(!empty($phpwcms['SMTP_REALM'])) {
-                        $mail->Realm = $phpwcms['SMTP_REALM'];
-                    }
-                    if(!empty($phpwcms['SMTP_WORKSTATION'])) {
-                        $mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-                    }
-                }
             }
             $mail->CharSet          = $phpwcms["charset"];
 

diff --git a/include/inc_lib/general.inc.php b/include/inc_lib/general.inc.php
@@ -845,14 +845,6 @@ function sendEmail($data = array(
         }
         if (!empty($phpwcms['SMTP_AUTH_TYPE'])) {
             $mail->AuthType = $phpwcms['SMTP_AUTH_TYPE'];
-            if ($phpwcms['SMTP_AUTH_TYPE'] === 'NTLM') {
-                if (!empty($phpwcms['SMTP_REALM'])) {
-                    $mail->Realm = $phpwcms['SMTP_REALM'];
-                }
-                if (!empty($phpwcms['SMTP_WORKSTATION'])) {
-                    $mail->Workstation = $phpwcms['SMTP_WORKSTATION'];
-                }
-            }
         }
         $mail->CharSet = $phpwcms["charset"];
         $mail->isHTML($data['isHTML']);

diff --git a/include/inc_lib/revision/revision.php b/include/inc_lib/revision/revision.php
@@ -9,6 +9,6 @@
  *
  **/
 
-const PHPWCMS_VERSION = '1.10.5';
-const PHPWCMS_RELEASE_DATE = '2024/08/10';
+const PHPWCMS_VERSION = '1.10.6';
+const PHPWCMS_RELEASE_DATE = '2024/08/24';
 const PHPWCMS_REVISION = '554';
diff --git a/include/vendor/composer/autoload_psr4.php b/include/vendor/composer/autoload_psr4.php
@@ -25,7 +25,7 @@
     'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
     'League\\Config\\' => array($vendorDir . '/league/config/src'),
     'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
-    'Html2Text\\' => array($vendorDir . '/html2text/html2text/src', $vendorDir . '/html2text/html2text/test'),
+    'Html2Text\\' => array($vendorDir . '/html2text/html2text/src'),
     'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
     'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
     'Algo26\\IdnaConvert\\' => array($vendorDir . '/algo26-matthias/idna-convert/src'),

diff --git a/include/vendor/composer/autoload_static.php b/include/vendor/composer/autoload_static.php
@@ -160,7 +160,6 @@ class ComposerStaticInit4b55c751baaf47512d22ca0465e5183a
         'Html2Text\\' => 
         array (
             0 => __DIR__ . '/..' . '/html2text/html2text/src',
-            1 => __DIR__ . '/..' . '/html2text/html2text/test',
         ),
         'Dflydev\\DotAccessData\\' => 
         array (

diff --git a/include/vendor/composer/installed.json b/include/vendor/composer/installed.json
@@ -251,35 +251,32 @@
         },
         {
             "name": "html2text/html2text",
-            "version": "4.3.1",
-            "version_normalized": "4.3.1.0",
+            "version": "4.3.2",
+            "version_normalized": "4.3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mtibben/html2text.git",
-                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c"
+                "reference": "3b443cbe302b52eb5806a21a9dbd79524203970a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mtibben/html2text/zipball/61ad68e934066a6f8df29a3d23a6460536d0855c",
-                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c",
+                "url": "https://api.github.com/repos/mtibben/html2text/zipball/3b443cbe302b52eb5806a21a9dbd79524203970a",
+                "reference": "3b443cbe302b52eb5806a21a9dbd79524203970a",
                 "shasum": ""
             },
             "require-dev": {
-                "phpunit/phpunit": "~4"
+                "phpunit/phpunit": "~4|^9.0"
             },
             "suggest": {
                 "ext-mbstring": "For best performance",
                 "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
             },
-            "time": "2020-04-16T23:44:31+00:00",
+            "time": "2024-08-20T02:43:29+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
-                    "Html2Text\\": [
-                        "src/",
-                        "test/"
-                    ]
+                    "Html2Text\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -289,7 +286,7 @@
             "description": "Converts HTML to formatted plain text",
             "support": {
                 "issues": "https://github.com/mtibben/html2text/issues",
-                "source": "https://github.com/mtibben/html2text/tree/4.3.1"
+                "source": "https://github.com/mtibben/html2text/tree/4.3.2"
             },
             "install-path": "../html2text/html2text"
         },
@@ -335,17 +332,17 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.1",
-            "version_normalized": "2.5.1.0",
+            "version": "2.5.3",
+            "version_normalized": "2.5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
                 "shasum": ""
             },
             "require": {
@@ -358,8 +355,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.31.0",
-                "commonmark/commonmark.js": "0.31.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -378,7 +375,7 @@
             "suggest": {
                 "symfony/yaml": "v2.3+ required if using the Front Matter extension"
             },
-            "time": "2024-07-24T12:52:09+00:00",
+            "time": "2024-08-16T11:46:16+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {

diff --git a/include/vendor/composer/installed.php b/include/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'c15e9b374627d21665a4e18437d7ef86e1a4cfe2',
+        'reference' => '27130a1dd432e3359f4ef3a9db911f7f7660e1d8',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'c15e9b374627d21665a4e18437d7ef86e1a4cfe2',
+            'reference' => '27130a1dd432e3359f4ef3a9db911f7f7660e1d8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../../',
             'aliases' => array(),
@@ -56,9 +56,9 @@
             'dev_requirement' => false,
         ),
         'html2text/html2text' => array(
-            'pretty_version' => '4.3.1',
-            'version' => '4.3.1.0',
-            'reference' => '61ad68e934066a6f8df29a3d23a6460536d0855c',
+            'pretty_version' => '4.3.2',
+            'version' => '4.3.2.0',
+            'reference' => '3b443cbe302b52eb5806a21a9dbd79524203970a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../html2text/html2text',
             'aliases' => array(),
@@ -74,9 +74,9 @@
             'dev_requirement' => false,
         ),
         'league/commonmark' => array(
-            'pretty_version' => '2.5.1',
-            'version' => '2.5.1.0',
-            'reference' => 'ac815920de0eff6de947eac0a6a94e5ed0fb147c',
+            'pretty_version' => '2.5.3',
+            'version' => '2.5.3.0',
+            'reference' => 'b650144166dfa7703e62a22e493b853b58d874b0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/commonmark',
             'aliases' => array(),

diff --git a/include/vendor/html2text/html2text/.github/workflows/ci.yml b/include/vendor/html2text/html2text/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI Tests
+on: [push, pull_request]
+
+jobs:
+  PHPUnit:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+        php:
+          - 5.4
+          - 5.5
+          - 5.6
+          - 7.0
+          - 7.1
+          - 7.2
+          - 7.3
+          - 7.4
+          - 8.0
+          - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run PHPUnit
+        run: vendor/bin/phpunit
diff --git a/include/vendor/html2text/html2text/.travis.yml b/include/vendor/html2text/html2text/.travis.yml
diff --git a/include/vendor/html2text/html2text/README.md b/include/vendor/html2text/html2text/README.md
@@ -2,7 +2,7 @@
 
 A PHP library for converting HTML to formatted plain text.
 
-[![Build Status](https://travis-ci.org/mtibben/html2text.png?branch=master)](https://travis-ci.org/mtibben/html2text)
+[![Build status](https://github.com/mtibben/html2text/actions/workflows/ci.yml/badge.svg)](https://github.com/mtibben/html2text/actions/workflows/ci.yml)
 
 ## Installing
 

diff --git a/include/vendor/html2text/html2text/composer.json b/include/vendor/html2text/html2text/composer.json
@@ -4,13 +4,20 @@
     "type": "library",
     "license": "GPL-2.0-or-later",
     "autoload": {
-        "psr-4": { "Html2Text\\": ["src/", "test/"] }
+        "psr-4": {
+            "Html2Text\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Html2Text\\": "test/"
+        }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4"
+        "phpunit/phpunit": "~4|^9.0"
     },
     "suggest": {
         "ext-mbstring": "For best performance",
         "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
     }
-}
+}