<td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
</tr>
</table>
+<br>
<hr />
<table width='100%'>
<tr>
<td class='base' width='55%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td>
- <td width='40%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
- <td width='5%' align='right'>
+ <td width='40%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
</td>
</tr>
</table>
############################################################################################################################
############################################# Backups von Addons erstellen #################################################
-&Header::openbox('100%', 'center', 'addons');
+&Header::openbox('100%', 'center', $Lang::tr{'addons'});
my @addonincluds = `ls /var/ipfire/backup/addons/includes/ 2>/dev/null`;
my @addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`;
;
&Header::closebox();
&Header::closebigbox();
-&Header::closepage();
\ No newline at end of file
+&Header::closepage();
print <<END
</select></td></tr>
-<tr><td colspan='2'><hr /></td></tr>
+<tr><td colspan='2'><br><br></td></tr>
<tr><td width='15%' class='base'>$Lang::tr{'ConnSched action'}</td><td>
<input type='radio' value='CONNECT' name='ACTION_ACTION' $checked_connect /> <select name='ACTION_CONNECT'>
<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'ConnSched reconnect'}</option>
}
print <<END
</select></td></tr>
-<tr><td colspan='2'><hr /></td></tr>
+<tr><td colspan='2'><br><br></td></tr>
<tr><td width='15%' class='base'>$Lang::tr{'ConnSched days'}</td>
<td><input type='radio' value='DAYS' name='ACTION_DAYSTYPE' $checked_days /> <select name='ACTION_DAYSTART'>
END
<input type='checkbox' name='Sat' $checked_sat />$Lang::tr{'saturday'}<br />
<input type='checkbox' name='Sun' $checked_sun />$Lang::tr{'sunday'}
</td></tr>
-<tr><td colspan='2'><hr /></td></tr>
+<tr><td colspan='2'><br></td></tr>
<tr><td width='15%' class='base'>$Lang::tr{'remark title'} <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='ACTION_COMMENT' size='40' value='$comment' /></td></tr></table>
-<hr />
+<br>
+<hr>
<table width='100%'><tr>
<td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
<td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td>
- <td width='40%' align='center'><input type='submit' name='SUBMIT' value='$buttontext' />
+ <td width='40%' align='right'><input type='submit' name='SUBMIT' value='$buttontext' />
<input type='hidden' name='ACTION' value='$hiddenvalue' /></td>
<input type='hidden' name='UPDATE_ID' value='$cgiparams{'ID'}' /></td>
</tr></table>
;
&Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'credits'});
+&Header::openbox('100%', 'left',);
print <<END
<br>
<center>
$Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b>
</center>
-<br><hr><br>
+<br><br>
<p><b>Development:</b><br />
<tr>
<td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
<td width='70%' class='base'>$Lang::tr{'avoid dod'}</td>
- <td width='30%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+ <td width='30%' align='right' valign='top' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</form>
<td><input type='password' name='PASSWORD2' value='$settings{'PASSWORD2'}' /></td>
</tr>
</table>
+<br>
<hr />
<table width='100%'>
<tr>
<td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
<td width='70%' class='base'>$ddnsprefix</td>
- <td width='30%' align='center' class='base'>
+ <td width='30%' align='right' class='base'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
<input type='submit' name='SUBMIT' value='$buttontext' /> </td>
</tr>
<td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
<td class='base'>$Lang::tr{'remove'}</td>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <td align='center' width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
+ <td align='right' width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
</form>
</tr>
</table>
<tr>
<td class='base' width='25%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td>
<td class='base' width='30%'>$warnNTPmessage</td>
- <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
- <td width='5%' align='right'> </td>
+ <td width='40%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</form>
<table width='100%'>
<tr>
<td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'dhcp advopt scope help'}</td>
- <td width='50%' align='center'>
+ <td width='50%' align='right'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}1' />
<input type='submit' name='SUBMIT' value='$buttontext' />
<input type='submit' name='SUBMIT' value='$Lang::tr{'dhcp advopt help'}' />
<table width='100%'>
<tr>
<td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td>
- <td width='50%' align='center'>
+ <td width='50%' align='right'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}2' />
<input type='submit' name='SUBMIT' value='$buttontext' />
<input type='hidden' name='KEY2' value='$dhcpsettings{'KEY2'}' /></td>
<td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td>
</tr>
</table>
-
+<br>
<hr>
<table width='100%'>
<tr>
<td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> <font class='base'>$Lang::tr{'this field may be blank'}</font></td>
- <td width='40%' align='center'>
+ <td width='40%' align='right'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
<input type='submit' name='SUBMIT' value='$buttontext' />
</td>
############################################################################################################################
############################################################################################################################
-&Header::openbox('100%', 'center', $Lang::tr{'extrahd'});
open( FILE, "< $devicefile" ) or die "Unable to read $devicefile";
@devices = <FILE>;
close FILE;
</table>
END
;
-
-&Header::closebox();
-
&Header::openbox('100%', 'center', $Lang::tr{'extrahd detected drives'});
print <<END
<table border='0' width='600' cellspacing="0">
if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
- &Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
#------SOURCE-------------------------------------------------------
print "<form method='post'>";
}
print<<END;
</select></td></tr>
- <tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+ <tr><td><br></td></tr>
+ </table>
END
&gen_dd_block('src','grp1');
- print"<hr>";
&Header::closebox();
#---SNAT / DNAT ------------------------------------------------
}
print<<END;
</select></td></tr>
- <tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+ <tr><td><br></td></tr></table>
END
&gen_dd_block('tgt','grp2');
- print"<hr>";
&Header::closebox;
#---PROTOCOL------------------------------------------------------
$fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
&Header::closebox;
$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = 'CHECKED';
print <<END;
- <hr><br>
+ <br>
<center>
<table width="80%" border="0">
<tr>
</td>
</tr>
</table>
- <br><hr>
+ <br>
END
#---ACTION------------------------------------------------------
<br><br><table border='0' width='100%'>
<tr><td><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}' ></form></td>
<td align='right'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}' ></form></td></tr>
- <tr><td colspan='6'><hr></td></tr></table>
+ <tr><td colspan='6'></td></tr></table>
END
&Header::closebox();
<tr><td>$Lang::tr{'fwhost netaddress'}:</td><td><input type='TEXT' name='IP' value='$fwhostsettings{'IP'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='15'></td></tr>
<tr><td>$Lang::tr{'netmask'}:</td><td><input type='TEXT' name='SUBNET' value='$fwhostsettings{'SUBNET'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='15'></td></tr>
<tr><td>$Lang::tr{'remark'}:</td><td><input type='TEXT' name='NETREMARK' value='$fwhostsettings{'NETREMARK'}' style='width: 98.5%;'></td></tr>
- <tr><td colspan='6'><br><hr></td></tr><tr>
+ <tr><td colspan='6'><br></td></tr><tr>
END
if ($fwhostsettings{'ACTION'} eq 'editnet' || $fwhostsettings{'error'} eq 'on')
{
$fwhostsettings{'orgname'}=$fwhostsettings{'HOSTNAME'};
$fwhostsettings{'orgremark'}=$fwhostsettings{'HOSTREMARK'};
print<<END;
- <table border='0' width='100%'>
+ <table width='100%'>
<tr><td>$Lang::tr{'name'}:</td><td><form method='post' style='display:inline;'><input type='TEXT' name='HOSTNAME' id='textbox1' value='$fwhostsettings{'HOSTNAME'}' $fwhostsettings{'BLK_HOST'} size='20'><script>document.getElementById('textbox1').focus()</script></td></tr>
<tr><td>IP/MAC:</td><td><input type='TEXT' name='IP' value='$fwhostsettings{'IP'}' $fwhostsettings{'BLK_IP'} size='20' maxlength='17'></td></tr>
<tr><td width='10%'>$Lang::tr{'remark'}:</td><td><input type='TEXT' name='HOSTREMARK' value='$fwhostsettings{'HOSTREMARK'}' style='width:98%;'></td></tr>
- <tr><td colspan='5'><hr></td></tr><tr>
+ <tr><td colspan='5'><br></td></tr><tr>
END
if ($fwhostsettings{'ACTION'} eq 'edithost' || $fwhostsettings{'error'} eq 'on')
my $rem=$fwhostsettings{'remark'};
if ($fwhostsettings{'update'} eq ''){
print<<END;
- <table width='100%' border='0'>
- <tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='20'></td></tr>
- <tr><td width='10%'>$Lang::tr{'remark'}:</td><td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 98%;'></td></tr>
- <tr><td colspan='2'><br><hr></td></tr></table>
+ <table width='100%' border='0'>
+ <tr>
+ <td width='10%'>$Lang::tr{'fwhost addgrpname'}</td>
+ <td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='20'></td>
+ </tr>
+ <tr>
+ <td width='10%'>$Lang::tr{'remark'}:</td>
+ <td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 98%;'></td>
+ </tr>
+ <tr>
+ <td colspan='2'><br></td>
+ </tr>
+ </table>
END
}else{
print<<END;
<table width='100%' border='0'><form method='post' style='display:inline'>
- <tr><td nowrap='nowrap' width='12%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='TEXT' name='grp' value='$fwhostsettings{'grp_name'}' ></td><td><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldgrpname' value='$fwhostsettings{'oldgrpname'}'><input type='hidden' name='ACTION' value='changegrpname'></td><td></td></form></tr>
- <tr><form method='post' style='display:inline'><td>$Lang::tr{'remark'}:</td><td colspan='2'><input type='TEXT' name='newrem' size='45' value='$fwhostsettings{'remark'}' style='width:98%'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td></tr></table></form>
- <hr>
+ <tr>
+ <td nowrap='nowrap' width='12%'>$Lang::tr{'fwhost addgrpname'}</td>
+ <td width='20%'><input type='TEXT' name='grp' value='$fwhostsettings{'grp_name'}' ></td>
+ <td><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldgrpname' value='$fwhostsettings{'oldgrpname'}'><input type='hidden' name='ACTION' value='changegrpname'></td>
+ <td></td></form>
+ </tr>
+ <tr><form method='post' style='display:inline'>
+ <td>$Lang::tr{'remark'}:</td>
+ <td colspan='2'><input type='TEXT' name='newrem' size='45' value='$fwhostsettings{'remark'}' style='width:98%'></td>
+ <td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td>
+ </tr>
+ </table></form>
+ <br><br>
END
}
if ($fwhostsettings{'update'} eq 'on'){
}
print"</select></td></tr>";
if (! -z $confignet){
- print"<tr><td><input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}></td><td>$Lang::tr{'fwhost cust net'}</td><td><select name='CUST_SRC_NET' style='min-width:185px;'>";
+ print"<tr><td><input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}></td><td>$Lang::tr{'fwhost cust net'}:</td><td><select name='CUST_SRC_NET' style='min-width:185px;'>";
foreach my $key (sort { ncmp($customnetwork{$a}[0],$customnetwork{$b}[0]) } keys %customnetwork) {
print"<option>$customnetwork{$key}[0]</option>";
}
print"</select></td></tr>";
}
if (! -z $confighost){
- print"<tr><td valign='top'><input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}></td><td valign='top'>$Lang::tr{'fwhost cust addr'}</td><td><select name='CUST_SRC_HOST' style='min-width:185px;'>";
+ print"<tr><td valign='top'><input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}></td><td valign='top'>$Lang::tr{'fwhost cust addr'}:</td><td><select name='CUST_SRC_HOST' style='min-width:185px;'>";
foreach my $key (sort { ncmp($customhost{$a}[0],$customhost{$b}[0]) } keys %customhost) {
print"<option>$customhost{$key}[0]</option>";
}
#OVPN n2n networks
foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) {
if($ccdhost{$key}[3] eq 'net'){
- print"<td width='1%'><input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}></td><td valign='top'>$Lang::tr{'fwhost ovpn_n2n'}</td><td colspan='3'><select name='OVPN_N2N' style='min-width:185px;'>" if ($show eq '');
+ print"<td width='1%'><input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}></td><td valign='top'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td colspan='3'><select name='OVPN_N2N' style='min-width:185px;'>" if ($show eq '');
$show='1';
print"<option>$ccdhost{$key}[1]</option>";
}
if ($show eq '1'){$show='';print"</select></td></tr>";}
print"</table>";
print"</td></tr></table>";
- print"<br><br><hr>";
+ print"<br><br>";
}
- print"<table border='0' width='100%'>";
+ print"<table width='100%'>";
print"<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
&Header::closebox();
}
print<<END;
</select></td></tr></table></div>
<div id='PORT' class='noscript'><table width='100%' border='0'><tr><td width='10%'>$Lang::tr{'fwhost port'}:</td><td><input type='text' name='SRV_PORT' value='$fwhostsettings{'SRV_PORT'}' maxlength='11' size='24'></td></tr></table></div>
- <table width='100%' border='0'><tr><td colspan='6'><br><hr></td></tr>
+ <table width='100%' border='0'><tr><td colspan='6'><br></td></tr>
<tr><td colspan='6' align='right'>
END
if ($fwhostsettings{'updatesrv'} eq 'on')
<table width='100%' border='0'><form method='post'>
<tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td><input type='text' name='SRVGRP_NAME' value='$fwhostsettings{'SRVGRP_NAME'}' size='24'></td></tr>
<tr><td width='10%'>$Lang::tr{'remark'}:</td><td><input type='text' name='SRVGRP_REMARK' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width: 98%;'></td></tr>
- <tr><td colspan='2'><br><hr></tr>
+ <tr><td colspan='2'><br></tr>
</table>
END
}else{
print<<END;
- <table width='100%' border='0'><form method='post' style='display:inline'>
+ <table width='100%'><form method='post' style='display:inline'>
<tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='text' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}' size='14'></td><td align='left'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvgrpname' value='$fwhostsettings{'oldsrvgrpname'}'><input type='hidden' name='ACTION' value='changesrvgrpname'></td><td width='3%'></td></form></tr>
<tr><form method='post'><td width='10%'>$Lang::tr{'remark'}:</td><td colspan='2'><input type='text' name='newsrvrem' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='changesrvgrpremark' ></td></tr>
- <tr><td colspan='4'><br><hr></td></td></tr>
+ <tr><td colspan='4'><br></td></td></tr>
</table></form>
END
}
if($fwhostsettings{'updatesrvgrp'} eq 'on'){
print<<END;
<form method='post'><input type='hidden' name='SRVGRP_REMARK' value='$fwhostsettings{'SRVGRP_REMARK'}'><input type='hidden' name='SRVGRP_NAME' value='$fwhostsettings{'SRVGRP_NAME'}'><table border='0' width='100%'>
- <tr><td width='1%' nowrap='nowrap'>$Lang::tr{'add'}</td><td><select name='CUST_SRV' style='min-width:185px;'>
+ <tr><td width='10%' nowrap='nowrap'>$Lang::tr{'add'}: </td><td><select name='CUST_SRV' style='min-width:185px;'>
END
&General::readhasharray("$configsrv", \%customservice);
#Protocols for use in servicegroups
print<<END;
</select></td></tr>
<tr><td colspan='4'><br><br></td></tr>
- <tr><td colspan='4'><hr></td></tr>
+ <tr><td colspan='4'></td></tr>
</table>
END
}
print<<END;
- <table width='100%' border='0'>
+ <table width='100%'>
<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='updatesrvgrp' value='$fwhostsettings{'updatesrvgrp'}'><input type='hidden' name='oldsrvgrpremark' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='saveservicegrp' ></form><form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'></td></tr>
</table></form>
END
&Header::closebox();
}
-&Header::openbox('100%','left',$Lang::tr{'gui settings'});
+&Header::openbox('100%','left',$Lang::tr{'display'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
-<tr>
- <td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
-</tr>
<tr>
<td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td>
<td>$Lang::tr{'display hostname in window title'}</td>
print <<END
</select></td></tr>
-<tr>
- <td colspan='2'><hr /><p><b>$Lang::tr{'theme'}</b></td>
-</tr>
+</table>
+END
+;
+&Header::closebox();
+&Header::openbox('100%','left',$Lang::tr{'theme'});
+print<<END;
+<table>
<tr>
<td> </td>
<td><select name='theme'>
print <<END
</select></td></tr>
-<tr>
- <td colspan='2'><hr /><p><b>$Lang::tr{'sound'}</b></td>
-</tr>
+</table>
+END
+;
+&Header::closebox();
+&Header::openbox('100%','left',$Lang::tr{'sound'});
+print <<END
<tr>
<td><input type ='checkbox' name='PPPUPDOWNBEEP' $checked{'PPPUPDOWNBEEP'}{'on'} /></td>
<td>$Lang::tr{'beep when ppp connects or disconnects'}</td>
</tr>
<tr>
- <td colspan='2'><hr /></td>
+ <td colspan='2'></td>
</tr>
</table>
-<div align='center'>
-<table width='80%'>
+<div align='right'>
+<br>
+<table width='100%'>
<tr>
- <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td>
- <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+ <td width='90%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td>
+ <td width='10%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</div>
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
-# This program is free software: you can redistribute it and/or modify #
+# This program is free software you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
<td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td>
</tr>
</table>
+<br>
<hr />
<table width='100%'>
<tr>
<td class='base' width='50%'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'this field may be blank'}</td>
- <td width='50%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
+ <td width='50%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
</tr>
</table>
</form>
refreshpage();
}
-&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'});
+&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
<tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort
print <<END
</td></tr>
<tr>
- <td><hr /></td>
+ <td><br><br></td>
</tr>
<tr>
<td><b>$Lang::tr{'ids rules update'}</b></td>
<td nowrap='nowrap'>Oinkcode: <input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td>
</tr>
<tr>
- <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
+ <td width='30%' align='left'><br><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
END
;
if ( -e "/var/tmp/snortrules.tar.gz"){
print <<END
</tr>
</table>
-<hr />
+<br><br>
<table width='100%'>
<tr>
- <td align='center'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+ <td align='right'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</form>
print `cat /var/ipfire/guardian/guardian.ignore`;
print <<END
</textarea></td></tr>
-<tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
+<tr><td align='right' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
</table>
</form>
END
# Check for display flag
if ($displayrulefilerules) {
# Rule file definition rule display
- print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=1><TR>";
+ print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=0><TR>";
# Local vars
my $ruledefdisplaycnt = 0;
print <<END
<table width='100%'>
<tr>
- <td width='33%'> </td>
- <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
- <td width='33%'>
+ <td width='100%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
<!-- space for future online help link -->
</td>
</tr>
&Header::closebox();
}
-&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
&Header::closebox();
}
-&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
</td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day before'}' value='<<' /></td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='>>' /></td>
-<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+<td width='20%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+</tr>
+<tr>
+ <td colspan='3' align='left' valign="left">$Lang::tr{'Number of IPs for the pie chart'}:</td>
+ <td colspan='3' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
+ <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
-<table width='100%'>
-<tr><td width='20%' align='right' valign="center">$Lang::tr{'Number of IPs for the pie chart'}:</td>
- <td width='10%' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
- <td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
- </table>
- </form>
+</form>
END
;
&Header::closebox();
}
-&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
</td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day before'}' value='<<' /></td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='>>' /></td>
-<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+<td width='20%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+</tr>
+<tr>
+ <td colspan='3' align='left' valign="center">$Lang::tr{'Number of Ports for the pie chart'}:</td>
+ <td colspan='3' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
+ <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
-<table width='100%'>
-<tr><td width='20%' align='right' valign="center">$Lang::tr{'Number of Ports for the pie chart'}:</td>
- <td width='10%' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
- <td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
- </table>
- </form>
+</form>
END
;
print <<END
</tr>
<tr>
- <td colspan="2"><hr /></td>
+ <td colspan="2"><br><hr /></td>
</tr>
<tr>
- <td colspan="2"><div align="center">
+ <td align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td><div align="right"></td>
+ <td align='right'>
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <<END
</div></td>
</tr>
- <tr>
- <td colspan="2"align='left'>
- <img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
- </tr>
-
</table>
END
</table>
<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%' cellspacing='0'>
+<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='submit' name='ACTION' value=$Lang::tr{'save'} />
</form></td></tr>
</table>
<option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option>
<option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option>
</select></td></tr>
- <tr><td colspan='4'><hr /></td></tr>
+ <tr><td colspan='4'><br><br></td></tr>
END
;
}
print "</form></table>";
&Header::closebox();
- &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}:");
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
print <<EOF#'
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
<tr>
<form method='post' enctype='multipart/form-data'>
<table width='100%' border='0'>
<tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr>
-<tr><td colspan='4'><hr /></td></tr>
+<tr><td colspan='4'><br></td></tr>
<tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr>
</table>
END
;
my $id = 0;
my $gif;
+ my $col1="";
foreach my $key (sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";}
print "<td align='center' $col>$confighash{$key}[32]</td>";
print "<td align='center' $col>$confighash{$key}[25]</td>";
-
- my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
+ $col1="bgcolor='${Header::colourred}'";
+ my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
if ($confighash{$key}[0] eq 'off') {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
+ $col1="bgcolor='${Header::colourblue}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
} else {
###
# m.a.d net2net
-###
-
+###
+
if ($confighash{$key}[3] eq 'net') {
if (-e "/var/run/$confighash{$key}[1]n2n.pid") {
#EXITING -- A graceful exit is in progress.
####
- if ( $tustate[1] eq 'CONNECTED') {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></tr></td></table>";
- } else {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$tustate[1]</font></b></td></tr></table>";
+ if ( $tustate[1] eq 'CONNECTED') {
+ $col1="bgcolor='${Header::colourgreen}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+ }else {
+ $col1="bgcolor='${Header::colourred}'";
+ $active = "<b><font color='#FFFFFF'>$tustate[1]</font></b>";
+ }
}
- }
}
- } else {
-
- my $cn;
- my @match = ();
- foreach my $line (@status) {
- chomp($line);
- if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
- @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
- if ($match[1] ne "Common Name") {
- $cn = $match[1];
- }
- $cn =~ s/[_]/ /g;
- if ($cn eq "$confighash{$key}[2]") {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
- }
- }
-
+ }else {
+
+ my $cn;
+ my @match = ();
+ foreach my $line (@status) {
+ chomp($line);
+ if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) {
+ @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line);
+ if ($match[1] ne "Common Name") {
+ $cn = $match[1];
+ }
+ $cn =~ s/[_]/ /g;
+ if ($cn eq "$confighash{$key}[2]") {
+ $col1="bgcolor='${Header::colourgreen}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+ }
+ }
+ }
}
}
-}
print <<END
- <td align='center' $col>$active</td>
+ <td align='center' $col1>$active</td>
<form method='post' name='frm${key}a'><td align='center' $col>
<input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' />
<td> <img src='/images/openvpn.png' alt='?RELOAD'/></td>
<td class='base'>$Lang::tr{'dl client arch'}</td>
</tr>
- </table><hr>
+ </table><br>
END
;
}
############################################################################################################################
############################################################################################################################
-&Header::openbox('100%', 'center', 'Quality of Service');
+&Header::openbox('100%', 'center', );
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
END
;
if ( $message ne "" ) {
- print "<tr><td colspan='2' align='center'><font color='red'>$message</font>";
+ print "<tr><td colspan='2' align='center'><font color='red'>$message</font></tr>";
}
print <<END
- <tr><td width='50%' align='left'><b>Quality of Service:</b>
- <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font>
- <tr><td width='100%' align='center' colspan='2'>
- <input type='submit' name='ACTION' value="$Lang::tr{'start'}" />
- <input type='submit' name='ACTION' value="$Lang::tr{'stop'}" />
- <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
+ <tr><td width='50%' align='left'><b>Quality of Service:</b></td>
+ <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font></td></tr>
+ <tr>
+ <td colspan='2'><br></td>
+ </tr>
+ <tr><td width='100%' align='right' colspan='2'>
+ <input type='submit' name='ACTION' value="$Lang::tr{'start'}">
+ <input type='submit' name='ACTION' value="$Lang::tr{'stop'}">
+ <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" ></td></tr></table></form>
END
;
if (($qossettings{'OUT_SPD'} ne '') && ($qossettings{'INC_SPD'} ne '')) {
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-&Header::openbox('100%', 'left', 'SSH:');
+&Header::openbox('100%', 'left', $Lang::tr{'ssh'});
print <<END
<table width='100%'>
<tr>
<td width='100%' class='base'>$Lang::tr{'ssh port'}</td>
</tr>
<tr>
- <td align='center' colspan='3'><hr />
+ <td align='right' colspan='3'>
<input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart30'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
<td><input type='text' name='REMARK' value='$settings{'REMARK'}' size='25'/></td>
</tr>
</table>
-<hr />
+<br>
<table width='100%'>
<tr>
- <td width='50%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
+ <td width='50%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
</tr>
</table>
</form>
print <<END
<div align='center'>
<table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
<th align='left'><b>$Lang::tr{'services'}</b></th>
<th align='center' ><b>$Lang::tr{'status'}</b></th>
<th align='center'><b>PID</b></th>
print <<END
<div align='center'>
<table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
<th align='center'><b>Addon</b></th>
<th align='center'><b>Boot</b></th>
<th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
print "<tr>";
$col="bgcolor='$color{'color20'}'";
}
- print "<td align='left' $col>$_</td> ";
+ print "<td align='left' $col width='31%'>$_</td> ";
my $status = isautorun($_,$col);
print "$status ";
- print "<td align='center' $col><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
- print "<td align='center' $col><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
+ print "<td align='center' $col
width='8%'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
+ print "<td align='center' $col
width='8%'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
my $status = &isrunningaddon($_,$col);
$status =~ s/\\e\[[0-1]\;[0-9]+m//g;
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'network time'});
+&Header::openbox('100%', 'left', $Lang::tr{'ntp common settings'});
print <<END
<table width='100%'>
-<tr>
- <td colspan='2'><strong>$Lang::tr{'ntp common settings'}</strong></td>
-</tr>
-
<tr>
<td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
<td width='100%' colspan='4' class='base'>$Lang::tr{'network time from'}</td>
<td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
</tr>
</table>
+END
+;
+&Header::closebox();
+&Header::openbox('100%',1,$Lang::tr{'ntp sync'});
+print <<END
<table width='100%'>
-<tr>
- <td colspan='4'><hr /><strong>$Lang::tr{'ntp sync'}</strong></td>
-</tr>
<tr>
<td class='base'><input type='radio' name='UPDATE_METHOD' value='periodically' $checked{'UPDATE_METHOD'}{'periodically'} /></td>
<td width='10%'>$Lang::tr{'every'}</td>
<td colspan='2'>$Lang::tr{'manually'}</td>
</tr>
<tr>
- <td colspan='4'><hr /><strong>$Lang::tr{'update time'}</strong></td>
+ <td colspan='4'><br><br><strong>$Lang::tr{'update time'}</strong></td>
</tr>
<tr>
<td> </td>
<table width='100%'>
<tr>
<td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
- <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td>
- <td width='25%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
- <td width='5%' align='right'> </td>
+ <td width='65%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td>
+ <td width='5%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
END
print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n";
-&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter filter settings'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter filter settings'}");
print <<END
<table width='100%'>
<tr>
print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n";
-&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}");
print <<END
<table width='100%'>
<b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
$Lang::tr{'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient'}
</td></tr>
- <tr><td colspan='2'><hr /></td></tr>
+ <tr><td colspan='2'><hr></td></tr>
<tr><td class='base' nowrap='nowrap'>$Lang::tr{'upload p12 file'}:</td>
<td nowrap='nowrap'><input type='file' name='FH' size='32' /></td></tr>
<tr><td class='base'>$Lang::tr{'pkcs12 file password'}: <img src='/blob.gif' alt='*' /></td>
<td class='base' nowrap='nowrap'>$Lang::tr{'host to net vpn'}: <img src='/blob.gif' alt='*' /></td>
<td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td>
</tr>
- </table>
+</table>
+<br>
<hr />
<table width='100%'>
<tr>
<td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
- <td width='70%' class='base' valign='top'>$Lang::tr{'this field may be blank'}</td>
+ <td width='70%' class='base' valign='top'>$Lang::tr{'this field may be blank'}</td><td width='30%' align='right' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
<tr>
<td class='base' valign='top' nowrap='nowrap'><img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' /> </td>
<td class='base'> <font class='base'>$Lang::tr{'vpn delayed start help'}</font></td>
- <td width='30%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+ <td></td>
</tr>
</table>
END
print "<td align='left' $col> </td>";
}
print "<td align='center' $col>$confighash{$key}[25]</td>";
+ my $col1="bgcolor='${Header::colourred}'";
# get real state
- my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
+ my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ /$confighash{$key}[1]\{.*INSTALLED/))
{
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
+ $col1="bgcolor='${Header::colourgreen}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
}
}
# move to blueif really down
- if ($confighash{$key}[0] eq 'off' && $active =~ /${Header::colourred}/ ) {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
+ if ($confighash{$key}[0] eq 'off' && $col1 =~ /${Header::colourred}/ ) {
+ $col1="bgcolor='${Header::colourblue}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
}
print <<END
- <td align='center' $col>$active</td>
+ <td align='center' $col1>$active</td>
<td align='center' $col>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'restart'}' src='/images/reload.gif' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' />
print <<END
<table width='100%'>
- <tr><td align='center' colspan='9'>
+ <tr><td align='right' colspan='9'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='submit' name='ACTION' value='$Lang::tr{'add'}' />
</form>
;
&Header::closebox();
- &Header::openbox('100%', 'left', "$Lang::tr{'certificate authorities'}:");
+ &Header::openbox('100%', 'left', "$Lang::tr{'certificate authorities'}");
print <<EOF
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
<tr>
}
my $createCA = -f "${General::swroot}/ca/cacert.pem" ? '' : "<tr><td colspan='3'></td><td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /></td></tr>";
print <<END
+ <br>
<hr />
<form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%' border='0' cellspacing='1' cellpadding='0'>
</tr>
<tr>
<td colspan='3'>$Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}:</td>
- <td><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></td>
+ <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></td>
</tr>
</table>
</form>
<td colspan='4' align='left'><input type='text' name='CLIENT_COMMENT' value='$cgiparams{'CLIENT_COMMENT'}' size='40' /></td>
</tr>
</table>
+<br>
<hr />
<table width='100%'>
<tr>
- <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
- <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td>
- <td width='40%' align='center'>
+ <td class='base' valign='top'><img src='/blob.gif' alt='*' />$Lang::tr{'this field may be blank'}</td>
+ <td width='40%' align='right'>
END
;
<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' /></td>
</tr>
</table>
-<hr />
+<br>
+<hr>
<table width='100%'>
<tr>
- <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
- <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td>
- <td width='40%' align='center'>
+ <td class='base' valign='top'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
+ <td width='40%' align='right'>
<input type='hidden' name='ACTION' value='add' />
<input type='submit' name='SUBMIT' value='$buttontext' />
</td>
- <td width='5%' align='right'> </td>
</tr>
</table>
END
'activate user' => 'Benutzer aktivieren',
'active' => 'Aktiv',
'add' => 'Hinzufügen',
-'add a host' => 'Host hinzufügen:',
+'add a host' => 'Host hinzufügen',
'add a new rule' => 'Neue Regel hinzufügen:',
'add cron' => 'Cronjob hinzufügen',
'add device' => 'Gerät hinzufügen',
'add network' => 'Netzwerk hinzufügen',
-'add new alias' => 'Neue Alias-Adresse hinzufügen:',
+'add new alias' => 'Neue Alias-Adresse hinzufügen',
'add new lease' => 'Neue Zuordnung definieren',
'add new ovpn' => 'OpenVPN-Einstellungen',
'add printer' => 'Drucker hinzufügen',
'add xtaccess' => 'Externen Zugang hinzugefügt',
'add-route' => 'Additional push route',
'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste',
+'addon' => 'Addons',
'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
'admin users' => 'Liste der Benutzer mit Super User Rechten',
'administrator user password' => 'Passwort für Benutzer "admin":',
'april' => 'April',
'archive not exist' => 'Konfigurationsarchiv existiert nicht',
'are you sure' => 'Sind Sie sicher?',
-'arp table entries' => 'Einträge der ARP-Tabelle:',
+'arp table entries' => 'Einträge der ARP-Tabelle',
'artist' => 'Künstler',
'attemps' => 'Versuche',
'attention' => 'ACHTUNG',
'connection' => 'Verbindung',
'connection closed' => 'Nicht Verbunden...',
'connection debugging' => 'Verbindungs-Debugging',
-'connection status and controlc' => 'Verbindungsstatus und -kontrolle:',
+'connection status and controlc' => 'Verbindungsstatus und -kontrolle',
'connection tracking' => 'iptables-Verbindungsverfolgung',
'connection type' => 'Verbindungstyp',
'connection type is invalid' => 'Verbindungstyp ist ungültig',
'crl' => 'Certificate Revocation List',
'cron server' => 'Cron-Server',
'current' => 'Aktuell',
-'current aliases' => 'Aktuelle Alias-Adresse:',
+'current aliases' => 'Aktuelle Alias-Adresse',
'current class' => 'Aktuelle Klasse',
'current devices' => 'Schnittstellen',
'current dhcp leases on blue' => 'Aktuelle DHCP-Zuordnungen auf Blau',
'current dynamic leases' => 'Aktuelle dynamische Zuordnungen',
'current fixed leases' => 'Aktuelle feste Zuordnungen',
-'current hosts' => 'Aktuelle Hosts:',
+'current hosts' => 'Aktuelle Hosts',
'current media' => 'Aktuelles Medium',
'current ovpn' => 'Aktive OVPN-Verbindung',
'current playlist' => 'Aktuelle Playlist',
'dns server' => 'DNS Server',
'dns title' => 'Domain Name System',
'dnsforward' => 'DNS-Weiterleitung',
-'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen:',
+'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen',
'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung',
-'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten:',
-'dnsforward entries' => 'Aktuelle Einträge:',
+'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten',
+'dnsforward entries' => 'Aktuelle Einträge',
'dnsforward forward_server' => 'DNS-Server',
'dnsforward zone' => 'Zone',
'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
'err rs 8 untar' => 'Fehler beim un-tar-en des Archivs',
'error config' => 'Kann /var/ipfire/ovpn/config/ZERINA.ovpn nicht öffnen!',
'error external access' => 'Kann /var/ipfire/xtaccess/config nicht öffnen (external acccess could not be granted)!',
-'error messages' => 'Fehlermeldungen:',
+'error messages' => 'Fehlermeldungen',
'esp encryption' => 'ESP Verschlüsselung:',
'esp grouptype' => 'ESP Gruppentyp:',
'esp integrity' => 'ESP Integrität:',
'extrahd' => 'ExtraHD',
'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Gerät gemountet ist',
'extrahd cant umount' => 'Konnte',
-'extrahd detected drives' => 'gefundene Laufwerke',
+'extrahd detected drives' => 'Gefundene Laufwerke',
'extrahd install or load driver' => 'Wenn Ihre Festplatte nicht angezeigt wird, müssen Sie zuerst den Treiber laden oder ggf. auch nachinstallieren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind, müssen diese erst angelegt werden.',
'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet',
'extrahd to' => 'nicht nach',
'fwdfw log' => 'Log',
'fwdfw log rule' => 'Logging aktivieren',
'fwdfw man port' => 'Port(s):',
-'fwdfw menu' => 'Firewallregeln',
+'fwdfw menu' => 'Firewall',
'fwdfw movedown' => 'Herunter',
'fwdfw moveup' => 'Herauf',
'fwdfw natport used' => 'Der eingegebene Port wird bereits von einer anderen DNAT-Regel benutzt.',
'fwdfw wd_tue' => 'Di',
'fwdfw wd_wed' => 'Mi',
'fwdfw xt access' => 'Input',
-'fwhost addgrp' => 'Neue Gruppe hinzufügen:',
+'fwhost addgrp' => 'Neue Gruppe hinzufügen',
'fwhost addgrpname' => 'Gruppenname:',
-'fwhost addhost' => 'Neuen Host hinzufügen:',
-'fwhost addnet' => 'Neues Netzwerk hinzufügen:',
-'fwhost addrule' => 'Regel hinzufügen/ändern:',
-'fwhost addservice' => 'Neuen Dienst hinzufügen:',
-'fwhost addservicegrp' => 'Neue Dienstgruppe hinzufügen:',
+'fwhost addhost' => 'Neuen Host hinzufügen',
+'fwhost addnet' => 'Neues Netzwerk hinzufügen',
+'fwhost addservice' => 'Neuen Dienst hinzufügen',
+'fwhost addservicegrp' => 'Neue Dienstgruppe hinzufügen',
'fwhost any' => 'Alle',
'fwhost attention' => 'ACHTUNG',
'fwhost back' => 'Zurück',
'fwhost ccdnet' => 'OpenVPN-Netzwerke:',
'fwhost change' => 'Ändern',
'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.',
-'fwhost cust addr' => 'Hosts:',
-'fwhost cust grp' => 'Gruppen:',
-'fwhost cust net' => 'Netzwerke:',
-'fwhost cust service' => 'Dienste:',
+'fwhost cust addr' => 'Hosts',
+'fwhost cust grp' => 'Gruppen',
+'fwhost cust net' => 'Netzwerke',
+'fwhost cust service' => 'Dienste',
'fwhost cust srvgrp' => 'Dienstgruppen',
'fwhost deleted' => 'Gelöscht',
'fwhost empty' => 'Keine Regeln definiert',
'ipfire side is invalid' => 'IPFire Seite ist ungültig.',
'ipfires hostname' => 'IPFire\'s Hostname',
'ipinfo' => 'IP-Info',
-'ipsec network' => 'IPsec-Netzwerke',
'iptable rules' => 'IPTable-Regeln',
'iptmangles' => 'IPTable Mangles',
+'ipsec network' => 'IPsec-Netzwerke',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'local vpn hostname/ip' => 'Lokaler VPN Hostname/IP',
'localkey' => 'Localkey',
'localkeyfile' => 'Localkeyfile',
-'log' => 'Protokoll:',
+'log' => 'Protokoll',
'log enabled' => 'Log aktiviert',
'log level' => 'Log Level',
'log lines per page' => 'Zeilen pro Seite',
'network red' => 'Netzwerk (extern)',
'network removed' => 'Benutzerdefiniertes Netzwerk entfernt',
'network status information' => 'Netzwerk-Statusinformationen',
-'network time' => 'Benutze NTP-Server:',
+'network time' => 'Benutze NTP-Server',
'network time from' => 'Uhrzeit von einem Netzwerk Zeitserver ermitteln',
'network traffic graphs' => 'Diagramme zur Netzwerkauslastung',
'network traffic graphs external' => 'Net-Traffic-Diagramme (extern)',
'root user password' => 'Root Passwort',
'route subnet is invalid' => 'Additional push route subnet is invalid',
'router ip' => 'IP-Adresse des Routers:',
-'routing table entries' => 'Einträge der Routing-Tabelle:',
+'routing table entries' => 'Einträge der Routing-Tabelle',
'rsvd dst port overlap' => 'Dieser Zielportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:',
'rsvd src port overlap' => 'Dieser Quellportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:',
'rules already up to date' => 'Regeln sind schon aktuell',
'srcprt range overlaps' => 'Quell-Port-Bereich überlappt mit einem bereits definierten Port.',
'srcprt within existing' => 'Quell-Port befindet sich innnerhalb eines bereits definierten Port-Bereichs.',
'ssdmz pinholes' => 'DMZ-Schlupflöcher',
+'ssh' => 'SSH',
'ssh access' => 'SSH-Zugriff',
'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!',
'ssh fingerprint' => 'Fingerabdruck',
'trafficorange' => 'DMZ',
'trafficout' => 'Ausgehend',
'trafficred' => 'Internet',
-'traffics' => 'Trafficübersicht:',
+'traffics' => 'Trafficübersicht',
'trafficsum' => 'Total',
'trafficto' => 'Nach',
'transfer limits' => 'Transferbeschränkungen',
'urlfilter log summary' => 'Gesamtanzahl der URL-Filter-Treffer für',
'urlfilter log viewer' => 'Ansicht URL-Filter-Log',
'urlfilter logs' => 'URL-Filter-Logdateien',
-'urlfilter maintenance' => 'URL-Filter-Wartung',
+'urlfilter maintenance' => 'URL-Filter Wartung',
'urlfilter manage local file repository' => 'Lokale Dateiablage verwalten',
'urlfilter manage repository' => 'Ablage verwalten',
'urlfilter minutes' => 'Minuten',
'activate user' => 'Activate user',
'active' => 'Active',
'add' => 'Add',
-'add a host' => 'Add a host:',
+'add a host' => 'Add a host',
'add a new rule' => 'Add a new rule:',
'add cron' => 'add cronjob',
'add device' => 'Add device',
'add network' => 'Add network',
-'add new alias' => 'Add a new alias:',
+'add new alias' => 'Add a new alias',
'add new lease' => 'Add a new fixed lease',
'add new ovpn' => 'OpenVPN Settings:',
'add printer' => 'Add printer',
'add xtaccess' => 'Add External Access',
'add-route' => 'Additional push route',
'added from dhcp lease list' => 'Added from DHCP lease list',
+'addons' => 'Addons',
'admin user password has been changed' => 'Admin user password has been changed.',
'admin users' => 'User with superuser rights',
'administrator user password' => 'Admin user password:',
'april' => 'April',
'archive not exist' => 'Configuration archive does not exist',
'are you sure' => 'Are you sure?',
-'arp table entries' => 'ARP Table Entries:',
+'arp table entries' => 'ARP Table Entries',
'artist' => 'Artist',
'attemps' => 'Attempts',
'attention' => 'ATTENTION',
'connection' => 'Connection',
'connection closed' => 'Not connected...',
'connection debugging' => 'Connection debugging',
-'connection status and controlc' => 'Connection status and control:',
+'connection status and controlc' => 'Connection status and control',
'connection tracking' => 'iptables Connection Tracking',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
'crl' => 'Certificate Revocation List',
'cron server' => 'CRON Server',
'current' => 'Current',
-'current aliases' => 'Current aliases:',
+'current aliases' => 'Current aliases',
'current class' => 'Current class',
'current devices' => 'Current devices',
'current dhcp leases on blue' => 'Current DHCP leases on BLUE',
'current dynamic leases' => 'Current dynamic leases',
'current fixed leases' => 'Current fixed leases',
-'current hosts' => 'Current hosts:',
+'current hosts' => 'Current hosts',
'current media' => 'Current media',
'current ovpn' => 'Active OVPN-Connection:',
'current playlist' => 'Current Playlist',
'dns server' => 'DNS Server',
'dns title' => 'Domain Name System',
'dnsforward' => 'DNS forwarding',
-'dnsforward add a new entry' => 'Add a new entry:',
+'dnsforward add a new entry' => 'Add a new entry',
'dnsforward configuration' => 'DNS forward configuration',
-'dnsforward edit an entry' => 'Edit an existing entry:',
-'dnsforward entries' => 'Current entries:',
+'dnsforward edit an entry' => 'Edit an existing entry',
+'dnsforward entries' => 'Current entries',
'dnsforward forward_server' => 'Nameserver',
'dnsforward zone' => 'Zone',
'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
'err rs 8 untar' => 'Error untarring archive',
'error config' => 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !',
'error external access' => 'Could not open /var/ipfire/xtaccess/config (external acccess could not be granted)!',
-'error messages' => 'Error messages:',
+'error messages' => 'Error messages',
'esp encryption' => 'ESP Encryption:',
'esp grouptype' => 'ESP Grouptype:',
'esp integrity' => 'ESP Integrity:',
'fwdfw log' => 'Log',
'fwdfw log rule' => 'Log rule',
'fwdfw man port' => 'Port(s):',
-'fwdfw menu' => 'Firewall Rules',
+'fwdfw menu' => 'Firewall',
'fwdfw movedown' => 'Move down',
'fwdfw moveup' => 'Move up',
'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.',
'fwdfw wd_tue' => 'Tue',
'fwdfw wd_wed' => 'Wed',
'fwdfw xt access' => 'Input',
-'fwhost addgrp' => 'Add new network/host group:',
+'fwhost addgrp' => 'Add new network/host group',
'fwhost addgrpname' => 'Group name:',
-'fwhost addhost' => 'Add new host:',
-'fwhost addnet' => 'Add new network:',
-'fwhost addrule' => 'Add/edit rule:',
-'fwhost addservice' => 'Add service:',
-'fwhost addservicegrp' => 'Add new service group:',
+'fwhost addhost' => 'Add new host',
+'fwhost addnet' => 'Add new network',
+'fwhost addservice' => 'Add service',
+'fwhost addservicegrp' => 'Add new service group',
'fwhost any' => 'Any',
'fwhost attention' => 'ATTENTION',
'fwhost back' => 'Back',
'fwhost ccdnet' => 'OpenVPN networks:',
'fwhost change' => 'Modify',
'fwhost changeremark' => 'You modified just the remark',
-'fwhost cust addr' => 'Hosts:',
-'fwhost cust grp' => 'Network/Host Groups:',
-'fwhost cust net' => 'Networks:',
-'fwhost cust service' => 'Services:',
-'fwhost cust srvgrp' => 'Service Groups:',
+'fwhost cust addr' => 'Hosts',
+'fwhost cust grp' => 'Network/Host Groups',
+'fwhost cust net' => 'Networks',
+'fwhost cust service' => 'Services',
+'fwhost cust srvgrp' => 'Service Groups',
'fwhost deleted' => 'Deleted',
'fwhost empty' => 'No rules defined',
'fwhost err addr' => 'Invalid IP address or subnet',
'local vpn hostname/ip' => 'Local VPN Hostname/IP',
'localkey' => 'Localkey',
'localkeyfile' => 'Localkeyfile',
-'log' => 'Log:',
+'log' => 'Log',
'log enabled' => 'Log Enabled',
'log level' => 'Log Level',
'log lines per page' => 'Lines per page',
'network red' => 'Network (external)',
'network removed' => 'Custom network removed',
'network status information' => 'Network Status Information',
-'network time' => 'Use a network time server:',
+'network time' => 'Use a network time server',
'network time from' => 'Obtain time from a network time server',
'network traffic graphs' => 'Network traffic graphs',
'network traffic graphs external' => 'Net-Traffic graphs (external)',
'root user password' => 'Root password',
'route subnet is invalid' => 'Additional push route subnet is invalid',
'router ip' => 'Router IP address:',
-'routing table entries' => 'Routing Table Entries:',
+'routing table entries' => 'Routing Table Entries',
'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
'rules already up to date' => 'Rules already up to date',
'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
'srcprt within existing' => 'Source port is within an already defined port range.',
'ssdmz pinholes' => 'DMZ Pinholes',
+'ssh' => 'SSH',
'ssh access' => 'SSH Access',
'ssh access tip' => 'IPFire SSH is not using default port 222!',
'ssh fingerprint' => 'Fingerprint',
'trafficorange' => 'DMZ',
'trafficout' => 'Output',
'trafficred' => 'Internet',
-'traffics' => 'Utilization-overview:',
+'traffics' => 'Utilization-overview',
'trafficsum' => 'Totals',
'trafficto' => 'To',
'transfer limits' => 'Transfer limits',
projects / people / teissler / ipfire-2.x.git / commitdiff
