Hi, first of all, the patch applies except some conflicts in the language files and pppsetup.cgi. I guess these are proper conflicts but I have not investigated any further. More comments are inline. In summary: Looking good. On Thu, 2015-06-04 at 23:31 +0200, Larsen wrote: > 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. > > Fixes bug 10847. > > Signed-off-by: Lars Schuhmacher > --- > 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 | 63 +++++++++++++++--------------- > 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 | 2 +- > langs/fr/cgi-bin/fr.pl | 2 +- > langs/it/cgi-bin/it.pl | 2 +- > langs/nl/cgi-bin/nl.pl | 2 +- > langs/pl/cgi-bin/pl.pl | 2 +- > langs/ru/cgi-bin/ru.pl | 2 +- > langs/tr/cgi-bin/tr.pl | 2 +- > src/squid-accounting/accounting.cgi | 44 ++++++++++----------- > 27 files changed, 253 insertions(+), 265 deletions(-) > > 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'} *


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


$Lang::tr{'ConnSched days'}
$Lang::tr{'ConnSched days'} * $Lang::tr{'sunday'} >

$Lang::tr{'remark title'} *
$Lang::tr{'remark title'}
>
>
> > > - > + > > > diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi > index e75207a..29a71e4 100644 > --- a/html/cgi-bin/dhcp.cgi > +++ b/html/cgi-bin/dhcp.cgi > @@ -544,39 +544,39 @@ print < > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > - > + > > >
*$Lang::tr{'this field may be blank'}$Lang::tr{'required field'} > $Lang::tr{'ip address'}
$Lang::tr{'netmask'}:		$netsettings{"${itf}_ADDRESS"}
$netsettings{"${itf}_NETMASK"}
$Lang::tr{'start address'}$Lang::tr{'start address'} *$Lang::tr{'end address'}$Lang::tr{'end address'} *
$Lang::tr{'default lease time'}$Lang::tr{'default lease time'} *$Lang::tr{'max lease time'}$Lang::tr{'max lease time'} *
$Lang::tr{'domain name suffix'} *$Lang::tr{'domain name suffix'}$Lang::tr{'dhcp allow bootp'}:
$Lang::tr{'primary dns'}$Lang::tr{'primary dns'} *$Lang::tr{'secondary dns'} *$Lang::tr{'secondary dns'}
$Lang::tr{'primary ntp server'}: *$Lang::tr{'primary ntp server'}:$Lang::tr{'secondary ntp server'}: *$Lang::tr{'secondary ntp server'}:
$Lang::tr{'primary wins server address'}: *$Lang::tr{'primary wins server address'}:$Lang::tr{'secondary wins server address'}: *$Lang::tr{'secondary wins server address'}:
next-server: *next-server:filename: *filename:
There are some hard-coded strings here. These are not newly introduced but still we should fix them in an other patch later. I am sure you have come across a couple of them. > @@ -588,7 +588,7 @@ END > print < > > - > + > > > > @@ -622,13 +622,13 @@ if ($opt ne '') { > } > print < > - > + > > - > + > > $opt > > - > + > \n"; > + print "\n"; > print "\n"; > if ($pppsettings{'TYPE'} eq 'modem' ) { > print "\n"; > @@ -711,15 +711,15 @@ END > > > > - > + > > > > - > + > > > > - > + > > > > @@ -732,7 +732,7 @@ END > > print < > - > + > > > > @@ -774,11 +774,11 @@ print < > > > - > + > > > > - > + > > > END > @@ -793,15 +793,15 @@ print < > > > - > + > > > > - > + > > > > - > + > > > > @@ -889,12 +889,12 @@ print < > > > - > + > > > > > - > + > > > > @@ -909,11 +909,11 @@ print < > > > - > + > > > > - > + > > > END > @@ -925,9 +925,9 @@ print < > > > - > + > > - > + > > > > @@ -948,7 +948,7 @@ END > } > print < > - > + > > > > @@ -969,7 +969,7 @@ print < > > > - > + > > > @@ -978,7 +978,7 @@ print < > > > - > + > >
* $Lang::tr{'this field may be blank'}* $Lang::tr{'required field'}$warnNTPmessage
$Lang::tr{'dhcp advopt name'}:$Lang::tr{'dhcp advopt name'}: *$Lang::tr{'dhcp advopt value'}:$Lang::tr{'dhcp advopt value'}: *
$Lang::tr{'enabled'}$Lang::tr{'dhcp advopt scope'}: *$Lang::tr{'dhcp advopt scope'}: > END > ; > @@ -649,7 +649,7 @@ print <
> > > - > + > > - > + > > - > + > > - > + > > > > > > > - > + > > - > + > > - > + > > >
* $Lang::tr{'dhcp advopt scope help'}$Lang::tr{'dhcp advopt scope help'} > > > @@ -827,29 +827,29 @@ if ($dhcpsettings{'KEY2'} ne '') { > } > print <
$Lang::tr{'mac address'}:$Lang::tr{'mac address'}: *$Lang::tr{'ip address'}:$Lang::tr{'ip address'}: *$Lang::tr{'remark'}: *$Lang::tr{'remark'}:
$Lang::tr{'enabled'}
$Lang::tr{'dhcp bootp pxe data'}
next-server: *next-server:filename: *filename:root path: *root path:
>
> > > - > + > >
* $Lang::tr{'this field may be blank'}* $Lang::tr{'required field'} > > > @@ -857,7 +857,6 @@ print <
> > -
> END > ; > #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new 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'}: *$Lang::tr{'enabled'}
$Lang::tr{'dnsforward forward_server'}:$Lang::tr{'dnsforward forward_server'}: *
> > > > - > + > > >
$Lang::tr{'remark'}: *$Lang::tr{'remark'}:
> @@ -229,7 +229,7 @@ print < > > > - > + > > > > - > + > END > ; > } else { > print < - * > + > END > ; > } > @@ -179,12 +179,12 @@ END > ; > if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { > print < - * > + > END > ; > } else { > print < - * > + > END > ; > } > @@ -195,7 +195,7 @@ print < > > > -
> +
>
> > > - > - > - > - > - > - > + > + > + > + > + > + > > > > - > + >
* $Lang::tr{'this field may be blank'}* $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'}: *$Lang::tr{'hostname'}:$Lang::tr{'hostname'}: *
$Lang::tr{'domain name'}: *$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'} * > END > ; > if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { > @@ -159,12 +159,12 @@ END > ; > if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { > print < - *
* $Lang::tr{'this field may be blank'}* $Lang::tr{'required 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 < > > - > + > > - > + > > > > - > + > > - > + > > > > - > + > > - > + > > > > - > + > > > > @@ -107,8 +107,7 @@ print <
> > > > > > - > + > > > > - >
$Lang::tr{'init string'} *$Lang::tr{'init string'}$Lang::tr{'hangup string'} *$Lang::tr{'hangup string'}
$Lang::tr{'speaker on'} *$Lang::tr{'speaker on'}$Lang::tr{'speaker off'} *$Lang::tr{'speaker off'}
$Lang::tr{'tone dial'} *$Lang::tr{'tone dial'}$Lang::tr{'pulse dial'} *$Lang::tr{'pulse dial'}
$Lang::tr{'connect timeout'}$Lang::tr{'connect timeout'} *  
> - *  > - $Lang::tr{'this field may be blank'} > + * $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 > > > > + * $Lang::tr{'required field'} > >
$Lang::tr{'organization name'}:
$Lang::tr{'organization name'}: * 
$Lang::tr{'ipfires hostname'}:
$Lang::tr{'ipfires hostname'}: * 
$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'}:  
> - * $Lang::tr{'this field may be blank'}

> > @@ -2018,17 +2018,17 @@ END > >
> > - > + > > > - > + > > > > > > > + * $Lang::tr{'required field'} > >
$Lang::tr{'upload p12 file'}:
$Lang::tr{'upload p12 file'}: * 
$Lang::tr{'pkcs12 file password'}: *
$Lang::tr{'pkcs12 file password'}: 
  
> -  $Lang::tr{'this field may be blank'}
> END > @@ -3101,11 +3101,10 @@ if ( -s "${General::swroot}/ovpn/settings") { >
$Lang::tr{'net to net vpn'} (Upload Client Package)
 
 Import Connection Name
 Import Connection Name
 $Lang::tr{'openvpn default'}: Client Packagename
* $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"; > > - print ""; > + print ""; > > if ($cgiparams{'TYPE'} eq 'host') { > if ($cgiparams{'KEY'}) { > @@ -4526,14 +4525,14 @@ if ($cgiparams{'TYPE'} eq 'net') { > > > > - > + > > > - > + > > > > - > + > > > > @@ -4543,10 +4542,10 @@ if ($cgiparams{'TYPE'} eq 'net') { > > > > - > + > > > - > + > > > > @@ -4556,22 +4555,22 @@ if ($cgiparams{'TYPE'} eq 'net') { > > > > - > + > > > > > - > + > > > > > - > + > > > > > - > > > > @@ -4622,7 +4621,7 @@ END > ; > } > #jumper > - print ""; > + print ""; > print "
$Lang::tr{'name'}:
$Lang::tr{'name'}: *
$Lang::tr{'local subnet'}
$Lang::tr{'local subnet'} *$Lang::tr{'remote subnet'}$Lang::tr{'remote subnet'} *
$Lang::tr{'ovpn subnet'}
$Lang::tr{'ovpn subnet'} *$Lang::tr{'protocol'}
$Lang::tr{'destination port'}:$Lang::tr{'destination port'}: *Management Port ($Lang::tr{'openvpn default'}: $Lang::tr{'destination port'}):  Management Port ($Lang::tr{'openvpn default'}: $Lang::tr{'destination port'}):
$Lang::tr{'MTU settings'}
$Lang::tr{'MTU'} 
$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'}   > +
$Lang::tr{'comp-lzo'}
$Lang::tr{'remark title'} 
$Lang::tr{'remark title'}
"; > > if ($cgiparams{'TYPE'} eq 'host') { > @@ -4689,12 +4688,12 @@ if ($cgiparams{'TYPE'} eq 'host') { >
 
$Lang::tr{'generate a certificate'} 
 $Lang::tr{'users fullname or system hostname'}:
 $Lang::tr{'users email'}: 
 $Lang::tr{'users department'}: 
 $Lang::tr{'organization name'}: 
 $Lang::tr{'city'}: 
 $Lang::tr{'state or province'}: 
 $Lang::tr{'users fullname or system hostname'}: *
 $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{'generate a certificate'} 
 $Lang::tr{'users fullname or system hostname'}:
 $Lang::tr{'users email'}: 
 $Lang::tr{'users department'}: 
 $Lang::tr{'organization name'}: 
 $Lang::tr{'city'}: 
 $Lang::tr{'state or province'}: 
 $Lang::tr{'users fullname or system hostname'}: *
 $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{'this field may be blank'}
* $Lang::tr{'required field'}
> END > }else{ > @@ -4761,7 +4760,7 @@ END >
   
   
* $Lang::tr{'this field may be blank'}
* $Lang::tr{'required field'}
> > END > diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi > index 33f521e..72be46e 100644 > --- a/html/cgi-bin/pppsetup.cgi > +++ b/html/cgi-bin/pppsetup.cgi > @@ -693,7 +693,7 @@ END > ; > } > if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) { > - print "
$Lang::tr{'number'}
$Lang::tr{'number'} *
$Lang::tr{'modem speaker on'}
$Lang::tr{'optional at cmd'} 1 *$Lang::tr{'optional at cmd'} 1
$Lang::tr{'optional at cmd'} 2 *$Lang::tr{'optional at cmd'} 2
$Lang::tr{'optional at cmd'} 3 *$Lang::tr{'optional at cmd'} 3
$Lang::tr{'idle timeout'}$Lang::tr{'idle timeout'} *
$Lang::tr{'holdoff'}:$Lang::tr{'holdoff'}: *
$Lang::tr{'maximum retries'}$Lang::tr{'maximum retries'} *
$Lang::tr{'pptp settings'}
PeerPeer: *
My NetconfigMy Netconfig: *
PPTP Route *PPTP Route:
$Lang::tr{'pppoe settings'}
$Lang::tr{'service name'} *$Lang::tr{'service name'}
$Lang::tr{'concentrator name'} *$Lang::tr{'concentrator name'}
MTU *MTU:
MRU *MRU:
$Lang::tr{'authentication'}
$Lang::tr{'username'}$Lang::tr{'username'} *$Lang::tr{'password'}$Lang::tr{'password'} *
$Lang::tr{'script name'} *$Lang::tr{'script name'}






$Lang::tr{'profile name'}$Lang::tr{'profile name'} * >
$Lang::tr{'legend'}:* $Lang::tr{'this field may be blank'}* $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'}: * > > > > @@ -988,7 +988,7 @@ if ($netsettings{'BLUE_DEV'}) { > print " "; > } > print < - $Lang::tr{'advproxy visible hostname'}: * > + $Lang::tr{'advproxy visible hostname'}: > > > > @@ -1035,7 +1035,7 @@ print <
> > > - > + > END > ; > my $count = `ip n| wc -l`; > @@ -1071,19 +1071,19 @@ print < > > > - > + > > > > > > - > + > > > > > > - > + > > > > @@ -1119,28 +1119,28 @@ print < > > > - > + > > > > - > + > > - > + > > > > > > > - > + > > - > + > > > > - > + > > - > + > > > > @@ -1158,7 +1158,7 @@ print < > > > - > + > > > > @@ -1218,8 +1218,8 @@ print < > > > - > - > + > + > > > > > > @@ -1782,7 +1782,7 @@ END > my $val=sprintf"%.3f",$cgiparams{'txt_cent'}; > print""; > #Optional note > - print""; > + print""; > print"
$Lang::tr{'advproxy redirector children'}
$Lang::tr{'processes'}
$Lang::tr{'processes'}: *
$Lang::tr{'advproxy via forwarding'}:$Lang::tr{'advproxy upstream proxy host:port'} *$Lang::tr{'advproxy upstream proxy host:port'}:
$Lang::tr{'advproxy client IP forwarding'}:$Lang::tr{'advproxy upstream username'}: *$Lang::tr{'advproxy upstream username'}:
$Lang::tr{'advproxy username forwarding'}:$Lang::tr{'advproxy upstream password'}: *$Lang::tr{'advproxy upstream password'}:
$Lang::tr{'proxy cachemgr'}:$Lang::tr{'advproxy admin mail'}: *$Lang::tr{'advproxy admin mail'}:
$Lang::tr{'proxy filedescriptors'}:$Lang::tr{'proxy filedescriptors'}: *$Lang::tr{'proxy admin password'}: *$Lang::tr{'proxy admin password'}:
$Lang::tr{'advproxy ram cache size'}:$Lang::tr{'advproxy ram cache size'}: *$Lang::tr{'advproxy hdd cache size'}:$Lang::tr{'advproxy hdd cache size'}: *
$Lang::tr{'advproxy min size'}:$Lang::tr{'advproxy min size'}: *$Lang::tr{'advproxy max size'}:$Lang::tr{'advproxy max size'}: *
$Lang::tr{'advproxy no cache sites'}: *$Lang::tr{'advproxy no cache sites'}:
$Lang::tr{'advproxy standard ports'}:$Lang::tr{'advproxy ssl ports'}:$Lang::tr{'advproxy standard ports'}: *$Lang::tr{'advproxy ssl ports'}: *

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


"; > print"
"; > >