From dbeb7efb5af435a9863f31dfb80c67bb92434f96 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 15 Apr 2013 16:53:13 -0700
Subject: [PATCH] CRM-12272 Fixed logic so that form rule ensures that EITHER
 custom_pre OR custom_post is an individual profile. Previously the code was
 throwing form rule error when custom_post was NOT type individual even though
 custom_pre was. However, the complete fix is to check for first + last name
 profile fields when Allow multiple registrations from same email is checked.
 Will file issue for that for 4.4.

----------------------------------------
* CRM-12272: Validation for required profile fields in event registration ignores 'extra' profiles
  http://issues.civicrm.org/jira/browse/CRM-12272
---
 CRM/Event/Form/ManageEvent/Registration.php | 56 +++++++++++----------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php
index 7703f7a4bb..de98f711e7 100644
--- a/CRM/Event/Form/ManageEvent/Registration.php
+++ b/CRM/Event/Form/ManageEvent/Registration.php
@@ -529,37 +529,41 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
         else {
           $isPreError = FALSE;
         }
-        //check for additional custom post profile
-        $additionalCustomPostId = CRM_Utils_Array::value('additional_custom_post_id', $values);
-        if (!empty($additionalCustomPostId)) {
-          if (!($additionalCustomPostId == 'none')) {
-            $customPostId = $additionalCustomPostId;
+        
+        // We don't have required Individual fields in the pre-custom profile, so now check the post-custom profile
+        if ($isPreError) {
+          $additionalCustomPostId = CRM_Utils_Array::value('additional_custom_post_id', $values);
+          if (!empty($additionalCustomPostId)) {
+            if (!($additionalCustomPostId == 'none')) {
+              $customPostId = $additionalCustomPostId;
+            }
+            else {
+              $isPostError = FALSE;
+            }
           }
           else {
-            $isPostError = FALSE;
+            $customPostId = CRM_Utils_Array::value('custom_post_id', $values) ? $values['custom_post_id'] : NULL;
           }
-        }
-        else {
-          $customPostId = CRM_Utils_Array::value('custom_post_id', $values) ? $values['custom_post_id'] : NULL;
-        }
-        //check whether the additional custom post profile is of type 'Individual' and its subtypes
-        if (!empty($customPostId)) {
-          $profileTypes = CRM_Core_BAO_UFGroup::profileGroups($customPostId);
-          foreach ($types as $individualTypes) {
-            if (in_array($individualTypes, $profileTypes)) {
-              $isPostError = FALSE;
-              break;
+          //check whether the additional custom post profile is of type 'Individual' and its subtypes
+          if (!empty($customPostId)) {
+            $profileTypes = CRM_Core_BAO_UFGroup::profileGroups($customPostId);
+            foreach ($types as $individualTypes) {
+              if (in_array($individualTypes, $profileTypes)) {
+                $isPostError = FALSE;
+                break;
+              }
             }
           }
-        }
-        else {
-          $isPostError = FALSE;
-        }
-        if ($isPreError || (empty($customPreId) && empty($customPostId))) {
-          $errorMsg['additional_custom_pre_id'] = ts("Allow multiple registrations from the same email address requires a profile of type 'Individual'");
-        }
-        if ($isPostError) {
-          $errorMsg['additional_custom_post_id'] = ts("Allow multiple registrations from the same email address requires a profile of type 'Individual'");
+          else {
+            $isPostError = FALSE;
+          }
+
+          if (empty($customPreId) && empty($customPostId)) {
+            $errorMsg['additional_custom_pre_id'] = ts("Allow multiple registrations from the same email address requires a profile of type 'Individual'");
+          }
+          if ($isPostError) {
+            $errorMsg['additional_custom_post_id'] = ts("Allow multiple registrations from the same email address requires a profile of type 'Individual'");
+          }
         }
       }
       if (!$isProfileComplete) {
-- 
2.25.1