ovpnmain.cgi: Refactor the entire advanced settings page

There are no functional changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index c454669e0c7978861d70f7c4aece4e6b69791efa..1c92b2d3867844e3d12c5ecc7e516cd8a7f93d38 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -217,6 +217,7 @@ WARNING: translation string unused: dhcp create fixed leases
 WARNING: translation string unused: dhcp fixed lease err1
 WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -419,6 +420,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -467,6 +471,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -501,6 +506,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -584,6 +590,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
+WARNING: translation string unused: ovpn add conf
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
@@ -602,6 +609,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
@@ -699,6 +707,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -979,13 +988,20 @@ WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Dae
 WARNING: untranslated string: no entries = No entries at the moment.
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
 WARNING: untranslated string: processors = unknown string

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 7fb97fc7ee1bf7154d71cdf365c4edffdc11096c..3d3c3a7a1c0abb55ce15d325ffc33f88b449ad05 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -562,7 +562,7 @@ WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: dest ip and port = Dest. IP: Port
 WARNING: untranslated string: destination = Destination
 WARNING: untranslated string: destination ip = Destination IP
-WARNING: untranslated string: destination port = Destination port
+WARNING: untranslated string: destination port = Destination Port
 WARNING: untranslated string: destination port numbers = Destination port must be a valid port number or port range.
 WARNING: untranslated string: detail level = Detail level
 WARNING: untranslated string: details = Details
@@ -600,7 +600,6 @@ WARNING: untranslated string: dhcp server = DHCP Server
 WARNING: untranslated string: dhcp server disabled = DHCP server disabled.  Stopped.
 WARNING: untranslated string: dhcp server enabled = DHCP server enabled.  Restarting.
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
-WARNING: untranslated string: dhcp-options = DHCP push options
 WARNING: untranslated string: dial = Connect
 WARNING: untranslated string: dial profile = Connect with profile
 WARNING: untranslated string: dialing mode = Dialing mode:
@@ -1131,9 +1130,6 @@ WARNING: untranslated string: invalid input for inactivity timeout = Invalid inp
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
 WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode
 WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
-WARNING: untranslated string: invalid input for keepalive 1 = Invalid input for Keepalive ping
-WARNING: untranslated string: invalid input for keepalive 1:2 = Invalid input for Keepalive use at least a ratio of 1:2
-WARNING: untranslated string: invalid input for keepalive 2 = Invalid input for Keepalive ping-restart
 WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
 WARNING: untranslated string: invalid input for max clients = Invalid input for Max Clients. The maximum of 1024 clients has been exceeded
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
@@ -1249,7 +1245,6 @@ WARNING: untranslated string: log settings = Log Settings
 WARNING: untranslated string: log summaries = Log summaries
 WARNING: untranslated string: log summary = Log Summary
 WARNING: untranslated string: log viewing options = Log viewing options
-WARNING: untranslated string: log-options = Logfile options
 WARNING: untranslated string: loged in at = Logged in at
 WARNING: untranslated string: logging server = Logging Server
 WARNING: untranslated string: loginlogout = Login/Logout
@@ -1311,7 +1306,6 @@ WARNING: untranslated string: minimal = Minimal
 WARNING: untranslated string: minimum = Minimum
 WARNING: untranslated string: minute = Minute
 WARNING: untranslated string: minutes = Minutes
-WARNING: untranslated string: misc-options = Miscellaneous options
 WARNING: untranslated string: mitigated = Mitigated
 WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: mode = Mode
@@ -1440,11 +1434,12 @@ WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Acces
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
 WARNING: untranslated string: outgoing traffic in bytes per second = Outgoing Traffic
 WARNING: untranslated string: ovpn = OpenVPN
-WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn con stat = OpenVPN Connection Statistics
 WARNING: untranslated string: ovpn connection name = Connection Name
-WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn crypt options = unknown string
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set
 WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask
@@ -1453,18 +1448,22 @@ WARNING: untranslated string: ovpn fallback cipher help = This cipher is being u
 WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn no connections = No active OpenVPN connections
 WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
-WARNING: untranslated string: ovpn routes push = Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24
-WARNING: untranslated string: ovpn routes push options = Route push options
+WARNING: untranslated string: ovpn routes push = Custom Routes
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn subnet = OpenVPN subnet:
 WARNING: untranslated string: ovpn subnet is invalid = OpenVPN subnet is invalid.
 WARNING: untranslated string: ovpn subnet overlap = OpenVPN Subnet overlaps with : 
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pagerefresh = Page is beeing refreshed, please wait.
 WARNING: untranslated string: pak update = Update
@@ -1631,7 +1630,6 @@ WARNING: untranslated string: send cr = ISP requires Carriage Return:
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: september = September
 WARNING: untranslated string: serial = Serial
-WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: service = Service
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
 WARNING: untranslated string: service name = Service name:

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 391a396debfce00c384bfd0ab33fac7814f71142..0fea87bf3cfcb3da377648742a4f22234935dded 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -246,6 +246,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -465,6 +466,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -517,6 +521,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -551,6 +556,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -637,6 +643,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
+WARNING: translation string unused: ovpn add conf
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dh
@@ -660,6 +667,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
@@ -759,6 +767,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -1041,13 +1050,20 @@ WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: processors = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index a2073d22c92872ef58249771123d17212d336cc0..e3ca5de4b197e12323dac38138b6f740dd9f2068 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -242,6 +242,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -448,6 +449,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -496,6 +500,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -530,6 +535,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -615,6 +621,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
+WARNING: translation string unused: ovpn add conf
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
@@ -633,6 +640,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
@@ -732,6 +740,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -985,13 +994,20 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hostile networks total = Total Hostile Networks
 WARNING: untranslated string: load average = unknown string
 WARNING: untranslated string: ovpn ciphers = Ciphers
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: processors = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 37a272e28916d1aa102802e8b3aa324e055b068e..ffe5c6ee2288a0f8b28507f282bcdd0016340d10 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -211,6 +211,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -416,6 +417,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -453,6 +457,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -487,6 +492,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -589,6 +595,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
@@ -683,6 +690,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -1226,18 +1234,24 @@ WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
-WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pak update = Update
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index e07374f7f812af087ad92f048a40e0eaa4f5a2b3..9e664823d307d0d5a87f219da354215b17edc8c6 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -212,6 +212,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -418,6 +419,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -455,6 +459,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -489,6 +494,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -586,6 +592,7 @@ WARNING: translation string unused: ovpn mtu-disc yes
 WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
@@ -682,6 +689,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -1248,20 +1256,26 @@ WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
-WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
-WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn crypt options = unknown string
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ac3ef1f8c71a38beafe9574685a7ff49be4075f1..c542aa13fd30a8e1c220bc0bc0fd21566f5936b0 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -199,6 +199,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -355,6 +356,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -391,6 +395,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -425,6 +430,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -1407,10 +1413,11 @@ WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
-WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
-WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn crypt options = unknown string
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set
 WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask
@@ -1419,15 +1426,19 @@ WARNING: untranslated string: ovpn fallback cipher help = This cipher is being u
 WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn no connections = No active OpenVPN connections
 WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
-WARNING: untranslated string: ovpn routes push = Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24
-WARNING: untranslated string: ovpn routes push options = Route push options
+WARNING: untranslated string: ovpn routes push = Custom Routes
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pak update = Update
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
@@ -1477,7 +1488,6 @@ 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: 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 otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 0efcde1313e7b9e6c0465fb97bc237083ddde2ca..7005aba33d70f2745bec7b7f8bc3c59701fe1f55 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -198,6 +198,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -351,6 +352,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -387,6 +391,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -421,6 +426,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -505,6 +511,7 @@ WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
@@ -1404,23 +1411,29 @@ WARNING: untranslated string: outgoing compression in bytes per second = Outgoin
 WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
 WARNING: untranslated string: outgoing traffic in bytes per second = Outgoing Traffic
-WARNING: untranslated string: ovpn add conf = Additional configuration
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
-WARNING: untranslated string: ovpn crypt options = Cryptographic options
+WARNING: untranslated string: ovpn crypt options = unknown string
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn no connections = No active OpenVPN connections
 WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required.
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pak update = Update
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
@@ -1470,7 +1483,6 @@ 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: 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 otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index abe9e60019c88168986f9f90a3cbb4a4084ce0c5..336d2db9ce5db6f09eeb8e8331c14db59b082b63 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -233,6 +233,7 @@ WARNING: translation string unused: dhcp fixed lease help1
 WARNING: translation string unused: dhcp mode
 WARNING: translation string unused: dhcp server disabled on blue interface
 WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dhcp-options
 WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
@@ -442,6 +443,9 @@ WARNING: translation string unused: intrusion detection system2
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for keepalive 1
+WARNING: translation string unused: invalid input for keepalive 1:2
+WARNING: translation string unused: invalid input for keepalive 2
 WARNING: translation string unused: invalid input for oink code
 WARNING: translation string unused: invalid loaded file
 WARNING: translation string unused: invalid md5sum
@@ -482,6 +486,7 @@ WARNING: translation string unused: log level
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log view
 WARNING: translation string unused: log viewer
+WARNING: translation string unused: log-options
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
 WARNING: translation string unused: ls_dhcpd
@@ -516,6 +521,7 @@ WARNING: translation string unused: meaning
 WARNING: translation string unused: memory usage per
 WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
+WARNING: translation string unused: misc-options
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
 WARNING: translation string unused: modem on com1
@@ -600,6 +606,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
+WARNING: translation string unused: ovpn add conf
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
@@ -618,6 +625,7 @@ WARNING: translation string unused: ovpn on blue
 WARNING: translation string unused: ovpn on orange
 WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn routes push options
 WARNING: translation string unused: ovpn server status
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
@@ -713,6 +721,7 @@ WARNING: translation string unused: selecttraffic
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
 WARNING: translation string unused: server reserved
+WARNING: translation string unused: server restart
 WARNING: translation string unused: server string
 WARNING: translation string unused: service added
 WARNING: translation string unused: service removed
@@ -1143,15 +1152,22 @@ WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn connection name = Connection Name
+WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings
+WARNING: untranslated string: ovpn dhcp settings = DHCP Settings
 WARNING: untranslated string: ovpn dynamic client subnet = Dynamic Client Subnet
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
 WARNING: untranslated string: ovpn fqdn = FQDN
+WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn protocol settings = Protocol Settings
+WARNING: untranslated string: ovpn push default route = Push Default Route
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
+WARNING: untranslated string: ovpn routing settings = Routing Settings
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
+WARNING: untranslated string: ovpn transport protocol = Transport Protocol
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pak update = Update
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.

diff --git a/doc/language_missings b/doc/language_missings
index ba71cae5e6255edef251d73ef02071883d021a51..ea00255584c773a3650d09e0d26de7ab9529071a 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -82,13 +82,20 @@
 < okay
 < optional
 < ovpn ciphers
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < quick control
 < random number generator daemon
@@ -150,13 +157,20 @@
 < openvpn cert expires soon
 < openvpn cert has expired
 < ovpn ciphers
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < regenerate host certificate
 < reiserfs warning1
@@ -186,13 +200,20 @@
 < g.lite
 < hostile networks total
 < ovpn ciphers
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < rss
 < rss long
@@ -565,16 +586,23 @@
 < ovpn add conf
 < ovpn ciphers
 < ovpn connection name
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
 < ovpn rw connection log
 < ovpn tls auth
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < ovpn warning rfc3280
 < pakfire already busy
@@ -1125,7 +1153,8 @@
 < ovpn add conf
 < ovpn ciphers
 < ovpn connection name
-< ovpn crypt options
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn engines
 < ovpn error md5
@@ -1134,12 +1163,17 @@
 < ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn reneg sec
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
 < ovpn rw connection log
 < ovpn tls auth
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < ovpn warning rfc3280
 < pakfire already busy
@@ -2005,7 +2039,8 @@
 < ovpn add conf
 < ovpn ciphers
 < ovpn connection name
-< ovpn crypt options
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn engines
 < ovpn errmsg green already pushed
@@ -2017,6 +2052,7 @@
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn mgmt in root range
+< ovpn misc settings
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc maybe
@@ -2027,13 +2063,16 @@
 < ovpn no cipher selected
 < ovpn no connections
 < ovpn port in root range
+< ovpn protocol settings
+< ovpn push default route
 < ovpn reneg sec
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
 < ovpn routes push
-< ovpn routes push options
+< ovpn routing settings
 < ovpn rw connection log
 < ovpn tls auth
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < ovpn warning rfc3280
 < pakfire already busy
@@ -3023,7 +3062,8 @@
 < ovpn add conf
 < ovpn ciphers
 < ovpn connection name
-< ovpn crypt options
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn engines
 < ovpn error md5
@@ -3033,6 +3073,7 @@
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn mgmt in root range
+< ovpn misc settings
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc maybe
@@ -3043,11 +3084,15 @@
 < ovpn no cipher selected
 < ovpn no connections
 < ovpn port in root range
+< ovpn protocol settings
+< ovpn push default route
 < ovpn reneg sec
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
 < ovpn rw connection log
 < ovpn tls auth
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < ovpn warning rfc3280
 < pakfire already busy
@@ -3543,16 +3588,23 @@
 < otp qrcode
 < ovpn ciphers
 < ovpn connection name
+< ovpn crypto settings
+< ovpn dhcp settings
 < ovpn dynamic client subnet
 < ovpn error md5
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn misc settings
 < ovpn no cipher selected
+< ovpn protocol settings
+< ovpn push default route
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
+< ovpn routing settings
 < ovpn rw connection log
 < ovpn tls auth
+< ovpn transport protocol
 < ovpn unsupported cipher selected
 < ovpn warning rfc3280
 < pakfire already busy

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index ceacfa2c6dadbb8f332dab58e6306c9092e3b4a3..63d75a07529a075f848ae10b9627f3e399f21652 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2725,19 +2725,58 @@ ADV_ERROR:
        print "&nbsp;</class>\n";
        &Header::closebox();
     }
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'});
+
+    &Header::opensection();
 
     print <<END;
-           <form method='post' enctype='multipart/form-data'>
-                       <table width='100%' border=0>
+           <form method='POST' enctype='multipart/form-data'>
+                       <h6>$Lang::tr{'ovpn protocol settings'}</h6>
+
+                       <table class="form">
+                               <tr>
+                                       <td>$Lang::tr{'ovpn transport protocol'}</td>
+                                       <td>
+                                               <select name='DPROTOCOL'>
+                                                       <option value='udp' $selected{'DPROTOCOL'}{'udp'}>UDP</option>
+                                                       <option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option>
+                                               </select>
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td>$Lang::tr{'destination port'}</td>
+                                       <td>
+                                               <input type='number' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' />
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td>$Lang::tr{'mtu'}</td>
+                                       <td>
+                                               <input type='number' name='DMTU' value='$cgiparams{'DMTU'}' min="1280" max="9000" />
+                                       </td>
+                               </tr>
+
                                <tr>
-                                       <td colspan='2'>
-                                               <b>$Lang::tr{'ovpn crypt options'}</b>
+                                       <td>mssfix</td>
+                                       <td>
+                                               <input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} />
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td>fragment</td>
+                                       <td>
+                                               <input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' />
                                        </td>
                                </tr>
+                       </table>
+
+                       <h6>$Lang::tr{'ovpn crypto settings'}</h6>
 
+                       <table class="form">
                                <tr>
-                                       <td width="25%">
+                                       <td>
                                                $Lang::tr{'ovpn ciphers'}
                                        </td>
 
@@ -2812,16 +2851,18 @@ END
                                                </select>
                                        </td>
                                </tr>
+
                                <tr>
                                        <td></td>
                                        <td>
                                                $Lang::tr{'ovpn fallback cipher help'}
                                        </td>
                                </tr>
+                       </table>
 
-                               <tr>
-                                       <td colspan='2'><b>$Lang::tr{'dhcp-options'}</b></td>
-                               </tr>
+                       <h6>$Lang::tr{'ovpn dhcp settings'}</h6>
+
+                       <table class="form">
                                <tr>
                                        <td>Domain</td>
                                        <td>
@@ -2840,9 +2881,18 @@ END
                                                <input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' />
                                        </td>
                                </tr>
+                       </table>
+
+                       <h6>$Lang::tr{'ovpn routing settings'}</h6>
+
+                       <table class="form">
                                <tr>
-                                       <td colspan='2'><b>$Lang::tr{'ovpn routes push options'}</b></td>
+                                       <td>$Lang::tr{'ovpn push default route'}</td>
+                                       <td>
+                                               <input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} />
+                                       </td>
                                </tr>
+
                                <tr>
                                        <td>$Lang::tr{'ovpn routes push'}</td>
                                        <td>
@@ -2851,101 +2901,28 @@ END
                                </tr>
                        </table>
 
-<hr size='1'>
-
-<table width='100%'>
-       <tr>
-               <td class='base'><b>$Lang::tr{'misc-options'}</b></td>
-       </tr>
-
-       <tr>
-               <td width='20%'></td> <td width='15%'> </td><td width='35%'> </td><td width='20%'></td><td width='35%'></td>
-       </tr>
+                       <h6>$Lang::tr{'ovpn misc settings'}</h6>
 
-       <tr>
-               <td class='base'>$Lang::tr{'protocol'}</td>
-               <td>
-                       <select name='DPROTOCOL'>
-                               <option value='udp' $selected{'DPROTOCOL'}{'udp'}>UDP</option>
-                               <option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option>
-                       </select>
-               </td>
-       </tr>
-
-       <tr>
-               <td class='base'>$Lang::tr{'destination port'}</td>
-               <td>
-                       <input type='number' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' />
-               </td>
-       </tr>
-
-       <tr>
-               <td class='base'>$Lang::tr{'mtu'}</td>
-               <td>
-                       <input type='number' name='DMTU' value='$cgiparams{'DMTU'}' min="1280" max="9000" />
-               </td>
-       </tr>
-
-       <tr>
-               <td class='base'>Redirect-Gateway def1</td>
-               <td><input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} /></td>
-       </tr>
-
-       <tr>
-               <td class='base'>mssfix</td>
-               <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
-               <td>$Lang::tr{'openvpn default'}: off</td>
-       </tr>
-
-       <tr>
-               <td class='base'>fragment <br></td>
-               <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td>
-       </tr>
-
-
-       <tr>
-               <td class='base'>Max-Clients</td>
-               <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td>
-       </tr>
-</table>
-END
+                       <table class="form">
+                               <tr>
+                                       <td>Max-Clients</td>
+                                       <td>
+                                               <input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' />
+                                       </td>
+                               </tr>
 
-if ( -e "/var/run/openvpn.pid"){
-print" <br><b><font color='#990000'>$Lang::tr{'attention'}:</b></font><br>
-               $Lang::tr{'server restart'}<br><br>
-               <hr>";
-       print<<END;
-<table width='100%'>
-<tr>
-    <td>&nbsp;</td>
-    <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' disabled='disabled' /></td>
-    <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' /></td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
+                               <tr class="action">
+                                       <td colspan="2">
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' />
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' />
+                                       </td>
+                               </tr>
+                       </table>
 END
-;
 
-
-}else{
-
-       print<<END;
-<table width='100%'>
-<tr>
-    <td>&nbsp;</td>
-    <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' /></td>
-    <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' /></td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
-END
-;
-}
-    &Header::closebox();
-#    print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
+    &Header::closesection();
     &Header::closebigbox();
+
     &Header::closepage();
     exit(0);
 

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 3168138d78eb2017eed9c84cfd5c7f47f3748558..ee614cb0b028af744bc020d57bcafc0ecd8b3ed0 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -92,10 +92,14 @@ body {
        color: #363636;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5 {
        font-size: 20px;
 }
 
+h6 {
+       font-size: 1em;
+}
+
 select, textarea, input[type=text], input[type=number] {
        width: 100%;
 }
@@ -330,6 +334,12 @@ table.form tr td:first-child {
        width: 30%;
 }
 
+table.form tr.header td {
+       font-weight: bold;
+
+       margin-top: 1rem;
+}
+
 table.form tr.action td {
        padding-top: 1rem;
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4f4e6b12ddefe24ea604d319b6ab6bb703f2ff93..dc3509f40eeffea2ccfee0163a6e5495c015f35d 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -795,7 +795,7 @@
 'destination ip bad' => 'Invalid destination IP',
 'destination ip or net' => 'Destination IP or net',
 'destination net' => 'Destination Net',
-'destination port' => 'Destination port',
+'destination port' => 'Destination Port',
 'destination port numbers' => 'Destination port must be a valid port number or port range.',
 'destination port overlaps' => 'Destination port range overlaps an existing port range.',
 'detail level' => 'Detail level',
@@ -842,7 +842,6 @@
 'dhcp server enabled' => 'DHCP server enabled.  Restarting.',
 'dhcp server enabled on blue interface' => 'DHCP server enabled on BLUE interface',
 'dhcp valid range required when deny known clients checked' => 'Valid range required when "Deny known clients:" is checked',
-'dhcp-options' => 'DHCP push options',
 'dial' => 'Connect',
 'dial profile' => 'Connect with profile',
 'dial user password' => 'Dial user password:',
@@ -1804,7 +1803,6 @@
 'minimum' => 'Minimum',
 'minute' => 'Minute',
 'minutes' => 'Minutes',
-'misc-options' => 'Miscellaneous options',
 'missing dat' => 'Encrypted archive not found',
 'missing gz' => 'Unencrypted archive not found',
 'mitigated' => 'Mitigated',
@@ -2022,8 +2020,9 @@
 'ovpn con stat' => 'OpenVPN Connection Statistics',
 'ovpn config' => 'OVPN-Config',
 'ovpn connection name' => 'Connection Name',
-'ovpn crypt options' => 'Cryptographic options',
+'ovpn crypto settings' => 'Cryptographic Settings',
 'ovpn device' => 'OpenVPN device:',
+'ovpn dhcp settings' => 'DHCP Settings',
 'ovpn dl' => 'OVPN-Config Download',
 'ovpn dynamic client subnet' => 'Dynamic Client Subnet',
 'ovpn engines' => 'Crypto engine',
@@ -2037,6 +2036,7 @@
 'ovpn ha' => 'Hash algorithm',
 'ovpn log' => 'OVPN-Log',
 'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
+'ovpn misc settings' => 'Miscellaneous Settings',
 'ovpn mtu-disc' => 'Path MTU Discovery',
 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.',
 'ovpn mtu-disc maybe' => 'Optionally',
@@ -2050,17 +2050,20 @@
 'ovpn on orange' => 'OpenVPN on ORANGE:',
 'ovpn on red' => 'OpenVPN on RED:',
 'ovpn port in root range' => 'A port number of 1024 or higher is required.',
+'ovpn protocol settings' => 'Protocol Settings',
+'ovpn push default route' => 'Push Default Route',
 'ovpn reneg sec' => 'Session key lifetime:',
 'ovpn roadwarrior server' => 'OpenVPN Roadwarrior Server',
 'ovpn roadwarrior settings' => 'Roadwarrior Settings',
-'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
-'ovpn routes push options' => 'Route push options',
+'ovpn routes push' => 'Custom Routes',
+'ovpn routing settings' => 'Routing Settings',
 'ovpn rw connection log' => 'OpenVPN Roadwarrior Connections Log',
 'ovpn server status' => 'Current OpenVPN server status:',
 'ovpn subnet' => 'OpenVPN subnet:',
 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
 'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ',
 'ovpn tls auth' => 'TLS Channel Protection:',
+'ovpn transport protocol' => 'Transport Protocol',
 'ovpn unsupported cipher selected' => 'Unknown cipher selected',
 'ovpn warning rfc3280' => 'Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>',
 'ovpn_fastio' => 'Fast-IO',