dev/core#5422 Fix no full message showing up for logged in registered users

Author: eileenmcnaughton

CRM/Event/Form/Registration/ParticipantConfirm.php

@@ -199,6 +199,8 @@ public function postProcess() {
 
       $this->postProcessHook();
       CRM_Core_Session::setStatus($statusMessage);
+      // The noFullMsg here is about suppressing the event full message as the person
+      // is potentially just being bounced to that screen.
       CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/event/info',
           "reset=1&id={$this->_eventId}&noFullMsg=1",
           FALSE, NULL, FALSE, TRUE

CRM/Event/Form/Registration/Register.php

@@ -984,6 +984,7 @@ public static function checkRegistration($fields, $form, $isAdditional = FALSE)
             }
             $status .= ' ' . ts('You can also <a href="%1">register another participant</a>.', [1 => $registerUrl]);
             CRM_Core_Session::singleton()->setStatus($status, '', 'alert');
+            // @todo - pass cid=0 in the url & remove noFullMsg here.
             $url = CRM_Utils_System::url('civicrm/event/info',
               "reset=1&id={$form->_values['event']['id']}&noFullMsg=true"
             );

CRM/Event/Form/SelfSvcUpdate.php

@@ -317,6 +317,8 @@ public function cancelParticipant($params) {
     if (!empty($this->isBackoffice)) {
       return;
     }
+    // The noFullMsg here is about suppressing the event full message as the person
+    // is potentially just being bounced to that screen.
     $url = CRM_Utils_System::url('civicrm/event/info', "reset=1&id={$this->_event_id}&noFullMsg=true");
     CRM_Utils_System::redirect($url);
   }

CRM/Event/Page/EventInfo.php

@@ -49,9 +49,6 @@ public function run() {
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks($this->_id));
     $this->assign('isShowICalIconsInline', TRUE);
 
-    // Sometimes we want to suppress the Event Full msg
-    $noFullMsg = CRM_Utils_Request::retrieve('noFullMsg', 'String', $this, FALSE, 'false');
-
     //retrieve event information
     $params = ['id' => $this->_id];
     $values = ['event' => NULL];
@@ -271,17 +268,25 @@ public function run() {
     $this->assign('registerClosed', !empty($values['event']['is_online_registration']) && !$isEventOpenForRegistration && CRM_Core_Permission::check('register for events'));
     $this->assign('allowRegistration', $allowRegistration);
 
-    $session = CRM_Core_Session::singleton();
-    $params = [
-      'contact_id' => $session->get('userID'),
-      'event_id' => $values['event']['id'] ?? NULL,
-      'role_id' => $values['event']['default_role_id'] ?? NULL,
-    ];
-
-    if (($this->isEventFull() && $noFullMsg === 'false') || CRM_Event_BAO_Event::checkRegistration($params)) {
-      $statusMessage = $this->getEventValue('event_full_text');
-      if (CRM_Event_BAO_Event::checkRegistration($params)) {
-        if ($noFullMsg == 'false') {
+    $isAlreadyRegistered = $this->isAlreadyRegistered();
+    // noFullMsg was originally passed in to suppress the message about the event being full. The intent
+    // was originally such that when you were sending the user back to the info page after registering
+    // they would not be told it was full. Along the way it got overloaded to encompass
+    // the scenario where the user is potentially trying to register another user & hence became very confusing.
+    // We could probably make this make more sense by
+    // 1) always passing cid in the url if the person is being redirected to register another person
+    // and using that rather than the logged in use to check for existing registrations
+    // 2) using a more positive 'you are registered' message rather than making it
+    // sound like a mistake.
+    // 3) using the normal button to pass cid=0 information rather than a link.
+    $noFullMsg = CRM_Utils_Request::retrieve('noFullMsg', 'String', $this, FALSE, 'false');
+    $isSuppressEventFullMessage = $noFullMsg !== 'false';
+    $statusMessage = ($this->isEventFull() && !$isSuppressEventFullMessage && !$isAlreadyRegistered) ? $this->getEventValue('event_full_text') : '';
+    if (($this->isEventFull() && $noFullMsg === 'false') || $isAlreadyRegistered) {
+      if ($isAlreadyRegistered) {
+        // @todo - this usage of `$isSuppressEventFullMessage` is where the historical mis-use makes it
+        // confusing - better use of cid in the url would help.
+        if (!$isSuppressEventFullMessage) {
           if ($values['event']['allow_same_participant_emails']) {
             $statusMessage = ts('It looks like you are already registered for this event.  You may proceed if you want to create an additional registration.');
           }
@@ -377,4 +382,19 @@ public function getPriceSetID(): ?int {
     return NULL;
   }
 
+  /**
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  public function isAlreadyRegistered(): bool {
+    $params = [
+      // @todo - instead of just checking logged in user check for cid=0 or an integer
+      // in the url. (For zero there should be no check).
+      'contact_id' => CRM_Core_Session::getLoggedInContactID(),
+      'event_id' => $this->getEventID(),
+      'role_id' => $this->getEventValue('default_role_id'),
+    ];
+    return CRM_Event_BAO_Event::checkRegistration($params);
+  }
+
 }

Civi/Test/PageWrapper.php

@@ -11,8 +11,6 @@
 
 namespace Civi\Civi\Test;
 
-use Civi\Api4\Utils\ReflectionUtils;
-
 class PageWrapper {
 
   /**

tests/phpunit/CRM/Event/Page/EventInfoTest.php

@@ -5,7 +5,6 @@
 class CRM_Event_Page_EventInfoTest extends CiviUnitTestCase {
   use EventTestTrait;
 
-
   public function tearDown(): void {
     $this->quickCleanUpFinancialEntities();
     parent::tearDown();