webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 01:12:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2014-04-29 14:37:58 +02:00
parent f9538c3562 872d5a1e33
commit 91812c575f
17 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/language_issues.es
View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes

1
doc/language_issues.fr
View File

@@ -598,6 +598,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes

1
doc/language_issues.nl
View File

@@ -600,6 +600,7 @@ WARNING: untranslated string: addons
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
WARNING: untranslated string: ccd err isipsecrw

1
doc/language_issues.pl
View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes

1
doc/language_issues.ru
View File

@@ -591,6 +591,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes

1
doc/language_issues.tr
View File

@@ -641,6 +641,7 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: atm device
WARNING: untranslated string: bytes
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: random number generator daemon

4
doc/language_missings
View File

@@ -23,6 +23,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< ccd add
@@ -501,6 +502,7 @@
< age sminute
< age ssecond
< Async logging enabled
< atm device
< attention
< bit
< ccd add
@@ -970,6 +972,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< ccd add
@@ -1416,6 +1419,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< ccd add

16
html/cgi-bin/pppsetup.cgi
View File

@@ -150,6 +150,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) {
$errormessage = $Lang::tr{'invalid vpi vpci'};
goto ERROR; }
if ($pppsettings{'ATM_DEV'} eq '') {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ( $pppsettings{'PROTOCOL'} eq '' ) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
@@ -723,11 +726,12 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)
print <<END
<tr>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'atm settings'}:</b></td>
<tr>
<td nowrap='nowrap'>$Lang::tr{'atm device'}</td>
<td><input type='text' size='5' name='ATM_DEV' value='$pppsettings{'ATM_DEV'}' /></td>
<td> $Lang::tr{'encapsulation'}:</td>
<td colspan='2' width='30%'>
<td>
<select name='ENCAP'>
<option value='0' $selected{'ENCAP'}{'0'}>LLC</option>
<option value='1' $selected{'ENCAP'}{'1'}>VCmux</option>
@@ -735,11 +739,10 @@ print <<END
</td>
</tr>
<tr>
<td nowrap='nowrap'>$Lang::tr{'vpi number'}</td>
<td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
<td align='right'>$Lang::tr{'vci number'}</td>
<td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
<td> $Lang::tr{'vci number'}</td>
<td><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
</tr>
END
;
@@ -939,6 +942,7 @@ sub initprofile
$pppsettings{'ENCAP'} = '0';
$pppsettings{'VPI'} = '1';
$pppsettings{'VCI'} = '32';
$pppsettings{'ATM_DEV'} = '0';
$pppsettings{'PPTP_PEER'} = '10.0.0.138';
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PPTP_ROUTE'} = '';

3
langs/de/cgi-bin/de.pl
View File

@@ -99,7 +99,6 @@
'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
'admin users' => 'Liste der Benutzer mit Super User Rechten',
'administrator user password' => 'Passwort für Benutzer &quot;admin&quot;:',
'adsl settings' => 'ADSL-Einstellungen',
'advanced' => 'Erweitert',
'advanced server' => 'Erweiterte Server-Optionen',
'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich',
@@ -366,6 +365,8 @@
'are you sure' => 'Sind Sie sicher?',
'arp table entries' => 'Einträge der ARP-Tabelle',
'artist' => 'Künstler',
'atm device' => 'Device:',
'atm settings' => 'ATM-Einstellungen',
'attemps' => 'Versuche',
'attention' => 'ACHTUNG',
'august' => 'August',

3
langs/en/cgi-bin/en.pl
View File

@@ -99,7 +99,6 @@
'admin user password has been changed' => 'Admin user password has been changed.',
'admin users' => 'User with superuser rights',
'administrator user password' => 'Admin user password:',
'adsl settings' => 'ADSL settings',
'advanced' => 'Advanced',
'advanced server' => 'Advanced server options',
'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
@@ -368,6 +367,8 @@
'are you sure' => 'Are you sure?',
'arp table entries' => 'ARP Table Entries',
'artist' => 'Artist',
'atm device' => 'Device:',
'atm settings' => 'ATM settings',
'attemps' => 'Attempts',
'attention' => 'ATTENTION',
'august' => 'August',

2
langs/es/cgi-bin/es.pl
View File

@@ -90,7 +90,6 @@
'admin user password has been changed' => 'El password del usuario Admin ha cambiado',
'admin users' => 'Usuario con niveles de superusuario (root)',
'administrator user password' => 'Contraseña del usuario Admin:',
'adsl settings' => 'Configuraciones ADSL',
'advanced' => 'Avanzadas',
'advanced server' => 'Opciones avanzadas de servidor',
'advproxy AUTH always required' => 'Se necesita autentificación para acceso irrestricto de direcciones de orígen',
@@ -349,6 +348,7 @@
'are you sure' => '¿Esta seguro?',
'arp table entries' => 'Tabla de entradas ARP:',
'artist' => 'Artista',
'atm settings' => 'Configuraciones ATM',
'attemps' => 'Intentos',
'august' => 'Agosto',
'authentication' => 'Autenticación',

2
langs/fr/cgi-bin/fr.pl
View File

@@ -92,7 +92,6 @@
'admin user password has been changed' => 'Le mot de passe admin a été changé.',
'admin users' => 'Utilisateur avec droits super-utilisateur',
'administrator user password' => 'Mot de passe de l\'administrateur:',
'adsl settings' => 'Réglages ADSL',
'advanced' => 'Avancé',
'advanced server' => 'Options avancées du serveur',
'advproxy AUTH always required' => 'Exige l\'authentification pour un accès sans restriction des adresses sources',
@@ -351,6 +350,7 @@
'are you sure' => 'Etes vous sûr ?',
'arp table entries' => 'Table d\'entrées ARP:',
'artist' => 'Artiste',
'atm settings' => 'Réglages ATM',
'attemps' => 'Tentatives',
'august' => 'Août',
'authentication' => 'Authentification :',

2
langs/nl/cgi-bin/nl.pl
View File

@@ -92,7 +92,6 @@
'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
'admin users' => 'Gebruiker met beheerdersrechten.',
'administrator user password' => 'Beheerderswachtwoord:',
'adsl settings' => 'ADSL instellingen',
'advanced' => 'Geavanceerd',
'advanced server' => 'Geavanceerde server opties',
'advproxy AUTH always required' => 'Authenticatie vereist voor ongelimiteerde bronadressen.',
@@ -353,6 +352,7 @@
'are you sure' => 'Weet u het zeker?',
'arp table entries' => 'ARP Tabelingangen:',
'artist' => 'Artiest',
'atm settings' => 'ATM instellingen',
'attemps' => 'Pogingen',
'attention' => 'LET OP',
'august' => 'Augustus',

2
langs/pl/cgi-bin/pl.pl
View File

@@ -92,7 +92,6 @@
'admin user password has been changed' => 'Hasło administratora zostało zmienione.',
'admin users' => 'Użytkownik prawami superużytkownika',
'administrator user password' => 'Hasło administratora:',
'adsl settings' => 'Ustawienia ADSL',
'advanced' => 'Zaawansowane',
'advanced server' => 'Zaawansowane ustawienia serwera',
'advproxy AUTH always required' => 'Wymagaj autoryzacji dla adresów źródłowych bez ograniczeń',
@@ -351,6 +350,7 @@
'are you sure' => 'Jesteś pewien?',
'arp table entries' => 'Wpisy tabeli ARP:',
'artist' => 'Artysta',
'atm settings' => 'Ustawienia ATM',
'attemps' => 'Prób',
'august' => 'Sierpień',
'authentication' => 'Uwierzytelnianie:',

2
langs/ru/cgi-bin/ru.pl
View File

@@ -90,7 +90,6 @@
'admin user password has been changed' => 'Пароль пользователя Admin был изменён.',
'admin users' => 'Пользователь с правами суперадминистратора',
'administrator user password' => 'Пароль пользователя Admin:',
'adsl settings' => 'Настройки ADSL',
'advanced' => 'Дополнительно',
'advanced server' => 'Дополнительные настройки сервера',
'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов',
@@ -349,6 +348,7 @@
'are you sure' => 'Вы уверены?',
'arp table entries' => 'Записи ARP-таблицы:',
'artist' => 'Artist',
'atm settings' => 'Настройки ATM',
'attemps' => 'Попытки',
'august' => 'Август',
'authentication' => 'Аутентификация:',

2
langs/tr/cgi-bin/tr.pl
View File

@@ -99,7 +99,6 @@
'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.',
'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı',
'administrator user password' => 'Admin kullanıcı parolası:',
'adsl settings' => 'ADSL ayarları',
'advanced' => 'Gelişmiş',
'advanced server' => 'Gelişmiş Sunucu Seçenekleri',
'advproxy AUTH always required' => 'Sınırsız kaynak adresleri için kimlik doğrulaması iste',
@@ -368,6 +367,7 @@
'are you sure' => 'Emin misiniz?',
'arp table entries' => 'ARP tablosu girdileri:',
'artist' => 'Sanatçı',
'atm settings' => 'ATM ayarları',
'attemps' => 'Girişim',
'attention' => 'DİKKAT',
'august' => 'Ağustos',

11
src/initscripts/init.d/networking/red
View File

@@ -22,6 +22,7 @@
#Define some defaults
INET_VLAN=7
IPTV_VLAN=8
ATM_DEV=0
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
if [ "$RRDLOG" == "" ]; then
@@ -170,17 +171,17 @@ case "${1}" in
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
PPP_NIC=nas0
DEVICE=nas0
PPP_NIC=nas${ATM_DEV}
DEVICE=nas${ATM_DEV}
boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
br2684ctl -c${ATM_DEV} -e${ENCAP} -a${ATM_DEV}.${VPI}.${VCI} >/dev/null 2>&1 &
sleep 1
# use user-defined or green mac address for nas0
if [ -n "$MAC" ]; then
ip link set dev nas0 address ${MAC}
ip link set dev nas${ATM_DEV} address ${MAC}
else
ip link set dev nas0 address $(cat /sys/class/net/green0/address)
ip link set dev nas${ATM_DEV} address $(cat /sys/class/net/green0/address)
fi
if [ "$TYPE" == "pppoeatm" ]; then