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 e8d5a2e0879d580d97e2c3d5406763514ffe1f18..ae97866213c995957150e26ca7b39a427bc66e1c 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: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP

diff --git a/doc/language_issues.en b/doc/language_issues.en
index c9e9cd89a2697c5c9e131bf4c12e552a12722027..75a9072057b668ff20a53bc3a2ca4785bb347d6b 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: Existing Files = Files in database

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 76f66584771e2535955f9ff77f9de213efb4b32e..5cb79aaa2a25a975fd235178b7b7f753163d251b 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -25,7 +25,6 @@ WARNING: translation string unused: Client status and controlc
 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: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4691add7b724bd81aaa60c228f31659a9bff712f..693fe5bbe29cb592145062423c89aee8774339f5 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: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP

diff --git a/doc/language_issues.it b/doc/language_issues.it
index ef92c6853e1fe7f370655f952d21560fa883a9e5..1a31b76861520902a96ac31f08657edc48ddbce2 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -917,6 +917,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 ext = 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: Scan for Songs = unknown string

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9a699f6960bb638af3dde5fd5c16a6e8823ffad2..df4b3aa6610a598304187e7e0ffbc9165a443511 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -918,6 +918,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 ext = 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: Scan for Songs = unknown string

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 14982746cb49f0b8e46d945975fb319a6ecd1c2d..648cb87ebbe48f9750c450edcce00287d8b5c259 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -832,6 +832,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 39616a331faff8ca079f2596ee78f3c7383efa77..d7cc9da973c55cf9a3760a2320a0da6a4d691df4 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -826,6 +826,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 6b42b8f80c527a715b83bfde4308aabefd41b9a8..ac48910d4e0b53454c57b384dc9d41ed20ec7a9c 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -913,6 +913,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: Scan for Songs = unknown string
 WARNING: untranslated string: access point name = Access Point Name
 WARNING: untranslated string: access point name is invalid = Access Point Name is invalid

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 0d238b6b75e636bccba7790ccd01488c1fdc1946..678281c6155f0b31e77a60014075316fa9b0043c 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2618,6 +2618,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>