From: maniacikarus Date: Fri, 13 Jul 2007 18:49:27 +0000 (+0000) Subject: Fuer den Urlfilter ein Background Image gemacht X-Git-Tag: v2.3-beta1~577 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=69addbb81059f6683900912bb59aac444648c6a7 Fuer den Urlfilter ein Background Image gemacht MPFire erweitert Samba Pagerefresh korrigiert Tripwire Pagerefreh korrigiert Backup CGI sollte jetzt fertig sein zum Testen vpnmain die beiden SHA2 Crypts entfernt Snort init nochmal angepasst damit die PID alleine angelegt wird git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@682 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/backup/backup.pl b/config/backup/backup.pl index f0ae002c44..7284ad421e 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -15,45 +15,35 @@ $Minuten = sprintf("%02d", $Minuten); if ($ARGV[0] eq 'include') { &createinclude; - my @files = `find / -name *.log`; + my @files = `find / -name *.log 2>/dev/null`; foreach (@files){ push(@include,$_); } open(DATEI, ">/tmp/include") || die "Could not save temp include file"; print DATEI @include; close(DATEI); - system("tar -cvzf /srv/web/ipfire/html/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten.ipf --files-from=/tmp/include --exclude-from=/var/ipfire/backup/exclude"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); system("rm /tmp/include"); } - -if ($ARGV[0] eq 'exclude') { +elsif ($ARGV[0] eq 'exclude') { &createinclude; open(DATEI, ">/tmp/include") || die "Could not save temp include file"; print DATEI @include; close(DATEI); - system("tar -cvzf /srv/web/ipfire/html/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); system("rm /tmp/include"); } - -if ($ARGV[0] eq 'restore') { +elsif ($ARGV[0] eq 'restore') { system("tar -xvz --preserve -f /tmp/restore.ipf"); } - -if ($ARGV[0] eq 'exclude') { - &createinclude; - open(DATEI, ">/tmp/include") || die "Could not save temp include file"; - print DATEI @include; - close(DATEI); - system("tar -cvzf /srv/web/ipfire/html/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); - system("rm /tmp/include"); +elsif ($ARGV[0] eq 'cli') { + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'"); } - -if ($ARGV[0] eq 'cli') { - system("tar -cvzf /srv/web/ipfire/html/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'"); +elsif ($ARGV[0] =~ /ipf$/ ) { + system("rm /var/ipfire/backup/$ARGV[0]"); } - -if ($ARGV[0] eq '') { - printf "No argument given, please use \n" +elsif ($ARGV[0] eq '') { + printf "No argument given, please use \n" } sub createinclude(){ diff --git a/config/backup/include b/config/backup/include index 802ebc25c4..17588a2697 100644 --- a/config/backup/include +++ b/config/backup/include @@ -1,6 +1,7 @@ /var/ipfire/*/settings /var/ipfire/*/*.conf /var/ipfire/*/*.pem +/var/ipfire/*/config /etc/passwd /etc/shadow /etc/group diff --git a/doc/language_issues.de b/doc/language_issues.de index a8c448c6b6..182d95c4a0 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -109,7 +109,6 @@ WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: downlink speed -WARNING: translation string unused: download WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload diff --git a/doc/language_missings b/doc/language_missings index a3ddc4b1d6..8f98f6dee3 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -17,7 +17,6 @@ < dhcp fixed lease err1 < dhcp fixed lease help1 < dns server -< download < err bk 10 password < or < password crypting key diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index fbc96271b9..fc77065714 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -22,7 +22,7 @@ my %cgiparams=(); my %checked = (); my $message = ""; my $errormessage = ""; -my @backups = `cd /srv/web/ipfire/html/backup && ls *.ipf`; +my @backups = `cd /var/ipfire/backup/ && ls *.ipf`; $a = new CGI; @@ -33,19 +33,16 @@ $cgiparams{'ACTION'} = ''; $cgiparams{'FILE'} = ''; $cgiparams{'UPLOAD'} = ''; $cgiparams{'BACKUPLOGS'} = ''; + &Header::getcgihash(\%cgiparams); ############################################################################################################################ -######################################## Scanne Verzeichnisse nach Mp3 Dateien ############################################# +############################################## System calls ohne Http Header ############################################### -if ( $cgiparams{'ACTION'} eq "backup" ) -{ - if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include");} - else {system("/usr/local/bin/backupctrl exclude");} -} -elsif ( $cgiparams{'ACTION'} eq "download" ) + +if ( $cgiparams{'ACTION'} eq "download" ) { - open(DLFILE, "; print "Content-Type:application/x-download\n"; print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; @@ -64,13 +61,31 @@ elsif ( $cgiparams{'ACTION'} eq "restore" ) system("/usr/local/bin/backupctrl restore"); } -############################################################################################################################ -########################################### rekursiv nach neuen Mp3s Scannen ##############################################ä - &Header::showhttpheaders(); + +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} + &Header::openpage($Lang::tr{'backup'}, 1, ""); &Header::openbigbox('100%', 'left', '', $errormessage); +############################################################################################################################ +################################################### Default System calls ################################################### + +if ( $cgiparams{'ACTION'} eq "backup" ) +{ + if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include >/dev/null");} + else {system("/usr/local/bin/backupctrl exclude >/dev/null");} + refreshpage(); +} +elsif ( $cgiparams{'ACTION'} eq "delete" ) +{ + system("/usr/local/bin/backupctrl $cgiparams{'FILE'} >/dev/null"); + refreshpage(); +} + +############################################################################################################################ +########################################### rekursiv nach neuen Mp3s Scannen ##############################################ä + if ( $message ne "" ){ &Header::openbox('100%','left',$Lang::tr{'error messages'}); print "$message\n"; @@ -100,11 +115,12 @@ END ; foreach (@backups){ chomp($_); -my $Datei = "/srv/web/ipfire/html/backup/".$_; +my $Datei = "/var/ipfire/backup/".$_; my @Info = stat($Datei); my $Size = $Info[7] / 1024; $Size = sprintf("%02d", $Size); -print "
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB
"; +print "$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB
"; +print "
"; } print < @@ -116,7 +132,7 @@ END print < -
$Lang::tr{'backup'}
+$Lang::tr{'backup'}
END ; diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index dcf6c17649..6b6b4acb5e 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -31,8 +31,10 @@ close(DATEI); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); &Header::showhttpheaders(); -&Header::getcgihash(\%mpfiresettings); +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} + +&Header::getcgihash(\%mpfiresettings); &Header::openpage($Lang::tr{'mpfire'}, 1, ""); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -44,6 +46,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ) delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'}; &General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings); system("/usr/local/bin/mpfirectrl scan $mpfiresettings{'SCANDIR'} $mpfiresettings{'SCANDIRDEPS'}"); +refreshpage(); } if ( $mpfiresettings{'ACTION'} eq ">" ){system("/usr/local/bin/mpfirectrl","play","\"$mpfiresettings{'FILE'}\"");} @@ -139,8 +142,12 @@ my $song = qx(/usr/local/bin/mpfirectrl song); if ( $song eq "" ){$song = "None";} &Header::openbox('100%', 'center', $Lang::tr{'mpfire controls'}); -print ""; print < + + + @@ -175,9 +182,10 @@ foreach (@songdb){ @album = sort keys %hash; print < + @@ -2340,8 +2338,6 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || diff --git a/html/html/images/background.gif b/html/html/images/background.gif new file mode 100644 index 0000000000..816b23ea3d Binary files /dev/null and b/html/html/images/background.gif differ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 4dcea18dcb..26db4e4785 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -606,7 +606,7 @@ 'domain name suffix' => 'Domain-Name-Suffix:', 'domain not set' => 'Domain nicht eingegeben.', 'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)', -'download' => 'Download', +'download' => 'herunterladen', 'download ca certificate' => 'CA Zertifikat herunterladen', 'download certificate' => 'Zertifikate herunterladen', 'download host certificate' => 'Host Zertifikat herunterladen', @@ -1167,6 +1167,7 @@ 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', +'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire configuration' => 'Pakfire Konfiguration', 'pap or chap' => 'PAP oder CHAP', 'password' => 'Passwort:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7cbafd5ad4..5a52ed3178 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -617,6 +617,7 @@ 'domain not set' => 'Domain not set.', 'done' => 'Do it', 'downlink speed' => 'Downlink speed (kbit/sec)', +'download' => 'download', 'download ca certificate' => 'Download CA Certificate', 'download certificate' => 'Download Certificate', 'download host certificate' => 'Download Host Certificate', @@ -1179,6 +1180,7 @@ 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', 'package failed to install' => 'Package failed to install.', +'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire configuration' => 'Pakfire Configuration', 'pap or chap' => 'PAP or CHAP', 'password' => 'Password:', diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index e0d93c6ec5..bb4e9b9416 100755 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -62,7 +62,7 @@ case "$1" in start) for DEVICE in $DEVICES; do boot_mesg "Starting Intrusion Detection System on $DEVICE..." - /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --pid-path /var/run/ + /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run/ evaluate_retval chmod 644 /var/run/snort_$DEVICE.pid done diff --git a/src/misc-progs/backupctrl.c b/src/misc-progs/backupctrl.c index f09eda0d31..120a51be46 100644 --- a/src/misc-progs/backupctrl.c +++ b/src/misc-progs/backupctrl.c @@ -43,7 +43,5 @@ int main(int argc, char *argv[]) { sprintf(add, " %s", argv[i]); strcat(command, add); } - - snprintf(command, STRING_SIZE, " >/dev/null 2>/dev/null"); return safe_system(command); }
-= $song =-

-= $song =-

total $#songdb songs
$Lang::tr{'artist'} - $#artist$Lang::tr{'album'} - $#album
- END ; foreach (@artist){print "";} @@ -188,7 +196,7 @@ print <
 - END ; foreach (@album){print "";} diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0d506dea65..f7bdfa9f55 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -98,7 +98,7 @@ my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; &General::readhash("${General::swroot}/samba/settings", \%sambasettings); &Header::getcgihash(\%sambasettings); -sub refreshpage{&Header::openbox( 'Waiting', 1, "" );} +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} &Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi index 3fa8fc7e78..3b4015a958 100644 --- a/html/cgi-bin/tripwire.cgi +++ b/html/cgi-bin/tripwire.cgi @@ -248,7 +248,7 @@ END if ($tripwiresettings{'ACTION'} eq 'globalresetyes') { -&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'tripwireoperating'}
"; +&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'tripwireoperating'}
";&Header::closebox(); $tripwiresettings{'ROOT'} = '/usr/sbin'; $tripwiresettings{'POLFILE'} = '/var/ipfire/tripwire/tw.pol'; $tripwiresettings{'DBFILE'} = '/var/ipfire/tripwire/$(HOSTNAME).twd'; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 6abfa8fac2..e14fa86646 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2302,8 +2302,6 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || 		$Lang::tr{'ike integrity'} $Lang::tr{'esp integrity'}