From 8d8cc03ac3a2c51269a5fa48779f4514ca67770c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 22 Sep 2023 11:23:01 +0200
Subject: [PATCH] mvc: UrlField validation message cleanup

---
 .../mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php | 9 ++++++---
 src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml  | 3 +--
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml     | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php
index 1ba138ce9..2bcdc08fe 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php
@@ -42,9 +42,12 @@ class UrlField extends BaseField
     protected $internalIsContainer = false;
 
     /**
-     * @var string default validation message string
+     * {@inheritdoc}
      */
-    protected $internalValidationMessage = "invalid url";
+    protected function defaultValidationMessage()
+    {
+        return gettext('Invalid URL.');
+    }
 
     /**
      * retrieve field validators for this field type
@@ -54,7 +57,7 @@ class UrlField extends BaseField
     {
         $validators = parent::getValidators();
         if ($this->internalValue != null) {
-            $validators[] = new UrlValidator(array('message' => $this->internalValidationMessage));
+            $validators[] = new UrlValidator(['message' => $this->getValidationMessage()]);
         }
         return $validators;
     }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
index 6df90a9e2..267f75e2d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
@@ -4,8 +4,7 @@
     <description>Firewall aliases</description>
     <items>
         <geoip>
-            <url type="UrlField">
-            </url>
+            <url type="UrlField"/>
         </geoip>
         <aliases>
             <alias type=".\AliasField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 99279cc6e..be44bdc4a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -387,7 +387,6 @@
                             </filename>
                             <url type="UrlField">
                                 <Required>Y</Required>
-                                <ValidationMessage>This does not look like a valid url.</ValidationMessage>
                             </url>
                             <username type="TextField">
                                 <mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>