From b485bc8c6b85f94e9bf850440eda07224f34ddeb Mon Sep 17 00:00:00 2001 From: Arun Philip Date: Wed, 18 Dec 2024 23:28:04 -0500 Subject: [PATCH] attempt to fix issues reported in github --- src/ChurchCRM/Service/AppIntegrityService.php | 2 +- src/ChurchCRM/Service/FinancialService.php | 2 +- src/Include/Functions.php | 2 +- src/Reports/ClassAttendance.php | 2 +- src/Reports/ClassList.php | 2 +- src/Reports/PhotoBook.php | 2 +- src/Reports/PledgeSummary.php | 2 +- src/Reports/ReminderReport.php | 2 +- src/Reports/VotingMembers.php | 2 +- src/SelectDelete.php | 2 +- src/v2/templates/people/family-view.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ChurchCRM/Service/AppIntegrityService.php b/src/ChurchCRM/Service/AppIntegrityService.php index cb06a3fcdb..e5ba5a6bb4 100644 --- a/src/ChurchCRM/Service/AppIntegrityService.php +++ b/src/ChurchCRM/Service/AppIntegrityService.php @@ -72,7 +72,7 @@ public static function getIntegrityCheckMessage(): string AppIntegrityService::$IntegrityCheckDetails->message = gettext('The previous integrity check passed. All system file hashes match the expected values.'); } - return AppIntegrityService::$IntegrityCheckDetails->message; + return AppIntegrityService::$IntegrityCheckDetails->message ?? ''; } public static function getFilesFailingIntegrityCheck() diff --git a/src/ChurchCRM/Service/FinancialService.php b/src/ChurchCRM/Service/FinancialService.php index 4d6c709434..9d5af9cfc6 100644 --- a/src/ChurchCRM/Service/FinancialService.php +++ b/src/ChurchCRM/Service/FinancialService.php @@ -121,7 +121,7 @@ public function getPayments($depID = null): array $values->plg_FamID = $plg_FamID; $values->familyString = $family->getFamilyString(); $values->plg_FYID = $plg_FYID; - $values->FiscalYear = MakeFYString($plg_FYID); + $values->FiscalYear = MakeFYString($plg_FYID ? (int) $plg_FYID : null); $values->plg_date = $plg_date; $values->plg_amount = $plg_amount; $values->plg_schedule = $plg_schedule; diff --git a/src/Include/Functions.php b/src/Include/Functions.php index 4c3682af7d..958f006578 100644 --- a/src/Include/Functions.php +++ b/src/Include/Functions.php @@ -143,7 +143,7 @@ function PrintFYIDSelect(string $selectName, int $iFYID = null): void $selectedTag = ' selected'; } - $selectableOptions[] = sprintf(''; + $selectableOptions[] = sprintf(''; } $selectableOptions = [ diff --git a/src/Reports/ClassAttendance.php b/src/Reports/ClassAttendance.php index 3bc44e8daf..2f94e72bf2 100644 --- a/src/Reports/ClassAttendance.php +++ b/src/Reports/ClassAttendance.php @@ -18,7 +18,7 @@ $nGrps = count($aGrp); LoggerUtils::getAppLogger()->debug("Group ID = {$iGroupID}"); -$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int'); $tFirstSunday = InputUtils::legacyFilterInput($_GET['FirstSunday']); $tLastSunday = InputUtils::legacyFilterInput($_GET['LastSunday']); diff --git a/src/Reports/ClassList.php b/src/Reports/ClassList.php index a74e4a89d7..8fe0306096 100644 --- a/src/Reports/ClassList.php +++ b/src/Reports/ClassList.php @@ -17,7 +17,7 @@ $aGrp = explode(',', $iGroupID); $nGrps = count($aGrp); -$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int'); $dFirstSunday = InputUtils::legacyFilterInput($_GET['FirstSunday']); $dLastSunday = InputUtils::legacyFilterInput($_GET['LastSunday']); $withPictures = InputUtils::legacyFilterInput($_GET['pictures']); diff --git a/src/Reports/PhotoBook.php b/src/Reports/PhotoBook.php index 37598d69a9..0b2263d69a 100644 --- a/src/Reports/PhotoBook.php +++ b/src/Reports/PhotoBook.php @@ -15,7 +15,7 @@ $iGroupID = InputUtils::legacyFilterInput($_GET['GroupID']); $aGrp = explode(',', $iGroupID); -$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int'); class PdfPhotoBook extends ChurchInfoReport { diff --git a/src/Reports/PledgeSummary.php b/src/Reports/PledgeSummary.php index 1dd552014a..f3f68c14e5 100644 --- a/src/Reports/PledgeSummary.php +++ b/src/Reports/PledgeSummary.php @@ -15,7 +15,7 @@ // Filter Values $output = InputUtils::legacyFilterInput($_POST['output']); -$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int'); if (!$iFYID) { $iFYID = CurrentFY(); } diff --git a/src/Reports/ReminderReport.php b/src/Reports/ReminderReport.php index c7ffac9c4a..8b71676548 100644 --- a/src/Reports/ReminderReport.php +++ b/src/Reports/ReminderReport.php @@ -14,7 +14,7 @@ AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isFinanceEnabled()); // Get the Fiscal Year ID out of the query string -$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int'); if (!$iFYID) { $iFYID = CurrentFY(); } diff --git a/src/Reports/VotingMembers.php b/src/Reports/VotingMembers.php index 33aced8541..4824e284cc 100644 --- a/src/Reports/VotingMembers.php +++ b/src/Reports/VotingMembers.php @@ -9,7 +9,7 @@ use ChurchCRM\Utils\InputUtils; // Get the Fiscal Year ID out of the query string -$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int'); +$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int'); if (!$iFYID) { $iFYID = CurrentFY(); } diff --git a/src/SelectDelete.php b/src/SelectDelete.php index 7be404b383..40db289153 100644 --- a/src/SelectDelete.php +++ b/src/SelectDelete.php @@ -240,7 +240,7 @@     -   +         diff --git a/src/v2/templates/people/family-view.php b/src/v2/templates/people/family-view.php index 8b77f1eff3..167ddd46a6 100644 --- a/src/v2/templates/people/family-view.php +++ b/src/v2/templates/people/family-view.php @@ -15,7 +15,7 @@ $iFYID = CurrentFY(); if (array_key_exists('idefaultFY', $_SESSION)) { - $iFYID = MakeFYString($_SESSION['idefaultFY']); + $iFYID = MakeFYString((int) $_SESSION['idefaultFY']); } ?>