X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Ftripwire.cgi;h=696a52e1ee1f343f467f16ab007933a2c5d0780e;hb=62fc8511664c6646d706aa42927bac53ac6a5b5f;hp=aa87806f3c232cc121b0fba3e779e57d95cc743e;hpb=71dfc4b7a2acd048324566be129ad79c941bbbf3;p=people%2Fteissler%2Fipfire-2.x.git
diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi
old mode 100755
new mode 100644
index aa87806f3..696a52e1e
--- a/html/cgi-bin/tripwire.cgi
+++ b/html/cgi-bin/tripwire.cgi
@@ -1,15 +1,28 @@
#!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# 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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see . #
+# #
+###############################################################################
use strict;
# enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
@@ -20,10 +33,16 @@ my %checked = ();
my %netsettings = ();
my $message = "";
my $errormessage = "";
-my @Logs = qx(ls -r /var/ipfire/tripwire/report/);
-my $file = `ls -tr /var/ipfire/tripwire/report/ | tail -1`;
+my @Logs = `ls -r /var/ipfire/tripwire/report/ 2>/dev/null`;
+my $file = `ls -tr /var/ipfire/tripwire/report/ | tail -1 2>/dev/null`;
+my @cronjobs = `ls /etc/fcron.daily/tripwire* 2>/dev/null`;
my $Log =$Lang::tr{'no log selected'};
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
############################################################################################################################
################################################# Tripwire Default Variablen ################################################
@@ -54,8 +73,9 @@ $tripwiresettings{'ACTION'} = '';
######################################################### Tripwire HTML Part ###############################################
&Header::showhttpheaders();
+
&Header::getcgihash(\%tripwiresettings);
-&Header::openpage('Tripwire', 1, '');
+&Header::openpage('Tripwire', 1,);
&Header::openbigbox('100%', 'left', '', $errormessage);
############################################################################################################################
@@ -63,7 +83,7 @@ $tripwiresettings{'ACTION'} = '';
if ($tripwiresettings{'ACTION'} eq $Lang::tr{'save'})
{
-system("/usr/local/bin/tripwirectrl readconfig");
+system("/usr/local/bin/tripwirectrl readconfig >/dev/null 2>&1");
open (FILE, ">${General::swroot}/tripwire/twcfg.txt") or die "Can't save tripwire config: $!";
flock (FILE, 2);
@@ -92,24 +112,44 @@ END
close FILE;
&General::writehash("${General::swroot}/tripwire/settings", \%tripwiresettings);
-system("/usr/local/bin/tripwirectrl lockconfig");
+system("/usr/local/bin/tripwirectrl lockconfig >/dev/null 2>&1");
}
############################################################################################################################
################################################## Sicherheitsabfrage für CGI ##############################################
+if ($tripwiresettings{'ACTION'} eq 'addcron')
+ {
+ print <
+