Remove the discovery URL pattern for now

A discovery URL could even take the form of a simple hostname (e.g., localhost), so we cannot even expect a dot inside the URL.
mstilkerich · Jan 14, 2023 · 1747d83 · 1747d83
1 parent 74683a8
commit 1747d83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/carddav.php b/carddav.php
@@ -39,7 +39,7 @@ class carddav extends rcube_plugin implements RcmInterface
      *
      * During development, it is set to the last release and added the suffix +dev.
      */
-    public const PLUGIN_VERSION = 'v5.0.0-beta1+dev';
+    public const PLUGIN_VERSION = 'v5.0.0';
 
     /**
      * Information about this plugin that is queried by roundcube.

diff --git a/src/Frontend/UI.php b/src/Frontend/UI.php
@@ -126,7 +126,6 @@ class UI
                         '',
                         [
                             'required' => '1',
-                            'pattern' => '^.*.\....*$',
                             'placeholder' => 'AccProps_discoveryurl_placeholder_lbl'
                         ]
                     ],
@@ -158,7 +157,6 @@ class UI
                         '',
                         [
                             // not required in the Account edit form because presets do not need discovery_url
-                            'pattern' => '^.*.\....*$',
                             'placeholder' => 'AccProps_discoveryurl_placeholder_lbl'
                         ]
                     ],

diff --git a/tests/Unit/UITest.php b/tests/Unit/UITest.php
@@ -207,7 +207,7 @@ public function accountIdProvider(): array
                     //  name             val                          type      flags (RDP)  placeholder
                     [ 'accountid',       '42',                        'hidden',    '',       null ],
                     [ 'accountname',     'Test Account',              'text',      'R',      null ],
-                    [ 'discovery_url',   'https://test.example.com/', 'text',      'P',      $lblDUrl ],
+                    [ 'discovery_url',   'https://test.example.com/', 'text',      '',       $lblDUrl ],
                     [ 'username',        'johndoe',                   'text',      '',       null ],
                     [ 'password',        null,                        'password',  '',       null ],
                     [ 'rediscover_time', '02:00:00',                  'text',      'RP',     $lblTime ],
@@ -225,7 +225,7 @@ public function accountIdProvider(): array
                     //  name             val                          type        flags (RDP)  placeholder
                     [ 'accountid',       'new',                       'hidden',   '',          null ],
                     [ 'accountname',     '',                          'text',     'R',         null ],
-                    [ 'discovery_url',   '',                          'text',     'RP',        $lblDUrl ],
+                    [ 'discovery_url',   '',                          'text',     'R',         $lblDUrl ],
                     [ 'username',        '',                          'text',     '',          null ],
                     [ 'password',        null,                        'password', '',          null ],
                     [ 'rediscover_time', '24:00:00',                  'text',     'RP',        $lblTime ],
@@ -242,7 +242,7 @@ public function accountIdProvider(): array
                     //  name             val                          type        flags (RDP)  placeholder
                     [ 'accountid',       '44',                        'hidden',   '',          null ],
                     [ 'accountname',     'Preset Contacts',           'text',     'R',         null ],
-                    [ 'discovery_url',   'https://carddav.example.com/', 'text',  'P',         $lblDUrl ],
+                    [ 'discovery_url',   'https://carddav.example.com/', 'text',  '',          $lblDUrl ],
                     [ 'username',        'foodoo',                    'text',     'D',         null ],
                     [ 'password',        null,                        'password', 'D',         null ],
                     [ 'rediscover_time', '24:00:00',                  'text',     'RP',        $lblTime ],