From 9a07a15c0775bd1c4e6d10b4657fb1472ebb319e Mon Sep 17 00:00:00 2001 From: Jerry Padgett Date: Wed, 15 Nov 2017 00:47:20 -0500 Subject: [PATCH] Minor changes for PHP7 warnings. (#1220) * Minor changes for PHP7 warnings for following issue's: #1164, 1165, 1178, 1179, 1180 and 1182. --- interface/billing/indigent_patients_report.php | 8 ++++---- interface/billing/new_payment.php | 6 +++--- interface/orders/orders_results.php | 2 +- interface/orders/types.php | 6 +++--- interface/patient_file/encounter/superbill_custom_full.php | 2 +- interface/reports/daily_summary_report.php | 6 +++--- interface/reports/external_data.php | 2 ++ 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/interface/billing/indigent_patients_report.php b/interface/billing/indigent_patients_report.php index 5d91cf37b..125b1ea8d 100644 --- a/interface/billing/indigent_patients_report.php +++ b/interface/billing/indigent_patients_report.php @@ -219,10 +219,10 @@ if ($_POST['form_refresh']) { $arow = sqlQuery("SELECT SUM(pay_amount) AS pay, " . "sum(adj_amount) AS adj FROM ar_activity WHERE " . "pid = ? AND encounter = ?", array($patient_id, $encounter_id)); - $inv_paid += $arow['pay']; - $inv_amount -= $arow['adj']; - $total_amount += bucks($inv_amount); - $total_paid += bucks($inv_paid); + $inv_paid += floatval($arow['pay']); + $inv_amount -= floatval($arow['adj']); + $total_amount += $inv_amount; + $total_paid += $inv_paid; $bgcolor = (($irow & 1) ? "#ffdddd" : "#ddddff"); ?> diff --git a/interface/billing/new_payment.php b/interface/billing/new_payment.php index c7c21c65c..8dc9e8921 100644 --- a/interface/billing/new_payment.php +++ b/interface/billing/new_payment.php @@ -41,8 +41,8 @@ require_once("$srcdir/payment.inc.php"); //=============================================================================== // Initialisations $mode = isset($_POST['mode']) ? $_POST['mode'] : ''; -$payment_id = isset($_REQUEST['payment_id']) ? $_REQUEST['payment_id'] : ''; -$request_payment_id = $payment_id ; +$payment_id = isset($_REQUEST['payment_id']) ? $_REQUEST['payment_id'] + 0 : 0; +$request_payment_id = $payment_id ; $hidden_patient_code = isset($_REQUEST['hidden_patient_code']) ? $_REQUEST['hidden_patient_code'] : ''; $default_search_patient = isset($_POST['default_search_patient']) ? $_POST['default_search_patient'] : ''; $hidden_type_code = formData('hidden_type_code', true); @@ -117,7 +117,7 @@ if ($mode == "PostPayments" || $mode == "FinishPayments") { //============================================================================== //=============================================================================== -$payment_id=$payment_id*1 > 0 ? $payment_id : $request_payment_id; +$payment_id=$payment_id*1 > 0 ? $payment_id + 0 : $request_payment_id + 0; //=============================================================================== //============================================================================== diff --git a/interface/orders/orders_results.php b/interface/orders/orders_results.php index 82676eaea..83651e9d3 100644 --- a/interface/orders/orders_results.php +++ b/interface/orders/orders_results.php @@ -343,7 +343,7 @@ if ($form_batch) { $form_to_date = $form_from_date; } - $form_proc_type = formData('form_proc_type') + 0; + $form_proc_type = isset($_REQUEST['form_proc_type']) ? $_REQUEST['form_proc_type'] + 0 : 0; if (!$form_proc_type) { $form_proc_type = -1; } diff --git a/interface/orders/types.php b/interface/orders/types.php index 0ce6af501..0641d0a59 100644 --- a/interface/orders/types.php +++ b/interface/orders/types.php @@ -17,13 +17,13 @@ require_once("$srcdir/acl.inc"); // item ID to select) will be provided, and maintenance may also be permitted. $popup = empty($_GET['popup']) ? 0 : 1; -$order = formData('order', 'G') + 0; -$labid = formData('labid', 'G') + 0; +$order = isset($_GET['order']) ? $_GET['order'] + 0 : 0; +$labid = isset($_GET['labid']) ? $_GET['labid'] + 0 : 0; // If Save was clicked, set the result, close the window and exit. // if ($popup && $_POST['form_save']) { - $form_order = formData('form_order') + 0; + $form_order = isset($_GET['form_order']) ? $_GET['form_order'] + 0 : 0; $ptrow = sqlQuery("SELECT name FROM procedure_type WHERE " . "procedure_type_id = '$form_order'"); $name = addslashes($ptrow['name']); diff --git a/interface/patient_file/encounter/superbill_custom_full.php b/interface/patient_file/encounter/superbill_custom_full.php index 48d348e5e..084694b0b 100644 --- a/interface/patient_file/encounter/superbill_custom_full.php +++ b/interface/patient_file/encounter/superbill_custom_full.php @@ -58,7 +58,7 @@ if (isset($mode) && $thisauthwrite) { $modifier = $_POST['modifier']; $superbill = $_POST['form_superbill']; $related_code = $_POST['related_code']; - $cyp_factor = $_POST['cyp_factor'] + 0; + $cyp_factor = is_numeric($_POST['cyp_factor']) ? $_POST['cyp_factor'] + 0 : 0; $active = empty($_POST['active']) ? 0 : 1; $reportable = empty($_POST['reportable']) ? 0 : 1; // dx reporting $financial_reporting = empty($_POST['financial_reporting']) ? 0 : 1; // financial service reporting diff --git a/interface/reports/daily_summary_report.php b/interface/reports/daily_summary_report.php index 0065f3672..a31020142 100644 --- a/interface/reports/daily_summary_report.php +++ b/interface/reports/daily_summary_report.php @@ -366,7 +366,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d')); -- 2.11.4.GIT