Skip to content

Commit f7f7d98

Browse files
marianaballabramleyAlainRnetlwcorpmichield
authored
Release 3.6.15 (#1034)
* Translations for 3.6.15 (#1032) * Translated using Weblate (English) Currently translated at 91.4% (1950 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (French) Currently translated at 99.8% (2128 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ --------- Co-authored-by: Duncan Cameron <phplist@dcameron.me.uk> Co-authored-by: Alain Rihs <alainrihs@sunrise.ch> * Support for indicating and getting feedback for e-mail test messages (#1031) * Update sendemaillib.php 1. Appended a test subject indicator to test messages 1. Added a reply-to address to test messages that have no manual reply-to: using the logged in admin's address or at least the general admin's * Update sendemaillib.php Rephrased variable name * Update sendemaillib.php Switched to using $admin_auth * Allowing subscribers to be filtered by confirmed and/or blacklisted (#1030) * Update users.php Allowed to filter by confirmed and/or non blacklisted - and not just by unconfirmed and/or blacklisted * Changed users to subscribers * Bouncemgt - allowing processing only existing bounces + a related new rule action (#1028) * Update bouncemgt.php Added &justexisting=true * Update processbounces.php 1. Added support for &justexisting=true 1. Added support for new bounce rule action * Update lib.php Added support for new bounce action * Update bouncemgt.php Added non default title (otherwise it takes the wrong one) * Update processbounces.php 1. Replaced goto with if-else 1. Hardcoded "-1" instead of supplying it in a sprintf value * Hardcoding defaults for older PHP versions * Removed modern solution * Update Common plugin and Segment plugin (#1024) * Define timestamp columns explicitly (#1019) * Define timestamp fields explicitly to avoid problem with the mysql setting explicit_defaults_for_timestamp * Remove setting of timestamp fields that are automatically updated * update CI to remove old PHP versions and add 8.3 (#1004) * Escape single quote in error message (#1003) * Allow ajax page links to have a title, defaulting to the link description (#1002) Fixes #996 * Update CONTRIBUTING.md (#994) Removed obsolete references * update UUID class to the latest upstream (#990) * update UUID class to the latest upstream * clean up old files * use the list order, even when grouping by category (#1025) * restore ability to create other super users (#1014) * restore ability to create other super users * correctly initialise the privileges array * Bounces' subscriber' status indicator + allowing to confirm right from bounces (#1029) * Update listbounces.php Added support for confirmed/blacklisted indicator * Update bounces.php Added confirmed/blacklisted indicator * Update bounce.php 1. Added confirmed/blacklisted indicator 1. Added support for confirming user from a bounce * Update bounce.php 1. Avoided ternary if because translation system doesn't support it 1. Used the newer s() function * Update listbounces.php Added curly brackets * Used potential translation * Php8fixes 202401 (#1026) * remove deprecated ini_set call * stop possible warning * avoid warning * avoid warning * cast to int * avoid warning on existing being null * force template to be an integer * suppress warnings * check on valid var and cast to int * give buttons an ID, so they can be targetted with testing * avoid warning on empty array index * add notification by email when an admin logs in from a new IP address. (#1027) * add notification by email when an admin logs in from a new IP address. * check IP per admin * force columns to be not null * prevent blocking login on an non-upgraded system and send login alert just to admin, or superuser * keep newlines in translation as they are * make shorter lines, so it renders a bit better * Remove redundant upgrade steps (#1020) * Remove steps that are unnecessary due to the 3.2.0 being the minimum upgrade version * Keep silent when there are no subscriber UUIDs to generate * Remove other unnecessary upgrade steps --------- Co-authored-by: Michiel Dethmers <michiel@phplist.com> * Use utf8mb4 for the connection etc (#1001) * Use utf8mb4 for the connection etc * Support utf8mb4 in campaign subject and content --------- Co-authored-by: Michiel Dethmers <michiel@phplist.com> * use PHP8.2 to build * use latest phplint * update docker build from bookworm * set version * avoid the admin being kicked out after upgrade (#1033) * mark update translations as @wip --------- Co-authored-by: Duncan Cameron <phplist@dcameron.me.uk> Co-authored-by: Alain Rihs <alainrihs@sunrise.ch> Co-authored-by: lwcorp <lwcorp@users.noreply.github.com> Co-authored-by: Duncan Cameron <3147688+bramley@users.noreply.github.com> Co-authored-by: Michiel Dethmers <michiel@phplist.com>
1 parent 7832a75 commit f7f7d98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+537
-1189
lines changed

.github/workflows/build-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['7.4']
17+
php-version: ['8.2']
1818
experimental: [false]
1919

2020
steps:
@@ -93,7 +93,7 @@ jobs:
9393
sudo php -S 0.0.0.0:80 -t public_html > /dev/null 2>&1 &
9494
9595
- name: Check PHP syntax errors
96-
uses: overtrue/phplint@2.4.1
96+
uses: overtrue/phplint@9.1.2
9797
with:
9898
path: ./public_html
9999
options: --exclude=base/vendor

.github/workflows/main.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
php-version: ['7.4', '8.0', '8.1']
14+
php-version: ['7.4', '8.0', '8.1','8.2']
1515
experimental: [false]
1616
include:
17-
- php-version: 7.2
18-
experimental: true
19-
- php-version: 7.3
20-
experimental: true
21-
- php-version: 8.2
17+
- php-version: 8.3
2218
experimental: true
2319

2420
steps:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Please follow the guidelines below when creating an issue so that your issue can
2525

2626
**Avoid duplicated issues**
2727

28-
Before you report an issue, please search through [existing issues on Mantis](https://mantis.phplist.com) and [GitHub](https://github.com/phpList/phplist3/issues) to see if your issue is already reported or fixed to make sure you are not reporting a duplicated issue.
28+
Before you report an issue, please search through [existing issues](https://github.com/phpList/phplist3/issues) to see if your issue is already reported or fixed to make sure you are not reporting a duplicated issue.
2929
Also, make sure you have the latest version of phpList and see if the issue still exists.
3030

3131

Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM debian:buster-slim
2+
FROM debian:bookworm-slim
33

44
LABEL maintainer="michiel@phplist.com"
55

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# file that keeps track of the latest tag in cvs and the corresponding version
22
# this automates publishing a new version, when it's tagged
33
# if you don't understand this, don't worry. You don't need this file
4-
VERSION=3.6.13
4+
VERSION=3.6.15

composer.lock

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

public_html/lists/admin/CsvReader.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class CsvReader
1616
*/
1717
public function __construct($filename, $delimiter)
1818
{
19-
ini_set('auto_detect_line_endings', true);
2019
$this->fh = fopen($filename, 'r');
2120
$this->delimiter = $delimiter;
2221
$this->totalRows = 0;

public_html/lists/admin/actions/import1.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@
5353
if (!is_email($email) && $omit_invalid) {
5454
unset($email, $info);
5555
$count_invalid_emails++;
56+
} else {
57+
//# actually looks like the "info" bit will get lost, but
58+
//# in a way, that doesn't matter
59+
$user_list[$email] = array(
60+
'info' => $info,
61+
);
5662
}
57-
//# actually looks like the "info" bit will get lost, but
58-
//# in a way, that doesn't matter
59-
$user_list[$email] = array(
60-
'info' => $info,
61-
);
6263
}
6364

6465
$count_email_add = 0;

public_html/lists/admin/actions/listmembercount.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ function listMemberCounts($listId)
4949
.'<span class="unconfirmedCount text-warning" title="%s">%s</span>, '.' '
5050
.'<span class="blacklistedCount text-danger" title="%s">%s</span>'.')',
5151
s('Confirmed and not blacklisted members'),
52-
number_format($counts['confirmed']),
52+
number_format(!empty($counts['confirmed']) ? $counts['confirmed'] : 0),
5353
s('Unconfirmed and not blacklisted members'),
54-
number_format($counts['notconfirmed']),
54+
number_format(!empty($counts['notconfirmed']) ? $counts['notconfirmed'] : 0),
5555
s('Blacklisted members'),
56-
number_format($counts['blacklisted'])
56+
number_format(!empty($counts['blacklisted']) ? $counts['blacklisted'] : 0)
5757
);
5858

5959
return $membersDisplay;

public_html/lists/admin/admin.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
echo Error(s('No Access'));
1919
return;
2020
}
21+
$accesslevel = 'all';
2122

2223
if (!empty($_POST['change'])) {
2324
if (!verifyToken()) { //# csrf check, should be added in more places
@@ -102,7 +103,7 @@
102103
'statistics' => !empty($_POST['statistics']),
103104
'settings' => !empty($_POST['settings']),
104105
);
105-
Sql_Query(sprintf('update %s set modified=now(), modifiedby = "%s", privileges = "%s" where id = %d',
106+
Sql_Query(sprintf('update %s set modifiedby = "%s", privileges = "%s" where id = %d',
106107
$GLOBALS['tables']['admin'], adminName($_SESSION['logindetails']['id']), sql_escape(serialize($privs)),
107108
$id));
108109

@@ -157,7 +158,7 @@
157158
if (isset($data['privileges'])) {
158159
$privileges = unserialize($data['privileges']);
159160
} else {
160-
$privileges = array();
161+
$privileges = array('subscribers' => 0, 'campaigns' => 0, 'statistics' => 0, 'settings' => 0);
161162
}
162163

163164
reset($struct);

0 commit comments

Comments
 (0)