updated net cnx

5 files changed, 46 insertions, 6 deletions

diff --git a/docs/HACKING b/docs/HACKING
index 8ff13e003..af150fa8b 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -66,6 +66,7 @@ Here is how I made it work on my computer.
 - ln -s path/to/gi/perl-install/share/themes /usr/share/gtk
 - ln -s path/to/gi/perl-install/share/step-* /usr/share
 - ln -s path/to/gi/perl-install/share/help.xpm /usr/share
+- ln -s path/to/gi/perl-install/share/isdn* /etc/sysconfdir/network-scripts
 - have a cd architecture linked on /export
 - ln -s /export /tmp/rhimage
 - export PERL_INSTALL_TEST=1
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 917035a11..5e1de7617 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1110,7 +1110,7 @@ Would you like X to start when you reboot?"), 1);
 _("I can set up your computer to automatically log on one user.
 If you don't want to use this feature, click on the cancel button."),
                                            [ _("Choose the default user:") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ])
-		  or delete $o->{miscellaneaous}{autologuser};
+		    or delete $o->{miscellaneaous}{autologuser};
 	    }
 	    any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, "kde");
 	}
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 849bf14d0..936836002 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 #- CHANGE THIS! (dam's)
-# DrakFuck
+# DrakNet
 
 # Copyright (C) 1999 MandrakeSoft (damien@mandrakesoft.com)
 #
@@ -19,16 +19,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use lib qw ".."; #(/usr/lib/libDrakX);
+use lib qw (/usr/lib/libDrakX); #..(/usr/lib/libDrakX);
 
 use interactive;
 use netconnect;
-#use Xconfig;
 use c;
 
 local $_ = join '', @ARGV;
 
-#/-h/ and die "usage: DrakFuck[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
+#/-h/ and die "usage: draknet[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
 
 my $netcnx = {};
 
@@ -47,6 +46,6 @@ $::isStandalone = 1;
 
 my $in = vnew interactive('su');
 
-netconnect::net_connect('', $netcnx, $in, -e "/etc/pcmcia");
+netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia");
 
 $in->exit(0);
diff --git a/tools/2adsldb.pm b/tools/2adsldb.pm
new file mode 100644
index 000000000..23328aafc
--- /dev/null
+++ b/tools/2adsldb.pm
@@ -0,0 +1,17 @@
+open F, "isplist.txt" or die "file $file not found";
+open G, ">tutu" or die "file $file not found";
+foreach (<F>) {
+    s/\#.*//;
+    /.*ADSL.*/ or  next;
+#| NOM | PAYS | CONNECTION | MAILTYPE | SMTP | MAILSERVER | NEWS | MY1DNS | MY2DNS | PROXY | PROXYSERVER | DHCP | EMAIL
+    s/(.*)france(.*)/$1France$2/;
+    s/(.*)FRANCE(.*)/$1France$2/;
+    s/(.*)USA(.*)/$1United States$2/;
+    s/(.*)U.S.A(.*)/$1United States$2/;
+    s/(.*)US(.*)/$1United States$2/;
+    s/(.*)usa(.*)/$1United States$2/;
+    s/(.*)club-internet(.*)/$1club internet$2/;
+    my ($name, $country, $connexion, $mailtype, $smtp, $popserver, $mailserver, $news, $dns1, $dns2, $proxy, $proxyserver, $dhcp, $email) = split /\|/;
+    print G join("|", $country, join("=>", $name,   $dns1, $dns2)), "\n"; #$domain,
+}
+
diff --git a/tools/2isdndb.pm b/tools/2isdndb.pm
new file mode 100644
index 000000000..4b0f9d8f7
--- /dev/null
+++ b/tools/2isdndb.pm
@@ -0,0 +1,23 @@
+open F, "isdndb.txt" or die "file $file not found";
+open G, ">tutu" or die "file $file not found";
+foreach (<F>) {
+    s/\#.*//;
+    s/\[City\]\s+National//;
+    /\[Country\]\s*(.*)/ and $country = $1;
+    /\[City\]\s*(.*)/ and $city = $1;
+    /\[Name\]\s*(.*)/ and $name = $1;
+    /\[Prefix\]\s*(.*)/ and $prefix = $1;
+    /\[ISDN\]\s*(.*)/ and $isdn = $1;
+    /\[Domain\]\s*(.*)/ and $domain = $1;
+    /\[DNS\]\s*(.*)/ and ($dns1 ? $dns2 : $dns1) = $1;
+    if ($isdn && !$prefix) { $prefix = "" }
+    if (defined $name && defined $prefix && defined $isdn && defined $domain && defined $dns1 && defined $dns2) {
+	print G join("|", $country, $city, join("=>", $name, $prefix . $isdn, $domain, $dns1, $dns2)), "\n";
+	undef $name;
+	undef $prefix;
+	undef $isdn;
+	undef $domain;
+	undef $dns1;
+	undef $dns2;
+    }
+}