Edsel [Tue, 17 Mar 2015 11:57:31 +0000 (17:27 +0530)]
CIVI-28 Added permission check for Contribution Detail Report
Edsel [Tue, 17 Mar 2015 11:52:48 +0000 (17:22 +0530)]
CIVI-28 Added permission check for Contribution Summary Report
Edsel [Tue, 17 Mar 2015 11:22:39 +0000 (16:52 +0530)]
CIVI-28 Removed Edit and delete links according to permission from contribution view page
Edsel [Tue, 17 Mar 2015 11:05:27 +0000 (16:35 +0530)]
CIVI-28 Removed unnecessary code
Edsel [Tue, 17 Mar 2015 11:04:22 +0000 (16:34 +0530)]
CIVI-28 Added check for permissions while search results are being displayed on contribution search, advanced search and contact summary page (Contributions tab)
Edsel [Tue, 17 Mar 2015 10:19:54 +0000 (15:49 +0530)]
CIVI-28 Bug fixes and modifications
Edsel [Tue, 17 Mar 2015 06:37:55 +0000 (12:07 +0530)]
CIVI-28 Modified functionality for offline contribution page
Edsel [Tue, 17 Mar 2015 06:36:14 +0000 (12:06 +0530)]
CIVI-28 Added permission check for Contrirbution pages
Edsel [Mon, 16 Mar 2015 14:14:58 +0000 (19:44 +0530)]
CIVI-28 Added permission forr contribution view
Edsel [Mon, 16 Mar 2015 14:14:38 +0000 (19:44 +0530)]
CIVI-28 Added permissions for Drupal page
Edsel [Mon, 16 Mar 2015 14:14:22 +0000 (19:44 +0530)]
CIVI-28 Added permission check for admin financial type
Edsel [Mon, 16 Mar 2015 14:14:02 +0000 (19:44 +0530)]
CIVI-28 Added permission check for Contribution page
Edsel [Mon, 16 Mar 2015 14:11:27 +0000 (19:41 +0530)]
CIVI-28 Added permission cehck for offline contribution form
Edsel [Mon, 16 Mar 2015 14:11:05 +0000 (19:41 +0530)]
CIVI-28 Added permissions for Drupal permission pages
Kurund Jalmi [Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
Yashodha Chaku [Mon, 21 Sep 2015 09:34:52 +0000 (15:04 +0530)]
Merge pull request #6712 from jitendrapurohit/CRM-17146-tests
Test to check CRM-17146 - include trxn_date in completetransaction API
Tim Otten [Mon, 21 Sep 2015 07:46:00 +0000 (00:46 -0700)]
Merge pull request #6776 from totten/master-setting-redux
CRM-16373 - $config - Separate runtime and boot services
Tim Otten [Mon, 21 Sep 2015 06:50:02 +0000 (23:50 -0700)]
Fix api_v3_ContactTest.testContactGetBy*Username
Tim Otten [Sun, 20 Sep 2015 23:17:06 +0000 (16:17 -0700)]
Construct runtime+extensions+container through boot services
Tim Otten [Sat, 19 Sep 2015 08:33:57 +0000 (01:33 -0700)]
Convert $config->userSystem to boot service
Tim Otten [Sat, 19 Sep 2015 05:09:01 +0000 (22:09 -0700)]
CRM-16373 - Bootstrap subsystems in more predictable order
Several subsystems were initialized on-demand. This had a weird side-effect
where the container would start initializing and call another service, which
would then (indirectly) try to initialize another container. The two container
instances would not be the same.
This revision enforces a more carefully considered sequence of events (which
will be documented in the wiki page, "Bootstrap Reference").
Tim Otten [Sat, 19 Sep 2015 05:03:20 +0000 (22:03 -0700)]
CRM_Core_Error - Don't display HTML crash when running tests
Tim Otten [Sat, 19 Sep 2015 01:00:30 +0000 (18:00 -0700)]
CRM-16373 - MagicMerge - Improve comments/readability.
Tim Otten [Mon, 21 Sep 2015 03:54:45 +0000 (20:54 -0700)]
Merge pull request #6774 from totten/master-fs25
composer.json - Use symfony/filesystem circa 2.5
Tim Otten [Mon, 21 Sep 2015 03:00:00 +0000 (20:00 -0700)]
composer.json - Use symfony/filesystem circa 2.5
The rest of the Symfony components are targetting ~2.5, but some reason
we're autoselecting `symfony/filesystem` ~2.7. That produces errors on
`test-debian6-1`.
Eileen McNaughton [Mon, 21 Sep 2015 02:24:27 +0000 (14:24 +1200)]
Merge pull request #6773 from civicrm/eileenmcnaughton-patch-1
CRM-16555 add code-comments
Eileen McNaughton [Mon, 21 Sep 2015 02:01:34 +0000 (14:01 +1200)]
CRM-16555 add code-comments
The patch added for CRM-16555 should not have been needed as the intention was that the function to getValidProcessors handling for mode would have worked. Adding some comments to indicate this for next time someone looks at it.
Dave Greenberg [Fri, 18 Sep 2015 23:55:35 +0000 (16:55 -0700)]
Merge pull request #6771 from seamuslee001/CRM-17231-Master
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191
CRM-17246 fix - Contact name showing in Contribution summary report
Seamus Lee [Fri, 18 Sep 2015 04:43:38 +0000 (04:43 +0000)]
PHPCS fixes
Seamus Lee [Fri, 18 Sep 2015 04:34:20 +0000 (04:34 +0000)]
Further tweeks following testing
Seamus Lee [Wed, 16 Sep 2015 23:45:37 +0000 (23:45 +0000)]
PHPCS fixes
Seamus Lee [Wed, 16 Sep 2015 23:36:45 +0000 (23:36 +0000)]
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 21:45:52 +0000 (03:15 +0530)]
Merge pull request #6755 from agileware/master-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 21:36:17 +0000 (03:06 +0530)]
Merge pull request #6770 from monishdeb/CRM16920
CRM-16920 - When coding a report template, can specify a default 'fro…
monishdeb [Fri, 18 Sep 2015 20:39:45 +0000 (02:09 +0530)]
CRM-16920 - When coding a report template, can specify a default 'from' and 'to' for date ranges, but not for integer ranges
https://issues.civicrm.org/jira/browse/CRM-16920
monishdeb [Fri, 18 Sep 2015 20:08:55 +0000 (01:38 +0530)]
format fix
monishdeb [Fri, 18 Sep 2015 19:53:49 +0000 (01:23 +0530)]
CRM-17246 fix - Contact name showing in Contribution summary report
https://issues.civicrm.org/jira/browse/CRM-17246
Tim Otten [Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)]
Merge pull request #6768 from totten/master-composer-lock
composer.lock - update
Tim Otten [Fri, 18 Sep 2015 19:37:50 +0000 (12:37 -0700)]
composer.lock - update
Previous merges left composer.lock with incorrect hash
Monish Deb [Fri, 18 Sep 2015 17:41:29 +0000 (23:11 +0530)]
Merge pull request #6766 from monishdeb/CRM-17191
Crm 17191
Dave Greenberg [Fri, 18 Sep 2015 17:07:38 +0000 (10:07 -0700)]
Merge pull request #6764 from davecivicrm/CRM-15378
CRM-15378 - Add max participants and count to price option browse page.
monishdeb [Fri, 18 Sep 2015 13:44:57 +0000 (19:14 +0530)]
notice and format fixes
Jamie McClelland [Thu, 10 Sep 2015 12:45:33 +0000 (08:45 -0400)]
CRM-17191 - removing redundant if clause.
Jamie McClelland [Thu, 10 Sep 2015 12:38:48 +0000 (08:38 -0400)]
CRM-17191 - ensure Participant list report works with custom Grouping
Previously, we got a trace back if a user defined a group by clause.
I've removed what appears to be crufty code that tries to add the
group by fields to an ORDER BY statement - which conflicts with the
existing ORDER BY statement and seems unnecessary. Also, if the user
wants to group by another field, we should not group by the participant
id.
Yashodha Chaku [Fri, 18 Sep 2015 10:19:44 +0000 (15:49 +0530)]
Merge pull request #6756 from agileware/4.6-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 09:45:44 +0000 (15:15 +0530)]
Merge pull request #6757 from yashodha/CRM-17227
CRM-17227: Error thrown while saving profile in Contribution page
Tim Otten [Fri, 18 Sep 2015 08:14:47 +0000 (01:14 -0700)]
Merge pull request #6765 from totten/master-cdl
CRM-14232, CRM-16373 - Fix saving of contact_default_language
Tim Otten [Fri, 18 Sep 2015 04:34:12 +0000 (21:34 -0700)]
CRM-14232, CRM-16373 - Fix saving of contact_default_language
Tim Otten [Fri, 18 Sep 2015 00:49:14 +0000 (17:49 -0700)]
Merge pull request #6542 from totten/master-setting-helper
CRM-16373 - $config based on settings (no config_backend). Use Civi:: helper.
Dave Greenberg [Fri, 18 Sep 2015 00:32:44 +0000 (17:32 -0700)]
Merge pull request #6761 from eileenmcnaughton/CRM-17233
CRM-17233 payment block showing in edit mode on contribution page
Dave Greenberg [Fri, 18 Sep 2015 00:27:34 +0000 (17:27 -0700)]
CRM-15378 - Add max participants and count to price option browse page.
----------------------------------------
* CRM-15378: Include Max Participants and Participant Count columns when viewing price field options
https://issues.civicrm.org/jira/browse/CRM-15378
Tim Otten [Thu, 17 Sep 2015 05:14:28 +0000 (22:14 -0700)]
civicrm_generated.mysql - regen
Tim Otten [Thu, 17 Sep 2015 07:51:02 +0000 (00:51 -0700)]
CRM-16373 - Path, URL Admin - Explain variables
Tim Otten [Thu, 17 Sep 2015 05:59:05 +0000 (22:59 -0700)]
SettingsManager::getSystemDefaults() - Return defaults even for critical boot settings
This fixes some issues in tests involving enableComponents.
Upshot: The UI for setting URLs/directories now displays the default values properly.
Tim Otten [Thu, 17 Sep 2015 04:49:57 +0000 (21:49 -0700)]
CRM_Core_BAO_Setting - Don't prefill settings
It's no longer necessary to prefill settings because defaults are loaded in
real(ish) time.
Removing this because it depends on ConfigSetting functions which I'd
like to also remove.
Tim Otten [Thu, 17 Sep 2015 04:08:38 +0000 (21:08 -0700)]
CRM_Admin_Form_Preferences - Fix loading of settings
Tim Otten [Thu, 17 Sep 2015 03:59:01 +0000 (20:59 -0700)]
CRM-16373 - Migrate config_backend to civicrm_setting
There are two steps at which we convert config_backend:
* In loading the upgrade environment, we may need access to old settings.
So SettingsBag supports reading config_backend for the active domain.
* As a specific upgrade step (for 4.7.alpha1), we migrate all values
for all domains (unless there's already a setting).
Tim Otten [Thu, 17 Sep 2015 01:50:57 +0000 (18:50 -0700)]
CRM_Core_Config - Expose userFrameworkVersion, replyTo, versionCheck, initialized
The first three were migrated to settings; although core no longer accesses them on $config,
we may need to migrate them, and it doesn't hurt to provide them for backward-compatibility.
Initialized was a just a bug.
Tim Otten [Wed, 16 Sep 2015 04:43:23 +0000 (21:43 -0700)]
CRM-14707 - CRM_Utils_Hook::runHooks - Cache function names
Tim Otten [Wed, 16 Sep 2015 04:41:23 +0000 (21:41 -0700)]
CRM-14707 - CRM_Core_BAO_Cache::setItem - Don't fire hooks
Tim Otten [Wed, 16 Sep 2015 03:53:53 +0000 (20:53 -0700)]
Memcache for extension, setting, and string caches
Tim Otten [Wed, 16 Sep 2015 02:55:04 +0000 (19:55 -0700)]
CRM_Core_Config - Simplify. Current cache commands are pointless.
Tim Otten [Wed, 16 Sep 2015 02:30:00 +0000 (19:30 -0700)]
MagicMerge - Changes to properties should not be persistent across requests
Tim Otten [Wed, 16 Sep 2015 02:01:03 +0000 (19:01 -0700)]
Remove CRM_Core_Config_Defaults
Tim Otten [Wed, 16 Sep 2015 01:55:26 +0000 (18:55 -0700)]
MagicMerge - Per-request cache of path/url properties
Tim Otten [Tue, 15 Sep 2015 22:58:17 +0000 (15:58 -0700)]
Civi::paths() - Decouple settings from paths. Allow path vars.
There has been a policy underwhich paths and URLs are assumed to be relative
to different points (urls => webroot; paths => sites/*/files/civicrm). For
some settings, this is fairly confusing. The policy had been encoded in
`SettingsBag::getPath` and `SettingsBag::getUrl`. It's particularly
confusing because (sometimes) the default value of a specific property isn't
really aligned with the policy.
This revision attempts to cleanup in two ways:
1. It removes policy from `SettingsBag` and puts it in `Civi\Core\Paths`.
2. It makes the policy less important by allowing variables in the paths.
* `[civicrm.files]/upload` might evaluate to `/var/www/sites/default/files/civicrm/upload`
* `[cms.root]/myuploads` might evaluate to `/var/www/myuploads`
The revision also updates MagicMerge to store various path and URL policies
in `getPropertyMap()` rather than adhoc callbacks.
Tim Otten [Tue, 15 Sep 2015 07:37:14 +0000 (00:37 -0700)]
CRM-16373 - rm CRM_Core_Config_Variables
Tim Otten [Tue, 15 Sep 2015 07:18:10 +0000 (00:18 -0700)]
civicrm_navigation.tpl - Move defaults into settings/*.php
For a large number of settings, defaults are declared twice -- once in
`xml/templates/civicrm_navigation.tpl` and once in `settings/*.php`. In
many cases, these are identical/redundant, but there are a couple where the
defaults diverged.
I believe the `civicrm_navigation.tpl` values have generally taken precedent
on new installations, so this commit revises `settings/*.php` to fix any
discrepancies.
Tim Otten [Tue, 15 Sep 2015 04:41:15 +0000 (21:41 -0700)]
SettingsBag::setDb() - Merge in CRM_Core_BAO_Setting::_setItem and ::dao()
Tim Otten [Tue, 15 Sep 2015 04:16:13 +0000 (21:16 -0700)]
CRM_Core_BAO_Setting - Remove redundant static cache
Before CRM-16373, the setting cache was stored in a static property of the
BAO. This data is now loaded into objects -- which are stored in the
container.
This is essentially the same for a typical request, and (for unit-testing)
it provides simpler cleanup between tests.
Tim Otten [Tue, 15 Sep 2015 00:58:45 +0000 (17:58 -0700)]
CRM-16373 - SettingsManager - useMandatory() to apply post-boot changes
Note: The global `$civicrm_setting` is meant to provide sysadmins with a way
to override settings in `civicrm.settings.php`, but it has traditionally
been possible for extensions to manipulate `$civicrm_setting` in a hook. If
you do this, please call `useMandatory()` to tell SettingsManager to re-scan
`$civicrm_setting`.
Tim Otten [Tue, 15 Sep 2015 00:56:13 +0000 (17:56 -0700)]
SettingsBag - Add getDefault(), getMandatory(). Cleanup comments.
Tim Otten [Tue, 15 Sep 2015 00:09:28 +0000 (17:09 -0700)]
settings/ - Add comment about critical/bootstrap settings.
Tim Otten [Sun, 13 Sep 2015 04:18:10 +0000 (21:18 -0700)]
CRM-16373 - Simplify UpdateConfigBackend and doSiteMove()
doSiteMove() has been performing a search-and-replace against data
structures which haven't exist since at least 4.0; it seems quite unlikely
that this works. Anecdotally, the workflow around this either incomplete or
buggy/broken. Simplifying this is simply a reflection of the reality that
it doesn't do what it was written to do.
Instead, doSiteMove() now resets to a standard baseline/default.
Tim Otten [Sun, 13 Sep 2015 00:57:17 +0000 (17:57 -0700)]
CRM_Utils_PDF_Utils::pdflib - Remove unused function with quaint data defaults
Tim Otten [Sat, 12 Sep 2015 22:13:55 +0000 (15:13 -0700)]
api_v3_SettingTest - Fix up
Tim Otten [Sat, 12 Sep 2015 23:23:58 +0000 (16:23 -0700)]
CRM_Core_Config - Bind to the settings of the active domain at the moment of setup.
I'm not sure this is actually a good behavior, but it's the old behavior,
and there's a unit-test which checks for it.
Tim Otten [Sat, 12 Sep 2015 21:47:04 +0000 (14:47 -0700)]
Core.settings.php - doNotAttachPDFReceipt - Match previous defaults
Tim Otten [Sat, 12 Sep 2015 20:58:37 +0000 (13:58 -0700)]
config->countryLimit - Don't directly modify array
When using magic method for countryLimit, it's difficult to directly modify
the array. It's easier to replace the array as a whole.
Tim Otten [Sat, 12 Sep 2015 07:15:21 +0000 (00:15 -0700)]
Settings - Remove special cases for `prefetch` and `config_only`
Tim Otten [Sat, 12 Sep 2015 07:00:03 +0000 (00:00 -0700)]
Remove invalid $config->defaultSymbol
Even in v4.5, this field appears to have been undefined, but it probably
behaved correctly anyway because the undefined value was passed into a
function which didn't need it.
Tim Otten [Sat, 12 Sep 2015 06:34:49 +0000 (23:34 -0700)]
Cleanup `config_only` settings (maxFileSize, doNotAttachPDFReceipt, resCacheCode)
Tim Otten [Sat, 12 Sep 2015 06:16:24 +0000 (23:16 -0700)]
Move BAO_Setting::getSettingSpecification => SettingsMetdata::getMetadata
When this function is in the BAO, it requires that the DAO exist. In a new
installation running GenCode, this can create dependency loop (where
generating code requires ts(), and using ts() requires settings, and using
settings requires that you already have the generated code).
Tim Otten [Sat, 12 Sep 2015 06:15:34 +0000 (23:15 -0700)]
CRM_Core_I18n - Use CRM_Core_Config less
Tim Otten [Sat, 12 Sep 2015 03:36:44 +0000 (20:36 -0700)]
CRM_Utils_Cache::create - Use factory function
Low-level tools like GenCode may run without access to a database. When we
try to use caching in central code, the cache-accesses are prone to
crashing. The problem -- in this environment, we shouldn't even try to use
databse for caching.
`CRM_Utils_Cache::create()` will attempt to create the best cache it can,
depending on what services are available.
Tim Otten [Sat, 12 Sep 2015 03:22:49 +0000 (20:22 -0700)]
CRM_Core_I18n::crm_translate_raw - Don't lookup $config->lcMessages for every string
Accessing `$config` is now be a little slower, and this function accounted
for about half of all calls.
Tim Otten [Sat, 12 Sep 2015 01:15:26 +0000 (18:15 -0700)]
GenCode - More complete env
Tim Otten [Fri, 11 Sep 2015 08:15:01 +0000 (01:15 -0700)]
CRM_Utils_System - Cleanup useFrameworkRelativeBase
Tim Otten [Fri, 11 Sep 2015 08:07:25 +0000 (01:07 -0700)]
CRM-16373 - CRM_Core_Config - Use `Runtime` and `MagicMerge`
Tim Otten [Fri, 11 Sep 2015 05:03:37 +0000 (22:03 -0700)]
Civi\Core\SettingsManager - Don't try to read settings if there's no DB
Tim Otten [Thu, 10 Sep 2015 23:36:28 +0000 (16:36 -0700)]
CRM-16373 - Civi\Core\SettingsManager - Load defaults *after* core bootstrap.
Tim Otten [Thu, 10 Sep 2015 23:34:05 +0000 (16:34 -0700)]
CRM_Extension_System - Make it a little easier to skim.
Tim Otten [Thu, 10 Sep 2015 21:38:55 +0000 (14:38 -0700)]
CRM-16373 - CRM_Core_Config_Variables should be strictly about data
The distribution of variables and functions between `CRM_Core_Config` and
`CRM_Core_Config_Variables` seems pretty random. In anticipation of
swapping out `CRM_Core_Config_Variables`, make a few changes:
* Move various functions from `CRM_Core_Config_Variables` to BAOs (`provinceLimit, `countryLimit`, `defaultContactCountry`, `defaultContactCountryName`, `defaultCurrencySymbol`)
* Put deprecated stubs in `CRM_Core_Config`
* Move most variables from `CRM_Core_Config` to `CRM_Core_Config_Variables`.
Tim Otten [Wed, 9 Sep 2015 20:50:11 +0000 (13:50 -0700)]
CRM_Core_Config - Fix bugs in path/dir settings
Tim Otten [Wed, 9 Sep 2015 06:18:34 +0000 (23:18 -0700)]
CRM-16373 - Search Settings - Fix dupes (eg contact_reference_options/autocompleteContactReference)
Note:
* The `autocompleteContactReference` and `autocompleteContactSearch` settings don't seem to be really stored as such.
* The form includes various hacks which effectively saves these fields in `contact_reference_options` and `contact_autocomplete_options`.
* At runtime, the application logic checks for `contact_reference_options` and `contact_autocomplete_options`.
* This situation predates the declarations of `autocompleteContactReference` and `autocompleteContactSearch` in `Search.setting.php`. It seems likely
that these settings have never been useful.
The fields still have some hacks, but they should be a bit easier to read/trace/grep.
Tim Otten [Tue, 8 Sep 2015 21:23:42 +0000 (14:23 -0700)]
CRM-16373 - Localization - Rearrange load/save logic
* Declare missing setting `languageLimit`
* Allow saving admin form -- even when using makeMultilingual, makeSinglelingual, addLanguage, and/or languageLimit
* Move onChange logic for `lcMessages` from `ConfigSetting::add()` to `onChangeLcMessages()`
* Move locale init from `ConfigSetting::retrieve()` to `applyLocale()`
Tim Otten [Tue, 8 Sep 2015 00:14:32 +0000 (17:14 -0700)]
CRM-16373 - CRM_Admin_Form_Setting - Generate error instead of saving config fields
Tim Otten [Tue, 8 Sep 2015 02:21:03 +0000 (19:21 -0700)]
CRM-16373 - CRM_Admin_Form_Setting_Search - Don't save through ConfigSetting::add()
Tim Otten [Tue, 8 Sep 2015 01:48:15 +0000 (18:48 -0700)]
CRM-16373 - CRM_Admin_Form_Setting_Date - Don't save through ConfigSetting::add()