network: Drop any traces of ISDN

This has been removed a long time ago and we should probably spend a
little bit more time on keeping the networking code tidy :)

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 4d631cea59e715e78d3f4458c4e03a84b9456d1f..bc979cf2c87b4f3df708fef9c6020393949decba 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -85,8 +85,6 @@ var/ipfire/ipblocklist-functions.pl
 var/ipfire/ipblocklist
 #var/ipfire/ipblocklist/modified
 #var/ipfire/ipblocklist/settings
-var/ipfire/isdn
-#var/ipfire/isdn/settings
 var/ipfire/key
 var/ipfire/lang.pl
 var/ipfire/langs

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5cbcb11117f6feeb33a96564359d029fa160c418..6a5f5f10895b1317e5ba9d858a5fcbdd796c6a84 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -376,7 +376,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -424,10 +423,6 @@ WARNING: translation string unused: ipblocklist category scanner
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.en b/doc/language_issues.en
index c559c62a7ae2b4da395e67329d496629c2401e3b..0a9b66ba0ba90fdb541fe2c5da0a96826c55d3ea 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2118,7 +2118,7 @@ WARNING: untranslated string: volup10 = Increase volume by 10
 WARNING: untranslated string: volup5 = Increase volume by 5
 WARNING: untranslated string: vpi number = VPI number:
 WARNING: untranslated string: vpn = VPN
-WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
+WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of email, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>email:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
 WARNING: untranslated string: vpn auth-dn = Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2254e484fc346e8fcbb0ed593a873698666e574b..b1530c655c47b2fe091d1d86627c5fdeef517012 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -415,7 +415,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1ad14cd34dc363a01752210600cb2df43ced446b..8d7fd20929477535554fc3ba8e434dcb94e5fedc 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -404,7 +404,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -454,10 +453,6 @@ WARNING: translation string unused: ipblocklist category scanner
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.it b/doc/language_issues.it
index c7638dbd654ddd24fdeac2175575f2b57da3b48a..a4fd5ff8373647e7fbd77ab59d71e8acd8d69e04 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -372,7 +372,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -417,10 +416,6 @@ WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4ef506798f2a2c384dec089d190751d9f91946cc..39f546dbb5306a318fec2b56b5f9fec27bbcad26 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -374,7 +374,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -419,10 +418,6 @@ WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ffea51ab39411eda3a87073c5d8ff3444724f453..6cf1299e94577eaa65254d6984904232e11bf375 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -315,7 +315,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -359,10 +358,6 @@ WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4257c0291d05abea42f1f08ec3bc8eceb75052a8..a1054070caca4b89eadd1dd3ce26ceca0ef43beb 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -312,7 +312,6 @@ WARNING: translation string unused: host configuration
 WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -356,10 +355,6 @@ WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index da7241f22ee4031b933cdc924146649b3461f942..b850312e6782a3d2a87da45e4b3fc83d53741933 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -398,7 +398,6 @@ WARNING: translation string unused: host deny
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
-WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
@@ -443,10 +442,6 @@ WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
-WARNING: translation string unused: isdn
-WARNING: translation string unused: isdn settings
-WARNING: translation string unused: isdn1
-WARNING: translation string unused: isdn2
 WARNING: translation string unused: javascript menu error1
 WARNING: translation string unused: javascript menu error2
 WARNING: translation string unused: kernel version

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 7fbb46a77179fc8117673e5fb859ba91410be346..d7e5799ec067af7372e94d496dc70eb1df13f4d2 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -32,7 +32,6 @@ require "${General::swroot}/header.pl";
 our %pppsettings=();
 my %temppppsettings=();
 our %modemsettings=();
-our %isdnsettings=();
 our %netsettings=();
 my %selected=();
 my %checked=();
@@ -63,7 +62,7 @@ if ($pppsettings{'ACTION'} ne '' &&
         &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);}
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 {
-        unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
+        unless ($pppsettings{'TYPE'} =~ /^(modem|serial|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
         my $type = $pppsettings{'TYPE'};
@@ -72,10 +71,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 }
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
 {
-        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
+        if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
-        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
+        if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
         if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) {
@@ -93,7 +92,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 $errormessage = $Lang::tr{'profile name not given'};
                 $pppsettings{'PROFILENAME'} = '';
                 goto ERROR; }
-        if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) {
+        if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
                 if ($pppsettings{'TELEPHONE'} eq '') {
                         $errormessage = $Lang::tr{'telephone not set'};
                         goto ERROR; }
@@ -739,7 +738,6 @@ print <<END
  </tr>
 END
 ;
-if ($pppsettings{'TYPE'} ne 'isdn') {
 print <<END
  <tr>
         <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
@@ -755,11 +753,7 @@ END
         print <<END
         </select></td>
 </tr>
-END
-;
-}
-print <<END
- <tr>
+<tr>
         <td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
   <td width='25%'><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>
 </tr>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a52d41531b4735881167d2b86b944600dc1cb653..94bb2736b89f4804c0e0f460e3b21e3ad0f4a7f7 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1365,7 +1365,6 @@
 'hour-graph' => 'Stunde',
 'hours' => 'Stunden',
 'hours2' => 'Stunden',
-'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.',
 'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.',
 'icmp type' => 'ICMP-Typ',
 'id' => 'ID',
@@ -1578,10 +1577,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Zusätzliche ISDN-Einstellungen:',
-'isdn1' => 'Einfaches ISDN',
-'isdn2' => 'ISDN-Kanalbündelung',
 'itlb multihit' => 'iTLB MultiHit',
 'january' => 'Januar',
 'javascript menu error1' => 'Wenn die Drop-down-Menus nicht funktionieren, deaktivieren Sie Javascript auf der',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bcba77aa425b3fb586118d944365143e0f25ec71..d504c58b6e8cce1044c996cb39550f9fa287bf10 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1410,7 +1410,6 @@
 'hour-graph' => 'Hour',
 'hours' => 'Hours',
 'hours2' => 'Hours',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
 'icmp type' => 'ICMP Type',
 'id' => 'ID',
@@ -1627,10 +1626,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
 'itlb multihit' => 'iTLB MultiHit',
 'january' => 'January',
 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 022d390faaf7cddb3d37199de376c2223d92bcc1..3daca873cfd242641afa20e5c78dff021b2bfeac 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1420,7 +1420,6 @@
 'hour-graph' => 'Hora',
 'hours' => 'horas',
 'hours2' => 'Horas',
-'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual',
 'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.',
 'icmp type' => 'Tipo de  ICMP',
 'id' => 'ID',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index bfd3f9b5ebe09e29ca70ba85d16b13420ec9348f..aa0697efc043f9d97c117d76957e27d6a5d0e351 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1411,7 +1411,6 @@
 'hour-graph' => 'Heure',
 'hours' => 'heure(s)',
 'hours2' => 'Heures',
-'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.',
 'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.',
 'icmp type' => 'Type ICMP',
 'id' => 'ID',
@@ -1631,10 +1630,6 @@
 'iptmangles' => 'Table IP Mangle ',
 'iptnats' => 'Traduction d\'adresses réseaux table IP ',
 'ipts' => 'Tables IP ',
-'isdn' => 'RNIS',
-'isdn settings' => 'Réglages RNIS supplémentaires :',
-'isdn1' => 'RNIS unique',
-'isdn2' => 'RNIS double',
 'itlb multihit' => 'ITLB - erreur vérification machine',
 'january' => 'Janvier',
 'javascript menu error1' => 'Si les menus déroulants ne fonctionnent pas, désactivez le Javascript sur la',

diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 40575b404b5049922a90d0d3a53cfd5fcb775a03..7526d67ad2626e8d034bf0accccc2e996a151e39 100644 (file)
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1204,7 +1204,6 @@
 'hour-graph' => 'Ora',
 'hours' => 'Ore',
 'hours2' => 'Ore',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
 'icmp type' => 'ICMP Type',
 'id' => 'ID',
@@ -1339,10 +1338,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
 'january' => 'Gennaio',
 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
 'javascript menu error2' => 'page.',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 865cfc5b38770317ad8c94d354d083719d234d17..4da924a741064d1c2e9d64e4cebbc7e121c76226 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1200,7 +1200,6 @@
 'hour-graph' => 'Uur',
 'hours' => 'uren',
 'hours2' => 'Uren',
-'ibod for dual isdn only' => 'iBOD kan alleen gebruikt worden met Dual ISDN.',
 'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.',
 'icmp type' => 'ICMP Type',
 'id' => 'ID',
@@ -1333,10 +1332,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Adrestranslatie',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Extra ISDN instellingen:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
 'january' => 'Januari',
 'javascript menu error1' => 'Als de menu\'s niet werken, schakel dan javascript uit op de',
 'javascript menu error2' => 'pagina.',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index eba6fd098049a60ed7e83d02fce6a47cb43566a2..6ff2dab7b8aa6f3493d6251cdb2ac887e30f944a 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -912,7 +912,6 @@
 'hour-graph' => 'Godzina',
 'hours' => 'Godziny',
 'hours2' => 'Godziny',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
 'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.',
 'icmp type' => 'Typ ICMP',
 'id' => 'ID',
@@ -1038,10 +1037,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Dodatkowe ustawienia ISDN:',
-'isdn1' => 'Pojedynczy ISDN',
-'isdn2' => 'Podwójny ISDN',
 'january' => 'Styczeń',
 'javascript menu error1' => 'Jeżeli rozwijane menu nie działają poprawnie wyłącz javascript na',
 'javascript menu error2' => 'stronie.',

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 9e2b02d71b8bd1614a48ea431698bfd1a5005cc6..78a43c7d633c79cd0c0856746d167e9407ac73ec 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -906,7 +906,6 @@
 'hour' => 'Час',
 'hours' => 'Часы',
 'hours2' => 'Часы',
-'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
 'icmp type' => 'ICMP Type',
 'id' => 'ID',
@@ -1031,10 +1030,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
-'isdn' => 'ISDN',
-'isdn settings' => 'Additional ISDN settings:',
-'isdn1' => 'Single ISDN',
-'isdn2' => 'Dual ISDN',
 'january' => 'Январь',
 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
 'javascript menu error2' => 'page.',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index ad5567ce1a6a912f2bb21646ddcc352ea61c5e18..45fc16144ab43aed576a294f0f87c692fba7b92a 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1317,7 +1317,6 @@
 'hour-graph' => 'saat',
 'hours' => 'saat',
 'hours2' => 'saat',
-'ibod for dual isdn only' => 'iBOD yalnızca çift ISDN ile kullanılabilir.',
 'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.',
 'icmp type' => 'ICMP Türü',
 'id' => 'Kimlik Numarası (ID)',
@@ -1457,10 +1456,6 @@
 'iptmangles' => 'IPTablo sıkıştırmaları',
 'iptnats' => 'IPTablo ağ adres çevrimi',
 'ipts' => 'IPTablolar',
-'isdn' => 'ISDN',
-'isdn settings' => 'Ek ISDN ayarları:',
-'isdn1' => 'Tek ISDN',
-'isdn2' => 'Çift ISDN',
 'january' => 'Ocak',
 'javascript menu error1' => 'Eğer aşağı açılır listeler çalışmıyorsa javascript seçeneğini devre dışı bırakın',
 'javascript menu error2' => 'sayfa.',

diff --git a/lfs/configroot b/lfs/configroot
index ef92f5f083ad3d3bf0c4c4e30fe3e9489edbc04b..2c09ae4a8b2bce891bc162e007259c36b45f648f 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,7 +51,7 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
-                       ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist isdn key langs logging mac main \
+                       ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs logging mac main \
                        menu.d modem optionsfw \
                        ovpn patches pakfire portfw ppp private proxy/advanced/cre \
                        proxy/calamaris/bin qos/bin red remote sensors suricata time \
@@ -66,7 +66,7 @@ $(TARGET) :
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
            fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
-           ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
+           ipblocklist/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index ee1683fdd29fe3bab818f3bc5db9e32d17acf0c1..2e636e72d934d3c98bbdd9468f5a38f770f61af2 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -24,11 +24,6 @@
 
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 
-if [ "$TYPE" = "isdn" ]; then
-       DNS1="${MS_DNS1}"
-       DNS2="${MS_DNS2}"
-fi
-
 # Write DNS servers to configuration
 echo "${DNS1}" > /var/run/dns1
 echo "${DNS2}" > /var/run/dns2