Some little bugfixes to current codebase

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index dd42415b73f483cf0de0cbc40e49917b631d2b40..58c97bc585d7c5fcd28b23b60f639d49653e8c44 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -145,7 +145,6 @@ foreach $configentry (sort @configs)
                } elsif ($configline[2] eq 'ip') {
                        @SOURCE = ("$configline[5]");
                        $DEV = "";
                } elsif ($configline[2] eq 'ip') {
                        @SOURCE = ("$configline[5]");
                        $DEV = "";

-               } 

                } elsif ($configline[2] eq 'all') {
                        @SOURCE = ("0/0");
                        $DEV = "";
                } elsif ($configline[2] eq 'all') {
                        @SOURCE = ("0/0");
                        $DEV = "";

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index ea1498dbc5880d7c94998280fab47cf6bb172239..d5ed0ef143b71a3f166825cfb2610394a3f45ac1 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -62,6 +62,7 @@
 * cacti-0.8.7e
 * calamaris-2.59
 * capi4k-utils-2005-07-18
 * cacti-0.8.7e
 * calamaris-2.59
 * capi4k-utils-2005-07-18

+* ccache-2.4

 * ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1
 * ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index e2bfcfdebfc77806f57f9ffc2bcc2c5bb237f648..be16beb6e6930799f3103c42c8c4784ddbf19554 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -656,13 +656,13 @@ END
                                        <optgroup label='---'>
                                                <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
                                        <optgroup label='$Lang::tr{'ip address'}'>
                                        <optgroup label='---'>
                                                <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
                                        <optgroup label='$Lang::tr{'ip address'}'>

-                                               <option value='ip' $selected{'SNET'}{'ip'}>IPSEC $Lang::tr{'interface'}</option>
-                                               <option value='red' $selected{'SNET'}{'red'}>OpenVPN $Lang::tr{'interface'}</option>
+                                               <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip'}</option>
+                                               <option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option>

                                        </optgroup>
                                        </optgroup>

+                                       <optgroup label='$Lang::tr{'alt vpns'}'>
+                                               <option value='ipsec' $selected{'SNET'}{'ipsec'}>IPSEC $Lang::tr{'interface'}</option>
+                                               <option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option>

                                        </optgroup>
                                        </optgroup>

-                                               <option value='ipsec' $selected{'SNET'}{'ipsec'}>$Lang::tr{'source ip'}</option>
-                                               <option value='ovpn' $selected{'SNET'}{'ovpn'}>$Lang::tr{'red'} IP</option>
-                                       <optgroup label='$Lang::tr{'network'}'>

                                        <optgroup label='$Lang::tr{'network'}'>
                                                <option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
 END
                                        <optgroup label='$Lang::tr{'network'}'>
                                                <option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
 END

diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
index b277339a1a7d637057de7d60e28672397fa07d40..69656d07294c7c7533a6e5d47d72052550f0e9bd 100644 (file)
--- a/html/cgi-bin/outgoinggrp.cgi
+++ b/html/cgi-bin/outgoinggrp.cgi
@@ -199,7 +199,7 @@ print <<END
                </tr>
                <tr>
                        <td  align='left' colspan='3'>
                </tr>
                <tr>
                        <td  align='left' colspan='3'>

-                               <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/14\n192.168.0.1\n192.168.0.2\n</textarea>
+                               <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea>

                        </td>
                </tr>
        </table>
                        </td>
                </tr>
        </table>

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 0addee7d19d882a73df8c1544454b3b31947d6a4..feef190cbb5ead82637b6f8c4b63a2cbc38f0aa8 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -15,7 +15,7 @@
 'ConnSched change profile title' => 'Change to profile:',
 'ConnSched days' => 'Days:',
 'ConnSched down' => 'Down',
 'ConnSched change profile title' => 'Change to profile:',
 'ConnSched days' => 'Days:',
 'ConnSched down' => 'Down',

-'Set time on boot' => 'Fixé l'heure en botte',
+'Set time on boot' => 'Fixe l heure en botte',

 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Reconnect',