Ajax Speedmeter ist ueber Guioptions deaktivierbar -> friss gut CPU

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / gui.cgi

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 3eaf37cd6e634bf6b64f62e97e1b5ebe44266137..ffab93c2ab04641b5934e40efe3d283d8aaf23a1 100644 (file)
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
@@ -15,7 +15,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -25,7 +25,8 @@ my %checked=();
 my $errormessage='';
 
 
-$cgiparams{'JAVASCRIPT'} = 'off';
+$cgiparams{'FX'} = 'off';
+$cgiparams{'SPEED'} = 'off';
 $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
 $cgiparams{'REFRESHINDEX'} = 'off';
 $cgiparams{'ACTION'} = '';
@@ -59,7 +60,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
         # Set flag if index page is to refresh whilst ppp is up.
         # Default is NO refresh.
         if ($cgiparams{'REFRESHINDEX'} ne 'off') {
-            system ('/bin/touch', "${General::swroot}/main/refreshindex");
+            system ('/usr/bin/touch', "${General::swroot}/main/refreshindex");
         } else {
             unlink "${General::swroot}/main/refreshindex";
         }
@@ -67,7 +68,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
         # Beep on ip-up or ip-down. Default is ON.
         if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') {
             $cgiparams{'PPPUPDOWNBEEP'} = 'off';
-            system ('/bin/touch', "${General::swroot}/ppp/nobeeps");
+            system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
         } else {
             unlink "${General::swroot}/ppp/nobeeps";
         }
@@ -76,6 +77,9 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
        $mainsettings{'LANGUAGE'} = $cgiparams{'lang'};
        $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
        $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
+       $mainsettings{'FX'} = $cgiparams{'FX'};
+       $mainsettings{'SPEED'} = $cgiparams{'SPEED'};
+       $mainsettings{'THEME'} = $cgiparams{'theme'};
        $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
        &General::writehash("${General::swroot}/main/settings", \%mainsettings);
        &Lang::reload($cgiparams{'lang'});
@@ -93,11 +97,28 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
                $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        }
 
+       if ($mainsettings{'FX'}) {
+               $cgiparams{'FX'} = $mainsettings{'FX'};
+       } else {
+               $cgiparams{'FX'} = 'on';
+       }
+
+       if ($mainsettings{'THEME'}) {
+               $cgiparams{'THEME'} = $mainsettings{'THEME'};
+       } else {
+               $cgiparams{'THEME'} = 'ipfire';
+       }
+
        if($mainsettings{'REFRESHINDEX'}) {
                $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'};
        } else {
                $cgiparams{'REFRESHINDEX'} = 'off';
        }
+       if($mainsettings{'SPEED'}) {
+               $cgiparams{'SPEED'} = $mainsettings{'SPEED'};
+       } else {
+               $cgiparams{'SPEED'} = 'off';
+       }
 }
 
 # Default settings
@@ -106,6 +127,9 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
        $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
        $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        $cgiparams{'REFRESHINDEX'} = 'off';
+       $cgiparams{'FX'} = 'on';
+       $cgiparams{'SPEED'} = 'on';
+       $cgiparams{'THEME'} = 'ipfire';
 }
 
 $checked{'WINDOWWITHHOSTNAME'}{'off'} = '';
@@ -120,6 +144,14 @@ $checked{'REFRESHINDEX'}{'off'} = '';
 $checked{'REFRESHINDEX'}{'on'} = '';
 $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'";
 
+$checked{'FX'}{'off'} = '';
+$checked{'FX'}{'on'} = '';
+$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
+
+$checked{'SPEED'}{'off'} = '';
+$checked{'SPEED'}{'on'} = '';
+$checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'";
+
 &Header::openpage($Lang::tr{'gui settings'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -137,6 +169,10 @@ print <<END
 <tr>
     <td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
 </tr>
+<tr>
+    <td><input type='checkbox' name='FX' $checked{'FX'}{'on'} /></td>
+    <td>$Lang::tr{'display webinterface effects'}</td>
+</tr>
 <tr>
     <td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td>
     <td>$Lang::tr{'display hostname in window title'}</td>
@@ -145,6 +181,10 @@ print <<END
     <td><input type='checkbox' name='REFRESHINDEX' $checked{'REFRESHINDEX'}{'on'} /></td>
     <td>$Lang::tr{'refresh index page while connected'}</td>
 </tr>
+<tr>
+    <td><input type='checkbox' name='SPEED' $checked{'SPEED'}{'on'} /></td>
+    <td>$Lang::tr{'show ajax speedmeter in footer'}</td>
+</tr>
 <tr>
     <td>&nbsp;</td>
     <td>$Lang::tr{'languagepurpose'}</td>
@@ -176,6 +216,37 @@ END
        ;
 }
 
+print <<END
+</select></td></tr>
+<tr>
+    <td colspan='2'><hr /><p><b>$Lang::tr{'theme'}</b></td>
+</tr>
+<tr>
+    <td>&nbsp;</td>
+    <td><select name='theme'>
+END
+;
+
+my $dir = "/srv/web/ipfire/html/themes";
+local *DH;
+my ($item, $file);
+my @files;
+
+opendir (DH, $dir);
+while ($file = readdir (DH)) {
+       next if ( $file =~ /^\./ );
+       push (@files, $file);
+}
+closedir (DH);
+
+foreach $item (sort (@files)) {
+       if ( "$mainsettings{'THEME'}" eq "$item" ) {
+               print "<option value='$item' selected='selected'>$item</option>\n";
+       } else {
+               print "<option value='$item'>$item</option>\n";
+       }
+}
+
 print <<END
 </select></td></tr>
 <tr>