Merge pull request #17 from jordandukart/8.x-1.x

D9 compat.

Author: adam-vessey

embargoes.info.yml

@@ -1,6 +1,6 @@
 name: Embargoes
 description: 'A module for managing embargo policies with access restrictions on content.'
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - menu_ui

modules/embargoes_log_views/embargoes_log_views.info.yml

@@ -1,7 +1,7 @@
 name: Embargoes Log Views
 description: 'Provides views for embargo logs.'
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - embargoes
   - views

src/Form/EmbargoesIpRangeEntityForm.php

@@ -69,6 +69,9 @@ public function form(array $form, FormStateInterface $form_state) {
       '#default_value' => implode('|', $range->getRanges()),
       '#description' => $this->t("IP range to be used. Please list in CIDR format, and separate multiple ranges with a '|'."),
       '#required' => TRUE,
+      '#element_validate' => [
+        '::validateIpRanges',
+      ],
     ];
 
     $form['proxy_url'] = [
@@ -82,6 +85,24 @@ public function form(array $form, FormStateInterface $form_state) {
     return $form;
   }
 
+  /**
+   * Validates the IP range entered.
+   *
+   * @param array $element
+   *   An array representing the element.
+   * @param Drupal\Core\Form\FormStateInterface $form_state
+   *   The Drupal form state.
+   */
+  public function validateIpRanges(array $element, FormStateInterface $form_state) {
+    $errors = $this->ipRanges->detectIpRangeStringErrors(array_map('trim', explode('|', trim($form_state->getValue('range')))));
+    if (!empty($errors)) {
+      $form_state->setError($element, $this->t('Problems detected with the %label IP Range. <br/>Errors: %errors', [
+        '%label' => $this->entity->label(),
+        '%errors' => implode(", ", $errors),
+      ]));
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -91,22 +112,13 @@ public function save(array $form, FormStateInterface $form_state) {
     $range->setProxyUrl($form_state->getValue('proxy_url'));
     $status = $range->save();
 
-    $errors = $this->ipRanges->detectIpRangeStringErrors(array_map('trim', explode('|', trim($form_state->getValue('range')))));
-    if (!$errors) {
-      switch ($status) {
-        case SAVED_NEW:
-          $this->messenger()->addMessage($this->t('Created the %label IP Range.', ['%label' => $range->label()]));
-          break;
-
-        default:
-          $this->messenger()->addMessage($this->t('Saved the %label IP Range.', ['%label' => $range->label()]));
-      }
-    }
-    else {
-      drupal_set_message("Problems detected with the {$range->label()} IP Range.", 'error');
-      foreach ($errors as $error) {
-        drupal_set_message("Error: {$error}.", 'error');
-      }
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label IP Range.', ['%label' => $range->label()]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label IP Range.', ['%label' => $range->label()]));
     }
     $form_state->setRedirectUrl($range->toUrl('collection'));
   }