Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from openemr:master #354

Open
wants to merge 1,730 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1730 commits
Select commit Hold shift + click to select a range
7d30933
fix: missing attr _insurance_edit_screen_edit.html.twig (#7298)
stephenwaite Mar 27, 2024
ed58faf
Resolve #7301: Add title to appointment (#7303)
AngelsDustz Mar 29, 2024
328c156
Resolve #7300: Resolve bug accidentally introduced in API (#7302)
AngelsDustz Mar 29, 2024
0054dda
Change search behaviour of select codes (#7309)
sjpadgett Apr 2, 2024
24905d5
fix: reduce 'maxlength' of 'per_refill' to '9' since it stored as 'IN…
tackyunicorn Apr 3, 2024
51b92a5
feat: support for loading 2024 reporting cqm valueset (#7318)
stephenwaite Apr 6, 2024
0b1be28
Fixes #7319 ccda extra drug_unit list options (#7321)
adunsulag Apr 7, 2024
ed9ffcc
Fixes #7323 Billing Code Widget,deprecate isOption (#7324)
adunsulag Apr 10, 2024
10bcaed
fix: allow for saving insurance when country is empty (#7332)
stephenwaite Apr 11, 2024
b681b42
fix: speed up slow flow board using static methods (#7330)
stephenwaite Apr 11, 2024
b034a6a
fix: inadequate date time format in log viewer (#7336)
manoj-ayyappan Apr 16, 2024
9be12b8
Fix: OpenEMR logs sensitive information such as payment details (#7341)
jubittajohn Apr 16, 2024
5c5001f
Some finishing touches (#7306)
sjpadgett Apr 16, 2024
d9b6b62
feat: minor CryptoGen class updates (#7365)
bradymiller Apr 18, 2024
632d2f7
Fixes #7368 local provider's form list type (#7369)
adunsulag Apr 18, 2024
7f38fd0
Fixes #7370 support select-fields alias (#7371)
adunsulag Apr 18, 2024
d277140
Store documents in remote cloud bucket (#7233)
juggernautsei Apr 18, 2024
4a991ed
Adding Password Strength Meter Fixes #7366 (#7367)
Kashika08 Apr 19, 2024
e752bb2
fixes: CDR engine fixes for duplicate use of actions across rules in …
bradymiller Mar 10, 2024
236693a
fix: CDR fix filter to only calculate with the targetdate
Mar 24, 2024
8ee2683
minor changes to prior commit
bradymiller Mar 24, 2024
8085a15
fixes: addresses a number of logic issues in CDR engine
Apr 3, 2024
5be871e
fix: clarify use of percentage in CDR engine
bradymiller Apr 3, 2024
e122860
Merge pull request #7268 from bradymiller/fixes-cdr-10
bradymiller Apr 21, 2024
2500b2c
add print button and put patient's details at top of visit history p…
ruthkonyn Apr 22, 2024
f633bd3
fix: check for empty postParseEvent ccda import (#7348)
stephenwaite Apr 22, 2024
da84ee5
feat: Enhanced and modular report generation in Patient List Creation…
jack5github Apr 22, 2024
74f2d7c
weno changes (#7384)
sjpadgett Apr 22, 2024
33ce7a5
fix: use empty array if no cpts when posting era (#7388)
stephenwaite Apr 22, 2024
0b24255
fix SMS Zone patient search dropdown (#7307)
surfacehazard Apr 23, 2024
0ed60e5
Fix: Input sanitation on google signin email (#7356)
mabeshark Apr 23, 2024
899ffee
feat: Group attendance display encounter (#7128)
juggernautsei Apr 23, 2024
a7a58d3
fix: check for empty array before looking for offsite document (#7391)
stephenwaite Apr 24, 2024
548db01
Weno better error handling from fetches (#7408)
sjpadgett Apr 25, 2024
1d0e579
Fix: Revert "Fix: OpenEMR logs sensitive information such as payment …
bradymiller Apr 26, 2024
0cbafca
feat: support loop 2420E (#7405)
stephenwaite Apr 30, 2024
14e7854
Refactor UB04 837i X12 feature to make work again. (#7412)
sjpadgett Apr 30, 2024
a379476
Fee sheet and Codes revenue code (#7415)
sjpadgett May 1, 2024
842ffbe
fix: ccda zip import and php warnings and deprecations (#7416)
stephenwaite May 2, 2024
6e94bfb
Hide dashboard card 2 (#7423)
juggernautsei May 6, 2024
6cef758
Various changes and fixes (#7424)
sjpadgett May 7, 2024
6d8bddc
fix: add missing use statement in facility admin script (#7428)
stephenwaite May 13, 2024
e153ce2
Previous names in New/Search doesn't save. (#7438)
sjpadgett May 18, 2024
b9e7550
Module uninstall
juggernautsei May 20, 2024
d67e6fc
Module uninstall PSR
juggernautsei May 20, 2024
4cafd7d
Module fixes and updates (#7429)
sjpadgett May 20, 2024
31fdc36
fix: batch payments distinct tab (#7398)
stephenwaite May 21, 2024
fbfa180
fix: bug (#7435)
stephenwaite May 21, 2024
b11a0b6
fix: bug (#7434)
stephenwaite May 21, 2024
1daecba
fix: billing manager To Encounter button to load proper person (#7420)
stephenwaite May 21, 2024
add592e
Not working to install
juggernautsei May 21, 2024
1dc24a6
PSR
juggernautsei May 21, 2024
22c5ff3
It is working now.
juggernautsei May 21, 2024
c49a6ac
Some change to prior PR#7429 (#7447)
sjpadgett May 21, 2024
eb74f87
reset_module is not being called
juggernautsei May 22, 2024
3654cce
reset_module removed and moved into
juggernautsei May 22, 2024
338ac46
forgot/missed one line
juggernautsei May 22, 2024
7d4ed14
understanding is hard to come by sometimes
juggernautsei May 22, 2024
224fd36
total front receipts by payment method (#7449)
stephenwaite May 22, 2024
8d71c34
as requested
juggernautsei May 23, 2024
4e8432a
Merge pull request #7442 from juggernautsei/claimrev-module-manager
sjpadgett May 23, 2024
610b811
feat: show collection balance in billing widget (#7454)
stephenwaite May 24, 2024
57973a2
Phantom date showing at the top of all reports. (#7433)
juggernautsei May 26, 2024
d019f25
Added fix for zip bomb (#7407)
tanmaypardeshi May 26, 2024
7febeb9
escape strings - brady's comment on pr #7359 (#7400)
ruthkonyn May 26, 2024
c06a6ae
Fix: to not allow user to pick future date for DOB (#7379)
riyagori1203 May 26, 2024
5c52818
Weno changes from documentation critique (#7453)
sjpadgett May 26, 2024
885ee27
Visit history - correct count for displaying ALL results on a page (#…
ruthkonyn May 26, 2024
707f69a
Fix: delete entry in immunization (#7346)
sathiya06 May 26, 2024
9a95f5d
fix: use getTimeFormat for encounter date of service datetime picker …
stephenwaite May 27, 2024
f476202
Commit generated changelog for 7.0.2.1 (#7458)
adunsulag May 28, 2024
1e5f32c
bug: fix variable typo in messages.php (#7466)
stephenwaite Jun 10, 2024
8c996e2
bug: fix typo in 837I script (#7469)
stephenwaite Jun 10, 2024
c4dc688
add insert value to google_signin_email column in users table (#7472)
AlceaDev Jun 12, 2024
c6ae41a
fix: webroot typo documents-go portal home (#7474)
stephenwaite Jun 15, 2024
60dc0ee
fix: use temp files dir for htmlpurify serializer path (#7476)
stephenwaite Jun 15, 2024
e873bb6
Add new modules loaded event (#7463)
sjpadgett Jun 16, 2024
4feb4c9
Search Tuning
sjpadgett Jun 18, 2024
6c63f59
add default to Name search for initial entry to edit.
sjpadgett Jun 19, 2024
7fe3fc2
remove debug logging
sjpadgett Jun 19, 2024
6e38162
Fixes #7497 datetimepicker invalid date format (#7499)
adunsulag Jun 19, 2024
5231631
address Brady comments for mysql connection and sql table structure fix
sjpadgett Jun 20, 2024
455443f
fix wayward timer
sjpadgett Jun 20, 2024
fc285b4
change weno_pharmacy structure
sjpadgett Jun 20, 2024
d1a903c
fix warnings and sql
sjpadgett Jun 20, 2024
0faa5aa
fix: add date_end to query for getEffectiveInsurances (#7490)
stephenwaite Jun 20, 2024
dbc0663
fix: set default x12 partner for item in billing manager (#7502)
stephenwaite Jun 20, 2024
90c325c
php warnings
sjpadgett Jun 20, 2024
f99cf61
add debug dump button
sjpadgett Jun 21, 2024
674f8ea
Merge pull request #7492 from sjpadgett/weno_updates
sjpadgett Jun 21, 2024
0cfa65e
Mangled path fax send (#7515)
sjpadgett Jun 22, 2024
16229d2
fix: set default x12 partner for item in billing manager (#7513)
stephenwaite Jun 24, 2024
7b18e17
fix: webroot attr editing insurance company from practice settings 40…
stephenwaite Jun 25, 2024
89f9085
Fixes #7511 documents stray html tags (#7512)
adunsulag Jun 25, 2024
9a57c29
Fixes #7509 twigify dicom viewer (#7510)
adunsulag Jun 25, 2024
1e0ea74
feat: add mysql 8.4 to ci and insane dev environment (#7519)
bradymiller Jun 25, 2024
abb910c
chore: add support for alpine 3.20 to insane dev environment (#7522)
bradymiller Jun 26, 2024
afe9224
chore: small doc change for alpine 3.20 in insane dev env (#7523)
bradymiller Jun 26, 2024
2f4858f
Adding module manager (#7500)
juggernautsei Jun 26, 2024
1a20710
fix: create custom temp directory for html purify serializer (#7521)
stephenwaite Jun 26, 2024
0bf576a
Fixes #7503 user admin create empty google sign in (#7504)
adunsulag Jun 26, 2024
9f085f2
CCDA Service fixes
sjpadgett Jun 28, 2024
92ad753
Merge pull request #7532 from sjpadgett/ccda
sjpadgett Jun 28, 2024
7f1166c
fix: bug
stephenwaite Jun 28, 2024
ba6df03
Fixes #7526 labcore fix date collected issues (#7527)
adunsulag Jun 28, 2024
fdadc05
ins subscriber name validation fixes see #7477 (#7478)
adunsulag Jun 28, 2024
f9b56e6
Merge pull request #7535 from stephenwaite/bug_fix_w1
stephenwaite Jun 28, 2024
1a7f915
chore: add mariadb 11.4 to ci (#7537)
bradymiller Jun 30, 2024
9c85a68
chore: complete integration of flex-3.20 (alpine 3.20) into ci (#7538)
bradymiller Jun 30, 2024
7ef0e36
chore: update ci and dev environments to use mariadb 11.4 (#7545)
bradymiller Jul 2, 2024
eadee2c
fix: set default if only 1 effective insurance (#7546)
stephenwaite Jul 2, 2024
e54aaed
fix: set default x12 partner if only 1 effective insurance
stephenwaite Jul 2, 2024
f854649
Merge pull request #7548 from stephenwaite/iss7501-take-4
stephenwaite Jul 2, 2024
fd4bc8a
Feat openemr fix 7480 7494 email prescription (#7495)
adunsulag Jul 3, 2024
08b5625
Annoying CKEditor4 security warning (#7543)
sjpadgett Jul 8, 2024
ee2bef8
fix: bug (#7551)
stephenwaite Jul 10, 2024
f50ca8b
fix: bug (#7552)
stephenwaite Jul 10, 2024
1bdd2d5
Add back RingCentral to our FaxSMS Module (#7542)
sjpadgett Jul 15, 2024
34993e7
fix: migrate table engine array binds (#7566)
stephenwaite Jul 17, 2024
4c48728
Fix encounter save bug on therapy_group_id (#7573)
adunsulag Jul 18, 2024
77cd668
Fixes #7570 list service search by codes (#7572)
adunsulag Jul 18, 2024
ed40ac9
Refactor previous name into dedicated service (#7571)
adunsulag Jul 18, 2024
9806920
Change support desk contact information (#7561)
juggernautsei Jul 22, 2024
bc9b4e5
feat: throttle down mechanism (#7587)
bradymiller Jul 24, 2024
0853649
increment database counter in version for last commit
bradymiller Jul 24, 2024
3c40f4b
fix: quick fix upgrade for throttle down feature (#7589)
bradymiller Jul 24, 2024
6a796e1
Portal Updates for Usability study, UI/UX and bug fixes. (#7556)
sjpadgett Jul 25, 2024
a894707
hide 'search by any demographics ' field if config for this set to 'n…
ruthkonyn Jul 26, 2024
2fe4015
Portal more styling (#7593)
sjpadgett Jul 26, 2024
6f89f4b
Portal Secure Messages ckeditor replacement. (#7595)
sjpadgett Jul 28, 2024
2f3e626
show issue type in 'add issue' form from encounter form (#7564)
ruthkonyn Jul 28, 2024
9407d01
bug fix (#7559)
juggernautsei Jul 29, 2024
b3dd874
Portal bug fixes and features update (#7600)
sjpadgett Aug 1, 2024
7635e37
fix: fix ci (#7614)
bradymiller Aug 4, 2024
4403fb9
fix: use escape identifier instead of binds for sql upgrade migrate t…
stephenwaite Aug 6, 2024
c5e4fae
remove testing
stephenwaite Aug 6, 2024
afa9e32
Merge pull request #7625 from stephenwaite/iss7565-1
stephenwaite Aug 6, 2024
93af85d
Feat openemr fix #7609 dashboard cards size consistency (#7610)
adunsulag Aug 7, 2024
cd42546
Fixes #7620 disable payment scripts (#7623)
adunsulag Aug 7, 2024
817448c
Fixes #7633 appointment error for first appt (#7634)
adunsulag Aug 7, 2024
d526c0a
bit of future proofing to ci (#7636)
bradymiller Aug 7, 2024
be599d6
solved issue #7304 (#7628)
Dhruv110904 Aug 7, 2024
4d74dbf
Fixes #7621 validation save errors w/ translations (#7622)
adunsulag Aug 8, 2024
8c2124a
Fixes #7640 patient port no show appt (#7641)
adunsulag Aug 8, 2024
5ff2ef5
Fix to 7631 - Update API_README (#7639)
lomaxanthony Aug 8, 2024
1615f2d
fixes #7612 (#7642)
Dhruv110904 Aug 8, 2024
dccbecc
Fixes #7608 appointment localized dates (#7611)
adunsulag Aug 8, 2024
8c43554
Questionnaire - configure where LOINC notice should go (#7554)
ruthkonyn Aug 8, 2024
4715e45
'fixed' uses finder if search on demographics box is empty (#7597)
ruthkonyn Aug 8, 2024
9392a1a
fix: Upgrade to v702 fails for really old version (#7629)
stephenwaite Aug 9, 2024
9afd738
Bug fix for LBF new.php (#7580)
MARSMemory Aug 9, 2024
dd4e862
Fixes Get Patient Documents #70, #71, #72 (#7661)
adunsulag Aug 9, 2024
53c9fad
Fixes #57, #58 submit changes button (#7657)
adunsulag Aug 9, 2024
76c1e84
Fixes #64 see appointments availability (#7655)
adunsulag Aug 9, 2024
888d442
Fixes #7648 secure messaging (#7649)
adunsulag Aug 9, 2024
30e418f
Fixes #7646 portal update page title tag (#7647)
adunsulag Aug 9, 2024
95cd967
Fixes #7644 message casing (#7645)
adunsulag Aug 9, 2024
3550bc1
columns need to align left easier to read (#7605)
juggernautsei Aug 9, 2024
a71f92f
columns need to align left easier to read (#7602)
juggernautsei Aug 9, 2024
89ee659
fix: Custom Reports-Superbill not showing Billing Information (#7582)
stephenwaite Aug 9, 2024
60a3195
Fixes #7590 wrongful use of break tag (#7624)
miltonhuynh Aug 10, 2024
aea767b
Questionnaires and LForms (#7668)
sjpadgett Aug 19, 2024
aa8f92c
display correct name when 'choices' group name is changed (#7671)
ruthkonyn Aug 24, 2024
63c42bd
update couple packages in ci
bradymiller Aug 25, 2024
10c4674
fix: skip the e2e Check Add User test for now
bradymiller Aug 26, 2024
b73441d
Merge pull request #7679 from bradymiller/fix-ci_10
bradymiller Aug 26, 2024
24fd248
Fixes #7662 #7663 secure messaging bugs (#7664)
adunsulag Aug 30, 2024
7dccf9d
Fixes #64 portal no appointments font update (#7653)
adunsulag Aug 30, 2024
26ef93c
Auto-create encounter reason flag and some forgotten fixes. (#7681)
sjpadgett Sep 2, 2024
d39a09c
fix: save encounter, hidden visit category (#7687)
stephenwaite Sep 7, 2024
06fddd2
fix: remove 2015 from certification usage (#7691)
stephenwaite Sep 7, 2024
b74de2b
Add payor information for FHIR Coverage Endpoint (#7685)
bgandy94 Sep 7, 2024
4e28e69
Update API_README.md (#7697)
adunsulag Sep 9, 2024
14a7e70
Feat Fixes #7650 portal credential settings update (#7651)
adunsulag Sep 9, 2024
bc37b3a
update review page (#7703)
juggernautsei Sep 10, 2024
5d5c84d
Feat openemr fix #7699 #7698 setup header (#7700)
adunsulag Sep 10, 2024
047b3e6
refactor menu navigation (#7678)
juggernautsei Sep 10, 2024
210527d
add ability to configure two logos on portal login page (#7711)
ruthkonyn Sep 12, 2024
0390adb
Feat fixes #7658 signature page twigify (#7659)
adunsulag Sep 12, 2024
0c9c4e2
fix: remove 2015 reference from ehi export (#7718)
stephenwaite Sep 13, 2024
bb010c3
fix: remove cpl 2015 references (#7720)
stephenwaite Sep 13, 2024
e038caf
Fixes #7701 register app error (#7702)
adunsulag Sep 13, 2024
263378a
fix: minor translation constant fix (#7722)
bradymiller Sep 14, 2024
85e6cdd
feat: upgrade icd10 2025 (#7713)
stephenwaite Sep 16, 2024
ea176a5
feat: allow 1 char first names for insurance subscriber (#7715)
stephenwaite Sep 18, 2024
c30b62f
Modules Updates (#7724)
sjpadgett Sep 18, 2024
55c96e7
Update PR template for AI documentation (#7706)
adunsulag Sep 21, 2024
4d8d535
Fixes #7707, #7708 health snapshot, custom report (#7709)
adunsulag Sep 22, 2024
f9e3158
Fixes #7635 appointment comments double escaped (#7638)
adunsulag Sep 22, 2024
786fe8b
Some Module Updates (#7732)
sjpadgett Sep 26, 2024
69d188e
Update API.php (#7723)
ophthal Sep 27, 2024
1c4622d
Add title to all appointment sql queries (#7311)
BerwoutK Sep 28, 2024
7f0bc6c
chore: remove mariadb 11.1 from ci testing (#7738)
bradymiller Sep 29, 2024
6fbf9e1
fix: support ccda in nginx ci dockers (#7744)
bradymiller Oct 1, 2024
62452e5
fix: couple insane dev environment fixes (#7745)
bradymiller Oct 1, 2024
df05199
fix: support nginx based testing ci dockers for testing nodejs stuff …
bradymiller Oct 2, 2024
b884ee1
fix: more fixes for nginx based testing ci dockers (#7749)
bradymiller Oct 2, 2024
5a5952b
fix: hopefully last fix for nginx containers (#7750)
bradymiller Oct 2, 2024
eca4520
fix: one more fix for nginx ci (#7751)
bradymiller Oct 2, 2024
d4ee0e8
fix: another nginx ci fix (#7753)
bradymiller Oct 2, 2024
74c9a1c
Billing Manager and Some Module fixes (#7747)
sjpadgett Oct 2, 2024
30a9ace
feat: add e2e testing for both menu links. Also fixed some e2e stuff.…
bradymiller Oct 4, 2024
968ba9c
fix: for e2e testing ensure login working prior to doing subsequent t…
bradymiller Oct 5, 2024
402c607
feat: incorporate traits into e2e ci testing (#7757)
bradymiller Oct 6, 2024
557ec66
More Changes and Fixes Modules (#7755)
sjpadgett Oct 9, 2024
4852747
Bug openemr fix 7746 export since delta fix (#7754)
adunsulag Oct 10, 2024
8493cde
fix: x12837 billing 5 or 9 digit zip check (#7760)
stephenwaite Oct 10, 2024
2a8405b
Feat: upgrade e2e testing (#7766)
bradymiller Oct 14, 2024
d1f41a5
Feat openemr fix 7764 last updated (#7767)
adunsulag Oct 15, 2024
7183768
fix: send each checked encounter to collections in form export (#7769)
stephenwaite Oct 16, 2024
4135a14
New Fixes (#7770)
sjpadgett Oct 19, 2024
7af700a
fix: couple e2e ci fixes (#7777)
bradymiller Oct 22, 2024
929c0a0
feat: composer.json packages update (#7693)
bradymiller Oct 23, 2024
13d1752
Eligibility Fixes (#7774)
sjpadgett Oct 24, 2024
66875f3
fix: e2e fix user add and patient add (#7779)
bradymiller Oct 25, 2024
9733cdd
feat: update CHANGELOG for 7.0.2.2 (#7783)
stephenwaite Oct 26, 2024
cd290ff
Feat openemr b11 7742 decision support interventions (#7743)
adunsulag Oct 27, 2024
5859254
fix: e2e ci misc fixes (#7785)
bradymiller Oct 27, 2024
35d736f
fix: firefox close dialog from cdr edit source (#7788)
stephenwaite Oct 29, 2024
87d19fa
fix: firefox close dialog from smart dsi edit source (#7789)
stephenwaite Oct 31, 2024
a0cd2bd
fix: faxsms psr7 vendor fix (#7794)
stephenwaite Oct 31, 2024
e049bf2
Dialog styles (#7797)
sjpadgett Nov 12, 2024
94a5988
fix: correct link to patient report in prior auth module (#7804)
stephenwaite Nov 15, 2024
e8354b3
fix: allow delete from addr book when username is null (#7806)
stephenwaite Nov 15, 2024
d92b33d
fix: allow viewing of fee sheet items if billing.billed is null (#7808)
stephenwaite Nov 15, 2024
bbaa55f
Add new actions delete and edit to Office Notes (#7813)
sjpadgett Nov 19, 2024
e948aaa
New Documents Update and fix (#7819)
sjpadgett Nov 19, 2024
1bee323
Fixes #7814 empty procedures error. (#7816)
adunsulag Nov 19, 2024
c7c1c72
Include DOB in referral template. (#7825)
ChrisOstler Nov 20, 2024
929a158
feat: openemr #6141 implement changelog (#7033)
adunsulag Nov 20, 2024
ccaa709
Fix invalid CSRF exception class. (#7833)
adunsulag Nov 20, 2024
96230d2
New Document Template radio group plug ins (#7837)
sjpadgett Nov 21, 2024
0eeae03
faxsms fixes (#7818)
sjpadgett Nov 21, 2024
79586c7
Fix Portal Default Signer (#7839)
sjpadgett Nov 22, 2024
92341b9
change log (#7841)
sjpadgett Nov 24, 2024
3298e34
fix: broken patient menu dashboard links prior auth module (#7849)
stephenwaite Nov 30, 2024
e3e75b0
fix: update couple of composer packages (#7852)
stephenwaite Dec 2, 2024
9601f9b
fix: calendar event edit provider out of office php math error (#7850)
stephenwaite Dec 2, 2024
eb4b033
Show an email tab for viewing past notifications. (#7846)
ChrisOstler Dec 3, 2024
aa75e0e
Add Clickatell integration to FaxSMS module. (#7838)
ChrisOstler Dec 3, 2024
9ea20c6
updated US CDC website link to current immunization VIS page (#7855)
JulieThurmes Dec 4, 2024
c35f11f
Fix type error in add_edit_lot file (#7669)
lamn5 Dec 13, 2024
7b77397
Some module fixes (#7872)
sjpadgett Dec 15, 2024
2c8f0ff
faxsms module cleanup and implement send email client (#7866)
sjpadgett Dec 15, 2024
fc24e07
Quick escape issues fix (#7873)
sjpadgett Dec 17, 2024
abbc3ce
ci updates (#7882)
bradymiller Dec 21, 2024
e673c11
ci updates (#7884)
bradymiller Dec 23, 2024
672b2da
minor ci update fix (#7885)
bradymiller Dec 23, 2024
df34b9b
ci minor fix to avoid conflicts with automated docker builds (#7886)
bradymiller Dec 23, 2024
da451d3
chore: composer packages update (#7890)
bradymiller Dec 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes openemr#7635 appointment comments double escaped (openemr#7638)
* Fixes openemr#7635 appointment comments double escaped

The day, month, and week appointments are showing html entities for
things like apostrophes, quotes, ampersands, etc because the data is
being double escaped.  We need to make sure we only do a single version
escape on the calendar.

The calendar uses the pcVarPrepHTMLDisplay function to escape this and
other fields which then get double escaped when passed through OpenEMR's
attr function.  We fix this issue by the removing the attr and relying
on the pcVarPrepHTMLDisplay.  This makes it so if anyone is using the
PostCalendar/pnuserapi.php to grab events it will still work properly.

Fixes openemr#7635

* Fix escaping on patient showImage

day/month/week escaping issue fix.
adunsulag authored Sep 22, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f9e3158455f3f755b4bfabd724a67380d53e3d16
Original file line number Diff line number Diff line change
@@ -729,7 +729,10 @@
if ($event['recurrtype'] > 0) {
$content .= "<img class='border-0' src='{$this->_tpl_vars['TPL_IMAGE_PATH']}/repeating8.png' style='margin: 0 2px 0 2px;' title='" . xla("Repeating event") . "' alt='" . xla("Repeating event") . "' />";
}
if ($comment) $content .= " " . text($comment);
if ($comment) {

$content .= " " . text($comment);
}
}
else {
// some sort of patient appointment
@@ -742,19 +745,24 @@
if ($event['recurrtype'] > 0) $content .= "<img src='{$this->_tpl_vars['TPL_IMAGE_PATH']}/repeating8.png' border='0' style='margin:0px 2px 0px 2px;' title='" . xla("Repeating event") . "' alt='" . xla("Repeating event") . "'>";
$content .= '&nbsp;' . text($event['apptstatus']);
if ($patientid) {
$link_title = $fname . " " . $lname . " \n";
$link_title .= xl('Age') . ": " . $patient_age . "\n" . xl('DOB') . ": " . $patient_dob . " $comment" . "\n";
$link_title .= "(" . xl('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . attr($link_title) . "'>";
$content .= "<i class='fas fa-user text-success' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".attr($patientid)."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" title='" . attr($link_title) . "'></i>";
// include patient name and link to their details
$link_title = attr($fname) . " " . attr($lname) . " \n";
// note we don't escape comment as its already been escaped in pnuserapi
$link_title .= xla('Age') . ": " . attr($patient_age) . "\n" . xla('DOB') . ": " . attr($patient_dob) . " $comment" . "\n";
$link_title .= "(" . xla('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . $link_title . "'>";
$content .= "<i class='fas fa-user text-success' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".urlencode($patientid)."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" title='" . $link_titles . "'></i>";
if ($catid == 1) $content .= "<s>";
$content .= text($lname);
if ($GLOBALS['calendar_appt_style'] != 1) {
$content .= "," . text($fname);
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}
@@ -773,8 +781,11 @@
if ($GLOBALS['calendar_appt_style'] != 1) {
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}
Original file line number Diff line number Diff line change
@@ -549,19 +549,23 @@
$content .= create_event_time_anchor($displayTime);
if ($patientid) {
// include patient name and link to their details
$link_title = $fname . " " . $lname . " \n";
$link_title .= xl('Age') . ": " . $patient_age . "\n" . xl('DOB') . ": " . $patient_dob . $comment . "\n";
$link_title .= "(" . xl('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . attr($link_title) . "'>";
$content .= "<img src='{$this->_tpl_vars['TPL_IMAGE_PATH']}/user-green.gif' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".$patientid."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" border='0' title='" . attr($link_title) . "' alt='View Patient' />";
$link_title = attr($fname) . " " . attr($lname) . " \n";
// note we don't escape comment as its already been escaped in pnuserapi
$link_title .= xla('Age') . ": " . attr($patient_age) . "\n" . xla('DOB') . ": " . attr($patient_dob) . " $comment" . "\n";
$link_title .= "(" . xla('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . $link_title . "'>";
$content .= "<img src='{$this->_tpl_vars['TPL_IMAGE_PATH']}/user-green.gif' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".urlencode($patientid)."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" border='0' title='" . $link_title . "' alt='View Patient' />";
if ($catid == 1) $content .= "<s>";
$content .= text($lname);
if ($GLOBALS['calendar_appt_style'] != 1) {
$content .= "," . text($fname);
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}
@@ -580,8 +584,11 @@
if ($GLOBALS['calendar_appt_style'] != 1) {
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}
Original file line number Diff line number Diff line change
@@ -760,20 +760,24 @@
$content .= text($event['apptstatus']);
if ($patientid) {
// include patient name and link to their details
$link_title = $fname . " " . $lname . " \n";
$link_title .= xl('Age') . ": " . $patient_age . "\n" . xl('DOB') . ": " . $patient_dob . $comment . "\n";
$link_title .= "(" . xl('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . attr($link_title) . "'>";
$content .= "<i class='fas fa-user text-success' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".$patientid."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" title='". attr($link_title) . "'></i>";
$link_title = attr($fname) . " " . attr($lname) . " \n";
// note we don't escape comment as its already been escaped in pnuserapi
$link_title .= xla('Age') . ": " . attr($patient_age) . "\n" . xla('DOB') . ": " . attr($patient_dob) . " $comment" . "\n";
$link_title .= "(" . xla('Click to view') . ")";
$content .= "<a class='link_title' data-pid='". attr($patientid) . "' href='javascript:goPid(" . attr_js($patientid) . ")' title='" . $link_title . "'>";
$content .= "<i class='fas fa-user text-success' onmouseover=\"javascript:ShowImage(" . attr_js($GLOBALS['webroot']."/controller.php?document&retrieve&patient_id=".urlencode($patientid)."&document_id=-1&as_file=false&original_file=true&disable_exit=false&show_original=true&context=patient_picture") . ");\" onmouseout=\"javascript:HideImage();\" title='". $link_title . "'></i>";

if ($catid == 1) $content .= "<s>";
$content .= text($lname);
if ($GLOBALS['calendar_appt_style'] != 1) {
$content .= "," . text($fname);
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}
@@ -793,8 +797,11 @@
if ($GLOBALS['calendar_appt_style'] != 1) {
if ($event['title'] && $GLOBALS['calendar_appt_style'] >= 3) {
$content .= "(" . text($event['title']);
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4)
$content .= ": <span class='text-success'>" . text(trim($event['hometext'])) . "</span>";
if ($event['hometext'] && $GLOBALS['calendar_appt_style'] >= 4) {
// note hometext is already escaped in pnuserapi.php via the pcVarPrepHTMLDisplay function
// we don't double escape it here.
$content .= ": <span class='text-success'>" . trim($event['hometext']) . "</span>";
}
$content .= ")";
}
}