Skip to content

Commit

Permalink
Merge branch 'release-3.6.15' into security-additions
Browse files Browse the repository at this point in the history
michield authored Mar 30, 2024
2 parents 7c0e6c5 + 15b07a7 commit 7b97496
Showing 23 changed files with 339 additions and 986 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -11,14 +11,10 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['7.4', '8.0', '8.1']
php-version: ['7.4', '8.0', '8.1','8.2']
experimental: [false]
include:
- php-version: 7.2
experimental: true
- php-version: 7.3
experimental: true
- php-version: 8.2
- php-version: 8.3
experimental: true

steps:
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Please follow the guidelines below when creating an issue so that your issue can

**Avoid duplicated issues**

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.
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.
Also, make sure you have the latest version of phpList and see if the issue still exists.


23 changes: 13 additions & 10 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions public_html/lists/admin/admin.php
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
echo Error(s('No Access'));
return;
}
$accesslevel = 'all';

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

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

reset($struct);
2 changes: 2 additions & 0 deletions public_html/lists/admin/bouncemgt.php
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
echo $spb.PageLink2('checkbouncerules', s('Check Current Bounce Rules')).$spe;

echo $spb.PageLink2('processbounces', s('Process Bounces')).$spe;
echo $spb.PageLink2('processbounces&justexisting=true', s('Reprocess Only Existing Bounces'), '', false, s('Reprocess Only Existing Bounces')).$spe;

echo '</ul><br />';

@@ -24,3 +25,4 @@
echo '<p class="information text-warning"><big>'.s('You have already defined bounce rules in your system. Be careful with generating new ones, because these may interfere with the ones that exist.').'</big></p>';
}
echo '<br /><p class="button">'.PageLink2('generatebouncerules', s('Generate Bounce Rules')).'</p>';

4 changes: 2 additions & 2 deletions public_html/lists/admin/connect.php
Original file line number Diff line number Diff line change
@@ -1262,10 +1262,10 @@ function PageLinkDialogOnly($name, $desc = '', $url = '', $extraclass = '')
return $link;
}

function PageLinkAjax($name, $desc = '', $url = '', $extraclass = '')
function PageLinkAjax($name, $desc = '', $url = '', $extraclass = '', $title = '')
{
//# as PageLink2, but add the option to ajax it in a popover window
$link = PageLink2($name, $desc, $url);
$link = PageLink2($name, $desc, $url, false, $title ?: $desc);
if ($link) {
$link = str_replace('<a ', '<a class="ajaxable '.$extraclass.'" ', $link);
$link .= '';
156 changes: 0 additions & 156 deletions public_html/lists/admin/inc/UUID.old..php

This file was deleted.

Loading

0 comments on commit 7b97496

Please sign in to comment.