Hi, I would like to merge this patch, but unfortunately it does not merge. It seems to be an encoding issue in the language files. Could you push your git branch somewhere where I can pull from and send me a URL? Best, -Michael On Sat, 2015-08-22 at 22:43 +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 | 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 - > src/squid-accounting/accounting.cgi | 69 +++++++++++++++++++++------ > ----- > 27 files changed, 273 insertions(+), 264 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'}  src='/blob.gif' alt='*' />


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


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

$Lang::tr{'remark title'}  src='/blob.gif' alt='*' />
$Lang::tr{'remark title'} value='$comment' />
>
>
> > > - > + > > /> > 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 < $checked{'ENABLE'}{'on'} /> > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > - > + > > > - > + > > - > + > > >
*$Lang::tr{'this field may be > blank'}$Lang::tr{'required field'} value='$buttontext' /> > $Lang::tr{'ip address'}
/>$Lang::tr{'netmask'}:		$netsettings{"${itf}_ADDRESS"}
/>$netsettings{"${itf}_NETMASK"}
$Lang::tr{'start address'}$Lang::tr{'start > address'} * value='$dhcpsettings{"START_ADDR_${itf}"}' />$Lang::tr{'end address'}$Lang::tr{'end address'}  src='/blob.gif' alt='*' /> value='$dhcpsettings{"END_ADDR_${itf}"}' />
$Lang::tr{'default lease time'}$Lang::tr{'default lease time'}  src='/blob.gif' alt='*' /> value='$dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"}' />$Lang::tr{'max lease time'}$Lang::tr{'max lease time'}  src='/blob.gif' alt='*' /> value='$dhcpsettings{"MAX_LEASE_TIME_${itf}"}' />
$Lang::tr{'domain name suffix'}  src='/blob.gif' alt='*' />$Lang::tr{'domain name suffix'} value='$dhcpsettings{"DOMAIN_NAME_${itf}"}' />$Lang::tr{'dhcp allow bootp'}: $checked{'ENABLEBOOTP'}{'on'} />
$Lang::tr{'primary dns'}$Lang::tr{'primary dns'}  src='/blob.gif' alt='*' /> value='$dhcpsettings{"DNS1_${itf}"}' />$Lang::tr{'secondary dns'}  src='/blob.gif' alt='*' />$Lang::tr{'secondary dns'} value='$dhcpsettings{"DNS2_${itf}"}' />
$Lang::tr{'primary ntp server'}:  src='/blob.gif' alt='*' />$Lang::tr{'primary ntp server'}: value='$dhcpsettings{"NTP1_${itf}"}' />$Lang::tr{'secondary ntp server'}:  src='/blob.gif' alt='*' />$Lang::tr{'secondary ntp server'}: value='$dhcpsettings{"NTP2_${itf}"}' />
$Lang::tr{'primary wins server > address'}: *$Lang::tr{'primary wins server address'}: value='$dhcpsettings{"WINS1_${itf}"}' />$Lang::tr{'secondary wins server > address'}: *$Lang::tr{'secondary wins server > address'}: value='$dhcpsettings{"WINS2_${itf}"}' />
next-server: * />next-server: value='$dhcpsettings{"NEXT_${itf}"}' />filename: * />filename: value='$dhcpsettings{"FILE_${itf}"}' />
> @@ -591,7 +591,7 @@ END > print < > > - > + > > > > @@ -625,13 +625,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 < > > > - > + > >
alt='*' /> $Lang::tr{'this field may be blank'} alt='*' /> $Lang::tr{'required field'}$warnNTPmessage value='$Lang::tr{'save'}' />
$Lang::tr{'dhcp advopt name'}:$Lang::tr{'dhcp advopt name'}:  src='/blob.gif' alt='*' /> value='$dhcpsettings{'ADVOPT_NAME'}' size='18' />$Lang::tr{'dhcp advopt value'}:$Lang::tr{'dhcp advopt value'}:  src='/blob.gif' alt='*' /> value='$dhcpsettings{'ADVOPT_DATA'}' size='40' />
$Lang::tr{'enabled'} type='checkbox' name='ADVOPT_ENABLED' > $checked{'ADVOPT_ENABLED'}{'on'} />$Lang::tr{'dhcp advopt scope'}:  src='/blob.gif' alt='*' />$Lang::tr{'dhcp advopt scope'}: > END > ; > @@ -652,7 +652,7 @@ print <
> > > - > + > > - > + > > - > + > > - > + > > > > > > > - > + > > - > + > > - > + > > >
alt='*' /> $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'}:  src='/blob.gif' alt='*' /> value='$dhcpsettings{'FIX_MAC'}' size='18' />$Lang::tr{'ip address'}:$Lang::tr{'ip address'}:  src='/blob.gif' alt='*' /> value='$dhcpsettings{'FIX_ADDR'}' size='18' />$Lang::tr{'remark'}:  alt='*' />$Lang::tr{'remark'}: value='$dhcpsettings{'FIX_REMARK'}' size='18' />
$Lang::tr{'enabled'} type='checkbox' name='FIX_ENABLED' $checked{'FIX_ENABLED'}{'on'} > />
$Lang::tr{'dhcp bootp pxe data'}
next-server: * />next-server: value='$dhcpsettings{'FIX_NEXTADDR'}' size='18' />filename: * />filename: value='$dhcpsettings{'FIX_FILENAME'}' size='18' />root path: * />root path: value='$dhcpsettings{'FIX_ROOTPATH'}' size='18' />
>
> > > - > + > >
alt='*' /> $Lang::tr{'this field may be blank'} alt='*' /> $Lang::tr{'required field'} > /> > > @@ -860,7 +860,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'}: * value='$cgiparams{'ZONE'}' size='24' /> class='base'>$Lang::tr{'enabled'} name='ENABLED' $checked{'ENABLED'}{'on'} />
$Lang::tr{'dnsforward > forward_server'}:$Lang::tr{'dnsforward > forward_server'}: * value='$cgiparams{'FORWARD_SERVER'}' size='24' />
> > > > - > + > > >
class='base'>$Lang::tr{'remark'}: * /> class='base'>$Lang::tr{'remark'}: value='$cgiparams{'REMARK'}' size='40' maxlength='50' />
> @@ -229,7 +229,7 @@ print < > > > - > + > > > > - > + > END > ; > } else { > print < - value='$macsettings{"MAC1"}'/>* > + value='$macsettings{"MAC1"}'/> > END > ; > } > @@ -179,12 +179,12 @@ END > ; > if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { > print < - src='/blob.gif' alt='*' /> > + > END > ; > } else { > print < - value='$macsettings{"MAC2"}'/>* > + value='$macsettings{"MAC2"}'/> > END > ; > } > @@ -195,7 +195,7 @@ print < > > > -
align="right"> > +
>
> > > - > - > - > - > - > - > + > + > + > + > + > + > r> > r> > > - > + >
alt ='*' align='top' /> $Lang::tr{'this field may be > blank'} alt ='*' align='top' /> $Lang::tr{'required field'} > value='$Lang::tr{'add'}' /> > value='$buttontext' /> > 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 name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' />
> > - > + > > - > + > > > - > + > > > > @@ -268,7 +268,7 @@ print <
>
$Lang::tr{'host ip'}: $Lang::tr{'host ip'}:  alt='*' />$Lang::tr{'hostname'}:$Lang::tr{'hostname'}:  src='/blob.gif' alt='*' /> />
$Lang::tr{'domain name'}:  src='/blob.gif' alt='*' />$Lang::tr{'domain name'}: />$Lang::tr{'enabled'} />
> > - > + > > >
alt='*' /> $Lang::tr{'this field may be blank'} alt='*' /> $Lang::tr{'required field'} value='$Lang::tr{'add'}' /> value='$buttontext' />
> 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 < - src='/blob.gif' alt='*' />
* /> $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 "
action='$ENV{'SCRIPT_NAME'}'>\n"; > print < > > - > + > > - > + > > > > - > + > > - > + > > > > - > + > > - > + > > > > - > + > > > > @@ -107,8 +107,7 @@ print <
> > > > > > - > + > > > > - >
$Lang::tr{'init > string'} *$Lang::tr{'init string'} value='$modemsettings{'INIT'}' />$Lang::tr{'hangup > string'} *$Lang::tr{'hangup string'} value='$modemsettings{'HANGUP'}' />
$Lang::tr{'speaker on'}  src='/blob.gif' alt='*' />$Lang::tr{'speaker on'} value='$modemsettings{'SPEAKER_ON'}' />$Lang::tr{'speaker off'}  src='/blob.gif' alt='*' />$Lang::tr{'speaker off'} value='$modemsettings{'SPEAKER_OFF'}' />
$Lang::tr{'tone dial'}  src='/blob.gif' alt='*' />$Lang::tr{'tone dial'} value='$modemsettings{'TONE_DIAL'}' />$Lang::tr{'pulse dial'}  src='/blob.gif' alt='*' />$Lang::tr{'pulse dial'} value='$modemsettings{'PULSE_DIAL'}' />
$Lang::tr{'connect timeout'}$Lang::tr{'connect timeout'}  src='/blob.gif' alt='*' /> value='$modemsettings{'TIMEOUT'}' />  
> - *  > - $Lang::tr{'this field may be > blank'} > + * /> $Lang::tr{'required field'} > > value='$Lang::tr{'restore defaults'}' /> > 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 < > cellpadding='0'> > - > + > > > - > + > > > - > + > > > - > + > > > - > + > > > - > + > > > > @@ -2002,7 +2002,7 @@ END > > > > + * /> $Lang::tr{'required field'} > >
$Lang::tr{'organization > name'}:
$Lang::tr{'organization > name'}: * type='text' name='ROOTCERT_ORGANIZATION' > value='$cgiparams{'ROOTCERT_ORGANIZATION'}' size='32' /> 
$Lang::tr{'ipfires hostname'}:
$Lang::tr{'ipfires > hostname'}: * name='ROOTCERT_HOSTNAME' value='$cgiparams{'ROOTCERT_HOSTNAME'}' > size='32' /> 
$Lang::tr{'your e-mail'}:  src='/blob.gif' alt'*' />
$Lang::tr{'your e-mail'}: name='ROOTCERT_EMAIL' value='$cgiparams{'ROOTCERT_EMAIL'}' size='32' > /> 
$Lang::tr{'your department'}:  src='/blob.gif' alt'*' />
$Lang::tr{'your department'}: name='ROOTCERT_OU' value='$cgiparams{'ROOTCERT_OU'}' size='32' > /> 
$Lang::tr{'city'}:  src='/blob.gif' alt'*' />
$Lang::tr{'city'}: name='ROOTCERT_CITY' value='$cgiparams{'ROOTCERT_CITY'}' size='32' > /> 
$Lang::tr{'state or > province'}: 
$Lang::tr{'state or province'}: name='ROOTCERT_STATE' value='$cgiparams{'ROOTCERT_STATE'}' size='32' > /> 
$Lang::tr{'country'}: value='$Lang::tr{'generate root/host certificates'}' />  
> - * /> $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'}: * size='32'> 
$Lang::tr{'pkcs12 file > password'}: *
$Lang::tr{'pkcs12 file password'}: name='P12_PASS' value='$cgiparams{'P12_PASS'}' size='32' /> 
  value='$Lang::tr{'upload p12 file'}' /> 
> - > $Lang::tr{'this field may be blank'}
> END > @@ -3101,11 +3101,10 @@ if ( -s "${General::swroot}/ovpn/settings") { >
value='net2net' />$Lang::tr{'net to net vpn'} (Upload > Client Package)
  name='FH' size='30'>
 Import Connection Name src='/blob.gif' />
 Import Connection Name
  name='n2nname' size='30'>$Lang::tr{'openvpn default'}: Client > Packagename
name='ACTION' value='$Lang::tr{'add'}' />
src='/blob.gif' alt='*' /> $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 "
class='boldbase'>$Lang::tr{'name'}:
class='boldbase'>$Lang::tr{'name'}: * /> value='$cgiparams{'REMOTE'}' />
$Lang::tr{'local > subnet'}
$Lang::tr{'local > subnet'} * value='$cgiparams{'LOCAL_SUBNET'}' /> nowrap='nowrap'>$Lang::tr{'remote subnet'} nowrap='nowrap'>$Lang::tr{'remote subnet'}  alt='*' /> value='$cgiparams{'REMOTE_SUBNET'}' />
$Lang::tr{'ovpn > subnet'}
$Lang::tr{'ovpn > subnet'} * value='$cgiparams{'OVPN_SUBNET'}' /> nowrap='nowrap'>$Lang::tr{'protocol'}
$Lang::tr{'destination > port'}:$Lang::tr{'destination > port'}: * value='$cgiparams{'DEST_PORT'}' size='5' />Management Port > ($Lang::tr{'openvpn default'}: class="base">$Lang::tr{'destination port'}):   src='/blob.gif' />Management Port > ($Lang::tr{'openvpn default'}: class="base">$Lang::tr{'destination port'}): VALUE='$cgiparams{'OVPN_MGMT'}'size='5' />
$Lang::tr{'MTU > settings'}
nowrap='nowrap'>$Lang::tr{'MTU'} 
nowrap='nowrap'>$Lang::tr{'MTU'} VALUE='$cgiparams{'MTU'}'size='5' />$Lang::tr{'openvpn default'}: > udp/tcp 1500/1400
fragment   src='/blob.gif' />
fragment: VALUE='$cgiparams{'FRAGMENT'}'size='5' />$Lang::tr{'openvpn default'}: class="base">1300
mssfix   src='/blob.gif' />
mssfix: $checked{'MSSFIX'}{'on'} />$Lang::tr{'openvpn default'}: class="base">on
$Lang::tr{'comp > -lzo'}   > +
$Lang::tr{'comp > -lzo'} $checked{'COMPLZO'}{'on'} />
$Lang::tr{'remark > title'} 
$Lang::tr{'remark > title'} value='$cgiparams{'REMARK'}' size='55' maxlength='50' > />
"; > > if ($cgiparams{'TYPE'} eq 'host') { > @@ -4689,12 +4688,12 @@ if ($cgiparams{'TYPE'} eq 'host') { >
 
$checked{'AUTH'}{'certgen'} $cakeydisabled /> class='base'>$Lang::tr{'generate a > certificate'} 
 $Lang::tr{'users > fullname or system hostname'}: nowrap='nowrap'> value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'users > email'}:  nowrap='nowrap'> value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled > />
 $Lang::tr{'users > department'}:  nowrap='nowrap'> value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled />
  class='base'>$Lang::tr{'organization name'}:  src='/blob.gif' /> type='text' name='CERT_ORGANIZATION' > value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'city'}:  class='base' nowrap='nowrap'> value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'state or > province'}:  nowrap='nowrap'> value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled > />
 $Lang::tr{'users > fullname or system hostname'}: * /> name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' > $cakeydisabled />
 $Lang::tr{'users > email'}: name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' > $cakeydisabled />
 $Lang::tr{'users > department'}: name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'organization name'}: nowrap='nowrap'> value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'city'}: nowrap='nowrap'> value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'state or > province'}: name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' > $cakeydisabled />
  class='base'>$Lang::tr{'country'}: border='0'> > > > - > - > - > - > - > - > + > + > + > + > + > + > > > > - > + >
$checked{'AUTH'}{'certgen'} $cakeydisabled /> class='base'>$Lang::tr{'generate a > certificate'} 
 $Lang::tr{'users > fullname or system hostname'}: nowrap='nowrap'> value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'users > email'}:  nowrap='nowrap'> value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled > />
 $Lang::tr{'users > department'}:  nowrap='nowrap'> value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled />
  class='base'>$Lang::tr{'organization name'}:  src='/blob.gif' /> type='text' name='CERT_ORGANIZATION' > value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'city'}:  class='base' nowrap='nowrap'> value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'state or > province'}:  nowrap='nowrap'> value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled > />
 $Lang::tr{'users > fullname or system hostname'}: * /> name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' > $cakeydisabled />
 $Lang::tr{'users > email'}: name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' > $cakeydisabled />
 $Lang::tr{'users > department'}: name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'organization name'}: nowrap='nowrap'> value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled > />
  class='base'>$Lang::tr{'city'}: nowrap='nowrap'> value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled />
 $Lang::tr{'state or > province'}: name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' > $cakeydisabled />
  class='base'>$Lang::tr{'country'}: type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' > size='32' $cakeydisabled />
 
src='/blob.gif' alt='*' /> $Lang::tr{'this field may be > blank'}
src='/blob.gif' alt='*' /> $Lang::tr{'required field'}
> END > }else{ > @@ -4761,7 +4760,7 @@ END >
   
   
src='/blob.gif' alt='*' /> $Lang::tr{'this field may be > blank'}
src='/blob.gif' alt='*' /> $Lang::tr{'required field'}
> > 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'} =~ /^(modem)$/ ) { > - print "
width='75%'>$Lang::tr{'number'}
width='75%'>$Lang::tr{'number'} * /> name='TELEPHONE' value='$pppsettings{'TELEPHONE'}'>
width='75%'>$Lang::tr{'modem speaker on'}
$Lang::tr{'optional at > cmd'} 1 *$Lang::tr{'optional at > cmd'} 1 value='$pppsettings{'ADD_AT1'}'>
$Lang::tr{'optional at > cmd'} 2 *$Lang::tr{'optional at > cmd'} 2 value='$pppsettings{'ADD_AT2'}'>
$Lang::tr{'optional at > cmd'} 3 *$Lang::tr{'optional at > cmd'} 3 value='$pppsettings{'ADD_AT3'}'>
$Lang::tr{'idle timeout'}$Lang::tr{'idle > timeout'} * value='$pppsettings{'TIMEOUT'}' />
$checked{'DIALONDEMANDDNS'}{'on'} />
$Lang::tr{'holdoff'}:$Lang::tr{'holdoff'}:  src='/blob.gif' alt='*' /> value='$pppsettings{'HOLDOFF'}' />
$Lang::tr{'maximum > retries'}$Lang::tr{'maximum > retries'} * value='$pppsettings{'MAXRETRIES'}' />
bgcolor='$color{'color20'}'>$Lang::tr{'pptp settings'}
$Lang::tr{'pptp peer'}:$Lang::tr{'pptp peer'}:  src='/blob.gif' alt='*' /> value='$pppsettings{'PPTP_PEER'}' />
$Lang::tr{'pptp netconfig'}:$Lang::tr{'pptp netconfig'}:  src='/blob.gif' alt='*' /> name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' />
$Lang::tr{'pptp route'}:  src='/blob.gif' alt='*' />$Lang::tr{'pptp route'}: value='$pppsettings{'PPTP_ROUTE'}' />
bgcolor='$color{'color20'}'>$Lang::tr{'pppoe settings'}
$Lang::tr{'service name'}  src='/blob.gif' alt='*' />$Lang::tr{'service name'} value='$pppsettings{'SERVICENAME'}' />
$Lang::tr{'concentrator name'}  src='/blob.gif' alt='*' />$Lang::tr{'concentrator name'} value='$pppsettings{'CONCENTRATORNAME'}' />
MTU * />MTU: value='$pppsettings{'MTU'}' />
MRU * />MRU: value='$pppsettings{'MRU'}' />
width='100%'>$Lang::tr{'authentication'}
$Lang::tr{'username'}$Lang::tr{'username'}  src='/blob.gif' alt='*' /> value='$pppsettings{'USERNAME'}' />$Lang::tr{'password'}$Lang::tr{'password'}  src='/blob.gif' alt='*' /> value='$pppsettings{'PASSWORD'}' />
$Lang::tr{'script name'}  src='/blob.gif' alt='*' />$Lang::tr{'script name'} value='$pppsettings{'LOGINSCRIPT'}' />


width='100%'>



$Lang::tr{'profile name'}$Lang::tr{'profile name'}  src='/blob.gif' alt='*' /> value='$pppsettings{'PROFILENAME'}'> >
$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: > $checked{'ENABLE'}{'on'} /> > - $Lang::tr{'advproxy proxy > port'}: > + $Lang::tr{'advproxy proxy > port'}: * > value='$proxysettings{'PROXY_PORT'}' size='5' /> > > > $Lang::tr{'advproxy transparent on'} color="$Header::colourgreen">Green: > $checked{'TRANSPARENT'}{'on'} /> > - $Lang::tr{'advproxy proxy port > transparent'}: > + $Lang::tr{'advproxy proxy port > transparent'}: * > value='$proxysettings{'TRANSPARENT_PORT'}' size='5' /> > > > @@ -988,7 +988,7 @@ if ($netsettings{'BLUE_DEV'}) { > print " "; > } > print < - $Lang::tr{'advproxy visible > hostname'}: * > + $Lang::tr{'advproxy visible > hostname'}: > value='$proxysettings{'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 +1807,7 @@ END > my $val=sprintf"%.3f",$cgiparams{'txt_cent'}; > print""; > #Optional note > - print""; > + print""; > print"
$Lang::tr{'advproxy redirector > children'}
$Lang::tr{'processes'} name='CHILDREN' value='$proxysettings{'CHILDREN'}' size='5' />
$Lang::tr{'processes'}:  src='/blob.gif' alt='*' /> value='$proxysettings{'CHILDREN'}' size='5' />
$Lang::tr{'advproxy via > forwarding'}: $checked{'FORWARD_VIA'}{'on'} />$Lang::tr{'advproxy upstream > proxy host:port'} *$Lang::tr{'advproxy upstream > proxy host:port'}: value='$proxysettings{'UPSTREAM_PROXY'}' />
$Lang::tr{'advproxy client IP > forwarding'}: $checked{'FORWARD_IPADDRESS'}{'on'} />$Lang::tr{'advproxy upstream > username'}: *$Lang::tr{'advproxy upstream > username'}: value='$proxysettings{'UPSTREAM_USER'}' />
$Lang::tr{'advproxy username > forwarding'}: $checked{'FORWARD_USERNAME'}{'on'} />$Lang::tr{'advproxy upstream > password'}: *$Lang::tr{'advproxy upstream > password'}: value='$proxysettings{'UPSTREAM_PASSWORD'}' />
$Lang::tr{'proxy cachemgr'}: $checked{'CACHEMGR'}{'on'} />$Lang::tr{'advproxy admin mail'}:  src='/blob.gif' alt='*' />$Lang::tr{'advproxy admin mail'}: value='$proxysettings{'ADMIN_MAIL_ADDRESS'}' />
$Lang::tr{'proxy filedescriptors'}:$Lang::tr{'proxy > filedescriptors'}: * value='$proxysettings{'FILEDESCRIPTORS'}' size='5' />$Lang::tr{'proxy admin > password'}: *$Lang::tr{'proxy admin password'}: value='$proxysettings{'ADMIN_PASSWORD'}' />
>
$Lang::tr{'advproxy ram cache size'}:$Lang::tr{'advproxy ram cache > size'}: * value='$proxysettings{'CACHE_MEM'}' size='5' />$Lang::tr{'advproxy hdd cache size'}:$Lang::tr{'advproxy hdd cache > size'}: * value='$proxysettings{'CACHE_SIZE'}' size='5' />
$Lang::tr{'advproxy min size'}:$Lang::tr{'advproxy min size'}:  src='/blob.gif' alt='*' /> value='$proxysettings{'MIN_SIZE'}' size='5' />$Lang::tr{'advproxy max size'}:$Lang::tr{'advproxy max size'}:  src='/blob.gif' alt='*' /> value='$proxysettings{'MAX_SIZE'}' size='5' />
$Lang::tr{'advproxy no cache > sites'}: *$Lang::tr{'advproxy no cache > sites'}:
align='center'> width='30%' align='center'>
$Lang::tr{'advproxy standard > ports'}:$Lang::tr{'advproxy ssl > ports'}:$Lang::tr{'advproxy standard > ports'}: *$Lang::tr{'advproxy ssl > ports'}: *

$Lang::tr{'acct cent'} type='text' name='txt_cent' value='$val' > size='3'>$settings{'CURRENCY'}
alt='*' />$Lang::tr{'acct > optional'}
alt='*' />$Lang::tr{'required > field'}


"; > print"
"; >