TandemPlugin: Fixed matching query for gender search

git-svn-id: https://server2.data-quest.de/svn/studip-plugins/TandemPlugin@2509 6a1f69d7-6018-4d13-bf90-b098e98c258d

classes/TandemMatching.class.php

@@ -39,6 +39,8 @@ class TandemMatching
         $request_gender = null;
         
         if($tandem_request->gender and TandemPlugin::isGenderSearchEnabled()) {
+            //If gender search is enabled and a gender preference is set
+            //we must filter for those settings.
             if($tandem_request->gender == 'm') {
                 $request_gender = 1;
             } elseif($tandem_request->gender == 'w') {
@@ -122,12 +124,36 @@ class TandemMatching
         ];
         
         if($request_gender) {
+            //The offere must have the gender the requester wishes.
             $sql .= 'AND user_info.geschlecht = :request_gender ';
             $sql_params['request_gender'] = $request_gender;
         }
         
+        if(TandemPlugin::isGenderSearchEnabled()) {
+            //The requester must have the gender the offerer wishes.
+            $requester_gender = $tandem_request->user->geschlecht;
+            
+            //convert Stud.IP gender to TandemPlugin gender:
+            if($requester_gender == '1') {
+                $requester_gender = 'm';
+            } elseif($requester_gender == '2') {
+                $requester_gender = 'w';
+            } else {
+                $requester_gender = '';
+            }
+            
+            if($requester_gender != '') {
+                //Only in cases where the gender is relevant
+                //we must extend the SQL query and check if the offerer
+                //wants requests from users with the requester's gender:
+                $sql .= "AND tandem_profiles.gender IN ( '', :requester_gender ) ";
+                $sql_params['requester_gender'] = $requester_gender;
+            }
+        }
+        
+        
         if($offer_user_id != null) {
-            $sql .= 'AND tandem_profiles.user_Id = :offer_user_id ';
+            $sql .= 'AND tandem_profiles.user_id = :offer_user_id ';
             $sql_params['offer_user_id'] = $offer_user_id;
         }
         

controllers/pair.php

@@ -69,13 +69,6 @@ class PairController extends PluginController
                 )
             );
             
-            $this->redirect(
-                PluginEngine::getURL(
-                    $this->plugin,
-                    [],
-                    'my_tandems/index'
-                )
-            );
             return;
         } elseif($num_matching_requests == 1) {
             //Only one matching request: