Merge remote-tracking branch 'origin/master' into release-3.6.4

Author: marianaballa

.github/workflows/build-release.yml

@@ -54,10 +54,11 @@ jobs:
           php_extensions: xml 
           version: 2
 
-      - name: Install Plugins
+      - name: Install Plugins and Themes
         run: |
           cd $GITHUB_WORKSPACE
           ./scripts/install-plugins.sh vendor public_html/lists/admin/plugins/
+          ./scripts/install-themes.sh vendor public_html/lists/admin/ui/
 
       - name: Install the phpList4 based REST API
         run: |
@@ -80,7 +81,7 @@ jobs:
       - name: Start Test Server
         run: |
           cd $GITHUB_WORKSPACE
-          cp -fv tests/default.behat.yml tests/behat.yml
+          cp -fv tests/ci/behat.yml tests/behat.yml
           cp -fv tests/ci/config.php public_html/lists/config/config.php
           mkdir -p output/screenshots
           mkdir -p build/mails
@@ -89,7 +90,7 @@ jobs:
           sudo php -S 0.0.0.0:80 -t public_html > /dev/null 2>&1 &
 
       - name: Check PHP syntax errors
-        uses: overtrue/phplint@2.3.5
+        uses: overtrue/phplint@2.4.1
         with:
           path: ./public_html
           options: --exclude=base/vendor
@@ -107,12 +108,20 @@ jobs:
           firefox -v
           vendor/bin/behat -V
 
-      - name: Run BDD Tests
+      - name: Run Behat Tests
         run: |
           cd $GITHUB_WORKSPACE/tests
           ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags=@initialise
           ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags="~@initialise && ~@wip"
 
+      - name: Upload the screenshots
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          path: "output"
+          name: "behat output"
+          retention-days: 3
+
       - name: Clean Up
         run: |
           cd $GITHUB_WORKSPACE

.github/workflows/main.yml

@@ -1,7 +1,7 @@
 
 name: CI
 
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -11,11 +11,8 @@ jobs:
     strategy:
       fail-fast: false     
       matrix:   
-        php-version: ['7.2', '7.2', '7.3', '7.4']
+        php-version: ['7.2', '7.2', '7.3', '7.4', '8.0']
         experimental: [false]
-        include:
-        - php-version: '8.0'
-          experimental: true
 
     steps:
       - uses: actions/checkout@v2
@@ -39,11 +36,8 @@ jobs:
           path: /tmp/composer-cache
           key: ${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
 
-      - name: Add HTTP basic auth credentials
-        run: echo '${{ secrets.COMPOSER_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json
-
       - name: Install dependencies
-        uses: php-actions/composer@v5
+        uses: php-actions/composer@v6
         with:
           dev: yes
           args: --prefer-dist --no-interaction
@@ -69,7 +63,7 @@ jobs:
       - name: Start Test Server
         run: |
           cd $GITHUB_WORKSPACE
-          cp -fv tests/default.behat.yml tests/behat.yml
+          cp -fv tests/ci/behat.yml tests/behat.yml
           cp -fv tests/ci/config.php public_html/lists/config/config.php
           mkdir -p output/screenshots
           touch output/screenshots/README.md

.gitignore

@@ -12,4 +12,9 @@ public_html/lists/admin/info/
 .vagrant
 public_html/lists/updater
 public_html/lists/texts
+public_html/lists/admin/plugins/
+/parked/
+public_html/lists/admin/ui/dressprow
+public_html/lists/admin/ui/dressprow-ph
+public_html/lists/admin/ui/phplist-ui-*
 

Vagrantfile

@@ -8,13 +8,8 @@
 ## below
 
 Vagrant.configure("2") do |config|
-  config.vagrant.plugins = [
-    "vagrant-docker-compose",
-  ]
   config.vm.box = "ubuntu/bionic64"
-  config.vm.provision :docker
-  config.vm.provision :docker_compose,
-    compose_version: "1.22.0"
+  config.vm.network "public_network"
 
   config.vm.provider "virtualbox" do |v|
       v.memory = 10640
@@ -31,9 +26,7 @@ Vagrant.configure("2") do |config|
       apt install software-properties-common
       add-apt-repository ppa:ondrej/php
       DEBIAN_FRONTEND=noninteractive apt update
-      DEBIAN_FRONTEND=noninteractive apt install -y composer mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation
-      DEBIAN_FRONTEND=noninteractive apt install -y php7.0 php7.0-mbstring php7.0-curl php7.0-mysql php7.0-xml php7.0-zip 
-      DEBIAN_FRONTEND=noninteractive apt install -y php7.1 php7.1-mbstring php7.1-curl php7.1-mysql php7.1-xml php7.1-zip 
+      DEBIAN_FRONTEND=noninteractive apt install -y make mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation xdg-utils 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.2 php7.2-mbstring php7.2-curl php7.2-mysql php7.2-xml php7.2-zip 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.3 php7.3-mbstring php7.3-curl php7.3-mysql php7.3-xml php7.3-zip 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.4 php7.4-mbstring php7.4-curl php7.4-mysql php7.4-xml php7.4-zip 
@@ -49,17 +42,20 @@ Vagrant.configure("2") do |config|
       update-alternatives --set phpize /usr/bin/phpize$PHPVERSION
       update-alternatives --set php-config /usr/bin/php-config$PHPVERSION
       [[ ! -z $(which google-chrome) ]] || {
-        wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+        [[ ! -f google-chrome-stable_current_amd64.deb ]] && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
         dpkg -i google-chrome-stable_current_amd64.deb
       }
       google-chrome --version
       rm -rf vendor
-      composer install
+      bin/update-composer.sh
+      sudo -u vagrant php composer.phar update
+      ln -s /vagrant/vendor/bin/chromedriver /usr/local/bin/chromedriver
+      ln -s /vagrant/vendor/bin/geckodriver /usr/local/bin/geckodriver
       service postfix stop
       service apache2 stop
       service mysqld start
       cp -fv tests/ci/config.php public_html/lists/config/config.php
-      cp -fv tests/default.behat.yml tests/behat.yml
+      cp -fv tests/ci/behat.yml tests/behat.yml
       [[ ! -d public_html/lists/admin/ui/phplist-ui-bootlist ]] && { 
         cd public_html/lists/admin/ui/ 
         wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz

composer.lock

@@ -80,6 +80,13 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
 
         if ($GLOBALS['emailsenderplugin']) {
             $this->Mailer = 'plugin';
+        } elseif (!$this->inBlast && empty($_SESSION['adminloggedin']) && 
+            defined('PHPMAILERSUBSCRIBEHOST') && 
+            defined('PHPMAILERSUBSCRIBEPORT') && PHPMAILERSUBSCRIBEHOST != '') {
+#            logEvent('Sending email via PHPMAILERSUBSCRIBEHOST '.PHPMAILERSUBSCRIBEHOST);
+            $this->Host = PHPMAILERSUBSCRIBEHOST;
+            $this->Port = PHPMAILERSUBSCRIBEPORT;
+            $this->Mailer = 'smtp';
         } elseif ($this->inBlast && defined('PHPMAILERBLASTHOST') && defined('PHPMAILERBLASTPORT') && PHPMAILERBLASTHOST != '') {
             $this->Host = PHPMAILERBLASTHOST;
             $this->Port = PHPMAILERBLASTPORT;
@@ -95,7 +102,7 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
             if (defined('PHPMAILERPORT')) {
                 $this->Port = PHPMAILERPORT;
             }
-            //logEvent('Sending email via '.PHPMAILERHOST);
+#            logEvent('Sending email via PHPMAILERTESTHOST '.PHPMAILERTESTHOST);
             $this->Host = PHPMAILERTESTHOST;
             if (isset($GLOBALS['phpmailer_smtpuser']) && $GLOBALS['phpmailer_smtpuser'] != ''
                 && isset($GLOBALS['phpmailer_smtppassword']) && $GLOBALS['phpmailer_smtppassword']
@@ -111,6 +118,7 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
             }
             //logEvent('Sending email via '.PHPMAILERHOST);
             $this->Host = PHPMAILERHOST;
+#            logEvent('Sending email via PHPMAILERHOST '.PHPMAILERHOST);
             if (POP_BEFORE_SMTP) {
                 // authenticate using the smtp user and password
                 $pop = new POP3();

public_html/lists/admin/.gitignore

@@ -343,6 +343,27 @@
 if (!defined('PHPMAILERHOST')) {
     define('PHPMAILERHOST', '');
 }
+if (!defined('PHPMAILERSUBSCRIBEHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERSUBSCRIBEHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILERBLASTHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERBLASTHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILERBLASTPORT') && defined('PHPMAILERPORT')) {
+    define('PHPMAILERBLASTPORT', PHPMAILERPORT);
+}
+if (!defined('PHPMAILERSUBSCRIBEPORT') && defined('PHPMAILERPORT')) {
+    define('PHPMAILERSUBSCRIBEPORT', PHPMAILERPORT);
+}
+if (!defined('PHPMAILERTESTHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERTESTHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILER_SECURE')) {
+    define('PHPMAILER_SECURE', 'auto');
+}
+if (!defined('PHPMAILER_SMTP_DEBUG')) {
+    define('PHPMAILER_SMTP_DEBUG', 0);
+}
 if (!defined('MANUALLY_PROCESS_QUEUE')) {
     define('MANUALLY_PROCESS_QUEUE', 1);
 }
@@ -599,21 +620,6 @@
 if (!defined('INTERFACELIB')) {
     define('INTERFACELIB', 1);
 }
-if (!defined('PHPMAILERBLASTHOST') && defined('PHPMAILERHOST')) {
-    define('PHPMAILERBLASTHOST', PHPMAILERHOST);
-}
-if (!defined('PHPMAILERBLASTPORT') && defined('PHPMAILERPORT')) {
-    define('PHPMAILERBLASTPORT', PHPMAILERPORT);
-}
-if (!defined('PHPMAILERTESTHOST') && defined('PHPMAILERHOST')) {
-    define('PHPMAILERTESTHOST', PHPMAILERHOST);
-}
-if (!defined('PHPMAILER_SECURE')) {
-    define('PHPMAILER_SECURE', 'auto');
-}
-if (!defined('PHPMAILER_SMTP_DEBUG')) {
-    define('PHPMAILER_SMTP_DEBUG', 0);
-}
 if (!defined('POP_BEFORE_SMTP')) {
     define('POP_BEFORE_SMTP', '');
 }