webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some more stderr fixes for the CGIs.

Browse Source
This commit is contained in:
Christian Schmidt
2010-12-15 18:45:59 +01:00
parent 0d08de33a6
commit 26906d9823
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/44/filelists/files
View File

@@ -21,6 +21,8 @@ srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/html/images/urlfilter/copy.gif
var/ipfire/general-functions.pl

15
html/cgi-bin/backup.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2005-2010 IPFire Team #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -35,6 +35,8 @@ my %cgiparams=();
my %checked = ();
my $message = "";
my $errormessage = "";
my @backups = "";
my @backupisos = "";
$a = new CGI;
@@ -150,8 +152,13 @@ if ( $message ne "" ){
&Header::closebox();
}
my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
my @backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
if ( -e "/var/ipfire/backup/" ){
@backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
}
if ( -e "/var/tmp/backupiso/" ){
@backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
}
&Header::openbox('100%', 'center', $Lang::tr{'backup'});
@@ -186,7 +193,7 @@ print <<END
END
;
foreach (@backups){
chomp($_);
chomp($_);
my $Datei = "/var/ipfire/backup/".$_;
my @Info = stat($Datei);
my $Size = $Info[7] / 1024 / 1024;

4
html/cgi-bin/services.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# Copyright (C) 2005-2010 IPFire Team #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -275,7 +275,7 @@ sub isrunningaddon{
my $exename;
my @memory;
my $testcmd = `/usr/local/bin/addonctrl $_ status`;
my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";