From 32c7abacb4039595ddb8f280158397d70a3d390b Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Tue, 25 Apr 2023 15:28:32 -0400 Subject: [PATCH] fixed references to undeclared / undefined vars --- lib/Auth/Source/FSFDrupalAuth.php | 35 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/Auth/Source/FSFDrupalAuth.php b/lib/Auth/Source/FSFDrupalAuth.php index 9058612..b9b808a 100644 --- a/lib/Auth/Source/FSFDrupalAuth.php +++ b/lib/Auth/Source/FSFDrupalAuth.php @@ -349,6 +349,13 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase return false; }; + // set dates here, used by helper functions below + $nomination_process_start_date = $this->nomination_process_contrib_start_date; + $nomination_process_end_date = $this->nomination_process_contrib_end_date; + $discussion_process_start_date = $this->discussion_process_contrib_start_date; + $discussion_process_end_date = $this->discussion_process_contrib_end_date; + + // looks for memberships / comparable donations in time window. also // looks for a membership or donation (included as a param) that // occurred up to a year before, and that would have carried over into @@ -356,12 +363,12 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase // the person was, or would have been, a member during the configured // time window. $nomination_process_analyze_history = function ($selective_donations_history) - use ($start_date, $end_date) { + use ($nomination_process_start_date, $nomination_process_end_date) { $eligible = false; - $start_date_obj = new \DateTime($start_date); - $end_date_obj = new \DateTime($end_date); + $start_date_obj = new \DateTime($nomination_process_start_date); + $end_date_obj = new \DateTime($nomination_process_end_date); foreach ($selective_donations_history as $row) { @@ -400,13 +407,13 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase }; $discussion_process_analyze_history = function ($selective_donations_history) - use ($start_date, $end_date) { + use ($discussion_process_start_date, $discussion_process_end_date) { $eligible = false; $total = 0; - $start_date_obj = new \DateTime($start_date); - $end_date_obj = new \DateTime($end_date); + $start_date_obj = new \DateTime($discussion_process_start_date); + $end_date_obj = new \DateTime($discussion_process_end_date); foreach ($selective_donations_history as $row) { @@ -414,7 +421,7 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase $member_type_id = $row['member_type_id']; $receive_date_obj = new \DateTime($row['receive_date']); - if (($receive_date_obj > $start_date_obj) && ($receive_date < $end_date_obj)) { + if (($receive_date_obj > $start_date_obj) && ($receive_date_obj < $end_date_obj)) { $total += $amount; } } @@ -430,11 +437,8 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase // nomination form participation specific checks // - $start_date = $this->nomination_process_contrib_start_date; - $end_date = $this->nomination_process_contrib_end_date; - - $donation_params = ['start_date' => $start_date, 'end_date' => $end_date]; - $gift_member_params = ['start_date' => $start_date, 'end_date' => $end_date, 'gift_redeem_page_id' => intval($this->gift_redeem_page_id)]; + $donation_params = ['start_date' => $nomination_process_start_date, 'end_date' => $nomination_process_end_date]; + $gift_member_params = ['start_date' => $nomination_process_start_date, 'end_date' => $nomination_process_end_date, 'gift_redeem_page_id' => intval($this->gift_redeem_page_id)]; $adhoc_params = ['adhoc_access_group_id' => intval($this->nomination_process_adhoc_access_group_id)]; if ($this->nomination_process_active != 'true' ) { @@ -463,11 +467,8 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase // discussion form participation specific checks // - $start_date = $this->discussion_process_contrib_start_date; - $end_date = $this->discussion_process_contrib_end_date; - - $donation_params = ['start_date' => $start_date, 'end_date' => $end_date]; - $gift_member_params = ['start_date' => $start_date, 'end_date' => $end_date, 'gift_redeem_page_id' => intval($this->gift_redeem_page_id)]; + $donation_params = ['start_date' => $discussion_process_start_date, 'end_date' => $discussion_process_end_date]; + $gift_member_params = ['start_date' => $discussion_process_start_date, 'end_date' => $discussion_process_end_date, 'gift_redeem_page_id' => intval($this->gift_redeem_page_id)]; $adhoc_params = ['adhoc_access_group_id' => intval($this->discussion_process_adhoc_access_group_id)]; $adhoc_params_no = ['adhoc_access_group_id' => intval($this->discussion_process_adhoc_no_access_group_id)]; -- 2.25.1