From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ed5fee308f8538f226e75ae8d0f356b6b18dd86b Date: Mon, 21 Sep 2015 17:51:32 +0200 Message-ID: <20150921155133.0BF5A20EFD@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3983119510121743183==" List-Id: --===============3983119510121743183== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ed5fee308f8538f226e75ae8d0f356b6b18dd86b (commit) via e3edceeb7a0bdb9b56fabf625e04f78bc2f69834 (commit) via b1fb211827460c7beddee53bc26e0e812acedbfb (commit) via 34ca23086716176974fad1d63e6412e15287f2c6 (commit) via 0a39488e4af4cf27bc111591000278c3fe01db51 (commit) from 1f4fea71a62d4c699de09f4a4b6258e6dd52845b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed5fee308f8538f226e75ae8d0f356b6b18dd86b Author: Michael Tremer Date: Mon Sep 7 19:39:40 2015 +0100 core94: Ship changed CGI files =20 Signed-off-by: Michael Tremer commit e3edceeb7a0bdb9b56fabf625e04f78bc2f69834 Author: Lars Schuhmacher Date: Mon Sep 7 19:39:39 2015 +0100 Mark required input fields with a star =20 Mark required input fields with a star as nowadays this is the de-facto default. Before, it was the other way around and optional fields were marked. =20 Signed-off-by: Lars Schumacher Signed-off-by: Michael Tremer commit b1fb211827460c7beddee53bc26e0e812acedbfb Merge: 34ca230 1f4fea7 Author: Michael Tremer Date: Mon Sep 21 16:12:25 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 34ca23086716176974fad1d63e6412e15287f2c6 Author: Michael Tremer Date: Sun Sep 20 13:31:58 2015 +0100 core94: Ship changed setup package =20 Signed-off-by: Michael Tremer commit 0a39488e4af4cf27bc111591000278c3fe01db51 Author: Osmar Gonzalez Date: Sun Sep 20 02:24:32 2015 -0700 Corrected typo in networking.c =20 Corrected "Misssing" to "Missing". =20 Signed-off-by: Osmar Gonzalez Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 15 +++++ .../{oldcore/89 =3D> core/94}/filelists/setup | 0 html/cgi-bin/connscheduler.cgi | 10 +-- html/cgi-bin/dhcp.cgi | 51 +++++++------- html/cgi-bin/dnsforward.cgi | 8 +-- html/cgi-bin/hosts.cgi | 10 +-- html/cgi-bin/mac.cgi | 12 ++-- html/cgi-bin/modem.cgi | 17 +++-- html/cgi-bin/ovpnmain.cgi | 73 ++++++++++---------- html/cgi-bin/pppsetup.cgi | 38 +++++------ html/cgi-bin/proxy.cgi | 78 +++++++++++---------= -- html/cgi-bin/qos.cgi | 6 +- html/cgi-bin/time.cgi | 6 +- html/cgi-bin/tor.cgi | 18 +++-- html/cgi-bin/updatexlrator.cgi | 4 +- html/cgi-bin/urlfilter.cgi | 48 ++++++------- html/cgi-bin/vpnmain.cgi | 64 +++++++++--------- html/cgi-bin/wakeonlan.cgi | 6 +- html/cgi-bin/wireless.cgi | 8 +-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 1 - langs/fr/cgi-bin/fr.pl | 1 - langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 1 - langs/pl/cgi-bin/pl.pl | 1 - langs/ru/cgi-bin/ru.pl | 1 - langs/tr/cgi-bin/tr.pl | 1 - lfs/squid-accounting | 2 +- lfs/tor | 2 +- src/setup/networking.c | 2 +- src/squid-accounting/accounting.cgi | 55 ++++++++++----- 32 files changed, 284 insertions(+), 260 deletions(-) copy config/rootfiles/{oldcore/89 =3D> core/94}/filelists/setup (100%) Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core= /94/filelists/files index 540b8a3..e63a611 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -3,9 +3,24 @@ etc/issue etc/rc.d/init.d/networking/red etc/rc.d/init.d/snort etc/rc.d/init.d/sshd +srv/web/ipfire/cgi-bin/connscheduler.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/hosts.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/mac.cgi srv/web/ipfire/cgi-bin/mail.cgi +srv/web/ipfire/cgi-bin/modem.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wakeonlan.cgi +srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/94/filelists/setup b/config/rootfiles/core= /94/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/94/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index c3bd0bc..90aae52 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -275,7 +275,7 @@ print < - + - - + - +
$Lang::tr{'ConnSched time'}$Lang::tr{'ConnSched time'} 3D'*'


$Lang::tr{'ConnSched action'} +
$Lang::tr{'ConnSched action'}   


$Lang::tr{'ConnSched days'}
$Lang::tr{'ConnSched days'} 3D'*'  

$Lang::tr{'remark title'} 3D'*'
$Lang::tr{'remark title'}

- + diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 971c51e..a22bcd4 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -547,39 +547,39 @@ print < - + - + - + - + - + - + - + - + - + - + - + - + -
3D'*'$Lang::tr{'this field may be blank'}$Lang::tr{'required field'} $Lang::tr{'ip address'}
$Lang::tr{= 'netmask'}:		$netsettings{"${itf}_ADDRESS"}
$netsettings{"${it= f}_NETMASK"}
$Lang::tr{'start address'}$Lang::tr{'start address'} 3D'*' $Lang::tr{'end address'}$Lang::tr{'end address'} 3D'*'
$Lang::tr{'default lease time'}$Lang::tr{'default lease time'} 3D'*' $Lang::tr{'max lease time'}$Lang::tr{'max lease time'} 3D'*'
$Lang::tr{'domain name suffix'} 3D'*'$Lang::tr{'domain name suffix'} $Lang::tr{'dhcp allow bootp'}:
$Lang::tr{'primary dns'}$Lang::tr{'primary dns'} 3D'*' $Lang::tr{'secondary dns'} 3D'*'$Lang::tr{'secondary dns'}
$Lang::tr{'primary ntp server'}: 3D'*'$Lang::tr{'primary ntp server'}: $Lang::tr{'secondary ntp server'}: 3D'*'$Lang::tr{'secondary ntp server'}:
$Lang::tr{'primary wins server address'}: 3D'*'$Lang::tr{'primary wins server address'}: $Lang::tr{'secondary wins server address'}: $Lang::tr{'secondary wins server address'}:
next-server: 3D'*'= next-server: filename: 3D'*' + filename:
@@ -591,7 +591,7 @@ END print < -  $Lang::tr{'this field may be blank'} +  $Lang::tr{'required field'} $warnNTPmessage @@ -625,13 +625,13 @@ if ($opt ne '') { } print < - $Lang::tr{'dhcp advopt name'}: + $Lang::tr{'dhcp advopt name'}: 3D'*' - $Lang::tr{'dhcp advopt value'}: + $Lang::tr{'dhcp advopt value'}: 3D'*' $opt $Lang::tr{'enabled'} - $Lang::tr{'dhcp advopt scope'}: 3D'*' + $Lang::tr{'dhcp advopt scope'}: END ; @@ -652,7 +652,7 @@ print < - + + - + - + - + - -
 $Lang::tr{'dhcp advopt scope help'}$Lang::tr{'dhcp advopt scope help'} @@ -830,29 +830,29 @@ if ($dhcpsettings{'KEY2'} ne '') { } print < - $Lang::tr{'mac address'}:$Lang::tr{'mac address'}: 3D'*' $Lang::tr{'ip address'}:$Lang::tr{'ip address'}: 3D'*' $Lang::tr{'remark'}: =3D'*'$Lang::tr{'remark'}:
$Lang::tr{'enabled'}
$Lang::tr{'dhcp bootp pxe data'}
next-server: 3D'*'= next-server: filename: 3D'*' + filename: root path: 3D'*' + root path:
- +
 $Lang::tr{'this field may be blank'} $Lang::tr{'required field'} @@ -860,7 +860,6 @@ print <
-
END ; #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'ne= w sort order' diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index b66fa46..1afc55f 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -207,20 +207,20 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { print < - $Lang::tr{'dnsforward zone'}: + $Lang::tr{'dnsforward zone'}: 3D'*' $Lang::tr{'enabled'} =20 - $Lang::tr{'dnsforward forward_server'}: + $Lang::tr{'dnsforward forward_server'}:&n= bsp;3D'*' =20 - +
$Lang::tr{'remark'}: 3D'*'$Lang::tr{'remark'}:
@@ -229,7 +229,7 @@ print < - 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index bb7df1f..e3463d1 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -223,7 +223,7 @@ if ($errormessage) { # #
# -# # # @@ -253,12 +253,12 @@ print <
+# # $warnmessage
- + - + - + @@ -268,7 +268,7 @@ print <
$Lang::tr{'host ip'}: $Lang::tr{'host ip'}: =3D'*' $Lang::tr{'hostname'}:$Lang::tr{'hostname'}: 
$Lang::tr{'domain name'}: 3D'*'$Lang::tr{'domain name'}: $Lang::tr{'enabled'}
- +
 $Lang::tr{'this field may be blank'} $Lang::tr{'required field'}
diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi index 1d34363..161be34 100644 --- a/html/cgi-bin/mac.cgi +++ b/html/cgi-bin/mac.cgi @@ -134,7 +134,7 @@ print <  - $Lang::tr{'mac new'} = + $Lang::tr{'mac new'} 3D'*' END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { @@ -159,12 +159,12 @@ END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { print <3D'*' + END ; } else { =20 print <3D'*' + END ; =20 }=20 @@ -179,12 +179,12 @@ END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { print <3D'*' + END ; } else { =20 print <3D'*' + END ; =20 }=20 @@ -195,7 +195,7 @@ print <
- 3D'*' $Lang::tr{'t= his field may be blank'}
+ 3D'*' $Lang::tr{'r= equired field'}
END ; diff --git a/html/cgi-bin/modem.cgi b/html/cgi-bin/modem.cgi index 48d1260..a13f8b2 100644 --- a/html/cgi-bin/modem.cgi +++ b/html/cgi-bin/modem.cgi @@ -78,25 +78,25 @@ print "
\n"; print < - $Lang::tr{'init string'} 3D'*' + $Lang::tr{'init string'} - $Lang::tr{'hangup string'} 3D'*' + $Lang::tr{'hangup string'} - $Lang::tr{'speaker on'} =3D'*' + $Lang::tr{'speaker on'} - $Lang::tr{'speaker off'} =3D'*' + $Lang::tr{'speaker off'} - $Lang::tr{'tone dial'} =3D'*' + $Lang::tr{'tone dial'} - $Lang::tr{'pulse dial'} =3D'*' + $Lang::tr{'pulse dial'} - $Lang::tr{'connect timeout'} + $Lang::tr{'connect timeout'} 3D'*'     @@ -107,8 +107,7 @@ print < - 3D'*'  - $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fb52e68..9e252a9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1956,22 +1956,22 @@ END print < - + - + - + - + - - + @@ -2002,7 +2002,7 @@ END =20 + 3D'*' $Lang::tr{'requ= ired field'}
$Lang::tr{'organization name'}:
$Lang::tr{'organization name'}: <= img src=3D'/blob.gif' alt=3D'*' />  
$Lang::tr{'ipfires hostname'}:
$Lang::tr{'ipfires hostname'}: 3D'*'  
$Lang::tr{'your e-mail'}: 
$Lang::tr{'your e-mail'}:  
$Lang::tr{'your department'}: 
$Lang::tr{'your department'}:  
$Lang::tr{'city'}: $Lang::tr{'city'}:  
$Lang::tr{'state or province'}: 
$Lang::tr{'state or province'}:  
$Lang::tr{'country'}:   
- 3D'*' $Lang::tr{'this= field may be blank'}

@@ -2018,17 +2018,17 @@ END =20
- + - + + 3D'*' $Lang::tr{'requi= red field'}
$Lang::tr{'upload p12 file'}:
$Lang::tr{'upload p12 file'}: = ;3D'*'  
$Lang::tr{'pkcs12 file password'}: 3D'*'
$Lang::tr{'pkcs12 file password'}:  
   
-  $Lang::tr{'this f= ield may be blank'}
END @@ -3101,11 +3101,10 @@ if ( -s "${General::swroot}/ovpn/settings") { =09 $Lang::tr{'net to net vpn'} (Upload Client Package)   -  Import Connection Name +  Import Connection Name  $Lang::tr{'openvpn default'}: Client Packagename
- 3D'*' $Lang::tr{'this field may be blank'} END ; @@ -4487,7 +4486,7 @@ if ($cgiparams{'TYPE'} eq 'net') { &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); print "\n"; =20 - print ""; + print ""; =09 if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { @@ -4526,14 +4525,14 @@ if ($cgiparams{'TYPE'} eq 'net') { =20 - + =20 - + =20 - + =20 @@ -4543,10 +4542,10 @@ if ($cgiparams{'TYPE'} eq 'net') { =09 - + =20 - + =20 @@ -4556,22 +4555,22 @@ if ($cgiparams{'TYPE'} eq 'net') { =20 - + =20 - + =20 - + =20 - =20 @@ -4622,7 +4621,7 @@ END ; } #jumper - print ""; + print ""; print "
$Lang::tr{'name'}:
$Lang::tr{'name'}: =
$Lang::tr{'local subnet'}
$Lang::tr{'local subnet'} = ;3D'*' $Lang::tr{'remote subnet'}$Lang::tr{'remote subnet'} <= img src=3D'/blob.gif' alt=3D'*' />
$Lang::tr{'ovpn subnet'}
$Lang::tr{'ovpn subnet'} = 3D'*' $Lang::tr{'protocol'}
$Lang::tr{'destination port'}:$Lang::tr{'destination port'}: 3D'*' Management Port ($Lang::tr{'openv= pn default'}: $Lang::tr{'destination port'}):  Management Port ($Lang::tr{'openv= pn default'}: $Lang::tr{'destination port'}):
$Lang::tr{'MTU settings'}
$Lang::tr{'MTU'} <= img src=3D'/blob.gif' />
$Lang::tr{'MTU'} $Lang::tr{'openvpn default'}: udp/tcp 1500/1400
fragment  
fragment: $Lang::tr{'openvpn default'}: 1300
mssfix  
mssfix: $Lang::tr{'openvpn default'}: on
$Lang::tr{'comp-lzo'} &= nbsp; +
$Lang::tr{'comp-lzo'} =
$Lang::tr{'remark title'} 
$Lang::tr{'remark title'}
"; =09 if ($cgiparams{'TYPE'} eq 'host') { @@ -4689,12 +4688,12 @@ if ($cgiparams{'TYPE'} eq 'host') {
  $Lang::tr{'genera= te a certificate'}  -  $Lang::tr{'users fullname or syst= em hostname'}: -  $Lang::tr{'users email'}:  -  $Lang::tr{'users department'}:&nb= sp; -  $Lang::tr{'organization name'}:&n= bsp; -  $Lang::tr{'city'}:  -  $Lang::tr{'state or province'}:&n= bsp; +  $Lang::tr{'users fullname or syst= em hostname'}: 3D'*' +  $Lang::tr{'users email'}: +  $Lang::tr{'users department'}: +  $Lang::tr{'organization name'}: +  $Lang::tr{'city'}: +  $Lang::tr{'state or province'}:  $Lang::tr{'country'}:$Lang::tr{'genera= te a certificate'}  -  $Lang::tr{'users fullname or syst= em hostname'}: -  $Lang::tr{'users email'}:  -  $Lang::tr{'users department'}:&nb= sp; -  $Lang::tr{'organization name'}:&n= bsp; -  $Lang::tr{'city'}:  -  $Lang::tr{'state or province'}:&n= bsp; +  $Lang::tr{'users fullname or syst= em hostname'}: 3D'*' +  $Lang::tr{'users email'}: +  $Lang::tr{'users department'}: +  $Lang::tr{'organization name'}: +  $Lang::tr{'city'}: +  $Lang::tr{'state or province'}:  $Lang::tr{'country'}:=  
- 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} END }else{ @@ -4761,7 +4760,7 @@ END        
- 3D'*' $Lang::tr{'this field may be blank'} + 3D'*' $Lang::tr{'required field'} =20 END diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 59677a4..b3e8e6c 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -693,7 +693,7 @@ END ; } if ($pppsettings{'TYPE'} =3D~ /^(modem)$/ ) { - print "$Lang::tr= {'number'}\n"; + print "$Lang::tr= {'number'} 3D'*'\n"; print "\n"; if ($pppsettings{'TYPE'} eq 'modem' ) { print "$= Lang::tr{'modem speaker on'}\n"; @@ -711,15 +711,15 @@ END - $Lang::tr{'optional at cmd'} 1&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 1<= /td> - $Lang::tr{'optional at cmd'} 2&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 2<= /td> - $Lang::tr{'optional at cmd'} 3&= nbsp;3D'*' + $Lang::tr{'optional at cmd'} 3<= /td> @@ -732,7 +732,7 @@ END =20 print < - $Lang::tr{'idle timeout'} + $Lang::tr{'idle timeout'} 3D'*' @@ -774,11 +774,11 @@ print < - $Lang::tr{'holdoff'}: + $Lang::tr{'holdoff'}: 3D'*' - $Lang::tr{'maximum retries'} + $Lang::tr{'maximum retries'}  END @@ -793,15 +793,15 @@ print <$L= ang::tr{'pptp settings'} - $Lang::tr{'pptp peer'}: + $Lang::tr{'pptp peer'}: 3D'*' - $Lang::tr{'pptp netconfig'}: + $Lang::tr{'pptp netconfig'}: 3D'*' - $Lang::tr{'pptp route'}: 3D'*' + $Lang::tr{'pptp route'}: =20 @@ -889,12 +889,12 @@ print <$L= ang::tr{'pppoe settings'} - $Lang::tr{'service name'} 3D'*' + $Lang::tr{'service name'} - $Lang::tr{'concentrator name'} 3D'*' + $Lang::tr{'concentrator name'} @@ -909,11 +909,11 @@ print < - MTU 3D'*' + MTU: - MRU 3D'*' + MRU: END @@ -925,9 +925,9 @@ print <$L= ang::tr{'authentication'} - $Lang::tr{'username'} + $Lang::tr{'username'} 3D'*' - $Lang::tr{'password'} + $Lang::tr{'password'} 3D'*' @@ -948,7 +948,7 @@ END } print < - $Lang::tr{'script name'} 3D'*' + $Lang::tr{'script name'}

@@ -969,7 +969,7 @@ print <



- $Lang::tr{'profile name'} + $Lang::tr{'profile name'} 3D'*' @@ -978,7 +978,7 @@ print < $Lang::tr{'legend'}: - 3D'*'&= nbsp;$Lang::tr{'this field may be blank'} + 3D'*'&= nbsp;$Lang::tr{'required field'} END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index ba2455a..6c4e2b0 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -969,13 +969,13 @@ print < $Lang::tr{'advproxy enabled on'} Green: - $Lang::tr{'advproxy proxy port'}: + $Lang::tr{'advproxy proxy port'}:  $Lang::tr{'advproxy transparent on'} Green: - $Lang::tr{'advproxy proxy port transparent= '}: + $Lang::tr{'advproxy proxy port transparent= '}: 3D'*' @@ -988,7 +988,7 @@ if ($netsettings{'BLUE_DEV'}) { print " "; } print <$Lang::tr{'advproxy visible hostname'}: 3D'*' + $Lang::tr{'advproxy visible hostname'}: @@ -1035,7 +1035,7 @@ print < - + END ; my $count =3D `ip n| wc -l`; @@ -1071,19 +1071,19 @@ print < - + - + - + @@ -1119,28 +1119,28 @@ print < - + - + - + - + - + - + - + @@ -1158,7 +1158,7 @@ print < - + @@ -1218,8 +1218,8 @@ print < - - + + @@ -1759,7 +1784,7 @@ END my $val=3Dsprintf"%.3f",$cgiparams{'txt_cent'}; print""; #Optional note - print""; + print""; print"
$Lang::tr{'advproxy redirector child= ren'}
$Lang::tr{'processes'}
$Lang::tr{'processes'}: 3D'*'$Lang::tr{'advproxy via forwarding'}: $Lang::tr{'advproxy upstream proxy host:po= rt'} 3D'*'$Lang::tr{'advproxy upstream proxy host:po= rt'}:
$Lang::tr{'advproxy client IP forwarding'}: $Lang::tr{'advproxy upstream username'}: 3D'*'$Lang::tr{'advproxy upstream username'}:
$Lang::tr{'advproxy username forwarding'}: $Lang::tr{'advproxy upstream password'}: 3D'*'$Lang::tr{'advproxy upstream password'}:
$Lang::tr{'proxy cachemgr'}: $Lang::tr{'advproxy admin mail'}: 3D'*'$Lang::tr{'advproxy admin mail'}:
$Lang::tr{'proxy filedescriptors'}:$Lang::tr{'proxy filedescriptors'}: 3D'*' $Lang::tr{'proxy admin password'}: 3D'*'$Lang::tr{'proxy admin password'}:
$Lang::tr{'advproxy ram cache size'}:$Lang::tr{'advproxy ram cache size'}: 3D'*' $Lang::tr{'advproxy hdd cache size'}:$Lang::tr{'advproxy hdd cache size'}: 3D'*'
$Lang::tr{'advproxy min size'}:$Lang::tr{'advproxy min size'}: 3D'*' $Lang::tr{'advproxy max size'}:$Lang::tr{'advproxy max size'}: 3D'*'
$Lang::tr{'advproxy no cache sites'}: =3D'*'$Lang::tr{'advproxy no cache sites'}:
$Lang::tr{'advproxy standard ports'}:$Lang::tr{'advproxy ssl ports'}:$Lang::tr{'advproxy standard ports'}: = ;3D'*'$Lang::tr{'advproxy ssl ports'}: 

$Lang::tr{'acct cent'}$settings{'CURRENCY'}
3D'*'=$Lang::tr{'acct optional'}
3D'*'=$Lang::tr{'required field'}


"; print"
"; =20 hooks/post-receive -- IPFire 2.x development tree --===============3983119510121743183==--