X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fqos.cgi;h=6d4d025bfdbc228283fe472127bcf3d521e61394;hp=de732842ca429d780f0ab93a8f4c60a727140a76;hb=5eee5a607e213c25b350926c5234d2230cfc6e29;hpb=2ad0c24a00c26a1b3ee84f189a774d0263dc6bd1

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index de732842c..6d4d025bf 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -251,15 +251,29 @@ END
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
 	if ( $qossettings{'QIP'} ne '' ) {
-		unless ( &General::validip($qossettings{'QIP'}) ) {
-			$qossettings{'VALID'} = 'no';
-			$message = $Lang::tr{'The source IP address is invalid.'};
+		if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+			if (! &General::validipandmask($qossettings{'QIP'}) ) {
+				$qossettings{'VALID'} = 'no';
+				$message = $Lang::tr{'The source IP address is invalid.'};
+			}
+		}else{
+			if ( &General::validip($qossettings{'QIP'}) ) {
+				$qossettings{'VALID'} = 'no';
+				$message = $Lang::tr{'The source IP address is invalid.'};
+			}
 		}
 	}
 	if ( $qossettings{'DIP'} ne '' ) {
-		unless ( &General::validip($qossettings{'DIP'}) ) {
-			$qossettings{'VALID'} = 'no';
-			$message = $Lang::tr{'The destination IP address is invalid.'};
+		if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+			if ( &General::validipandmask($qossettings{'DIP'}) ) {
+				$qossettings{'VALID'} = 'no';
+				$message = $Lang::tr{'The destination IP address is invalid.'};
+			}
+		}else{
+			if ( &General::validip($qossettings{'DIP'}) ) {
+				$qossettings{'VALID'} = 'no';
+				$message = $Lang::tr{'The destination IP address is invalid.'};
+			}
 		}
 	}
 	if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -699,7 +713,7 @@ if ($errormessage) {
 ############################################################################################################################
 ############################################################################################################################
 
-&Header::openbox('100%', 'center', 'Quality of Service');
+&Header::openbox('100%', 'center', );
 
 print <<END
   <form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -707,15 +721,18 @@ print <<END
 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 '')) {
@@ -769,10 +786,10 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
 	exit
 }
 
-	&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}");
+	&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}");
 	&Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325");
 	&Header::closebox();
-	&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}");
+	&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}");
 	&Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
 	&Header::closebox();
 
@@ -793,7 +810,7 @@ sub changedefclasses {
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='66%'>
 		<tr><td width='100%' colspan='3'>$Lang::tr{'no filter pass'}
-		<tr><td width='33%' align='right'>Download:<td width='33%' align='left'><select name='DEFCLASS_INC'>
+		<tr><td width='33%' align='right'>$Lang::tr{'download'}:<td width='33%' align='left'><select name='DEFCLASS_INC'>
 END
 ;
 		for ( $c = 200 ; $c <= 220 ; $c++ )
@@ -804,7 +821,7 @@ END
 		}
 		print <<END
 		</select><td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>Upload:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
+		<tr><td width='33%' align='right'>$Lang::tr{'upload'}:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
 END
 ;
 		for ( $c = 100 ; $c <= 120 ; $c++ )
@@ -1076,10 +1093,10 @@ END
 	print <<END
 		    </select><td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
-		    <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+		    <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
-		    <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+		    <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
 		    <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
 		<tr><td colspan="3" align='center'><font color="red"><em>$Lang::tr{'qos warning'}</em></font>
 		</table></form>
@@ -1120,10 +1137,10 @@ END
 		    <td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' />
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
-		    <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+		    <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
-		    <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+		    <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
 		    <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value='$Lang::tr{'save'}' />
 		</table></form>
 END
@@ -1181,7 +1198,7 @@ sub showclasses {
 	  		@classline = split( /\;/, $classentry );
 	  		if ( $classline[0] eq $qossettings{'DEV'} )
 	  		{
-	  		  &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1]");
+	  		  &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1] $classline[8]");
 	  			print <<END
 				<table border='0' width='100%' cellspacing='0'>
 				<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
@@ -1206,22 +1223,22 @@ sub showclasses {
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]' />
 						<input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' />
-						<input type='image' alt='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
+						<input type='image' alt='$Lang::tr{'add subclass'}' title='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]' />
 						<input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
-						<input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+						<input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]' />
 						<input type='hidden' name='DOCLASS' value='$Lang::tr{'edit'}' />
-						<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+						<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]' />
 						<input type='hidden' name='DOCLASS' value='$Lang::tr{'delete'}' />
-						<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+						<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
 					</form>
 					</table>
 				    </td>
@@ -1246,13 +1263,13 @@ END
 						<input type='hidden' name='CLASS' value='$l7ruleline[0]' />
 						<input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
 						<input type='hidden' name='DOLEVEL7' value='$Lang::tr{'edit'}' />
-						<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+						<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$l7ruleline[0]' />
 						<input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
 						<input type='hidden' name='DOLEVEL7' value='$Lang::tr{'delete'}' />
-						<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+						<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
 					</form>
 					</table>
 END
@@ -1311,7 +1328,7 @@ END
 						<input type='hidden' name='DIP' value='$portruleline[5]' />
 						<input type='hidden' name='DPORT' value='$portruleline[6]' />
 						<input type='hidden' name='DOPORT' value='$Lang::tr{'edit'}' />
-						<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+						<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$portruleline[0]' />
@@ -1321,7 +1338,7 @@ END
 						<input type='hidden' name='DIP' value='$portruleline[5]' />
 						<input type='hidden' name='DPORT' value='$portruleline[6]' />
 						<input type='hidden' name='DOPORT' value='$Lang::tr{'delete'}' />
-						<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+						<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
 					</form>
 				    </table>
 END
@@ -1369,14 +1386,14 @@ END
 								<input type='hidden' name='DEV' value='$tosruleline[1]' />
 								<input type='hidden' name='TOS' value='$tosruleline[2]' />
 								<input type='hidden' name='DOTOS' value='$Lang::tr{'edit'}' />
-								<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+								<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 							</form>
 							<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 								<input type='hidden' name='CLASS' value='$tosruleline[0]' />
 								<input type='hidden' name='DEV' value='$tosruleline[1]' />
 								<input type='hidden' name='TOS' value='$tosruleline[2]' />
 								<input type='hidden' name='DOTOS' value='$Lang::tr{'delete'}' />
-								<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+								<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
 							</form>
 				    		</table>
 END
@@ -1404,17 +1421,17 @@ END
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]' />
 							<input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
-							<input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+							<input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
 						</form>
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]' />
 							<input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' />
-							<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+							<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 						</form>
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]' />
 							<input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' />
-							<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+							<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
 						</form>
 						</table>
 END