From 63e3da5935ee846b9e1e29f624bd299518194d35 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 5 Jan 2014 02:18:43 +0100 Subject: [PATCH] vpnmain.cgi: Re-design algorithm selection. --- doc/language_issues.de | 9 ++ doc/language_issues.en | 9 ++ doc/language_issues.es | 13 +++ doc/language_issues.fr | 13 +++ doc/language_issues.nl | 13 +++ doc/language_issues.pl | 13 +++ doc/language_issues.ru | 13 +++ doc/language_issues.tr | 13 +++ doc/language_missings | 16 +++ html/cgi-bin/vpnmain.cgi | 229 +++++++++++++++++++++++---------------- langs/de/cgi-bin/de.pl | 4 + langs/en/cgi-bin/en.pl | 4 + 12 files changed, 255 insertions(+), 94 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 4c6ef63aaf..b07ee32c4d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -161,6 +161,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -231,6 +235,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -385,6 +393,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile diff --git a/doc/language_issues.en b/doc/language_issues.en index 88a8f6e2b9..314643dd60 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -184,6 +184,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -256,6 +260,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -412,6 +420,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile diff --git a/doc/language_issues.es b/doc/language_issues.es index 356dc0ec56..09ebf81917 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -375,6 +383,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -606,6 +615,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -766,7 +776,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6e1c15bc2e..c37425e87b 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -377,6 +385,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -609,6 +618,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -769,7 +779,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 902b6e5c1e..55fd951cbe 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -185,6 +185,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -226,6 +230,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -382,6 +390,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -572,6 +581,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: encryption WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -715,7 +725,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: notice diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 356dc0ec56..09ebf81917 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -375,6 +383,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -606,6 +615,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -766,7 +776,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a5e6638458..200ab29208 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -182,6 +182,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -219,6 +223,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -371,6 +379,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -602,6 +611,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -752,8 +762,11 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 810b3d6592..30a7a8a6fd 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -185,6 +185,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -226,6 +230,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -382,6 +390,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -568,6 +577,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: encryption WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -711,7 +721,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: notice diff --git a/doc/language_missings b/doc/language_missings index 0b6e3f0938..e3e5c8efe1 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -75,6 +75,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -265,7 +266,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -488,6 +492,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -678,7 +683,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -893,6 +901,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1075,7 +1084,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -1278,6 +1290,7 @@ < drop forward < drop outgoing < Edit an existing route +< encryption < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1461,9 +1474,12 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype < hour-graph < incoming traffic in bytes per second +< integrity < least preferred +< lifetime < minute < month-graph < most preferred diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 5a943b779a..64bf17e936 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2304,110 +2304,151 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
$Lang::tr{'ike encryption'} - $Lang::tr{'ike integrity'} - $Lang::tr{'ike grouptype'} -
$Lang::tr{'ike lifetime'} - $Lang::tr{'hours'}
IKEESP
$Lang::tr{'encryption'} + + + +
$Lang::tr{'esp encryption'} - $Lang::tr{'esp integrity'} - $Lang::tr{'esp grouptype'} -
$Lang::tr{'esp keylife'} - $Lang::tr{'hours'}
- IKE+ESP: $Lang::tr{'use only proposed settings'}
- $Lang::tr{'pfs yes no'}
- $Lang::tr{'vpn payload compression'}
$Lang::tr{'integrity'} + + + +
$Lang::tr{'lifetime'} + $Lang::tr{'hours'} + + $Lang::tr{'hours'} +
$Lang::tr{'grouptype'} + +
+ +
+ + + + + + + + + + + + EOF ; if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { print ""; } elsif ($confighash{$cgiparams{'KEY'}}[10]) { - print ""; + print ""; } else { - print ""; + print ""; } - print "
+
+ +
+ +
"; - print " $Lang::tr{'vpn vhost'}
"; - print " $Lang::tr{'vpn vhost'}
"; + print < + + + + + + +EOF + &Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e8fb995995..d89a4bd3f4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -801,6 +801,7 @@ 'enabledtitle' => 'Aktiviert', 'encapsulation' => 'Encapsulation', 'encrypted' => 'Verschlüsselt', +'encryption' => 'Verschlüsselung:', 'end address' => 'Endadresse:', 'enter ack class' => 'Legen Sie hier die ACK-Klasse fest
und klicken Sie danach auf Speichern.', 'enter data' => 'Geben Sie die Daten ein
und klicken Sie danach auf Speichern.', @@ -1103,6 +1104,7 @@ 'graph per' => 'pro', 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', +'grouptype' => 'Gruppentyp:', 'guaranteed bandwith' => 'Garantierte Bandbreite', 'guardian alertfile' => 'Alertfile', 'guardian configuration' => 'Guardian Konfiguration', @@ -1179,6 +1181,7 @@ 'installed' => 'Installiert', 'installed updates' => 'Installierte Updates:', 'instant update' => 'Sofortiges Update', +'integrity' => 'Integrität:', 'interface' => 'Schnittstelle', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', @@ -1290,6 +1293,7 @@ 'least preferred' => 'weniger präferiert', 'legend' => 'Legende', 'length' => 'Länge', +'lifetime' => 'Lebensdauer:', 'line' => 'Leitung', 'linkq' => 'Antwortzeit', 'load printer' => 'Load Printer', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8bbfff39f6..30bf70a3e1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -826,6 +826,7 @@ 'enabledtitle' => 'Enabled', 'encapsulation' => 'Encapsulation', 'encrypted' => 'Encrypted', +'encryption' => 'Encryption:', 'end address' => 'End address:', 'enter ack class' => 'Enter the ACK- Class
and then press Save.', 'enter data' => 'Enter your settings
and then press Save.', @@ -1130,6 +1131,7 @@ 'graph per' => 'per', 'green' => 'GREEN', 'green interface' => 'Green Interface', +'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', 'guardian alertfile' => 'Alertfile', 'guardian configuration' => 'Guardian Configuration', @@ -1207,6 +1209,7 @@ 'installed' => 'Installed', 'installed updates' => 'Installed updates:', 'instant update' => 'Instant Update', +'integrity' => 'Integrity:', 'interface' => 'Interface', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', @@ -1318,6 +1321,7 @@ 'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', +'lifetime' => 'Lifetime:', 'line' => 'Line', 'linkq' => 'Link Quality', 'load printer' => 'Load Printer', -- 2.39.2