Merge branch 'release-11.0' into dev

Author: demiankatz

module/VuFind/src/VuFind/Auth/Manager.php

@@ -790,6 +790,11 @@ public function updatePassword(Request $request): UserEntityInterface
     public function resetPassword(array $recoveryData, array $params)
     {
         $this->getAuth()->resetPassword($recoveryData, $params);
+        $this->auditEventService->addEvent(
+            AuditEventType::User,
+            AuditEventSubType::PasswordReset,
+            data: compact('recoveryData', 'params')
+        );
     }
 
     /**

module/VuFind/src/VuFind/Db/Type/AuditEventSubtype.php

@@ -72,6 +72,7 @@ enum AuditEventSubtype: string
     case LoginFailure = 'login_fail';
     case Logout = 'logout';
     case PasswordChanged = 'password_changed';
+    case PasswordReset = 'password_reset';
     case RememberLogin = 'remember_login';
     case SaveSearch = 'save_search';
     case ScheduleSearch = 'schedule_search';

module/VuFind/src/VuFind/ILS/Driver/Folio.php

@@ -2460,20 +2460,23 @@ public function placeHold($holdDetails)
         if (!empty($holdDetails['comment'])) {
             $requestBody['patronComments'] = $holdDetails['comment'];
         }
-        $allowed = $this->getAllowedServicePoints(
+        $allowedServicePoints = $fulfillmentValue == 'Delivery' ? null : $this->getAllowedServicePoints(
             $instance->id,
             $holdDetails['item_id'] ?? null,
             $holdDetails['patron']['id']
         );
         $preferredRequestType = $this->getPreferredRequestType($holdDetails);
         foreach ($this->getRequestTypeList($preferredRequestType) as $requestType) {
             // Skip illegal request types, if we have validation data available:
-            if (null !== $allowed) {
+            if (null !== $allowedServicePoints) {
                 if (
                     // Unsupported request type:
-                    !isset($allowed[$requestType])
+                    !isset($allowedServicePoints[$requestType])
                     // Unsupported pickup location:
-                    || !in_array($holdDetails['pickUpLocation'], array_column($allowed[$requestType] ?? [], 'id'))
+                    || !in_array(
+                        $holdDetails['pickUpLocation'],
+                        array_column($allowedServicePoints[$requestType] ?? [], 'id')
+                    )
                 ) {
                     continue;
                 }