Some little bugfixes to current codebase
authorChristian Schmidt <maniacikarus@ipfire.org>
Wed, 21 Apr 2010 05:15:44 +0000 (07:15 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Wed, 21 Apr 2010 05:15:44 +0000 (07:15 +0200)
config/outgoingfw/outgoingfw.pl
doc/packages-list.txt
html/cgi-bin/outgoingfw.cgi
html/cgi-bin/outgoinggrp.cgi
langs/fr/cgi-bin/fr.pl

index dd42415..58c97bc 100644 (file)
@@ -145,7 +145,6 @@ foreach $configentry (sort @configs)
                } elsif ($configline[2] eq 'ip') {
                        @SOURCE = ("$configline[5]");
                        $DEV = "";
-               } 
                } elsif ($configline[2] eq 'all') {
                        @SOURCE = ("0/0");
                        $DEV = "";
index ea1498d..d5ed0ef 100644 (file)
@@ -62,6 +62,7 @@
 * 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
index e2bfcfd..be16beb 100644 (file)
@@ -656,13 +656,13 @@ END
                                        <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 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>
-                                               <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
index b277339..69656d0 100644 (file)
@@ -199,7 +199,7 @@ print <<END
                </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>
index 0addee7..feef190 100644 (file)
@@ -15,7 +15,7 @@
 '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',