Eileen McNaughton [Mon, 11 Sep 2023 20:33:33 +0000 (08:33 +1200)]
Use bounce activity type, if exists
We can look at adding in upgrade script in later version after bedding in
Eileen McNaughton [Thu, 7 Sep 2023 08:47:59 +0000 (20:47 +1200)]
Move handling of empty from obscure function to main email handler class
I wondered if the zeta components update would make this fix obsolete but adding
a test says not...
So this locks in the fix on
https://issues.civicrm.org/jira/browse/CRM-19215
Eileen McNaughton [Thu, 7 Sep 2023 02:17:05 +0000 (14:17 +1200)]
Move from handling to processor, test
Eileen McNaughton [Thu, 7 Sep 2023 08:08:17 +0000 (20:08 +1200)]
dev/core#2800 Fix bounce processing to handle verp emails
This fixes 2 issues when combining bounce processing with verp emails
1) the emails being processed are being matched to email they come from -
ie the verp email. Hence the created activities are not linked to the
actual contact and instead create endless variants of the sender.
This happens with both the job.process_activities job and with
job.fetch_bounces with is_create_activities = TRUE.
This fix adapts the handling to identify verp emails (using existing regex)
and look up the contact ID from the mailing_event_queue. This is
used as the source (I didn't add a target or assignee at this stage cos
I wasn't sure if that was just data-cruft or useful stuff - but it would
be retrieved from the mailing)
2) this second one is a doozy & probably only showed up in tests because the
tests mostly cover obscure email formats. The create activities code does
a call to get the body and attachments using a function that looks like it
came from a tutorial on how to best use ezcmail. It seems to parse
all the email variants and attachments and, importantly, moves those attachments
to the civicrm files as part of creating the activity.
The code used to getBody() for bounces looks like it was ... written by us.
It does a subset of the processing in earlier call to get body and in
many of our test cases falls back on a blunt generateBody(). This call parses the
email, including the attachments, which are no longer there cos they got moved....
so it fatals.
I dug into the 2 functions and I feel pretty sure the bounce one doesn't add any
additional value but DOES have less capability than the other. So I removed that code,
Unfortunately the person received weird email from Exchange 2003 did not log
the headers https://issues.civicrm.org/jira/browse/CRM-9361 - but even if the
preferred version of the function doesn't parse that there is default text so
it won't fail & it seems like the risk of having a bit less info about an (untested)
obscure email bounce body is not that probematic
Seamus Lee [Sun, 10 Sep 2023 20:54:40 +0000 (06:54 +1000)]
Merge pull request #27384 from eileenmcnaughton/566test
Add email helper to new form test helper
colemanw [Sun, 10 Sep 2023 15:04:38 +0000 (11:04 -0400)]
Merge pull request #27383 from larssandergreen/Fix-SearchDisplay-totals
dev/core#4559 Don't include test, template, deleted entities in SearchDisplay totals
colemanw [Sun, 10 Sep 2023 14:55:19 +0000 (10:55 -0400)]
Merge pull request #27381 from sebalis/dev_core_4542_sebalis
dev/core#4542 Fix priority handling in ACLs when dealing with objects…
Eileen McNaughton [Sat, 9 Sep 2023 23:39:16 +0000 (11:39 +1200)]
Add email helper to new form test helper
larssandergreen [Sun, 10 Sep 2023 00:48:39 +0000 (18:48 -0600)]
Don't include test, template, deleted entities in searchdisplay totals
sebalis [Sat, 9 Sep 2023 01:19:13 +0000 (03:19 +0200)]
add change to ACLPermissionTest.php from original pull request
Co-authored-by: Seamus Lee <seamuslee001@gmail.com>
sebalis [Sat, 9 Sep 2023 00:56:50 +0000 (02:56 +0200)]
dev/core#4542 Fix priority handling in ACLs when dealing with objects other than contacts, and remove code duplication
Co-authored-by: Seamus Lee <seamuslee001@gmail.com>
Eileen McNaughton [Fri, 8 Sep 2023 04:02:59 +0000 (16:02 +1200)]
Merge pull request #27372 from larssandergreen/Expose_fee_label_for_event_tokens
Expose fee_label for event tokens
larssandergreen [Fri, 8 Sep 2023 03:26:50 +0000 (21:26 -0600)]
Expose fee_lable for event tokens
colemanw [Fri, 8 Sep 2023 01:09:54 +0000 (21:09 -0400)]
Merge pull request #27367 from eileenmcnaughton/566
Fix notice on unpaid event
Seamus Lee [Thu, 7 Sep 2023 23:20:39 +0000 (09:20 +1000)]
Merge pull request #27368 from seamuslee001/5.66
[REF] Ensure that any NULL values in the title field are fixed prior …
Eileen McNaughton [Thu, 7 Sep 2023 21:50:57 +0000 (09:50 +1200)]
Fix notice on unpaid event
Seamus Lee [Thu, 7 Sep 2023 22:32:07 +0000 (08:32 +1000)]
[REF] Ensure that any NULL values in the title field are fixed prior to changing the column
colemanw [Thu, 7 Sep 2023 21:57:18 +0000 (17:57 -0400)]
Merge pull request #27128 from christianwach/lang
Support retention of locale on links
Seamus Lee [Thu, 7 Sep 2023 21:35:08 +0000 (07:35 +1000)]
Merge pull request #27364 from seamuslee001/5.66
FiveSixtyFour: disable i18n rewrite on cancel_URL
Seamus Lee [Thu, 7 Sep 2023 20:58:40 +0000 (06:58 +1000)]
Merge pull request #27363 from eileenmcnaughton/event_id
Ensure event ID is an integer
Mathieu Lu [Thu, 7 Sep 2023 19:24:12 +0000 (15:24 -0400)]
FiveSixtyFour: disable i18n rewrite on cancel_URL
Eileen McNaughton [Thu, 7 Sep 2023 20:13:06 +0000 (08:13 +1200)]
Ensure event ID is an integer
colemanw [Thu, 7 Sep 2023 19:19:04 +0000 (15:19 -0400)]
Merge pull request #27358 from colemanw/pseudoconstantGuard
PseudoConstant - Prevent fatal when entity not available
colemanw [Thu, 7 Sep 2023 17:38:12 +0000 (13:38 -0400)]
PseudoConstant - Prevent fatal when entity not available
This can happen e.g when Views tries to lookup an option value for a disabled extension.
See https://github.com/civicrm/civicrm-drupal/pull/656#issuecomment-
1094362139
colemanw [Thu, 7 Sep 2023 13:09:22 +0000 (09:09 -0400)]
Merge pull request #27350 from eileenmcnaughton/incoming_util
Remove unused variable
Eileen McNaughton [Thu, 7 Sep 2023 01:20:49 +0000 (13:20 +1200)]
Remove unused parameter
CiviCRM [Thu, 7 Sep 2023 02:14:09 +0000 (02:14 +0000)]
Set version to 5.66.beta1
Eileen McNaughton [Thu, 7 Sep 2023 01:39:49 +0000 (13:39 +1200)]
Merge pull request #27330 from alifrumin/4555
dev/core#4555 When using a Contribution Page with a Membership Price Set, the contribution amount information never shows on the thank you page
Eileen McNaughton [Thu, 7 Sep 2023 01:38:05 +0000 (13:38 +1200)]
Merge pull request #27345 from eileenmcnaughton/eileen
Fold deprecated function back into the caller
Eileen McNaughton [Thu, 7 Sep 2023 01:10:27 +0000 (13:10 +1200)]
Merge pull request #27344 from seamuslee001/update_zetacomponents
[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation …
Eileen McNaughton [Thu, 7 Sep 2023 00:34:57 +0000 (12:34 +1200)]
Fix variable name clash
Seamus Lee [Wed, 6 Sep 2023 23:51:21 +0000 (09:51 +1000)]
[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling
Seamus Lee [Thu, 7 Sep 2023 00:26:17 +0000 (10:26 +1000)]
Merge pull request #27348 from seamuslee001/master
5.65
Seamus Lee [Thu, 7 Sep 2023 00:24:48 +0000 (10:24 +1000)]
Merge branch '5.65'
Tim Otten [Wed, 6 Sep 2023 05:15:51 +0000 (22:15 -0700)]
Update release-notes/5.65.0.md
Seamus Lee [Sat, 2 Sep 2023 22:18:26 +0000 (08:18 +1000)]
Purify in the social network section as well
Seamus Lee [Tue, 1 Mar 2022 04:52:47 +0000 (15:52 +1100)]
security/core#114 Fix Stored XSS in event title field
Seamus Lee [Sun, 3 Sep 2023 01:07:47 +0000 (11:07 +1000)]
Add code comment as per Coleman
Seamus Lee [Sat, 2 Sep 2023 22:49:40 +0000 (08:49 +1000)]
Minor fix
Seamus Lee [Sat, 2 Sep 2023 22:28:52 +0000 (08:28 +1000)]
Also fix deleting from PCPAccount form class
Seamus Lee [Sat, 2 Sep 2023 22:03:19 +0000 (08:03 +1000)]
security/core#126 Ensure that QFKey is validated when deleting a contact image
colemanw [Sat, 2 Sep 2023 18:52:27 +0000 (14:52 -0400)]
Fix security/core#126 csrf bug to delete contact image
colemanw [Sat, 2 Sep 2023 18:28:02 +0000 (14:28 -0400)]
Fix security/core#125 Stored xss in survey title
CiviCRM [Sat, 2 Sep 2023 05:16:48 +0000 (22:16 -0700)]
CIVI-SA-2023-12 - jQuery Validation
CiviCRM [Sat, 2 Sep 2023 05:13:40 +0000 (22:13 -0700)]
CIVI-SA-2023-11 - Potential XSS
CiviCRM [Sat, 2 Sep 2023 05:13:39 +0000 (22:13 -0700)]
CIVI-SA-2023-10 - Potential SQLI
CiviCRM [Sat, 2 Sep 2023 05:13:38 +0000 (22:13 -0700)]
CIVI-SA-2023-09 - SQLI via API getFields
Seamus Lee [Thu, 7 Sep 2023 00:18:42 +0000 (10:18 +1000)]
Merge pull request #27346 from seamuslee001/5.65
Correct Credit card month description in release notes
Seamus Lee [Thu, 7 Sep 2023 00:14:06 +0000 (10:14 +1000)]
Correct Credit card month description in release notes
Seamus Lee [Wed, 6 Sep 2023 23:55:37 +0000 (09:55 +1000)]
Merge pull request #27343 from seamuslee001/master
5.65
colemanw [Wed, 6 Sep 2023 23:54:14 +0000 (19:54 -0400)]
Merge pull request #26861 from totten/master-url
(dev/core#4433) - Implement Civi::url() with prefixes and OOP enhancements
Eileen McNaughton [Wed, 6 Sep 2023 23:53:19 +0000 (11:53 +1200)]
Fold deprecated function back into the caller
We have a situation where the first function called (parseMailingObject) formats stuff weirdly just to be undone by the second.
Moving the handling to a single place (the calling function) will allow us to unravel this
Seamus Lee [Wed, 6 Sep 2023 23:25:31 +0000 (09:25 +1000)]
Merge branch '5.65'
Seamus Lee [Wed, 6 Sep 2023 23:23:36 +0000 (09:23 +1000)]
Merge pull request #27333 from eileenmcnaughton/tok
dev/core#4551 Fix escaping on token event.title
colemanw [Wed, 6 Sep 2023 23:12:42 +0000 (19:12 -0400)]
Merge pull request #27337 from eileenmcnaughton/email_start
Move regex processing in EmailProcessor to handling class
Eileen McNaughton [Wed, 6 Sep 2023 22:59:19 +0000 (10:59 +1200)]
Fix schema for pay_later_receipt input type
Eileen McNaughton [Wed, 6 Sep 2023 19:58:49 +0000 (07:58 +1200)]
dev/core#4551 Fix escaping on token event.title
Seamus Lee [Wed, 6 Sep 2023 22:56:49 +0000 (08:56 +1000)]
Merge pull request #27342 from seamuslee001/master
5.65
Seamus Lee [Wed, 6 Sep 2023 22:55:16 +0000 (08:55 +1000)]
Merge branch '5.65'
Seamus Lee [Wed, 6 Sep 2023 22:50:41 +0000 (08:50 +1000)]
Merge pull request #27340 from seamuslee001/565_regen
[REF] Regen after civicrm/civicrm-core#27335
Eileen McNaughton [Wed, 6 Sep 2023 22:43:15 +0000 (10:43 +1200)]
Merge pull request #27331 from colemanw/searchKitDefaults
SearchKit - Fix default search columns
Seamus Lee [Wed, 6 Sep 2023 22:42:36 +0000 (08:42 +1000)]
Merge pull request #27341 from civicrm/5.65
5.65
colemanw [Wed, 6 Sep 2023 22:28:22 +0000 (18:28 -0400)]
Merge pull request #27321 from eileenmcnaughton/email_api
Improve error handling by using civicrm_api3 not civicrm_api
Seamus Lee [Wed, 6 Sep 2023 22:23:36 +0000 (08:23 +1000)]
Merge pull request #27339 from agh1/5.65.0-releasenotes-final
5.65.0 release notes: added late changes
Seamus Lee [Wed, 6 Sep 2023 22:15:48 +0000 (08:15 +1000)]
[REF] Regen after civicrm/civicrm-core#27335
Andie Hunt [Wed, 6 Sep 2023 22:12:28 +0000 (18:12 -0400)]
5.65.0 release notes: added late changes
Eileen McNaughton [Wed, 6 Sep 2023 22:07:29 +0000 (10:07 +1200)]
Merge pull request #27338 from colemanw/crmStatusRevert
Revert "Update CRM.status for compatability with native js promises"
Eileen McNaughton [Wed, 6 Sep 2023 21:46:10 +0000 (09:46 +1200)]
Move regex processing in EmailProcessor to handling class
This is a partial of https://github.com/civicrm/civicrm-core/pull/27319
and includes moving a big chunk of code but no logic changes
There is good test cover in CRM_Utils_Mail_EmailProcessorTest
I have split this out as it gets some of the 'bulk' out of that PR which
has a lot of more complex changes to grok
colemanw [Wed, 6 Sep 2023 22:02:29 +0000 (18:02 -0400)]
SearchKit - Use angular helper crmStatus for in-place-edit
Followup to #27105 this uses native angular service instead of jQuery-based function
colemanw [Wed, 6 Sep 2023 21:48:41 +0000 (17:48 -0400)]
Revert "Update CRM.status for compatability with native js promises"
This reverts commit
5e6740703f417d2d4d0c3d625bbe0cdfd00cd549.
It was causing loading errors at ext/message_admin/ang/crmMsgadm/User.js#L18
Eileen McNaughton [Wed, 6 Sep 2023 21:35:04 +0000 (09:35 +1200)]
Merge pull request #27336 from civicrm/5.65
5.65 to master
Eileen McNaughton [Wed, 6 Sep 2023 21:34:25 +0000 (09:34 +1200)]
Merge pull request #27334 from colemanw/getCalcFields
SearchKit - Don't crash afforms with non-dao entities
Eileen McNaughton [Wed, 6 Sep 2023 21:33:44 +0000 (09:33 +1200)]
Merge pull request #27335 from larssandergreen/fix-missing-event-pay-later-receipt-text
Fix missing event pay later receipt text
larssandergreen [Wed, 6 Sep 2023 20:50:13 +0000 (14:50 -0600)]
Fix missing event pay later receipt text
colemanw [Wed, 6 Sep 2023 20:42:48 +0000 (16:42 -0400)]
SearchKit - Don't crash afforms with non-dao entities
Alice Frumin [Wed, 6 Sep 2023 17:01:49 +0000 (13:01 -0400)]
update confirm too
colemanw [Wed, 6 Sep 2023 16:14:54 +0000 (12:14 -0400)]
SearchKit - Fix default search columns
colemanw [Wed, 6 Sep 2023 16:22:58 +0000 (12:22 -0400)]
Merge pull request #27329 from mlutfy/eventDashboardEndDate
Event Dashboard: show events that have not ended yet
Alice Frumin [Wed, 6 Sep 2023 15:40:50 +0000 (11:40 -0400)]
dev/core#4555 When using a Contribution Page with a Membership Price Set, the contribution amount information never shows on the thank you page
Mathieu Lu [Wed, 6 Sep 2023 15:25:09 +0000 (11:25 -0400)]
Event Dashboard: show events that have not ended yet
Yashodha Chaku [Wed, 6 Sep 2023 14:47:01 +0000 (20:17 +0530)]
Merge pull request #27305 from eileenmcnaughton/preview
Remove unreachable page
Monish Deb [Wed, 6 Sep 2023 14:36:34 +0000 (20:06 +0530)]
Merge pull request #27327 from demeritcowboy/weight
Set link weight on manage case
demeritcowboy [Wed, 6 Sep 2023 13:22:10 +0000 (09:22 -0400)]
weight
colemanw [Wed, 6 Sep 2023 12:18:29 +0000 (08:18 -0400)]
Merge pull request #27320 from eileenmcnaughton/processor
Remove unused parameter, pass by reference in private function with one caller
colemanw [Wed, 6 Sep 2023 12:17:24 +0000 (08:17 -0400)]
Merge pull request #27323 from eileenmcnaughton/weight
Define weight for links on extensions page, financial types, financial accounts
Eileen McNaughton [Wed, 6 Sep 2023 11:55:36 +0000 (23:55 +1200)]
Merge pull request #27326 from civicrm/5.65
5.65 to master
colemanw [Wed, 6 Sep 2023 11:54:07 +0000 (07:54 -0400)]
Merge pull request #27324 from eileenmcnaughton/565
Fix enotice (possible regression)
Eileen McNaughton [Wed, 6 Sep 2023 11:48:39 +0000 (23:48 +1200)]
Add weights to contribution page links
Eileen McNaughton [Wed, 6 Sep 2023 08:10:20 +0000 (20:10 +1200)]
Fix enotice (possible regression)
It's clear in the function that lineItem is only defined for add - I hit the enotice editing
the participant to be paid. Not sure if this is a regression but there was a related one
fixed in 5.65 or 5.64 so targetting the rc
Eileen McNaughton [Wed, 6 Sep 2023 07:55:57 +0000 (19:55 +1200)]
Add weight to contribution tasks
Eileen McNaughton [Wed, 6 Sep 2023 07:32:49 +0000 (19:32 +1200)]
Add weights to Manage Event links
Eileen McNaughton [Wed, 6 Sep 2023 07:28:10 +0000 (19:28 +1200)]
Add weights on assign financial account page
Eileen McNaughton [Wed, 6 Sep 2023 07:26:09 +0000 (19:26 +1200)]
Add weights to financial type screen
Eileen McNaughton [Wed, 6 Sep 2023 07:23:29 +0000 (19:23 +1200)]
Add weights on financial accounts page
Eileen McNaughton [Wed, 6 Sep 2023 07:18:32 +0000 (19:18 +1200)]
Define weight for links on extensions page
Yashodha Chaku [Wed, 6 Sep 2023 07:04:08 +0000 (12:34 +0530)]
Merge pull request #27317 from eileenmcnaughton/process
Remove long-broken function
Eileen McNaughton [Wed, 6 Sep 2023 05:42:44 +0000 (17:42 +1200)]
Improve error handling by using civicrm_api3 not civicrm_api
Eileen McNaughton [Wed, 6 Sep 2023 05:38:15 +0000 (17:38 +1200)]
Remove unused parameter, pass by reference in private function with one caller
colemanw [Wed, 6 Sep 2023 01:37:50 +0000 (21:37 -0400)]
Merge pull request #27318 from eileenmcnaughton/legacy
Finish CiviCRM 2.1 deprecation - old style verp
Eileen McNaughton [Wed, 6 Sep 2023 01:23:37 +0000 (13:23 +1200)]
Merge pull request #27259 from eileenmcnaughton/lookup
Use new lookup trait to eliminate use of undefined properties `userDisplayName`