ovpnmain.cgi: Allow to disable the fallback cipher

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 8aa723c53be9fef24224fa65534f3e1872df5d41..1ab7fc2401b82b96649461ebde9d235eb4be965e 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -23,7 +23,6 @@ WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: Daily
-WARNING: translation string unused: Disabled
 WARNING: translation string unused: Existing Files
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule

diff --git a/doc/language_issues.en b/doc/language_issues.en
index e19a88f1249ef182e6e06c9366ad46d993c72253..7573b35ce70e8e10e6ea326ce2068d6756cac81f 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -57,6 +57,7 @@ WARNING: untranslated string: ConnSched shutdown = Shutdown
 WARNING: untranslated string: ConnSched time = Time:
 WARNING: untranslated string: ConnSched up = Up
 WARNING: untranslated string: ConnSched weekdays = Days of the week:
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Edit an existing route = Edit an existing route
 WARNING: untranslated string: Enter TOS = Activate or deactivate TOS-bits <br /> and then press <i>Save</i>.
 WARNING: untranslated string: Level7 Protocol = Level7-Protocol

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6fd50a633372285f70022d1d73d4acf6f93141fe..11ee46ba7d0326f8f601fec3fa39eac66c7faf57 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -24,7 +24,6 @@ WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: Daily
-WARNING: translation string unused: Disabled
 WARNING: translation string unused: Existing Files
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 748ad2787cf490e1280982500eb645ceb971bbd2..07fd48d4a31dac8700ead408625c92c2f92ad6c7 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -27,7 +27,6 @@ WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: Daily
-WARNING: translation string unused: Disabled
 WARNING: translation string unused: Existing Files
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule

diff --git a/doc/language_issues.it b/doc/language_issues.it
index fc4c16b8032de6190e5b98ac6f4758715522b093..ff5025cc40629ca3f5b41b4547d4eefb46d443d8 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -932,6 +932,7 @@ WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG
 WARNING: untranslated string: Captive valid for = Valid for
 WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
 WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: access point name = Access Point Name

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index db267a1bff82204ceef63b44275283750be93aea..371605b8ea5a73feaa50d60c3d0df87d801c2c86 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -932,6 +932,7 @@ WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG
 WARNING: untranslated string: Captive valid for = Valid for
 WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
 WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: access point name = Access Point Name

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index f920da669c6dc223dc56d3ee87f22d32899737a1..2da3f6de93db34f8c7a49d78e764748e156e0207 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -846,6 +846,7 @@ WARNING: untranslated string: ConnSched dial = Connect
 WARNING: untranslated string: ConnSched hangup = Disconnect
 WARNING: untranslated string: ConnSched reboot = Reboot
 WARNING: untranslated string: ConnSched shutdown = Shutdown
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MB read = MB read
 WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7651a77b695fd088d098c4b60d29bc27d005c891..217e0ca566d941bce4bcc79aed6d4e96338eba31 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -840,6 +840,7 @@ WARNING: untranslated string: ConnSched dial = Connect
 WARNING: untranslated string: ConnSched hangup = Disconnect
 WARNING: untranslated string: ConnSched reboot = Reboot
 WARNING: untranslated string: ConnSched shutdown = Shutdown
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Edit an existing route = Edit an existing route
 WARNING: untranslated string: MB read = MB read
 WARNING: untranslated string: MB written = MB written

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index eb565bfba70314429566ba8a7fa94f5293c6cb9a..9674b3d7bb44a7237347891a30d40b19741d5efb 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -927,6 +927,7 @@ WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: Captive delete logo = Delete Logo
+WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: access point name = Access Point Name
 WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
 WARNING: untranslated string: access point name is required = Access Point Name is required

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index a80aaad79929b4f206b38bbe5876dcc3a12d25a1..2e15d146d950a6443b5ccb7d26aaf4f09e47dd64 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2619,6 +2619,7 @@ ADV_ERROR:
 
                                        <td>
                                                <select name='DCIPHER'>
+                                                       <option value='' $selected{'DCIPHER'}{''}>- $Lang::tr{'Disabled'} -</option>
                                                        <option value='AES-256-GCM' $selected{'DCIPHER'}{'AES-256-GCM'}>AES-GCM (256 $Lang::tr{'bit'})</option>
                                                        <option value='AES-192-GCM' $selected{'DCIPHER'}{'AES-192-GCM'}>AES-GCM (192 $Lang::tr{'bit'})</option>
                                                        <option value='AES-128-GCM' $selected{'DCIPHER'}{'AES-128-GCM'}>AES-GCM (128 $Lang::tr{'bit'})</option>