rebase

plugins/tasks/Notifications.php

@@ -62,7 +62,6 @@ class Notifications implements EndpointInterface
     foreach ($notificationsSubTasks as $task) {
       // If the tasks must be treated - status and scheduled - process the sub-tasks
       if ($this->gateway->statusAndScheduleCheck($task)) {
-
         // Retrieve data from the main task
         $notificationsMainTask     = $this->getNotificationsMainTask($task['fdtasksgranularmaster'][0]);
         $notificationsMainTaskName = $task['fdtasksgranularmaster'][0];
@@ -99,26 +98,26 @@ class Notifications implements EndpointInterface
 
   private function getMatchingAttrs (array $notificationsMainTask, array $task): array
   {
-    // Simply retrieve the list of audited attributes
-    $auditAttributes = $this->decodeAuditAttributes($task);
+      // Simply retrieve the list of audited attributes
+      $auditAttributes = $this->decodeAuditAttributes($task);
 
-    // Recovering monitored attributes list from the defined notification task.
-    $monitoredAttrs = $notificationsMainTask[0]['fdtasksnotificationsattributes'];
-    // Reformat supann
-    $monitoredSupannResource = $this->getSupannResourceState($notificationsMainTask[0]);
+      // Recovering monitored attributes list from the defined notification task.
+      $monitoredAttrs = $notificationsMainTask[0]['fdtasksnotificationsattributes'];
+      // Reformat supann
+      $monitoredSupannResource = $this->getSupannResourceState($notificationsMainTask[0]);
 
-    // Simply remove keys with 'count' reported by ldap.
-    $this->gateway->unsetCountKeys($monitoredAttrs);
-    $this->gateway->unsetCountKeys($monitoredSupannResource);
+      // Simply remove keys with 'count' reported by ldap.
+      $this->gateway->unsetCountKeys($monitoredAttrs);
+      $this->gateway->unsetCountKeys($monitoredSupannResource);
 
-    // Find matching attributes between audited and monitored attributes
-    $matchingAttrs = Utils::findMatchingKeys($auditAttributes, $monitoredAttrs);
+      // Find matching attributes between audited and monitored attributes
+      $matchingAttrs = $this->findMatchingAttributes($auditAttributes, $monitoredAttrs);
 
-    // Verify Supann resource state if applicable
-    if ($this->shouldVerifySupannResource($monitoredSupannResource, $auditAttributes)) {
-      // Adds it to the mating attrs for further notification process.
-      $matchingAttrs[] = 'supannRessourceEtat';
-    }
+      // Verify Supann resource state if applicable
+      if ($this->shouldVerifySupannResource($monitoredSupannResource, $auditAttributes)) {
+          // Adds it to the mating attrs for further notification process.
+          $matchingAttrs[] = 'supannRessourceEtat';
+      }
 
       return $matchingAttrs;
   }
@@ -188,7 +187,7 @@ class Notifications implements EndpointInterface
     }
 
     // Get all the values only of a multidimensional array.
-    $auditedValues = Utils::getArrayValuesRecursive($auditedAttrs);
+    $auditedValues = $this->getArrayValuesRecursive($auditedAttrs);
     return in_array($monitoredSupannState, $auditedValues);
   }