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 fbd7ef78ed08533d55ecd5051e788bfd9af19f55..cf2ee2a8376fa13893776da71c61e77b6efb74ec 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 cf6f977e6631e781b87eff396b22409e8b9181c1..10e64fdc412ce6af4b53c5b47a32af14eaab74b6 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 f253a72984078e33a58e33699a401aaec79bd2cd..1de155a268926d362399afd0fa390b6bb6b0f4ed 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 a28a7dd9c726b7dde0048c3fbae45525462e4541..d5b396b6e491e0a9b3849b1b8225a25fe7346087 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 ead791a2674c5f90dd8b558c917bc26b664d9b48..6b0138a25dae629148f8d86577748c1543d462de 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -931,6 +931,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 6908af3cdc513a02d27b2d75cdde8468da38bf90..2ba12ffe661d8767a2df456e73624f59042475d0 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -931,6 +931,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 b95a8a127621e5fa80b7135466428632a8898bce..e6fda715e473de1efb785fa98db400660f4768c2 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -845,6 +845,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 561dfafb7ad80f053e42467421db9a5f870db7bd..d8d5edff34cb87456834043a9e06a27d6902cf80 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -839,6 +839,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 b8373e3d5855643e8de0b0320767fe0c5e5c29f9..85f23bd12f7a14044bc33e577162b1f72271f4b6 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -926,6 +926,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>