X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FAuth%2FSource%2FFSFDrupalAuth.php;h=69f60b473f2b26e4d9550c1bb477822c958bd9f7;hb=79ae195ecad22c0cea89a99276dc6af90ceff4db;hp=4f365ca625a6b2e4c294c1c6975cde2597b5d399;hpb=1ae1ff15baf7f1f54c5f1959d5028fad4466e39e;p=fsfdrupalauth.git

diff --git a/lib/Auth/Source/FSFDrupalAuth.php b/lib/Auth/Source/FSFDrupalAuth.php
index 4f365ca..69f60b4 100644
--- 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;
 
     /**
@@ -73,6 +72,7 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
     private $discussion_process_contrib_end_date;
     private $discussion_process_adhoc_access_group_id;
     private $discussion_process_adhoc_no_access_group_id;
+    private $discussion_process_donation_amount;
 
     /**
      * Constructor for this authentication source.
@@ -113,14 +113,14 @@ 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',
 		'discussion_process_contrib_start_date',
 		'discussion_process_contrib_end_date',
 		'discussion_process_adhoc_access_group_id',
-		'discussion_process_adhoc_no_access_group_id',]
+		'discussion_process_adhoc_no_access_group_id',
+		'discussion_process_donation_amount',]
 		as $param) {
 
             if (!array_key_exists($param, $config)) {
@@ -430,7 +430,7 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
 			}
 		}
 
-		if ($total >= 120) {
+		if ($total >= $this->discussion_process_donation_amount) {
 			return true;
 		} else {
 			return false;
@@ -473,7 +473,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 +493,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'];