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 f593f0f20804607138f09ee26ec305dcc1e49c4a..6a4ee84ca0aa95afa4278db254fcfb5c5eb3f28a 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 2bc0f4cf8ec67690a40678d5fc08899b1035b945..18591b0e94516ffaa45714d594d715ed8580e428 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 7439468c83985fa11b9c1567557447b9cbd6c8a8..17b0a57faa0d5f0eed1a1905424cace0c9d11958 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 5cdeb74c422a8654331f6b2016ff4706a06ecb00..6ddab43954c30151389a54296abf4a5a615ce33c 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 5c0b3e9998cdc7f75dbb28e0898750a70941aa90..5626918ae16cd6caaa91752df09fb2584a46a04d 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -884,6 +884,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 961850129026a6baf427f29aded92ce22986e518..9a26b205fe6a3d655415976b6ed0c8305c27337e 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -884,6 +884,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 503c59fd8dc1b9cf73338ccc6b32a71197d2bdb4..4a2ba40338e576b37f7bd8cbe6d7085a1836768e 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -800,6 +800,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 6c322a33d35beb9802263b34aacb6d968e87c3e7..3fe8454d6eebbe975e243577957c46df73fb3653 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -795,6 +795,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 e19b6d4bf365b96ea74c0a7d96ec9328a3707847..c65623544046c30759bfadeeca7096d91e1b627e 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -880,6 +880,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 1f924208b58d006dd34697288da81bf2b39c1ad7..d2330e35937cf2658d7898c0be08046da7f95751 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2622,6 +2622,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>