This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 98dd8fc1a3a295e9e005bf15e51af578932ec95c (commit) via 26906d98239bf79d9344e8f0796d5ca40d02ee73 (commit) from 11b2b92bab2282d7c6c8dec0fbcb3f600fabe83a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 98dd8fc1a3a295e9e005bf15e51af578932ec95c Merge: 26906d9 11b2b92 Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Dec 15 18:46:24 2010 +0100

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

commit 26906d98239bf79d9344e8f0796d5ca40d02ee73 Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Dec 15 18:45:59 2010 +0100

Some more stderr fixes for the CGIs.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/44/filelists/files | 2 ++ html/cgi-bin/backup.cgi | 15 +++++++++++---- html/cgi-bin/services.cgi | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 44b01ac..cd2840e 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -23,6 +23,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 diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 86814e9..e526fc3 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -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; diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 156db2d..424ca86 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -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>";

hooks/post-receive -- IPFire 2.x development tree