remove redundant gift membership check

[fsfdrupalauth.git] / lib / Auth / Source / FSFDrupalAuth.php

diff --git a/lib/Auth/Source/FSFDrupalAuth.php b/lib/Auth/Source/FSFDrupalAuth.php
index 4f365ca625a6b2e4c294c1c6975cde2597b5d399..44f33350d4327379f4713edcd516c5f5b4d26b89 100644 (file)
--- a/lib/Auth/Source/FSFDrupalAuth.php
+++ b/lib/Auth/Source/FSFDrupalAuth.php
@@ -51,7 +51,6 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
 
     private $query_discussion_process_old_membership;
     private $query_discussion_process_donations;
-    private $query_discussion_process_gift_receipt;
     private $query_discussion_process_adhoc;
 
     /**
@@ -113,7 +112,6 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
 
                'query_discussion_process_old_membership',
                'query_discussion_process_donations',
-               'query_discussion_process_gift_receipt',
                'query_discussion_process_adhoc',
 
                'discussion_process_active',
@@ -473,7 +471,6 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
 
        $donation_params    = ['start_date' => $discussion_process_start_date, 'end_date' => $discussion_process_end_date];
        $old_member_params  = $donation_params;
-       $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)];
 
@@ -494,8 +491,7 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
                $attributes['discussion_process'] = ['false'];
 
        } elseif ($compare_res($old_membership_query('query_discussion_process_old_membership', $old_member_params), 1)
-               || $discussion_process_analyze_history($donation_query('query_discussion_process_donations', $donation_params))
-               || $compare_res($donation_query('query_discussion_process_gift_receipt', $gift_member_params), 1)) {
+               || $discussion_process_analyze_history($donation_query('query_discussion_process_donations', $donation_params))) {
 
                $attributes['discussion_process'] = ['true'];