colemanw [Fri, 22 Sep 2023 00:57:26 +0000 (20:57 -0400)]
Merge pull request #27495 from eileenmcnaughton/action_notice
Cast _action to an int
colemanw [Fri, 22 Sep 2023 00:55:53 +0000 (20:55 -0400)]
Merge pull request #27555 from larssandergreen/Fix-{php}-in-hlp-test
Remove {php} in hlp test
Eileen McNaughton [Fri, 22 Sep 2023 00:27:04 +0000 (12:27 +1200)]
Merge pull request #27554 from demeritcowboy/quick-safe
dev/core#4616 - Fix js syntax error on contribution page / nonfunctioning honoree toggle
larssandergreen [Thu, 21 Sep 2023 23:53:29 +0000 (17:53 -0600)]
Remove {php} in hlp test
colemanw [Thu, 21 Sep 2023 23:34:27 +0000 (19:34 -0400)]
Merge pull request #27535 from eileenmcnaughton/custom
Simplify CustomField::displayValue to expect an ID & have deprecated handling for anything else
colemanw [Thu, 21 Sep 2023 23:32:53 +0000 (19:32 -0400)]
Merge pull request #27532 from eileenmcnaughton/verify_1
Pass `NULL` instead of a value where function requires a parameter but does not use it
colemanw [Thu, 21 Sep 2023 23:31:54 +0000 (19:31 -0400)]
Merge pull request #27474 from eileenmcnaughton/billing_field
php8.x Remove never-used undeclared property
colemanw [Thu, 21 Sep 2023 23:31:11 +0000 (19:31 -0400)]
Merge pull request #27429 from eileenmcnaughton/ref
Fix unnecessary pass-by-ref, minor code improvements
colemanw [Thu, 21 Sep 2023 23:30:38 +0000 (19:30 -0400)]
Merge pull request #27471 from eileenmcnaughton/smartY
Fix Smarty secure mode for premiums tab
colemanw [Thu, 21 Sep 2023 23:30:18 +0000 (19:30 -0400)]
Merge pull request #27470 from eileenmcnaughton/contribution_form
PHP 8.x always assign taxTerm, ppID - backoffice contribution form
demeritcowboy [Thu, 21 Sep 2023 23:30:13 +0000 (19:30 -0400)]
js syntax error when false
Eileen McNaughton [Mon, 18 Sep 2023 21:05:01 +0000 (09:05 +1200)]
Case _action to an int
There is a lot of code comparing to action which is unsure whether it
is dealing with 2 or '2'. It should be possible to always cast to an int but
I have added deprecation just in case...
colemanw [Thu, 21 Sep 2023 23:23:39 +0000 (19:23 -0400)]
Merge pull request #27016 from eileenmcnaughton/tax
Use token for tax_amount, quick config mode
Seamus Lee [Thu, 21 Sep 2023 22:56:17 +0000 (08:56 +1000)]
Merge pull request #27551 from civicrm/5.66
5.66
Eileen McNaughton [Wed, 20 Sep 2023 21:09:43 +0000 (09:09 +1200)]
Simplify CustomField::displayValue to expect an ID & have deprecated handline for anything else
Seamus Lee [Thu, 21 Sep 2023 22:29:00 +0000 (08:29 +1000)]
Merge pull request #27550 from seamuslee001/ca_config_update
Update CAConfig to use 23.07 version
Seamus Lee [Thu, 21 Sep 2023 22:03:14 +0000 (08:03 +1000)]
Update CAConfig to use 23.07 version
Seamus Lee [Thu, 21 Sep 2023 21:26:40 +0000 (07:26 +1000)]
Merge pull request #27522 from eileenmcnaughton/billing
PHP8.2 Pass variables rather than co-erce properties when caling `AbstractEditPayment:processBillingAddress`
colemanw [Thu, 21 Sep 2023 19:42:21 +0000 (15:42 -0400)]
Merge pull request #27548 from larssandergreen/Remove-templates/CRM/Price/Form/LineItem.tpl
Remove unused templates/CRM/Price/Form/LineItem.tpl
Eileen McNaughton [Thu, 21 Sep 2023 19:15:17 +0000 (07:15 +1200)]
Merge pull request #27540 from eileenmcnaughton/membership_type_edit
[php8.x[ Remove notice-causing code that seems unreachable
larssandergreen [Thu, 21 Sep 2023 18:32:47 +0000 (12:32 -0600)]
Remove unused templates/CRM/Price/Form/LineItem.tpl
Eileen McNaughton [Thu, 21 Sep 2023 04:44:54 +0000 (16:44 +1200)]
Set variables when calling customDataBlock.tpl from MembershipType
Eileen McNaughton [Thu, 21 Sep 2023 04:37:46 +0000 (16:37 +1200)]
Remove notice-causing code that seems unreachable
I really can't find any way this code could be triggered - I think it
might have been quietly broken for years...
colemanw [Thu, 21 Sep 2023 17:38:41 +0000 (13:38 -0400)]
Merge pull request #26529 from samuelsov/adminui3
civicrm_admin_ui: add Profile Copy action
Samuel Vanhove [Thu, 21 Sep 2023 16:08:59 +0000 (12:08 -0400)]
civicrm_admin_ui: add Profile Copy action
colemanw [Thu, 21 Sep 2023 15:03:06 +0000 (11:03 -0400)]
Merge pull request #27546 from demeritcowboy/double-honor
Fix double fieldset for honoree section
demeritcowboy [Thu, 21 Sep 2023 14:26:24 +0000 (10:26 -0400)]
Merge pull request #27545 from civicrm/5.66
5.66
colemanw [Thu, 21 Sep 2023 13:39:35 +0000 (09:39 -0400)]
Merge pull request #27541 from eileenmcnaughton/cid_notice
Always assign noCid when the tpl is included
colemanw [Thu, 21 Sep 2023 13:28:09 +0000 (09:28 -0400)]
Merge pull request #27539 from eileenmcnaughton/class_notice
Remove some copy & paste...
demeritcowboy [Thu, 21 Sep 2023 13:18:58 +0000 (09:18 -0400)]
true
demeritcowboy [Thu, 21 Sep 2023 12:55:20 +0000 (08:55 -0400)]
Merge pull request #27446 from demeritcowboy/upgrade-multi-default-566
Add missing upgrade script for multilingual defaults
demeritcowboy [Thu, 21 Sep 2023 12:53:57 +0000 (08:53 -0400)]
Merge pull request #27544 from eileenmcnaughton/badge56
Add weights on badge layout links
Eileen McNaughton [Thu, 21 Sep 2023 09:49:25 +0000 (21:49 +1200)]
Add weights on badge layout links
Tim Otten [Thu, 21 Sep 2023 08:16:17 +0000 (01:16 -0700)]
Merge pull request #27513 from eileenmcnaughton/mailing
dev/core#4567 Add mailing_id, is_test to civicrm_mailing_event_queue
Eileen McNaughton [Thu, 21 Sep 2023 07:06:54 +0000 (19:06 +1200)]
Merge pull request #27542 from civicrm/5.66
5.66
Eileen McNaughton [Thu, 21 Sep 2023 05:19:43 +0000 (17:19 +1200)]
Always assign noCid when the tpl is included
Fixes notices by moving the assign out of the function that adds the form elements
This one only matters when smarty is in secure mode:
Eileen McNaughton [Thu, 21 Sep 2023 04:31:18 +0000 (16:31 +1200)]
Merge pull request #27483 from eileenmcnaughton/8_notice
Php 8.x clean up notices on Profiles
Eileen McNaughton [Thu, 21 Sep 2023 04:22:35 +0000 (16:22 +1200)]
Remove some copy & paste...
Class is never in the rows array - this is copy & paste
Eileen McNaughton [Thu, 21 Sep 2023 03:22:05 +0000 (15:22 +1200)]
Merge pull request #27533 from eileenmcnaughton/hash_less
CiviMail - Generate email auth-code as random string
Eileen McNaughton [Mon, 18 Sep 2023 05:37:31 +0000 (17:37 +1200)]
php8.x Fix notices on displaying FieldSet
Eileen McNaughton [Mon, 18 Sep 2023 05:15:11 +0000 (17:15 +1200)]
Stop using mode as magic for showing the fieldset
Eileen McNaughton [Thu, 21 Sep 2023 02:43:31 +0000 (14:43 +1200)]
Loosen regex
Eileen McNaughton [Thu, 21 Sep 2023 02:11:49 +0000 (14:11 +1200)]
Merge pull request #27536 from totten/master-getclass
PHP 7.x - Use get_class() instead of $object::class
Eileen McNaughton [Thu, 21 Sep 2023 02:11:30 +0000 (14:11 +1200)]
Merge pull request #27537 from eileenmcnaughton/recur
Fix mistake from last week on string wrangling
Eileen McNaughton [Thu, 21 Sep 2023 01:31:19 +0000 (13:31 +1200)]
Fix mistake from last week on string wrangling
This came from
https://github.com/civicrm/civicrm-core/pull/27419
Tim Otten [Thu, 21 Sep 2023 01:23:44 +0000 (18:23 -0700)]
PHP 7.x - Use get_class() instead of $object::class
Tim Otten [Thu, 21 Sep 2023 01:08:16 +0000 (18:08 -0700)]
CiviMail - Fixup edge-case chars. Use consistent function.
1. Base64 can output some funny chars that are awkward in VERP and URL contexts.
Use strict lowercase alphanumeric.
2. The new code was being used for the test mailing - but not for real mailings. They should use same formula.
Eileen McNaughton [Wed, 20 Sep 2023 22:15:31 +0000 (10:15 +1200)]
Merge pull request #27409 from seamuslee001/5.66
[REF] Fix bug caused by recent ACL changes where combination of edit …
Eileen McNaughton [Wed, 20 Sep 2023 09:19:43 +0000 (21:19 +1200)]
Use random string rather than sha string
As discussed on chat
https://chat.civicrm.org/civicrm/pl/r7h6cc7xo78zjgsd8af6ff9tee
this function just generates a hard-to-guess string that is stored
in the civicrm_mailing_event_bounce table. This unique value is
used in conjunction with the unique id value from the table to
determine if it is a match but it's not ever reverse calculated
so we don't need to use a reversable function
Eileen McNaughton [Wed, 20 Sep 2023 19:33:11 +0000 (07:33 +1200)]
Merge pull request #27472 from colemanw/noteForm
API - Improve ACL processing, deprecate `hook_civicrm_notePrivacy`
colemanw [Wed, 20 Sep 2023 18:11:51 +0000 (14:11 -0400)]
Merge pull request #27534 from artfulrobot/artfulrobot-fix-group-removal-count
Stop saying N contacts removed when they were already removed.
Rich Lott / Artful Robot [Wed, 20 Sep 2023 14:11:13 +0000 (15:11 +0100)]
Stop saying N contacts removed when they were already removed.
colemanw [Mon, 18 Sep 2023 23:08:19 +0000 (19:08 -0400)]
Add userId and conditions to hook_civicrm_selectWhereClause signature
colemanw [Mon, 18 Sep 2023 02:58:59 +0000 (22:58 -0400)]
Note - Deprecate hook_civicrm_notePrivacy in favor of hook_civicrm_selectWhereClause
This enables note privacy to be enforced by SearchKit and the API,
and gives an upgrade path for implementations of hook_civicrm_notePrivacy to be refactored out.
colemanw [Mon, 18 Sep 2023 01:56:12 +0000 (21:56 -0400)]
DAO/APIv4 - Optimize ACL clauses
Before: no values passed to BAO::addSelectWhereClause
After: $entityName and $conditions passed.
$entityName is rarely needed, but useful for dynamic entities like ECK.
$conditions contains field/value pairs gleaned from the WHERE clause or ON clause
(depending on how the entity was added to the query)
colemanw [Sun, 17 Sep 2023 22:11:03 +0000 (18:11 -0400)]
API/DAO - Improve permissioning sql clauses: support field names and OR
Before: selectWhereClause was limited to returning arrays of clauses which would be
joined with AND. They could not reference any other fields on the entity.
After: selectWhereClause can return sub-arrays which are joined with OR,
and can reference any field on the entity using {curly_brace} syntax.
Stricter type checking emits noisy deprecations if arrays are expected and strings are given.
colemanw [Sun, 17 Sep 2023 19:59:42 +0000 (15:59 -0400)]
DAO - addSelectWhereClause should always return an array
colemanw [Sun, 17 Sep 2023 18:56:17 +0000 (14:56 -0400)]
Activity - More accurate calculation of permittedActivityTypes
The strict array key comparison seemed wrong, array_diff_key works better.
I was hoping this would be more efficient by skipping the where clause for
privledge users, but it doesn't. Oh well at least this is more correct.
colemanw [Sun, 17 Sep 2023 15:31:52 +0000 (11:31 -0400)]
Make Note.privacy required
Eileen McNaughton [Wed, 20 Sep 2023 07:40:38 +0000 (19:40 +1200)]
Stop passing now-ignored job_id to verify function
Eileen McNaughton [Wed, 20 Sep 2023 09:03:42 +0000 (21:03 +1200)]
Merge pull request #27531 from eileenmcnaughton/verify
CiviMail - VERP should no longer require job_id for verification
Eileen McNaughton [Wed, 20 Sep 2023 07:20:24 +0000 (19:20 +1200)]
Fix verify verp function to cope with job_id having been deleted
This allows the record to be validated based on queue_id & hash
(which is still pretty insane to brute force & allows
us to purge job records
Eileen McNaughton [Tue, 19 Sep 2023 08:23:32 +0000 (20:23 +1200)]
Add mailing_id, is_test to civicrm_mailing_event_queue
Eileen McNaughton [Wed, 20 Sep 2023 04:46:41 +0000 (16:46 +1200)]
Merge pull request #27529 from civicrm/5.66
5.66 to master
Eileen McNaughton [Wed, 20 Sep 2023 04:46:00 +0000 (16:46 +1200)]
Merge pull request #27528 from demeritcowboy/weight-again
Fix weights again on contribution page settings dropdown
Eileen McNaughton [Tue, 19 Sep 2023 21:36:43 +0000 (09:36 +1200)]
PHP8.2 Pass variables rather than co-erce properties when caling AbstractEditPayment:processBillingAddress
demeritcowboy [Wed, 20 Sep 2023 03:13:21 +0000 (23:13 -0400)]
fix weights again
Eileen McNaughton [Wed, 20 Sep 2023 03:26:36 +0000 (15:26 +1200)]
Merge pull request #27527 from colemanw/searchToolbar
SearchKit Toolbar - Fix conditionals, add tests
colemanw [Wed, 20 Sep 2023 02:38:35 +0000 (22:38 -0400)]
SearchKit Toolbar - Fix conditionals, add tests
Eileen McNaughton [Wed, 20 Sep 2023 01:39:45 +0000 (13:39 +1200)]
Merge pull request #27525 from larssandergreen/Remove-spaces-around-curly-braces-to-prepare-for-Smarty-3+
Remove spaces around curly braces to prepare for Smarty 3+
larssandergreen [Wed, 20 Sep 2023 00:45:51 +0000 (18:45 -0600)]
Remove spaces around curly braces to prepare for Smarty 3+
Eileen McNaughton [Sun, 17 Sep 2023 22:07:57 +0000 (10:07 +1200)]
PHP 8.x always assign taxTerm, ppID
Seamus Lee [Tue, 19 Sep 2023 21:46:35 +0000 (07:46 +1000)]
Merge pull request #27521 from civicrm/5.66
5.66
Eileen McNaughton [Tue, 19 Sep 2023 20:43:29 +0000 (08:43 +1200)]
Merge pull request #27520 from colemanw/dfk
APIv4 - Add dfk metadata to getfields
colemanw [Tue, 19 Sep 2023 20:34:59 +0000 (16:34 -0400)]
Merge pull request #27476 from eileenmcnaughton/part_amounts
Add test cover, use token for `event.is_share`
colemanw [Tue, 19 Sep 2023 18:56:16 +0000 (14:56 -0400)]
APIv4 - Hack around bad dfk metadata in unit tests
colemanw [Tue, 19 Sep 2023 16:07:48 +0000 (12:07 -0400)]
APIv4 - Add dfk metadata to getfields
(mostly) fixes some bad guesswork in the APIv4 conformance test,
and now the dfk_entities metadata is available in getFields
colemanw [Tue, 19 Sep 2023 16:22:36 +0000 (12:22 -0400)]
Merge pull request #27487 from eileenmcnaughton/pay_later
Fix notices in text versions of event receipts
colemanw [Tue, 19 Sep 2023 15:37:28 +0000 (11:37 -0400)]
Merge pull request #27518 from demeritcowboy/bread
dev/core#4605 - Add yet another guard against failed upgrades
colemanw [Tue, 19 Sep 2023 15:35:26 +0000 (11:35 -0400)]
Merge pull request #27517 from eileenmcnaughton/custom_param
Move nasty chunk of code to where it is used
demeritcowboy [Tue, 19 Sep 2023 13:00:11 +0000 (09:00 -0400)]
guard during upgrades
demeritcowboy [Tue, 19 Sep 2023 12:47:52 +0000 (08:47 -0400)]
Merge pull request #27516 from eileenmcnaughton/participant82
Php8.x Fix notices when creating custom field
Eileen McNaughton [Tue, 19 Sep 2023 10:36:17 +0000 (22:36 +1200)]
Move nasty chunk of code to where it is used
This code to get the customFields array is tough going. I haven't unravelled it, just moved it from being
figured out in one function & used in another such that it is figured out in the
chunk of code it is used in.
This will probably fix some php 8.2 tests because rather than all tests
hitting it only those that actually have custom fields + receipts do.
It's a bit of a fake win but it will reduce fails & make further cleanup easier
Eileen McNaughton [Tue, 19 Sep 2023 10:23:45 +0000 (22:23 +1200)]
Php8.x Fix notices when creating custom field
Eileen McNaughton [Tue, 19 Sep 2023 09:15:57 +0000 (21:15 +1200)]
Merge pull request #27514 from eileenmcnaughton/regen
Run regen
Eileen McNaughton [Tue, 19 Sep 2023 08:38:27 +0000 (20:38 +1200)]
Run regen
Eileen McNaughton [Tue, 19 Sep 2023 06:06:40 +0000 (18:06 +1200)]
Merge pull request #27510 from totten/master-event-dao
Regenerate CRM_Event_DAO_Event
Eileen McNaughton [Mon, 18 Sep 2023 09:56:32 +0000 (21:56 +1200)]
Fix notices in text versions of event receipts
Pretty minor change but gets past the notices
Tim Otten [Tue, 19 Sep 2023 04:29:17 +0000 (21:29 -0700)]
Regenerate CRM_Event_DAO_Event
Recently changed by #27478
colemanw [Tue, 19 Sep 2023 02:28:46 +0000 (22:28 -0400)]
Merge pull request #27478 from eileenmcnaughton/carty
Move Conference slots functionality to event cart
colemanw [Tue, 19 Sep 2023 02:24:55 +0000 (22:24 -0400)]
Merge pull request #27482 from eileenmcnaughton/show_cms
Consolidate Profile Preview with other profile code
colemanw [Tue, 19 Sep 2023 02:22:32 +0000 (22:22 -0400)]
Merge pull request #27488 from eileenmcnaughton/event_notice_custom_post
php 8.x Ensure profiles are assigned to template, even when empty
colemanw [Tue, 19 Sep 2023 01:57:35 +0000 (21:57 -0400)]
Merge pull request #27497 from eileenmcnaughton/sessions_offline
Remove event cart sessions handling from offline event receipt text as gone from html
Eileen McNaughton [Tue, 19 Sep 2023 01:53:35 +0000 (13:53 +1200)]
Merge pull request #27502 from eileenmcnaughton/legacy
Fix legacy custom searches to not use hacky method to access protected property on core class
Eileen McNaughton [Tue, 19 Sep 2023 01:53:17 +0000 (13:53 +1200)]
Merge pull request #27509 from eileenmcnaughton/renew
php8.2 stop using yet-another undeclared property for _membershipId.
colemanw [Tue, 19 Sep 2023 01:49:50 +0000 (21:49 -0400)]
Merge pull request #27503 from eileenmcnaughton/getvar
Add deprecation annotations for getVar & setVar
Eileen McNaughton [Tue, 19 Sep 2023 01:39:12 +0000 (13:39 +1200)]
Merge pull request #27508 from civicrm/5.66
5.66
colemanw [Tue, 19 Sep 2023 01:31:53 +0000 (21:31 -0400)]
Merge pull request #27507 from eileenmcnaughton/survey
Remove getVar call, access protected property in same class directly
Eileen McNaughton [Tue, 19 Sep 2023 00:48:02 +0000 (12:48 +1200)]
php8.2 stop using yet-another undeclared property for _membershipId.
Instead follow our new practice of having consistent (externally supported)
functions for getting the main id variables
Tim Otten [Tue, 19 Sep 2023 00:30:28 +0000 (17:30 -0700)]
Merge pull request #27475 from totten/5.66-comp-status
Status Check - Ensure that components are enabled