flattened conditionals (for simpler logic)

diff --git a/lib/Auth/Source/FSFDrupalAuth.php b/lib/Auth/Source/FSFDrupalAuth.php
index 32f5e1a98f943e1dd5d952518b49a541ff77d5a1..90586123a4c8b402080badcc30b78fe4fffd03cf 100644 (file)
--- a/lib/Auth/Source/FSFDrupalAuth.php
+++ b/lib/Auth/Source/FSFDrupalAuth.php
@@ -437,21 +437,25 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
        $gift_member_params = ['start_date' => $start_date, 'end_date' => $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' ) {
-               if ($compare_res($donation_query('query_nomination_process_adhoc', $adhoc_params), 1)) {
-                       $attributes['nomination_process'] = ['true'];
+       if ($this->nomination_process_active != 'true' ) {
+               $attributes['nomination_process'] = ['false'];
 
-               } elseif ($attributes['is_member'] == ['true']
-                   && ($nomination_process_analyze_history($donation_query('query_nomination_process_donations', $donation_params))
-                       || $compare_res($donation_query('query_nomination_process_gift_receipt', $gift_member_params), 1))) {
+       } elseif ($compare_res($donation_query('query_nomination_process_adhoc', $adhoc_params), 1)) {
+               $attributes['nomination_process'] = ['true'];
+
+       } elseif ($attributes['is_member'] != ['true']) {
+               Logger::debug('fsfdrupalauth:'.$this->authId.
+                       ': Not a member / comparable donor during window for board process.');
+               $attributes['nomination_process'] = ['false'];
+
+       } elseif ($nomination_process_analyze_history($donation_query('query_nomination_process_donations', $donation_params))
+               || $compare_res($donation_query('query_nomination_process_gift_receipt', $gift_member_params), 1)) {
+
+               $attributes['nomination_process'] = ['true'];
 
-                       $attributes['nomination_process'] = ['true'];
-               } else {
-                       Logger::debug('fsfdrupalauth:'.$this->authId.
-                               ': Not a member / comparable donor during window for board process.');
-                       $attributes['nomination_process'] = ['false'];
-               }
        } else {
+               Logger::debug('fsfdrupalauth:'.$this->authId.
+                       ': Not a member / comparable donor during window for board process.');
                $attributes['nomination_process'] = ['false'];
        }
 
@@ -467,27 +471,30 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
        $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)];
 
-       if ($this->discussion_process_active == 'true' ) {
-               if ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params_no), 1)) {
-                       Logger::debug('fsfdrupalauth:'.$this->authId.
-                               ': Nominee not eligible for board nominee discussion process.');
-                       $attributes['discussion_process'] = ['false'];
+       if ($this->discussion_process_active != 'true' ) {
+               $attributes['discussion_process'] = ['false'];
 
-               } elseif ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params), 1)) {
-                       $attributes['discussion_process'] = ['true'];
+       } elseif ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params_no), 1)) {
+               Logger::debug('fsfdrupalauth:'.$this->authId.
+                       ': Nominee not eligible for board nominee discussion process.');
+               $attributes['discussion_process'] = ['false'];
 
-               } elseif ($attributes['is_member'] == ['true']
-                   && ($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))) {
+       } elseif ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params), 1)) {
+               $attributes['discussion_process'] = ['true'];
 
-                       $attributes['discussion_process'] = ['true'];
+       } elseif ($attributes['is_member'] != ['true']) {
+               Logger::debug('fsfdrupalauth:'.$this->authId.
+                       ': Not eligible for board nominee discussion process.');
+               $attributes['discussion_process'] = ['false'];
+
+       } elseif ($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)) {
+
+               $attributes['discussion_process'] = ['true'];
 
-               } else {
-                       Logger::debug('fsfdrupalauth:'.$this->authId.
-                               ': Not eligible for board nominee discussion process.');
-                       $attributes['discussion_process'] = ['false'];
-               }
        } else {
+               Logger::debug('fsfdrupalauth:'.$this->authId.
+                       ': Not eligible for board nominee discussion process.');
                $attributes['discussion_process'] = ['false'];
        }