Wording fix in form Exceptions

[flowspy] / flowspec / forms.py

diff --git a/flowspec/forms.py b/flowspec/forms.py
index c9efde5..f5741c6 100644 (file)
--- a/flowspec/forms.py
+++ b/flowspec/forms.py
@@ -41,7 +41,7 @@ class RouteForm(forms.ModelForm):
                         mail_body = "User %s %s (%s) attempted to set %s as the source address in a firewall rule" %(user.username, user.email, peer.peer_name, data)
                         send_mail(settings.EMAIL_SUBJECT_PREFIX + "Caught an attempt to set a protected IP/network as a source address",
                               mail_body, settings.SERVER_EMAIL,
-                              [settings.NOC_MAIL], fail_silently=True)
+                              settings.NOTIFY_ADMIN_MAILS, fail_silently=True)
                         raise forms.ValidationError("Not allowed")
                 if address.is_private:
                     private_error = True
@@ -71,7 +71,7 @@ class RouteForm(forms.ModelForm):
                         mail_body = "User %s %s (%s) attempted to set %s as the destination address in a firewall rule" %(user.username, user.email, peer.peer_name, data)
                         send_mail(settings.EMAIL_SUBJECT_PREFIX + "Caught an attempt to set a protected IP/network as the destination address",
                               mail_body, settings.SERVER_EMAIL,
-                              [settings.NOC_MAIL], fail_silently=True)
+                              settings.NOTIFY_ADMIN_MAILS, fail_silently=True)
                         raise forms.ValidationError("Not allowed")
                 if address.prefixlen < settings.PREFIX_LENGTH:
                     error = "Currently no prefix lengths < %s are allowed" %settings.PREFIX_LENGTH
@@ -123,7 +123,7 @@ class RouteForm(forms.ModelForm):
         if destinationports and not destination:
             raise forms.ValidationError('Once destination port is matched, destination has to be filled as well. Either deselect destination port or fill destination address')
         if not (source or sourceports or ports or destination or destinationports):
-            raise forms.ValidationError('Fill at least a Route Match Condition')
+            raise forms.ValidationError('Fill at least a Rule Match Condition')
         if not user.is_superuser and then[0].action not in settings.UI_USER_THEN_ACTIONS:
             raise forms.ValidationError('This action "%s" is not permitted' %(then[0].action))
         existing_routes = Route.objects.exclude(status='EXPIRED').exclude(status='PENDING').exclude(status='ERROR').exclude(status='ADMININACTIVE')