Hinzugefügt:

* Kleiner Tux im Webinterface für den eXciter und den Benne :) Geändert: * time.cgi überarbeitet und Funktion verbessert. * index.cgi - noch ein Paar Fehler behoben oder was hinzugefügt. * FLASH-Eintrag aus der crontab gelöscht. * Online-Hilfe-Rettungsringe (die hässlichen) aus den CGIs entfernt. * Logger von ipcop nach ipfire umgestellt. Gelöscht: * Nicht benötigte Reste vom IPCop entfernt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@160 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-26 10:52:57 +02:00 · 2006-06-05 11:30:07 +00:00
parent ca35618d11
commit 39a7cc119a
17 changed files with 57 additions and 176 deletions
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -576,9 +576,7 @@ print <<END
    <td class='base' width='25%'><img src='/blob.gif' align='top' alt='*' />&nbsp;$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'>
-        <a href='${General::adminmanualurl}/services.html#services_dhcp' target='_blank'>
-        <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 </form>
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -102,13 +102,12 @@ print <<END;

 <!-- Table of networks -->
 <table border='0' width=80%>
-  <!--  Headline -->
  <tr>	<th bgcolor='lightgrey'>$Lang::tr{'network'}
 	<th bgcolor='lightgrey'>IP
 	<th bgcolor='lightgrey'>$Lang::tr{'status'}
-  <!-- RED -->
  <tr>	<td bgcolor='$Header::colourred' width='25%'><font size='2' color='white'><b>$Lang::tr{'internet'}:</b></font><br>
-	<td width='30%'>$ipaddr <td width='45%'>$connstate
+	<td width='30%'>$ipaddr 
+	<td width='45%'>$connstate
 	<tr><td colspan='2'>
 		<form method='post' action='/cgi-bin/dial.cgi'>$Lang::tr{'profile'}:
 			<select name='PROFILE'>
@@ -161,13 +160,14 @@ END
 			if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
 		}	else { print "Proxy aus"; }
 	}
-	if (`ifconfig | grep $netsettings{'ORANGE_DEV'}`) { print <<END;
+	if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
 		<tr><td bgcolor='$Header::colourorange' width='25%'><font size='2' color='white'><b>$Lang::tr{'dmz'}:</b></font><br>
 	  	<td width='30%'>$netsettings{'ORANGE_ADDRESS'}
  		<td width='45%'><font color=$Header::colourgreen>Online</font>
 END
 	}
-	if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ) { 
+	if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
+	     `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) { 
 		my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
 		print <<END;
 		<tr><td bgcolor='$Header::colourvpn' width='25%'><font size='2' color='white'><b>$Lang::tr{'vpn'}:</b></font><br>
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -714,9 +714,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
 	}
 }
 print <<END
-	<td width='5%' align='right'>
-		<a href='${General::adminmanualurl}/section-firewall.html#section-port-forwarding' target='_blank'>
-		<img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+	<td width='5%' align='right'>&nbsp;</td>
 	</tr>
 </table>
 END
--- a/html/cgi-bin/shutdown.cgi
+++ b/html/cgi-bin/shutdown.cgi
@@ -186,9 +186,7 @@ END
    <td width='30%' align='center'>
        <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
    </td>
-    <td width='10%' align='right'>
-        <a href='${General::adminmanualurl}/system.html#shutdown' target='_blank'>
-        <img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='10%' align='right'>&nbsp;
 </tr>
 </table>

--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -19,7 +19,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';

-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";

@@ -46,49 +46,6 @@ $timesettings{'SETYEAR'} = '';

 &Header::getcgihash(\%timesettings);

-if ($timesettings{'ACTION'} eq $Lang::tr{'instant update'})
-{
-	if ($timesettings{'SETHOUR'} eq '' || $timesettings{'SETHOUR'} < 0 || $timesettings{'SETHOUR'} > 23) {
-		$errormessage = $Lang::tr{'invalid time entered'};
-		goto UPDTERROR;
-	}
-	if ($timesettings{'SETMINUTES'} eq '' || $timesettings{'SETMINUTES'} < 0 || $timesettings{'SETMINUTES'} > 59) {
-		$errormessage = $Lang::tr{'invalid time entered'};
-		goto UPDTERROR;
-	}
-	if ($timesettings{'SETDAY'} eq '' || $timesettings{'SETDAY'} < 1 || $timesettings{'SETDAY'} > 31) {
-		$errormessage = $Lang::tr{'invalid date entered'};
-		goto UPDTERROR;
-	}
-	if ($timesettings{'SETMONTH'} eq '' || $timesettings{'SETMONTH'} < 1 || $timesettings{'SETMONTH'} > 12) {
-		$errormessage = $Lang::tr{'invalid date entered'};
-		goto UPDTERROR;
-	}
-	if ($timesettings{'SETYEAR'} eq '' || $timesettings{'SETYEAR'} < 2003 || $timesettings{'SETYEAR'} > 2030) {
-		$errormessage = $Lang::tr{'invalid date entered'};
-		goto UPDTERROR;
-	}
-
-UPDTERROR:
-	if ($errormessage) {
-		$timesettings{'VALID'} = 'no'; }
-	else {
-       	$timesettings{'VALID'} = 'yes'; }
-
-	if ($timesettings{'VALID'} eq 'yes') {
-		# we want date in YYYY-MM-DD HH:MM format for date command
-		# EAO changed datestring to ISO 6801 format 2003-08-11
-		my $datestring = "$timesettings{'SETYEAR'}-$timesettings{'SETMONTH'}-$timesettings{'SETDAY'}";
-		my $timestring = "$timesettings{'SETHOUR'}:$timesettings{'SETMINUTES'}";
-		# EAO setdate.c also revised for ISO 6801 date format 2003-08-11
-		system ('/usr/local/bin/setdate', $datestring, $timestring);
-		&General::log("$Lang::tr{'time date manually reset'} $datestring $timestring");
-	}
-	unless ($errormessage) {
-		undef %timesettings;
-	}
-}
-
 if ($timesettings{'ACTION'} eq $Lang::tr{'save'})
 { 
 	if ($timesettings{'ENABLENTP'} eq 'on')
@@ -203,6 +160,7 @@ $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
 	system ('/bin/touch', "${General::swroot}/time/settimenow");
+	system ('/usr/local/bin/timecheckctrl >& /dev/null');
 }

 &General::readhash("${General::swroot}/time/settings", \%timesettings);
@@ -213,7 +171,7 @@ if ($timesettings{'VALID'} eq '')
 	$timesettings{'UPDATE_METHOD'} = 'manually';
 	$timesettings{'UPDATE_VALUE'} = '1';
 	$timesettings{'UPDATE_PERIOD'} = 'daily';
-	$timesettings{'NTP_ADDR_1'} = 'pool.ntp.org';
+	$timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';
 	$timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
 }

@@ -345,9 +303,7 @@ print <<END
 	<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'>
-		<a href='${General::adminmanualurl}/services.html#services_time' target='_blank'><img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a>
-	</td>
+	<td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 END
@@ -355,34 +311,6 @@ END

 &Header::closebox();

-&Header::openbox('100%', 'left', $Lang::tr{'update time'});
-
-print <<END
-<table width='100%'>
-<tr>
-	<td width='65%' class='base'>
-	<table>	
-	<tr>
-		<td>$Lang::tr{'year'}:&nbsp;</td>
-		<td><input type='text' name='SETYEAR' size='4' maxlength='4' value='$timesettings{'SETYEAR'}' /></td>
-		<td>&nbsp;$Lang::tr{'month'}:&nbsp;</td>
-		<td><input type='text' name='SETMONTH' size='2' maxlength='2' value='$timesettings{'SETMONTH'}' /></td>
-		<td>&nbsp;$Lang::tr{'day'}:&nbsp;</td>
-		<td><input type='text' name='SETDAY' size='2' maxlength='2' value='$timesettings{'SETDAY'}' /></td>
-		<td>&nbsp;&nbsp;&nbsp;&nbsp;$Lang::tr{'hours2'}:&nbsp;</td>
-		<td><input type='text' name='SETHOUR' size='2' maxlength='2' value='$timesettings{'SETHOUR'}' /></td>
-		<td>&nbsp;$Lang::tr{'minutes'}:&nbsp;</td>
-		<td><input type='text' name='SETMINUTES' size='2' maxlength='2' value='$timesettings{'SETMINUTES'}' /></td>
-	</tr>	
-	</table>
-	</td>
-	<td width='35%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
 print "</form>\n";

 &Header::closebigbox();
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -225,9 +225,7 @@ print <<END
      <input type='hidden' name='ACTION' value='add' />
      <input type='submit' name='SUBMIT' value='$buttontext' />
    </td>
-    <td width='5%' align='right'>
-    <a href='${General::adminmanualurl}/section-firewall.html#section-blue-access' target='_blank'>
-    <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 END
--- a/html/html/images/iptux.png
+++ b/html/html/images/iptux.png