X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Foutgoingfw.cgi;h=6e27262abec66da356a5d240a44c14eac10e146e;hp=e2bfcfdebfc77806f57f9ffc2bcc2c5bb237f648;hb=9f6e5c768ee27f986b303f91dd42d07bc0ce4c56;hpb=fdeaa057c2f60b80890e24885db7b3b81bdd8ff2

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index e2bfcfdebf..6e27262abe 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -465,14 +465,14 @@ END
 						unless ($outfwsettings{'SIP'}) { $outfwsettings{'DISPLAY_SIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'}; }
 						unless ($outfwsettings{'SMAC'}) { $outfwsettings{'DISPLAY_SMAC'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'}; }
 						print <<END
-						<tr><td width='14%' align='right'>$Lang::tr{'source ip'}:
+						<tr><td width='14%' align='right'>$Lang::tr{'source ip or net'}:
 						    <td width='14%' align='left'>$outfwsettings{'DISPLAY_SIP'}
 						    <td width='44%' colspan='2' align='center'>
 END
 ;
 					}
 						print <<END
-						<tr><td width='14%' align='right'>$Lang::tr{'time'} - </td>
+						<tr><td width='14%' align='right'>$Lang::tr{'time'} -  </td>
 						    <td width='14%' align='left'>
 END
 ;
@@ -559,13 +559,13 @@ END
 		if ($p2pline[2] eq 'on') {
 			print <<END
 				<input type='hidden' name='ACTION' value='disable' />
-				<input type='image' name='submit' src='/images/stock_ok.png' alt='' />
+				<input type='image' name='submit' src='/images/stock_ok.png' alt='$Lang::tr{'outgoingfw p2p allow'}' title='$Lang::tr{'outgoingfw p2p allow'}'/>
 END
 ;
 		} else {
 			print <<END
 				<input type='hidden' name='ACTION' value='enable' />
-				<input type='image' name='submit' src='/images/stock_stop.png' alt='' />
+				<input type='image' name='submit' src='/images/stock_stop.png' alt='$Lang::tr{'outgoingfw p2p deny'}' title='$Lang::tr{'outgoingfw p2p deny'}' />
 END
 ;
 		}
@@ -576,7 +576,7 @@ END
 	}
 	print <<END
 	</table>
-  <br />$Lang::tr{'outgoingfw p2p description'}
+  <br />$Lang::tr{'outgoingfw p2p description 1'} <img src='/images/stock_ok.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 2'} <img src='/images/stock_stop.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 3'}
 END
 ;
 	&Header::closebox();
@@ -656,13 +656,13 @@ END
 					<optgroup label='---'>
 						<option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
 					<optgroup label='$Lang::tr{'ip address'}'>
-						<option value='ip' $selected{'SNET'}{'ip'}>IPSEC $Lang::tr{'interface'}</option>
-						<option value='red' $selected{'SNET'}{'red'}>OpenVPN $Lang::tr{'interface'}</option>
+						<option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip or net'}</option>
+						<option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option>
 					</optgroup>
+					<optgroup label='$Lang::tr{'alt vpn'}'>
+						<option value='ipsec' $selected{'SNET'}{'ipsec'}>IPSEC $Lang::tr{'interface'}</option>
+						<option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option>
 					</optgroup>
-						<option value='ipsec' $selected{'SNET'}{'ipsec'}>$Lang::tr{'source ip'}</option>
-						<option value='ovpn' $selected{'SNET'}{'ovpn'}>$Lang::tr{'red'} IP</option>
-					<optgroup label='$Lang::tr{'network'}'>
 					<optgroup label='$Lang::tr{'network'}'>
 						<option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
 END
@@ -686,8 +686,8 @@ END
 					</optgroup>
 				</select>
 			</td>
-			<td width='20%' align='right' colspan='2'>$Lang::tr{'source ip'}: <img src='/blob.gif' /></td>
-			<td width='30%' align='left' colspan='2'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' /></td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'source ip or net'}<img src='/blob.gif' /></td>
+			<td width='30%' align='left' colspan='2'><input type='text' name='SIP' value='$outfwsettings{'SIP'}' /></td>
 		</tr>
 		<tr>
 			<td width='20%' align='right'>$Lang::tr{'logging'}:</td>
@@ -700,10 +700,10 @@ END
 			<td width='20%' align='right' colspan='2' />
 			<td width='30%' align='left' colspan='2' />
 		<tr>
-			<td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' /></td>
-			<td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}' /></td>
-			<td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}: <img src='/blob.gif' /></td>
-			<td width='30%' align='left' colspan='2'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}' /></td>
+			<td width='20%' align='right'>$Lang::tr{'destination ip or net'}: <img src='/blob.gif' /></td>
+			<td width='30%' align='left'><input type='text' name='DIP'  value='$outfwsettings{'DIP'}' /></td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}(s) <img src='/blob.gif' /></td>
+			<td width='30%' align='left' colspan='2'><input type='text' name='DPORT' value='$outfwsettings{'DPORT'}' /></td>
 		</tr>
 		<tr>
 			<td width='20%' align='right'>$Lang::tr{'time'}:</td>