From 1256a9412166b3aee9c4d12f51b454ae4ecc6edc Mon Sep 17 00:00:00 2001 From: stephen waite Date: Wed, 1 Feb 2023 11:45:25 -0500 Subject: [PATCH] fix: minor prior auth bugs and some php8 warns in graphs (#6153) * fix: minor prior auth bugs and some php8 warns in graphs * fix typehint * remove text() for tds * remove unrelated feature --- .../openemr.bootstrap.php | 55 ---------------------- .../public/deleter.php | 2 +- .../public/index.php | 12 ++--- .../oe-module-prior-authorizations/table.sql | 4 +- .../src/Installer/Model/InstModuleTable.php | 8 ++-- library/ajax/graphs.php | 8 ++-- 6 files changed, 18 insertions(+), 71 deletions(-) diff --git a/interface/modules/custom_modules/oe-module-prior-authorizations/openemr.bootstrap.php b/interface/modules/custom_modules/oe-module-prior-authorizations/openemr.bootstrap.php index b452c5082..3e28ea7f7 100644 --- a/interface/modules/custom_modules/oe-module-prior-authorizations/openemr.bootstrap.php +++ b/interface/modules/custom_modules/oe-module-prior-authorizations/openemr.bootstrap.php @@ -54,60 +54,6 @@ function oe_module_priorauth_patient_menu_item(PatientMenuEvent $menuEvent) return $menuEvent; } -function renderButtonPostLoad(Event $event) -{ - $patient_status = sqlQuery("SELECT `status` FROM `patient_status` WHERE `pid` = ? ORDER BY `statusId` DESC LIMIT 1", [$_SESSION['pid']]); - if (($patient_status['status'] != 'inactive') && (AclMain::aclCheckCore('admin', 'super'))) { - ?> - - - - - addListener(MenuEvent::MENU_UPDATE, 'oe_module_priorauth_add_menu_item'); $eventDispatcher->addListener(PatientMenuEvent::MENU_UPDATE, 'oe_module_priorauth_patient_menu_item'); -$eventDispatcher->addListener(RenderEvent::EVENT_RENDER_POST_PAGELOAD, 'renderButtonPostLoad'); diff --git a/interface/modules/custom_modules/oe-module-prior-authorizations/public/deleter.php b/interface/modules/custom_modules/oe-module-prior-authorizations/public/deleter.php index b986452e0..107efd158 100644 --- a/interface/modules/custom_modules/oe-module-prior-authorizations/public/deleter.php +++ b/interface/modules/custom_modules/oe-module-prior-authorizations/public/deleter.php @@ -18,7 +18,7 @@ if (!AclMain::aclCheckCore('admin', 'practice')) { die; } -if (CsrfUtils::verifyCsrfToken($_GET['csrf_token_form'])) { +if (!CsrfUtils::verifyCsrfToken($_GET['csrf_token_form'])) { CsrfUtils::csrfNotVerified(); } sqlQuery("delete from `module_prior_authorizations` where `id` = ?", [$_GET['id']]); diff --git a/interface/modules/custom_modules/oe-module-prior-authorizations/public/index.php b/interface/modules/custom_modules/oe-module-prior-authorizations/public/index.php index 83bc5b36c..23b27fa6f 100644 --- a/interface/modules/custom_modules/oe-module-prior-authorizations/public/index.php +++ b/interface/modules/custom_modules/oe-module-prior-authorizations/public/index.php @@ -156,16 +156,16 @@ const TABLE_TD = ""; $remaining = $iter['init_units'] - $used['count']; print ""; print text($iter['auth_num']); - print text(TABLE_TD) . text($iter['init_units']); - print text(TABLE_TD) . text($remaining); - print text(TABLE_TD) . text($iter['start_date']); + print TABLE_TD . text($iter['init_units']); + print TABLE_TD . text($remaining); + print TABLE_TD . text($iter['start_date']); if ($iter['end_date'] == '0000-00-00') { print TABLE_TD; } else { - print text(TABLE_TD) . text($iter['end_date']); + print TABLE_TD . text($iter['end_date']); } - print text(TABLE_TD) . text($iter['cpt']); - print text(TABLE_TD) . " + print TABLE_TD . text($iter['cpt']); + print TABLE_TD . " "; print "" . xlt('Delete') . ""; diff --git a/interface/modules/custom_modules/oe-module-prior-authorizations/table.sql b/interface/modules/custom_modules/oe-module-prior-authorizations/table.sql index 41be5f16d..a9ce36a98 100644 --- a/interface/modules/custom_modules/oe-module-prior-authorizations/table.sql +++ b/interface/modules/custom_modules/oe-module-prior-authorizations/table.sql @@ -5,8 +5,8 @@ CREATE TABLE IF NOT EXISTS `module_prior_authorizations` `id` INT NOT NULL PRIMARY KEY auto_increment, `pid` bigint(20) DEFAULT NULL, `auth_num` VARCHAR(20) NOT NULL, - `start_date` DEFAULT NULL, - `end_date` DEFAULT NULL, + `start_date` date DEFAULT NULL, + `end_date` date DEFAULT NULL, `cpt` TEXT, `init_units` INT(5) NULL, `remaining_units` INT(5) NULL diff --git a/interface/modules/zend_modules/module/Installer/src/Installer/Model/InstModuleTable.php b/interface/modules/zend_modules/module/Installer/src/Installer/Model/InstModuleTable.php index f4ad2e81f..dd28cd4ef 100644 --- a/interface/modules/zend_modules/module/Installer/src/Installer/Model/InstModuleTable.php +++ b/interface/modules/zend_modules/module/Installer/src/Installer/Model/InstModuleTable.php @@ -261,8 +261,10 @@ class InstModuleTable $added = ""; $typeSet = ""; - $lines = @file($GLOBALS['srcdir'] . "/../interface/modules/$base/$added$directory/info.txt"); - if ($lines) { + if (file_exists($GLOBALS['srcdir'] . "/../interface/modules/$base/$added$directory/info.txt")) { + $lines = @file($GLOBALS['srcdir'] . "/../interface/modules/$base/$added$directory/info.txt"); + } + if (!empty($lines)) { $name = $lines[0]; } else { $name = $directory; @@ -1094,7 +1096,7 @@ class InstModuleTable private function existsModuleConfigFile($moduleDirectory) { $filePath = $this->getModuleConfigFilePathForDirectory($moduleDirectory); - return file_exists($filePath); + return file_exists($filePath ?? ''); } /** diff --git a/library/ajax/graphs.php b/library/ajax/graphs.php index 47dc027a2..61ff32208 100644 --- a/library/ajax/graphs.php +++ b/library/ajax/graphs.php @@ -229,10 +229,10 @@ $data = array(); while ($row = sqlFetchArray($values)) { if ($row["$name"]) { $x = $row['date']; - if ($multiplier) { + if ($multiplier ?? null) { // apply unit conversion multiplier $y = $row["$name"] * $multiplier; - } elseif ($isConvertFtoC) { + } elseif ($isConvertFtoC ?? null) { // apply temp F to C conversion $y = convertFtoC($row["$name"]); } else { @@ -249,10 +249,10 @@ if ($isBP) { while ($row = sqlFetchArray($values_alt)) { if ($row["$name_alt"]) { $x = $row['date']; - if ($multiplier) { + if ($multiplier ?? null) { // apply unit conversion multiplier $y = $row["$name_alt"] * $multiplier; - } elseif ($isConvertFtoC) { + } elseif ($isConvertFtoC ?? null) { // apply temp F to C conversion $y = convertFtoC($row["$name_alt"]); } else { -- 2.11.4.GIT