Merge branch 'release-3.6.13' into translations

# Conflicts:
#	public_html/lists/admin/locale/en/phplist.po
#	public_html/lists/admin/locale/zh_CN/phplist.po

Author: michield

.github/workflows/build-release.yml

@@ -5,9 +5,10 @@ on:
   push:
     tags: v[1-9]+.[0-9]+.*
 
+
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental }}
 
     strategy:
@@ -24,8 +25,8 @@ jobs:
 
       - name: Show the discovered version
         run: |
-          if [[ $RELEASE_VERSION = "refs/heads/master" ]]; then
-            echo "RELEASE_VERSION=testing-RC1" >> $GITHUB_ENV
+          if [[ ${{ secrets.BUILD_TEST }} ]]; then
+            echo "RELEASE_VERSION=build-testing-RC1" >> $GITHUB_ENV
           fi
           echo \$RELEASE_VERSION = $RELEASE_VERSION
           echo \$\{\{ env.RELEASE_VERSION \}\} = ${{ env.RELEASE_VERSION }}
@@ -66,7 +67,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           cd public_html/lists
-          wget https://github.com/phpList/base-distribution/archive/phplist3.zip
+          wget https://github.com/phpList/base-distribution/archive/refs/heads/phplist3.zip
           unzip phplist3.zip
           rm phplist3.zip
           mv base-distribution-phplist3 base
@@ -78,7 +79,7 @@ jobs:
           sudo systemctl start mysql.service
           sudo mysql -proot  -e 'drop database if exists phplistdb'
           sudo mysqladmin -proot create phplistdb
-          sudo mysql -proot -e 'grant all on phplistdb.* to phplist@localhost identified by "phplist"'
+          sudo mysql -proot -e 'create user phplist@"%" identified by "phplist"; grant all on phplistdb.* to phplist@"%"'
 
       - name: Start Test Server
         run: |
@@ -225,27 +226,6 @@ jobs:
           name: "phpList Release File"
           retention-days: 3
 
-      - name: Upload the files to SF
-        run: |
-          export SSHPASS=${{ secrets.SF_PASS }}
-          if [[ $RELEASE_VERSION =~ "-RC" ]]; then
-            RELEASE_FOLDER=phplist-development
-          else 
-            RELEASE_FOLDER=phplist
-          fi
-          echo "${{ secrets.SF_HOSTKEY }}" >> ~/.ssh/known_hosts
-          cd $GITHUB_WORKSPACE
-          cd ..
-
-          sshpass -e sftp -oBatchMode=no -b - ${{ secrets.SF_USERNAME }}@${{ secrets.SF_HOST }} << EOF
-            cd /home/frs/project/phplist/$RELEASE_FOLDER
-            mkdir $RELEASE_VERSION
-            cd $RELEASE_VERSION
-            put phplist-${RELEASE_VERSION}.*
-            ls -l 
-            bye
-          EOF
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
@@ -266,3 +246,24 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_REPO }}/${{ secrets.DOCKERHUB_IMAGE }}:${{ env.RELEASE_VERSION }}
           build-args: |
             VERSION=${{ env.RELEASE_VERSION }}
+
+      - name: Upload the files to SF
+        run: |
+          export SSHPASS=${{ secrets.SF_PASS }}
+          if [[ $RELEASE_VERSION =~ "-RC" ]]; then
+            RELEASE_FOLDER=phplist-development
+          else 
+            RELEASE_FOLDER=phplist
+          fi
+          echo "${{ secrets.SF_HOSTKEY }}" >> ~/.ssh/known_hosts
+          cd $GITHUB_WORKSPACE
+          cd ..
+
+          sshpass -e sftp -oBatchMode=no -b - ${{ secrets.SF_USERNAME }}@${{ secrets.SF_HOST }} << EOF
+            cd /home/frs/project/phplist/$RELEASE_FOLDER
+            mkdir $RELEASE_VERSION
+            cd $RELEASE_VERSION
+            put phplist-${RELEASE_VERSION}.*
+            ls -l 
+            bye
+          EOF

.github/workflows/main.yml

@@ -52,6 +52,20 @@ jobs:
           php_extensions: xml 
           version: 2
 
+      - name: Report Versions
+        run: |
+          google-chrome --version
+          lsb_release -a
+          php -v
+          chromedriver -v
+          geckodriver -V
+          which geckodriver
+          which chromedriver
+          firefox -v
+          vendor/bin/behat -V
+          mysql --version
+          mysqladmin --version
+
       - name: Create Database
         run: |
           sudo systemctl start mysql.service
@@ -84,17 +98,6 @@ jobs:
         with:
           path: ./public_html
 
-      - name: Report Versions
-        run: |
-          google-chrome --version
-          php -v
-          chromedriver -v
-          geckodriver -V
-          which geckodriver
-          which chromedriver
-          firefox -v
-          vendor/bin/behat -V
-
       - name: Run BDD Tests UI
         run: |
           cd $GITHUB_WORKSPACE/tests

Dockerfile.release

@@ -37,6 +37,8 @@ RUN tar zxf phplist-$VERSION.tgz
 RUN mv phplist-$VERSION/* /var/www/phpList3/
 RUN rm -rf /phplist-$VERSION*
 
+RUN mkdir -p /var/tmp/phplistupdate && chown www-data /var/tmp/phplistupdate
+
 RUN rm -f /etc/apache2/sites-enabled/000-default.conf && \
     cd /var/www/ && find . -type d -name .git -print0 | xargs -0 rm -rf && \
     find . -type d -print0 | xargs -0 chmod 755 && \

README.md

@@ -11,18 +11,19 @@
 <img src="https://translate.phplist.org/widgets/phplist/-/svg-badge.svg" alt="Translation status" />
 </a>
 <a href="https://hub.docker.com/r/phplist/phplist/tags"><img alt="Docker Image Version (latest semver)" src="https://img.shields.io/docker/v/phplist/phplist?label=docker&sort=semver"></a>
+<img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/phplist/phplist?label=docker%20pulls&logo=docker%20pulls">
 
 <br/>
 
 Fully functional Open Source email marketing manager for creating, sending, integrating, and analysing email campaigns and newsletters: [https://www.phplist.org](https://www.phplist.org)
 
 phpList includes analytics, segmentation, content personalisation, bounce processing, plugin-based architecture, and multiple APIs. Used in 95 countries, available in 20 languages, and used to send more than 25 billion campaign messages in 2018.
 
-Deploy it on your own server, or get a hosted account at http://phplist.com.
+Deploy it on your own server, or get a hosted account at https://phplist.com.
 
 <div align="center" width="100%">
-  <a href="http://phplist.org/">Community</a> |
-  <a href="http://phplist.com/">Hosted</a> |
+  <a href="https://phplist.org/">Community</a> |
+  <a href="https://phplist.com/">Hosted</a> |
   <a href="https://demo.phplist.org">Demo</a>
   <br>
   <img src="https://www.phplist.com/site/images/readme-images/panel.png" align="center" width="100%">

composer.json

@@ -85,6 +85,10 @@
       {
             "type": "vcs",
             "url": "https://github.com/phplist/phplist-plugin-subjectLinePlaceholdersPlugin.git"
+      },
+      {
+            "type": "vcs",
+            "url": "https://github.com/michield/phplist-plugin-addons.git"
       }
     ],
   "extra": {
@@ -106,7 +110,7 @@
     ]
   },
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.3",
     "davidbarratt/custom-installer": "@stable",
     "phplist/phplist-ui-bootlist": "@stable",
     "phplist/phplist-lan-help": "@stable",
@@ -123,16 +127,15 @@
     "bramley/phplist-plugin-captcha": "dev-master",
     "bramley/phplist-plugin-ckeditor": "dev-master",
     "bramley/phplist-plugin-segment": "dev-master",
-    "phplist/phplist-plugin-subjectlineplaceholders": "dev-master"
+    "phplist/phplist-plugin-subjectlineplaceholders": "dev-master",
+    "michield/phplist-plugin-addons": "dev-master"
   },
   "require-dev": {
-    "behat/mink": "@stable",
-    "behat/mink-goutte-driver": "@stable",
-    "behat/mink-selenium2-driver": "^1.3",
-    "behat/behat": "3.5.0",
-    "behat/mink-extension": "^2.2",
-    "fabpot/goutte": "@stable",
-    "symfony/config": "3.0",
+    "behat/behat": "@stable",
+    "behat/mink-selenium2-driver": "@stable",
+    "friends-of-behat/mink": "@stable",
+    "friends-of-behat/mink-extension": "^2.7",
+    "symfony/config": "@stable",
     "se/selenium-server-standalone": "^2.52",
     "bex/behat-screenshot": "^1.2",
     "zbateson/mail-mime-parser": "^1.1",