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 df162e9ddfe02cef706fb171654ce72e586ab1a4..e024cf27987d8a50b2ac0af8a4cf9db4f93bf756 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 b0d1b876ea18005579375a5a07ada96e6b5dd291..a8d6f4c2d12366f247f6104a8c8d69368b44e101 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 ebb3f186a851319ea32dfc78abbc6f6bfb96e435..f37af3014a09b886ad25fa8a80e821f7a2cad78f 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: 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 51b27980e6d50b22bfd740f75e5c718b2fddc9be..e8b3d5e21cc120eb68e114c5bcad5eeb01bef285 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 43930f2a7d6fc7926c1d87a97c81f78fb8273751..35c84aa26e5693e4c740260de5304f8e3467c305 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -939,6 +939,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: access point name = Access Point Name

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 28ff28336d6901bd9901e3044b3beeccdcf0c6db..d3c2a6d6c2bad96b4472df18026cbc170fdab07f 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -940,6 +940,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: access point name = Access Point Name

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index b24d5aab0941a9c584749d2b94ccd19e68832e10..1b1e7bf05aa4e3eccbf93a5ab598e80ecd7b9d5d 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -854,6 +854,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 1b6855831c8b9790b0db99d91d6c369e9f1a326b..dbbecfeda8532a1e6785bed2030d545d1a6d482b 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -848,6 +848,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 74c44ed3f0a88d77da6bc6934e095bcaa8e83baa..c20fe603b56f06b28ea0b5e11341654d42888e29 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -935,6 +935,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 4e09b1ea2ff00832bbd5f0a076ace967783ede11..35efebe516cc71140542890629ee9f91ac50a1d4 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>