Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vakeesan26/core
  • jensschuppe/core
  • artfulrobot/core
  • johnk/core
  • cmtool/core
  • naomi/core
  • onlyjob/core
  • justinfreeman/core
  • ufundo/core
  • HeneryH/core
  • wil_SRQ/core
  • jptillman/core
  • usha.makoa/core
  • shahrukh_compucorp/core
  • tapash/core
  • lunar/core
  • kunjkanani/core
  • dave/core
  • jtwyman/core
  • schoel-bis/core
20 results
Show changes
Commits on Source (67021)
66,921 additional commits have been omitted to prevent performance issues.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1095 additions and 1395 deletions
.editorconfig 0 → 100644
View file @ 1b6e2172
# CiviCRM editor configuration normalization
# @see http://editorconfig.org/
# This is the top-most .editorconfig file; do not search in parent directories.
root = true
# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
.gitattributes 0 → 100644
View file @ 1b6e2172
.gitattributes export-ignore
.gitignore export-ignore
**/tests/** export-ignore
**/tools/** export-ignore
.github/CONTRIBUTING.md 0 → 100644
View file @ 1b6e2172
CiviCRM is a community-driven open-source project. It has a small, full-time
[core team](https://civicrm.org/core-team)
which facilitates development and works on critical issues.
Additionally, a large community of active contributors and
[partner organizations](https://civicrm.org/partners-contributors)
drive much of the development work.
For developers, CiviCRM maintains a comprehensive
[Developer Guide](https://docs.civicrm.org/dev/en/latest).
Topics of particular importance while submitting pull requests include:
* [Contributing to CiviCRM core](https://docs.civicrm.org/dev/en/latest/core/contributing/)
* [Pull requests](https://docs.civicrm.org/dev/en/latest/tools/git/#pr)
* [Git workflow overview](https://docs.civicrm.org/dev/en/latest/tools/git/#contributing)
* [Writing automated tests](https://docs.civicrm.org/dev/en/latest/testing/setup/)
* [Jenkins continuous integration](https://docs.civicrm.org/dev/en/latest/tools/jenkins/)
* [Release Process](https://docs.civicrm.org/dev/en/latest/core/release-process/)
* [Developer Community](https://docs.civicrm.org/dev/en/latest/basics/community/)
CiviCRM thanks you for your contributions.
.github/FUNDING.yml 0 → 100644
View file @ 1b6e2172
custom: https://civicrm.org/civicrm/contribute/transact?reset=1&id=47
.github/PULL_REQUEST_TEMPLATE.md 0 → 100644
View file @ 1b6e2172
Overview
----------------------------------------
_A brief description of the pull request. Keep technical jargon to a minimum. Hyperlink relevant discussions._
Before
----------------------------------------
_What is the old user-interface or technical-contract (as appropriate)?_
_For optimal clarity, include a concrete example such as a screenshot, GIF ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)), or code-snippet._
After
----------------------------------------
_What changed? What is new old user-interface or technical-contract?_
_For optimal clarity, include a concrete example such as a screenshot, GIF ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)), or code-snippet._
Technical Details
----------------------------------------
_If the PR involves technical details/changes/considerations which would not be manifest to a casual developer skimming the above sections, please describe the details here._
Comments
----------------------------------------
_Anything else you would like the reviewer to note_
.github/workflows/regen.yml 0 → 100644
View file @ 1b6e2172
# Helper to run bin/regen.sh to regenerate civicrm_generated.mysql
# 1. In your civicrm-core fork on github.com, click on the Actions tab.
# * If you don't see an Actions tab, you may need to enable Github Actions in your fork, under Settings - Actions - General.
# 2. Click on Regen on the left.
# * If you don't see Regen on the left, the master branch of your fork may be outdated. In a recent git checkout of master run `git push my-fork master`, where "my-fork" is the remote alias of your fork (see output of `git remote -v`).
# 3. On the right you'll see a dropdown "Run workflow".
# 4. From the Branch field in the dropdown pick your branch.
# 5. Optionally choose to have it add a commit with the new file to your branch at the end, otherwise it will give you the file to download.
# Note it does not autosquash but typically this would be done at the end and is acceptable as its own commit.
# 6. Wait about 2-3 minutes until the spinning yellow turns green.
# 7. If you didn't choose to commit, then to get to the download click on the green.
# 7. Scroll down to Artifacts.
# 8. There's your file available for download.
name: Regen
on:
workflow_dispatch:
inputs:
civiver:
description: CiviCRM version
required: true
default: 'master'
autocommit:
description: Autocommit to branch (y or n)
required: false
default: 'n'
permissions:
contents: read
jobs:
runregen:
permissions:
contents: write # for Git to git push
runs-on: ubuntu-latest
name: Run Regen
services:
mysql:
image: mysql:8.0
env:
MYSQL_ALLOW_EMPTY_PASSWORD: no
MYSQL_DATABASE: db
MYSQL_ROOT_PASSWORD: passpasspw
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: shivammathur/setup-php@v2
with:
php-version: 8.1
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
coverage: none
tools: composer:v2
- name: Sanity check
run: |
if [ "$GITHUB_REPOSITORY" = "civicrm/civicrm-core" ]; then
echo "You need to run this in your own fork."
exit -1
fi
- name: Sendmail is now needed or else drupal install gets marked as fail
run: |
sudo apt-get update
sudo apt-get install sendmail
- name: Download cv
run: |
cd $GITHUB_WORKSPACE
git clone https://github.com/civicrm/cv.git civicrm-cv
cd civicrm-cv
# downloads-plugin is locked at 2.1 but that doesn't work with composer v2
rm composer.lock
COMPOSER_MEMORY_LIMIT=-1 composer install
- name: Download and install stuff
run: |
cd $GITHUB_WORKSPACE
export DRUPVER=`php -r '$xml = simplexml_load_file("https://updates.drupal.org/release-history/drupal/7.x"); echo $xml->releases[0]->release->version;'`
curl -L -o drupal.tgz https://ftp.drupal.org/files/projects/drupal-$DRUPVER.tar.gz
tar xzf drupal.tgz
mv drupal-$DRUPVER drupal
cd drupal
composer require drush/drush:'^8'
./vendor/drush/drush/drush -y -l http://civi.localhost site-install standard --db-url='mysql://root:passpasspw@127.0.0.1:${{ job.services.mysql.ports[3306] }}/db' --site-name=TestCivi --account-pass=admin
chmod +w sites/default
cd sites/all/modules
# check out my fork's branch as selected from the dropdown
BRANCHNAME=${GITHUB_REF##*/}
echo "Cloning branch $BRANCHNAME from $GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
git clone -b $BRANCHNAME --depth 1 $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git civicrm
cd civicrm
git clone -b 7.x-${{ github.event.inputs.civiver }} --depth 1 https://github.com/civicrm/civicrm-drupal.git drupal
git clone -b ${{ github.event.inputs.civiver }} --depth 1 https://github.com/civicrm/civicrm-packages.git packages
COMPOSER_MEMORY_LIMIT=-1 composer install
npm install
cd xml
php GenCode.php
cd ..
$GITHUB_WORKSPACE/civicrm-cv/bin/cv core:install --cms-base-url=http://civi.localhost
# In this environment in this particular repo, we are under a workspace folder that contains the literal "civicrm-core" in the path, which makes civicrm.config.php think we are a composer install, so it gets the paths wrong.
echo '<?php define("CIVICRM_CONFDIR", "/home/runner/work/civicrm-core/civicrm-core/drupal/sites/default");' > settings_location.php
- name: regen
run: |
cd $GITHUB_WORKSPACE/drupal/sites/all/modules/civicrm/bin
export PATH=$PATH:$GITHUB_WORKSPACE/drupal/vendor/drush/drush
cp setup.conf.txt setup.conf
sed -i -e "s#CIVISOURCEDIR=#CIVISOURCEDIR=$GITHUB_WORKSPACE/drupal/sites/all/modules/civicrm#" setup.conf
sed -i -e 's/DBUSER=/DBUSER=root/' setup.conf
sed -i -e 's/DBPASS=/DBPASS=passpasspw/' setup.conf
sed -i -e 's/DBNAME=/DBNAME=db/' setup.conf
sed -i -e 's/DBHOST=/DBHOST=127.0.0.1/' setup.conf
sed -i -e 's/DBPORT=/DBPORT=${{ job.services.mysql.ports[3306] }}/' setup.conf
sed -i -e 's/GENCODE_CMS=""/GENCODE_CMS=Drupal/' setup.conf
# next two lines just make it easier to see what's going on if it fails
cat setup.conf
sed -i -e 's/set -e/set -e\nset -x/' setup.sh
cd ..
bin/regen.sh
- name: maybe commit
if: ${{ success() && github.event.inputs.autocommit == 'y' }}
run: |
cd $GITHUB_WORKSPACE/drupal/sites/all/modules/civicrm
git config --global user.name "$GITHUB_ACTOR"
git config --global user.email "regen@civicrm.org"
# We don't use `-a` because often there's other files that get spurious updates like composer.lock
git commit -m "regenerate civicrm_generated" sql/civicrm_generated.mysql
git remote add mine https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY.git
git push mine
- uses: actions/upload-artifact@v4
if: ${{ success() }}
with:
name: the_file_you_requested
path: '/home/runner/work/civicrm-core/civicrm-core/drupal/sites/all/modules/civicrm/sql/civicrm_generated.mysql'
.gitignore
View file @ 1b6e2172
*~ *~
*.bak *.bak
CRM/ACL/DAO .use-civicrm-setup
CRM/Activity/DAO .composer-downloads
CRM/Auction/DAO /ext/*
CRM/Campaign/DAO !/ext/afform
CRM/Case/DAO !/ext/standaloneusers
!/ext/authx
!/ext/civigrant
!/ext/civicrm_admin_ui
!/ext/civicrm_search_ui
!/ext/chart_kit
/ext/chart_kit/packages
!/ext/sequentialcreditnotes
!/ext/flexmailer
!/ext/eventcart
!/ext/ewaysingle
!/ext/greenwich
!/ext/elavon
/ext/greenwich/dist
/ext/greenwich/extern
!/ext/message_admin
!/ext/oauth-client
!/ext/search_kit
!/ext/search_kit_reports
!/ext/financialacls
!/ext/contributioncancelactions
!/ext/recaptcha
!/ext/iframe
!/ext/oembed
!/ext/payflowpro
!/ext/ckeditor4
!/ext/legacycustomsearches
!/ext/legacydedupefinder
!/ext/civiimport
!/ext/civi_campaign
!/ext/civi_case
!/ext/civi_contribute
!/ext/civi_event
!/ext/civi_mail
!/ext/civi_member
!/ext/civi_pledge
!/ext/civi_report
!/ext/scheduled_communications
!/ext/user_dashboard
!/ext/tellafriend
!/ext/riverlea
backdrop/
bower_components
CRM/Case/xml/configuration CRM/Case/xml/configuration
CRM/Contact/DAO/ACLContactCache.php
CRM/Contact/DAO/Contact.php
CRM/Contact/DAO/ContactType.php
CRM/Contact/DAO/DashboardContact.php
CRM/Contact/DAO/Group.php
CRM/Contact/DAO/GroupContact.php
CRM/Contact/DAO/GroupContactCache.php
CRM/Contact/DAO/GroupNesting.php
CRM/Contact/DAO/GroupOrganization.php
CRM/Contact/DAO/Relationship.php
CRM/Contact/DAO/RelationshipType.php
CRM/Contact/DAO/SavedSearch.php
CRM/Contact/DAO/SubscriptionHistory.php
CRM/Contribute/DAO
CRM/Core/DAO/.listAll.php CRM/Core/DAO/.listAll.php
CRM/Core/DAO/listAll.php CRM/Core/DAO/listAll.php
CRM/Core/DAO/ActionLog.php
CRM/Core/DAO/ActionMapping.php
CRM/Core/DAO/ActionSchedule.php
CRM/Core/DAO/Address.php
CRM/Core/DAO/AddressFormat.php
CRM/Core/DAO/Batch.php
CRM/Core/DAO/Cache.php
CRM/Core/DAO/Component.php
CRM/Core/DAO/Country.php
CRM/Core/DAO/County.php
CRM/Core/DAO/Currency.php
CRM/Core/DAO/CustomField.php
CRM/Core/DAO/CustomGroup.php
CRM/Core/DAO/Dashboard.php
CRM/Core/DAO/Discount.php
CRM/Core/DAO/Domain.php
CRM/Core/DAO/Email.php
CRM/Core/DAO/EntityBatch.php
CRM/Core/DAO/EntityFile.php
CRM/Core/DAO/EntityFinancialTrxn.php
CRM/Core/DAO/EntityTag.php
CRM/Core/DAO/Extension.php
CRM/Core/DAO/File.php
CRM/Core/DAO/FinancialAccount.php
CRM/Core/DAO/FinancialTrxn.php
CRM/Core/DAO/IM.php
CRM/Core/DAO/Job.php
CRM/Core/DAO/JobLog.php
CRM/Core/DAO/LineItem.php
CRM/Core/DAO/LocBlock.php
CRM/Core/DAO/LocationType.php
CRM/Core/DAO/Log.php
CRM/Core/DAO/MailSettings.php
CRM/Core/DAO/Managed.php
CRM/Core/DAO/Mapping.php
CRM/Core/DAO/MappingField.php
CRM/Core/DAO/Menu.php
CRM/Core/DAO/MessageTemplates.php
CRM/Core/DAO/Navigation.php
CRM/Core/DAO/Note.php
CRM/Core/DAO/OpenID.php
CRM/Core/DAO/OptionGroup.php
CRM/Core/DAO/OptionValue.php
CRM/Core/DAO/PaymentProcessor.php
CRM/Core/DAO/PaymentProcessorType.php
CRM/Core/DAO/Persistent.php
CRM/Core/DAO/Phone.php
CRM/Core/DAO/Preferences.php
CRM/Core/DAO/PreferencesDate.php
CRM/Core/DAO/PrevNextCache.php
CRM/Core/DAO/PriceField.php
CRM/Core/DAO/PriceSet.php
CRM/Core/DAO/PriceSetEntity.php
CRM/Core/DAO/Setting.php
CRM/Core/DAO/StateProvince.php
CRM/Core/DAO/Tag.php
CRM/Core/DAO/Timezone.php
CRM/Core/DAO/UFField.php
CRM/Core/DAO/UFGroup.php
CRM/Core/DAO/UFJoin.php
CRM/Core/DAO/UFMatch.php
CRM/Core/DAO/Website.php
CRM/Core/DAO/Worldregion.php
CRM/Core/I18n/SchemaStructure.php
CRM/Dedupe/DAO
CRM/Event/Cart/DAO
CRM/Event/DAO
CRM/Friend/DAO
CRM/Grant/DAO
CRM/Mailing/DAO
CRM/Mailing/Event/DAO
CRM/Member/DAO
CRM/PCP/DAO
CRM/Pledge/DAO
CRM/Price/DAO
CRM/Project/DAO
CRM/Queue/DAO
CRM/Report/DAO
CRM/SMS/DAO
CRM/Standalone/OpenID/DAO
bin/setup.conf bin/setup.conf
civicrm-version.php
civicrm-version.txt civicrm-version.txt
civicrm.config.php civicrm.config.php
install/langs.php node_modules
packages/.channels
packages/.depdb
packages/.depdblock
packages/.filemap
packages/.lock
packages/.registry
packages/cache
packages/doc
packages/temp
packages/test
settings_location.php settings_location.php
sql/case_sample.mysql
sql/civicrm.mysql sql/civicrm.mysql
sql/civicrm_acl.??_??.mysql sql/civicrm_acl.??_??.mysql
sql/civicrm_acl.mysql sql/civicrm_acl.mysql
...@@ -126,24 +64,30 @@ sql/civicrm_data.mysql ...@@ -126,24 +64,30 @@ sql/civicrm_data.mysql
sql/civicrm_drop.mysql sql/civicrm_drop.mysql
sql/civicrm_navigation.mysql sql/civicrm_navigation.mysql
sql/civicrm_sample.mysql sql/civicrm_sample.mysql
templates/CRM/common/version.tpl
tests/phpunit/CiviTest/CiviSeleniumSettings.php tests/phpunit/CiviTest/CiviSeleniumSettings.php
tests/phpunit/CiviTest/civicrm.settings.php tests/phpunit/CiviTest/civicrm.settings.php
tools/stats/config.php tools/stats/config.php
authors.txt authors.txt
CRM/Batch/DAO/ /drupal/
CRM/Financial/DAO/ /drupal-8/
drupal/
WordPress WordPress
joomla joomla
packages/ packages/
tests/output
tests/phpunit/CiviTest/civicrm.settings.local.php tests/phpunit/CiviTest/civicrm.settings.local.php
tests/phpunit/CiviTest/truncate.xml
tests/**/*.rtf.php
tools/scripts/releaser/releaser.conf tools/scripts/releaser/releaser.conf
tools/tests/reports/logfile.tap tools/tests/reports/logfile.tap
tools/tests/reports/testdox.html tools/tests/reports/testdox.html
tools/tests/reports/testdox.txt tools/tests/reports/testdox.txt
tools/extensions/org.civicrm.contactlayout
tools/extensions/phpstorm/.phpstorm.meta.php
l10n l10n
vendor vendor
civicrm.settings.php civicrm.settings.php
sql/dummy_processor.mysql sql/dummy_processor.mysql
distmaker/distmaker.conf distmaker/distmaker.conf
distmaker/out
/srv
/tmp
.gitlab/issue_templates/improvement.md 0 → 100644
View file @ 1b6e2172
Overview
----------------------------------------
_Please describe your improvement in detail._
Example use-case
----------------------------------------
1. Click on **Contacts -> New Individual**.
1. Enter **First Name** and **Last Name** and click **Save**.
Current behaviour
----------------------------------------
_What is currently possible? What limit ?_
Proposed behaviour
----------------------------------------
_What should happen? How is this better? If appropriate/available, include any wireframes or mockups._
Comments
----------------------------------------
_Anything else you would like the reviewer to note._
.gitlab/issue_templates/problem.md 0 → 100644
View file @ 1b6e2172
Overview
----------------------------------------
_Please describe your problem or bug in detail._
_If you have already posted on https://civicrm.stackexchange.com or https://chat.civicrm.org, please include the link to that conversation._
Reproduction steps
----------------------------------------
1. Click on **Contacts -> New Individual**.
1. Entered **First Name** and **Last Name** and clicked **Save**.
1. Got an error "**Fatal error: DB error**".
Current behaviour
----------------------------------------
_What happens currently. Please provide error messages, screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
```
TIP: The best way to convey an error message is to copy it in here and use
three backtick ` symbols. You may edit the message to remove private
information (like passwords). The backticks will help to preserve any
special characters or spaces.
```
Expected behaviour
----------------------------------------
_What should happen._
Environment information
----------------------------------------
<!-- Some of the items below may not be relevant for every bug - if in doubt please include more information than you think is neccessary. -->
* __Browser:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
* __CiviCRM:__ _Master/5.20.0/5.19.1/5.18.2/..._ <!-- If this problem relates to an upgrade, then specify both old and new versions -->
* __PHP:__ _7.0/7.1/7.2/7.3/...__
* __CMS:__ _Backdrop 1.5/Drupal 7.30/Joomla 3.3/WordPress 4.5/..._
* __Database:__ _MySQL 5.7.7/MariaDB 10.4/..._
* __Web Server:__ _Apache 2.4/Nginx 1.16/..._
Comments
----------------------------------------
_Anything else you would like the reviewer to note._
.jshintrc 0 → 100644
View file @ 1b6e2172
{
"indent": 2,
"jasmine": true,
"esversion": 6,
"predef": [
"angular",
"inject",
"module",
"CRM"
],
"-W097": true
}
CONTRIBUTORS.txt deleted 100644 → 0
View file @ 2055b6f4
The following people and organizations sponsored and/or contributed new and improved features to the project.
************************************************
Key Contributors and Sponsors for 4.3
************************************************
CiviCRM Team - Coleman Watts, David Greenberg, Deepak Srivastava, Donald Lobo,
Kurund Jalmi, Michael McAndrew, Pratik Joshi, Ravish Nair,
Tim Otten, Yashodha Chaku, Eileen McNaughton
AGH Strategies - Andrew Hunt
Backoffice Thinking
Chris Burgess
Circle Interactive - Andrew Walker, Dave Moreton
CiviDesk - Nicolas Ganivet
CiviHosting - Hershel Robinson
Community Builders
Compucorp
Confluence - Frank Gomez
Dave D
EE-atWork - Erik Hommel
Electronic Frontier Foundation - Micah Lee, Kellie Brownell
Emphanos - Allen Shaw
Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson
Jim Meehan
JMA Consulting - Joe Murray, Pradeep Nayak
Keith Morgan
Ken West
Korlon - Stuart Gaston
Koumbit - Samuel Vanhove
Lighthouse Consulting and Design - Brian Shaughnessy
Mathieu Lutfy
New York State Senate - Ken Zalewski
NfP Services (MTL Software Group) - Jag Kandasamy, Rajesh Sundararajan
Niro Solutions
Noah Miller
Palente Technology Cooperative - Jon Goldberg
Progressive Tech Project - Alice Aguilar, Jamie McClelland
Paul Delbar
Registered Nurses Association of Ontario
San Francisco Baykeeper - Eliet Henderson
Tech to the People - Xavier Dutoit
Third Sector Design
Veda Consulting - Parvez Saleh
Web Access
Zing - Simon West, Andrew Tombs
************************************************
Sponsors and key contributors for 4.2
************************************************
The following people and organizations sponsored and/or contributed new and improved features for the 4.2 release.
Abril Rocabert
Adam Wight
Alice Aguilar
Allen Shaw
Andres Spagarino
Andrew Hunt
Anthony Camilleri
Ariel Gold
Brian Shaughnessy
Chris Ward
Dave Moreton
Eileen McNaughton
Eliet Henderson
Erik Hommel
Frank Gomez
Graylin Kim
Jamie McClelland
Jane Hanley
Jason Bertolacci
Joe Murray
John Derry
Jon Goldberg
Kasia Wakarecy
Katie Horn
Katy Jockelson
Ken Zalewski
Lisa Jervis
Mathieu Lutfy
Matt Neimayer
Micah Lee
Michael Daryabeygi
Michael McAndrew
Nicolas Ganivet
Noah Miller
Parvez Saleh
Peter Gehres
Peter McAndrew
Robyn Perry
Samuel Vanhove
Simon West
Stéphane Lussier
Stuart Gaston
Xavier Dutoit
Art of Living
Backoffice Thinking
Community Builders
DC Road Runners
EE atWork
Electronic Frontier Foundation
Freeform Solutions
Free Software Foundation
Fuzion NZ
Gingko Street Consulting
JMA Consulting
Korlon
Koumbit
Lighthouse Consulting
National Democratic Institute
New York State Senate
NS Web Solutions
Progressive Technology Project
San Francisco Baykeeper
Tech to the People
The Monthly.com
Veda Consulting
Xstreme Media
Zing
************************************************
Sponsors and key contributors for 4.1
************************************************
The following people and organizations sponsored and/or contributed new and improved features for the 4.1 release.
Adam Wight
Andrew Harris
Alice Aguilar
Andre Gurgel
Brian Shaugnessy
Coleman Watts
Dave D
Dave Moreton
Eileen McNaughton
Erik Brower
Erik Hommel
Henry Bennett
Jamie McClelland
Jim Taylor
Jonathan Mark
Joe Murray
Marianela Zucotti Bozzano
Michael McAndrew
Steve Colson
Stuart Gaston
Tim Otten
Tom Kirkpatrick
Xavier Dutoit
AGH Strategies
Amigos Library Services
Association for Learning Technology
Attendee Management
Benton Consulting
Circle Interactive
CivicActions
Community Builders
EE-atWork
Fuzion (NZ)
Giant Rabbit
Kindling Trust
Korlon
International Mountain Biking Association
International Society for Bayesian Analysis
Josiesque Designs
Michigan Parents for Schools
New York State Senate
Nonprofit Association of Oregon
Nonprofit Solutions
Powered by Action
Progressive Technology Project
Resolutions Northwest
River Pool at Beacon
Rooty Hollow
San Francisco Baykeeper
Scotland's Colleges
Switchback
System Seed
Tech to the People
The San Francisco Orff-Schulwerk
Third Sector Design
Voluntary Action Westminster
Vpod Schweiz
Woven
************************************************
Sponsors for 3.4 / 4.0 Make-it-Happen Projects
************************************************
The following people and organizations sponsored new and improved features for the 3.4 / 4.0 release.
ACORN Canada http://acorncanada.org
Allora Consulting http://alloraconsulting.com
American Friends Service Committee http://afsc.org/
Australian Greens http://greens.org.au
BREAZE http://breaze.org.au
Canadian Paramedics http://www.peelparamedics.com
Community Builders Australia Pty Ltd
Corvair Society of America (CORSA) http://www.corvair.org/
Donor Depot http://donordepot.com
Energetica http://energetica.com.au
Fuzion http://fuzion.co.nz
Gold Strategy Group http://www.goldstrategygroup.com
JMA Consulting http://jmaconsulting.biz
Joomkit Ltd http://joomkit.com
Kabissa - Space for Change in Africa http://kabissa.org
NS Web Solutions http://nswebsolutions.com
NAMI Louisville http://namilouisville.org
Progressive Technology Project http://www.progressivetech.org
RVTC http://rvtc.us
Volunteer Honduras http://www.volunteerhonduras.org
Briney, Matthew
Brownsberger, Will
Burden, Monica
Calleeuw, Bart
Cimpian, Casti
Clarke, Jill
Davis, Peter
Day, Janette
Gold, Ariel
Hadar, Kehilat
Malkoun, Anthony
Matsushita, Jun
McNaughton, Eileen
Murray, Joe
Shaughnessy, Brian
Spagarino, Andres
Speleo
Stuart, josh
Tabletguy
Watts, Danny
Wistreich, Nic
****************************************
Sponsors for 3.3 Make-it-Happen Projects
****************************************
The following people and organizations sponsored new and improved features for the 3.3 release.
JMA Consulting: http://jmaconsulting.biz/
Emergency Picnic: http://emergencypicnic.net/
Thomas Carlson
Micheas Herman
T.J. Hellman
Gold Strategy Group: http://www.goldstrategygroup.com
Laura Velkei
John Barclay
Matthew Briney: http://emotivellc.com
2020Media: http://www.2020media.com/
Social Contxt: http://socialcontxt.com/
Impari Systems Inc: http://www.imparisystems.com/
Alpha: http://uk.alpha.org
Cambridge Union: http://www.cus.org
St Ethelburga's: http://stethelburgas.org
Joomkit: http://www.joomkit.com
International Mountain Biking Assocation: http://www.imba.com/
Niro Solutions: http://www.nirosolutions.com/
Fuzion: http://fuzion.co.nz
ArtD Webdesign
CivicActions: http://civicactions.com/
NES Alumni and Friends Nonprofit Partnership: https://www.nesalumni.org/en
Gold Strategy Group: http://www.goldstrategygroup.com
Creative Commons: http://creativecommons.org/
Community Builders Australia Pty Ltd: http://www.communitybuilders.com.au/
Australian Greens: http://greens.org.au/
NES Alumni and Friends Nonprofit Partnership: https://www.nesalumni.org/en
Data-Scribe: http://www.datascribe.biz/
Rayogram: http://www.rayogram.com/
GingerFeet LLC: http://www.gingerfeet.com/
Kabissa: http://kabissa.org
Beth Hynes-Ciernia
CRM/ACL/API.php
View file @ 1b6e2172
<?php <?php
// $Id$
/* /*
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
| CiviCRM version 4.3 | | Copyright CiviCRM LLC. All rights reserved. |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| | | |
| You should have received a copy of the GNU Affero General Public | | This work is published under the GNU AGPLv3 license with some |
| License and the CiviCRM Licensing Exception along | | permitted exceptions and without any warranty. For full license |
| with this program; if not, contact CiviCRM LLC | | and copyright information, see https://civicrm.org/licensing |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
*/ */
/** /**
* *
* @package CRM * @package CRM
* @copyright CiviCRM LLC (c) 2004-2013 * @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/ */
class CRM_ACL_API { class CRM_ACL_API {
/** /**
* The various type of permissions * The various type of permissions.
* *
* @var int * @var int
*/ */
CONST EDIT = 1; const EDIT = 1;
CONST VIEW = 2; const VIEW = 2;
CONST DELETE = 3; const DELETE = 3;
CONST CREATE = 4; const CREATE = 4;
CONST SEARCH = 5; const SEARCH = 5;
CONST ALL = 6; const ALL = 6;
/** /**
* given a permission string, check for access requirements * Given a permission string, check for access requirements
* *
* @param string $str the permission to check * @param string $str
* @param int $contactID the contactID for whom the check is made * The permission to check.
* @param int|null $contactID
* The contactID for whom the check is made.
* *
* @return boolean true if yes, else false * @return bool
* @static * true if yes, else false
* @access public *
* @deprecated
*/ */
static function check($str, $contactID = NULL) { public static function check($str, $contactID = NULL) {
\CRM_Core_Error::deprecatedWarning(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated.');
if ($contactID == NULL) { if ($contactID == NULL) {
$session = CRM_Core_Session::singleton(); $contactID = CRM_Core_Session::getLoggedInContactID();
$contactID = $session->get('userID');
} }
if (!$contactID) { if (!$contactID) {
...@@ -73,135 +56,150 @@ class CRM_ACL_API { ...@@ -73,135 +56,150 @@ class CRM_ACL_API {
} }
/** /**
* Get the permissioned where clause for the user * Get the permissioned where clause for the user.
* *
* @param int $type the type of permission needed * @param int $type
* @param array $tables (reference ) add the tables that are needed for the select clause * The type of permission needed.
* @param array $whereTables (reference ) add the tables that are needed for the where clause * @param array $tables
* @param int $contactID the contactID for whom the check is made * (reference ) add the tables that are needed for the select clause.
* @param bool $onlyDeleted whether to include only deleted contacts * @param array $whereTables
* @param bool $skipDeleteClause don't add delete clause if this is true, * (reference ) add the tables that are needed for the where clause.
* this means it is handled by generating query * @param int|null $contactID
* The contactID for whom the check is made.
* @param bool $onlyDeleted
* Whether to include only deleted contacts.
* @param bool $skipDeleteClause
* Don't add delete clause if this is true,.
* this means it is handled by generating query
* @param bool $skipOwnContactClause
* Do not add 'OR contact_id = $userID' to the where clause.
* This is a hideously inefficient query and should be avoided
* wherever possible.
* *
* @return string the group where clause for this user * @return string
* @access public * the group where clause for this user
*/ */
public static function whereClause($type, public static function whereClause(
$type,
&$tables, &$tables,
&$whereTables, &$whereTables,
$contactID = NULL, $contactID = NULL,
$onlyDeleted = FALSE, $onlyDeleted = FALSE,
$skipDeleteClause = FALSE $skipDeleteClause = FALSE,
$skipOwnContactClause = FALSE
) { ) {
// the default value which is valid for rhe final AND // the default value which is valid for the final AND
$deleteClause = ' ( 1 ) '; $deleteClause = ' ( 1 ) ';
if (!$skipDeleteClause) { if (!$skipDeleteClause) {
if (CRM_Core_Permission::check('access deleted contacts') and $onlyDeleted) { if (CRM_Core_Permission::check('access deleted contacts')) {
$deleteClause = '(contact_a.is_deleted)'; if ($onlyDeleted) {
$deleteClause = '(contact_a.is_deleted)';
}
} }
else { else {
// CRM-6181 // Exclude deleted contacts due to permissions
$deleteClause = '(contact_a.is_deleted = 0)'; $deleteClause = '(contact_a.is_deleted = 0)';
} }
} }
// first see if the contact has edit / view all contacts if (!$contactID) {
if (CRM_Core_Permission::check('edit all contacts') || $contactID = CRM_Core_Session::getLoggedInContactID();
($type == self::VIEW &&
CRM_Core_Permission::check('view all contacts')
)
) {
return $skipDeleteClause ? ' ( 1 ) ' : $deleteClause;
}
if ($contactID == NULL) {
$session = CRM_Core_Session::singleton();
$contactID = $session->get('userID');
} }
$contactID = (int) $contactID;
if (!$contactID) { // first see if the contact has edit / view all permission
// anonymous user if (CRM_Core_Permission::check('edit all contacts', $contactID) ||
$contactID = 0; ($type == self::VIEW && CRM_Core_Permission::check('view all contacts', $contactID))
) {
return $deleteClause;
} }
return implode(' AND ', $whereClause = CRM_ACL_BAO_ACL::whereClause($type,
array( $tables,
CRM_ACL_BAO_ACL::whereClause($type, $whereTables,
$tables, $contactID
$whereTables,
$contactID
),
$deleteClause,
)
); );
$where = implode(' AND ', [$whereClause, $deleteClause]);
// Add permission on self if we really hate our server or have hardly any contacts.
if (!$skipOwnContactClause && $contactID && (CRM_Core_Permission::check('edit my contact') ||
$type == self::VIEW && CRM_Core_Permission::check('view my contact'))
) {
$where = "(contact_a.id = $contactID OR ($where))";
}
return $where;
} }
/** /**
* get all the groups the user has access to for the given operation * Get all the groups the user has access to for the given operation.
* *
* @param int $type the type of permission needed * @param int $type
* @param int $contactID the contactID for whom the check is made * The type of permission needed.
* @param int|null $contactID
* The contactID for whom the check is made.
* *
* @return array the ids of the groups for which the user has permissions * @param string $tableName
* @access public * @param array|null $allGroups
* @param array $includedGroups
*
* @return array
* the ids of the groups for which the user has permissions
*/ */
public static function group( public static function group(
$type, $type,
$contactID = NULL, $contactID = NULL,
$tableName = 'civicrm_saved_search', $tableName = 'civicrm_group',
$allGroups = NULL, $allGroups = NULL,
$includedGroups = NULL $includedGroups = []
) { ) {
if ($contactID == NULL) { if (!is_array($includedGroups)) {
$session = CRM_Core_Session::singleton(); CRM_Core_Error::deprecatedWarning('pass an array for included groups');
$contactID = $session->get('userID'); $includedGroups = (array) $includedGroups;
} }
if ($contactID == NULL) {
if (!$contactID) { $contactID = CRM_Core_Session::getLoggedInContactID();
// anonymous user
$contactID = 0;
} }
return CRM_ACL_BAO_ACL::group($type, $contactID, $tableName, $allGroups, $includedGroups); return CRM_ACL_BAO_ACL::group($type, (int) $contactID, $tableName, $allGroups, $includedGroups);
} }
/** /**
* check if the user has access to this group for operation $type * Check if the user has access to this group for operation $type
* *
* @param int $type the type of permission needed * @param int $type
* @param int $contactID the contactID for whom the check is made * The type of permission needed.
* @param int $groupID
* @param int|null $contactID
* The contactID for whom the check is made.
* @param string $tableName
* @param array|null $allGroups
* @param array|null $includedGroups
* *
* @return array the ids of the groups for which the user has permissions * @return bool
* @access public
*/ */
public static function groupPermission( public static function groupPermission(
$type, $type,
$groupID, $groupID,
$contactID = NULL, $contactID = NULL,
$tableName = 'civicrm_saved_search', $tableName = 'civicrm_group',
$allGroups = NULL, $allGroups = NULL,
$includedGroups = NULL $includedGroups = NULL
) { ) {
static $cache = array();
if (!isset(Civi::$statics[__CLASS__]) || !isset(Civi::$statics[__CLASS__]['group_permission'])) {
Civi::$statics[__CLASS__]['group_permission'] = [];
}
if (!$contactID) { if (!$contactID) {
$session = CRM_Core_Session::singleton(); $contactID = CRM_Core_Session::getLoggedInContactID();
$contactID = NULL;
if ($session->get('userID')) {
$contactID = $session->get('userID');
}
} }
$key = "{$tableName}_{$type}_{$contactID}"; $key = "{$tableName}_{$type}_{$contactID}";
if (array_key_exists($key, $cache)) { if (!array_key_exists($key, Civi::$statics[__CLASS__]['group_permission'])) {
$groups = &$cache[$key]; Civi::$statics[__CLASS__]['group_permission'][$key] = self::group($type, $contactID, $tableName, $allGroups, $includedGroups ?? []);
}
else {
$groups = self::group($type, $contactID, $tableName, $allGroups, $includedGroups);
$cache[$key] = $groups;
} }
return in_array($groupID, $groups) ? TRUE : FALSE; return in_array($groupID, Civi::$statics[__CLASS__]['group_permission'][$key]);
} }
}
}
CRM/ACL/BAO/ACL.php
View file @ 1b6e2172
This diff is collapsed.
CRM/ACL/BAO/ACLEntityRole.php 0 → 100644
View file @ 1b6e2172
<?php
/*
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
/**
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
/**
* Access Control AclRole.
*/
class CRM_ACL_BAO_ACLEntityRole extends CRM_ACL_DAO_ACLEntityRole {
/**
* Whitelist of possible values for the entity_table field
*
* @return array
*/
public static function entityTables(): array {
return [
'civicrm_contact' => ts('Contact'),
'civicrm_group' => ts('Group'),
];
}
/**
* @param array $params
*
* @deprecated
* @return CRM_ACL_BAO_ACLEntityRole
*/
public static function create(&$params) {
CRM_Core_Error::deprecatedFunctionWarning('writeRecord');
return self::writeRecord($params);
}
/**
* @deprecated
* @param array $params
* @param array $defaults
* @return self|null
*/
public static function retrieve($params, &$defaults) {
CRM_Core_Error::deprecatedFunctionWarning('API');
return self::commonRetrieve(self::class, $params, $defaults);
}
/**
* @deprecated - this bypasses hooks.
* @param int $id
* @param bool $is_active
* @return bool
*/
public static function setIsActive($id, $is_active) {
CRM_Core_Error::deprecatedFunctionWarning('writeRecord');
return CRM_Core_DAO::setFieldValue(__CLASS__, $id, 'is_active', $is_active);
}
/**
* Delete Dedupe Entity Role records.
*
* @param int $entityRoleId
* ID of the EntityRole record to be deleted.
* @deprecated
*/
public static function del($entityRoleId) {
CRM_Core_Error::deprecatedFunctionWarning('deleteRecord');
return self::deleteRecord(['id' => $entityRoleId]);
}
}
CRM/ACL/BAO/Cache.php
View file @ 1b6e2172
<?php <?php
// $Id$
/* /*
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
| CiviCRM version 4.3 | | Copyright CiviCRM LLC. All rights reserved. |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| | | |
| CiviCRM is free software; you can copy, modify, and distribute it | | This work is published under the GNU AGPLv3 license with some |
| under the terms of the GNU Affero General Public License | | permitted exceptions and without any warranty. For full license |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | | and copyright information, see https://civicrm.org/licensing |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
*/ */
/** /**
* *
* @package CRM * @package CRM
* @copyright CiviCRM LLC (c) 2004-2013 * @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/ */
/** /**
* Access Control Cache * Access Control Cache.
*/ */
class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_Cache { class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_ACLCache {
static $_cache = NULL; public static $_cache = NULL;
static function &build($id) { /**
* Build an array of ACLs for a specific ACLed user
*
* @param int $id - contact_id of the ACLed user
*
* @return mixed
* @throws \CRM_Core_Exception
*/
public static function &build($id) {
if (!self::$_cache) { if (!self::$_cache) {
self::$_cache = array(); self::$_cache = [];
} }
if (array_key_exists($id, self::$_cache)) { if (array_key_exists($id, self::$_cache)) {
...@@ -58,18 +46,23 @@ class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_Cache { ...@@ -58,18 +46,23 @@ class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_Cache {
return self::$_cache[$id]; return self::$_cache[$id];
} }
self::$_cache[$id] = CRM_ACL_BAO_ACL::getAllByContact($id); self::$_cache[$id] = CRM_ACL_BAO_ACL::getAllByContact((int) $id);
self::store($id, self::$_cache[$id]); self::store($id, self::$_cache[$id]);
return self::$_cache[$id]; return self::$_cache[$id];
} }
static function retrieve($id) { /**
* @param int $id
*
* @return array
*/
protected static function retrieve($id) {
$query = " $query = "
SELECT acl_id SELECT acl_id
FROM civicrm_acl_cache FROM civicrm_acl_cache
WHERE contact_id = %1 WHERE contact_id = %1
"; ";
$params = array(1 => array($id, 'Integer')); $params = [1 => [$id, 'Integer']];
if ($id == 0) { if ($id == 0) {
$query .= " OR contact_id IS NULL"; $query .= " OR contact_id IS NULL";
...@@ -77,16 +70,22 @@ SELECT acl_id ...@@ -77,16 +70,22 @@ SELECT acl_id
$dao = CRM_Core_DAO::executeQuery($query, $params); $dao = CRM_Core_DAO::executeQuery($query, $params);
$cache = array(); $cache = [];
while ($dao->fetch()) { while ($dao->fetch()) {
$cache[$dao->acl_id] = 1; $cache[$dao->acl_id] = 1;
} }
return $cache; return $cache;
} }
static function store($id, &$cache) { /**
* Store ACLs for a specific user in the `civicrm_acl_cache` table
* @param int $id - contact_id of the ACLed user
* @param array $cache - key civicrm_acl.id - values is the details of the ACL.
*
*/
protected static function store($id, &$cache) {
foreach ($cache as $aclID => $data) { foreach ($cache as $aclID => $data) {
$dao = new CRM_ACL_DAO_Cache(); $dao = new CRM_ACL_BAO_Cache();
if ($id) { if ($id) {
$dao->contact_id = $id; $dao->contact_id = $id;
} }
...@@ -98,7 +97,12 @@ SELECT acl_id ...@@ -98,7 +97,12 @@ SELECT acl_id
} }
} }
static function deleteEntry($id) { /**
* Remove entries from civicrm_acl_cache for a specified ACLed user
* @param int $id - contact_id of the ACLed user
*
*/
public static function deleteEntry($id) {
if (self::$_cache && if (self::$_cache &&
array_key_exists($id, self::$_cache) array_key_exists($id, self::$_cache)
) { ) {
...@@ -109,40 +113,73 @@ SELECT acl_id ...@@ -109,40 +113,73 @@ SELECT acl_id
DELETE FROM civicrm_acl_cache DELETE FROM civicrm_acl_cache
WHERE contact_id = %1 WHERE contact_id = %1
"; ";
$params = array(1 => array($id, 'Integer')); $params = [1 => [$id, 'Integer']];
$dao = CRM_Core_DAO::executeQuery($query, $params); CRM_Core_DAO::executeQuery($query, $params);
} }
static function updateEntry($id) { /**
// rebuilds civicrm_acl_cache * Do an opportunistic cache refresh if the site is configured for these.
self::deleteEntry($id); *
self::build($id); * Sites that use acls and do not run the acl cache clearing cron job should
* refresh the caches on demand. The user session will be forced to wait
// rebuilds civicrm_acl_contact_cache * and this is a common source of deadlocks, so it is less ideal.
CRM_Contact_BAO_Contact_Permission::cache($id, CRM_Core_Permission::VIEW, TRUE); */
public static function opportunisticCacheFlush(): void {
if (Civi::settings()->get('acl_cache_refresh_mode') === 'opportunistic') {
self::resetCache();
}
} }
// deletes all the cache entries /**
static function resetCache() { * Deletes all the cache entries.
*/
public static function resetCache(): void {
if (!CRM_Core_Config::isPermitCacheFlushMode()) {
return;
}
// reset any static caching // reset any static caching
self::$_cache = NULL; self::$_cache = NULL;
// reset any db caching
$config = CRM_Core_Config::singleton();
$smartGroupCacheTimeout = CRM_Contact_BAO_GroupContactCache::smartGroupCacheTimeout();
//make sure to give original timezone settings again.
$now = CRM_Utils_Date::getUTCTime();
$query = " $query = "
DELETE DELETE
FROM civicrm_acl_cache FROM civicrm_acl_cache
WHERE modified_date IS NULL WHERE modified_date IS NULL
OR (TIMESTAMPDIFF(MINUTE, modified_date, $now) >= $smartGroupCacheTimeout) OR (modified_date <= %1)
"; ";
CRM_Core_DAO::singleValueQuery($query); $params = [
1 => [
CRM_Contact_BAO_GroupContactCache::getCacheInvalidDateTime(),
'String',
],
];
CRM_Core_DAO::singleValueQuery($query, $params);
self::flushACLContactCache();
}
CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE civicrm_acl_contact_cache"); /**
* Remove Entries from `civicrm_acl_contact_cache` for a specific ACLed user
* @param int $userID - contact_id of the ACLed user
*
*/
public static function deleteContactCacheEntry($userID) {
CRM_Core_DAO::executeQuery("DELETE FROM civicrm_acl_contact_cache WHERE user_id = %1", [1 => [$userID, 'Positive']]);
} }
}
/**
* Flush the contents of the acl contact cache.
*/
protected static function flushACLContactCache(): void {
unset(Civi::$statics['CRM_ACL_API']);
// CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE civicrm_acl_contact_cache"); // No, force-commits transaction
// CRM_Core_DAO::singleValueQuery("DELETE FROM civicrm_acl_contact_cache"); // Transaction-safe
if (CRM_Core_Transaction::isActive()) {
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, function () {
CRM_Core_DAO::singleValueQuery('TRUNCATE TABLE civicrm_acl_contact_cache');
});
}
else {
CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE civicrm_acl_contact_cache");
}
}
}
CRM/ACL/BAO/EntityRole.php
View file @ 1b6e2172
<?php <?php
// $Id$
/* /*
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
| CiviCRM version 4.3 | | Copyright CiviCRM LLC. All rights reserved. |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| | | |
| CiviCRM is distributed in the hope that it will be useful, but | | This work is published under the GNU AGPLv3 license with some |
| WITHOUT ANY WARRANTY; without even the implied warranty of | | permitted exceptions and without any warranty. For full license |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | | and copyright information, see https://civicrm.org/licensing |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+ +--------------------------------------------------------------------+
*/ */
/** /**
* *
* @package CRM * @package CRM
* @copyright CiviCRM LLC (c) 2004-2013 * @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/ */
/** /**
* Access Control EntityRole * @deprecated
*/ */
class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole { class CRM_ACL_BAO_EntityRole extends CRM_ACL_BAO_ACLEntityRole {}
static $_entityTable = NULL;
static function entityTable() {
if (!self::$_entityTable) {
self::$_entityTable = array(
'civicrm_contact' => ts('Contact'),
'civicrm_group' => ts('Group'),
);
}
return self::$_entityTable;
}
static function create(&$params) {
$dao = new CRM_ACL_DAO_EntityRole();
$dao->copyValues($params);
$dao->save();
}
static function retrieve(&$params, &$defaults) {
CRM_Core_DAO::commonRetrieve('CRM_ACL_DAO_EntityRole', $params, $defaults);
}
/**
* update the is_active flag in the db
*
* @param int $id id of the database record
* @param boolean $is_active value we want to set the is_active field
*
* @return Object DAO object on sucess, null otherwise
* @static
*/
static function setIsActive($id, $is_active) {
return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_EntityRole', $id, 'is_active', $is_active);
}
/**
* Function to delete Entity Role records
*
* @param int $entityRoleId ID of the EntityRole record to be deleted.
*
* @access public
* @static
*/
static function del($entityRoleId) {
$entityDAO = new CRM_ACL_DAO_EntityRole();
$entityDAO->id = $entityRoleId;
$entityDAO->find(TRUE);
$entityDAO->delete();
}
}
CRM/ACL/DAO/ACL.php 0 → 100644
View file @ 1b6e2172
<?php
/**
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
/**
* Placeholder class retained for legacy compatibility.
*
* @property int|string|null $id
* @property string|null $name
* @property bool|string $deny
* @property string $entity_table
* @property int|string|null $entity_id
* @property string $operation
* @property string|null $object_table
* @property int|string|null $object_id
* @property string|null $acl_table
* @property int|string|null $acl_id
* @property bool|string $is_active
* @property int|string $priority
*/
class CRM_ACL_DAO_ACL extends CRM_Core_DAO_Base {
}
CRM/ACL/DAO/ACLCache.php 0 → 100644
View file @ 1b6e2172
<?php
/**
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
/**
* Placeholder class retained for legacy compatibility.
*
* @property int|string|null $id
* @property int|string|null $contact_id
* @property int|string $acl_id
* @property string $modified_date
*/
class CRM_ACL_DAO_ACLCache extends CRM_Core_DAO_Base {
}
CRM/ACL/DAO/ACLEntityRole.php 0 → 100644
View file @ 1b6e2172
<?php
/**
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*/
/**
* Placeholder class retained for legacy compatibility.
*
* @property int|string|null $id
* @property int|string $acl_role_id
* @property string $entity_table
* @property int|string $entity_id
* @property bool|string $is_active
*/
class CRM_ACL_DAO_ACLEntityRole extends CRM_Core_DAO_Base {
}
CRM/ACL/DAO/EntityRole.php 0 → 100644
View file @ 1b6e2172
<?php
/**
* DAO class was renamed in 5.39
*/
class_alias('CRM_ACL_DAO_ACLEntityRole', 'CRM_ACL_DAO_EntityRole');