Squidupdate und QoS-Fix.

Hostname als Ueberschrift.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@458 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

html/cgi-bin/pakfire.cgi

@@ -61,42 +61,8 @@ if ($errormessage) {
 	&Header::closebox();
 	}
 
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-
-&Header::openbox('100%', 'left', $Lang::tr{'network pakfire'});
-print <<END
-<table width='100%'>
-<tr>
-	<td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
-	<td width='100%' colspan='4' class='base'>$Lang::tr{'network pakfire from'}</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td width='100%' class='base' colspan='4'>
-END
-;
-
-
-print <<END
-</table>
-<br />
-<hr />
-<table width='100%'>
-<tr>
-	<td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-	<td width='33%' align='right'>
-		<a href='${General::adminmanualurl}/services.html#services_pakfire' target='_blank'><img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a>
-	</td>
-</tr>
-</table>
-END
-;
-
 &Header::closebox();
 
-print "</form>\n";
-
 &Header::closebigbox();
 
 &Header::closepage();

html/html/themes/ipfire/include/functions.pl

@@ -166,7 +166,14 @@ END
 	<div id="header_inner" class="fixed">
 
 		<div id="logo">
-			<h1><span>IPFire</span></h1><br />
+END
+;
+    if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
+    } else {
+				print "<h1><span>IPFire</span></h1><br />";
+		}
+		print <<END
 			<h2>$h2</h2>
 		</div>