From 94608c71017fc9f519315e3e78b1d7f5a2dc2ca0 Mon Sep 17 00:00:00 2001 From: Cliff Su Date: Sat, 6 Jun 2020 13:54:47 +0800 Subject: [PATCH] Refactor #3542: remove outdated javascript attribute (#3599) * refactor: remove outdated javascript attribute * refactor: remove comment script --- .../help_files/openemr_installation_help.php | 6 ++--- .../openemr_multisite_admin_help.php | 6 ++--- admin.php | 4 ++-- ccr/createCCR.php | 2 +- .../templates/evaluation/general_new.html | 2 +- contrib/forms/example2/new.php | 2 +- contrib/forms/example2/print.php | 2 +- contrib/forms/example2/view.php | 4 ++-- contrib/forms/formmaker/formscript.pl | 2 +- contrib/forms/ippf_srh/new.php | 2 +- .../psychiatrySet/brief_aan_verwijzer/new.php | 2 +- .../forms/psychiatrySet/intakeverslag/new.php | 2 +- .../psychiatrySet/intakeverslag/view.php | 2 +- .../psychiatrisch_onderzoek/new.php | 2 +- .../psychiatrisch_onderzoek/view.php | 2 +- contrib/forms/soccer_injury/new.php | 2 +- contrib/forms/soccer_injury/view.php | 2 +- contrib/forms/xmlformgen/xslt/new.php.xslt | 4 ++-- contrib/forms/xmlformgen/xslt/print.php.xslt | 2 +- contrib/forms/xmlformgen/xslt/show.php.xslt | 4 ++-- contrib/forms/xmlformgen/xslt/view.php.xslt | 4 ++-- contrib/util/de_identification_upgrade.php | 2 +- contrib/util/dupecheck/index.php | 2 +- contrib/util/dupecheck/mergerecords.php | 2 +- custom/export_qrda_xml.php | 2 +- gacl/admin/templates/phpgacl/acl_admin.tpl | 6 ++--- gacl/admin/templates/phpgacl/acl_admin_js.tpl | 4 ++-- gacl/admin/templates/phpgacl/assign_group.tpl | 6 ++--- interface/billing/edi_270.php | 2 +- interface/billing/edi_271.php | 2 +- interface/clickmap/template/general_new.html | 4 ++-- interface/cmsportal/insurance_form.php | 2 +- interface/cmsportal/list_requests.php | 2 +- .../de_identification_screen1.php | 2 +- .../find_drug_popup.php | 2 +- .../re_identification_input_screen.php | 2 +- interface/drugs/dispense_drug.php | 4 ++-- interface/eRx.php | 6 ++--- interface/fax/fax_dispatch.php | 2 +- interface/forms/CAMOS/notegen.php | 2 +- interface/forms/CAMOS/rx_print.php | 2 +- interface/forms/CAMOS/view.php | 2 +- interface/forms/LBF/new.php | 4 ++-- interface/forms/aftercare_plan/new.php | 2 +- interface/forms/ankleinjury/new.php | 2 +- interface/forms/bronchitis/new.php | 4 ++-- interface/forms/eye_mag/SpectacleRx.php | 6 ++--- interface/forms/eye_mag/a_issue.php | 2 +- .../forms/eye_mag/php/eye_mag_functions.php | 2 +- interface/forms/eye_mag/view.php | 10 ++++----- .../code_choice/initialize_code_choice.php | 2 +- .../fee_sheet/review/initialize_review.php | 8 +++---- .../forms/functional_cognitive_status/new.php | 2 +- interface/forms/misc_billing_options/new.php | 2 +- interface/forms/misc_billing_options/save.php | 2 +- interface/forms/newGroupEncounter/common.php | 4 ++-- interface/forms/newpatient/common.php | 2 +- interface/forms/note/new.php | 4 ++-- interface/forms/note/print.php | 2 +- interface/forms/note/view.php | 4 ++-- interface/forms/observation/new.php | 2 +- interface/forms/physical_exam/new.php | 2 +- interface/forms/track_anything/history.php | 4 ++-- interface/forms/track_anything/new.php | 2 +- interface/forms/transfer_summary/new.php | 2 +- interface/forms/treatment_plan/new.php | 2 +- interface/forms/vitals/growthchart/chart.php | 4 ++-- .../vitals/templates/vitals/general_new.html | 2 +- interface/login/login.php | 8 +++---- interface/login_screen.php | 2 +- interface/main/about_page.php | 8 +++---- interface/main/calendar/find_group_popup.php | 4 ++-- .../modules/PostCalendar/common.api.php | 6 ++--- .../PostCalendar/pnincludes/ColorPicker2.js | 20 ++++++++--------- .../pntemplates/default/user/ajax_search.html | 3 +-- .../pntemplates/default/views/header.html | 2 +- .../dated_reminders/dated_reminders_add.php | 2 +- interface/main/tabs/main.php | 20 ++++++++--------- interface/main/tabs/menu/menu_json.php | 2 +- interface/main/tabs/timeout_iframe.php | 2 +- .../module/Acl/view/acl/acl/acl.phtml | 4 ++-- .../module/Acl/view/acl/acl/index.phtml | 4 ++-- .../module/Acl/view/layout/layout_tabs.phtml | 2 +- .../src/Application/Helper/Javascript.php | 2 +- .../carecoordination/revandapprove.phtml | 2 +- .../carecoordination/upload.phtml | 2 +- .../view/carecoordination/ccd/upload.phtml | 2 +- .../encountermanager/index.phtml | 4 ++-- .../view/carecoordination/setup/index.phtml | 8 +++---- .../module/Ccr/view/ccr/ccr/index.phtml | 2 +- .../Ccr/view/ccr/ccr/revandapprove.phtml | 2 +- .../immunization/immunization/index.phtml | 6 ++--- .../view/multipledb/multipledb/index.phtml | 6 ++--- .../syndromicsurveillance/index.phtml | 4 ++-- interface/new/new_comprehensive_save.php | 2 +- interface/new/new_patient_save.php | 2 +- interface/orders/find_order_popup.php | 6 ++--- interface/orders/patient_match_dialog.php | 2 +- interface/orders/pending_followup.php | 2 +- interface/orders/procedure_provider_list.php | 2 +- interface/orders/single_order_results.inc.php | 4 ++-- interface/orders/single_order_results.php | 4 ++-- interface/orders/types.php | 8 +++---- interface/orders/types_edit.php | 2 +- interface/patient_file/ccr_review_approve.php | 2 +- interface/patient_file/deleter.php | 2 +- interface/patient_file/encounter/forms.php | 4 ++-- .../patient_file/encounter/load_form.php | 2 +- .../patient_file/encounter/view_form.php | 2 +- interface/patient_file/front_payment.php | 8 +++---- interface/patient_file/history/encounters.php | 2 +- .../patient_file/history/history_full.php | 6 ++--- interface/patient_file/letter.php | 2 +- interface/patient_file/pos_checkout.php | 4 ++-- interface/patient_file/problem_encounter.php | 2 +- .../patient_file/report/custom_report.php | 4 ++-- interface/patient_file/rules/patient_data.php | 2 +- .../summary/add_edit_amendments.php | 2 +- .../patient_file/summary/add_edit_issue.php | 4 ++-- .../summary/advancedirectives.php | 2 +- .../summary/create_portallogin.php | 4 ++-- .../patient_file/summary/demographics.php | 2 +- .../summary/demographics_full.php | 2 +- .../patient_file/summary/disclosure_full.php | 2 +- .../patient_file/summary/immunizations.php | 2 +- .../patient_file/summary/list_amendments.php | 2 +- interface/patient_file/summary/pnotes.php | 2 +- .../patient_file/summary/pnotes_fragment.php | 2 +- .../patient_file/summary/pnotes_full.php | 4 ++-- .../summary/record_disclosure.php | 4 ++-- interface/patient_file/summary/stats.php | 2 +- interface/patient_file/summary/stats_full.php | 2 +- .../transaction/add_transaction.php | 4 ++-- .../transaction/record_request.php | 2 +- interface/patient_tracker/patient_tracker.php | 6 ++--- interface/reports/amc_tracking.php | 2 +- interface/reports/audit_log_tamper_report.php | 4 ++-- interface/reports/cdr_log.php | 2 +- interface/reports/clinical_reports.php | 4 ++-- interface/reports/collections_report.php | 2 +- interface/reports/daily_summary_report.php | 2 +- interface/reports/immunization_report.php | 2 +- interface/reports/inventory_list.php | 2 +- interface/reports/ippf_cyp_report.php | 2 +- interface/reports/ippf_daily.php | 2 +- interface/reports/ippf_statistics.php | 2 +- interface/reports/patient_edu_web_lookup.php | 4 ++-- .../reports/patient_flow_board_report.php | 2 +- interface/reports/patient_list.php | 2 +- interface/reports/prescriptions_report.php | 2 +- interface/reports/referrals_report.php | 2 +- interface/reports/report.script.php | 2 +- .../reports/svc_code_financial_report.php | 2 +- interface/super/edit_globals.php | 4 ++-- interface/super/edit_layout_props.php | 2 +- interface/super/edit_list.php | 2 +- .../super/rules/base/template/redirect.php | 4 ++-- .../rules/controllers/browse/view/list.php | 6 ++--- .../controllers/browse/view/plans_config.php | 18 +++++++-------- .../rules/controllers/detail/view/view.php | 4 ++-- .../controllers/edit/template/criteria.php | 4 ++-- .../rules/controllers/edit/view/action.php | 6 ++--- .../rules/controllers/edit/view/bucket.php | 4 ++-- .../rules/controllers/edit/view/custom.php | 4 ++-- .../rules/controllers/edit/view/diagnosis.php | 4 ++-- .../rules/controllers/edit/view/intervals.php | 4 ++-- .../rules/controllers/edit/view/summary.php | 4 ++-- interface/usergroup/adminacl.php | 2 +- interface/usergroup/facilities.php | 2 +- interface/usergroup/facility_admin.php | 6 ++--- interface/usergroup/facility_user.php | 2 +- interface/usergroup/facility_user_admin.php | 4 ++-- .../usergroup/ssl_certificates_admin.php | 2 +- interface/usergroup/user_admin.php | 6 ++--- interface/usergroup/user_info.php | 2 +- interface/usergroup/usergroup_admin.php | 4 ++-- interface/usergroup/usergroup_admin_add.php | 4 ++-- interface/weno/confirm.php | 2 +- library/ajax/facility_ajax_jav.inc.php | 2 +- library/ajax/payment_ajax_jav.inc.php | 2 +- library/classes/TreeMenu.php | 2 +- library/custom_template/add_context.php | 2 +- library/custom_template/add_template.php | 2 +- library/custom_template/custom_template.php | 4 ++-- library/custom_template/delete_category.php | 4 ++-- library/custom_template/personalize.php | 2 +- library/custom_template/quest_popup.php | 2 +- library/custom_template/share_template.php | 2 +- library/dicom_frame.php | 6 ++--- library/erx_javascript.inc.php | 2 +- library/js/xl/dygraphs.js.php | 2 +- library/options.js.php | 2 +- library/options_listadd.inc | 2 +- library/payment_jav.inc.php | 2 +- library/spreadsheet.inc.php | 2 +- library/validation/validate_core.php | 2 +- library/validation/validation_script.js.php | 6 ++--- myportal/index.php | 2 +- portal/account/index_reset.php | 2 +- .../OnsiteActivityViewListView.tpl.php | 2 +- .../templates/OnsiteDocumentListView.tpl.php | 8 +++---- .../OnsitePortalActivityListView.tpl.php | 2 +- .../patient/templates/PatientListView.tpl.php | 4 ++-- portal/patient/templates/_FormsHeader.tpl.php | 4 ++-- portal/patient/templates/_Header.tpl.php | 4 ++-- .../patient/templates/_ProviderHeader.tpl.php | 12 +++++----- .../templates/_modalFormHeader.tpl.php | 22 +++++++++---------- portal/portal_payment.php | 10 ++++----- portal/report/portal_custom_report.php | 2 +- portal/sign/assets/signit.php | 6 ++--- setup.php | 13 +++++------ sites/default/referral_template.html | 2 +- src/Core/Header.php | 2 +- .../document_categories/general_list.html | 4 ++-- templates/documents/general_list.html | 8 +++---- templates/documents/general_queue.html | 2 +- .../insurance_companies/general_edit.html | 2 +- templates/insurance_numbers/general_edit.html | 2 +- templates/pharmacies/general_edit.html | 2 +- templates/prescription/general_lookup.html | 2 +- templates/x12_partners/general_edit.html | 2 +- tests/api/InternalApiTest.php | 2 +- 222 files changed, 387 insertions(+), 393 deletions(-) diff --git a/Documentation/help_files/openemr_installation_help.php b/Documentation/help_files/openemr_installation_help.php index 9f2c658706b..1ba90ef999f 100644 --- a/Documentation/help_files/openemr_installation_help.php +++ b/Documentation/help_files/openemr_installation_help.php @@ -16,11 +16,11 @@ - - + + - + <?php echo ("OpenEMR Installation Help");?> - diff --git a/contrib/forms/soccer_injury/view.php b/contrib/forms/soccer_injury/view.php index 4b8110e4593..9d76f0c3178 100644 --- a/contrib/forms/soccer_injury/view.php +++ b/contrib/forms/soccer_injury/view.php @@ -186,7 +186,7 @@ function cbcell($name, $desc, $colname) - diff --git a/contrib/forms/xmlformgen/xslt/new.php.xslt b/contrib/forms/xmlformgen/xslt/new.php.xslt index c108f9a6c48..0ed718d20d7 100644 --- a/contrib/forms/xmlformgen/xslt/new.php.xslt +++ b/contrib/forms/xmlformgen/xslt/new.php.xslt @@ -69,7 +69,7 @@ $submiturl = $GLOBALS['rootdir'].'/forms/'.$form_folder.'/save.php?mode=new& - diff --git a/contrib/forms/xmlformgen/xslt/show.php.xslt b/contrib/forms/xmlformgen/xslt/show.php.xslt index 0abe54d8eac..d968fed66db 100644 --- a/contrib/forms/xmlformgen/xslt/show.php.xslt +++ b/contrib/forms/xmlformgen/xslt/show.php.xslt @@ -71,7 +71,7 @@ $returnurl = "../../forms/$form_folder/view.php?mode=noencounter"; - diff --git a/custom/export_qrda_xml.php b/custom/export_qrda_xml.php index e768d223902..cfb8bacf5dc 100644 --- a/custom/export_qrda_xml.php +++ b/custom/export_qrda_xml.php @@ -1501,7 +1501,7 @@ <?php echo xlt('Export QRDA Report'); ?> - {include file="phpgacl/acl_admin_js.tpl"} @@ -177,4 +177,4 @@ -{include file="phpgacl/footer.tpl"} \ No newline at end of file +{include file="phpgacl/footer.tpl"} diff --git a/gacl/admin/templates/phpgacl/acl_admin_js.tpl b/gacl/admin/templates/phpgacl/acl_admin_js.tpl index 3c6e7a81743..45cd8889896 100644 --- a/gacl/admin/templates/phpgacl/acl_admin_js.tpl +++ b/gacl/admin/templates/phpgacl/acl_admin_js.tpl @@ -1,4 +1,4 @@ {literal} - -{/literal} \ No newline at end of file +{/literal} diff --git a/gacl/admin/templates/phpgacl/assign_group.tpl b/gacl/admin/templates/phpgacl/assign_group.tpl index 4384a45d39e..319c15ce270 100644 --- a/gacl/admin/templates/phpgacl/assign_group.tpl +++ b/gacl/admin/templates/phpgacl/assign_group.tpl @@ -1,11 +1,11 @@ {include file="phpgacl/header.tpl"} - {include file="phpgacl/acl_admin_js.tpl"} - {include file="phpgacl/navigation.tpl"} + {include file="phpgacl/navigation.tpl"}
@@ -100,4 +100,4 @@ -{include file="phpgacl/footer.tpl"} \ No newline at end of file +{include file="phpgacl/footer.tpl"} diff --git a/interface/billing/edi_270.php b/interface/billing/edi_270.php index a4654073623..6667370924a 100644 --- a/interface/billing/edi_270.php +++ b/interface/billing/edi_270.php @@ -236,7 +236,7 @@ function unique_by_key($source, $key) - + {if !$reportMode} @@ -43,7 +43,7 @@ - + - diff --git a/interface/forms/eye_mag/SpectacleRx.php b/interface/forms/eye_mag/SpectacleRx.php index bef1ebf543a..10cc664e92a 100644 --- a/interface/forms/eye_mag/SpectacleRx.php +++ b/interface/forms/eye_mag/SpectacleRx.php @@ -375,7 +375,7 @@ width: 300px; } - + diff --git a/interface/forms/eye_mag/php/eye_mag_functions.php b/interface/forms/eye_mag/php/eye_mag_functions.php index a7b7f0e7ba0..e947e1d6dd5 100644 --- a/interface/forms/eye_mag/php/eye_mag_functions.php +++ b/interface/forms/eye_mag/php/eye_mag_functions.php @@ -1483,7 +1483,7 @@ function display_PRIOR_section($zone, $orig_id, $id_to_show, $pid, $report = '0' - - - - - - + + + +
diff --git a/interface/forms/fee_sheet/code_choice/initialize_code_choice.php b/interface/forms/fee_sheet/code_choice/initialize_code_choice.php index 18f9d15ab11..7b2e1ea5e0f 100644 --- a/interface/forms/fee_sheet/code_choice/initialize_code_choice.php +++ b/interface/forms/fee_sheet/code_choice/initialize_code_choice.php @@ -13,5 +13,5 @@ require_once("templates/code_choices.php"); ?> - + diff --git a/interface/forms/fee_sheet/review/initialize_review.php b/interface/forms/fee_sheet/review/initialize_review.php index 7c73a08db8b..b1cfcabfd6c 100644 --- a/interface/forms/fee_sheet/review/initialize_review.php +++ b/interface/forms/fee_sheet/review/initialize_review.php @@ -35,10 +35,10 @@ function fee_sheet_option(code,code_type,description,fee) return this; } - - - - + + + + - "; + echo ""; } if (!$encounter) { // comes from globals.php die(xlt("Internal error: we do not seem to be in an encounter!")); diff --git a/interface/forms/newGroupEncounter/common.php b/interface/forms/newGroupEncounter/common.php index 38417ea2ad2..7967f9caceb 100644 --- a/interface/forms/newGroupEncounter/common.php +++ b/interface/forms/newGroupEncounter/common.php @@ -70,7 +70,7 @@ function sensitivity_compare($a, $b) require_once($GLOBALS['srcdir'] . "/validation/validation_script.js.php"); ?> - @@ -97,7 +97,7 @@ - + <?php echo xlt('Growth Chart'); ?> diff --git a/interface/forms/vitals/templates/vitals/general_new.html b/interface/forms/vitals/templates/vitals/general_new.html index 10d4b44ac51..cf9ade3f8f7 100644 --- a/interface/forms/vitals/templates/vitals/general_new.html +++ b/interface/forms/vitals/templates/vitals/general_new.html @@ -12,7 +12,7 @@ {headerTemplate assets='datetime-picker'} {literal} - - - + + - diff --git a/interface/main/about_page.php b/interface/main/about_page.php index 49e636d6e55..136539f8e42 100644 --- a/interface/main/about_page.php +++ b/interface/main/about_page.php @@ -58,7 +58,7 @@ } - - - + + - - diff --git a/interface/main/calendar/modules/PostCalendar/pnincludes/ColorPicker2.js b/interface/main/calendar/modules/PostCalendar/pnincludes/ColorPicker2.js index 31ee44bc704..367a4993896 100644 --- a/interface/main/calendar/modules/PostCalendar/pnincludes/ColorPicker2.js +++ b/interface/main/calendar/modules/PostCalendar/pnincludes/ColorPicker2.js @@ -17,13 +17,13 @@ // =================================================================== -/* +/* ColorPicker.js Author: Matt Kruse Last modified: 6/19/01 -DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB -form. It uses a color "swatch" to display the standard 216-color web-safe +DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB +form. It uses a color "swatch" to display the standard 216-color web-safe palette. The user can then click on a color to select it. COMPATABILITY: See notes in AnchorPosition.js and PopupWindow.js. @@ -53,18 +53,18 @@ function pickColor(color) { NOTES: 1) Requires the functions in AnchorPosition.js and PopupWindow.js -2) Your anchor tag MUST contain both NAME and ID attributes which are the +2) Your anchor tag MUST contain both NAME and ID attributes which are the same. For example: -3) There must be at least a space between for IE5.5 to see the +3) There must be at least a space between for IE5.5 to see the anchor tag correctly. Do not do with no space. 4) When a ColorPicker object is created, a handler for 'onmouseup' is attached to any event handler you may have already defined. Do NOT define an event handler for 'onmouseup' after you define a ColorPicker object or the color picker will not hide itself correctly. -*/ +*/ function ColorPicker_writeDiv() { document.writeln(""); @@ -83,7 +83,7 @@ function ColorPicker_pickColor(color,obj) { alert("You must define a function named 'pickColor' to receive the value clicked!"); } } - + // This function runs when you move your mouse over a color block, if you have a newer browser function ColorPicker_highlightColor(c) { var thedoc = (arguments.length>1)?arguments[1]:window.document; @@ -106,7 +106,7 @@ function ColorPicker() { else { var divname = arguments[0]; } - + if (divname != "") { var cp = new PopupWindow(divname); } @@ -117,7 +117,7 @@ function ColorPicker() { // Object variables cp.currentValue = "#FFFFFF"; - + // Method Mappings cp.writeDiv = ColorPicker_writeDiv; cp.highlightColor = ColorPicker_highlightColor; @@ -159,7 +159,7 @@ function ColorPicker() { if (use_highlight) { var mo = 'onMouseOver="'+windowRef+'ColorPicker_highlightColor(\''+colors[i]+'\',window.document)"'; } else { mo = ""; } cp_contents += '
'; - if ( ((i+1)>=total) || (((i+1) % width) == 0)) { + if ( ((i+1)>=total) || (((i+1) % width) == 0)) { cp_contents += ""; } } diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html index 8f5dbd87f48..9ea721ab90e 100644 --- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html @@ -4,8 +4,7 @@ [-* we want to include our stylesheet for this view*-] - - + [-*Load the Language Definitions*-] diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/header.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/header.html index c52f87fdfbc..ee1ed066692 100644 --- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/header.html +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/header.html @@ -9,7 +9,7 @@ - +" + . "" . ' - - - + + + + - - + - - - + + + - @@ -64,4 +64,4 @@ $listener = $this->listenerObject;
   
- \ No newline at end of file + diff --git a/interface/modules/zend_modules/module/Acl/view/acl/acl/index.phtml b/interface/modules/zend_modules/module/Acl/view/acl/acl/index.phtml index 9d1b2b3bcb4..5fd0957f8c2 100644 --- a/interface/modules/zend_modules/module/Acl/view/acl/acl/index.phtml +++ b/interface/modules/zend_modules/module/Acl/view/acl/acl/index.phtml @@ -12,7 +12,7 @@ $listener = $this->listenerObject; ?> -'; diff --git a/interface/modules/zend_modules/module/Carecoordination/view/carecoordination/carecoordination/revandapprove.phtml b/interface/modules/zend_modules/module/Carecoordination/view/carecoordination/carecoordination/revandapprove.phtml index dec37a0cf2c..20dac8b83cf 100644 --- a/interface/modules/zend_modules/module/Carecoordination/view/carecoordination/carecoordination/revandapprove.phtml +++ b/interface/modules/zend_modules/module/Carecoordination/view/carecoordination/carecoordination/revandapprove.phtml @@ -64,7 +64,7 @@ $insert = $this->listenerObject->z_xlt('Insert'); padding: 2px 10px; } - diff --git a/interface/modules/zend_modules/module/Syndromicsurveillance/view/syndromicsurveillance/syndromicsurveillance/index.phtml b/interface/modules/zend_modules/module/Syndromicsurveillance/view/syndromicsurveillance/syndromicsurveillance/index.phtml index 22413d2808f..d48d897060f 100644 --- a/interface/modules/zend_modules/module/Syndromicsurveillance/view/syndromicsurveillance/syndromicsurveillance/index.phtml +++ b/interface/modules/zend_modules/module/Syndromicsurveillance/view/syndromicsurveillance/syndromicsurveillance/index.phtml @@ -13,7 +13,7 @@ $code_list = $this->code_list; $provider = $this->provider; ?> - - + + - - + diff --git a/interface/orders/types.php b/interface/orders/types.php index 55fcec3a581..5e6c6f2c1e7 100644 --- a/interface/orders/types.php +++ b/interface/orders/types.php @@ -33,10 +33,8 @@ $ptrow = sqlQuery("SELECT name FROM procedure_type WHERE procedure_type_id = ?", [$form_order]); $name = $ptrow['name']; ?> - - + - + diff --git a/interface/patient_file/encounter/load_form.php b/interface/patient_file/encounter/load_form.php index f852b08973d..8525df54e00 100644 --- a/interface/patient_file/encounter/load_form.php +++ b/interface/patient_file/encounter/load_form.php @@ -29,5 +29,5 @@ } if (!empty($GLOBALS['text_templates_enabled'])) { ?> - + diff --git a/interface/patient_file/encounter/view_form.php b/interface/patient_file/encounter/view_form.php index 7ef8b2a642b..792e83fd24e 100644 --- a/interface/patient_file/encounter/view_form.php +++ b/interface/patient_file/encounter/view_form.php @@ -29,5 +29,5 @@ $id = $clean_id; if (!empty($GLOBALS['text_templates_enabled'])) { ?> - + diff --git a/interface/patient_file/front_payment.php b/interface/patient_file/front_payment.php index 77f6a20c4a0..8eb63084f02 100644 --- a/interface/patient_file/front_payment.php +++ b/interface/patient_file/front_payment.php @@ -419,7 +419,7 @@ function calcTaxes($row, $amount) <?php echo xlt('Receipt for Payment'); ?> - - - diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php index b94b2f1dfab..7f5b496361c 100644 --- a/interface/patient_file/history/encounters.php +++ b/interface/patient_file/history/encounters.php @@ -171,7 +171,7 @@ function generatePageElement($start, $pagesize, $billing, $issue, $text) - + - - + diff --git a/interface/patient_file/rules/patient_data.php b/interface/patient_file/rules/patient_data.php index 2cfa0fe39fe..e928bd1ff10 100644 --- a/interface/patient_file/rules/patient_data.php +++ b/interface/patient_file/rules/patient_data.php @@ -23,7 +23,7 @@ - + -'; + echo ''; } } diff --git a/interface/patient_file/summary/demographics_full.php b/interface/patient_file/summary/demographics_full.php index 964eb0187ec..38ff9e9c76a 100644 --- a/interface/patient_file/summary/demographics_full.php +++ b/interface/patient_file/summary/demographics_full.php @@ -91,7 +91,7 @@ - - + - diff --git a/interface/reports/patient_flow_board_report.php b/interface/reports/patient_flow_board_report.php index 3b48ae1c4eb..7571c057939 100644 --- a/interface/reports/patient_flow_board_report.php +++ b/interface/reports/patient_flow_board_report.php @@ -80,7 +80,7 @@ - "; + echo ""; return false; } @@ -156,7 +156,7 @@ function checkBackgroundServices() } } - echo " - + diff --git a/interface/super/rules/controllers/browse/view/list.php b/interface/super/rules/controllers/browse/view/list.php index 35bc7e14e75..80921628d5d 100644 --- a/interface/super/rules/controllers/browse/view/list.php +++ b/interface/super/rules/controllers/browse/view/list.php @@ -14,10 +14,10 @@ ?> - - + + - diff --git a/interface/super/rules/controllers/browse/view/plans_config.php b/interface/super/rules/controllers/browse/view/plans_config.php index eed978efa7a..2286b73f68f 100644 --- a/interface/super/rules/controllers/browse/view/plans_config.php +++ b/interface/super/rules/controllers/browse/view/plans_config.php @@ -23,12 +23,12 @@ - - - - - - + + + + + - - + + - - + diff --git a/interface/super/rules/controllers/edit/template/criteria.php b/interface/super/rules/controllers/edit/template/criteria.php index 59d3e9fef08..51f9dbb61a2 100644 --- a/interface/super/rules/controllers/edit/template/criteria.php +++ b/interface/super/rules/controllers/edit/template/criteria.php @@ -27,8 +27,8 @@ rule ?> criteria ?> - - + diff --git a/interface/super/rules/controllers/edit/view/action.php b/interface/super/rules/controllers/edit/view/action.php index d7dca610562..bcc37cd409e 100644 --- a/interface/super/rules/controllers/edit/view/action.php +++ b/interface/super/rules/controllers/edit/view/action.php @@ -16,9 +16,9 @@ action?> rule?> - - - + + + - diff --git a/interface/super/rules/controllers/edit/view/custom.php b/interface/super/rules/controllers/edit/view/custom.php index c90f861d63d..6e67706bae3 100644 --- a/interface/super/rules/controllers/edit/view/custom.php +++ b/interface/super/rules/controllers/edit/view/custom.php @@ -14,9 +14,9 @@ ?> - + - diff --git a/interface/super/rules/controllers/edit/view/diagnosis.php b/interface/super/rules/controllers/edit/view/diagnosis.php index cb70f089cff..3f9faea7ec1 100644 --- a/interface/super/rules/controllers/edit/view/diagnosis.php +++ b/interface/super/rules/controllers/edit/view/diagnosis.php @@ -16,8 +16,8 @@ - - + - + diff --git a/interface/super/rules/controllers/edit/view/summary.php b/interface/super/rules/controllers/edit/view/summary.php index 2bc18da39e7..443407dc477 100644 --- a/interface/super/rules/controllers/edit/view/summary.php +++ b/interface/super/rules/controllers/edit/view/summary.php @@ -14,8 +14,8 @@ $rule = $viewBean->rule ?> - - + diff --git a/interface/usergroup/adminacl.php b/interface/usergroup/adminacl.php index f5081cf26cd..abf3e609cea 100644 --- a/interface/usergroup/adminacl.php +++ b/interface/usergroup/adminacl.php @@ -34,7 +34,7 @@ - - - + + + diff --git a/interface/usergroup/facility_user.php b/interface/usergroup/facility_user.php index 7084c5ee980..638db8c7eb1 100644 --- a/interface/usergroup/facility_user.php +++ b/interface/usergroup/facility_user.php @@ -58,7 +58,7 @@ - diff --git a/interface/usergroup/ssl_certificates_admin.php b/interface/usergroup/ssl_certificates_admin.php index dae4c1376fa..77bccb07398 100644 --- a/interface/usergroup/ssl_certificates_admin.php +++ b/interface/usergroup/ssl_certificates_admin.php @@ -451,7 +451,7 @@ function create_and_download_certificates() - + @@ -66,7 +66,7 @@ } ?> - + + @@ -53,7 +53,7 @@ $collectthis = json_sanitize($collectthis["new_user"]["rules"]); } ?> - + - + - + - - - + + + diff --git a/myportal/index.php b/myportal/index.php index 4dee1e66a9e..c32d0710f3f 100644 --- a/myportal/index.php +++ b/myportal/index.php @@ -68,7 +68,7 @@ function md5_pass($length = 8) ?> -\n"; } ?> - "; ?> - - - - + + + diff --git a/portal/patient/templates/_FormsHeader.tpl.php b/portal/patient/templates/_FormsHeader.tpl.php index 10eabae6747..10b41facaf2 100644 --- a/portal/patient/templates/_FormsHeader.tpl.php +++ b/portal/patient/templates/_FormsHeader.tpl.php @@ -25,8 +25,8 @@ - - + - + - - - + + + + - - + + register) {?> - + - - - - - - - + + + + + + + - - + diff --git a/portal/portal_payment.php b/portal/portal_payment.php index 40ec09cf69b..1dfe539e872 100644 --- a/portal/portal_payment.php +++ b/portal/portal_payment.php @@ -76,7 +76,7 @@ if ($edata) { $ccdata = json_decode($cryptoGen->decryptStandard($edata['checksum']), true); $invdata = json_decode($edata['table_args'], true); - echo ""; + echo ""; } function bucks($amount) @@ -437,7 +437,7 @@ function calcTaxes($row, $amount) ?> <?php echo xlt('Receipt for Payment'); ?> - + - - + + + diff --git a/portal/sign/assets/signit.php b/portal/sign/assets/signit.php index fc3fff63300..b7a01f063e8 100644 --- a/portal/sign/assets/signit.php +++ b/portal/sign/assets/signit.php @@ -29,10 +29,8 @@ - - + + - + + - - diff --git a/src/Core/Header.php b/src/Core/Header.php index 3f914acb712..2dd23151549 100644 --- a/src/Core/Header.php +++ b/src/Core/Header.php @@ -301,7 +301,7 @@ public static function parsePlaceholders($subject) private static function createElement($path, $type, $alreadyBuilt) { - $script = "\n"; + $script = "\n"; $link = "\n"; $template = ($type == 'script') ? $script : $link; diff --git a/templates/document_categories/general_list.html b/templates/document_categories/general_list.html index bff767d9717..67715efe598 100644 --- a/templates/document_categories/general_list.html +++ b/templates/document_categories/general_list.html @@ -13,11 +13,11 @@ --> {/literal} - - + diff --git a/templates/documents/general_list.html b/templates/documents/general_list.html index c3df4b3d955..e3f6502ab53 100644 --- a/templates/documents/general_list.html +++ b/templates/documents/general_list.html @@ -31,10 +31,10 @@ } {/literal} - - + + -
{xlt t="Document Categories"}