civicrm-core.git
4 years agosecurity/core#40 Purify activity details when viewing case activities and case reports
Seamus Lee [Sun, 9 Feb 2020 08:32:48 +0000 (19:32 +1100)]
security/core#40 Purify activity details when viewing case activities and case reports

4 years agosecurity/core#60 - Fix PHP Object Injection via Phar Deserialization
Patrick Figel [Tue, 18 Feb 2020 19:44:11 +0000 (20:44 +0100)]
security/core#60 - Fix PHP Object Injection via Phar Deserialization

This mitigates Phar deserialization vulnerabilities by registering an
alternative Phar stream wrapper that filters out insecure Phar files.

PHP makes it possible to trigger Object Injection vulnerabilities by using
a side-effect of the phar:// stream wrapper that unserializes Phar
metadata. To mitigate this vulnerability, projects such as TYPO3 and Drupal
have implemented an alternative Phar stream wrapper that disallows
inclusion of phar files based on certain parameters. This change implements
a similar approach for Civi in environments where the vulnerability isn't
mitigated by the CMS.

Fixes security/core#60

4 years agoCIV-01-021 - Improve entity name sanitization
Tim Otten [Wed, 4 Mar 2020 02:54:50 +0000 (18:54 -0800)]
CIV-01-021 - Improve entity name sanitization

Before
------

* There exist two functions which purport to take an API entity name and sanitize it,
  producing a canonical API entity name. (`\Civi\API\Request::normalizeEntityName`
  and `_civicrm_api_get_camel_name`)
* The two functions are identical for typical inputs. Both call `convertStringToCamel()`.
* The difference relates to unusual/unspecified input characters like `/` or `.` or `+`.
   * `_civicrm_api_get_camel_name()` allows/returns unusual characters.
   * `normalizeEntityName()` filters them out via `\CRM_Utils_String::munge()`

After
-----

* `_civicrm_api_get_camel_name()` just calls `normalizeEntityName()`
* A unit-test provides some comparison/contrast between the old+new behaviors.

Comments
--------

I came into this because CIV-01-021 pointed out that `_civicrm_api_get_camel_name()` had
insufficient sanitization of wonky inputs and could potentially lead to unexpected file-reads.

You can potentially address those wonky inputs by filtering them out or by throwing an exception.
I initially started doing an exception... but it turned out that `normalizeEntityName()` was already
filtering out and didn't really need a change. Also, regardless of the policy, the functions should be
brought into alignment.

Anyway, it seemed like this was the simpler change - it keeps `normalizeEntityName()` working exactly
as before, and only changes `_civicrm_api_get_camel_name()` to match.

4 years agosecurity/core#73 - Fix Contact.getquick API key exposure
Patrick Figel [Tue, 18 Feb 2020 20:54:05 +0000 (21:54 +0100)]
security/core#73 - Fix Contact.getquick API key exposure

This fixes an issue where API keys can be exposed via the field_name
parameter of the Contact.getquick API. Since there is no valid use-case
for requesting API keys via getquick, the fix simply triggers an API
error if the API key is requested.

4 years agoUpdate 5.24.2.md
davejenx [Thu, 9 Apr 2020 10:01:29 +0000 (11:01 +0100)]
Update 5.24.2.md

Fix version number in title.

4 years agoMerge pull request #17041 from seamuslee001/5.25
Tim Otten [Thu, 9 Apr 2020 07:21:03 +0000 (00:21 -0700)]
Merge pull request #17041 from seamuslee001/5.25

Add release-notes/5.24.2

4 years agoAdd release-notes/5.24.2
Tim Otten [Thu, 9 Apr 2020 06:22:33 +0000 (23:22 -0700)]
Add release-notes/5.24.2

4 years agoMerge pull request #17033 from seamuslee001/5.25
Eileen McNaughton [Wed, 8 Apr 2020 22:12:09 +0000 (10:12 +1200)]
Merge pull request #17033 from seamuslee001/5.25

Revert "temp workaround for dev/core#1675"

4 years agoMerge pull request #17021 from totten/5.25-language-labels
Seamus Lee [Wed, 8 Apr 2020 21:28:14 +0000 (07:28 +1000)]
Merge pull request #17021 from totten/5.25-language-labels

CRM_Core_I18n - Provide a better label for new/unknown locales

4 years agoRevert "temp workaround for dev/core#1675"
Seamus Lee [Wed, 8 Apr 2020 21:20:48 +0000 (07:20 +1000)]
Revert "temp workaround for dev/core#1675"

This reverts commit fcd23b884537a19ff2acbc98ca20a43f292c4c42.

4 years agoMerge pull request #17004 from pradpnayak/fixhookissue
Eileen McNaughton [Wed, 8 Apr 2020 04:57:48 +0000 (16:57 +1200)]
Merge pull request #17004 from pradpnayak/fixhookissue

Fixed fatal error for class not found when managed hook is invoked du…

4 years agoCRM_Core_I18n - Provide a better label for new/unknown locales
Tim Otten [Wed, 8 Apr 2020 04:14:38 +0000 (21:14 -0700)]
CRM_Core_I18n - Provide a better label for new/unknown locales

Overview
--------

Suppose you add new/unrecognized data files in the `l10n` folder - and then
you navigate to the screen `civicrm/admin/setting/localization?reset=1`.

Before
------

The new language appears in the admin UI as a blank item.

Every page in the app displays a warning about the unrecognized locale.

After
-----

The new language appears in the admin UI with a placeholder name (based on the code).

The warnings are not displayed.

Comment
-------

We've just had an issue where a new language was added to the `l10n`
data-set, and then all automated test-suites for all versions (incl `5.25`
RC and `5.24` stable) started to throw blocker errors on unrelated PRs.
This is because the `l10n` data is generally evergreen, but each branch/tag
of `civicrm-core` has the list hard-coded in multiple spots.

This patch tries to make the symptom less painful when mixing/matching
different revisions of `civicrm-core.git` and `l10n.git`.

4 years agoMerge pull request #17014 from seamuslee001/nl_be_5_25
Seamus Lee [Wed, 8 Apr 2020 01:53:29 +0000 (11:53 +1000)]
Merge pull request #17014 from seamuslee001/nl_be_5_25

add nl_BE language

4 years agoadd nl_BE language
demeritcowboy [Thu, 2 Apr 2020 21:59:21 +0000 (17:59 -0400)]
add nl_BE language

4 years agoFixed fatal error for class not found when managed hook is invoked during upgrade
Pradeep Nayak [Tue, 7 Apr 2020 02:16:44 +0000 (03:16 +0100)]
Fixed fatal error for class not found when managed hook is invoked during upgrade

4 years agoMerge pull request #16978 from seamuslee001/5.25
Seamus Lee [Sun, 5 Apr 2020 20:17:23 +0000 (06:17 +1000)]
Merge pull request #16978 from seamuslee001/5.25

Add release-notes/5.24.1

4 years agoAdd release-notes/5.24.1
Tim Otten [Sun, 5 Apr 2020 00:50:45 +0000 (17:50 -0700)]
Add release-notes/5.24.1

4 years agoMerge pull request #16971 from totten/5.25-seqcredit
Seamus Lee [Fri, 3 Apr 2020 23:49:28 +0000 (10:49 +1100)]
Merge pull request #16971 from totten/5.25-seqcredit

dev/financial#84 - Fix upgrade failure. Thin-out activation logic for `sequentialcreditnotes`.

4 years agodev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.
Tim Otten [Fri, 3 Apr 2020 22:22:44 +0000 (15:22 -0700)]
dev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.

Steps to reproduce
------------------

* Create a site based on `wp-demo` with Civi 5.21
* Make a DB snapshot
* Update code to 5.24
* In the web UI, run the DB upgrade
    * Note: It's important to use the web UI. The problem does not reproduce in CLI.

Before
------

The upgrader freezes on "Upgrade DB to 5.24.alpha1". The `CiviCRM.log` includes:

```
Apr 03 14:41:50  [info] Running task: Upgrade DB to 5.24.alpha1: SQL

Apr 03 14:41:55  [info] Running task: Install sequential creditnote extension

Apr 03 14:42:14  [info] $CRM_Queue_ErrorPolicy_reportError = Array
(
    [is_error] => 1
    [is_continue] => 0
    [exception] => Error 1: Uncaught Error: Class 'CRM_Volunteer_Permission' not found in /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/tools/extensions/civivolunteer/volunteer.php:497
Stack trace:
0 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook.php(286): volunteer_civicrm_permission(Array)
1 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook/WordPress.php(139): CRM_Utils_Hook->runHooks(Array, 'civicrm_permiss...', 1, Array, NULL, NULL, NULL, NULL, NULL)
2 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/Civi/Core/CiviEventDispatcher.php(86): CRM_Utils_Hook_WordPress->invokeViaUF(1, Array, NULL, NULL, NULL, NULL, NULL, 'civicrm_permiss...')
3 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/vendor/symfony/event-dispatcher/EventDispatcher.php(184): Civi\Core\CiviEventDispatcher::delegateToUF(Object(Civi\Core\Event\GenericHookEvent), 'hook_civicrm_p
    [last_task_title] => Install sequential creditnote extension
)
```

After
-----

The upgrade completes. After installation, the `sequentialcreditnotes` extension is active.

4 years agoMerge pull request #16961 from MegaphoneJon/core-1688-525
Seamus Lee [Fri, 3 Apr 2020 00:54:34 +0000 (11:54 +1100)]
Merge pull request #16961 from MegaphoneJon/core-1688-525

core#1688 - false positive on missing custom field check

4 years agocore#1688 - false positive on missing custom field check
Jon Goldberg [Thu, 2 Apr 2020 18:07:33 +0000 (14:07 -0400)]
core#1688 - false positive on missing custom field check

4 years agoSet version to 5.25.beta1
CiviCRM [Thu, 2 Apr 2020 05:26:58 +0000 (05:26 +0000)]
Set version to 5.25.beta1

4 years agoMerge pull request #16753 from agh1/consolidated-php-version
Tim Otten [Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)]
Merge pull request #16753 from agh1/consolidated-php-version

dev/core#1528 - Consolidate to single constant for minimum PHP version

4 years agoCRM_Report_DAO_ReportInstance - Update checksum
Tim Otten [Thu, 2 Apr 2020 04:21:07 +0000 (21:21 -0700)]
CRM_Report_DAO_ReportInstance - Update checksum

4 years agoMerge pull request #16948 from eileenmcnaughton/email4
Tim Otten [Thu, 2 Apr 2020 04:14:16 +0000 (21:14 -0700)]
Merge pull request #16948 from eileenmcnaughton/email4

[REF] move buildQuickForm function to the trait

4 years agoMerge pull request #16951 from colemanw/dirtyMoney
Tim Otten [Thu, 2 Apr 2020 04:11:58 +0000 (21:11 -0700)]
Merge pull request #16951 from colemanw/dirtyMoney

Revert "APIv4 - Fix contribution create"

4 years agoRevert "APIv4 - Fix contribution create"
Coleman Watts [Thu, 2 Apr 2020 01:21:10 +0000 (21:21 -0400)]
Revert "APIv4 - Fix contribution create"

This reverts commit 2f97c5641cceec44c02585c2d1d212bda1c6228e.
It should no longer be needed due to the improvement made in 243320eda23195985815ceb65ec7ee9079ae3014.

4 years agoMerge pull request #16950 from eileenmcnaughton/clean_money
Seamus Lee [Thu, 2 Apr 2020 00:40:14 +0000 (11:40 +1100)]
Merge pull request #16950 from eileenmcnaughton/clean_money

Remove  deprecated cleaning  of money in  the  BAO layer

4 years agoRemove deprecated cleaning of money in the BAO layer
eileen [Wed, 1 Apr 2020 23:01:00 +0000 (12:01 +1300)]
Remove  deprecated cleaning  of money in  the  BAO layer

Any code that  passed dirty money  to the Contribution::create BAO will  have been seeing
deprecation notices  for  some time.  The  supported method is via the  api & v3 api does  the cleaning
whereas  v4 expects it to be pre-cleaned  - perhaps it's time to remove  this & leave it to  the
calling code

4 years agoMerge pull request #16947 from colemanw/groupByFunctions
Eileen McNaughton [Wed, 1 Apr 2020 22:57:04 +0000 (11:57 +1300)]
Merge pull request #16947 from colemanw/groupByFunctions

APIv4 - Support GROUP BY and aggregate functions

4 years agoMerge pull request #16943 from jitendrapurohit/core-1682
Eileen McNaughton [Wed, 1 Apr 2020 22:33:31 +0000 (11:33 +1300)]
Merge pull request #16943 from jitendrapurohit/core-1682

dev/core#1682 - Invalid currency  on sending offline membership receipt.

4 years agoMerge pull request #16919 from jaapjansma/dev-1674
Tim Otten [Wed, 1 Apr 2020 22:06:31 +0000 (15:06 -0700)]
Merge pull request #16919 from jaapjansma/dev-1674

dev/core#1674: fix rebuilding of container on every request

4 years ago(REF) CRM_Api4_Services - Cleanup extra comment/try/catch
Tim Otten [Wed, 1 Apr 2020 22:03:33 +0000 (15:03 -0700)]
(REF) CRM_Api4_Services - Cleanup extra comment/try/catch

4 years ago[REF] move buildQuickForm function to the trait
eileen [Tue, 31 Mar 2020 22:19:44 +0000 (11:19 +1300)]
[REF] move buildQuickForm function to the trait

Note that Contact had an extra assign. It seems likely the  extra  assign  is not required  but it
would not be a bad thing on the others

4 years agoMerge pull request #16940 from eileenmcnaughton/email4
colemanw [Wed, 1 Apr 2020 21:51:26 +0000 (17:51 -0400)]
Merge pull request #16940 from eileenmcnaughton/email4

[REF] Move properties to Trait

4 years agoAPIv4 - Fix contribution create
Coleman Watts [Wed, 1 Apr 2020 21:26:32 +0000 (17:26 -0400)]
APIv4 - Fix contribution create

4 years agoAPIv4 - Add SQL expression handling and aggregate functions
Coleman Watts [Tue, 31 Mar 2020 21:33:19 +0000 (17:33 -0400)]
APIv4 - Add SQL expression handling and aggregate functions

Adds a series of SqlExpression classes to parse and validate sql expressions used in SELECT, GROUP BY and ORDER BY clauses.
The framework can handle most sql functions, but this first commit adds support for the aggregate functions AVG, COUNT, MAX, MIN & SUM

4 years agoMerge pull request #16941 from jitendrapurohit/16845-followup
Eileen McNaughton [Wed, 1 Apr 2020 21:33:16 +0000 (10:33 +1300)]
Merge pull request #16941 from jitendrapurohit/16845-followup

Follow up PR for #16845 - Fix form error when  variable is NULL

4 years agoMerge pull request #16945 from lcdservices/dev-core-1683
Eileen McNaughton [Wed, 1 Apr 2020 21:24:33 +0000 (10:24 +1300)]
Merge pull request #16945 from lcdservices/dev-core-1683

fixes dev/core#1683 set profile frontend title

4 years agoApi4SelectQuery - add more metadata to apiFieldSpec
Coleman Watts [Mon, 30 Mar 2020 16:22:43 +0000 (12:22 -0400)]
Api4SelectQuery - add more metadata to apiFieldSpec

4 years agoAPIv4 - Add rudimentary support for groupBy
Coleman Watts [Sat, 21 Mar 2020 23:48:24 +0000 (19:48 -0400)]
APIv4 - Add rudimentary support for groupBy

4 years agoMerge pull request #16946 from civicrm/5.24
Seamus Lee [Wed, 1 Apr 2020 21:06:01 +0000 (08:06 +1100)]
Merge pull request #16946 from civicrm/5.24

5.24

4 years agoMerge pull request #16944 from alifrumin/5.24-rn
Seamus Lee [Wed, 1 Apr 2020 20:40:40 +0000 (07:40 +1100)]
Merge pull request #16944 from alifrumin/5.24-rn

[NFC] adding late changes to release notes for 5.24

4 years agofixes dev/core#1683 set profile frontend title
Brian Shaughnessy [Wed, 1 Apr 2020 18:52:10 +0000 (14:52 -0400)]
fixes dev/core#1683 set profile frontend title

4 years agolate changes to release notes
Alice Frumin [Wed, 1 Apr 2020 15:37:42 +0000 (11:37 -0400)]
late changes to release notes

4 years agodev/core#1682 - Invalid currency on sending offline membership receipt.
Jitendra Purohit [Wed, 1 Apr 2020 11:32:30 +0000 (17:02 +0530)]
dev/core#1682 - Invalid currency  on sending offline membership receipt.

4 years agoFollow up PR for #16845 - Fix form error when variable is NULL
Jitendra Purohit [Wed, 1 Apr 2020 10:50:08 +0000 (16:20 +0530)]
Follow up PR for #16845 - Fix form error when  variable is NULL

4 years agoMove properties to Trait
eileen [Tue, 31 Mar 2020 22:14:44 +0000 (11:14 +1300)]
Move properties to Trait

4 years agoMerge pull request #16935 from eileenmcnaughton/email_common
colemanw [Wed, 1 Apr 2020 09:37:32 +0000 (05:37 -0400)]
Merge pull request #16935 from eileenmcnaughton/email_common

[REF] Start transitioning EmailCommon class to a trait

4 years agodev/core#1674 - Update container cache when folder is removed or created
Tim Otten [Wed, 1 Apr 2020 08:00:07 +0000 (01:00 -0700)]
dev/core#1674 - Update container cache when folder is removed or created

Conceptually, you want to:

* (A) Keep the container cache when nothing has changed (regardless of whether that status-quo has an API4 subscriber folder).
* (B) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly created
* (C) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly removed

To test this out, I hacked `Civi\Core\Container::loadContainer()` to emit a debug message
to indicate if it is reusing the cache or updating. Then, I prepared two terminals for running alternate steps:

* In terminal 1, go back and forth with adding/removing folders/files like `Civi/Api4/Event/Subscriber`.
* In terminal 2, periodically run `cv ev 'echo "Hello\n";'` and note whether the cache is update.

In this way, we can see if a developer action (adding a file) leads to an automatic update in the cache.

I found that the previous commit fixed (A) and did (C), but it failed to
update per (B).  This commit should handle (A), (B), and (C).

4 years agoMerge pull request #16885 from demeritcowboy/test-getrelatedcases
Eileen McNaughton [Wed, 1 Apr 2020 03:54:28 +0000 (16:54 +1300)]
Merge pull request #16885 from demeritcowboy/test-getrelatedcases

[NFC/TEST] Resurrect unfinished test for getRelatedCases()

4 years agoMerge pull request #16921 from pradpnayak/newHook
Yashodha Chaku [Wed, 1 Apr 2020 03:18:37 +0000 (08:48 +0530)]
Merge pull request #16921 from pradpnayak/newHook

Add hook to alter display value or Custom field value

4 years agoMerge pull request #16938 from civicrm/5.24
Eileen McNaughton [Wed, 1 Apr 2020 02:33:11 +0000 (15:33 +1300)]
Merge pull request #16938 from civicrm/5.24

5.24

4 years agoMerge pull request #16937 from seamuslee001/5.24
Eileen McNaughton [Wed, 1 Apr 2020 02:32:53 +0000 (15:32 +1300)]
Merge pull request #16937 from seamuslee001/5.24

[REF] Fix handling of owner url parameter from Membership Dashboard

4 years ago[REF] Start transitioning EmailCommon class to a trait
eileen [Tue, 31 Mar 2020 21:08:20 +0000 (10:08 +1300)]
[REF] Start transitioning EmailCommon class to a trait

This is a really awful class - I've added a trait &  moved the calls from the various forms to that trait
so the code  on EmailCommon for buildForm is now only called once. I will follow up with more the same

4 years ago[REF] Fix handling of owner url parameter from Membership Dashboard
Seamus Lee [Wed, 1 Apr 2020 00:51:26 +0000 (11:51 +1100)]
[REF] Fix handling of owner url parameter from Membership Dashboard

4 years agoMerge pull request #16933 from eileenmcnaughton/member_search
Seamus Lee [Wed, 1 Apr 2020 00:45:40 +0000 (11:45 +1100)]
Merge pull request #16933 from eileenmcnaughton/member_search

dev/user-interface#14 Fix membership_status_id url handling (recent regression).

4 years agoMerge pull request #16930 from eileenmcnaughton/524
Seamus Lee [Wed, 1 Apr 2020 00:38:32 +0000 (11:38 +1100)]
Merge pull request #16930 from eileenmcnaughton/524

dev/core#1677 Fix multisite regression on domain membership types

4 years agoMerge pull request #16928 from eileenmcnaughton/email
colemanw [Tue, 31 Mar 2020 20:50:09 +0000 (16:50 -0400)]
Merge pull request #16928 from eileenmcnaughton/email

[REF] Remove fatal, fix some code comments

4 years agoMerge pull request #16932 from eileenmcnaughton/mailing_name
colemanw [Tue, 31 Mar 2020 15:43:28 +0000 (11:43 -0400)]
Merge pull request #16932 from eileenmcnaughton/mailing_name

dev/core#1656 Remove duplicate label

4 years agoMerge pull request #16929 from eileenmcnaughton/email2
colemanw [Tue, 31 Mar 2020 14:12:58 +0000 (10:12 -0400)]
Merge pull request #16929 from eileenmcnaughton/email2

[REF] extract code to getEmails

4 years agoMerge pull request #16927 from eileenmcnaughton/campaign
colemanw [Tue, 31 Mar 2020 14:09:46 +0000 (10:09 -0400)]
Merge pull request #16927 from eileenmcnaughton/campaign

[REF] Minor simplification - do not use variable variables

4 years agoMerge pull request #16868 from twomice/contribution_detail_pledge
Yashodha Chaku [Tue, 31 Mar 2020 10:23:14 +0000 (15:53 +0530)]
Merge pull request #16868 from twomice/contribution_detail_pledge

Add "pledge id" as column and filter in Contribution Detail report.

4 years agodev/user-interface#14 Fix membership_status_id url handling (recent regression).
eileen [Tue, 31 Mar 2020 08:31:44 +0000 (21:31 +1300)]
dev/user-interface#14 Fix membership_status_id url handling (recent regression).

The right fix here is to fix the xml to the  field setting it to export & adding a uniquename.

However, with our search focus moving on to the new search functionality in the pipeline & us having had
a hiatus on dealing with  search  code I think this more conservative change + a rc focus makes sense
at the  moment

4 years agoRemove duplicate label
eileen [Tue, 31 Mar 2020 07:25:15 +0000 (20:25 +1300)]
Remove duplicate label

4 years agoMerge pull request #16931 from civicrm/5.24
Eileen McNaughton [Tue, 31 Mar 2020 06:04:10 +0000 (19:04 +1300)]
Merge pull request #16931 from civicrm/5.24

5.24 to master

4 years agoMerge pull request #16926 from demeritcowboy/quickfix-case-addtimeline
Eileen McNaughton [Tue, 31 Mar 2020 05:57:54 +0000 (18:57 +1300)]
Merge pull request #16926 from demeritcowboy/quickfix-case-addtimeline

dev/core#1675 - Temporary regression fix for case add timeline

4 years agodev/core#1677 Fix multisite regression on domain membership types
eileen [Tue, 31 Mar 2020 05:12:33 +0000 (18:12 +1300)]
dev/core#1677 Fix multisite regression on domain membership types

Fixes a regression where membership types bleed between domains

4 years ago[REF] extract code to getEmails
eileen [Tue, 31 Mar 2020 04:51:01 +0000 (17:51 +1300)]
[REF] extract code to getEmails

4 years ago[REF] Remove fatal, fix some code comments
eileen [Tue, 31 Mar 2020 03:48:38 +0000 (16:48 +1300)]
[REF] Remove fatal, fix some code comments

4 years ago[REF] Minor simplification - do not use variable variables
eileen [Tue, 31 Mar 2020 03:38:23 +0000 (16:38 +1300)]
[REF] Minor simplification - do not use variable variables

This is a minor readabilty improvement because it's awful. Much more could be done....

4 years agotemp workaround for dev/core#1675
demeritcowboy [Mon, 30 Mar 2020 20:12:12 +0000 (16:12 -0400)]
temp workaround for dev/core#1675

4 years agoAdded unit test
Pradeep Nayak [Sun, 29 Mar 2020 19:57:39 +0000 (20:57 +0100)]
Added unit test

4 years agoAdd hook to alter display value or Custom field value
Pradeep Nayak [Thu, 11 Jul 2019 20:11:38 +0000 (21:11 +0100)]
Add hook to alter display value or Custom field value

4 years agoMerge pull request #16912 from eileenmcnaughton/conf_2
Matthew Wire [Mon, 30 Mar 2020 10:41:26 +0000 (11:41 +0100)]
Merge pull request #16912 from eileenmcnaughton/conf_2

[Test] Remove skip that seems no longer required

4 years agoMerge pull request #16925 from pradpnayak/pseudoCon
Seamus Lee [Mon, 30 Mar 2020 06:27:19 +0000 (17:27 +1100)]
Merge pull request #16925 from pradpnayak/pseudoCon

Added pseudoconstant for acl_id

4 years agoMerge pull request #16924 from demeritcowboy/brackets
Seamus Lee [Mon, 30 Mar 2020 06:26:54 +0000 (17:26 +1100)]
Merge pull request #16924 from demeritcowboy/brackets

dev/core#1676 - E_NOTICE because of missing brackets for order of operations

4 years agoAdded pseudoconstant for acl_id
Pradeep Nayak [Mon, 30 Mar 2020 03:03:30 +0000 (04:03 +0100)]
Added pseudoconstant for acl_id

4 years agoMerge pull request #16907 from eileenmcnaughton/deprec
colemanw [Mon, 30 Mar 2020 02:53:47 +0000 (22:53 -0400)]
Merge pull request #16907 from eileenmcnaughton/deprec

Remove deprecated function

4 years agomissing brackets
demeritcowboy [Mon, 30 Mar 2020 01:01:21 +0000 (21:01 -0400)]
missing brackets

4 years agoMerge pull request #16670 from demeritcowboy/audit-tpl-3
Eileen McNaughton [Sun, 29 Mar 2020 22:27:51 +0000 (11:27 +1300)]
Merge pull request #16670 from demeritcowboy/audit-tpl-3

dev/core#1366 - case audit printReport parameter is no longer used

4 years agoMerge pull request #16889 from colemanw/api4ref
Eileen McNaughton [Sun, 29 Mar 2020 21:24:53 +0000 (10:24 +1300)]
Merge pull request #16889 from colemanw/api4ref

Make api4 select query object more sane

4 years agoApi4SelectQuery - Refactor field handling for looser coupling and more flexibility
Coleman Watts [Fri, 27 Mar 2020 01:01:28 +0000 (21:01 -0400)]
Api4SelectQuery - Refactor field handling for looser coupling and more flexibility

Getting ready to support groupBy, having and sql functions

4 years agoAPIv4 - Standardize field sql name conversion
Coleman Watts [Tue, 24 Mar 2020 17:26:21 +0000 (13:26 -0400)]
APIv4 - Standardize field sql name conversion

4 years agoMerge pull request #16920 from colemanw/api4test
colemanw [Sun, 29 Mar 2020 18:54:49 +0000 (14:54 -0400)]
Merge pull request #16920 from colemanw/api4test

[NFC] APIv4 - Add test coverage for expected fields from join

4 years agoAPIv4 - Add test coverage for expected fields from join
Coleman Watts [Sun, 29 Mar 2020 01:52:57 +0000 (21:52 -0400)]
APIv4 - Add test coverage for expected fields from join

4 years agoUpdate style warnings
Jaap Jansma [Sat, 28 Mar 2020 21:55:57 +0000 (22:55 +0100)]
Update style warnings

4 years agodev-1674: fix rebuilding of container on every request
Jaap Jansma [Sat, 28 Mar 2020 20:16:04 +0000 (21:16 +0100)]
dev-1674: fix rebuilding of container on every request

4 years agoMerge pull request #16893 from seamuslee001/nfc_sort_api4_test
colemanw [Sat, 28 Mar 2020 13:46:29 +0000 (09:46 -0400)]
Merge pull request #16893 from seamuslee001/nfc_sort_api4_test

[NFC] Add in unit test to ensure that APIv4 Doesn't accept an invalid…

4 years ago[NFC] Add in unit test to ensure that APIv4 Doesn't accept an invalid sort
Seamus Lee [Wed, 25 Mar 2020 00:05:01 +0000 (11:05 +1100)]
[NFC] Add in unit test to ensure that APIv4 Doesn't accept an invalid sort

4 years agoMerge pull request #16917 from colemanw/domainId2
Seamus Lee [Fri, 27 Mar 2020 20:54:05 +0000 (07:54 +1100)]
Merge pull request #16917 from colemanw/domainId2

APIv4 - Only adjust domain_id if required

4 years agoMerge pull request #16902 from eileenmcnaughton/setting_ex
Matthew Wire [Fri, 27 Mar 2020 19:01:29 +0000 (19:01 +0000)]
Merge pull request #16902 from eileenmcnaughton/setting_ex

[REF] Extract code used to render a pseudoconstant when a table is defined.

4 years agoAPIv4 - Only adjust domain_id if required
Coleman Watts [Fri, 27 Mar 2020 16:39:40 +0000 (12:39 -0400)]
APIv4 - Only adjust domain_id if required

4 years agoMerge pull request #16914 from eileenmcnaughton/act2
colemanw [Fri, 27 Mar 2020 14:11:39 +0000 (10:11 -0400)]
Merge pull request #16914 from eileenmcnaughton/act2

Remove unused code

4 years agoMerge pull request #16913 from eileenmcnaughton/act
Seamus Lee [Fri, 27 Mar 2020 08:52:55 +0000 (19:52 +1100)]
Merge pull request #16913 from eileenmcnaughton/act

[REF] Move form specific handling back to the relevant form.

4 years agoRemove unused code
eileen [Fri, 27 Mar 2020 04:11:41 +0000 (17:11 +1300)]
Remove unused code

If seems to me that 1) if this IF is true then there will be a bounce & it will not proceed annd
2 if it IS true emailAddress does not seem to be applied anywhere

4 years ago[REF] Move form specific handling back to the relevant form.
eileen [Fri, 27 Mar 2020 02:59:14 +0000 (15:59 +1300)]
[REF] Move form specific handling back to the relevant form.

The shared function has handling to set ->_single if the class is CRM_Contact_Form_Task_Email -
this seems prety obviously not functionality that is shared so it should be on the CRM_Contact_Form_Task_Email
class

4 years ago[Test] Remove skip that seems no longer required
eileen [Thu, 26 Mar 2020 23:46:53 +0000 (12:46 +1300)]
[Test] Remove skip that seems no longer required

The removed line seems to be loosening the test for a deprecation that I didn't hit in testing today

4 years agoMerge pull request #16895 from eileenmcnaughton/case
Seamus Lee [Thu, 26 Mar 2020 23:44:55 +0000 (10:44 +1100)]
Merge pull request #16895 from eileenmcnaughton/case

Remove assigns for   atypefile

4 years agoMerge pull request #16910 from eileenmcnaughton/conf
colemanw [Thu, 26 Mar 2020 23:17:35 +0000 (19:17 -0400)]
Merge pull request #16910 from eileenmcnaughton/conf

Deprecate use of  in OptionGroup::add() function