vpn-statistic: change title of ovpn RW statistic page

[ipfire-2.x.git] / html / cgi-bin / wireless.cgi

diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi
index 3964835cdde4666920fa5bfd7ef66b8e1fdb5800..358f318df08af8559460388cd5760217f785f835 100644 (file)
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -1,14 +1,23 @@
 #!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) 2003 Alan Hourihane <alanh@fairlite.demon.co.uk>
-# (c) 2005 Eric Oberlander, Robert Kerr - Inline editing & DHCP leases
-#
-# $Id: wireless.cgi,v 1.4.2.15 2005/06/11 12:14:49 eoberlander Exp $
-#
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use strict;
 use Time::Local;
@@ -83,7 +92,7 @@ if ($cgiparams{'ACTION'} eq 'add')
        {
                $cgiparams{'SOURCE_IP'} = 'NONE';
        } else {
-               unless(&General::validip($cgiparams{'SOURCE_IP'})) 
+               unless(&General::validipormask($cgiparams{'SOURCE_IP'})) 
                {
                        $errormessage = $Lang::tr{'invalid fixed ip address'}; 
                        goto ADDERROR;
@@ -124,7 +133,7 @@ ADDERROR:
                close(FILE);
                undef %cgiparams;
                &General::log($Lang::tr{'wireless config added'});
-               system('/usr/local/bin/restartwireless');
+               system('/usr/local/bin/wirelessctrl');
        }
 ADDEXIT:
 }
@@ -148,7 +157,7 @@ if ($cgiparams{'ACTION'} eq 'edit')
                }
        }
        &General::log($Lang::tr{'wireless config changed'});
-       system('/usr/local/bin/restartwireless');
+       system('/usr/local/bin/wirelessctrl');
 }
 
 if ($cgiparams{'ACTION'} eq 'remove' || $cgiparams{'ACTION'} eq 'toggle')
@@ -169,7 +178,7 @@ if ($cgiparams{'ACTION'} eq 'remove' || $cgiparams{'ACTION'} eq 'toggle')
        }
        close(FILE);
        &General::log($Lang::tr{'wireless config changed'});
-       system('/usr/local/bin/restartwireless');
+       system('/usr/local/bin/wirelessctrl');
 }
 
 
@@ -216,16 +225,15 @@ print <<END
 <td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' /></td>
 </tr>
 </table>
-<hr />
+<br>
+<hr>
 <table width='100%'>
 <tr>
-    <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
-    <td width='55%' class='base'>$Lang::tr{'this field may be blank'}</td>
-    <td width='40%' align='center'>
+    <td class='base' valign='top'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
+    <td width='40%' align='right'>
       <input type='hidden' name='ACTION' value='add' />
       <input type='submit' name='SUBMIT' value='$buttontext' />
     </td>
-    <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 END
@@ -251,13 +259,13 @@ my @current = <FILE>;
 close (FILE);
 
 print <<END
-<table width='100%'>
+<table width='100%' class='tbl'>
 <tr>
-<td align='center' width='20%'><b>$Lang::tr{'hostname'}</b></td>
-<td align='center' width='20%'><b>$Lang::tr{'source ip'}</b></td>
-<td align='center' width='20%'><b>$Lang::tr{'mac address'}</b></td>
-<td align='center' width='35%'><b>$Lang::tr{'remark'}</b></td>
-<td align='center' colspan='3'><b>$Lang::tr{'action'}</b></td>
+<th align='center' width='20%'><b>$Lang::tr{'hostname'}</b></th>
+<th align='center' width='20%'><b>$Lang::tr{'source ip'}</b></th>
+<th align='center' width='20%'><b>$Lang::tr{'mac address'}</b></t>
+<th align='center' width='35%'><b>$Lang::tr{'remark'}</b></th>
+<th align='center' colspan='3'><b>$Lang::tr{'action'}</b></th>
 </tr>
 END
 ;
@@ -324,20 +332,24 @@ foreach my $line (@current)
                else { $gif = 'off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'};}
 
        my $remark    = &Header::cleanhtml($temp[4]);
+       my $col="";
 
        if ($cgiparams{'ACTION'} eq 'edit' && $cgiparams{'ID'} eq $id) {
-               print "<tr bgcolor='${Header::colouryellow}'>\n";
+               print "<tr>";
+               $col="bgcolor='${Header::colouryellow}'";
        } elsif ($id % 2) {
-               print "<tr bgcolor='${Header::table1colour}'>\n";
+               print "<tr>";
+               $col="bgcolor='${Header::table1colour}'";
        } else {
-               print "<tr bgcolor='${Header::table2colour}'>\n";
+               print "<tr>";
+               $col="bgcolor='${Header::table2colour}'";
        }
-       print "<td align='center'>$hname</td>\n";
-       print "<td align='center'>$sourceip</td>\n";
-       print "<td align='center'>$sourcemac</td>\n";
-       print "<td align='center'>$remark</td>\n";
+       print "<td align='center' $col>$hname</td>\n";
+       print "<td align='center' $col>$sourceip</td>\n";
+       print "<td align='center' $col>$sourcemac</td>\n";
+       print "<td align='center' $col>$remark</td>\n";
 print<<END
-<td align='center'>
+<td align='center' $col>
        <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
        <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' />
        <input type='hidden' name='ACTION' value='toggle'}' />
@@ -346,7 +358,7 @@ print<<END
        </form>
 </td>
 
-<td align='center'>
+<td align='center' $col>
        <form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
        <input type='hidden' name='ACTION' value='edit' />
        <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
@@ -354,7 +366,7 @@ print<<END
        </form>
 </td>
 
-<td align='center'>
+<td align='center' $col>
        <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
        <input type='hidden' name='ACTION' value='remove' />
        <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
@@ -396,12 +408,13 @@ sub printblueleases
 
        &Header::openbox('100%', 'left', "$Lang::tr{'current dhcp leases on blue'}");
        print <<END
-<table width='100%'>
+<table width='100%' class='tbl'>
 <tr>
-<td width='25%' align='center'><b>$Lang::tr{'ip address'}</b></td>
-<td width='25%' align='center'><b>$Lang::tr{'mac address'}</b></td>
-<td width='20%' align='center'><b>$Lang::tr{'hostname'}</b></td>
-<td width='30%' align='center'><b>$Lang::tr{'lease expires'} (local time d/m/y)</b></td>
+<th width='25%' align='center'><b>$Lang::tr{'ip address'}</b></th>
+<th width='25%' align='center'><b>$Lang::tr{'mac address'}</b></th>
+<th width='20%' align='center'><b>$Lang::tr{'hostname'}</b></th>
+<th width='30%' align='center'><b>$Lang::tr{'lease expires'} (local time d/m/y)</b></th>
+<th></th>
 </tr>
 END
        ;
@@ -450,18 +463,21 @@ END
        foreach my $key (sort blueleasesort keys %entries) {
 
                my $hostname = &Header::cleanhtml($entries{$key}->{HOSTNAME},"y");
+               my $col="";
 
                if ($id % 2) {
-                       print "<tr bgcolor='$Header::table2colour'>";
+                       print "<tr>";
+                       $col="bgcolor='$Header::table2colour'";
                } else {
-                       print "<tr bgcolor='$Header::table1colour'>";
+                       print "<tr>";
+                       $col="bgcolor='$Header::table1colour'";
                }
 
                print <<END
-<td align='center'>$entries{$key}->{IPADDR}</td>
-<td align='center'>$entries{$key}->{ETHER}</td>
-<td align='center'>&nbsp;$hostname </td>
-<td align='center'>
+<td align='center' $col>$entries{$key}->{IPADDR}</td>
+<td align='center' $col>$entries{$key}->{ETHER}</td>
+<td align='center' $col>&nbsp;$hostname </td>
+<td align='center' $col>
 END
                ;
 
@@ -484,7 +500,7 @@ END
                }
 
                print <<END
-<td align='center'>
+<td align='center' $col>
        <form method='post' name='frmd$id' action='$ENV{'SCRIPT_NAME'}'>
        <input type='hidden' name='ACTION' value='add' />
        <input type='hidden' name='SOURCE_IP' value='' />