public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing
@ 2022-12-05  8:40 Adolf Belka
  2022-12-05  8:40 ` [PATCH 2/2] Language files update: Adolf Belka
  0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2022-12-05  8:40 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3324 bytes --]

- On CU172 Testing Build: master/eb9e29f9 when selecting the OpenVPN menu it showed the
   Diffie-Hellman info and pressing back took you to the same DH page.
- Tested patch suggestion from Erik on vm testbed and confirmed that it worked.

Suggested-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 4 ++--
 langs/de/cgi-bin/de.pl    | 2 ++
 langs/en/cgi-bin/en.pl    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index dc429d90c..ecfd4fdaf 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -977,7 +977,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n";
   print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
   print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
-  print SERVERCONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n";
+  print SERVERCONF "dh $dhparameter\n";
   print SERVERCONF "# Cipher\n";
   print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n";
 
@@ -5700,7 +5700,7 @@ END
 
 	print <<END;
 		<tr>
-			<td class='base' $col3>$Lang::tr{'dh parameter'}</td>
+			<td class='base' $col3>$Lang::tr{'dh'}</td>
 			<td class='base' $col3>$dhsubject</td>
 			<form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
 			<input type='hidden' name='ACTION' value='$Lang::tr{'show dh'}' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a52d41531..457a7108c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -760,6 +760,7 @@
 'details' => 'Mehr',
 'device' => 'Gerät',
 'devices on blue' => 'Geräte auf BLAU',
+'dh' => 'Diffie-Hellman-Parameter',
 'dhcp advopt add' => 'DHCP Option hinzufügen',
 'dhcp advopt added' => 'DHCP Option hinzugefügt',
 'dhcp advopt blank value' => 'Wert für DHCP Option darf nicht leer sein',
@@ -2256,6 +2257,7 @@
 'show ca certificate' => 'CA Zertifikat anzeigen',
 'show certificate' => 'Datei anzeigen',
 'show crl' => 'Certificate Revocation List anzeigen',
+'show dh' => 'Diffie-Hellman-Parameter anzeigen',
 'show host certificate' => 'Host-Zertifikat anzeigen',
 'show last x lines' => 'die letzten x Zeilen anzeigen',
 'show otp qrcode' => 'Zeige OTP QRCode',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bcba77aa4..72cef9a11 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -795,6 +795,7 @@
 'details' => 'Details',
 'device' => 'Device',
 'devices on blue' => 'Devices on BLUE',
+'dh' => 'Diffie-Hellman-Parameter',
 'dhcp advopt add' => 'Add a DHCP option',
 'dhcp advopt added' => 'DHCP option added',
 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.',
@@ -2313,6 +2314,7 @@
 'show ca certificate' => 'Show CA certificate',
 'show certificate' => 'Show file',
 'show crl' => 'Show certificate revocation list',
+'show dh' => 'Show Diffie-Hellman parameters',
 'show host certificate' => 'Show host certificate',
 'show last x lines' => 'Show last x lines',
 'show lines' => 'Show lines',
-- 
2.38.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 2/2] Language files update:
  2022-12-05  8:40 [PATCH 1/2] ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing Adolf Belka
@ 2022-12-05  8:40 ` Adolf Belka
  0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2022-12-05  8:40 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 15072 bytes --]

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 doc/language_issues.de |  2 --
 doc/language_issues.en |  6 +++---
 doc/language_issues.fr |  4 ++--
 doc/language_issues.it |  4 ++--
 doc/language_issues.nl |  4 ++--
 doc/language_issues.pl |  4 ++--
 doc/language_issues.ru |  4 ++--
 doc/language_issues.tr |  4 ++--
 doc/language_missings  | 12 ++++++++++++
 9 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5cbcb1111..c3db84863 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -885,7 +885,6 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
 WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
 WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
@@ -939,7 +938,6 @@ WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
-WARNING: untranslated string: show dh = unknown string
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: subscription code = Subscription code
diff --git a/doc/language_issues.en b/doc/language_issues.en
index c559c62a7..0bf7bf977 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -570,7 +570,7 @@ WARNING: untranslated string: detail level = Detail level
 WARNING: untranslated string: details = Details
 WARNING: untranslated string: device = Device
 WARNING: untranslated string: devices on blue = Devices on BLUE
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp advopt add = Add a DHCP option
 WARNING: untranslated string: dhcp advopt added = DHCP option added
@@ -1638,7 +1638,7 @@ WARNING: untranslated string: show ajax speedmeter in footer = Show Ajax speedme
 WARNING: untranslated string: show ca certificate = Show CA certificate
 WARNING: untranslated string: show certificate = Show file
 WARNING: untranslated string: show crl = Show certificate revocation list
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show host certificate = Show host certificate
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show root certificate = Show root certificate
@@ -2118,7 +2118,7 @@ WARNING: untranslated string: volup10 = Increase volume by 10
 WARNING: untranslated string: volup5 = Increase volume by 5
 WARNING: untranslated string: vpi number = VPI number:
 WARNING: untranslated string: vpn = VPN
-WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
+WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of email, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>email:</b>ipfire(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
 WARNING: untranslated string: vpn auth-dn = Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1ad14cd34..1a6a877d7 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -912,7 +912,7 @@ WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
 WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
 WARNING: untranslated string: core notice 3 = available.
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: email recipient invalid = Invalid email recipient
 WARNING: untranslated string: error message = unknown string
@@ -954,4 +954,4 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
diff --git a/doc/language_issues.it b/doc/language_issues.it
index c7638dbd6..e0c87ea2c 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -941,7 +941,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1222,7 +1222,7 @@ WARNING: untranslated string: search = Search
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4ef506798..da08fb913 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -944,7 +944,7 @@ WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
 WARNING: untranslated string: dhcp dns key name = Key Name
@@ -1243,7 +1243,7 @@ WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ffea51ab3..5de989453 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -916,7 +916,7 @@ WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: details = Details
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1430,7 +1430,7 @@ WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4257c0291..81a492358 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -912,7 +912,7 @@ WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: details = Details
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1425,7 +1425,7 @@ WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index da7241f22..d1bd0f4e9 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -927,7 +927,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
@@ -1128,7 +1128,7 @@ WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
diff --git a/doc/language_missings b/doc/language_missings
index e5fad0a6a..47b314981 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -110,12 +110,14 @@
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
+< dh
 < email recipient invalid
 < g.dtm
 < g.lite
 < guaranteed bandwidth
 < retbleed
 < service boot setting unavailable
+< show dh
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -231,6 +233,7 @@
 < dangerous
 < default IP address
 < desired
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -499,6 +502,7 @@
 < secret
 < sent
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < smb daemon
 < smt disabled
@@ -731,6 +735,7 @@
 < default
 < default IP address
 < desired
+< dh
 < dhcp dns enable update
 < dhcp dns key name
 < dhcp dns update
@@ -1022,6 +1027,7 @@
 < search
 < secret
 < sent
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -1322,6 +1328,7 @@
 < deprecated fs warn
 < desired
 < details
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -1889,6 +1896,7 @@
 < sent
 < server restart
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -2294,6 +2302,7 @@
 < deprecated fs warn
 < desired
 < details
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -2864,6 +2873,7 @@
 < sent
 < server restart
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -3137,6 +3147,7 @@
 < dangerous
 < default IP address
 < desired
+< dh
 < dhcp deny known clients:
 < dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
@@ -3314,6 +3325,7 @@
 < secret
 < sent
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < smb daemon
 < smt disabled
-- 
2.38.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-12-05  8:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-05  8:40 [PATCH 1/2] ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing Adolf Belka
2022-12-05  8:40 ` [PATCH 2/2] Language files update: Adolf Belka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox