Skip to content

Commit c97e9a8

Browse files
committed
Merge branch 'master' into release-3.6.4
2 parents 2ad13e5 + c6b560b commit c97e9a8

File tree

9 files changed

+79
-31
lines changed

9 files changed

+79
-31
lines changed

.github/workflows/build-release.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
run: |
5959
cd $GITHUB_WORKSPACE
6060
./scripts/install-plugins.sh vendor public_html/lists/admin/plugins/
61+
./scripts/install-themes.sh vendor public_html/lists/admin/ui/
6162
6263
- name: Install the phpList4 based REST API
6364
run: |
@@ -89,7 +90,7 @@ jobs:
8990
sudo php -S 0.0.0.0:80 -t public_html > /dev/null 2>&1 &
9091
9192
- name: Check PHP syntax errors
92-
uses: overtrue/phplint@2.3.5
93+
uses: overtrue/phplint@2.4.1
9394
with:
9495
path: ./public_html
9596
options: --exclude=base/vendor
@@ -113,6 +114,14 @@ jobs:
113114
../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags=@initialise
114115
../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags="~@initialise && ~@wip"
115116
117+
- name: Upload the screenshots
118+
if: always()
119+
uses: actions/upload-artifact@v2
120+
with:
121+
path: "output"
122+
name: "behat output"
123+
retention-days: 3
124+
116125
- name: Clean Up
117126
run: |
118127
cd $GITHUB_WORKSPACE

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,9 @@ public_html/lists/admin/info/
1212
.vagrant
1313
public_html/lists/updater
1414
public_html/lists/texts
15+
public_html/lists/admin/plugins/
16+
/parked/
17+
public_html/lists/admin/ui/dressprow
18+
public_html/lists/admin/ui/dressprow-ph
19+
public_html/lists/admin/ui/phplist-ui-*
1520

Vagrantfile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88
## below
99

1010
Vagrant.configure("2") do |config|
11-
config.vagrant.plugins = [
12-
"vagrant-docker-compose",
13-
]
1411
config.vm.box = "ubuntu/bionic64"
15-
config.vm.provision :docker
16-
config.vm.provision :docker_compose,
17-
compose_version: "1.22.0"
12+
config.vm.network "public_network"
1813

1914
config.vm.provider "virtualbox" do |v|
2015
v.memory = 10640
@@ -31,9 +26,7 @@ Vagrant.configure("2") do |config|
3126
apt install software-properties-common
3227
add-apt-repository ppa:ondrej/php
3328
DEBIAN_FRONTEND=noninteractive apt update
34-
DEBIAN_FRONTEND=noninteractive apt install -y composer mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation
35-
DEBIAN_FRONTEND=noninteractive apt install -y php7.0 php7.0-mbstring php7.0-curl php7.0-mysql php7.0-xml php7.0-zip
36-
DEBIAN_FRONTEND=noninteractive apt install -y php7.1 php7.1-mbstring php7.1-curl php7.1-mysql php7.1-xml php7.1-zip
29+
DEBIAN_FRONTEND=noninteractive apt install -y make mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation xdg-utils
3730
DEBIAN_FRONTEND=noninteractive apt install -y php7.2 php7.2-mbstring php7.2-curl php7.2-mysql php7.2-xml php7.2-zip
3831
DEBIAN_FRONTEND=noninteractive apt install -y php7.3 php7.3-mbstring php7.3-curl php7.3-mysql php7.3-xml php7.3-zip
3932
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|
4942
update-alternatives --set phpize /usr/bin/phpize$PHPVERSION
5043
update-alternatives --set php-config /usr/bin/php-config$PHPVERSION
5144
[[ ! -z $(which google-chrome) ]] || {
52-
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
45+
[[ ! -f google-chrome-stable_current_amd64.deb ]] && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
5346
dpkg -i google-chrome-stable_current_amd64.deb
5447
}
5548
google-chrome --version
5649
rm -rf vendor
57-
composer install
50+
bin/update-composer.sh
51+
sudo -u vagrant php composer.phar update
52+
ln -s /vagrant/vendor/bin/chromedriver /usr/local/bin/chromedriver
53+
ln -s /vagrant/vendor/bin/geckodriver /usr/local/bin/geckodriver
5854
service postfix stop
5955
service apache2 stop
6056
service mysqld start
6157
cp -fv tests/ci/config.php public_html/lists/config/config.php
62-
cp -fv tests/default.behat.yml tests/behat.yml
58+
cp -fv tests/ci/behat.yml tests/behat.yml
6359
[[ ! -d public_html/lists/admin/ui/phplist-ui-bootlist ]] && {
6460
cd public_html/lists/admin/ui/
6561
wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public_html/lists/admin/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

public_html/lists/admin/ui/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

public_html/lists/config/config.php

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
2+
23
/*
4+
35
* ==============================================================================================================
46
*
57
*
@@ -10,25 +12,38 @@
1012
* ** NOTE: To use options from config_extended.php, you need to copy them to this file **
1113
*
1214
==============================================================================================================
15+
1316
*/
17+
1418
// what is your Mysql database server hostname
15-
$database_host = 'dbhost';
19+
$database_host = 'localhost';
20+
1621
// what is the name of the database we are using
1722
$database_name = 'phplistdb';
23+
1824
// what user has access to this database
1925
$database_user = 'phplist';
26+
2027
// and what is the password to login to control the database
2128
$database_password = 'phplist';
29+
2230
// if you have an SMTP server, set it here. Otherwise it will use the normal php mail() function
2331
//# if your SMTP server is called "smtp.mydomain.com" you enter this below like this:
2432
//#
2533
//# define("PHPMAILERHOST",'smtp.mydomain.com');
26-
define('PHPMAILERHOST', '');
34+
35+
define('PHPMAILERHOST', 'localhost');
36+
define('PHPMAILERPORT',2500);
37+
define('PHPMAILER_SECURE',false);
38+
39+
2740
// if TEST is set to 1 (not 0) it will not actually send ANY messages, but display what it would have sent
2841
// this is here, to make sure you edited the config file and mails are not sent "accidentally"
2942
// on unmanaged systems
30-
define('TEST', 1);
43+
44+
define('TEST', 0);
3145
/*
46+
3247
==============================================================================================================
3348
*
3449
* Settings for handling bounces
@@ -38,46 +53,60 @@
3853
* unnecessary messages, which overloads your own server, the receiving servers and internet traffic as a whole
3954
*
4055
==============================================================================================================
56+
4157
*/
58+
4259
// Message envelope.
60+
4361
// This is the address that most bounces will be delivered to
4462
// Your should make this an address that no PERSON reads
4563
// but a mailbox that phpList can empty every so often, to process the bounces
64+
4665
// $message_envelope = 'listbounces@yourdomain';
66+
4767
// Handling bounces. Check README.bounces for more info
4868
// This can be 'pop' or 'mbox'
4969
$bounce_protocol = 'pop';
70+
5071
// set this to 0, if you set up a cron to download bounces regularly by using the
5172
// commandline option. If this is 0, users cannot run the page from the web
5273
// frontend. Read README.commandline to find out how to set it up on the
5374
// commandline
5475
define('MANUALLY_PROCESS_BOUNCES', 1);
76+
5577
// when the protocol is pop, specify these three
5678
$bounce_mailbox_host = 'localhost';
5779
$bounce_mailbox_user = 'popuser';
5880
$bounce_mailbox_password = 'password';
81+
5982
// the "port" is the remote port of the connection to retrieve the emails
6083
// the default should be fine but if it doesn't work, you can try the second
6184
// one. To do that, add a # before the first line and take off the one before the
6285
// second line
6386
$bounce_mailbox_port = '110/pop3/notls';
6487
//$bounce_mailbox_port = "110/pop3";
88+
6589
// it's getting more common to have secure connections, in which case you probably want to use
6690
//$bounce_mailbox_port = "995/pop3/ssl/novalidate-cert";
91+
6792
// when the protocol is mbox specify this one
6893
// it needs to be a local file in mbox format, accessible to your webserver user
6994
$bounce_mailbox = '/var/mail/listbounces';
95+
7096
// set this to 0 if you want to keep your messages in the mailbox. this is potentially
7197
// a problem, because bounces will be counted multiple times, so only do this if you are
7298
// testing things.
7399
$bounce_mailbox_purge = 1;
100+
74101
// set this to 0 if you want to keep unprocessed messages in the mailbox. Unprocessed
75102
// messages are messages that could not be matched with a user in the system
76103
// messages are still downloaded into phpList, so it is safe to delete them from
77104
// the mailbox and view them in phpList
78105
$bounce_mailbox_purge_unprocessed = 1;
106+
79107
// how many bounces in a row need to have occurred for a user to be marked unconfirmed
80108
$bounce_unsubscribe_threshold = 5;
109+
81110
// choose the hash method for password
82111
// check the extended config for more info
83112
// in most cases, it is fine to leave this as it is

scripts/install-themes.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
from=$1
4+
to=$2
5+
6+
[[ -z $from ]] || [[ ! -d $from ]] || [[ -z $to ]] || [[ ! -d $to ]] && exit;
7+
8+
echo $from $to
9+
10+
for theme in $(ls -d $from/*/phplist-ui-*); do
11+
[[ ! -z "$(ls -A $theme)" ]] && {
12+
echo installing $theme
13+
cp -R $theme $to
14+
}
15+
done

tests/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ createdb:
66
mysql -e 'grant all on phplistdb.* to phplist@"%" identified by "phplist"; FLUSH PRIVILEGES;'
77

88
test: createdb
9-
../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags=@initialise
10-
../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags="~@initialise && ~@wip"
9+
../vendor/bin/behat -n -fprogress -p goutte --strict --stop-on-failure --tags=@initialise
10+
../vendor/bin/behat -n -fprogress -p goutte --strict --stop-on-failure --tags="~@initialise && ~@wip"
1111

1212
verbosetest: createdb
1313
../vendor/bin/behat -n -p chrome --strict --stop-on-failure --tags=@initialise

0 commit comments

Comments
 (0)