From 19f5a6cc72e1c8d72f11994474da03a9a56d0455 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Mon, 3 Sep 2007 09:18:10 +0000 Subject: [PATCH] MPFire Copyright korrigiert Tripwire Samba und MPFire mit Ankern versehen Graph Cgi mit Back Button git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@875 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- html/cgi-bin/graphs.cgi | 9 +++++++ html/cgi-bin/mpfire.cgi | 37 +++++++++++++++++--------- html/cgi-bin/samba.cgi | 56 +++++++++++++++++++++------------------ html/cgi-bin/tripwire.cgi | 3 ++- 4 files changed, 66 insertions(+), 39 deletions(-) diff --git a/html/cgi-bin/graphs.cgi b/html/cgi-bin/graphs.cgi index 3c66db23bf..71e0b99c47 100644 --- a/html/cgi-bin/graphs.cgi +++ b/html/cgi-bin/graphs.cgi @@ -115,5 +115,14 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) { } } +print "
"; +if ( $cgigraphs[1] eq "cpu" || $cgigraphs[1] eq "load" ) { print ""; } +elsif ( $cgigraphs[1] eq "memory" || $cgigraphs[1] eq "swap" ) { print ""; } +elsif ( $cgigraphs[1] eq "memory" || $cgigraphs[1] eq "swap" ) { print ""; } +elsif ( $cgigraphs[1] =~ /disk/ ) { print ""; } +elsif ( $cgigraphs[1] eq "RED" || $cgigraphs[1] eq "lq" ) { print ""; } +elsif ( $cgigraphs[1] eq "GREEN" || $cgigraphs[1] eq "BLUE" || $cgigraphs[1] eq "ORANGE" ) { print ""; } +print "$Lang::tr{'back'}
\n"; + &Header::closebigbox(); &Header::closepage(); diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 9415dc6488..cc2237ab01 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.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"; @@ -200,7 +213,7 @@ print < - +
$Lang::tr{'Scan for Files'}
$Lang::tr{'Scan from Directory'}
$Lang::tr{'Scan from Directory'}
@@ -316,7 +329,7 @@ if ( $mpfiresettings{'SHOWLIST'} eq "on" ){ &Header::openbox('100%', 'center', $Lang::tr{'mpfire songs'}); print < ";} else {print "";} print <
+ @@ -418,7 +431,7 @@ END foreach (@webradio){ my @stream = split(/\|/,$_); print < + END diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a66dbe1504..818b5c5be8 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -561,6 +561,7 @@ if ($sambasettings{'SECURITY'} eq 'user') &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); } print <
$Lang::tr{'Existing Files'}

$Lang::tr{'Pages'}

@@ -357,7 +370,7 @@ foreach (keys(%songs)){ if ($lines % 2) {print "
 $song[2]
$song[3]		 $song[5] $song[4]$stream[1]
$stream[1]
@@ -621,7 +622,7 @@ END { print < -
+
@@ -633,7 +634,7 @@ END { print < - + @@ -649,7 +650,7 @@ END else { print < + @@ -661,7 +662,7 @@ END if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/) { print < + @@ -672,7 +673,7 @@ END else { print < + @@ -686,7 +687,7 @@ END

- END @@ -695,14 +696,14 @@ END if ($sambasettings{'DOMAINMASTER'} eq 'on') { print <
+ @@ -735,7 +736,7 @@ END my $password = 'samba'; print < -
+
+
END ; } print <
+
@@ -758,7 +759,7 @@ END $password=~s/\s//g; print < - +
$Lang::tr{'change passwords'}
$Lang::tr{'username'}
@@ -780,7 +781,7 @@ END $pcname=~s/\s//g; print < - +
$Lang::tr{'add user'}
$Lang::tr{'username'}
@@ -806,6 +807,7 @@ my %shares = config("${General::swroot}/samba/shares"); print <
$Lang::tr{'pc add'}
$Lang::tr{'client'}
";} else {print "";} print <$shareentry - -
$Lang::tr{'manage shares'} @@ -822,12 +824,12 @@ foreach my $shareentry (sort @Shares) if ($lines % 2) {print "
+
+
@@ -841,15 +843,15 @@ print <
- - - @@ -883,7 +885,7 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio - +
+
+
+
$Lang::tr{'show share options'}

@@ -903,7 +905,7 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op - +
$Lang::tr{'edit share'}
$Lang::tr{'show share options'}

@@ -953,6 +955,7 @@ if ( -e "/var/ipfire/cups/enable") my @Printers = keys(%printer); print <
- -
$Lang::tr{'manage printers'} @@ -964,12 +967,12 @@ foreach my $printerentry (sort @Printers) chomp $printerentry; print <$printerentry +
+
@@ -981,15 +984,15 @@ print <
- - - @@ -1007,7 +1010,7 @@ if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri - +
+
+
+
$Lang::tr{'show share options'}

@@ -1028,7 +1031,7 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq ' - +
$Lang::tr{'edit printer'}
$Lang::tr{'show share options'}

@@ -1092,8 +1095,9 @@ $Log=~s/\n/
/g; &Header::openbox('100%', 'center', $Lang::tr{'log'}); print <
- +
diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi index 518d36147b..39673a0095 100644 --- a/html/cgi-bin/tripwire.cgi +++ b/html/cgi-bin/tripwire.cgi @@ -461,8 +461,9 @@ END &Header::openbox('100%', 'center', $Lang::tr{'tripwire reports'}); print <
- +
$Lang::tr{'log view'}

-- 2.39.2
$Lang::tr{'log view'}