Only update the ACL if the user hasn't changed orgs.

Author: aaronweeden

classes/XDUser.php

@@ -2443,11 +2443,16 @@ public static function validateRID($rid)
     public function postLogin() {
         if (!$this->isSticky()) {
             $this->updatePerson();
-            // CampusChampionAclUpdater is defined in the xdmod-xsede module.
-            if (class_exists('\User\CampusChampionAclUpdater')) {
+            $orgHasChanged = $this->synchronizeOrganization();
+            // If the user hasn't changed organizations, check if they should
+            // be given the Campus Champion ACL (CampusChampionAclUpdater is
+            // defined in the xdmod-xsede module).
+            if (
+                !$orgHasChanged
+                && class_exists('\User\CampusChampionAclUpdater')
+            ) {
                 \User\CampusChampionAclUpdater::update($this);
             }
-            $this->synchronizeOrganization();
         }
         $this->currentToken = XDSessionManager::recordLogin($this);
     }
@@ -2461,10 +2466,14 @@ public function postLogin() {
      * to the admin / user notifying them that additional steps will need to be taken before their
      * former level of access is restored.
      *
+     * @return bool whether the user's organization had been updated.
      * @throws Exception
      */
     public function synchronizeOrganization()
     {
+        // Temporarily assume the user's organization has not been updated.
+        $orgHasChanged = false;
+
         // This is pulled from the moddb.Users.organization_id column for this user record.
         $actualOrganization = $this->getOrganizationID();
 
@@ -2480,6 +2489,7 @@ public function synchronizeOrganization()
 
         // If these don't match then the user's organization has been updated. Steps need to be taken.
         if ($actualOrganization !== $expectedOrganization) {
+            $orgHasChanged = true;
             $originalAcls = $this->getAcls(true);
 
             // if the user is currently assigned an acl that interacts with XDMoD's centers ( i.e.
@@ -2551,6 +2561,8 @@ public function synchronizeOrganization()
             $this->setOrganizationId($expectedOrganization);
             $this->saveUser();
         }
+
+        return $orgHasChanged;
     }
 
     /**