printer related modules cleaning :

- create the printer/ hierarchy

- split services related stuff into services.pm & printer::services,

- move things that've nothing to do with printers into common.pm
  (alternatives, permissions, ...)

- move eveything related to cups, gimp-print, detection,
  {star,open}office to the corresponding splited printer:: module

- big consolidation of printer::office (it was obvious there were tons
  of duplication between staroffice and openoffice managment)

- move other stuff into printer::main, printer::common,

status : print.pm has been heavily splited (now one can begin to
understand the little bits).
printerdrake still needs to be splited/cleaned and eventually removed
since printer/printerdrake modules separation is not understandable by
other people

till, in printer::gimp, $lprcommand is neither declared nor setted
nowhere.  idem in mdk9.0 ...

10 files changed, 6684 insertions, 0 deletions

diff --git a/perl-install/printer/common.pm b/perl-install/printer/common.pm
new file mode 100644
index 000000000..13e5919f9
--- /dev/null
+++ b/perl-install/printer/common.pm
@@ -0,0 +1,91 @@
+package printer::common;
+
+use strict;
+
+
+sub addentry {
+    my ($section, $entry, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $entryinserted = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	if (!$sectionfound) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (!/^\s*$/ && !/^\s*;/) { #-#
+		$_ = "$entry\n$_";
+		$entryinserted = 1;
+		last;
+	    }
+	}
+    }
+    if ($sectionfound && !$entryinserted) {
+	push(@lines, $entry);
+    }
+    return join ("\n", @lines);
+}
+
+sub addsection {
+    my ($section, $filecontent) = @_;
+    my $entryinserted = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	if (/^\s*\[\s*$section\s*\]\s*$/) {
+	    # section already there, nothing to be done
+	    return $filecontent;
+	}
+    }
+    return $filecontent . "\n[$section]";
+}
+
+sub removeentry {
+    my ($section, $entry, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $done = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	$_ = "$_\n";
+	next if $done;
+	if (!$sectionfound) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (/^\s*\[.*\]\s*$/) { # Next section
+		$done = 1;
+	    } elsif (/^\s*$entry/) {
+		$_ = "";
+		$done = 1;
+	    }
+	}
+    }
+    return join ("", @lines);
+}
+
+sub removesection {
+    my ($section, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $done = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	$_ = "$_\n";
+	next if $done;
+	if (!$sectionfound) {
+	    if (/^\s*\[\s*$section\s*\]\s*$/) {
+		$_ = "";
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (/^\s*\[.*\]\s*$/) { # Next section
+		$done = 1;
+	    } else {
+		$_ = "";
+	    }
+	}
+    }
+    return join ("", @lines);
+}
+
+1;
diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm
new file mode 100644
index 000000000..1de54edf2
--- /dev/null
+++ b/perl-install/printer/cups.pm
@@ -0,0 +1,30 @@
+package printer::cups;
+
+use strict;
+use printer::data;
+
+sub get_remote_queues {
+    my ($printer) = $_[0];
+    # The following code reads in a list of all remote printers which the
+    # local CUPS daemon knows due to broadcasting of remote servers or 
+    # "BrowsePoll" entries in the local /etc/cups/cupsd.conf
+    local *F;
+    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
+	"lpstat -v |" or return ();
+    my @printerlist;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m/^\s*device\s+for\s+([^:\s]+):\s*(\S+)\s*$/) {
+	    my $queuename = $1;
+	    if (($2 =~ m!^ipp://([^/:]+)[:/]!) &&
+		(!$printer->{configured}{$queuename})) {
+		my $server = $1;
+		push (@printerlist, "$queuename|$server");
+	    }
+	}
+    }
+    close F;
+    return @printerlist;
+}
+
+1;
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
new file mode 100644
index 000000000..0c7a29eed
--- /dev/null
+++ b/perl-install/printer/data.pm
@@ -0,0 +1,37 @@
+package printer::data;
+
+use strict;
+use common;
+
+# BUG, FIXME : this was neither declered nor setted anywhere before :
+# maybe this should be swtiched : 
+# $lprcommand{stuff} => $spoolers{stuff}{print_command}
+
+our %lprcommand;
+
+our %spoolers = ('ppq' => {
+                          'help' => "/usr/bin/lphelp %s |",
+					 'print_command' => 'lpr-pdq',
+					 'long_name' =>N("PDQ - Print, Don't Queue"),
+					 'short_name' => N("PDQ")
+                 },
+                'lpd' => {
+                        'help' => "/usr/bin/pdq -h -P %s 2>&1 |",
+                        'print_command' => 'lpr',
+				    'long_name' => N("LPD - Line Printer Daemon"),
+					   'short_name' => N("LPD")
+                 },
+			 'lprng' => {
+				'print_command' => 'lpr-lpd',
+				'long_name' => N("LPRng - LPR New Generation"),
+				'short_name' => N("LPRng")
+			 },
+			 'cups' => {
+				'print_command' => 'lpr-cups',
+				'long_name' => N("CUPS - Common Unix Printing System"),
+				'short_name' => N("CUPS")
+			 }
+            );
+our %spooler_inv = map { $spoolers{$_}{long_name} => $_ } keys %spoolers;
+
+our %shortspooler_inv = map { $spoolers{$_}{short_name} => $_ } keys %spoolers;
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
new file mode 100644
index 000000000..5c15645d2
--- /dev/null
+++ b/perl-install/printer/default.pm
@@ -0,0 +1,51 @@
+package printer::default;
+
+use strict;
+use run_program;
+use common;
+
+#-configuration directory of Foomatic
+my $FOOMATICCONFDIR = "/etc/foomatic"; 
+#-location of the file containing the default spooler's name
+my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
+
+sub set_printer {
+    my ($printer) = $_[0];
+    run_program::rooted($::prefix, "foomatic-configure",
+			"-D", "-q", "-s", $printer->{SPOOLER},
+			"-n", $printer->{DEFAULT}) or return 0;
+    return 1;
+}
+
+sub get_printer {
+    my $printer = $_[0];
+    local *F;
+    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
+	"foomatic-configure -Q -q -s $printer->{SPOOLER} |" or return undef;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m!^\s*<defaultqueue>(.*)</defaultqueue>\s*$!) {
+	    return $1;
+	}
+    }
+    return undef;
+}
+
+sub printer_type($) { "LOCAL" }
+
+sub get_spooler () {
+    if (-f "$::prefix$FOOMATIC_DEFAULT_SPOOLER") {
+        my $spool = cat_("$::prefix$FOOMATIC_DEFAULT_SPOOLER");
+	chomp $spool;
+	return $spool if $spool =~ /cups|lpd|lprng|pdq/; 
+    }
+}
+
+sub set_spooler ($) {
+    my ($printer) = @_;
+    # Mark the default driver in a file
+    output_p("$::prefix$FOOMATIC_DEFAULT_SPOOLER", $printer->{SPOOLER});
+}
+
+
+1;
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
new file mode 100644
index 000000000..8439f9a37
--- /dev/null
+++ b/perl-install/printer/detect.pm
@@ -0,0 +1,306 @@
+package printer::detect;
+
+use strict;
+use common;
+use detect_devices;
+use modules;
+
+sub local_detect {
+    modules::get_probeall("usb-interface") and eval { modules::load("printer") };
+    eval { modules::unload(qw(lp parport_pc parport_probe parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
+    eval { modules::load(qw(parport_pc lp parport_probe)) }; #- take care as not available on 2.4 kernel (silent error).
+    my $b = before_leaving { eval { modules::unload("parport_probe") } };
+    detect_devices::whatPrinter();
+}
+
+sub net_detect { whatNetPrinter(1, 0) }
+
+sub net_smb_detect { whatNetPrinter(0, 1) }
+
+sub detect {
+    local_detect(), net_detect(), net_smb_detect();
+}
+
+sub whatNetPrinter {
+    my ($network, $smb) = @_;
+
+    my ($i,@res);
+
+    # Which ports should be scanned?
+    my @portstoscan;
+    push @portstoscan, "139" if $smb;
+    push @portstoscan, "4010", "4020", "4030", "5503", "9100-9104" if $network;
+    
+    return () if $#portstoscan < 0;
+    my $portlist = join (",", @portstoscan);
+    
+    # Which hosts should be scanned?
+    # (Applying nmap to a whole network is very time-consuming, because nmap
+    #  waits for a certain timeout period on non-existing hosts, so we get a 
+    #  lists of existing hosts by pinging the broadcast addresses for existing
+    #  hosts and then scanning only them, which is much faster)
+    my @hostips = getIPsInLocalNetworks();
+    return () if $#hostips < 0;
+    my $hostlist = join (" ", @hostips);
+
+    # Scan network for printers, the timeout settings are there to avoid
+    # delays caused by machines blocking their ports with a firewall
+    local *F;
+    open F, ($::testing ? "" : "chroot $::prefix/ ") .
+	"/bin/sh -c \"export LC_ALL=C; nmap -r -P0 --host_timeout 400 --initial_rtt_timeout 200 -p $portlist $hostlist\" |"
+	or return @res;
+    my ($host, $ip, $port, $modelinfo) = ("", "", "", "");
+    while (my $line = <F>) {
+	chomp $line;
+
+	# head line of the report of a host with the ports in question open
+	#if ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\(([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)\s*:\s*$/i) {
+	if ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\((\S+)\)\s*:\s*$/i) {
+	    ($host, $ip) = ($1, $2);
+	    $host = $ip if $host eq "";
+	    $port = "";
+
+	    undef $modelinfo;
+
+	} elsif ($line =~ m/^\s*(\d+)\/\S+\s+open\s+/i) {
+	    next if $ip eq "";
+	    $port = $1;
+	    
+	    # Now we have all info for one printer
+	    # Store this auto-detection result in the data structure
+
+	    # Determine the protocol by the port number
+
+	    # SMB/Windows
+	    if ($port eq "139") {
+		my @shares = getSMBPrinterShares($ip);
+		foreach my $share (@shares) {
+		    push @res, { port => "smb://$host/$share->{name}",
+				 val => { CLASS => 'PRINTER',
+					  MODEL => N("Unknown Model"),
+					  MANUFACTURER => "",
+					  DESCRIPTION => "$share->{description}",
+					  SERIALNUMBER => ""
+				      }
+			     };
+		}
+	    } else {
+		if (!defined($modelinfo)) {
+		    # SNMP request to auto-detect model
+		    $modelinfo = getSNMPModel ($ip);
+		}
+		if (defined($modelinfo)) {
+		    push @res, { port => "socket://$host:$port",
+				 val => $modelinfo
+				 };
+		}
+	    }
+	}
+    }
+    close F;
+    @res;
+}
+
+sub getIPsInLocalNetworks {
+
+    # subroutine determines the list of all hosts reachable in the local
+    # networks by means of pinging the broadcast addresses.
+    
+    # Return an empty list if no network is running
+    return () unless network_running();
+    
+    # Read the output of "ifconfig" to determine the broadcast addresses of
+    # the local networks
+    my $dev_is_localnet = 0;
+    my @local_bcasts;
+    my $current_bcast = "";
+	
+    local *IFCONFIG_OUT;
+    open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
+	"/bin/sh -c \"export LC_ALL=C; ifconfig\" |" or return ();
+    while (my $readline = <IFCONFIG_OUT>) {
+	# New entry ...
+	if ($readline =~ /^(\S+)\s/) {
+	    my $dev = $1;
+	    # ... for a local network (eth = ethernet, 
+	    #     vmnet = VMWare,
+	    #     ethernet card connected to ISP excluded)?
+	    $dev_is_localnet = (($dev =~ /^eth/) || ($dev =~ /^vmnet/));
+	    # delete previous address
+	    $current_bcast = "";
+	}
+	# Are we in the important line now?
+	if ($readline =~ /\sBcast:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
+	    # Rip out the broadcast IP address
+	    $current_bcast = $1;
+	    
+	    # Are we in an entry for a local network?
+	    if ($dev_is_localnet == 1) {
+		# Store current IP address
+		push @local_bcasts, $current_bcast;
+	    }
+	}
+    }
+    close(IFCONFIG_OUT);
+
+    my @addresses;
+    # Now ping all broadcast addresses and additionally "nmblookup" the
+    # networks (to find Windows servers which do not answer to ping)
+    foreach my $bcast (@local_bcasts) {
+	local *F;
+	open F, ($::testing ? "" : "chroot $::prefix/ ") . 
+	    "/bin/sh -c \"export LC_ALL=C; ping -w 1 -b -n $bcast | cut -f 4 -d ' ' | sed s/:// | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort\" |" 
+	    or next;
+	local $_;
+	while (<F>) { chomp; push @addresses, $_ }
+	close F;
+	if (-x "/usr/bin/nmblookup") {
+	    local *F;
+	    open F, ($::testing ? "" : "chroot $::prefix/ ") . 
+		"/bin/sh -c \"export LC_ALL=C; nmblookup -B $bcast \\* | cut -f 1 -d ' ' | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort\" |" 
+		or next;
+	    local $_;
+	    while (<F>) { 
+		chomp;
+		push @addresses, $_ if !(member($_,@addresses));
+	    }
+	}
+    }
+
+    @addresses;
+}
+
+sub getSMBPrinterShares {
+    my ($host) = @_;
+    
+    # SMB request to auto-detect shares
+    local *F;
+    open F, ($::testing ? "" : "chroot $::prefix/ ") .
+	"/bin/sh -c \"export LC_ALL=C; smbclient -N -L $host\" |" or return ();
+    my $insharelist = 0;
+    my @shares;
+    while (my $l = <F>) {
+	chomp $l;
+	if ($l =~ /^\s*Sharename\s+Type\s+Comment\s*$/i) {
+	    $insharelist = 1;
+	} elsif ($l =~ /^\s*Server\s+Comment\s*$/i) {
+	    $insharelist = 0;
+	} elsif (($l =~ /^\s*(\S+)\s+Printer\s*(.*)$/i) &&
+		 ($insharelist)) {
+	    my $name = $1;
+	    my $description = $2;
+	    $description =~ s/^(\s*)//;
+	    push (@shares, { name => $name, description => $description });
+	}
+    }
+    close F;
+
+    return @shares;
+}
+
+sub getSNMPModel {
+    my ($host) = @_;
+    my $manufacturer = "";
+    my $model = "";
+    my $description = "";
+    my $serialnumber = "";
+    
+    # SNMP request to auto-detect model
+    local *F;
+    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+	"/bin/sh -c \"scli -1 -c 'show printer info' $host\" |" or
+	return { CLASS => 'PRINTER',
+		 MODEL => N("Unknown Model"),
+		 MANUFACTURER => "",
+		 DESCRIPTION => "",
+		 SERIALNUMBER => ""
+		 };
+    while (my $l = <F>) {
+	chomp $l;
+	if (($l =~ /^\s*Manufacturer:\s*(\S.*)$/i) &&
+	    ($l =~ /^\s*Vendor:\s*(\S.*)$/i)) {
+	    $manufacturer = $1;
+	    $manufacturer =~ s/Hewlett[-\s_]Packard/HP/;
+	    $manufacturer =~ s/HEWLETT[-\s_]PACKARD/HP/;
+	} elsif ($l =~ /^\s*Model:\s*(\S.*)$/i) {
+	    $model = $1;
+	} elsif ($l =~ /^\s*Description:\s*(\S.*)$/i) {
+	    $description = $1;
+	    $description =~ s/Hewlett[-\s_]Packard/HP/;
+	    $description =~ s/HEWLETT[-\s_]PACKARD/HP/;
+	} elsif ($l =~ /^\s*Serial\s*Number:\s*(\S.*)$/i) {
+	    $serialnumber = $1;
+	}
+    }
+    close F;
+
+    # Was there a manufacturer and a model in the output?
+    # If not, get them from the description
+    if (($manufacturer eq "") || ($model eq "")) {
+	if ($description =~ /^\s*(\S*)\s+(\S.*)$/) {
+	    $manufacturer = $1 if $manufacturer eq "";
+	    $model = $2 if $model eq "";
+	}
+	# No description field? Make one out of manufacturer and model.
+    } elsif ($description eq "") {
+	$description = "$manufacturer $model";
+    }
+    
+    # We couldn't determine a model
+    $model = N("Unknown Model") if $model eq "";
+    
+    # Remove trailing spaces
+    $manufacturer =~ s/(\S+)\s+$/$1/;
+    $model        =~ s/(\S+)\s+$/$1/;
+    $description  =~ s/(\S+)\s+$/$1/;
+    $serialnumber =~ s/(\S+)\s+$/$1/;
+
+    # Now we have all info for one printer
+    # Store this auto-detection result in the data structure
+    return  { CLASS => 'PRINTER',
+	      MODEL => $model,
+	      MANUFACTURER => $manufacturer,
+	      DESCRIPTION => $description,
+	      SERIALNUMBER => $serialnumber
+	      };
+}
+
+sub network_running {
+    # If the network is not running return 0, otherwise 1.
+    local *F; 
+    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
+	"/bin/sh -c \"export LC_ALL=C; /sbin/ifconfig\" |" or
+	    die "Could not run \"ifconfig\"!";
+    while (my $line = <F>) {
+	if (($line !~ /^lo\s+/) && # The loopback device can have been 
+                                   # started by the spooler's startup script
+	    ($line =~ /^(\S+)\s+/)) { # In this line starts an entry for a
+	                              # running network
+	    close F;
+	    return 1;
+	}
+    }
+    close F;
+    return 0;
+}
+
+sub parport_addr {
+    # auto-detect the parallel port addresses
+    my ($device) = @_;
+    $device =~ m!^/dev/lp(\d+)$! or
+	$device =~ m!^/dev/printers/(\d+)$!;
+    my $portnumber = $1;
+    my $parport_addresses = 
+	`cat /proc/sys/dev/parport/parport$portnumber/base-addr`;
+    my $address_arg;
+    if ($parport_addresses =~ /^\s*(\d+)\s+(\d+)\s*$/) {
+	$address_arg = sprintf(" -base 0x%x -basehigh 0x%x", $1, $2);
+    } elsif ($parport_addresses =~ /^\s*(\d+)\s*$/) {
+	$address_arg = sprintf(" -base 0x%x", $1);
+    } else {
+	$address_arg = "";
+    }
+    return $address_arg;
+}
+
+1;
diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
new file mode 100644
index 000000000..6d92d5fe3
--- /dev/null
+++ b/perl-install/printer/gimp.pm
@@ -0,0 +1,412 @@
+package printer::gimp;
+
+use strict;
+use run_program;
+use common;
+use printer::common;
+use printer::data;
+use printer::cups;
+
+# ------------------------------------------------------------------
+#   GIMP-print related stuff
+# ------------------------------------------------------------------
+
+sub configure {
+    my ($printer, $queue) = @_;
+    # Do we have files to treat?
+    my @configfilenames = findconfigfiles();
+    return 1 if $#configfilenames < 0;
+    # There is no system-wide config file, treat every user's config file
+    foreach my $configfilename (@configfilenames) {
+	# Load GIMP's printer config file
+	my $configfilecontent = readconfigfile($configfilename);
+	# Update local printer queues
+	foreach my $queue (keys(%{$printer->{configured}})) {
+	    # Check if we have a PPD file
+	    if (! -r "$::prefix/etc/foomatic/$queue.ppd") {
+		if (-r "$::prefix/etc/cups/ppd/$queue.ppd") {
+		    # If we have a PPD file in the CUPS config dir, link to it
+		    run_program::rooted($::prefix, 
+					"ln", "-sf",
+					"/etc/cups/ppd/$queue.ppd",
+					"/etc/foomatic/$queue.ppd");
+		} elsif (-r "$::prefix/usr/share/postscript/ppd/$queue.ppd") {
+		    # Check PPD directory of GPR, too
+		    run_program::rooted
+			($::prefix, 
+			 "ln", "-sf",
+			 "/usr/share/postscript/ppd/$queue.ppd",
+			 "/etc/foomatic/$queue.ppd");
+		} else {
+		    # No PPD file at all? We cannot set up this printer
+		    next;
+		}
+	    }
+	    # Add the printer entry
+	    if (!isprinterconfigured ($queue, $configfilecontent)) {
+		# Remove the old printer entry
+		$configfilecontent = 
+		    removeprinter($queue, $configfilecontent);
+		# Add the new printer entry
+		$configfilecontent = 
+		    makeprinterentry($printer, $queue,
+					 $configfilecontent);
+	    }
+	}
+	# Default printer
+	if ($printer->{DEFAULT}) {
+	    if ($configfilecontent !~ /^\s*Current\-Printer\s*:/m) {
+		$configfilecontent =~
+		    s/\n/\nCurrent-Printer: $printer->{DEFAULT}\n/s;
+	    } else {
+		$configfilecontent =~ /^\s*Current\-Printer\s*:\s*(\S+)\s*$/m;
+		if (!isprinterconfigured ($1, $configfilecontent)) {
+		    $configfilecontent =~
+			s/(Current\-Printer\s*:\s*)\S+/$1$printer->{DEFAULT}/;
+		}
+	    }
+	}
+	# Write back GIMP's printer configuration file
+	writeconfigfile($configfilename, $configfilecontent);
+    }
+    return 1;
+}
+
+sub addcupsremoteto {
+    my ($printer, $queue) = @_;
+    # Do we have files to treat?
+    my @configfilenames = findconfigfiles();
+    return 1 if $#configfilenames < 0;
+    my @printerlist = printer::cups::get_remote_queues();
+    my $ppdfile = "";
+    if (($printer->{SPOOLER} eq "cups") && 
+	((-x "$::prefix/usr/bin/curl") || (-x "$::prefix/usr/bin/wget"))) {
+	foreach my $listentry (@printerlist) {
+	    next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
+	    my $q = $1;
+	    next if $q ne $queue;
+	    my $server = $2;
+	    # Remove server name from queue name
+	    $q =~ s/^([^@]*)@.*$/$1/;
+	    if (-x "$::prefix/usr/bin/wget") {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/wget", "-O",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$q.ppd"));
+	    } else {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/curl", "-o",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$q.ppd"));
+	    }
+	    # Does the file exist and is it not an error message?
+	    if ((-r "$::prefix/etc/foomatic/$queue.ppd") &&
+		(cat_("$::prefix/etc/foomatic/$queue.ppd") =~ 
+		 /^\*PPD-Adobe/)) {
+		$ppdfile = "/etc/foomatic/$queue.ppd";
+	    } else {
+		unlink ("$::prefix/etc/foomatic/$queue.ppd");
+		return 0;
+	    }
+	}
+    } else {
+	return 1;
+    }
+    # There is no system-wide config file, treat every user's config file
+    foreach my $configfilename (@configfilenames) {
+	# Load GIMP's printer config file
+	my $configfilecontent = readconfigfile($configfilename);
+	# Add the printer entry
+	if (!isprinterconfigured ($queue, $configfilecontent)) {
+	    # Remove the old printer entry
+	    $configfilecontent = 
+		removeprinter($queue, $configfilecontent);
+	    # Add the new printer entry
+	    $configfilecontent = 
+		makeprinterentry($printer, $queue,
+				     $configfilecontent);
+	}
+	# Write back GIMP's printer configuration file
+	writeconfigfile($configfilename, $configfilecontent);
+    }
+    return 1;
+}
+
+sub removeprinterfrom {
+    my ($printer, $queue) = @_;
+    # Do we have files to treat?
+    my @configfilenames = findconfigfiles();
+    return 1 if $#configfilenames < 0;
+    # There is no system-wide config file, treat every user's config file
+    foreach my $configfilename (@configfilenames) {
+	# Load GIMP's printer config file
+	my $configfilecontent = readconfigfile($configfilename);
+	# Remove the printer entry
+	$configfilecontent = 
+	    removeprinter($queue, $configfilecontent);
+	# Write back GIMP's printer configuration file
+	writeconfigfile($configfilename, $configfilecontent);
+    }
+    return 1;
+}
+
+sub removelocalprintersfrom {
+    my ($printer) = @_;
+    # Do we have files to treat?
+    my @configfilenames = findconfigfiles();
+    return 1 if $#configfilenames < 0;
+    # There is no system-wide config file, treat every user's config file
+    foreach my $configfilename (@configfilenames) {
+	# Load GIMP's printer config file
+	my $configfilecontent = readconfigfile($configfilename);
+	# Remove the printer entries
+	foreach my $queue (keys(%{$printer->{configured}})) {
+	    $configfilecontent = 
+		removeprinter($queue, $configfilecontent);
+	}
+	# Write back GIMP's printer configuration file
+	writeconfigfile($configfilename, $configfilecontent);
+    }
+    return 1;
+}
+
+sub makeprinterentry {
+    my ($printer, $queue, $configfile) = @_;
+    # Make printer's section
+    $configfile = addprinter($queue, $configfile);
+    # Load PPD file
+    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
+    # Is the printer configured with GIMP-Print?
+    my $gimpprintqueue = 0;
+    my $gimpprintdriver = "ps2";
+    if ($ppd =~ /CUPS\s*\+\s*GIMP\s*\-\s*Print/im) {
+	# Native CUPS driver
+	$gimpprintqueue = 1;
+	$ppd =~ /\s*\*ModelName:\s*\"(\S+)\"\s*$/im;
+	$gimpprintdriver = $1;
+    } elsif ($ppd =~ /Foomatic\s*\+\s*gimp\s*\-\s*print/im) {
+	# GhostScript + Foomatic driver
+	$gimpprintqueue = 1;
+	$ppd =~
+	    /'idx'\s*=>\s*'ev\/gimp-print-((escp2|pcl|bjc|lexmark)\-\S*)'/im;
+	$gimpprintdriver = $1;
+    }
+    if ($gimpprintqueue) {
+	# Get the paper size from the PPD file
+	if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
+	    my $papersize = $1;
+	    $configfile = removeentry($queue,
+					  "Media-Size", $configfile);
+	    $configfile = addentry($queue, 
+				       "Media-Size: $papersize", $configfile);
+	}
+	$configfile = removeentry($queue,
+				      "PPD-File:", $configfile);
+	$configfile = addentry($queue, 
+				   "PPD-File:", $configfile);
+	$configfile = removeentry($queue,
+				      "Driver:", $configfile);
+	$configfile = addentry($queue, 
+				   "Driver: $gimpprintdriver", $configfile);
+	$configfile = removeentry($queue,
+				      "Destination:", $configfile);
+	$configfile = addentry($queue, 
+				   "Destination: /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue -o raw", $configfile);
+    } else {
+	$configfile = removeentry($queue,
+				      "PPD-File:", $configfile);
+	$configfile = addentry($queue, 
+				   "PPD-File: /etc/foomatic/$queue.ppd", $configfile);
+	$configfile = removeentry($queue,
+				      "Driver:", $configfile);
+	$configfile = addentry($queue, 
+				   "Driver: ps2", $configfile);
+	$configfile = removeentry($queue,
+				      "Destination:", $configfile);
+	$configfile = addentry($queue, 
+				   "Destination: /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue", $configfile);
+    }
+    return $configfile;
+}
+
+sub findconfigfiles {
+    my @configfilenames;
+    push (@configfilenames, ".gimp-1.2/printrc") if -d "$::prefix/usr/lib/gimp/1.2";
+    push (@configfilenames, ".gimp-1.3/printrc") if -d "$::prefix/usr/lib/gimp/1.3";
+    my @filestotreat;
+    local *PASSWD;
+    open PASSWD, "< $::prefix/etc/passwd" or die "Cannot read /etc/passwd!\n";
+    local $_;
+    while (<PASSWD>) {
+	chomp;
+	if (/^([^:]+):[^:]*:([^:]+):([^:]+):[^:]*:([^:]+):[^:]*$/) {
+	    my ($username, $uid, $gid, $homedir) = ($1, $2, $3, $4);
+	    if ((($uid == 0) || ($uid >= 500)) && ($username ne "nobody")) {
+		foreach my $file (@configfilenames) {
+		    my $dir = "$homedir/$file";
+		    $dir =~ s,/[^/]*$,,;
+		    next if (-f $dir) && (! -d $dir);
+		    if (! -d "$::prefix$dir") {
+			run_program::rooted($::prefix, 
+					    "/bin/mkdir", $dir)
+			    or next;
+			run_program::rooted($::prefix, 
+					      "/bin/chown", "$uid.$gid", $dir)
+			    or next;
+		    }
+		    if (! -f "$::prefix$homedir/$file") {
+			local *F;
+			open F, "> $::prefix$homedir/$file" or next;
+			print F "#PRINTRCv1 written by GIMP-PRINT 4.2.2 - 13 Sep 2002\n";
+			close F;
+			run_program::rooted($::prefix, 
+					    "/bin/chown", "$uid.$gid",
+					    "$homedir/$file")
+			    or next;
+		    }
+		    push (@filestotreat, "$homedir/$file");
+		}
+	    }
+	}
+    }
+    @filestotreat;
+}
+
+sub readconfigfile {
+    my ($file) = @_;
+    local *F; 
+    open F, "< $::prefix$file" or return "";
+    my $filecontent = join("", <F>);
+    close F;
+    return $filecontent;
+}
+
+sub writeconfigfile {
+    my ($file, $filecontent) = @_;
+    local *F; 
+    open F, "> $::prefix$file" or return 0;
+    print F $filecontent;
+    close F;
+    return 1;
+}
+
+sub addentry {
+    my ($section, $entry, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $entryinserted = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	if (!$sectionfound) {
+	    if (/^\s*Printer\s*:\s*($section)\s*$/) {
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (!/^\s*$/ && !/^\s*;/) { #-#
+		$_ = "$entry\n$_";
+		$entryinserted = 1;
+		last;
+	    }
+	}
+    }
+    if ($sectionfound && !$entryinserted) {
+	push(@lines, $entry);
+    }
+    return join ("\n", @lines);
+}
+
+sub addprinter {
+    my ($section, $filecontent) = @_;
+    my $entryinserted = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	if (/^\s*Printer\s*:\s*($section)\s*$/) {
+	    # section already there, nothing to be done
+	    return $filecontent;
+	}
+    }
+    return $filecontent . "\nPrinter: $section";
+}
+
+sub removeentry {
+    my ($section, $entry, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $done = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	$_ = "$_\n";
+	next if $done;
+	if (!$sectionfound) {
+	    if (/^\s*Printer\s*:\s*($section)\s*$/) {
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (/^\s*Printer\s*:\s*.*\s*$/) { # Next section
+		$done = 1;
+	    } elsif (/^\s*$entry/) {
+		$_ = "";
+		$done = 1;
+	    }
+	}
+    }
+    return join ("", @lines);
+}
+
+sub removeprinter {
+    my ($section, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $done = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	$_ = "$_\n";
+	next if $done;
+	if (!$sectionfound) {
+	    if (/^\s*Printer\s*:\s*($section)\s*$/) {
+		$_ = "";
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (/^\s*Printer\s*:\s*.*\s*$/) { # Next section
+		$done = 1;
+	    } else {
+		$_ = "";
+	    }
+	}
+    }
+    return join ("", @lines);
+}
+
+sub isprinterconfigured {
+    my ($queue, $filecontent) = @_;
+    my $sectionfound = 0;
+    my $done = 0;
+    my $drivernotps2 = 0;
+    my $ppdfileset = 0;
+    my $nonrawprinting = 0;
+    my @lines = split("\n", $filecontent);
+    foreach (@lines) {
+	last if $done;
+	if (!$sectionfound) {
+	    if (/^\s*Printer\s*:\s*($queue)\s*$/) {
+		$sectionfound = 1;
+	    }
+	} else {
+	    if (/^\s*Printer\s*:\s*.*\s*$/) { # Next section
+		$done = 1;
+	    } elsif (/^\s*Driver:\s*(\S+)\s*$/) {
+		$drivernotps2 = ($1 ne "ps2");
+	    } elsif (/^\s*PPD\-File:\s*(\S+)\s*$/) {
+		$ppdfileset = 1;
+	    } elsif (/^\s*Destination:\s*(\S+.*)$/) {
+		$nonrawprinting = ($1 !~ /\-o\s*raw/);
+	    } 
+	}
+    }
+    return 0 if $done && !$sectionfound;
+    return 1 if $ppdfileset || $drivernotps2 || $nonrawprinting;
+    return 0;
+}
+
+
+# ------------------------------------------------------------------
+
+1;
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
new file mode 100644
index 000000000..ad525b0d6
--- /dev/null
+++ b/perl-install/printer/main.pm
@@ -0,0 +1,1704 @@
+package printer::main;
+
+# $Id$
+
+#
+#
+
+
+use common;
+use run_program;
+use printer::services;
+use printer::default;
+use printer::gimp;
+use printer::cups;
+use printer::office;
+use printer::detect;
+use printer::data;
+use services;
+
+
+#-location of the printer database in an installed system
+my $PRINTER_DB_FILE = "/usr/share/foomatic/db/compiled/overview.xml";
+
+#-Did we already read the subroutines of /usr/sbin/ptal-init?
+my $ptalinitread = 0;
+
+%printer_type = (
+    N("Local printer")                              => "LOCAL",
+    N("Remote printer")                             => "REMOTE",
+    N("Printer on remote CUPS server")              => "CUPS",
+    N("Printer on remote lpd server")               => "LPD",
+    N("Network printer (TCP/Socket)")               => "SOCKET",
+    N("Printer on SMB/Windows 95/98/NT server")     => "SMB",
+    N("Printer on NetWare server")                  => "NCP",
+    N("Enter a printer device URI")                 => "URI",
+    N("Pipe job into a command")                    => "POSTPIPE"
+);
+our %printer_type_inv = reverse %printer_type;
+
+#------------------------------------------------------------------------------
+
+sub set_prefix($) { $prefix = $_[0] }
+
+sub spooler {
+    # LPD is taken from the menu for the moment because the classic LPD is
+    # highly unsecure. Depending on how the GNU lpr development is going on
+    # LPD support can be reactivated by uncommenting the following line.
+
+    #return @spooler_inv{qw(cups lpd lprng pdq)};
+
+    # LPRng is not officially supported any more since Mandrake 9.0, so
+    # show it only in the spooler menu when it was manually installed.
+    my @res;
+    if (files_exist((qw(/usr/lib/filters/lpf /usr/sbin/lpd)))) {
+        foreach (qw(cups lprng pdq)) { push @res, $spooler_inv{$_}{long_name} };
+#        {qw(cups lprng pdq)}{long_name};
+    } else {
+        foreach (qw(cups pdq)) { push @res, $spooler_inv{$_}{long_name} };
+#	return spooler_inv{qw(cups pdq)}{long_name};
+    }
+    return @res;
+}
+
+sub printer_type($) {
+    my ($printer) = @_;
+    foreach ($printer->{SPOOLER}) {
+	/cups/ && return @printer_type_inv{qw(LOCAL), 
+					   qw(LPD SOCKET SMB), 
+					   $::expert ? qw(URI) : ()};
+	/lpd/  && return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP),
+					   $::expert ? qw(POSTPIPE URI) : ()};
+	/lprng/  && return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP),
+					   $::expert ? qw(POSTPIPE URI) : ()};
+	/pdq/  && return @printer_type_inv{qw(LOCAL LPD SOCKET),
+					   $::expert ? qw(URI) : ()};
+    }
+}
+
+sub SIGHUP_daemon {
+    my ($service) = @_;
+    if ($service eq "cupsd") { $service = "cups" };
+    # PDQ has no daemon, exit.
+    if ($service eq "pdq") { return 1 };
+    # CUPS needs auto-correction for its configuration
+    run_program::rooted($prefix, "/usr/sbin/correctcupsconfig") if $service eq "cups";
+    # Name of the daemon
+    my %daemons = (
+			    "lpr" => "lpd",
+			    "lpd" => "lpd",
+			    "lprng" => "lpd",
+			    "cups" => "cupsd",
+			    "devfs" => "devfsd",
+			    );
+    my $daemon = $daemons{$service};
+    $daemon = $service if ! defined $daemon;
+#    if ($service eq "cups") {
+#	# The current CUPS (1.1.13) dies on SIGHUP, do the normal restart.
+#	printer::services::restart($service);
+#	# CUPS needs some time to come up.
+#	printer::services::wait_for_cups();
+#    } else {
+
+    # Send the SIGHUP
+    run_program::rooted($prefix, "/usr/bin/killall", "-HUP", $daemon);
+    if ($service eq "cups") {
+	# CUPS needs some time to come up.
+	printer::services::wait_for_cups();
+    }
+
+    return 1;
+}
+
+
+sub assure_device_is_available_for_cups {
+    # Checks whether CUPS already "knows" a certain port, it does not
+    # know it usually when the appropriate kernel module is loaded
+    # after CUPS was started or when the printer is turned on after
+    # CUPS was started. CUPS 1.1.12 and newer refuses to set up queues
+    # on devices which it does not know, it points these queues to
+    # file:/dev/null instead. Restart CUPS if necessary to assure that
+    # CUPS knows the device.
+    my ($device) = @_;
+    my $result;
+    for ($i = 0; $i < 3; $i++) {
+	local *F; 
+	open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	    "/bin/sh -c \"export LC_ALL=C; /usr/sbin/lpinfo -v\" |" or
+	    die "Could not run \"lpinfo\"!";
+	while (my $line = <F>) {
+	    if ($line =~ /$device/) { # Found a line containing the device
+		                      # name, so CUPS knows it.
+		close F;
+		return 1;
+	    }
+	}
+	close F;
+	$result = SIGHUP_daemon("cups");
+    }
+    return $result;
+}
+
+
+sub spooler_in_security_level {
+    # Was the current spooler already added to the current security level?
+    my ($spooler, $level) = @_;
+    my $sp;
+    $sp = (($spooler eq "lpr") || ($spooler eq "lprng")) ? "lpd" : $spooler;
+    $file = "$prefix/etc/security/msec/server.$level";
+    if (-f $file) {
+	local *F; 
+	open F, "< $file" or return 0;
+	while (my $line = <F>) {
+	    if ($line =~ /^\s*$sp\s*$/) {
+		close F;
+		return 1;
+	    }
+	}
+	close F;
+    }
+    return 0;
+}
+
+sub add_spooler_to_security_level {
+    my ($spooler, $level) = @_;
+    my $sp;
+    $sp = (($spooler eq "lpr") || ($spooler eq "lprng")) ? "lpd" : $spooler;
+    $file = "$prefix/etc/security/msec/server.$level";
+    if (-f $file) {
+	local *F; 
+	open F, ">> $file" or return 0;
+	print F "$sp\n";
+	close F;
+    }
+    return 1;
+}
+
+sub pdq_panic_button {
+    my $setting = $_[0];
+    if (-f "$prefix/usr/sbin/pdqpanicbutton") {
+        run_program::rooted($prefix, "/usr/sbin/pdqpanicbutton", "--$setting")
+	    or die "Could not $setting PDQ panic buttons!";
+    }
+}
+
+sub copy_printer_params($$) {
+    my ($from, $to) = @_;
+    map { $to->{$_} = $from->{$_} } grep { $_ ne 'configured' } keys %$from; 
+    #- avoid cycles-----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+}
+
+sub getinfo($) {
+    my ($prefix) = @_;
+    my $printer = {};
+    my @QUEUES;
+
+    set_prefix($prefix);
+
+    # Initialize $printer data structure
+    resetinfo($printer);
+
+    return $printer;
+}
+
+#------------------------------------------------------------------------------
+sub resetinfo($) {
+    my ($printer) = @_;
+    $printer->{QUEUE} = "";
+    $printer->{OLD_QUEUE} = "";
+    $printer->{OLD_CHOICE} = "";
+    $printer->{ARGS} = "";
+    $printer->{DBENTRY} = "";
+    $printer->{DEFAULT} = "";
+    $printer->{currentqueue} = {};
+    # -check which printing system was used previously and load the information
+    # -about its queues
+    read_configured_queues($printer);
+}
+
+sub read_configured_queues($) {
+    my ($printer) = @_;
+    my @QUEUES;
+    # Get the default spooler choice from the config file
+    $printer->{SPOOLER} ||= printer::default::get_spooler();
+    if (!$printer->{SPOOLER}) {
+	#- Find the first spooler where there are queues
+	foreach my $spooler (qw(cups pdq lprng lpd)) {
+	    #- Is the spooler's daemon running?
+	    my $service = $spooler;
+	    if ($service eq "lprng") {
+		$service = "lpd";
+	    }
+	    if ($service ne "pdq") {
+		next unless services::is_service_running($service);
+		# daemon is running, spooler found
+		$printer->{SPOOLER} = $spooler;
+	    }
+	    #- poll queue info 
+	    local *F; 
+	    open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+		"foomatic-configure -P -q -s $spooler |" or
+		    die "Could not run foomatic-configure";
+	    eval (join('',(<F>))); 
+	    close F;
+	    if ($service eq "pdq") {
+		#- Have we found queues? PDQ has no damon, so we consider
+		#- it in use when there are defined printer queues
+		if ($#QUEUES != -1) {
+		    $printer->{SPOOLER} = $spooler;
+		    last;
+		}
+	    } else {
+		#- For other spoolers we have already found a running
+		#- daemon when we have arrived here
+		last;
+	    }
+	}
+    } else {
+	#- Poll the queues of the current default spooler
+	local *F; 
+	open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	    "foomatic-configure -P -q -s $printer->{SPOOLER} |" or
+		die "Could not run foomatic-configure";
+	eval (join('',(<F>))); 
+	close F;
+    }
+    $printer->{configured} = {};
+    my $i;
+    my $N = $#QUEUES + 1;
+    for ($i = 0;  $i < $N; $i++) {
+	$printer->{configured}{$QUEUES[$i]{queuedata}{queue}} = 
+	    $QUEUES[$i];
+	if ((!$QUEUES[$i]{make}) || (!$QUEUES[$i]{model})) {
+	    if ($printer->{SPOOLER} eq "cups") {
+		$printer->{OLD_QUEUE} = $QUEUES[$i]{queuedata}{queue};
+		my $descr = get_descr_from_ppd($printer);
+		$descr =~ m/^([^\|]*)\|([^\|]*)\|.*$/;
+		$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= $1;
+		$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= $2;
+		# Read out which PPD file was originally used to set up this
+		# queue
+		local *F;
+		if (open F, "< $prefix/etc/cups/ppd/$QUEUES[$i]{queuedata}{queue}.ppd") {
+		    while (my $line = <F>) {
+			if ($line =~ /^\*%MDKMODELCHOICE:(.+)$/) {
+			    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = $1;
+			}
+		    }
+		    close F;
+		}
+		# Mark that we have a CUPS queue but do not know the name
+		# the PPD file in /usr/share/cups/model
+		if (!$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd}) {
+		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = '1';
+		}
+		$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = 'CUPS/PPD';
+		$printer->{OLD_QUEUE} = "";
+		# Read out the printer's options
+		$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{args} = read_cups_options($QUEUES[$i]{queuedata}{queue});
+	    }
+	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= "";
+	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= N("Unknown model");
+	} else {
+	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} = $QUEUES[$i]{make};
+	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} = $QUEUES[$i]{model};
+	}
+	# Fill in "options" field
+	if (my $args = $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{args}) {
+	    my @options;
+	    foreach my $arg (@{$args}) {
+		push(@options, "-o");
+		my $optstr = $arg->{name} . "=" . $arg->{default};
+		push(@options, $optstr);
+	    }
+	    @{$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{options}} = @options;
+	}
+	# Construct an entry line for tree view in main window of
+	# printerdrake
+	make_menuentry($printer, $QUEUES[$i]{queuedata}{queue});
+    }
+}
+
+sub make_menuentry {
+    my ($printer, $queue) = @_;
+    my $spooler = $shortspooler_inv{$printer->{SPOOLER}}{short_name};
+    my $connect = $printer->{configured}{$queue}{queuedata}{connect};
+    my $localremote;
+    if (($connect =~ m!^file:!) || ($connect =~ m!^ptal:/mlc:!)) {
+	$localremote = N("Local Printers");
+    } else {
+	$localremote = N("Remote Printers");
+    }
+    my $make = $printer->{configured}{$queue}{queuedata}{make};
+    my $model = $printer->{configured}{$queue}{queuedata}{model};
+    my $connection;
+    if ($connect =~ m!^file:/dev/lp(\d+)$!) {
+	my $number = $1;
+	$connection = N(" on parallel port \#%s", $number);
+    } elsif ($connect =~ m!^file:/dev/usb/lp(\d+)$!) {
+	my $number = $1;
+	$connection = N(", USB printer \#%s", $number);
+    } elsif ($connect =~ m!^ptal:/(.+)$!) {
+	my $ptaldevice = $1;
+	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
+	    my $number = $1;
+	    $connection = N(", multi-function device on parallel port \#%s",
+			    $number);
+	} elsif ($ptaldevice =~ /^mlc:usb:/) {
+	    $connection = N(", multi-function device on USB");
+	} elsif ($ptaldevice =~ /^hpjd:/) {
+	    $connection = N(", multi-function device on HP JetDirect");
+	} else {
+	    $connection = N(", multi-function device");
+	}
+    } elsif ($connect =~ m!^file:(.+)$!) {
+	$connection = N(", printing to %s", $1);
+    } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) {
+	$connection = N(" on LPD server \"%s\", printer \"%s\"", $2, $1);
+    } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) {
+	$connection = N(", TCP/IP host \"%s\", port %s", $1, $2);
+    } elsif (($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$!) ||
+	     ($connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$!) ||
+	     ($connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!)) {
+	$connection = N(" on SMB/Windows server \"%s\", share \"%s\"", $1, $2);
+    } elsif (($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$!) ||
+	     ($connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$!) ||
+	     ($connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!)) {
+	$connection = N(" on Novell server \"%s\", printer \"%s\"", $1, $2);
+    } elsif ($connect =~ m!^postpipe:(.+)$!) {
+	$connection = N(", using command %s", $1);
+    } else {
+	$connection = ($::expert ? ", URI: $connect" : "");
+    }
+    my $sep = "!";
+    $printer->{configured}{$queue}{queuedata}{menuentry} = 
+	($::expert ? "$spooler$sep" : "") .
+	"$localremote$sep$queue: $make $model$connection";
+}
+
+sub read_printer_db(;$) {
+
+    my $spooler = $_[0];
+
+    my $dbpath = $prefix . $PRINTER_DB_FILE;
+
+    local *DBPATH; #- don't have to do close ... and don't modify globals at least
+    # Generate the Foomatic printer/driver overview, read it from the
+    # appropriate file when it is already generated
+    if (!(-f $dbpath)) {
+	open DBPATH, ($::testing ? $prefix : "chroot $prefix/ ") . #-#
+	    "foomatic-configure -O -q |" or
+		die "Could not run foomatic-configure";
+    } else {
+	open DBPATH, $dbpath or die "An error occurred on $dbpath : $!"; #-#
+    }
+
+    my $entry = {};
+    my $inentry = 0;
+    my $indrivers = 0;
+    my $inautodetect = 0;
+    local $_;
+    while (<DBPATH>) {
+	chomp;
+	if ($inentry) {
+	    # We are inside a printer entry
+	    if ($indrivers) {
+		# We are inside the drivers block of a printers entry
+		if (m!^\s*</drivers>\s*$!) {
+		    # End of drivers block
+		    $indrivers = 0;
+		} elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
+		    push (@{$entry->{drivers}}, $1);
+		}
+	    } elsif ($inautodetect) {
+		# We are inside the autodetect block of a printers entry
+		# All entries inside this block will be ignored
+		if (m!^.*</autodetect>\s*$!) {
+		    # End of autodetect block
+		    $inautodetect = 0;
+		}
+	    } else {
+		if (m!^\s*</printer>\s*$!) {
+		    # entry completed
+		    $inentry = 0;
+		    # Expert mode:
+		    # Make one database entry per driver with the entry name
+		    # manufacturer|model|driver
+		    if ($::expert) {
+			foreach my $driver (@{$entry->{drivers}}) {
+			    my $driverstr;
+			    if ($driver eq "Postscript") {
+				$driverstr = "PostScript";
+			    } else {
+				$driverstr = "GhostScript + $driver";
+			    }
+			    if ($driver eq $entry->{defaultdriver}) {
+				$driverstr .= " (recommended)";
+			    }
+			    $entry->{ENTRY} = "$entry->{make}|$entry->{model}|$driverstr";
+			    $entry->{driver} = $driver;
+			    # Duplicate contents of $entry because it is multiply entered to the database
+			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
+			}
+		    } else {
+			# Recommended mode
+			# Make one entry per printer, with the recommended
+			# driver (manufacturerer|model)
+			$entry->{ENTRY} = "$entry->{make}|$entry->{model}";
+			if ($entry->{defaultdriver}) {
+			    $entry->{driver} = $entry->{defaultdriver};
+			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
+			}
+		    }
+		    $entry = {};
+		} elsif (m!^\s*<id>\s*([^\s<>]+)\s*</id>\s*$!) {
+		    # Foomatic printer ID
+		    $entry->{printer} = $1;
+		} elsif (m!^\s*<make>(.+)</make>\s*$!) {
+		    # Printer manufacturer
+		    $entry->{make} = uc($1);
+		} elsif (m!^\s*<model>(.+)</model>\s*$!) {
+		    # Printer model
+		    $entry->{model} = $1;
+		} elsif (m!<driver>(.+)</driver>!) {
+		    # Printer default driver
+		    $entry->{defaultdriver} = $1;
+		} elsif (m!^\s*<drivers>\s*$!) {
+		    # Drivers block
+		    $indrivers = 1;
+		    @{$entry->{drivers}} = (); 
+		} elsif (m!^\s*<autodetect>\s*$!) {
+		    # Autodetect block
+		    $inautodetect = 1;
+		}
+	    }
+	} else {
+	    if (m!^\s*<printer>\s*$!) {
+		# new entry
+		$inentry = 1;
+	    }
+	}
+    }
+    close DBPATH;
+
+    # Add raw queue
+    if ($spooler ne "pdq") {
+	$entry->{ENTRY} = N("Raw printer (No driver)");
+	$entry->{driver} = "raw";
+	$entry->{make} = "";
+	$entry->{model} = N("Unknown model");
+	map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
+    }
+
+    #- Load CUPS driver database if CUPS is used as spooler
+    if (($spooler) && ($spooler eq "cups") && ($::expert)) {
+
+	#&$install('cups-drivers') unless $::testing;
+	#my $w;
+	#if ($in) {
+	#    $w = $in->wait_message(N("CUPS starting"),
+	#			   N("Reading CUPS drivers database..."));
+	#}
+        poll_ppd_base();
+    }
+
+    @entries_db_short     = sort keys %printer::thedb;
+    #%descr_to_db          = map { $printer::thedb{$_}{DESCR}, $_ } @entries_db_short;
+    #%descr_to_help        = map { $printer::thedb{$_}{DESCR}, $printer::thedb{$_}{ABOUT} } @entries_db_short;
+    #@entry_db_description = keys %descr_to_db;
+    #db_to_descr          = reverse %descr_to_db;
+
+}
+
+sub read_foomatic_options ($) {
+    my ($printer) = @_;
+    # Generate the option data for the chosen printer/driver combo
+    my $COMBODATA;
+    local *F;
+    open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	"foomatic-configure -P -q -p $printer->{currentqueue}{printer}" .
+	    " -d $printer->{currentqueue}{driver}" . 
+		($printer->{OLD_QUEUE} ?
+		  " -s $printer->{SPOOLER} -n $printer->{OLD_QUEUE}" : "") .
+		($printer->{SPECIAL_OPTIONS} ?
+		  " $printer->{SPECIAL_OPTIONS}" : "") 
+		    . " |" or
+	    die "Could not run foomatic-configure";
+    eval (join('',(<F>))); 
+    close F;
+    # Return the arguments field
+    return $COMBODATA->{args};
+}
+
+sub read_cups_options ($) {
+    my ($queue_or_file) = @_;
+    # Generate the option data from a CUPS PPD file/a CUPS queue
+    # Use the same Perl data structure as Foomatic uses to be able to
+    # reuse the dialog
+    local *F;
+    if ($queue_or_file =~ /.ppd.gz$/) { # compressed PPD file
+	open F, ($::testing ? $prefix : "chroot $prefix/ ") . #-#
+	    "gunzip -cd $queue_or_file | lphelp - |" or return 0;
+    } else { # PPD file not compressed or queue
+	open F, ($::testing ? $prefix : "chroot $prefix/ ") . #-#
+	    "lphelp $queue_or_file |" or return 0;
+    }
+    my $i;
+    my $j;
+    my @args;
+    my $line;
+    my $inoption = 0;
+    my $inchoices = 0;
+#    my $innumerical = 0;
+    while ($line = <F>) {
+	chomp $line;
+	if ($inoption) {
+	    if ($inchoices) {
+		if ($line =~ /^\s*(\S+)\s+(\S.*)$/) {
+		    push(@{$args[$i]{vals}}, {});
+		    $j = $#{$args[$i]{vals}};
+		    $args[$i]{vals}[$j]{value} = $1;
+		    my $comment = $2;
+		    # Did we find the default setting?
+		    if ($comment =~ /default\)\s*$/) {
+			$args[$i]{default} = $args[$i]{vals}[$j]{value};
+			$comment =~ s/,\s*default\)\s*$//;
+		    } else {
+			$comment =~ s/\)\s*$//;
+		    }
+		    # Remove opening paranthese
+		    $comment =~ s/^\(//;
+		    # Remove page size info
+		    $comment =~ s/,\s*size:\s*[0-9\.]+x[0-9\.]+in$//;
+		    $args[$i]{vals}[$j]{comment} = $comment;
+		} elsif (($line =~ /^\s*$/) && ($#{$args[$i]{vals}} > -1)) {
+		    $inchoices = 0;
+		    $inoption = 0;
+		}
+#	    } elsif ($innumerical == 1) {
+#		if ($line =~ /^\s*The default value is ([0-9\.]+)\s*$/) {
+#		    $args[$i]{default} = $1;
+#		    $innumerical = 0;
+#		    $inoption = 0;
+#		}
+	    } else {
+		if ($line =~ /^\s*<choice>/) {
+		    $inchoices = 1;
+#		} elsif ($line =~ /^\s*<value> must be a(.*) number in the range ([0-9\.]+)\.\.([0-9\.]+)\s*$/) {
+#		    delete($args[$i]{vals});
+#		    $args[$i]{min} = $2;
+#		    $args[$i]{max} = $3;
+#		    my $type = $1;
+#		    if ($type =~ /integer/) {
+#			$args[$i]{type} = 'int';
+#		    } else {
+#			$args[$i]{type} = 'float';
+#		    }
+#		    $innumerical = 1;
+		}
+	    }
+	} else {
+	    if ($line =~ /^\s*([^\s:][^:]*):\s+-o\s+([^\s=]+)=<choice>\s*$/) {
+#	    if ($line =~ /^\s*([^\s:][^:]*):\s+-o\s+([^\s=]+)=<.*>\s*$/) {
+		$inoption = 1;
+		push(@args, {});
+		$i = $#args;
+		$args[$i]{comment} = $1;
+		$args[$i]{name} = $2;
+		$args[$i]{type} = 'enum';
+		@{$args[$i]{vals}} = ();
+	    }
+	}
+    }
+    close F;
+    # Return the arguments field
+    return \@args;
+}
+
+sub set_cups_special_options {
+    my ($queue) = $_[0];
+    # Set some special CUPS options
+    my @lpoptions = chomp_(cat_("$prefix/etc/cups/lpoptions"));
+    # If nothing is already configured, set text file borders of half an inch
+    # and decrease the font size a little bit, so nothing of the text gets
+    # cut off by unprintable borders.
+    if (!grep { /$queue.*\s(page-(top|bottom|left|right)|lpi|cpi)=/ } @lpoptions) {
+	run_program::rooted($prefix, "lpoptions",
+			    "-p", $queue,
+			    "-o", "page-top=36", "-o", "page-bottom=36",
+			    "-o", "page-left=36", "-o page-right=36",
+			    "-o", "cpi=12", "-o", "lpi=7", "-o", "wrap");
+    }
+    # Let images fill the whole page by default
+    if (!grep { /$queue.*\s(scaling|natural-scaling|ppi)=/ } @lpoptions) {
+	run_program::rooted($prefix, "lpoptions",
+			    "-p", $queue,
+			    "-o", "scaling=100");
+    }
+    return 1;
+}
+
+#------------------------------------------------------------------------------
+
+sub read_cups_printer_list {
+    my ($printer) = $_[0];
+    # This function reads in a list of all printers which the local CUPS
+    # daemon currently knows, including remote ones.
+    local *F;
+    open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	"lpstat -v |" or return ();
+    my @printerlist;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m/^\s*device\s+for\s+([^:\s]+):\s*(\S+)\s*$/) {
+	    my $queuename = $1;
+	    my $comment = "";
+	    if (($2 =~ m!^ipp://([^/:]+)[:/]!) &&
+		(!$printer->{configured}{$queuename})) {
+		$comment = N("(on %s)", $1);
+	    } else {
+		$comment = N("(on this machine)");
+	    }
+	    push (@printerlist, "$queuename $comment");
+	}
+    }
+    close F;
+    return @printerlist;
+}
+
+sub get_cups_remote_queues {
+    my ($printer) = $_[0];
+    # This function reads in a list of all remote printers which the local 
+    # CUPS daemon knows due to broadcasting of remote servers or 
+    # "BrowsePoll" entries in the local /etc/cups/cupsd.conf/
+    local *F;
+    open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	"lpstat -v |" or return ();
+    my @printerlist;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m/^\s*device\s+for\s+([^:\s]+):\s*(\S+)\s*$/) {
+	    my $queuename = $1;
+	    my $comment = "";
+	    if (($2 =~ m!^ipp://([^/:]+)[:/]!) &&
+		(!$printer->{configured}{$queuename})) {
+		$comment = N("On CUPS server \"%s\"", $1);
+		my $sep = "!";
+		push (@printerlist,
+		      ($::expert ? N("CUPS") . $sep : "") .
+		      N("Remote Printers") . "$sep$queuename: $comment"
+		      . ($queuename eq $printer->{DEFAULT} ?
+			 N(" (Default)") : ("")));
+	    }
+	}
+    }
+    close F;
+    return @printerlist;
+}
+
+sub set_cups_autoconf {
+    my $autoconf = $_[0];
+
+    # Read config file
+    my $file = "$prefix/etc/sysconfig/printing";
+    @file_content = cat_($file);
+
+    # Remove all valid "CUPS_CONFIG" lines
+    (/^\s*CUPS_CONFIG/ and $_ = "") foreach @file_content;
+ 
+    # Insert the new "CUPS_CONFIG" line
+    if ($autoconf) {
+	push @file_content, "CUPS_CONFIG=automatic\n";
+    } else {
+	push @file_content, "CUPS_CONFIG=manual\n";
+    }
+
+    output($file, @file_content);
+
+    # Restart CUPS
+    printer::services::restart("cups");
+
+    return 1;
+}
+
+sub get_cups_autoconf {
+    local *F;
+    open F, "< $prefix/etc/sysconfig/printing" or return 1;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m!^[^\#]*CUPS_CONFIG=manual!) {
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+sub set_usermode {
+    my $usermode = $_[0];
+    $::expert = $usermode;
+
+    # Read config file
+    my $file = "$prefix/etc/sysconfig/printing";
+    @file_content = cat_($file);
+
+    # Remove all valid "USER_MODE" lines
+    (/^\s*USER_MODE/ and $_ = "") foreach @file_content;
+ 
+    # Insert the new "USER_MODE" line
+    if ($usermode) {
+	push @file_content, "USER_MODE=expert\n";
+    } else {
+	push @file_content, "USER_MODE=recommended\n";
+    }
+
+    output($file, @file_content);
+
+    return 1;
+}
+
+sub get_usermode {
+    local *F;
+    open F, "< $prefix/etc/sysconfig/printing" or return 0;
+    my $line;
+    while ($line = <F>) {
+	if ($line =~ m!^[^\#]*USER_MODE=expert!) {
+	    $::expert = 1;
+	    return 1;
+	}
+    }
+    $::expert = 0;
+    return 0;
+}
+
+sub read_cupsd_conf {
+    cat_("$prefix/etc/cups/cupsd.conf");
+}
+sub write_cupsd_conf {
+    my (@cupsd_conf) = @_;
+
+    output("$prefix/etc/cups/cupsd.conf", @cupsd_conf);
+
+    #- restart cups after updating configuration.
+    printer::services::restart("cups");
+}
+
+sub read_printers_conf {
+    my ($printer) = @_;
+    my $current;
+
+    #- read /etc/cups/printers.conf file.
+    #- according to this code, we are now using the following keys for each queues.
+    #-    DeviceURI > lpd://printer6/lp
+    #-    Info      > Info Text
+    #-    Location  > Location Text
+    #-    State     > Idle|Stopped
+    #-    Accepting > Yes|No
+    local *PRINTERS; open PRINTERS, "$prefix/etc/cups/printers.conf" or return;
+    local $_;
+    while (<PRINTERS>) {
+	chomp;
+	/^\s*#/ and next;
+	if (/^\s*<(?:DefaultPrinter|Printer)\s+([^>]*)>/) { $current = { mode => 'cups', QUEUE => $1, } }
+	elsif (/\s*<\/Printer>/) { $current->{QUEUE} && $current->{DeviceURI} or next; #- minimal check of synthax.
+				   add2hash($printer->{configured}{$current->{QUEUE}} ||= {}, $current); $current = undef }
+	elsif (/\s*(\S*)\s+(.*)/) { $current->{$1} = $2 }
+    }
+    close PRINTERS;
+
+    #- assume this printing system.
+    $printer->{SPOOLER} ||= 'cups';
+}
+
+sub get_direct_uri {
+    #- get the local printer to access via a Device URI.
+    my @direct_uri;
+    local *F; open F, ($::testing ? $prefix : "chroot $prefix/ ") . "/usr/sbin/lpinfo -v |";
+    local $_;
+    while (<F>) {
+	/^(direct|usb|serial)\s+(\S*)/ and push @direct_uri, $2;
+    }
+    close F;
+    @direct_uri;
+}
+
+sub get_descr_from_ppd {
+    my ($printer) = @_;
+    my %ppd;
+
+    #- if there is no ppd, this means this is a raw queue.
+    local *F; open F, "$prefix/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd" or return "|" . N("Unknown model");
+    # "OTHERS|Generic PostScript printer|PostScript (en)";
+    local $_;
+    while (<F>) {
+	/^\*([^\s:]*)\s*:\s*\"([^\"]*)\"/ and do { $ppd{$1} = $2; next };
+	/^\*([^\s:]*)\s*:\s*([^\s\"]*)/   and do { $ppd{$1} = $2; next };
+    }
+    close F;
+
+    my $descr = ($ppd{NickName} || $ppd{ShortNickName} || $ppd{ModelName});
+    # Apply the beautifying rules of poll_ppd_base
+    if ($descr =~ /Foomatic \+ Postscript/) {
+	$descr =~ s/Foomatic \+ Postscript/PostScript/;
+    } elsif ($descr =~ /Foomatic/) {
+	$descr =~ s/Foomatic/GhostScript/;
+    } elsif ($descr =~ /CUPS\+GIMP-print/) {
+	$descr =~ s/CUPS\+GIMP-print/CUPS \+ GIMP-Print/;
+    } elsif ($descr =~ /Series CUPS/) {
+	$descr =~ s/Series CUPS/Series, CUPS/;
+    } elsif (!(uc($descr) =~ /POSTSCRIPT/)) {
+	$descr .= ", PostScript";
+    }
+
+    # Split the $descr into model and driver
+    my $model;
+    my $driver;
+    if ($descr =~ /^([^,]+), (.*)$/) {
+	$model = $1;
+	$driver = $2;
+    } else {
+	# Some PPDs do not have the ", <driver>" part.
+	$model = $descr;
+	$driver = "PostScript";
+    }
+    my $make = $ppd{Manufacturer};
+    my $lang = $ppd{LanguageVersion};
+
+    # Remove manufacturer's name from the beginning of the model name
+    if (($make) && ($model =~ /^$make[\s\-]+([^\s\-].*)$/)) {
+	$model = $1;
+    }
+
+    # Put out the resulting description string
+    uc($make) . '|' . $model . '|' . $driver .
+      ($lang && (" (" . lc(substr($lang, 0, 2)) . ")"));
+}
+
+sub poll_ppd_base {
+    #- before trying to poll the ppd database available to cups, we have to make sure
+    #- the file /etc/cups/ppds.dat is no more modified.
+    #- if cups continue to modify it (because it reads the ppd files available), the
+    #- poll_ppd_base program simply cores :-)
+    run_program::rooted($prefix, "ifconfig lo 127.0.0.1"); #- else cups will not be happy! and ifup lo don't run ?
+    printer::services::start_not_running_service("cups");
+    my $driversthere = scalar(keys %thedb);
+    foreach (1..60) {
+	local *PPDS; open PPDS, ($::testing ? $prefix : "chroot $prefix/ ") . "/usr/bin/poll_ppd_base -a |";
+	local $_;
+	while (<PPDS>) {
+	    chomp;
+	    my ($ppd, $mf, $descr, $lang) = split /\|/;
+	    if ($ppd eq "raw") { next }
+	    my ($model, $driver);
+	    if ($descr) {
+		if ($descr =~ /^([^,]+), (.*)$/) {
+		    $model = $1;
+		    $driver = $2;
+		} else {
+		    # Some PPDs do not have the ", <driver>" part.
+		    $model = $descr;
+		    $driver = "PostScript";
+		}
+	    }
+	    # Rename Canon "BJC XXXX" models into "BJC-XXXX" so that the models
+	    # do not appear twice
+	    if ($mf eq "CANON") {
+		$model =~ s/BJC\s+/BJC-/;
+	    }
+	    $ppd && $mf && $descr and do {
+		my $key = "$mf|$model|$driver" . ($lang && " ($lang)");
+	        $thedb{$key}{ppd} = $ppd;
+		$thedb{$key}{driver} = $driver;
+		$thedb{$key}{make} = $mf;
+		$thedb{$key}{model} = $model;
+	    }
+	}
+	close PPDS;
+	scalar(keys %thedb) - $driversthere > 5 and last;
+	#- we have to try again running the program, wait here a little before.
+	sleep 1; 
+    }
+
+    #scalar(keys %descr_to_ppd) > 5 or die "unable to connect to cups server";
+
+}
+
+
+
+#-******************************************************************************
+#- write functions
+#-******************************************************************************
+
+sub configure_queue($) {
+    my ($printer) = @_;
+
+    if ($printer->{currentqueue}{foomatic}) {
+	#- Create the queue with "foomatic-configure", in case of queue
+	#- renaming copy the old queue
+        run_program::rooted($prefix, "foomatic-configure", "-q",
+			    "-s", $printer->{currentqueue}{spooler},
+			    "-n", $printer->{currentqueue}{queue},
+			    (($printer->{currentqueue}{queue} ne 
+			      $printer->{OLD_QUEUE}) &&
+			     ($printer->{configured}{$printer->{OLD_QUEUE}}) ?
+			     ("-C", $printer->{OLD_QUEUE}) : ()),
+			    "-c", $printer->{currentqueue}{connect},
+			    "-p", $printer->{currentqueue}{printer},
+			    "-d", $printer->{currentqueue}{driver},
+			    "-N", $printer->{currentqueue}{desc},
+			    "-L", $printer->{currentqueue}{loc},
+			    @{$printer->{currentqueue}{options}}
+			    ) or die "foomatic-configure failed";
+    } elsif ($printer->{currentqueue}{ppd}) {
+	#- If the chosen driver is a PPD file from /usr/share/cups/model,
+	#- we use lpadmin to set up the queue
+        run_program::rooted($prefix, "lpadmin",
+			    "-p", $printer->{currentqueue}{queue},
+#			    $printer->{State} eq 'Idle' && 
+#			        $printer->{Accepting} eq 'Yes' ? ("-E") : (),
+			    "-E",
+			    "-v", $printer->{currentqueue}{connect},
+			    ($printer->{currentqueue}{ppd} ne '1') ?
+			        ("-m", $printer->{currentqueue}{ppd}) : (),
+			    $printer->{currentqueue}{desc} ?
+			        ("-D", $printer->{currentqueue}{desc}) : (),
+			    $printer->{currentqueue}{loc} ? 
+			        ("-L", $printer->{currentqueue}{loc}) : (),
+			    @{$printer->{currentqueue}{options}}
+			    ) or die "lpadmin failed";
+	# Add a comment line containing the path of the used PPD file to the
+	# end of the PPD file
+	if ($printer->{currentqueue}{ppd} ne '1') {
+	    local *F;
+	    open F, ">> $prefix/etc/cups/ppd/$printer->{currentqueue}{queue}.ppd";
+	    print F "*%MDKMODELCHOICE:$printer->{currentqueue}{ppd}\n";
+	}
+	# Copy the old queue's PPD file to the new queue when it is renamed,
+	# to conserve the option settings
+	if (($printer->{currentqueue}{queue} ne 
+	     $printer->{OLD_QUEUE}) &&
+	    ($printer->{configured}{$printer->{OLD_QUEUE}})) {
+	    system("cp -f $prefix/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd $prefix/etc/cups/ppd/$printer->{currentqueue}{queue}.ppd");
+	}
+    } else {
+	# Raw queue
+        run_program::rooted($prefix, "foomatic-configure", "-q",
+			    "-s", $printer->{currentqueue}{spooler},
+			    "-n", $printer->{currentqueue}{queue},
+			    "-c", $printer->{currentqueue}{connect},
+			    "-d", $printer->{currentqueue}{driver},
+			    "-N", $printer->{currentqueue}{desc},
+			    "-L", $printer->{currentqueue}{loc}
+			    ) or die "foomatic-configure failed";
+    }	  
+
+    # Make sure that queue is active
+    if ($printer->{SPOOLER} ne "pdq") {
+        run_program::rooted($prefix, "foomatic-printjob",
+			    "-s", $printer->{currentqueue}{spooler},
+			    "-C", "up", $printer->{currentqueue}{queue});
+    }
+
+    # In case of CUPS set some more useful defaults for text and image printing
+    if ($printer->{SPOOLER} eq "cups") {
+	set_cups_special_options($printer->{currentqueue}{queue});
+    }
+
+    # Check whether a USB printer is configured and activate USB printing if so
+    my $useUSB = 0;
+    foreach (values %{$printer->{configured}}) {
+	$useUSB ||= $_->{queuedata}{connect} =~ /usb/ || 
+	    $_->{DeviceURI} =~ /usb/;
+    }
+    $useUSB ||= ($printer->{currentqueue}{queue}{queuedata}{connect}
+		 =~ /usb/);
+    if ($useUSB) {
+	my $f = "$prefix/etc/sysconfig/usb";
+	my %usb = getVarsFromSh($f);
+	$usb{PRINTER} = "yes";
+	setVarsInSh($f, \%usb);
+    }
+
+    # Open permissions for device file when PDQ is chosen as spooler
+    # so normal users can print.
+    if ($printer->{SPOOLER} eq 'pdq') {
+	if ($printer->{currentqueue}{connect} =~ m!^\s*file:(\S*)\s*$!) {
+	    set_permissions($1,"666");
+	}
+    }
+
+    # Make a new printer entry in the $printer structure
+    $printer->{configured}{$printer->{currentqueue}{queue}}{queuedata} =
+        {};
+    copy_printer_params($printer->{currentqueue},
+      $printer->{configured}{$printer->{currentqueue}{queue}}{queuedata});
+    # Construct an entry line for tree view in main window of
+    # printerdrake
+    make_menuentry($printer, $printer->{currentqueue}{queue});
+
+    # Store the default option settings
+    $printer->{configured}{$printer->{currentqueue}{queue}}{args} = {};
+    if ($printer->{currentqueue}{foomatic}) {
+	my $tmp = $printer->{OLD_QUEUE};
+	$printer->{OLD_QUEUE} = $printer->{currentqueue}{queue};
+	$printer->{configured}{$printer->{currentqueue}{queue}}{args} = 
+	    read_foomatic_options($printer);
+	$printer->{OLD_QUEUE} = $tmp;
+    } elsif ($printer->{currentqueue}{ppd}) {
+	$printer->{configured}{$printer->{currentqueue}{queue}}{args} =
+	    read_cups_options($printer->{currentqueue}{queue});
+    }
+    # Clean up
+    delete($printer->{ARGS});
+    $printer->{OLD_CHOICE} = "";
+    $printer->{ARGS} = {};
+    $printer->{DBENTRY} = "";
+    $printer->{currentqueue} = {};
+}
+
+sub remove_queue($$) {
+    my ($printer) = $_[0];
+    my ($queue) = $_[1];
+    run_program::rooted($prefix, "foomatic-configure", "-R", "-q",
+			"-s", $printer->{SPOOLER},
+			"-n", $queue);
+    # Delete old stuff from data structure
+    delete $printer->{configured}{$queue};
+    delete($printer->{currentqueue});
+    delete($printer->{ARGS});
+    $printer->{OLD_CHOICE} = "";
+    $printer->{ARGS} = {};
+    $printer->{DBENTRY} = "";
+    $printer->{currentqueue} = {};
+    removeprinterfromapplications($printer, $queue);
+}
+
+sub restart_queue($) {
+    my ($printer) = @_;
+    my $queue = $printer->{QUEUE};
+
+    # Restart the daemon(s)
+    foreach ($printer->{SPOOLER}) {
+	/cups/ && do {
+	    #- restart cups.
+	    printer::services::restart("cups");
+	    last };
+	/lpr|lprng/ && do {
+	    #- restart lpd.
+	    foreach (("/var/spool/lpd/$queue/lock", "/var/spool/lpd/lpd.lock")) {
+		my $pidlpd = (cat_("$prefix$_"))[0];
+		kill 'TERM', $pidlpd if $pidlpd;
+		unlink "$prefix$_";
+	    }
+	    printer::services::restart("lpd"); sleep 1;
+	    last };
+    }
+    # Kill the jobs
+    run_program::rooted($prefix, "foomatic-printjob", "-R",
+			"-s", $printer->{SPOOLER},
+			"-P", $queue, "-");
+
+}
+
+sub print_pages($@) {
+    my ($printer, @pages) = @_;
+    my $queue = $printer->{QUEUE};
+    my $lpr = "/usr/bin/foomatic-printjob";
+    my $lpq = "$lpr -Q";
+
+    # Print the pages
+    foreach (@pages) {
+	my $page = $_;
+	# Only text and PostScript can be printed directly with all spoolers,
+	# images must be treated seperately
+	if ($page =~ /\.jpg$/) {
+	    if ($printer->{SPOOLER} ne "cups") {
+		# Use "convert" from ImageMagick for non-CUPS spoolers
+		system(($::testing ? $prefix : "chroot $prefix/ ") .
+		       "/usr/bin/convert $page -page 427x654+100+65 PS:- | " .
+		       ($::testing ? $prefix : "chroot $prefix/ ") .
+		       "$lpr -s $printer->{SPOOLER} -P $queue");
+	    } else {
+		# Use CUPS's internal image converter with CUPS, tell it
+		# to let the image occupy 90% of the page size (so nothing
+		# gets cut off by unprintable borders)
+		run_program::rooted($prefix, $lpr, "-s", $printer->{SPOOLER},
+				    "-P", $queue, "-o", "scaling=90", $page);
+	    }		
+	} else {
+	    run_program::rooted($prefix, $lpr, "-s", $printer->{SPOOLER},
+				"-P", $queue, $page);
+	}
+    }
+    sleep 5; #- allow lpr to send pages.
+    # Check whether the job is queued
+    local *F; 
+    open F, ($::testing ? $prefix : "chroot $prefix/ ") . "$lpq -s $printer->{SPOOLER} -P $queue |";
+    my @lpq_output =
+	grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <F>;
+    close F;
+    @lpq_output;
+}
+
+sub help_output {
+    my ($printer, $spooler) = @_;
+    my $queue = $printer->{QUEUE};
+
+    local *F; 
+    open F, ($::testing ? $prefix : "chroot $prefix/ ") . sprintf($spoolers{$spooler}{help}, $queue);
+    $helptext = join("", <F>);
+    close F;
+    $helptext = "Option list not available!\n" if $spooler eq 'lpq' && (!$helptext || ($helptext eq ""));
+    return $helptext;
+}
+
+sub print_optionlist {
+    my ($printer) = @_;
+    my $queue = $printer->{QUEUE};
+    my $lpr = "/usr/bin/foomatic-printjob";
+
+    # Print the option list pages
+    if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
+        run_program::rooted($prefix, $lpr, "-s", $printer->{SPOOLER},
+			    "-P", $queue, "-o", "docs",
+			    "/etc/bashrc");
+    } elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
+	system(($::testing ? $prefix : "chroot $prefix/ ") .
+	       "/usr/bin/lphelp $queue | " .
+	       ($::testing ? $prefix : "chroot $prefix/ ") .
+	       "$lpr -s $printer->{SPOOLER} -P $queue");
+    }
+}
+
+# ---------------------------------------------------------------
+#
+# Spooler config stuff
+#
+# ---------------------------------------------------------------
+
+sub get_copiable_queues {
+    my ($oldspooler, $newspooler) = @_;
+
+    my @queuelist;      #- here we will list all Foomatic-generated queues
+    # Get queue list with foomatic-configure
+    local *QUEUEOUTPUT;
+    open QUEUEOUTPUT, ($::testing ? $prefix : "chroot $prefix/ ") . 
+	    "foomatic-configure -Q -q -s $oldspooler |" or
+		die "Could not run foomatic-configure";
+
+    my $entry = {};
+    my $inentry = 0;
+    local $_;
+    while (<QUEUEOUTPUT>) {
+	chomp;
+	if ($inentry) {
+	    # We are inside a queue entry
+	    if (m!^\s*</queue>\s*$!) {
+		# entry completed
+		$inentry = 0;
+		if (($entry->{foomatic}) && 
+		    ($entry->{spooler} eq $oldspooler)) {
+		    # Is the connection type supported by the new
+		    # spooler?
+		    if ((($newspooler eq "cups") &&
+			 (($entry->{connect} =~ /^file:/) ||
+			  ($entry->{connect} =~ /^ptal:/) ||
+			  ($entry->{connect} =~ /^lpd:/) ||
+			  ($entry->{connect} =~ /^socket:/) ||
+			  ($entry->{connect} =~ /^smb:/) ||
+			  ($entry->{connect} =~ /^ipp:/))) ||
+			((($newspooler eq "lpd") ||
+			  ($newspooler eq "lprng")) &&
+			 (($entry->{connect} =~ /^file:/) ||
+			  ($entry->{connect} =~ /^ptal:/) ||
+			  ($entry->{connect} =~ /^lpd:/) ||
+			  ($entry->{connect} =~ /^socket:/) ||
+			  ($entry->{connect} =~ /^smb:/) ||
+			  ($entry->{connect} =~ /^ncp:/) ||
+			  ($entry->{connect} =~ /^postpipe:/))) ||
+			(($newspooler eq "pdq") &&
+			 (($entry->{connect} =~ /^file:/) ||
+			  ($entry->{connect} =~ /^ptal:/) ||
+			  ($entry->{connect} =~ /^lpd:/) ||
+			  ($entry->{connect} =~ /^socket:/)))) {
+			push(@queuelist, $entry->{name});
+		    }
+		}
+		$entry = {};
+	    } elsif (m!^\s*<name>(.+)</name>\s*$!) {
+		    # queue name
+		    $entry->{name} = $1;
+	    } elsif (m!^\s*<connect>(.+)</connect>\s*$!) {
+		    # connection type (URI)
+		    $entry->{connect} = $1;
+	    }
+	} else {
+	    if (m!^\s*<queue\s+foomatic\s*=\s*\"?(\d+)\"?\s*spooler\s*=\s*\"?(\w+)\"?\s*>\s*$!) {
+		# new entry
+		$inentry = 1;
+		$entry->{foomatic} = $1;
+		$entry->{spooler} = $2;
+	    }
+	}
+    }
+    close QUEUEOUTPUT;
+    
+    return @queuelist;
+}
+
+sub copy_foomatic_queue {
+    my ($printer, $oldqueue, $oldspooler, $newqueue) = @_;
+    run_program::rooted($prefix, "foomatic-configure", "-q",
+			"-s", $printer->{SPOOLER},
+			"-n", $newqueue,
+			"-C", $oldspooler, $oldqueue);
+    # In case of CUPS set some more useful defaults for text and image printing
+    if ($printer->{SPOOLER} eq "cups") {
+	set_cups_special_options($newqueue);
+    }
+}
+
+# ------------------------------------------------------------------
+#
+# Configuration of HP multi-function devices
+#
+# ------------------------------------------------------------------
+
+sub configure_hpoj {
+    my ($device, @autodetected) = @_;
+
+    # Make the subroutines of /usr/sbin/ptal-init available
+    # It's only necessary to read it at the first call of this subroutine,
+    # the subroutine definitions stay valid after leaving this subroutine.
+    if (!$ptalinitread) {
+	local *PTALINIT;
+	open PTALINIT, "$prefix/usr/sbin/ptal-init" or do {
+	    die "unable to open $prefix/usr/sbin/ptal-init";
+	};
+	my @ptalinitfunctions; # subroutine definitions in /usr/sbin/ptal-init
+	local $_;
+	while (<PTALINIT>) {
+	    if (m!sub main!) {
+		last;
+	    } elsif (m!^[^\#]!) {
+		# Make the subroutines also working during installation
+		if ($::isInstall) {
+		    s!\$prefix!\$hpoj_prefix!g;
+		    s!prefix=\"/usr\"!prefix=\"$prefix/usr\"!g;
+		    s!etcPtal=\"/etc/ptal\"!etcPtal=\"$prefix/etc/ptal\"!g;
+		    s!varLock=\"/var/lock\"!varLock=\"$prefix/var/lock\"!g;
+		    s!varRunPrefix=\"/var/run\"!varRunPrefix=\"$prefix/var/run\"!g;
+		}
+		push (@ptalinitfunctions, $_);
+	    }
+	}
+	close PTALINIT;
+
+	eval "@ptalinitfunctions
+        sub getDevnames {
+	    return (%devnames)
+	}
+        sub getConfigInfo {
+            return (%configInfo)
+        }";
+
+	if ($::isInstall) {
+	    # Needed for photo card reader detection during installation
+	    system("ln -s $prefix/var/run/ptal-mlcd /var/run/ptal-mlcd");
+	    system("ln -s $prefix/etc/ptal /etc/ptal");
+	}
+	$ptalinitread = 1;
+    }
+
+    # Read the HPOJ config file and check whether this device is already
+    # configured
+    setupVariables ();
+    readDeviceInfo ();
+
+    $device =~ m!^/dev/\S*lp(\d+)$! or
+	$device =~ m!^/dev/printers/(\d+)$! or
+	$device =~ m!^socket://([^:]+)$! or
+	$device =~ m!^socket://([^:]+):(\d+)$!;
+    my $model = $1;
+    my $model_long = "";
+    my $serialnumber = "";
+    my $serialnumber_long = "";
+    my $cardreader = 0;
+    my $device_ok = 1;
+    my $bus;
+    my $address_arg = "";
+    my $base_address = "";
+    my $hostname = "";
+    my $port = $2;
+    if ($device =~ /usb/) {
+	$bus = "usb";
+    } elsif (($device =~ /par/) ||
+	     ($device =~ /\/dev\/lp/) ||
+	     ($device =~ /printers/)) {
+	$bus = "par";
+	$address_arg = printer::detect::parport_addr($device);
+	$address_arg =~ /^\s*-base\s+(\S+)/;
+	eval ("$base_address = $1");
+    } elsif ($device =~ /socket/) {
+	$bus = "hpjd";
+	$hostname = $model;
+	return "" if $port && ($port < 9100 || $port > 9103);
+	if ($port && $port != 9100) {
+	    $port -= 9100;
+	    $hostname .= ":$port";
+	}
+    } else {
+	return "";
+    }
+    my $devdata;
+    foreach (@autodetected) {
+	$device eq $_->{port} or next;
+	$devdata = $_;
+	# $model is for the PTAL device name, so make sure that it is unique
+	# so in the case of the model name auto-detection having failed leave
+	# the port number or the host name as model name.
+	my $searchunknown = N("Unknown model");
+	if (($_->{val}{MODEL}) &&
+	    ($_->{val}{MODEL} !~ /$searchunknown/i) &&
+	    ($_->{val}{MODEL} !~ /^\s*$/)) {
+	    $model = $_->{val}{MODEL};
+	}
+	$serialnumber = $_->{val}{SERIALNUMBER};
+	# Check if the device is really an HP multi-function device
+	if ($bus ne "hpjd") {
+	    # Start ptal-mlcd daemon for locally connected devices
+	    services::stop("hpoj");
+	    run_program::rooted($prefix, 
+				"ptal-mlcd", "$bus:probe", "-device", 
+				$device, split(' ',$address_arg));
+	}
+	$device_ok = 0;
+	my $ptalprobedevice = $bus eq "hpjd" ? "hpjd:$hostname" : "mlc:$bus:probe";
+	local *F;
+	if (open F, ($::testing ? $prefix : "chroot $prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice |") {
+	    my $devid = join("", <F>);
+	    close F;
+	    if ($devid) {
+		$device_ok = 1;
+                local *F;
+		if (open F, ($::testing ? $prefix : "chroot $prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice -long -mdl 2>/dev/null |") {
+		    $model_long = join("", <F>);
+		    close F;
+		    chomp $model_long;
+		    # If SNMP or local port auto-detection failed but HPOJ
+		    # auto-detection succeeded, fill in model name here.
+		    if ((!$_->{val}{MODEL}) ||
+			($_->{val}{MODEL} =~ /$searchunknown/i) ||
+			($_->{val}{MODEL} =~ /^\s*$/)) {
+			if ($model_long =~ /:([^:;]+);/) {
+			    $_->{val}{MODEL} = $1;
+			}
+		    }
+		}
+		if (open F, ($::testing ? $prefix : "chroot $prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice -long -sern 2>/dev/null |") { #-#
+		    $serialnumber_long = join("", <F>);
+		    close F;
+		    chomp $serialnumber_long;
+		}
+		if (cardReaderDetected ($ptalprobedevice)) {
+		    $cardreader = 1;
+		}
+	    }
+	}
+	if ($bus ne "hpjd") {
+	    # Stop ptal-mlcd daemon for locally connected devices
+            local *F;
+	    if (open F, ($::testing ? $prefix : "chroot $prefix/ ") . "ps auxwww | grep \"ptal-mlcd $bus:probe\" | grep -v grep | ") {
+		my $line = <F>;
+		if ($line =~ /^\s*\S+\s+(\d+)\s+/) {
+		    my $pid = $1;
+		    kill (15, $pid);
+		}
+		close F;
+	    }
+	    printer::services::start("hpoj");
+	}
+	last;
+    }
+    # No, it is not an HP multi-function device.
+    return "" if !$device_ok;
+
+    # Determine the ptal device name from already existing config files
+    my $ptalprefix =
+	($bus eq "hpjd" ? "hpjd:" : "mlc:$bus:");
+    my $ptaldevice = lookupDevname ($ptalprefix, $model_long, 
+				    $serialnumber_long, $base_address);
+
+    # It's all done for us, the device is already configured
+    return $ptaldevice if defined($ptaldevice);
+
+    # Determine the ptal name for a new device
+    if ($bus eq "hpjd") {
+	$ptaldevice = "hpjd:$hostname";
+    } else {
+	$ptaldevice = $model;
+	$ptaldevice =~ s![\s/]+!_!g;
+	$ptaldevice = "mlc:$bus:$ptaldevice";
+    }
+
+    # Delete any old/conflicting devices
+    deleteDevice ($ptaldevice);
+    if ($bus eq "par") {
+	while (1) {
+	    my $oldDevname = lookupDevname ("mlc:par:",undef,undef,
+					  $base_address);
+	    if (!defined($oldDevname)) {
+		last;
+	    }
+	    deleteDevice ($oldDevname);
+	}
+    }
+
+    # Configure the device
+
+    # Open configuration file
+    local *CONFIG;
+    open(CONFIG,"> $prefix/etc/ptal/$ptaldevice") or
+	die "Could not open /etc/ptal/$ptaldevice for writing!\n";
+
+    # Write file header.
+    $_ = `date`;
+    chomp;
+    print CONFIG
+	"# Added $_ by \"printerdrake\".\n".
+	"\n".
+	"# The basic format for this file is \"key[+]=value\".\n".
+	"# If you say \"+=\" instead of \"=\", then the value is appended to any\n".
+	"# value already defined for this key, rather than replacing it.\n".
+	"\n".
+	"# Comments must start at the beginning of the line.  Otherwise, they may\n".
+	"# be interpreted as being part of the value.\n".
+	"\n".
+	"# If you have multiple devices and want to define options that apply to\n".
+	"# all of them, then put them in the file /etc/ptal/defaults, which is read\n".
+	"# in before this file.\n".
+	"\n".
+	"# The format version of this file:\n".
+	"#   ptal-init ignores devices with incorrect/missing versions.\n".
+	"init.version=1\n";
+
+    # Write model string.
+    if ($model_long !~ /\S/) {
+	print CONFIG
+	    "\n".
+	    "# \"printerdrake\" couldn't read the model but added this device anyway:\n".
+	    "# ";
+    } else {
+	print CONFIG
+	    "\n".
+	    "# The device model that was originally detected on this port:\n".
+	    "#   If this ever changes, then you should re-run \"printerdrake\"\n".
+	    "#   to delete and re-configure this device.\n";
+	if ($bus eq "par") {
+	    print CONFIG
+		"#   Comment out if you don't care what model is really connected to this\n".
+		"#   parallel port.\n";
+	}
+    }
+    print CONFIG
+	"init.mlcd.append+=-devidmatch \"$model_long\"\n";
+
+    # Write serial-number string.
+    if ($serialnumber_long!~/\S/) {
+	print CONFIG
+	    "\n".
+	    "# The device's serial number is unknown.\n".
+	    "# ";
+    } else {
+	print CONFIG
+	    "\n".
+	    "# The serial number of the device that was originally detected on this port:\n";
+	if ($bus=~/^[pu]/) {
+	    print CONFIG
+		"#   Comment out if you want to disable serial-number matching.\n";
+	}
+    }
+    print CONFIG
+	"init.mlcd.append+=-devidmatch \"$serialnumber_long\"\n";
+
+    if ($bus=~/^[pu]/) {
+	print CONFIG
+	    "\n".
+	    "# Standard options passed to ptal-mlcd:\n".
+	    "init.mlcd.append+=";
+	if ($bus eq "usb") {
+	    # Important: don't put more quotes around /dev/usb/lp[0-9]*,
+	    # because ptal-mlcd currently does no globbing:
+	    print CONFIG "-device /dev/usb/lp[0-9]*";
+	} elsif ($bus eq "par") {
+	    print CONFIG "$address_arg -device $device";
+	}
+	print CONFIG "\n".
+	    "\n".
+	    "# ptal-mlcd's remote console can be useful for debugging, but may be a\n".
+	    "# security/DoS risk otherwise.  In any case, it's accessible with the\n".
+	    "# command \"ptal-connect mlc:<XXX>:<YYY> -service PTAL-MLCD-CONSOLE\".\n".
+	    "# Uncomment the following line if you want to enable this feature for\n".
+	    "# this device:\n".
+	    "# init.mlcd.append+=-remconsole\n".
+	    "\n".
+	    "# If you need to pass any other command-line options to ptal-mlcd, then\n".
+	    "# add them to the following line and uncomment the line:\n".
+	    "# init.mlcd.append+=\n".
+	    "\n".
+	    "# By default ptal-printd is started for mlc: devices.  If you use CUPS,\n".
+	    "# then you may not be able to use ptal-printd, and you can uncomment the\n".
+	    "# following line to disable ptal-printd for this device:\n".
+	    "# init.printd.start=0\n";
+    } else {
+	print CONFIG
+	    "\n".
+	    "# By default ptal-printd isn't started for hpjd: devices.\n".
+	    "# If for some reason you want to start it for this device, then\n".
+	    "# uncomment the following line:\n".
+	    "init.printd.start=1\n";
+    }
+
+    print CONFIG
+	"\n".
+	"# If you need to pass any additional command-line options to ptal-printd,\n".
+	"# then add them to the following line and uncomment the line:\n".
+	"# init.printd.append+=\n";
+    if ($cardreader) {
+	print CONFIG
+	    "\n".
+	    "# Uncomment the following line to enable ptal-photod for this device:\n".
+	    "init.photod.start=1\n".
+	    "\n".
+	    "# If you have more than one photo-card-capable peripheral and you want to\n".
+	    "# assign particular TCP port numbers and mtools drive letters to each one,\n".
+	    "# then change the line below to use the \"-portoffset <n>\" option.\n".
+	    "init.photod.append+=-maxaltports 26\n";
+    }
+    close(CONFIG);
+    readOneDevice ($ptaldevice);
+
+    # Restart HPOJ
+    printer::services::restart("hpoj");
+
+    # Return HPOJ device name to form the URI
+    return $ptaldevice;
+}
+
+sub config_sane {
+    # Add HPOJ backend to /etc/sane.d/dll.conf if needed (no individual
+    # config file /etc/sane.d/hpoj.conf necessary, the HPOJ driver finds the
+    # scanner automatically)
+    return if member("hpoj", chomp_(cat_("$prefix/etc/sane.d/dll.conf")));
+    local *F;
+    open F, ">> $prefix/etc/sane.d/dll.conf" or 
+	die "can't write SANE config in /etc/sane.d/dll.conf: $!";
+    print F "hpoj\n";
+    close F;
+}
+
+sub config_photocard {
+
+    # Add definitions for the drives p:. q:, r:, and s: to /etc/mtools.conf
+    my $mtoolsconf = join("", cat_("$prefix/etc/mtools.conf"));
+    return if $mtoolsconf =~ m/^\s*drive\s+p:/m;
+    my $mtoolsconf_append = "
+# Drive definitions added for the photo card readers in HP multi-function
+# devices driven by HPOJ
+drive p: file=\":0\" remote
+drive q: file=\":1\" remote
+drive r: file=\":2\" remote
+drive s: file=\":3\" remote
+# This turns off some file system integrity checks of mtools, it is needed
+# for some photo cards.
+mtools_skip_check=1
+";
+    local *F;
+    open F, ">> $prefix/etc/mtools.conf" or 
+	die "can't write mtools config in /etc/mtools.conf: $!";
+    print F $mtoolsconf_append;
+    close F;
+
+    # Generate a config file for the graphical mtools frontend MToolsFM or
+    # modify the existing one
+    my $mtoolsfmconf;
+    if (-f "$prefix/etc/mtoolsfm.conf") {
+	$mtoolsfmconf = cat_("$prefix/etc/mtoolsfm.conf") or die "can't read MToolsFM config in $prefix/etc/mtoolsfm.conf: $!";
+	$mtoolsfmconf =~ m/^\s*DRIVES\s*=\s*\"([A-Za-z ]*)\"/m;
+	my $alloweddrives = lc($1);
+	foreach my $letter ("p", "q", "r", "s") {
+	    if ($alloweddrives !~ /$letter/) {
+		$alloweddrives .= $letter;
+	    }
+	}
+	$mtoolsfmconf =~ s/^\s*DRIVES\s*=\s*\"[A-Za-z ]*\"/DRIVES=\"$alloweddrives\"/m;
+	$mtoolsfmconf =~ s/^\s*LEFTDRIVE\s*=\s*\"[^\"]*\"/LEFTDRIVE=\"p\"/m;
+    } else {
+	$mtoolsfmconf = "\# MToolsFM config file. comments start with a hash sign.
+\#
+\# This variable sets the allowed driveletters (all lowercase). Example:
+\# DRIVES=\"ab\"
+DRIVES=\"apqrs\"
+\#
+\# This variable sets the driveletter upon startup in the left window.
+\# An empty string or space is for the hardisk. Example:
+\# LEFTDRIVE=\"a\"
+LEFTDRIVE=\"p\"
+\#
+\# This variable sets the driveletter upon startup in the right window.
+\# An empty string or space is for the hardisk. Example:
+\# RIGHTDRIVE=\"a\"
+RIGHTDRIVE=\" \"
+";
+    }
+    output("$prefix/etc/mtoolsfm.conf", $mtoolsfmconf);
+}
+
+# ------------------------------------------------------------------
+#
+# Configuration of printers in applications
+#
+# ------------------------------------------------------------------
+
+sub configureapplications {
+    my ($printer) = @_;
+    setcupslink ($printer);
+    printer::office::configureoffice('Star Office', $printer);
+    printer::office::configureoffice('OpenOffice.Org', $printer);
+    printer::gimp::configure($printer);
+}
+
+sub addcupsremotetoapplications {
+    my ($printer, $queue) = @_;
+    setcupslink ($printer);
+    return (printer::office::add_cups_remote_to_office('Star Office', $printer, $queue) &&
+	    printer::office::add_cups_remote_to_office('OpenOffice.Org', $printer, $queue) &&
+	    printer::gimp::addcupsremoteto($printer, $queue));
+}
+
+sub removeprinterfromapplications {
+    my ($printer, $queue) = @_;
+    setcupslink ($printer);
+    return (printer::office::remove_printer_from_office('Star Office', $printer, $queue) &&
+	    printer::office::remove_printer_from_office('OpenOffice.Org', $printer, $queue) &&
+	    printer::gimp::removeprinterfrom($printer, $queue));
+}
+
+sub removelocalprintersfromapplications {
+    my ($printer) = @_;
+    setcupslink ($printer);
+    printer::office::remove_local_printers_from_office('Star Office', $printer);
+    printer::office::remove_local_printers_from_office('OpenOffice.Org', $printer);
+    printer::gimp::removelocalprintersfrom($printer);
+}
+
+sub setcupslink {
+    my ($printer) = @_;
+    return 1 if !$::isInstall;
+    return 1 if $printer->{SPOOLER} ne "cups";
+    return 1 if -d "/etc/cups/ppd";
+    system("ln -sf $prefix/etc/cups /etc/cups");
+    return 1;
+}
+
+
+1;
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
new file mode 100644
index 000000000..037d40601
--- /dev/null
+++ b/perl-install/printer/office.pm
@@ -0,0 +1,384 @@
+package printer::office;
+
+use strict;
+use common;
+use run_program;
+use printer::common;
+use printer::cups;
+
+# ------------------------------------------------------------------
+#   Star Offica/OpenOffice.org
+# ------------------------------------------------------------------
+
+
+our %suites =
+    (
+     'Star Office' => {
+	 'make' => \&makestarofficeprinterentry,
+	 'file_name' => '^(.*)/share/psprint/psprint.conf$',
+	 'param' => ["Generic Printer", "Command="],
+	 'perl' => "/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/",
+	 'files' => [qw(/usr/lib/*/share/xp3/Xpdefaults
+		       /usr/local/lib/*/share/xp3/Xpdefaults
+		       /usr/local/*/share/xp3/Xpdefaults
+		       /opt/*/share/xp3/Xpdefaults)]
+
+	 },
+     'OpenOffice.Org' => {
+	 'make' => \&makeopenofficeprinterentry,
+	 'file_name' => '^(.*)/share/xp3/Xpdefaults$',
+	 'param' => ["ports", "default_queue="],
+	 'perl' => "usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/",
+	 'files' => [qw(/usr/lib/*/share/psprint/psprint.conf
+		       /usr/local/lib/*/share/psprint/psprint.conf
+		       /usr/local/*/share/psprint/psprint.conf
+		       /opt/*/share/psprint/psprint.conf)]
+	 }
+     );
+
+sub configureoffice {
+    my ($suite, $printer) = @_;
+    # Do we have Star Office installed?
+    my $configfilename = find_config_file($suite);
+    return 1 if !$configfilename;
+    $configfilename =~ m!$suites{$suite}{file_name}!;
+    my $configprefix = $1;
+    # Load Star Office printer config file
+    my $configfilecontent = readsofficeconfigfile($configfilename);
+    # Update remote CUPS queues
+    if (0 && ($printer->{SPOOLER} eq "cups") && 
+	((-x "$::prefix/usr/bin/curl") || (-x "$::prefix/usr/bin/wget"))) {
+	my @printerlist = printer::cups::get_remote_queues();
+	foreach my $listentry (@printerlist) {
+	    next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
+	    my $queue = $1;
+	    my $server = $2;
+	    if (-x "$::prefix/usr/bin/wget") {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/wget", "-O",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$queue.ppd"));
+	    } else {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/curl", "-o",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$queue.ppd"));
+	    }
+	    if (-r "$::prefix/etc/foomatic/$queue.ppd") {
+		$configfilecontent = $suites{$suite}{make}($printer, $queue, $configprefix, $configfilecontent);
+	    }
+	}
+    }
+    # Update local printer queues
+    foreach my $queue (keys(%{$printer->{configured}})) {
+	# Check if we have a PPD file
+	if (! -r "$::prefix/etc/foomatic/$queue.ppd") {
+	    if (-r "$::prefix/etc/cups/ppd/$queue.ppd") {
+		# If we have a PPD file in the CUPS config dir, link to it
+		run_program::rooted($::prefix, 
+				    "ln", "-sf",
+				    "/etc/cups/ppd/$queue.ppd",
+				    "/etc/foomatic/$queue.ppd");
+	    } elsif (-r "$::prefix/usr/share/postscript/ppd/$queue.ppd") {
+		# Check PPD directory of GPR, too
+		run_program::rooted($::prefix, 
+				    "ln", "-sf",
+				    "/usr/share/postscript/ppd/$queue.ppd",
+				    "/etc/foomatic/$queue.ppd");
+	    } else {
+		# No PPD file at all? We cannot set up this printer
+		next;
+	    }
+	}
+	$configfilecontent = 
+	    $suites{$suite}{make}($printer, $queue, $configprefix,
+				       $configfilecontent);
+    }
+    # Patch PostScript output to print Euro symbol correctly also for
+    # the "Generic Printer"
+    my @parameters = $suites{$suite}{param};
+    $configfilecontent =printer::common::removeentry
+	(@parameters, $configfilecontent);
+    $configfilecontent =printer::common::addentry($parameters[0],$parameters[1] . $suites{$suite}{perl} . $printer::data::lprcommand{$printer->{SPOOLER}{print_command}}, $configfilecontent);
+    # Write back Star Office configuration file
+    return writesofficeconfigfile($configfilename, $configfilecontent);
+}
+
+sub add_cups_remote_to_office {
+    my ($suite, $printer, $queue) = @_;
+    # Do we have Star Office installed?
+    my $configfilename = find_config_file($suite);
+    return 1 if !$configfilename;
+    $configfilename =~ m!$suites{$suite}{file_name}!;
+    my $configprefix = $1;
+    # Load Star Office printer config file
+    my $configfilecontent = readsofficeconfigfile($configfilename);
+    # Update remote CUPS queues
+    if (($printer->{SPOOLER} eq "cups") && 
+	((-x "$::prefix/usr/bin/curl") || (-x "$::prefix/usr/bin/wget"))) {
+	my @printerlist = printer::cups::get_remote_queues();
+	foreach my $listentry (@printerlist) {
+	    next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
+	    my $q = $1;
+	    next if $q ne $queue;
+	    my $server = $2;
+	    # Remove server name from queue name
+	    $q =~ s/^([^@]*)@.*$/$1/;
+	    if (-x "$::prefix/usr/bin/wget") {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/wget", "-O",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$q.ppd"));
+	    } else {
+		eval(run_program::rooted
+		     ($::prefix, "/usr/bin/curl", "-o",
+		      "/etc/foomatic/$queue.ppd",
+		      "http://$server:631/printers/$q.ppd"));
+	    }
+	    # Does the file exist and is it not an error message?
+	    if ((-r "$::prefix/etc/foomatic/$queue.ppd") &&
+		(cat_("$::prefix/etc/foomatic/$queue.ppd") =~ 
+		 /^\*PPD-Adobe/)) {
+		$configfilecontent = 
+		    $suites{$suite}{make}($printer, $queue,
+					       $configprefix,
+					       $configfilecontent);
+	    } else {
+		unlink ("$::prefix/etc/foomatic/$queue.ppd");
+		return 0;
+	    }
+	    last if $suite eq 'Star Office';
+	}
+    }
+    # Write back Star Office configuration file
+    return writesofficeconfigfile($configfilename, $configfilecontent);
+}
+
+sub remove_printer_from_office {
+    my ($suite, $printer, $queue) = @_;
+    # Do we have Star Office installed?
+    my $configfilename = find_config_file($suite);
+    return 1 if !$configfilename;
+    $configfilename =~ m!$suites{$suite}{file_name}!;
+    my $configprefix = $1;
+    # Load Star Office printer config file
+    my $configfilecontent = readsofficeconfigfile($configfilename);
+    # Remove the printer entry
+    $configfilecontent = 
+	removestarofficeprinterentry($printer, $queue, $configprefix,
+				     $configfilecontent);
+    # Write back Star Office configuration file
+    return writesofficeconfigfile($configfilename, $configfilecontent);
+}
+
+sub remove_local_printers_from_office {
+    my ($suite, $printer) = @_;
+    # Do we have Star Office installed?
+    my $configfilename = find_config_file($suite);
+    return 1 if !$configfilename;
+    $configfilename =~ m!$suites{$suite}{file_name}!;
+    my $configprefix = $1;
+    # Load Star Office printer config file
+    my $configfilecontent = readsofficeconfigfile($configfilename);
+    # Remove the printer entries
+    foreach my $queue (keys(%{$printer->{configured}})) {
+	$configfilecontent = 
+	    removestarofficeprinterentry($printer, $queue, $configprefix,
+					 $configfilecontent);
+    }
+    # Write back Star Office configuration file
+    return writesofficeconfigfile($configfilename, $configfilecontent);
+}
+
+
+sub makestarofficeprinterentry {
+    my ($printer, $queue, $configprefix, $configfile) = @_;
+    # Set default printer
+    if ($queue eq $printer->{DEFAULT}) {
+	$configfile =printer::common::removeentry("windows", "device=", $configfile);
+	$configfile =printer::common::addentry("windows", 
+			       "device=$queue,$queue PostScript,$queue",
+			       $configfile);
+    }
+    # Make an entry in the "[devices]" section
+    $configfile =printer::common::removeentry("devices", "$queue=", $configfile);
+    $configfile =printer::common::addentry("devices", 
+			   "$queue=$queue PostScript,$queue",
+			   $configfile);
+    # Make an entry in the "[ports]" section
+    # The "perl" command patches the PostScript output to print the Euro
+    # symbol correctly.
+    $configfile =printer::common::removeentry("ports", "$queue=", $configfile);
+    $configfile =printer::common::addentry("ports", 
+			   "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
+			   $configfile);
+    # Make printer's section
+    $configfile = printer::common::addsection("$queue,PostScript,$queue", $configfile);
+    # Load PPD file
+    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
+    # Set the PostScript level
+    my $pslevel;
+    if ($ppd =~ /^\s*\*LanguageLevel:\s*\"?([^\s\"]+)\"?\s*$/m) {
+	$pslevel = $1;
+	$pslevel = "2" if $pslevel eq "3";
+    } else { $pslevel = "2" }
+    $configfile =printer::common::removeentry("$queue.PostScript.$queue",
+			      "Level=", $configfile);
+    $configfile =printer::common::addentry("$queue.PostScript.$queue", 
+			   "Level=$pslevel", $configfile);
+    # Set Color/BW
+    my $color = ($ppd =~ /^\s*\*ColorDevice:\s*\"?([Tt]rue)\"?\s*$/m) ? "1" : "0";
+    $configfile =printer::common::removeentry("$queue.PostScript.$queue", "BitmapColor=", $configfile);
+    $configfile =printer::common::addentry("$queue.PostScript.$queue", "BitmapColor=$color", $configfile);
+    # Set the default paper size
+    if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
+	my $papersize = $1;
+	$configfile =printer::common::removeentry("$queue.PostScript.$queue", "PageSize=", $configfile);
+	$configfile =printer::common::removeentry("$queue.PostScript.$queue", "PPD_PageSize=", $configfile);
+	$configfile =printer::common::addentry("$queue.PostScript.$queue", "PageSize=$papersize", $configfile);
+	$configfile =printer::common::addentry("$queue.PostScript.$queue", "PPD_PageSize=$papersize", $configfile);
+    }
+    # Link the PPD file
+    run_program::rooted($::prefix, 
+			"ln", "-sf", "/etc/foomatic/$queue.ppd", 
+			"$configprefix/share/xp3/ppds/$queue.PS");
+    return $configfile;
+}
+
+sub makeopenofficeprinterentry {
+    my ($printer, $queue, $configprefix, $configfile) = @_;
+    # Make printer's section
+    $configfile = printer::common::addsection($queue, $configfile);
+    # Load PPD file
+    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
+    # "PPD_PageSize" line
+    if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
+	my $papersize = $1;
+	$configfile = printer::common::removeentry($queue,
+				  "PPD_PageSize=", $configfile);
+	$configfile = printer::common::addentry($queue, 
+			       "PPD_PageSize=$papersize", $configfile);
+    }
+    # "Command" line
+    # The "perl" command patches the PostScript output to print the Euro
+    # symbol correctly.
+    $configfile = printer::common::removeentry($queue, "Command=", $configfile);
+    $configfile = printer::common::addentry($queue, 
+			   "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$printer::data::lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
+			   $configfile);
+    # "Comment" line 
+    $configfile = printer::common::removeentry($queue, "Comment=", $configfile);
+    if (($printer->{configured}{$queue}) &&
+	($printer->{configured}{$queue}{queuedata}{desc})) {
+	$configfile =printer::common::addentry
+	    ($queue, 
+	     "Comment=$printer->{configured}{$queue}{queuedata}{desc}",
+	     $configfile);
+    } else {
+	$configfile = printer::common::addentry($queue, 
+			       "Comment=",
+			       $configfile);
+    }
+    # "Location" line 
+    $configfile = printer::common::removeentry($queue, "Location=", $configfile);
+    if (($printer->{configured}{$queue}) &&
+	($printer->{configured}{$queue}{queuedata}{loc})) {
+	$configfile = printer::common::addentry
+	    ($queue, 
+	     "Location=$printer->{configured}{$queue}{queuedata}{loc}",
+	     $configfile);
+    } else {
+	$configfile = printer::common::addentry($queue, "Location=", $configfile);
+    }
+    # "DefaultPrinter" line
+    $configfile = printer::common::removeentry($queue, "DefaultPrinter=", $configfile);
+    my $default = "0";
+    if ($queue eq $printer->{DEFAULT}) {
+	$default = "1";
+	# "DefaultPrinter=0" for the "Generic Printer"
+	$configfile = printer::common::removeentry("Generic Printer", "DefaultPrinter=",
+				  $configfile);
+	$configfile = printer::common::addentry("Generic Printer", 
+			       "DefaultPrinter=0",
+			       $configfile);	
+    }
+    $configfile = printer::common::addentry($queue, "DefaultPrinter=$default", $configfile);
+    # "Printer" line 
+    $configfile = printer::common::removeentry($queue, "Printer=", $configfile);
+    $configfile = printer::common::addentry($queue, "Printer=$queue/$queue", $configfile);
+    # Link the PPD file
+    run_program::rooted($::prefix, 
+			"ln", "-sf", "/etc/foomatic/$queue.ppd", 
+			"$configprefix/share/psprint/driver/$queue.PS");
+    return $configfile;
+}
+
+sub removestarofficeprinterentry {
+    my ($printer, $queue, $configprefix, $configfile) = @_;
+    # Remove default printer entry
+    $configfile = printer::common::removeentry("windows", "device=$queue,", $configfile);
+    # Remove entry in the "[devices]" section
+    $configfile = printer::common::removeentry("devices", "$queue=", $configfile);
+    # Remove entry in the "[ports]" section
+    $configfile = printer::common::removeentry("ports", "$queue=", $configfile);
+    # Remove "[$queue,PostScript,$queue]" section
+    $configfile = printer::common::removesection("$queue,PostScript,$queue", $configfile);
+    # Remove Link of PPD file
+    run_program::rooted($::prefix, 
+			"rm", "-f", 
+			"$configprefix/share/xp3/ppds/$queue.PS");
+    return $configfile;
+}
+
+sub removeopenofficeprinterentry {
+    my ($printer, $queue, $configprefix, $configfile) = @_;
+    # Remove printer's section
+    $configfile = printer::common::removesection($queue, $configfile);
+    # Remove Link of PPD file
+    run_program::rooted($::prefix, 
+			"rm", "-f", 
+			"$configprefix/share/psprint/driver/$queue.PS");
+    return $configfile;
+}
+
+sub find_config_file {
+    my ($suite) = @_;
+    my @configfilenames = $suites{$suite}{files};
+    foreach my $configfilename (@configfilenames) {
+	local *F;
+	if (open F, "ls -r $::prefix$configfilename 2> /dev/null |") {
+	    my $filename = <F>;
+	    close F;
+	    if ($filename) {
+		if ($::prefix ne "") {
+		    $filename =~ s/^$::prefix//;
+		}
+		# Work around a bug in the "ls" of "busybox". During
+		# installation it outputs the mask given on the command line
+		# instead of nothing when the mask does not match any file
+		next if $filename =~ /\*/;
+		return $filename;
+	    }
+	}
+    }
+    return "";
+}
+
+sub readsofficeconfigfile {
+    my ($file) = @_;
+    local *F; 
+    open F, "< $::prefix$file" or return "";
+    my $filecontent = join("", <F>);
+    close F;
+    return $filecontent;
+}
+
+sub writesofficeconfigfile {
+    my ($file, $filecontent) = @_;
+    local *F; 
+    open F, "> $::prefix$file" or return 0;
+    print F $filecontent;
+    close F;
+    return 1;
+}
+
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
new file mode 100644
index 000000000..57e57fe28
--- /dev/null
+++ b/perl-install/printer/printerdrake.pm
@@ -0,0 +1,3608 @@
+package printer::printerdrake;
+# $Id$
+
+
+
+
+use common;
+use detect_devices;
+use modules;
+use network;
+use log;
+use printer::main;
+use printer::services;
+use printer::detect;
+use printer::default;
+
+1;
+
+sub choose_printer_type {
+    my ($printer, $in) = @_;
+    $in->set_help('configurePrinterConnected') if $::isInstall;
+    my $queue = $printer->{OLD_QUEUE};
+    $printer->{str_type} = $printer::printer_type_inv{$printer->{TYPE}};
+    my $autodetect = 0;
+    $autodetect = 1 if $printer->{AUTODETECT};
+    my @printertypes = printer::main::printer_type($printer);
+    $in->ask_from_(
+		   { title => N("Select Printer Connection"),
+		     messages => N("How is the printer connected?") .
+			 ($printer->{SPOOLER} eq "cups" ?
+			  N("
+Printers on remote CUPS servers you do not have to configure here; these printers will be automatically detected.") : ())
+		     },
+		   [
+		    { val => \$printer->{str_type},
+		      list => \@printertypes, 
+		      not_edit => 1, sort => 0,
+		      type => 'list' },
+		    { text => N("Printer auto-detection (Local, TCP/Socket, and SMB printers)"),
+		      type => 'bool', val => \$autodetect }
+		    ]
+		   ) or return 0;
+    if ($autodetect) {
+	$printer->{AUTODETECT} = 1;
+    } else {
+	undef $printer->{AUTODETECT};
+    }
+    $printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
+    1;
+}
+
+sub config_cups {
+    my ($printer, $in, $upNetwork) = @_;
+
+    local $::isWizard = 0;
+    # Check whether the network functionality is configured and
+    # running
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+
+    $in->set_help('configureRemoteCUPSServer') if $::isInstall;
+    my $queue = $printer->{OLD_QUEUE};
+    #- hack to handle cups remote server printing,
+    #- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
+    my ($server, $port, $default, $autoconf);
+    # Return value: 0 when nothing was changed ("Apply" never pressed), 1
+    # when "Apply" was at least pressed once.
+    my $retvalue = 0;
+    # Read CUPS config file
+    my @cupsd_conf = printer::main::read_cupsd_conf();
+    foreach (@cupsd_conf) {
+	/^\s*BrowsePoll\s+(\S+)/ and $server = $1, last;
+    }
+    $server =~ /([^:]*):(.*)/ and ($server, $port) = ($1, $2);
+    #- Did we have automatic or manual configuration mode for CUPS
+    $autoconf = printer::main::get_cups_autoconf();
+    #- Remember the server/port/autoconf settings to check whether the user
+    #- has changed them.
+    my $oldserver = $server;
+    my $oldport = $port;
+    my $oldautoconf = $autoconf;
+    
+    #- then ask user for this combination and rewrite /etc/cups/cupsd.conf
+    #- according to new settings. There are no other point where such
+    #- information is written in this file.
+    
+    if ($in->ask_from_
+	({ title => ($::expert ? N("CUPS configuration") :
+		     N("Specify CUPS server")),
+	   messages => N("To get access to printers on remote CUPS servers in your local network you do not have to configure anything; the CUPS servers inform your machine automatically about their printers. All printers currently known to your machine are listed in the \"Remote printers\" section in the main window of Printerdrake. When your CUPS server is not in your local network, you have to enter the CUPS server IP address and optionally the port number to get the printer information from the server, otherwise leave these fields blank.") .
+	       ($::expert ? "\n" . N("
+Normally, CUPS is automatically configured according to your network environment, so that you can access the printers on the CUPS servers in your local network. If this does not work correctly, turn off \"Automatic CUPS configuration\" and edit your file /etc/cups/cupsd.conf manually. Do not forget to restart CUPS afterwards (command: \"service cups restart\").") : ()),
+	   callbacks => { complete => sub {
+	       if ($server && !network::is_ip($server)) {
+		   $in->ask_warn('', N("The IP address should look like 192.168.1.20"));
+		   return (1,0);
+	       }
+	       if ($port !~ /^\d*$/) {
+		   $in->ask_warn('', N("The port number should be an integer!"));
+		   return (1,1);
+	       }
+	       return 0;
+	   } }
+       },
+	 [	
+		{ label => N("CUPS server IP"), val => \$server },
+		{ label => N("Port"), val => \$port },
+		($::expert ?
+		 { text => N("Automatic CUPS configuration"), type => 'bool',
+		   val => \$autoconf } : ()),
+	 ]
+	 )) {
+	# We have clicked "OK"
+	$retvalue = 1;
+	# Set BrowsePoll line
+	if (($server ne $oldserver) || ($port ne $oldport)) {
+	    $server && $port and $server = "$server:$port";
+	    if ($server) {
+		@cupsd_conf = 
+		    map { $server and 
+			      s/^\s*BrowsePoll\s+(\S+)/BrowsePoll $server/ and
+			      $server = '';
+			  $_ } @cupsd_conf;
+		$server and push @cupsd_conf, "\nBrowsePoll $server\n";
+	    } else {
+		@cupsd_conf = 
+		    map { s/^\s*BrowsePoll\s+(\S+)/\#BrowsePoll $1/;
+			  $_ } @cupsd_conf;
+	    }
+	    printer::main::write_cupsd_conf(@cupsd_conf);
+	}
+	# Set auto-configuration state
+	if ($autoconf != $oldautoconf) {
+	    printer::main::set_cups_autoconf($autoconf);
+	}
+	# Save user settings for auto-install
+	$printer->{BROWSEPOLLADDR} = $server;
+	$printer->{BROWSEPOLLPORT} = $port;
+	$printer->{MANUALCUPSCONFIG} = 1 - $autoconf;
+    }
+    return $retvalue;
+}
+
+sub setup_printer_connection {
+    my ($printer, $in, $upNetwork) = @_;
+    # Choose the appropriate connection config dialog
+    my $done = 1;
+    foreach ($printer->{TYPE}) {
+	/LOCAL/    and setup_local_autoscan ($printer, $in, $upNetwork) and last;
+	/LPD/      and setup_lpd      ($printer, $in, $upNetwork) and last;
+	/SOCKET/   and setup_socket   ($printer, $in, $upNetwork) and last;
+	/SMB/      and setup_smb      ($printer, $in, $upNetwork) and last;
+	/NCP/      and setup_ncp      ($printer, $in, $upNetwork) and last;
+	/URI/      and setup_uri      ($printer, $in, $upNetwork) and last;
+	/POSTPIPE/ and setup_postpipe ($printer, $in) and last;
+	$done = 0; last;
+    }
+    return $done;
+}
+
+sub first_time_dialog {
+    my ($printer, $in, $upNetwork) = @_;
+    return 1 if printer::default::get_spooler () or $::isInstall;
+
+    # Wait message
+    my $w = $in->wait_message(N("Printerdrake"), 
+			      N("Checking your system..."));
+
+    # Auto-detect local printers
+    my @autodetected = printer::detect::local_detect();
+    my @printerlist;
+    my $localprinterspresent;
+    if (@autodetected == ()) {
+	$localprinterspresent = 0;
+	push (@printerlist, N("There are no printers found which are directly connected to your machine"));
+    } else {
+	$localprinterspresent = 1;
+	foreach my $printer (@autodetected) {
+	    my $entry = $printer->{val}{DESCRIPTION};
+	    if ($entry) { push (@printerlist, "  -  $entry\n") }
+	}
+	my $morethanoneprinters = ($#printerlist > 0);
+	my $unknown_printers = $#autodetected - $#printerlist;
+	if (@printerlist != ()) {
+	    unshift (@printerlist, 
+		     ($morethanoneprinters ?
+		      N("The following printers\n\n") :
+		      N("The following printer\n\n")));
+	    if ($unknown_printers == 1) {
+		push (@printerlist, N("\nand one unknown printer are "));
+	    } elsif ($unknown_printers > 1) {
+		push (@printerlist, N("\nand %d unknown printers are ",
+				      $unknown_printers));
+	    } else {
+		push (@printerlist, ($morethanoneprinters ? 
+				     N("\nare ") :
+				     N("\nis ")));
+	    }
+	    push (@printerlist, N("directly connected to your system"));
+	} else {
+	    if ($unknown_printers == 1) {
+		push (@printerlist, N("\nThere is one unknown printer directly connected to your system"));
+	    } elsif ($unknown_printers > 1) {
+		push (@printerlist, N("\nThere are %d unknown printers directly connected to your system",
+				      $unknown_printers));
+	    }
+	}
+    }
+    push (@printerlist,
+	  N(" (Make sure that all your printers are connected and turned on).\n"));
+    my $localprinters = join('', @printerlist);
+
+    # Do we have a local network?
+
+    # If networking is configured, start it, but don't ask the user to
+    # configure networking.
+    my $havelocalnetworks = 
+	 (check_network($printer, $in, $upNetwork, 1) && 
+	  (printer::detect::getIPsInLocalNetworks() != ()));
+
+    # Finish building the dialog text
+    my $question = ($havelocalnetworks ?
+		    ($localprinterspresent ?
+		     N("Do you want to enable printing on the printers mentioned above or on printers in the local network?\n") :
+		     N("Do you want to enable printing on printers in the local network?\n")) :
+		    ($localprinterspresent ?
+		     N("Do you want to enable printing on the printers mentioned above?\n") :
+		     N("Are you sure that you want to set up printing on this machine?\n")));
+    my $warning = N("NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed.", 80);
+    my $dialogtext = "$localprinters\n$question\n$warning";
+
+    # Close wait message
+    undef $w;
+
+    # Show dialog
+    $in->ask_yesorno(N("Printerdrake"), $dialogtext, 0);
+}
+
+sub wizard_welcome {
+    my ($printer, $in, $upNetwork) = @_;
+    my $ret;
+    my $autodetectlocal = 0;
+    my $autodetectnetwork = 0;
+    my $autodetectsmb = 0;
+    # If networking is configured, start it, but don't ask the user to
+    # configure networking.
+    my $havelocalnetworks;
+    if ($::expert) {
+	$havelocalnetworks = 0;
+	undef $printer->{AUTODETECTNETWORK};
+	undef $printer->{AUTODETECTSMB};
+    } else {
+	$havelocalnetworks = ((check_network($printer, $in, $upNetwork, 1)) &&
+			      (printer::detect::getIPsInLocalNetworks() != ()));
+	if (!$havelocalnetworks) {
+	    undef $printer->{AUTODETECTNETWORK};
+	    undef $printer->{AUTODETECTSMB};
+	}
+	$autodetectlocal = 1 if $printer->{AUTODETECTLOCAL};
+	$autodetectnetwork = 1 if $printer->{AUTODETECTNETWORK};
+	$autodetectsmb = 1 if $printer->{AUTODETECTSMB};
+    }
+    if ($in) {
+	eval {
+	    if ($::expert) {
+		if ($::isWizard) {
+		    $ret = $in->ask_okcancel
+			(N("Add a new printer"),
+			 N("
+Welcome to the Printer Setup Wizard
+
+This wizard allows you to install local or remote printers to be used from this machine and also from other machines in the network.
+
+It asks you for all necessary information to set up the printer and gives you access to all available printer drivers, driver options, and printer connection types."));
+		} else {
+		    $ret = 1;
+		}
+	    } else {
+		$ret = $in->ask_from_
+		    ({title => N("Add a new printer"),
+		      messages => ($printer->{SPOOLER} ne "pdq" ? 
+				   ($havelocalnetworks ? N("
+Welcome to the Printer Setup Wizard
+
+This wizard will help you to install your printer(s) connected to this computer, connected directly to the network or to a remote Windows machine.
+
+If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) and you Windows machines must be connected and turned on.
+
+Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it.
+
+ Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : N("
+Welcome to the Printer Setup Wizard
+
+This wizard will help you to install your printer(s) connected to this computer.
+
+If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.
+
+ Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.")) : 
+				   ($havelocalnetworks ? N("
+Welcome to the Printer Setup Wizard
+
+This wizard will help you to install your printer(s) connected to this computer or connected directly to the network.
+
+If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.
+
+Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it.
+
+ Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : N("
+Welcome to the Printer Setup Wizard
+
+This wizard will help you to install your printer(s) connected to this computer.
+
+If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.
+
+ Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now."))) },
+		     [
+		      { text => N("Auto-detect printers connected to this machine"), type => 'bool',
+			val => \$autodetectlocal },
+		      ($havelocalnetworks ?
+		       ({ text => N("Auto-detect printers connected directly to the local network"), type => 'bool',
+			  val => \$autodetectnetwork },
+			($printer->{SPOOLER} ne "pdq" ?
+			 { text => N("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool',
+			   val => \$autodetectsmb } : ())) : ())
+		      ]);
+		$printer->{AUTODETECTLOCAL} = $autodetectlocal ? 1 : undef;
+		$printer->{AUTODETECTNETWORK} = $autodetectnetwork ? 1 : undef;
+		$printer->{AUTODETECTSMB} = ($autodetectsmb && ($printer->{SPOOLER} ne "pdq")) ? 1 : undef;
+	    }
+	};
+	return ($@ =~ /wizcancel/) ? 0 : $ret;
+    }
+}
+
+sub wizard_congratulations {
+    my ($in) = @_;
+    if ($in) {
+	$in->ask_okcancel(N("Add a new printer"),
+			  N("
+Congratulations, your printer is now installed and configured!
+
+You can print using the \"Print\" command of your application (usually in the \"File\" menu).
+
+If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the Mandrake Control Center."))
+    }
+}
+
+sub setup_local_autoscan {
+    my ($printer, $in, $upNetwork) = @_;
+    my (@port, @str, $device);
+    my $queue = $printer->{OLD_QUEUE};
+    my $expert_or_modify = ($::expert || !$printer->{NEW});
+    my $do_auto_detect = 
+	(($expert_or_modify &&
+	  $printer->{AUTODETECT}) ||
+	 (!$expert_or_modify &&
+	  ($printer->{AUTODETECTLOCAL} ||
+	   $printer->{AUTODETECTNETWORK} ||
+	   $printer->{AUTODETECTSMB})));
+
+    # If the user requested auto-detection of remote printers, check
+    # whether the network functionality is configured and running
+    if ($printer->{AUTODETECTNETWORK} || $printer->{AUTODETECTSMB}) {
+	return 0 unless check_network($printer, $in, $upNetwork, 0);
+    }
+
+    my @autodetected;
+    my $menuentries = {};
+    $in->set_help('setupLocal') if $::isInstall;
+    if ($do_auto_detect) {
+	if ((!$::testing) &&
+	    (!$expert_or_modify) && ($printer->{AUTODETECTSMB}) &&
+	    (!files_exist((qw(/usr/bin/smbclient))))) {
+	    $in->do_pkgs->install('samba-client');
+	}
+	my $w = $in->wait_message(N("Printer auto-detection"), N("Detecting devices..."));
+	# When HPOJ is running, it blocks the printer ports on which it is
+	# configured, so we stop it here. If it is not installed or not 
+	# configured, this command has no effect.
+	require services;
+	services::stop("hpoj");
+	@autodetected = ($expert_or_modify || $printer->{AUTODETECTLOCAL})    and printer::detect::local_detect(),
+				 (!$expert_or_modify && $printer->{AUTODETECTNETWORK}) and printer::detect::net_detect(),
+				 (!$expert_or_modify && $printer->{AUTODETECTSMB})     and printer::detect::net_smb_detect();
+	# We have more than one printer, so we must ask the user for a queue
+	# name in the fully automatic printer configuration.
+	$printer->{MORETHANONE} = ($#autodetected > 0);
+	foreach my $p (@autodetected) {
+	    if ($p->{val}{DESCRIPTION}) {
+		my $menustr = $p->{val}{DESCRIPTION};
+		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
+		    $menustr .= N(" on parallel port \#%s", $1);
+		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
+		    $menustr .= N(", USB printer \#%s", $1);
+		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
+		    $menustr .= N(", network printer \"%s\", port %s", $1, $2);
+		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
+		    $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $2, $1);
+		}
+		if ($::expert) {
+		    $menustr .= " ($p->{port})";
+		}
+		$menuentries->{$menustr} = $p->{port};
+		push @str, N("Detected %s", $menustr);
+	    } else {
+		my $menustr;
+		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
+		    $menustr = N("Printer on parallel port \#%s", $1);
+		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
+		    $menustr = N("USB printer \#%s", $1);
+		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
+		    $menustr .= N("Network printer \"%s\", port %s", $1, $2);
+		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
+		    $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $2, $1);
+		}
+		if ($::expert) {
+		    $menustr .= " ($p->{port})";
+		}
+		$menuentries->{$menustr} = $p->{port};
+	    }
+	}
+	if ($::expert) {
+	    @port = detect_devices::whatPrinterPort();
+	    foreach my $q (@port) {
+		if (@str) {
+		    my $alreadyfound = 0;
+		    foreach my $p (@autodetected) {
+			if ($p->{port} eq $q) {
+			    $alreadyfound = 1;
+			    last;
+			}
+		    }
+		    if ($alreadyfound) {
+			next;
+		    }
+		}
+		my $menustr;
+		if ($q =~ m!^/dev/lp(\d+)$!) {
+		    $menustr = N("Printer on parallel port \#%s", $1);
+		} elsif ($q =~ m!^/dev/usb/lp(\d+)$!) {
+		    $menustr = N("USB printer \#%s", $1);
+		}
+		if ($::expert) {
+		    $menustr .= " ($q)";
+		}
+		$menuentries->{$menustr} = $q;
+	    }
+	}
+	# We are ready with auto-detection, so we restart HPOJ here. If it 
+	# is not installed or not configured, this command has no effect.
+	printer::services::start("hpoj");
+    } else {
+	# Always ask for queue name in recommended mode when no auto-
+	# detection was done
+	$printer->{MORETHANONE} = ($#autodetected > 0);
+	my $m;
+	for ($m = 0; $m <= 2; $m++) {
+	    my $menustr = N("Printer on parallel port \#%s", $m);
+	    if ($::expert) {
+		$menustr .= " (/dev/lp$m)";
+	    }
+	    $menuentries->{$menustr} = "/dev/lp$m";
+	    $menustr = N("USB printer \#%s", $m);
+	    if ($::expert) {
+		$menustr .= " (/dev/usb/lp$m)";
+	    }
+	    $menuentries->{$menustr} = "/dev/usb/lp$m";
+	}
+    }
+    my @menuentrieslist = sort { 
+	my @prefixes = ("/dev/lp", "/dev/usb/lp", "/dev/", "socket:", "smb:");
+	my $first = $menuentries->{$a};
+	my $second = $menuentries->{$b};
+	for (my $i = 0; $i <= $#prefixes; $i++) {
+	    my $firstinlist = ($first =~ m!^$prefixes[$i]!);
+	    my $secondinlist = ($second =~ m!^$prefixes[$i]!);
+	    if (($firstinlist) && (!$secondinlist)) { return -1 };
+	    if (($secondinlist) && (!$firstinlist)) { return 1 };
+	}
+	return $first cmp $second;
+    } keys(%{$menuentries});
+    my $menuchoice = "";
+    my $oldmenuchoice = "";
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m/^file:/)) {
+	# Non-HP or HP print-only device (HPOJ not used)
+	$device = $printer->{currentqueue}{connect};
+	$device =~ s/^file://;
+	foreach my $p (keys %{$menuentries}) {
+	    if ($device eq $menuentries->{$p}) {
+		$menuchoice = $p;
+		last;
+	    }
+	}
+    } elsif (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m!^ptal:/mlc:!)) {
+	# HP multi-function device (controlled by HPOJ)
+	my $ptaldevice = $printer->{currentqueue}{connect};
+	$ptaldevice =~ s!^ptal:/mlc:!!;
+	if ($ptaldevice =~ /^par:(\d+)$/) {
+	    $device = "/dev/lp$1";
+	    foreach my $p (keys %{$menuentries}) {
+		if ($device eq $menuentries->{$p}) {
+		    $menuchoice = $p;
+		    last;
+		}
+	    }
+	} else {
+	    my $make = lc($printer->{currentqueue}{make});
+	    my $model = lc($printer->{currentqueue}{model});
+	    $device = "";
+	    foreach my $p (keys %{$menuentries}) {
+		my $menumakemodel = lc($p);
+		if (($menumakemodel =~ /$make/) && 
+		    ($menumakemodel =~ /$model/)) {
+		    $menuchoice = $p;
+		    $device = $menuentries->{$p};
+		    last;
+		}
+	    }
+	}
+    } elsif (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m!^(socket|smb):/!)) {
+	# Ethernet-(TCP/Socket)-connected printer or printer on Windows server
+	$device = $printer->{currentqueue}{connect};
+	foreach my $p (keys %{$menuentries}) {
+	    if ($device eq $menuentries->{$p}) {
+		$menuchoice = $p;
+		last;
+	    }
+	}
+    } else { $device = "" }
+    if (($menuchoice eq "") && (@menuentrieslist > -1)) {
+	$menuchoice = $menuentrieslist[0];
+	$oldmenuchoice = $menuchoice;
+	$device = $menuentries->{$menuchoice} if $device eq "";
+    }
+    if ($in) {
+	$::expert or $in->set_help('configurePrinterDev') if $::isInstall;
+	if ($#menuentrieslist < 0) { # No menu entry
+	    # auto-detection has failed, we must do all manually
+	    $do_auto_detect = 0;
+	    $printer->{MANUAL} = 1;
+	    if ($::expert) {
+		$device = $in->ask_from_entry
+		    (N("Local Printer"),
+		     N("No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."),
+		     { 
+			 complete => sub {
+			     unless ($menuchoice ne "") {
+				 $in->ask_warn('', N("You must enter a device or file name!"));
+				 return (1,0);
+			     }
+			     return 0;
+			 }
+		     });
+		if ($device eq "") {
+		    return 0;
+		}
+	    } else {
+		$in->ask_warn(N("Printer auto-detection"),
+			      N("No printer found!"));
+		return 0;
+	    }
+	} else {
+	    my $manualconf = 0;
+	    $manualconf = 1 if $printer->{MANUAL} || !$do_auto_detect;
+	    if (!$in->ask_from_
+		(
+		 { title => ($expert_or_modify ?
+			     N("Local Printer") :
+			     N("Available printers")),
+		   messages => (($do_auto_detect ?
+				 ($::expert ?
+				  (($#menuentrieslist == 0) ?
+				   N("The following printer was auto-detected, if it is not the one you want to configure, enter a device name/file name in the input line") :
+				   N("Here is a list of all auto-detected printers. Please choose the printer you want to set up or enter a device name/file name in the input line")) :
+				  (($#menuentrieslist == 0) ?
+				   N("The following printer was auto-detected. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") :
+				   N("Here is a list of all auto-detected printers. Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"."))) :
+				 ($::expert ?
+				  N("Please choose the port where your printer is connected to or enter a device name/file name in the input line") :
+				  N("Please choose the port where your printer is connected to."))) .
+				($::expert ?
+				 N(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...).") :
+				 ())), 
+				 callbacks => {
+				     complete => sub {
+					 unless ($menuchoice ne "") {
+					     $in->ask_warn('', N("You must choose/enter a printer/device!"));
+					     return (1,0);
+					 }
+					 return 0;
+				     },
+				     changed => sub {
+					 if ($oldmenuchoice ne $menuchoice) {
+					     $device = $menuentries->{$menuchoice};
+					     $oldmenuchoice = $menuchoice;
+					 }
+					 return 0;
+				     }
+				 } },
+		 [
+		  ($::expert ? 
+		   { val => \$device } : ()),
+		  { val => \$menuchoice, list => \@menuentrieslist, 
+		    not_edit => !$::expert, format => \&translate, sort => 0,
+		    allow_empty_list => 1, type => 'list' },
+		  (((!$::expert) && ($do_auto_detect) && ($printer->{NEW})) ? 
+		   { text => N("Manual configuration"), type => 'bool',
+		     val => \$manualconf } : ()),
+		  ]
+		 )) {
+		return 0;
+	    }
+	    if ($device ne $menuentries->{$menuchoice}) {
+		$menuchoice = "";
+		$do_auto_detect = 0;
+	    }
+	    if ($manualconf) {
+		$printer->{MANUAL} = 1;
+	    } else {
+		undef $printer->{MANUAL};
+	    }
+	}
+    }
+
+    #- LPD and LPRng need netcat ('nc') to access to socket printers
+    if ((($printer->{SPOOLER} eq 'lpd') || ($printer->{SPOOLER} eq 'lprng')) &&
+        (!$::testing) && ($device =~ /^socket:/) &&
+        (!files_exist((qw(/usr/bin/nc))))) {
+        $in->do_pkgs->install('nc');
+    }
+
+    # Do configuration of multi-function devices and look up model name
+    # in the printer database
+    setup_common ($printer, $in, $menuchoice, $device, $do_auto_detect,
+		  @autodetected);
+
+    1;
+}
+
+sub setup_lpd {
+    my ($printer, $in, $upNetwork) = @_;
+
+    # Check whether the network functionality is configured and
+    # running
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+
+    $in->set_help('setupLPD') if $::isInstall;
+    my ($uri, $remotehost, $remotequeue);
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m/^lpd:/)) {
+	$uri = $printer->{currentqueue}{connect};
+	$uri =~ m!^\s*lpd://([^/]+)/([^/]+)/?\s*$!;
+	$remotehost = $1;
+	$remotequeue = $2;
+    } else {
+	$remotehost = "";
+	$remotequeue = "lp";
+    }
+
+    return if !$in->ask_from(N("Remote lpd Printer Options"),
+N("To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."), [
+{ label => N("Remote host name"), val => \$remotehost },
+{ label => N("Remote printer name"), val => \$remotequeue } ],
+complete => sub {
+    unless ($remotehost ne "") {
+	$in->ask_warn('', N("Remote host name missing!"));
+	return (1,0);
+    }
+    unless ($remotequeue ne "") {
+	$in->ask_warn('', N("Remote printer name missing!"));
+	return (1,1);
+    }
+    return 0;
+}
+			      );
+    #- make the DeviceURI from user input.
+    $printer->{currentqueue}{connect} = 
+        "lpd://$remotehost/$remotequeue";
+
+    #- LPD does not support filtered queues to a remote LPD server by itself
+    #- It needs an additional program as "rlpr"
+    if (($printer->{SPOOLER} eq 'lpd') && (!$::testing) &&
+        (!files_exist((qw(/usr/bin/rlpr))))) {
+        $in->do_pkgs->install('rlpr');
+    }
+
+    # Auto-detect printer model (works if host is an ethernet-connected
+    # printer)
+    my $modelinfo = printer::detect::getSNMPModel ($remotehost);
+    my $auto_hpoj;
+    if ((defined($modelinfo)) &&
+	($modelinfo->{MANUFACTURER} ne "") &&
+	($modelinfo->{MODEL} ne "")) {
+        $in->ask_warn('', N("Detected model: %s %s",
+                            $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL}));
+        $auto_hpoj = 1;
+    } else {
+	$auto_hpoj = 0;
+    }
+
+    # Do configuration of multi-function devices and look up model name
+    # in the printer database
+    setup_common ($printer, $in,
+		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
+		  $printer->{currentqueue}{connect}, $auto_hpoj,
+                  ({port => $printer->{currentqueue}{connect},
+                    val => $modelinfo}));
+
+    1;
+}
+
+sub setup_smb {
+    my ($printer, $in, $upNetwork) = @_;
+
+    # Check whether the network functionality is configured and
+    # running
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+
+    $in->set_help('setupSMB') if $::isInstall;
+    my ($uri, $smbuser, $smbpassword, $workgroup, $smbserver, $smbserverip, $smbshare);
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m/^smb:/)) {
+	$uri = $printer->{currentqueue}{connect};
+	$uri =~ m!^\s*smb://(.*)$!;
+	my $parameters = $1;
+	# Get the user's login and password from the URI
+	if ($parameters =~ m!([^@]*)@([^@]+)!) {
+	    my $login = $1;
+	    $parameters = $2;
+	    if ($login =~ m!([^:]*):([^:]*)!) {
+		$smbuser = $1;
+		$smbpassword = $2;
+	    } else {
+		$smbuser = $login;
+		$smbpassword = "";
+	    }
+	} else {
+	    $smbuser = "";
+	    $smbpassword = "";
+	}
+	# Get the workgroup, server, and share name
+	if ($parameters =~ m!([^/]*)/([^/]+)/([^/]+)$!) {
+	    $workgroup = $1;
+	    $smbserver = $2;
+	    $smbshare = $3;
+	} elsif ($parameters =~ m!([^/]+)/([^/]+)$!) {
+	    $workgroup = "";
+	    $smbserver = $1;
+	    $smbshare = $2;
+	} else {
+	    die "The \"smb://\" URI must at least contain the server name and the share name!\n";
+	}
+	if (network::is_ip($smbserver)) {
+	    $smbserverip = $smbserver;
+	    $smbserver = "";
+	}
+    }
+
+    my $autodetect = 0;
+    my @autodetected;
+    my $menuentries;
+    my @menuentrieslist;
+    my $menuchoice = "";
+    my $oldmenuchoice = "";
+    if ($printer->{AUTODETECT}) {
+	$autodetect = 1;
+	if ((!$::testing) &&
+	    (!files_exist((qw(/usr/bin/smbclient))))) {
+	    $in->do_pkgs->install('samba-client');
+	}
+	my $w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
+	@autodetected = printer::detect::net_smb_detect();
+	foreach my $p (@autodetected) {
+	    my $menustr;
+	    $p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!;
+	    my $server = $1;
+	    my $share = $2;
+	    if ($p->{val}{DESCRIPTION}) {
+		$menustr = $p->{val}{DESCRIPTION};
+		$menustr .= N(", printer \"%s\" on server \"%s\"",
+			      $share, $server);
+	    } else {
+		$menustr = N("Printer \"%s\" on server \"%s\"",
+			     $share, $server);
+	    }
+	    $menuentries->{$menustr} = $p->{port};
+	    if (($server eq $smbserver) &&
+		($share eq $smbshare)) {
+		$menuchoice = $menustr;
+	    }
+	}
+	@menuentrieslist = sort {
+	    $menuentries->{$a} cmp $menuentries->{$b};
+	} keys(%{$menuentries});
+	if (($printer->{configured}{$queue}) &&
+	    ($printer->{currentqueue}{connect} =~ m/^smb:/) &&
+	    ($menuchoice eq "")) {
+	    my $menustr;
+	    if ($printer->{currentqueue}{make}) {
+		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
+		$menustr .= N(", printer \"%s\" on server \"%s\"",
+			      $smbshare, $smbserver);
+	    } else {
+		$menustr = N("Printer \"%s\" on server \"%s\"",
+			     $smbshare, $smbserver);
+	    }
+	    $menuentries->{$menustr} = "smb://$smbserver/$smbshare";
+	    unshift(@menuentrieslist, $menustr);
+	    $menuchoice = $menustr;
+	}
+	if ($#menuentrieslist < 0) {
+	    $autodetect = 0;
+	} elsif ($menuchoice eq "") {
+	    $menuchoice = $menuentrieslist[0];
+	    $menuentries->{$menuentrieslist[0]} =~
+		m!^smb://([^/:]+)/([^/:]+)$!;
+	    $smbserver = $1;
+	    $smbshare = $2;
+	}
+	$oldmenuchoice = $menuchoice;
+    }
+
+    return 0 if !$in->ask_from
+	(N("SMB (Windows 9x/NT) Printer Options"),
+	 N("To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information.") .
+	 ($autodetect ? N(" If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed.") : ""),
+	 [{ label => N("SMB server host"), val => \$smbserver },
+	  { label => N("SMB server IP"), val => \$smbserverip },
+	  { label => N("Share name"), val => \$smbshare },
+	  { label => N("User name"), val => \$smbuser },
+	  { label => N("Password"), val => \$smbpassword, hidden => 1 },
+	  { label => N("Workgroup"), val => \$workgroup },
+	  ($autodetect ?
+	   { label => N("Auto-detected"),
+	     val => \$menuchoice, list => \@menuentrieslist, 
+	     not_edit => 1, format => \&translate, sort => 0,
+	     allow_empty_list => 1, type => 'combo' } :
+	     ()) ],
+	 complete => sub {
+	     if (!network::is_ip($smbserverip) && $smbserverip ne "") {
+		 $in->ask_warn('', N("IP address should be in format 1.2.3.4"));
+		 return (1,1);
+	     }
+	     if ($smbserver eq "" && $smbserverip eq "") {
+		 $in->ask_warn('', N("Either the server name or the server's IP must be given!"));
+		 return (1,0);
+	     }
+	     if ($smbshare eq "") {
+		 $in->ask_warn('', N("Samba share name missing!"));
+		 return (1,2);
+	     }
+	     if ($smbpassword ne "") {
+		 local $::isWizard = 0;
+		 my $yes = $in->ask_yesorno
+		     (N("SECURITY WARNING!"),
+		      N("You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\".
+
+We recommend to make use of one of the following alternatives (in all cases you have to make sure that only machines from your local network have access to your Windows server, for example by means of a firewall):
+
+Use a password-less account on your Windows server, as the \"GUEST\" account or a special account dedicated for printing. Do not remove the password protection from a personal account or the administrator account.
+
+Set up your Windows server to make the printer available under the LPD protocol. Then set up printing from this machine with the \"%s\" connection type in Printerdrake.
+
+", N("Printer on remote lpd server")) .
+		      ($::expert ? 
+		       N("Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake.
+
+", N("Enter a printer device URI")) : "") .
+N("Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client.
+
+Do you really want to continue setting up this printer as you are doing now?"), 0);
+		 return 0 if $yes;
+		 return (1,2);
+	     }
+	     return 0;
+	 },
+	 changed => sub {
+	     return 0 if !$autodetect;
+	     if ($oldmenuchoice ne $menuchoice) {
+		 $menuentries->{$menuchoice} =~ m!^smb://([^/:]+)/([^/:]+)$!;
+		 $smbserver = $1;
+		 $smbshare = $2;
+		 $oldmenuchoice = $menuchoice;
+	     }
+	     return 0;
+	 }
+	 );
+    #- make the DeviceURI from, try to probe for available variable to
+    #- build a suitable URI.
+    $printer->{currentqueue}{connect} =
+    join '', ("smb://", ($smbuser && ($smbuser . 
+    ($smbpassword && ":$smbpassword") . "@")), ($workgroup && ("$workgroup/")),
+    ($smbserver || $smbserverip), "/$smbshare");
+
+    if ((!$::testing) &&
+        (!files_exist((qw(/usr/bin/smbclient))))) {
+	$in->do_pkgs->install('samba-client');
+    }
+    $printer->{SPOOLER} eq 'cups' and printer::main::restart_queue($printer);
+    1;
+}
+
+sub setup_ncp {
+    my ($printer, $in, $upNetwork) = @_;
+
+    # Check whether the network functionality is configured and
+    # running
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+
+    $in->set_help('setupNCP') if $::isInstall;
+    my ($uri, $ncpuser, $ncppassword, $ncpserver, $ncpqueue);
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m/^ncp:/)) {
+	$uri = $printer->{currentqueue}{connect};
+	my $parameters = $uri =~ m!^\s*ncp://(.*)$!;
+	# Get the user's login and password from the URI
+	if ($parameters =~ m!([^@]*)@([^@]+)!) {
+	    my $login = $1;
+	    $parameters = $2;
+	    if ($login =~ m!([^:]*):([^:]*)!) {
+		$ncpuser = $1;
+		$ncppassword = $2;
+	    } else {
+		$ncpuser = $login;
+		$ncppassword = "";
+	    }
+	} else {
+	    $ncpuser = "";
+	    $ncppassword = "";
+	}
+	# Get the workgroup, server, and share name
+	if ($parameters =~ m!([^/]+)/([^/]+)$!) {
+	    $ncpserver = $1;
+	    $ncpqueue = $2;
+	} else {
+	    die "The \"ncp://\" URI must at least contain the server name and the share name!\n";
+	}
+    }
+
+    return 0 if !$in->ask_from(N("NetWare Printer Options"),
+N("To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."), [
+{ label => N("Printer Server"), val => \$ncpserver },
+{ label => N("Print Queue Name"), val => \$ncpqueue },
+{ label => N("User name"), val => \$ncpuser },
+{ label => N("Password"), val => \$ncppassword, hidden => 1 } ],
+complete => sub {
+    unless ($ncpserver ne "") {
+	$in->ask_warn('', N("NCP server name missing!"));
+	return (1,0);
+    }
+    unless ($ncpqueue ne "") {
+	$in->ask_warn('', N("NCP queue name missing!"));
+	return (1,1);
+    }
+    return 0;
+}
+					);
+    # Generate the Foomatic URI
+    $printer->{currentqueue}{connect} =
+    join '', ("ncp://", ($ncpuser && ($ncpuser . 
+    ($ncppassword && ":$ncppassword") . "@")),
+    "$ncpserver/$ncpqueue");
+
+    if ((!$::testing) &&
+        (!files_exist((qw(/usr/bin/nprint))))) {
+	$in->do_pkgs->install('ncpfs');
+    }
+
+    1;
+}
+
+sub setup_socket {
+    my ($printer, $in, $upNetwork) = @_;
+
+    # Check whether the network functionality is configured and
+    # running
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+
+    $in->set_help('setupSocket') if $::isInstall;
+
+    my ($hostname, $port, $uri, $remotehost,$remoteport);
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~  m!^(socket:|ptal:/hpjd:)!)) {
+	$uri = $printer->{currentqueue}{connect};
+	if ($uri =~ m!^ptal:!) {
+	    if ($uri =~ m!^ptal:/hpjd:([^/:]+):([0-9]+)/?\s*$!) {
+		my $ptalport = $2 - 9100;
+		($remotehost, $remoteport) = ($1, $ptalport);
+	    } elsif ($uri =~ m!^ptal:/hpjd:([^/:]+)\s*$!) {
+		($remotehost, $remoteport) = ($1, 9100);
+	    }
+	} else {
+	    ($remotehost, $remoteport) =
+		$uri =~ m!^\s*socket://([^/:]+):([0-9]+)/?\s*$!;
+	}
+    } else {
+	$remotehost = "";
+	$remoteport = "9100";
+    }
+
+    my $autodetect = 0;
+    my @autodetected;
+    my $menuentries;
+    my @menuentrieslist;
+    my $menuchoice = "";
+    my $oldmenuchoice = "";
+    if ($printer->{AUTODETECT}) {
+	$autodetect = 1;
+	my $w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
+	@autodetected = printer::detect::net_detect();
+	foreach my $p (@autodetected) {
+	    my $menustr;
+	    $p->{port} =~ m!^socket://([^:]+):(\d+)$!;
+	    my $host = $1;
+	    my $port = $2;
+	    if ($p->{val}{DESCRIPTION}) {
+		$menustr = $p->{val}{DESCRIPTION};
+		$menustr .= N(", host \"%s\", port %s",
+			      $host, $port);
+	    } else {
+		$menustr = N("Host \"%s\", port %s", $host, $port);
+	    }
+	    $menuentries->{$menustr} = $p->{port};
+	    if (($host eq $remotehost) &&
+		($host eq $remotehost)) {
+		$menuchoice = $menustr;
+	    }
+	}
+	@menuentrieslist = sort { 
+	    $menuentries->{$a} cmp $menuentries->{$b};
+	} keys(%{$menuentries});
+	if (($printer->{configured}{$queue}) &&
+	    ($printer->{currentqueue}{connect} =~ m!^(socket:|ptal:/hpjd:)!) &&
+	    ($menuchoice eq "")) {
+	    my $menustr;
+	    if ($printer->{currentqueue}{make}) {
+		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
+		$menustr .= N(", host \"%s\", port %s",
+			      $remotehost, $remoteport);
+	    } else {
+		$menustr = N("Host \"%s\", port %s",
+			      $remotehost, $remoteport);
+	    }
+	    $menuentries->{$menustr} = "socket://$remotehost:$remoteport";
+	    unshift(@menuentrieslist, $menustr);
+	    $menuchoice = $menustr;
+	}
+	if ($#menuentrieslist < 0) {
+	    $autodetect = 0;
+	} elsif ($menuchoice eq "") {
+	    $menuchoice = $menuentrieslist[0];
+	    $menuentries->{$menuentrieslist[0]} =~ m!^socket://([^:]+):(\d+)$!;
+	    $remotehost = $1;
+	    $remoteport = $2;
+	}
+	$oldmenuchoice = $menuchoice;
+    }
+
+    return 0 if !$in->ask_from_
+	({
+	     title => N("TCP/Socket Printer Options"),
+	     messages => ($autodetect ?
+			  N("Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) into the input fields.") :
+			  N("To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware.")),
+		 callbacks => {
+		 complete => sub {
+		     unless ($remotehost ne "") {
+			 $in->ask_warn
+			     ('', N("Printer host name or IP missing!"));
+			 return (1,0);
+		     }
+		     unless ($remoteport =~ /^[0-9]+$/) {
+			 $in->ask_warn('', N("The port number should be an integer!"));
+			 return (1,1);
+		     }
+		     return 0;
+		 },
+		 changed => sub {
+		     return 0 if !$autodetect;
+		     if ($oldmenuchoice ne $menuchoice) {
+			 $menuentries->{$menuchoice} =~ m!^socket://([^:]+):(\d+)$!;
+			 $remotehost = $1;
+			 $remoteport = $2;
+			 $oldmenuchoice = $menuchoice;
+		     }
+		     return 0;
+		 }
+	     }
+	 },
+	 [
+	  { label => ($autodetect ? "" : N("Printer host name or IP")),
+	    val => \$remotehost },
+	  { label => ($autodetect ? "" : N("Port")), val => \$remoteport },
+	  ($autodetect ?
+	   { val => \$menuchoice, list => \@menuentrieslist, 
+	     not_edit => 0, format => \&translate, sort => 0,
+	     allow_empty_list => 1, type => 'list' } :
+	     ())
+	  ]
+	 );
+    
+    #- make the Foomatic URI
+    $printer->{currentqueue}{connect} = 
+	join '', ("socket://$remotehost", $remoteport ? (":$remoteport") : ());
+
+    #- LPD and LPRng need netcat ('nc') to access to socket printers
+    if ((($printer->{SPOOLER} eq 'lpd') || ($printer->{SPOOLER} eq 'lprng'))&& 
+        (!$::testing) &&
+        (!files_exist((qw(/usr/bin/nc))))) {
+        $in->do_pkgs->install('nc');
+    }
+
+    # Auto-detect printer model
+    my $modelinfo;
+    if ($printer->{AUTODETECT}) {
+	$modelinfo = printer::detect::getSNMPModel ($remotehost);
+    }
+    my $auto_hpoj;
+    if ((defined($modelinfo)) &&
+	($modelinfo->{MANUFACTURER} ne "") &&
+	($modelinfo->{MODEL} ne "")) {
+        $auto_hpoj = 1;
+    } else {
+	$auto_hpoj = 0;
+    }
+
+    # Do configuration of multi-function devices and look up model name
+    # in the printer database
+    setup_common ($printer, $in,
+		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
+		  $printer->{currentqueue}{connect}, $auto_hpoj,
+                  ({port => $printer->{currentqueue}{connect},
+                    val => $modelinfo }));
+    1;
+}
+
+sub setup_uri {
+    my ($printer, $in, $upNetwork) = @_;
+
+    $in->set_help('setupURI') if $::isInstall;
+    return if !$in->ask_from(N("Printer Device URI"),
+N("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [
+{ label => N("Printer Device URI"),
+val => \$printer->{currentqueue}{connect},
+list => [ $printer->{currentqueue}{connect},
+	  "file:/",
+	  "http://",
+	  "ipp://",
+	  "lpd://",
+	  "smb://",
+	  "ncp://",
+	  "socket://",
+	  "postpipe:\"\"",
+	  ], not_edit => 0 }, ],
+complete => sub {
+    unless ($printer->{currentqueue}{connect} =~ /[^:]+:.+/) {
+	$in->ask_warn('', N("A valid URI must be entered!"));
+	return (1,0);
+    }
+    return 0;
+}
+    );
+
+    # Non-local printer, check network and abort if no network available
+    if (($printer->{currentqueue}{connect} !~ m!^(file|ptal):/!) &&
+        (!check_network($printer, $in, $upNetwork, 0))) { return 0 };
+
+    # If the chosen protocol needs additional software, install it.
+
+    # LPD does not support filtered queues to a remote LPD server by itself
+    # It needs an additional program as "rlpr"
+    if (($printer->{currentqueue}{connect} =~ /^lpd:/) &&
+	($printer->{SPOOLER} eq 'lpd') && (!$::testing) &&
+        (!files_exist((qw(/usr/bin/rlpr))))) {
+        $in->do_pkgs->install('rlpr');
+    }
+    if (($printer->{currentqueue}{connect} =~ /^smb:/) &&
+        (!$::testing) &&
+        (!files_exist((qw(/usr/bin/smbclient))))) {
+	$in->do_pkgs->install('samba-client');
+    }
+    if (($printer->{currentqueue}{connect} =~ /^ncp:/) &&
+	(!$::testing) &&
+        (!files_exist((qw(/usr/bin/nprint))))) {
+	$in->do_pkgs->install('ncpfs');
+    }
+    #- LPD and LPRng need netcat ('nc') to access to socket printers
+    if (($printer->{currentqueue}{connect} =~ /^socket:/) &&
+	(($printer->{SPOOLER} eq 'lpd') || ($printer->{SPOOLER} eq 'lprng')) &&
+        (!$::testing) &&
+        (!files_exist((qw(/usr/bin/nc))))) {
+        $in->do_pkgs->install('nc');
+    }
+
+    if (($printer->{currentqueue}{connect} =~ m!^socket://([^:/]+)!) ||
+        ($printer->{currentqueue}{connect} =~ m!^lpd://([^:/]+)!) ||
+        ($printer->{currentqueue}{connect} =~ m!^http://([^:/]+)!) ||
+        ($printer->{currentqueue}{connect} =~ m!^ipp://([^:/]+)!)) {
+	
+	# Auto-detect printer model (works if host is an ethernet-connected
+	# printer)
+	my $remotehost = $1;
+	my $modelinfo = printer::main::getSNMPModel ($remotehost);
+        my $auto_hpoj;
+        if ((defined($modelinfo)) &&
+            ($modelinfo->{MANUFACTURER} ne "") &&
+	    ($modelinfo->{MODEL} ne "")) {
+            $in->ask_warn('', N("Detected model: %s %s",
+                                $modelinfo->{MANUFACTURER},
+				$modelinfo->{MODEL}));
+            $auto_hpoj = 1;
+        } else {
+	    $auto_hpoj = 0;
+        }
+
+        # Do configuration of multi-function devices and look up model name
+        # in the printer database
+        setup_common ($printer, $in,
+		      "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
+		      $printer->{currentqueue}{connect}, $auto_hpoj,
+                      ({port => $printer->{currentqueue}{connect},
+                        val => $modelinfo }));
+    }
+
+    1;
+}
+
+sub setup_postpipe {
+    my ($printer, $in) = @_;
+
+    $in->set_help('setupPostpipe') if $::isInstall;
+    my $uri;
+    my $commandline;
+    my $queue = $printer->{OLD_QUEUE};
+    if (($printer->{configured}{$queue}) &&
+	($printer->{currentqueue}{connect} =~ m/^postpipe:/)) {
+	$uri = $printer->{currentqueue}{connect};
+	$uri =~ m!^\s*postpipe:\"(.*)\"$!;
+	$commandline = $1;
+    } else {
+	$commandline = "";
+    }
+
+    return if !$in->ask_from(N("Pipe into command"),
+N("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [
+{ label => N("Command line"),
+val => \$commandline }, ],
+complete => sub {
+    unless ($commandline ne "") {
+	$in->ask_warn('', N("A command line must be entered!"));
+	return (1,0);
+    }
+    return 0;
+}
+);
+
+    #- make the Foomatic URI
+    $printer->{currentqueue}{connect} = "postpipe:$commandline";
+    
+    1;
+}
+
+sub setup_common {
+
+    my ($printer, $in, $makemodel, $device, $do_auto_detect,
+	@autodetected) = @_;
+
+    #- Check whether the printer is an HP multi-function device and 
+    #- configure HPOJ if it is one
+
+    my $ptaldevice = "";
+    my $isHPOJ = 0;
+    if (($device =~ /^\/dev\//) || ($device =~ /^socket:\/\//)) {
+	# Ask user whether he has a multi-function device when he didn't
+	# do auto-detection or when auto-detection failed
+	my $searchunknown = N("Unknown model");
+	if ((!$do_auto_detect) ||
+	    ($makemodel =~ /$searchunknown/i) ||
+	    ($makemodel =~ /^\s*$/)) {
+	    local $::isWizard = 0;
+	    $isHPOJ = $in->ask_yesorno(N("Add a new printer"),
+				       N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
+	}
+	if (($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0))/i) ||
+	    ($makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i) ||
+	    ($isHPOJ)) {
+	    # Install HPOJ package
+	    if ((!$::testing) &&
+		(!files_exist((qw(/usr/sbin/ptal-mlcd
+					   /usr/sbin/ptal-init
+					   /usr/bin/xojpanel))))) {
+		my $w = $in->wait_message(N("Printerdrake"),
+					  N("Installing HPOJ package..."));
+		$in->do_pkgs->install('hpoj', 'xojpanel');
+	    }
+	    # Configure and start HPOJ
+	    my $w = $in->wait_message
+		(N("Printerdrake"),
+		 N("Checking device and configuring HPOJ..."));
+	    $ptaldevice = printer::main::configure_hpoj($device, @autodetected);
+	    
+	    if ($ptaldevice) {
+		# Configure scanning with SANE on the MF device
+		if (($makemodel !~ /HP\s+PhotoSmart/i) &&
+		    ($makemodel !~ /HP\s+LaserJet\s+2200/i)) {
+		    # Install SANE
+		    if ((!$::testing) &&
+			(!files_exist((qw(/usr/bin/scanimage
+						   /usr/bin/xscanimage
+						   /usr/bin/xsane
+						   /etc/sane.d/dll.conf
+						   /usr/lib/libsane-hpoj.so.1),
+						(files_exist
+						 ('/usr/bin/gimp') ? 
+						 '/usr/bin/xsane-gimp' : 
+						 ()))))) {
+			my $w = $in->wait_message
+			    (N("Printerdrake"),
+			     N("Installing SANE packages..."));
+			$in->do_pkgs->install('sane-backends',
+					      'sane-frontends',
+					      'xsane', 'libsane-hpoj0',
+					      if_($in->do_pkgs->is_installed
+						  ('gimp'),'xsane-gimp'));
+		    }
+		    # Configure the HPOJ SANE backend
+		    printer::main::config_sane();
+		}
+		# Configure photo card access with mtools and MToolsFM
+		if ((($makemodel =~ /HP\s+PhotoSmart/i) ||
+		     ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
+		     ($makemodel =~ /HP\s+PSC\s*22\d\d/i) ||
+		     ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) &&
+		    ($makemodel !~ /HP\s+PhotoSmart\s+7150/i)) {
+		    # Install mtools and MToolsFM
+		    if ((!$::testing) &&
+			(!files_exist(qw(/usr/bin/mdir
+						  /usr/bin/mcopy
+						  /usr/bin/MToolsFM
+						  )))) {
+			my $w = $in->wait_message
+			    (N("Printerdrake"),
+			     N("Installing mtools packages..."));
+			$in->do_pkgs->install('mtools', 'mtoolsfm');
+		    }
+		    # Configure mtools/MToolsFM for photo card access
+		    printer::main::config_photocard();
+		}
+		
+		my $text = "";
+		# Inform user about how to scan with his MF device
+		$text = scanner_help($makemodel, "ptal:/$ptaldevice");
+		if ($text) {
+		    $in->ask_warn
+			(N("Scanning on your HP multi-function device"),
+			 $text);
+		}
+		# Inform user about how to access photo cards with his MF
+		# device
+		$text = photocard_help($makemodel, "ptal:/$ptaldevice");
+		if ($text) {
+		    $in->ask_warn(N("Photo memory card access on your HP multi-function device"),
+				  $text);
+		}
+		# make the DeviceURI from $ptaldevice.
+		$printer->{currentqueue}{connect} = "ptal:/" . $ptaldevice;
+	    } else {
+		# make the DeviceURI from $device.
+		$printer->{currentqueue}{connect} = $device;
+	    }
+	} else {
+	    # make the DeviceURI from $device.
+	    $printer->{currentqueue}{connect} = $device;
+	}
+    } else {
+	# make the DeviceURI from $device.
+	$printer->{currentqueue}{connect} = $device;
+    }
+
+    if ($printer->{currentqueue}{connect} !~ /:/) {
+	$printer->{currentqueue}{connect} =
+	    "file:" . $printer->{currentqueue}{connect};
+    }
+
+    #- if CUPS is the spooler, make sure that CUPS knows the device
+    if (($printer->{SPOOLER} eq "cups") &&
+	($device !~ /^lpd:/) &&
+	($device !~ /^smb:/) &&
+	($device !~ /^socket:/) &&
+	($device !~ /^http:/) &&
+	($device !~ /^ipp:/)) {
+	my $w = $in->wait_message(N("Printerdrake"), N("Making printer port available for CUPS..."));
+	printer::main::assure_device_is_available_for_cups($ptaldevice || $device);
+    }
+
+    #- Read the printer driver database if necessary
+    if ((keys %printer::main::thedb) == 0) {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Reading printer database..."));
+        printer::main::read_printer_db($printer->{SPOOLER});
+    }
+
+    #- Search the database entry which matches the detected printer best
+    my $descr = "";
+    foreach (@autodetected) {
+	$device eq $_->{port} or next;
+	if (($_->{val}{MANUFACTURER}) && ($_->{val}{MODEL})) {
+	    $descr = "$_->{val}{MANUFACTURER}|$_->{val}{MODEL}";
+	} else {
+	    $descr = $_->{val}{DESCRIPTION};
+	    $descr =~ s/ /\|/;
+	}
+	# Clean up the description from noise which makes the best match
+	# difficult
+	$descr =~ s/Seiko\s+Epson/Epson/;
+	$descr =~ s/\s+Inc\.//;
+	$descr =~ s/\s+Corp\.//;
+	$descr =~ s/\s+SA\.//;
+	$descr =~ s/\s+S\.\s*A\.//;
+	$descr =~ s/\s+Ltd\.//;
+	$descr =~ s/\s+International//;
+	$descr =~ s/\s+Int\.//;
+	$descr =~ s/\s+[Ss]eries//;
+	$descr =~ s/\s+\(?[Pp]rinter\)?$//;
+	$printer->{DBENTRY} = "";
+	# Try to find an exact match, check both whether the detected
+	# make|model is in the make|model of the database entry and vice versa
+	# If there is more than one matching database entry, the longest match
+	# counts.
+	my $matchlength = 0;
+	foreach my $entry (keys %printer::main::thedb) {
+	    my $dbmakemodel;
+	    if ($::expert) {
+		$entry =~ m/^(.*)\|[^\|]*$/;
+		$dbmakemodel = $1;
+	    } else {
+		$dbmakemodel = $entry;
+	    }
+	    next if !$dbmakemodel;
+	    $dbmakemodel =~ s/\|/\\\|/;
+	    my $searchterm = $descr;
+	    $searchterm =~ s/\|/\\\|/;
+	    my $lsearchterm = length($searchterm);
+	    if (($lsearchterm > $matchlength) &&
+		($entry =~ m!$searchterm!i)) {
+		$matchlength = $lsearchterm;
+		$printer->{DBENTRY} = $entry;
+	    }
+	    my $ldbmakemodel = length($dbmakemodel);
+	    if (($ldbmakemodel > $matchlength) &&
+		($descr =~ m!$dbmakemodel!i)) {
+		$matchlength = $ldbmakemodel;
+		$printer->{DBENTRY} = $entry;
+	    }
+	}
+	if (!$printer->{DBENTRY}) {
+	    $printer->{DBENTRY} =
+		bestMatchSentence ($descr, keys %printer::main::thedb);
+	}
+        # If the manufacturer was not guessed correctly, discard the
+        # guess.
+        $printer->{DBENTRY} =~ /^([^\|]+)\|/;
+        my $guessedmake = lc($1);
+        if (($descr !~ /$guessedmake/i) &&
+            (($guessedmake ne "hp") ||
+             ($descr !~ /Hewlett[\s-]+Packard/i)))
+            { $printer->{DBENTRY} = "" };
+    }
+
+    #- Pre-fill the "Description" field with the printer's model name
+    if ((!$printer->{currentqueue}{desc}) && ($descr)) {
+	$printer->{currentqueue}{desc} = $descr;
+	$printer->{currentqueue}{desc} =~ s/\|/ /g;
+    }
+
+    #- When we have chosen a printer here, the question whether the
+    #- automatically chosen model from the database is correct, should
+    #- have "This model is correct" as default answer
+    delete($printer->{MANUALMODEL});
+
+    1;
+}
+
+sub choose_printer_name {
+    my ($printer, $in) = @_;
+    # Name, description, location
+    $in->set_help('setupPrinterName') if $::isInstall;
+    my $default = $printer->{currentqueue}{queue};
+    $in->ask_from_
+	(
+	 { title => N("Enter Printer Name and Comments"),
+	   #cancel => !$printer->{configured}{$queue} ? '' : N("Remove queue"),
+	   callbacks => { complete => sub {
+	       unless ($printer->{currentqueue}{queue} =~ /^\w+$/) {
+		   $in->ask_warn('', N("Name of printer should contain only letters, numbers and the underscore"));
+		   return (1,0);
+	       }
+	       local $::isWizard = 0;
+	       if (($printer->{configured}{$printer->{currentqueue}{queue}})
+		   && ($printer->{currentqueue}{queue} ne $default) && 
+		   (!$in->ask_yesorno('', N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
+					    $printer->{currentqueue}{queue}),
+				      0))) {
+		   return (1,0); # Let the user correct the name
+	       }
+	       return 0;
+	   },
+		      },
+	   messages =>
+N("Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users.") }, 
+	 [ { label => N("Name of printer"), val => \$printer->{currentqueue}{queue} },
+	   { label => N("Description"), val => \$printer->{currentqueue}{desc} },
+	   { label => N("Location"), val => \$printer->{currentqueue}{loc} },
+	 ]) or return 0;
+
+    $printer->{QUEUE} = $printer->{currentqueue}{queue};
+    1;
+}
+
+sub get_db_entry {
+    my ($printer, $in) = @_;
+    #- Read the printer driver database if necessary
+    if ((keys %printer::main::thedb) == 0) {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Reading printer database..."));
+        printer::main::read_printer_db($printer->{SPOOLER});
+    }
+    my $w = $in->wait_message(N("Printerdrake"),
+			      N("Preparing printer database..."));
+    my $queue = $printer->{OLD_QUEUE};
+    if ($printer->{configured}{$queue}) {
+	# The queue was already configured
+	if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
+	    # The queue was configured with Foomatic
+	    my $driverstr;
+	    if ($printer->{configured}{$queue}{queuedata}{driver} eq "Postscript") {
+		$driverstr = "PostScript";
+	    } else {
+		$driverstr = "GhostScript + $printer->{configured}{$queue}{queuedata}{driver}";
+	    }
+	    my $make = uc($printer->{configured}{$queue}{queuedata}{make});
+	    my $model =	$printer->{configured}{$queue}{queuedata}{model};
+	    if ($::expert) {
+		$printer->{DBENTRY} = "$make|$model|$driverstr";
+		# database key contains the "(recommended)" for the
+		# recommended driver, so add it if necessary
+		if (!member($printer->{DBENTRY}, keys(%printer::main::thedb))) {
+		    $printer->{DBENTRY} .= " (recommended)";
+		}
+	    } else {
+		$printer->{DBENTRY} = "$make|$model";
+	    }
+	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
+	} elsif (($printer->{SPOOLER} eq "cups") && ($::expert) &&
+		 ($printer->{configured}{$queue}{queuedata}{ppd})) {
+	    # Do we have a native CUPS driver or a PostScript PPD file?
+	    $printer->{DBENTRY} = printer::main::get_descr_from_ppd($printer) || $printer->{DBENTRY};
+	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
+	} else {
+	    # Point the list cursor at least to manufacturer and model of the
+	    # printer
+	    $printer->{DBENTRY} = "";
+	    my $make = uc($printer->{configured}{$queue}{queuedata}{make});
+	    my $model = $printer->{configured}{$queue}{queuedata}{model};
+	    foreach my $key (keys %printer::main::thedb) {
+		if ((($::expert) && ($key =~ /^$make\|$model\|.*\(recommended\)$/)) ||
+		    ((!$::expert) && ($key =~ /^$make\|$model$/))) {
+		    $printer->{DBENTRY} = $key;
+		}
+	    }
+	    if ($printer->{DBENTRY} eq "") {
+		# Exact match of make and model did not work, try to clean
+		# up the model name
+		$model =~ s/PS//;
+		$model =~ s/PostScript//;
+		$model =~ s/Series//;
+		for $key (keys %printer::main::thedb) {
+		    if ((($::expert) && ($key =~ /^$make\|$model\|.*\(recommended\)$/)) ||
+			((!$::expert) && ($key =~ /^$make\|$model$/))) {
+			$printer->{DBENTRY} = $key;
+		    }
+		}
+	    }
+	    if (($printer->{DBENTRY} eq "") && ($make ne "")) {
+		# Exact match with cleaned-up model did not work, try a best match
+		my $matchstr = "$make|$model";
+		$printer->{DBENTRY} = bestMatchSentence($matchstr, keys %printer::main::thedb);
+		# If the manufacturer was not guessed correctly, discard the
+		# guess.
+		$printer->{DBENTRY} =~ /^([^\|]+)\|/;
+		my $guessedmake = lc($1);
+		if (($matchstr !~ /$guessedmake/i) &&
+		    (($guessedmake ne "hp") ||
+		     ($matchstr !~ /Hewlett[\s-]+Packard/i)))
+		{ $printer->{DBENTRY} = "" };
+	    }
+	    # Set the OLD_CHOICE to a non-existing value
+	    $printer->{OLD_CHOICE} = "XXX";
+	}
+    } else {
+	if (($::expert) && ($printer->{DBENTRY} !~ /(recommended)/)) {
+	    my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
+	    foreach my $key (keys %printer::main::thedb) {
+		if ($key =~ /^$make\|$model\|.*\(recommended\)$/) {
+		    $printer->{DBENTRY} = $key;
+		}
+	    }
+	}
+	$printer->{OLD_CHOICE} = $printer->{DBENTRY};
+    }
+}
+
+sub is_model_correct {
+    my ($printer, $in) = @_;
+    $in->set_help('chooseModel') if $::isInstall;
+    my $dbentry = $printer->{DBENTRY};
+    if (!$dbentry) {
+	# If printerdrake could not determine the model, omit this dialog and
+	# let the user choose manually.
+	$printer->{MANUALMODEL} = 1;
+	return 1;
+    }
+    $dbentry =~ s/\|/ /g;
+    my $res = $in->ask_from_list_
+	    (N("Your printer model"),
+	     N("Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.
+
+For your printer Printerdrake has found:
+
+%s", $dbentry),
+	     [N("The model is correct"),
+	      N("Select model manually")],
+	     ($printer->{MANUALMODEL} ? N("Select model manually") : 
+	      N("The model is correct")));
+    return 0 if !$res;
+    $printer->{MANUALMODEL} = ($res eq N("Select model manually"));
+    1;
+}
+
+sub choose_model {
+    my ($printer, $in) = @_;
+    $in->set_help('chooseModel') if $::isInstall;
+    #- Read the printer driver database if necessary
+    if ((keys %printer::main::thedb) == 0) {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Reading printer database..."));
+        printer::main::read_printer_db($printer->{SPOOLER});
+    }
+    if (!member($printer->{DBENTRY}, keys(%printer::main::thedb))) {
+	$printer->{DBENTRY} = N("Raw printer (No driver)");
+    }
+    # Choose the printer/driver from the list
+    return ($printer->{DBENTRY} = $in->ask_from_treelist(N("Printer model selection"),
+							 N("Which printer model do you have?") .
+							 N("
+
+Please check whether Printerdrake did the auto-detection of your printer model correctly. Search the correct model in the list when the cursor is standing on a wrong model or on \"Raw printer\".") . " " .
+N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|',
+							 [ keys %printer::main::thedb ], $printer->{DBENTRY}));
+
+}
+
+sub get_printer_info {
+    my ($printer, $in) = @_;
+    #- Read the printer driver database if necessary
+    #if ((keys %printer::main::thedb) == 0) {
+    #    my $w = $in->wait_message(N("Printerdrake"), 
+    #                              N("Reading printer database..."));
+    #    printer::main::read_printer_db($printer->{SPOOLER});
+    #}
+    my $queue = $printer->{OLD_QUEUE};
+    my $oldchoice = $printer->{OLD_CHOICE};
+    my $newdriver = 0;
+    if ((!$printer->{configured}{$queue}) ||      # New queue  or
+	(($oldchoice) && ($printer->{DBENTRY}) && # make/model/driver changed
+	 (($oldchoice ne $printer->{DBENTRY}) ||
+	  ($printer->{currentqueue}{driver} ne 
+	   $printer::main::thedb{$printer->{DBENTRY}}{driver})))) {
+	delete($printer->{currentqueue}{printer});
+	delete($printer->{currentqueue}{ppd});
+	$printer->{currentqueue}{foomatic} = 0;
+	# Read info from printer database
+	foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way...
+	    $printer->{currentqueue}{$_} = $printer::main::thedb{$printer->{DBENTRY}}{$_};
+	}
+	$newdriver = 1;
+    }
+    # Use the "printer" and not the "foomatic" field to identify a Foomatic
+    # queue because in a new queue "foomatic" is not set yet.
+    if (($printer->{currentqueue}{printer}) || # We have a Foomatic queue
+	($printer->{currentqueue}{ppd})) { # We have a CUPS+PPD queue
+	if ($printer->{currentqueue}{printer}) { # Foomatic queue?
+	    # In case of a new queue "foomatic" was not set yet
+	    $printer->{currentqueue}{foomatic} = 1;
+	    # Now get the options for this printer/driver combo
+	    if (($printer->{configured}{$queue}) && ($printer->{configured}{$queue}{queuedata}{foomatic})) {
+		# The queue was already configured with Foomatic ...
+		if (!$newdriver) {
+		    # ... and the user didn't change the printer/driver
+		    $printer->{ARGS} = $printer->{configured}{$queue}{args};
+		} else {
+		    # ... and the user has chosen another printer/driver
+		    $printer->{ARGS} = printer::main::read_foomatic_options($printer);
+		}
+	    } else {
+		# The queue was not configured with Foomatic before
+		# Set some special options
+		$printer->{SPECIAL_OPTIONS} = '';
+		# Default page size depending on the country/language
+		# (US/Canada -> Letter, Others -> A4)
+		my $pagesize;
+		if ($printer->{PAPERSIZE}) {
+		    $printer->{SPECIAL_OPTIONS} .= 
+			" -o PageSize=$printer->{PAPERSIZE}";
+		} elsif (($pagesize = $in->{lang}) ||
+			 ($pagesize = $ENV{LC_PAPER}) ||
+			 ($pagesize = $ENV{LANG}) ||
+			 ($pagesize = $ENV{LANGUAGE}) ||
+			 ($pagesize = $ENV{LC_ALL})) {
+		    if (($pagesize =~ /^en_CA/) ||
+			($pagesize =~ /^fr_CA/) || 
+			($pagesize =~ /^en_US/)) {
+			$pagesize = "Letter";
+		    } else {
+			$pagesize = "A4";
+		    }
+		    $printer->{SPECIAL_OPTIONS} .= 
+			" -o PageSize=$pagesize";
+		}
+		# oki4w driver -> OKI winprinter which needs the
+		# oki4daemon to work
+		if ($printer->{currentqueue}{driver} eq 'oki4w') {
+		    if ($printer->{currentqueue}{connect} ne 
+			'file:/dev/lp0') {
+			$in->ask_warn(N("OKI winprinter configuration"),
+				      N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."));
+		    }
+		    $printer->{currentqueue}{connect} = 'file:/dev/null';
+		    # Start the oki4daemon
+		    services::start_service_on_boot('oki4daemon');
+		    printer::services::start('oki4daemon');
+		    # Set permissions
+		    if ($printer->{SPOOLER} eq 'cups') {
+			set_permissions('/dev/oki4drv', '660', 'lp',
+						 'sys');
+		    } elsif ($printer->{SPOOLER} eq 'pdq') {
+			set_permissions('/dev/oki4drv', '666');
+		    } else {
+			set_permissions('/dev/oki4drv', '660', 'lp',
+						 'lp');
+		    }
+		} elsif ($printer->{currentqueue}{driver} eq 'lexmarkinkjet') {
+		    # Set "Port" option
+		    if ($printer->{currentqueue}{connect} eq 
+			'file:/dev/lp0') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=ParPort1";
+		    } elsif ($printer->{currentqueue}{connect} eq 
+			'file:/dev/lp1') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=ParPort2";
+		    } elsif ($printer->{currentqueue}{connect} eq 
+			'file:/dev/lp2') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=ParPort3";
+		    } elsif ($printer->{currentqueue}{connect} eq 
+			'file:/dev/usb/lp0') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=USB1";
+		    } elsif ($printer->{currentqueue}{connect} eq 
+			'file:/dev/usb/lp1') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=USB2";
+		    } elsif ($printer->{currentqueue}{connect} eq 
+			'file:/dev/usb/lp2') {
+			$printer->{SPECIAL_OPTIONS} .= 
+			    " -o Port=USB3";
+		    } else {
+			$in->ask_warn(N("Lexmark inkjet configuration"),
+				      N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."));
+			return 0;
+		    }
+		    # Set device permissions
+		    $printer->{currentqueue}{connect} =~ /^\s*file:(\S*)\s*$/;
+		    if ($printer->{SPOOLER} eq 'cups') {
+			set_permissions($1, '660', 'lp', 'sys');
+		    } elsif ($printer->{SPOOLER} eq 'pdq') {
+			set_permissions($1, '666');
+		    } else {
+			set_permissions($1, '660', 'lp', 'lp');
+		    }
+		    # This is needed to have the device not blocked by the
+		    # spooler backend.
+		    $printer->{currentqueue}{connect} = 'file:/dev/null';
+		    #install packages
+		    my $drivertype = $printer->{currentqueue}{model};
+		    if ($drivertype eq 'Z22') { $drivertype = 'Z32' }
+		    if ($drivertype eq 'Z23') { $drivertype = 'Z33' }
+		    $drivertype = lc($drivertype);
+		    if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
+			eval { $in->do_pkgs->install("lexmark-drivers-$drivertype") };
+		    }
+		    if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
+			# Driver installation failed, probably we do not have
+			# the commercial CDs
+			$in->ask_warn(N("Lexmark inkjet configuration"),
+				      N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."));
+		    }
+		} elsif ($printer->{currentqueue}{driver} eq 'pbmtozjs') {
+		    $in->ask_warn(N("GDI Laser Printer using the Zenographics ZJ-Stream Format"),
+				  N("Your printer belongs to the group of GDI laser printers (winprinters) sold by different manufacturers which uses the Zenographics ZJ-stream raster format for the data sent to the printer. The driver for these printers is still in a very early development stage and so it will perhaps not always work properly. Especially it is possible that the printer only works when you choose the A4 paper size.
+
+Some of these printers, as the HP LaserJet 1000, for which this driver was originally created, need their firmware to be uploaded to them after they are turned on. In the case of the HP LaserJet 1000 you have to search the printer's Windows driver CD or your Windows partition for the file \"sihp1000.img\" and upload the file to the printer with one of the following commands:
+
+     lpr -o raw sihp1000.img
+     cat sihp1000.img > /dev/usb/lp0
+
+The first command can be given by any normal user, the second must be given as root. After having done so you can print normally.
+"));
+		}
+		$printer->{ARGS} = printer::main::read_foomatic_options($printer);
+		delete($printer->{SPECIAL_OPTIONS});
+	    }
+	} elsif ($printer->{currentqueue}{ppd}) { # CUPS+PPD queue?
+	    # If we had a Foomatic queue before, unmark the flag and initialize
+	    # the "printer" and "driver" fields
+	    $printer->{currentqueue}{foomatic} = 0;
+	    $printer->{currentqueue}{printer} = undef;
+	    $printer->{currentqueue}{driver} = "CUPS/PPD";
+	    # Now get the options from this PPD file
+	    if ($printer->{configured}{$queue}) {
+		# The queue was already configured
+		if ((!$printer->{DBENTRY}) || (!$oldchoice) ||
+		    ($printer->{DBENTRY} eq $oldchoice)) {
+		    # ... and the user didn't change the printer/driver
+		    $printer->{ARGS} = printer::main::read_cups_options($queue);
+		} else {
+		    # ... and the user has chosen another printer/driver
+		    $printer->{ARGS} = printer::main::read_cups_options("/usr/share/cups/model/$printer->{currentqueue}{ppd}");
+		}
+	    } else {
+		# The queue was not configured before
+		$printer->{ARGS} = printer::main::read_cups_options("/usr/share/cups/model/$printer->{currentqueue}{ppd}");
+	    }
+	}
+    }
+    1;
+}
+
+sub setup_options {
+    my ($printer, $in) = @_;
+    my @simple_options = 
+	("PageSize",        # Media properties
+	 "MediaType",
+	 "Form",
+	 "InputSlot",       # Trays
+	 "Tray",
+	 "OutBin",
+	 "OutputBin",
+	 "FaceUp",
+	 "FaceDown",
+	 "Collate",
+	 "Manual",
+	 "ManualFeed",
+	 "Manualfeed",
+	 "ManualFeeder",
+	 "Feeder",
+	 "Duplex",          # Double-sided printing
+	 "Binding",
+	 "Tumble",
+	 "DoubleSided",
+	 "Resolution",      # Resolution/Quality
+	 "GSResolution",
+	 "JCLResolution",
+	 "Quality",
+	 "PrintQuality",
+	 "PrintoutQuality",
+	 "QualityType",
+	 "ImageType",
+	 "stpImageType",
+	 "InkType",         # Colour/Gray/BW, 4-ink/6-ink
+	 "stpInkType",
+	 "Mode",
+	 "OutputMode",
+	 "OutputType",
+	 "ColorMode",
+	 "ColorModel",
+	 "PrintingMode",
+	 "Monochrome",
+	 "BlackOnly",
+	 "Grayscale",
+	 "GrayScale",
+	 "Colour",
+	 "Color",
+	 "Gamma",           # Lighter/Darker
+	 "GammaCorrection",
+	 "GammaGeneral",
+	 "MasterGamma",
+	 "StpGamma",
+	 "stpGamma",
+	 "EconoMode",       # Ink/Toner saving
+	 "Economode",
+	 "TonerSaving",
+	 "JCLEconomode",
+	 "HPNup",           # Other useful options
+	 "InstalledMemory", # Laser printer hardware config
+	 "Option1",
+	 "Option2",
+	 "Option3",
+	 "Option4",
+	 "Option5",
+	 "Option6",
+	 "Option7",
+	 "Option8",
+	 "Option9",
+	 "Option10",
+	 "Option11",
+	 "Option12",
+	 "Option13",
+	 "Option14",
+	 "Option15",
+	 "Option16",
+	 "Option17",
+	 "Option18",
+	 "Option19",
+	 "Option20",
+	 "Option21",
+	 "Option22",
+	 "Option23",
+	 "Option24",
+	 "Option25",
+	 "Option26",
+	 "Option27",
+	 "Option28",
+	 "Option29",
+	 "Option30"
+	 );
+    $in->set_help('setupOptions') if $::isInstall;
+    if (($printer->{currentqueue}{printer}) || # We have a Foomatic queue
+	($printer->{currentqueue}{ppd})) { # We have a CUPS+PPD queue
+	# Set up the widgets for the option dialog
+	my @widgets;
+	my @userinputs;
+	my @choicelists;
+	my @shortchoicelists;
+	my $i;
+	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+	    my $optshortdefault = $printer->{ARGS}[$i]{default};
+	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
+		# enumerated option
+		push(@choicelists, []);
+		push(@shortchoicelists, []);
+		foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) {
+		    push(@{$choicelists[$i]}, $choice->{comment});
+		    push(@{$shortchoicelists[$i]}, $choice->{value});
+		    if ($choice->{value} eq $optshortdefault) {
+			push(@userinputs, $choice->{comment});
+		    }
+		}
+		push(@widgets,
+		     { label => $printer->{ARGS}[$i]{comment}, 
+		       val => \$userinputs[$i], 
+		       not_edit => 1,
+		       list => \@{$choicelists[$i]},
+		       advanced => !member($printer->{ARGS}[$i]{name},
+					   @simple_options) });
+	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
+		# boolean option
+		push(@choicelists, [$printer->{ARGS}[$i]{name}, 
+				    $printer->{ARGS}[$i]{name_false}]);
+		push(@shortchoicelists, []);
+		push(@userinputs, $choicelists[$i][1-$optshortdefault]);
+		push(@widgets,
+		     { label => $printer->{ARGS}[$i]{comment},
+		       val => \$userinputs[$i],
+		       not_edit => 1,
+		       list => \@{$choicelists[$i]},
+		       advanced => !member($printer->{ARGS}[$i]{name},
+					   @simple_options) });
+	    } else {
+		# numerical option
+		push(@choicelists, []);
+		push(@shortchoicelists, []);
+		push(@userinputs, $optshortdefault);
+		push(@widgets,
+		     { label => $printer->{ARGS}[$i]{comment} . 
+			   " ($printer->{ARGS}[$i]{min}... " .
+			       "$printer->{ARGS}[$i]{max})",
+			   #type => 'range',
+			   #min => $printer->{ARGS}[$i]{min},
+			   #max => $printer->{ARGS}[$i]{max},
+			   val => \$userinputs[$i],
+			   advanced => !member($printer->{ARGS}[$i]{name},
+					       @simple_options) });
+	    }
+	}
+	# Show the options dialog. The call-back function does a
+	# range check of the numerical options.
+	my $windowtitle = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
+	if ($::expert) {
+	    my $driver;
+	    if ($driver = $printer->{currentqueue}{driver}) {
+		if ($printer->{currentqueue}{foomatic}) {
+		    if ($driver eq 'Postscript') {
+			$driver = "PostScript";
+		    } else {
+			$driver = "GhostScript + $driver";
+		    }
+		} elsif ($printer->{currentqueue}{ppd}) {
+		    if ($printer->{DBENTRY}) {
+			$printer->{DBENTRY} =~ /^[^\|]*\|[^\|]*\|(.*)$/;
+			$driver = $1;
+		    } else {
+			$driver = printer::main::get_descr_from_ppd($printer);
+			if ($driver =~ /^[^\|]*\|[^\|]*$/) { # No driver info
+			    $driver = "CUPS/PPD";
+			} else {
+			    $driver =~ /^[^\|]*\|[^\|]*\|(.*)$/;
+			    $driver = $1;
+			}
+		    }
+		}
+	    } 
+	    if ($driver) {
+		$windowtitle .= ", $driver";
+	    }
+	}
+	# Do not show the options setup dialog when installing a new printer
+	# in recommended mode without "Manual configuration" turned on.
+	if ((!$printer->{NEW}) or ($::expert) or ($printer->{MANUAL})) {
+	    return 0 if !$in->ask_from
+		($windowtitle,
+		 N("Printer default settings
+
+You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower."),
+		 \@widgets,
+		 complete => sub {
+		     my $i;
+		     for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+			 if (($printer->{ARGS}[$i]{type} eq 'int') || ($printer->{ARGS}[$i]{type} eq 'float')) {
+			     if ($printer->{ARGS}[$i]{type} eq 'int' && $userinputs[$i] !~ /^[\-\+]?[0-9]+$/) {
+				 $in->ask_warn('', N("Option %s must be an integer number!", $printer->{ARGS}[$i]{comment}));
+				 return (1, $i);
+			     }
+			     if ($printer->{ARGS}[$i]{type} eq 'float' && $userinputs[$i] !~ /^[\-\+]?[0-9\.]+$/) {
+				 $in->ask_warn('', N("Option %s must be a number!", $printer->{ARGS}[$i]{comment}));
+				 return (1, $i);
+			     }
+			     if ($userinputs[$i] < $printer->{ARGS}[$i]{min} || $userinputs[$i] > $printer->{ARGS}[$i]{max}) {
+				 $in->ask_warn('', N("Option %s out of range!", $printer->{ARGS}[$i]{comment}));
+				 return (1, $i);
+			     }
+			 }
+		     }
+		     return (0);
+		 } );
+	}
+	# Read out the user's choices and generate the appropriate command
+	# line arguments
+	@{$printer->{currentqueue}{options}} = ();
+	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
+	    push(@{$printer->{currentqueue}{options}}, "-o");
+	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
+		# enumerated option
+		my $j;
+		for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) {
+		    if ($choicelists[$i][$j] eq $userinputs[$i]) {
+			push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=". $shortchoicelists[$i][$j]);
+		    }
+		}
+	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
+		# boolean option
+		push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=".
+		     (($choicelists[$i][0] eq $userinputs[$i]) ? "1" : "0"));
+	    } else {
+		# numerical option
+		push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=" . $userinputs[$i]);
+	    }
+	}
+    }
+    1;
+}
+
+sub setasdefault {
+    my ($printer, $in) = @_;
+    $in->set_help('setupAsDefault') if $::isInstall;
+    if (($printer->{DEFAULT} eq '') || # We have no default printer,
+	                               # so set the current one as default
+	($in->ask_yesorno('', N("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0))) { # Ask the user
+	$printer->{DEFAULT} = $printer->{QUEUE};
+        printer::default::set_printer($printer);
+    }
+}
+	
+sub print_testpages {
+    my ($printer, $in, $upNetwork) = @_;
+    $in->set_help('printTestPages') if $::isInstall;
+    # print test pages
+    my $standard = 1;
+    my $altletter = 0;
+    my $alta4 = 0;
+    my $photo = 0;
+    my $ascii = 0;
+    my $res2 = 0;
+    my $oldstandard = 1;
+    my $oldaltletter = 0;
+    my $oldalta4 = 0;
+    my $oldphoto = 0;
+    my $oldascii = 0;
+    my $oldres2 = 0;
+    my $res1 = $in->ask_from_
+	({ title => N("Test pages"),
+	   messages => N("Please select the test pages you want to print.
+Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."),
+	   cancel => ((!$printer->{NEW}) ?
+		       N("Cancel") : ($::isWizard ? N("<- Previous") : 
+				      N("No test pages"))),
+	   ok => ($::isWizard ? N("Next ->") : N("Print")),
+	   callbacks => {
+	       changed => sub {
+		   if ($oldres2 ne $res2) {
+		       if ($res2) {
+			   $standard = 0;
+			   $altletter = 0;
+			   $alta4 = 0;
+			   $photo = 0;
+			   $ascii = 0;
+			   $oldstandard = 0;
+			   $oldaltletter = 0;
+			   $oldalta4 = 0;
+			   $oldphoto = 0;
+			   $oldascii = 0;
+		       }
+		       $oldres2 = $res2;
+		   }
+		   if ($oldstandard ne $standard) {
+		       if ($standard) {
+			   $res2 = 0;
+			   $oldres2 = 0;
+		       }
+		       $oldstandard = $standard;
+		   }
+		   if ($oldaltletter ne $altletter) {
+		       if ($altletter) {
+			   $res2 = 0;
+			   $oldres2 = 0;
+		       }
+		       $oldaltletter = $altletter;
+		   }
+		   if ($oldalta4 ne $alta4) {
+		       if ($alta4) {
+			   $res2 = 0;
+			   $oldres2 = 0;
+		       }
+		       $oldalta4 = $alta4;
+		   }
+		   if ($oldphoto ne $photo) {
+		       if ($photo) {
+			   $res2 = 0;
+			   $oldres2 = 0;
+		       }
+		       $oldphoto = $photo;
+		   }
+		   if ($oldascii ne $ascii) {
+		       if ($ascii) {
+			   $res2 = 0;
+			   $oldres2 = 0;
+		       }
+		       $oldascii = $ascii;
+		   }
+		   return 0;
+	       }
+	   } },
+	 [
+	  { text => N("Standard test page"), type => 'bool',
+	    val => \$standard },
+	  ($::expert ?
+	   { text => N("Alternative test page (Letter)"), type => 'bool', 
+	     val => \$altletter } : ()),
+	  ($::expert ?
+	   { text => N("Alternative test page (A4)"), type => 'bool', 
+	     val => \$alta4 } : ()), 
+	  { text => N("Photo test page"), type => 'bool', val => \$photo },
+	  #{ text => N("Plain text test page"), type => 'bool',
+	  #  val => \$ascii }
+	  ($::isWizard ?
+	   { text => N("Do not print any test page"), type => 'bool', 
+	     val => \$res2 } : ())
+	  ]);
+    $res2 = 1 unless $standard || $altletter || $alta4 || $photo || $ascii;
+    if ($res1 && !$res2) {
+	my @lpq_output;
+	{
+	    my $w = $in->wait_message(N("Printerdrake"),
+				      N("Printing test page(s)..."));
+	    
+	    $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) };
+	    my $stdtestpage = "/usr/share/printer-testpages/testprint.ps";
+	    my $altlttestpage = "/usr/share/printer-testpages/testpage.ps";
+	    my $alta4testpage = "/usr/share/printer-testpages/testpage-a4.ps";
+	    my $phototestpage = "/usr/share/printer-testpages/photo-testpage.jpg";
+	    my $asciitestpage = "/usr/share/printer-testpages/testpage.asc";
+	    my @testpages;
+	    # Install the filter to convert the photo test page to PS
+	    if (($printer->{SPOOLER} ne "cups") && ($photo) && (!$::testing) &&
+		(!files_exist((qw(/usr/bin/convert))))) {
+		$in->do_pkgs->install('ImageMagick');
+	    }
+	    # set up list of pages to print
+	    $standard && push (@testpages, $stdtestpage);
+	    $altletter && push (@testpages, $altlttestpage);
+	    $alta4 && push (@testpages, $alta4testpage);
+	    $photo && push (@testpages, $phototestpage);
+	    $ascii && push (@testpages, $asciitestpage);
+	    # print the stuff
+	    @lpq_output = printer::main::print_pages($printer, @testpages);
+	}
+	my $dialogtext;
+	if (@lpq_output) {
+	    $dialogtext = N("Test page(s) have been sent to the printer.
+It may take some time before the printer starts.
+Printing status:\n%s\n\n", @lpq_output);
+	} else {
+	    $dialogtext = N("Test page(s) have been sent to the printer.
+It may take some time before the printer starts.\n");
+	}
+	if ($printer->{NEW} == 0) {
+	    $in->ask_warn('',$dialogtext);
+	    return 1;
+	} else {
+	    $in->ask_yesorno('',$dialogtext . N("Did it work properly?"), 1) 
+		and return 1;
+	}
+    } else {
+	return ($::isWizard ? $res1 : 1);
+    }
+    return 2;
+}
+
+sub printer_help {
+    my ($printer, $in) = @_;
+    my $spooler = $printer->{SPOOLER};
+    my $queue = $printer->{QUEUE};
+    my $default = $printer->{DEFAULT};
+    my $raw = 0;
+    my $cupsremote = 0;
+    my $scanning = "";
+    my $photocard = "";
+    if ($printer->{configured}{$queue}) {
+	if (($printer->{configured}{$queue}{queuedata}{model} eq
+	     N("Unknown model")) ||
+	    ($printer->{configured}{$queue}{queuedata}{model} eq
+	     N("Raw printer"))) {
+	    $raw = 1;
+	}
+	# Information about scanning with HP's multi-function devices
+	$scanning = scanner_help
+	    ($printer->{configured}{$queue}{queuedata}{make} . " " .
+	     $printer->{configured}{$queue}{queuedata}{model}, 
+	     $printer->{configured}{$queue}{queuedata}{connect});
+	if ($scanning) {
+	    $scanning = "\n\n$scanning\n\n";
+	}
+	# Information about photo card access with HP's multi-function devices
+	$photocard = photocard_help
+	    ($printer->{configured}{$queue}{queuedata}{make} . " " .
+	     $printer->{configured}{$queue}{queuedata}{model}, 
+	     $printer->{configured}{$queue}{queuedata}{connect});
+	if ($photocard) {
+	    $photocard = "\n\n$photocard\n\n";
+	}
+    } else {
+	$cupsremote = 1;
+    }
+
+    my $dialogtext;
+    if ($spooler eq "cups") {
+	$dialogtext =
+N("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
+", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
+N("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.
+") .
+(!$raw ?
+N("
+The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
+(!$cupsremote ?
+ N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s
+
+", $scanning, $photocard) . printer::main::help_output($printer, 'lpd') : 
+ $scanning . $photocard .
+ N("Here is a list of the available printing options for the current printer:
+
+") . printer::main::help_output($printer, 'lpd')) : $scanning . $photocard);
+    } elsif ($spooler eq "lprng") {
+	$dialogtext =
+N("To print a file from the command line (terminal window) use the command \"%s <file>\".
+", ($queue ne $default ? "lpr -P $queue" : "lpr")) . 
+N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
+") .
+(!$raw ?
+N("
+The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) .
+N("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard);
+    } elsif ($spooler eq "lpd") {
+	$dialogtext =
+N("To print a file from the command line (terminal window) use the command \"%s <file>\".
+", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
+N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
+") .
+(!$raw ?
+N("
+The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
+N("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard);
+    } elsif ($spooler eq "pdq") {
+	$dialogtext =
+N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".
+", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) .
+N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
+") .
+N("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.
+If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams.
+") .
+(!$raw ?
+N("
+The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\".
+", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) .
+N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s
+
+", $scanning, $photocard) . printer::main::help_output($printer, 'pdq') :
+ $scanning . $photocard);
+    }
+    my $windowtitle = ($scanning ?
+                       ($photocard ?
+			N("Printing/Scanning/Photo Cards on \"%s\"", $queue) :
+			N("Printing/Scanning on \"%s\"", $queue)) :
+                       ($photocard ?
+			N("Printing/Photo Card Access on \"%s\"", $queue) :
+			N("Printing on the printer \"%s\"", $queue)));
+    if (!$raw && !$cupsremote) {
+        my $choice;
+        while ($choice ne N("Close")) {
+	    $choice = $in->ask_from_list_
+	        ($windowtitle, $dialogtext,
+		 [ N("Print option list"), N("Close") ],
+		 N("Close"));
+	    if ($choice ne N("Close")) {
+		my $w = $in->wait_message(N("Printerdrake"),
+					  N("Printing test page(s)..."));
+	        printer::main::print_optionlist($printer);
+	    }
+	}
+    } else {
+	$in->ask_warn($windowtitle, $dialogtext);
+    }
+}
+
+sub scanner_help {
+    my ($makemodel, $deviceuri) = @_;
+    if ($deviceuri =~ m!^ptal:/(.*)$!) {
+	my $ptaldevice = $1;
+	if (($makemodel !~ /HP\s+PhotoSmart/i) &&
+	    ($makemodel !~ /HP\s+LaserJet\s+2200/i)) {
+	    # Models with built-in scanner
+	    return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.
+
+Do not use \"scannerdrake\" for this device!",
+		     $ptaldevice);
+	} else {
+	    # Scanner-less models
+	    return "";
+	}
+    }
+}
+
+sub photocard_help {
+    my ($makemodel, $deviceuri) = @_;
+    if ($deviceuri =~ m!^ptal:/(.*)$!) {
+	my $ptaldevice = $1;
+	if ((($makemodel =~ /HP\s+PhotoSmart/i) ||
+	     ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
+	     ($makemodel =~ /HP\s+PSC\s*22\d\d/i) ||
+	     ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) &&
+	    ($makemodel !~ /HP\s+PhotoSmart\s+7150/i)) {
+	    # Models with built-in photo card drives
+	    return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.",
+		     $ptaldevice);
+	} else {
+	    # Photo-card-drive-less models
+	    return "";
+	}
+    }
+}
+
+sub copy_queues_from {
+    my ($printer, $in, $oldspooler) = @_;
+
+    $in->set_help('copyQueues') if $::isInstall;
+    my $newspooler = $printer->{SPOOLER};
+    my @oldqueues;
+    my @queueentries;
+    my @queuesselected;
+    my $newspoolerstr;
+    my $oldspoolerstr;
+    my $noninteractive = 0;
+    {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Reading printer data..."));
+	@oldqueues = printer::main::get_copiable_queues($oldspooler, $newspooler);
+	@oldqueues = sort(@oldqueues);
+	$newspoolerstr = $printer::shortspooler_inv{$newspooler};
+	$oldspoolerstr = $printer::shortspooler_inv{$oldspooler};
+	foreach (@oldqueues) {
+	    push (@queuesselected, 1);
+	    push (@queueentries, { text => $_, type => 'bool', 
+				   val => \$queuesselected[$#queuesselected] } );
+	}
+	# LPRng and LPD use the same config files, therefore one sees the 
+	# queues of LPD when one uses LPRng and vice versa, but these queues
+	# do not work. So automatically transfer all queues when switching
+	# between LPD and LPRng.
+	if (($oldspooler =~ /^lp/) && ($newspooler =~ /^lp/)) {
+	    $noninteractive = 1;
+	}
+    }
+    if ($noninteractive ||
+	$in->ask_from_
+	({ title => N("Transfer printer configuration"),
+	   messages => N("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.
+Not all queues can be transferred due to the following reasons:
+", $oldspoolerstr, $newspoolerstr) .
+($newspooler eq "cups" ? N("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.
+") :
+ ($newspooler eq "pdq" ? N("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.
+") :
+  N("LPD and LPRng do not support IPP printers.
+"))) .
+N("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") .
+($oldspooler eq "cups" ? N("
+Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.") : ()) . N("
+Mark the printers which you want to transfer and click 
+\"Transfer\"."),
+	   cancel => N("Do not transfer printers"),
+           ok => N("Transfer")
+	 },
+         \@queueentries
+      )) {
+	my $queuecopied = 0;
+	foreach (@oldqueues) {
+	    if (shift(@queuesselected)) {
+                my $oldqueue = $_;
+                my $newqueue = $_;
+                if ((!$printer->{configured}{$newqueue}) ||
+		    ($noninteractive) ||
+		    ($in->ask_from_
+	             ({ title => N("Transfer printer configuration"),
+	                messages => N("A printer named \"%s\" already exists under %s. 
+Click \"Transfer\" to overwrite it.
+You can also type a new name or skip this printer.", 
+				      $newqueue, $newspoolerstr),
+                        ok => N("Transfer"),
+                        cancel => N("Skip"),
+		        callbacks => { complete => sub {
+	                    unless ($newqueue =~ /^\w+$/) {
+				$in->ask_warn('', N("Name of printer should contain only letters, numbers and the underscore"));
+				return (1,0);
+			    }
+			    if (($printer->{configured}{$newqueue})
+				&& ($newqueue ne $oldqueue) && 
+				(!$in->ask_yesorno('', N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
+							 $newqueue),
+						   0))) {
+				return (1,0); # Let the user correct the name
+			    }
+			    return 0;
+			} }
+		    },
+		      [{label => N("New printer name"),val => \$newqueue }]))) {
+		    {
+			my $w = $in->wait_message(N("Printerdrake"), 
+			   N("Transferring %s...", $oldqueue));
+		        printer::main::copy_foomatic_queue($printer, $oldqueue,
+						   $oldspooler, $newqueue) and
+							 $queuecopied = 1;
+		    }
+		    if ($oldqueue eq $printer->{DEFAULT}) {
+			# Make the former default printer the new default
+			# printer if the user does not reject
+			if (($noninteractive) ||
+			    ($in->ask_yesorno
+			     (N("Transfer printer configuration"),
+			      N("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1))) {
+			    $printer->{DEFAULT} = $newqueue;
+			    printer::default::set_printer($printer);
+			}
+		    }
+		}
+            }
+	}
+        if ($queuecopied) {
+	    my $w = $in->wait_message(N("Printerdrake"),
+                                      N("Refreshing printer data..."));
+	    printer::main::read_configured_queues($printer);
+        }
+    }
+}
+
+sub start_network {
+    my ($in, $upNetwork) = @_;
+    my $w = $in->wait_message(N("Configuration of a remote printer"), 
+			      N("Starting network..."));
+    if ($::isInstall) {
+	return ($upNetwork and 
+		do { my $ret = &$upNetwork(); 
+		     undef $upNetwork; 
+		     sleep(1);
+		     $ret });
+    } else { return printer::services::start("network") }
+}
+
+sub check_network {
+
+    # This routine is called whenever the user tries to configure a remote
+    # printer. It checks the state of the network functionality to assure
+    # that the network is up and running so that the remote printer is
+    # reachable.
+
+    my ($printer, $in, $upNetwork, $dontconfigure) = @_;
+
+    # Any additional dialogs caused by this subroutine should appear as
+    # extra windows and not embedded in the "Add printer" wizard.
+    local $::isWizard = 0;
+
+    $in->set_help('checkNetwork') if $::isInstall;
+
+    # First check: Does /etc/sysconfig/network-scripts/drakconnect_conf exist
+    # (otherwise the network is not configured yet and drakconnect has to be
+    # started)
+
+    if ((!files_exist("/etc/sysconfig/network-scripts/drakconnect_conf")) &&
+	(!$dontconfigure)) {
+	my $go_on = 0;
+	while (!$go_on) {
+	    my $choice = N("Configure the network now");
+	    if ($in->ask_from(N("Network functionality not configured"),
+			      N("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"),
+			      [ { val => \$choice, type => 'list',
+				  list => [ N("Configure the network now"),
+					    N("Go on without configuring the network") ] } ])) {
+		if ($choice eq N("Configure the network now")) {
+		    if ($::isInstall) {
+			require network::netconnect;
+		        network::netconnect::main
+			    ($in->{prefix}, $in->{netcnx} ||= {}, 
+			     $in->{netc}, $in->{mouse}, $in, 
+			     $in->{intf}, 0,
+			     $in->{lang} eq "fr_FR" && 
+			     $in->{keyboard}{KEYBOARD} eq "fr", 0);
+		    } else {
+			system("/usr/sbin/drakconnect");
+		    }
+		    if (files_exist("/etc/sysconfig/network-scripts/drakconnect_conf")) {
+			$go_on = 1;
+		    }
+		} else {
+		    return 1;
+		}
+	    } else {
+		return 0;
+	    }
+	}
+    }
+
+    # Do not try to start the network if it is not configured
+    if (!files_exist("/etc/sysconfig/network-scripts/drakconnect_conf")) { return 0 }
+
+    # Second check: Is the network running?
+
+    if (printer::detect::network_running()) { return 1 }
+
+    # The network is configured now, start it.
+    if ((!start_network($in, $upNetwork)) && (!$dontconfigure)) {
+	$in->ask_warn(N("Configuration of a remote printer"), 
+($::isInstall ?
+N("The network configuration done during the installation cannot be started now. Please check whether the network gets accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\"") :
+N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again.")));
+	return 0;
+    }
+
+    # Give a SIGHUP to the daemon and in case of CUPS do also the
+    # automatic configuration of broadcasting/access permissions
+    # The daemon is not really restarted but only SIGHUPped to not
+    # interrupt print jobs.
+
+    my $w = $in->wait_message(N("Configuration of a remote printer"), 
+			      N("Restarting printing system..."));
+
+    return printer::main::SIGHUP_daemon($printer->{SPOOLER});
+
+}
+
+sub security_check {
+    # Check the security mode and when in "high" or "paranoid" mode ask the
+    # user whether he really wants to configure printing.
+    my ($printer, $in, $spooler) = @_;
+
+    # Any additional dialogs caused by this subroutine should appear as
+    # extra windows and not embedded in the "Add printer" wizard.
+    local $::isWizard = 0;
+
+    $in->set_help('securityCheck') if $::isInstall;
+
+    # Get security level
+    my $security;
+    if ($::isInstall) {
+	$security = $in->{security};
+    } else {
+     require any;
+	$security = any::get_secure_level();
+    }
+
+    # Exit silently if the spooler is PDQ
+    if ($spooler eq "pdq") { return 1 }
+
+    # Exit silently in medium or lower security levels
+    if ((!$security) || ($security < 4)) { return 1 }
+    
+    # Exit silently if the current spooler is already activated for the current
+    # security level
+    if (printer::main::spooler_in_security_level($spooler, $security)) { return 1 }
+
+    # Tell user in which security mode he is and ask him whether he really
+    # wants to activate the spooler in the given security mode. Stop the
+    # operation of installing the spooler if he disagrees.
+    my $securitystr = ($security == 4 ? N("high") : N("paranoid"));
+    if ($in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr),
+			 N("You are about to install the printing system %s on a system running in the %s security level.
+
+This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessable by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.
+
+Do you really want to configure printing on this machine?",
+			   $printer::main::shortspooler_inv{$spooler},
+			   $securitystr))) {
+        printer::main::add_spooler_to_security_level($spooler, $security);
+	my $service;
+	if (($spooler eq "lpr") || ($spooler eq "lprng")) {
+	    $service = "lpd";
+	} else {
+	    $service = $spooler;
+	}
+        services::start_service_on_boot($service); #TV
+	return 1;
+    } else {
+	return 0;
+    }
+}
+
+sub start_spooler_on_boot {
+    # Checks whether the spooler will be started at boot time and if not,
+    # ask the user whether he wants to start the spooler at boot time.
+    my ($printer, $in, $service) = @_;
+
+    # Any additional dialogs caused by this subroutine should appear as
+    # extra windows and not embedded in the "Add printer" wizard.
+    local $::isWizard = 0;
+
+    $in->set_help('startSpoolerOnBoot') if $::isInstall;
+    if (!services::starts_on_boot($service)) {
+	if ($in->ask_yesorno(N("Starting the printing system at boot time"),
+			     N("The printing system (%s) will not be started automatically when the machine is booted.
+
+It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks.
+
+Do you want to have the automatic starting of the printing system turned on again?",
+		       $printer::main::shortspooler_inv{$printer->{SPOOLER}}))) {
+	    services::start_service_on_boot($service);
+	}
+    }
+    1;
+}
+
+sub install_spooler {
+    # installs the default spooler and start its daemon
+    my ($printer, $in, $upNetwork) = @_;
+    if (!$::testing) {
+	# If the user refuses to install the spooler in high or paranoid
+	# security level, exit.
+	return 0 unless security_check($printer, $in, $printer->{SPOOLER});
+	if ($printer->{SPOOLER} eq "cups") {
+	    {
+		my $w = $in->wait_message(N("Printerdrake"),
+					  N("Checking installed software..."));
+		if ((!$::testing) &&
+		    (!files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi
+						/sbin/ifconfig
+						/usr/bin/xpp),
+					     ($::expert ? 
+					      "/usr/share/cups/model/postscript.ppd.gz" : ())
+					    )))) {
+		    $in->do_pkgs->install(('cups', 'net-tools', 'xpp',
+					   ($::expert ? 'cups-drivers' : ())));
+		}
+		if ((!$::testing) &&
+		    ((!files_exist((qw(/usr/bin/wget)))) &&
+		     (!files_exist((qw(/usr/bin/curl)))))) {
+		    $in->do_pkgs->install
+			($::isInstall ? 'curl' : 'webfetch');
+		}
+		# Try to start the network when CUPS is the spooler, so that
+		# remote CUPS printers get displayed (especially during
+		# installation)
+		$upNetwork and do {
+		    &$upNetwork(); 
+		    undef $upNetwork; 
+		    sleep(1);
+		};
+		# Start daemon
+		# Avoid unnecessary restarting of CUPS, this blocks the
+		# startup of printerdrake for several seconds.
+		printer::services::start_not_running_service("cups");
+		# Set the CUPS tools as defaults for "lpr", "lpq", "lprm", ...
+	        set_alternative("lpr","/usr/bin/lpr-cups");
+	        set_alternative("lpq","/usr/bin/lpq-cups");
+	        set_alternative("lprm","/usr/bin/lprm-cups");
+	        set_alternative("lp","/usr/bin/lp-cups");
+	        set_alternative("cancel","/usr/bin/cancel-cups");
+	        set_alternative("lpstat","/usr/bin/lpstat-cups");
+	        set_alternative("lpc","/usr/sbin/lpc-cups");
+		# Remove PDQ panic buttons from the user's KDE Desktops
+	        printer::main::pdq_panic_button("remove");
+	    }
+	    # Should it be started at boot time?
+	    start_spooler_on_boot($printer, $in, "cups");
+	} elsif ($printer->{SPOOLER} eq "lpd") {
+	    {
+		my $w = $in->wait_message(N("Printerdrake"), 
+					  N("Checking installed software..."));
+		# "lpr" conflicts with "LPRng", remove "LPRng"
+		if ((!$::testing) &&
+		    (files_exist((qw(/usr/lib/filters/lpf))))) {
+		    my $w = $in->wait_message(N("Printerdrake"),
+					      N("Removing LPRng..."));
+		    $in->do_pkgs->remove_nodeps('LPRng');
+		}
+		if ((!$::testing) &&
+		    (!files_exist((qw(/usr/sbin/lpf
+					       /usr/sbin/lpd
+					       /sbin/ifconfig
+					       /usr/bin/gpr
+					       /usr/bin/a2ps
+					       /usr/bin/convert))))) {
+		    $in->do_pkgs->install(('lpr', 'net-tools', 'gpr', 'a2ps', 'ImageMagick'));
+		}
+		# Start the network (especially during installation), so the
+		# user can set up queues to remote printers.
+		$upNetwork and do {
+		    &$upNetwork(); 
+		    undef $upNetwork; 
+		    sleep(1);
+		};
+		# Start daemon
+	        printer::services::restart("lpd");
+		# Set the LPD tools as defaults for "lpr", "lpq", "lprm", ...
+	        set_alternative("lpr","/usr/bin/lpr-lpd");
+	        set_alternative("lpq","/usr/bin/lpq-lpd");
+	        set_alternative("lprm","/usr/bin/lprm-lpd");
+	        set_alternative("lpc","/usr/sbin/lpc-lpd");
+		# Remove PDQ panic buttons from the user's KDE Desktops
+	        printer::main::pdq_panic_button("remove");
+	    }
+	    # Should it be started at boot time?
+	    start_spooler_on_boot($printer, $in, "lpd");
+	} elsif ($printer->{SPOOLER} eq "lprng") {
+	    {
+		my $w = $in->wait_message(N("Printerdrake"),
+					  N("Checking installed software..."));
+		# "LPRng" conflicts with "lpr", remove "lpr"
+		if ((!$::testing) &&
+		    (files_exist((qw(/usr/sbin/lpf))))) {
+		    my $w = $in->wait_message(N("Printerdrake"),
+					      N("Removing LPD..."));
+		    $in->do_pkgs->remove_nodeps('lpr');
+		}
+		if ((!$::testing) &&
+		    (!files_exist((qw(/usr/lib/filters/lpf
+					       /usr/sbin/lpd
+					       /sbin/ifconfig
+					       /usr/bin/gpr
+					       /usr/bin/a2ps
+					       /usr/bin/convert))))) {
+		    $in->do_pkgs->install('LPRng', 'net-tools', 'gpr', 'a2ps', 'ImageMagick');
+		}
+		# Start the network (especially during installation), so the
+		# user can set up queues to remote printers.
+		$upNetwork and do {
+		    &$upNetwork(); 
+		    undef $upNetwork; 
+		    sleep(1);
+		};
+		# Start daemon
+	        printer::services::restart("lpd");
+		# Set the LPRng tools as defaults for "lpr", "lpq", "lprm", ...
+	        set_alternative("lpr","/usr/bin/lpr-lpd");
+	        set_alternative("lpq","/usr/bin/lpq-lpd");
+	        set_alternative("lprm","/usr/bin/lprm-lpd");
+	        set_alternative("lp","/usr/bin/lp-lpd");
+	        set_alternative("cancel","/usr/bin/cancel-lpd");
+	        set_alternative("lpstat","/usr/bin/lpstat-lpd");
+	        set_alternative("lpc","/usr/sbin/lpc-lpd");
+		# Remove PDQ panic buttons from the user's KDE Desktops
+	        printer::main::pdq_panic_button("remove");
+	    }
+	    # Should it be started at boot time?
+	    start_spooler_on_boot($printer, $in, "lpd");
+	} elsif ($printer->{SPOOLER} eq "pdq") {
+	    {
+		my $w = $in->wait_message(N("Printerdrake"),
+					  N("Checking installed software..."));
+		if ((!$::testing) &&
+		    (!files_exist((qw(/usr/bin/pdq
+					       /usr/X11R6/bin/xpdq))))) {
+		    $in->do_pkgs->install('pdq');
+		}
+		# Start the network (especially during installation), so the
+		# user can set up queues to remote printers.
+		$upNetwork and do {
+		    &$upNetwork(); 
+		    undef $upNetwork; 
+		    sleep(1);
+		};
+		# PDQ has no daemon, so nothing needs to be started
+		
+		# Set the PDQ tools as defaults for "lpr", "lpq", "lprm", ...
+	        set_alternative("lpr","/usr/bin/lpr-pdq");
+	        set_alternative("lpq","/usr/bin/lpq-foomatic");
+	        set_alternative("lprm","/usr/bin/lprm-foomatic");
+		# Add PDQ panic buttons to the user's KDE Desktops
+	        printer::main::pdq_panic_button("add");
+	    }
+	}
+	# Give a SIGHUP to the devfsd daemon to correct the permissions
+	# for the /dev/... files according to the spooler
+	printer::main::SIGHUP_daemon("devfs");
+    }
+    1;
+}
+
+sub setup_default_spooler {
+    my ($printer, $in, $upNetwork) = @_;
+    $in->set_help('setupDefaultSpooler') if $::isInstall;
+    $printer->{SPOOLER} ||= 'cups';
+    my $oldspooler = $printer->{SPOOLER};
+    my $str_spooler = 
+	$in->ask_from_list_(N("Select Printer Spooler"),
+			    N("Which printing system (spooler) do you want to use?"),
+			    [ printer::main::spooler() ],
+			    $printer::spooler_inv{$printer->{SPOOLER}},
+			    ) or return;
+    $printer->{SPOOLER} = $printer::spooler{$str_spooler};
+    # Install the spooler if not done yet
+    if (!install_spooler($printer, $in, $upNetwork)) {
+	$printer->{SPOOLER} = $oldspooler;
+	return;
+    }
+    if ($printer->{SPOOLER} ne $oldspooler) {
+	# Remove the local printers from Star Office/OpenOffice.org/GIMP
+	printer::main::removelocalprintersfromapplications($printer);
+	# Get the queues of this spooler
+	{
+	    my $w = $in->wait_message(N("Printerdrake"),
+				      N("Reading printer data..."));
+	    printer::main::read_configured_queues($printer);
+	}
+	# Copy queues from former spooler
+	copy_queues_from($printer, $in, $oldspooler);
+	# Re-read the printer database (CUPS has additional drivers, PDQ
+	# has no raw queue)
+	%printer::main::thedb = ();
+	#my $w = $in->wait_message(N("Printerdrake"),
+	#                          N("Reading printer database..."));
+	#printer::main::read_printer_db($printer->{SPOOLER});
+    }
+    # Save spooler choice
+    printer::default::set_spooler($printer);
+    return $printer->{SPOOLER};
+}
+
+sub configure_queue {
+    my ($printer, $in) = @_;
+    my $w = $in->wait_message(N("Printerdrake"),
+			      N("Configuring printer \"%s\"...",
+				$printer->{currentqueue}{queue}));
+    $printer->{complete} = 1;
+    printer::main::configure_queue($printer);
+    $printer->{complete} = 0;
+}
+
+sub install_foomatic {
+    my ($in) = @_;
+    if ((!$::testing) &&
+	(!files_exist((qw(/usr/bin/foomatic-configure
+				       /usr/lib/perl5/vendor_perl/5.8.0/Foomatic/DB.pm)
+				    )))) {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Installing Foomatic..."));
+	$in->do_pkgs->install('foomatic');
+    }
+}
+
+sub wizard_close {
+    my ($in, $mode) = @_;
+    # Leave wizard mode with congratulations screen if $mode = 1
+    $::Wizard_no_previous = 1;
+    $::Wizard_no_cancel = 1;
+    $::Wizard_finished = 1;
+    wizard_congratulations($in) if $mode == 1;
+    undef $::isWizard;
+    $::WizardWindow->destroy if defined $::WizardWindow;
+    undef $::WizardWindow;
+};
+
+#- Program entry point for configuration of the printing system.
+sub main {
+    my ($printer, $in, $ask_multiple_printer, $upNetwork) = @_;
+
+    # Save the user mode, so that the same one is used on the next start
+    # of Printerdrake
+    printer::main::set_usermode($::expert);
+
+    # Default printer name, we do not use "lp" so that one can switch the
+    # default printer under LPD without needing to rename another printer.
+    # Under LPD the alias "lp" will be given to the default printer.
+    my $defaultprname = N("Printer");
+
+    # printerdrake does not work without foomatic, and for more convenience
+    # we install some more stuff
+    {
+	my $w = $in->wait_message(N("Printerdrake"),
+				  N("Checking installed software..."));
+	if ((!$::testing) &&
+	    (!files_exist((qw(/usr/bin/foomatic-configure
+				       /usr/lib/perl5/vendor_perl/5.8.0/Foomatic/DB.pm
+				       /usr/bin/escputil
+				       /usr/share/printer-testpages/testprint.ps
+				       /usr/bin/nmap
+				       /usr/bin/scli
+				       ),
+				    (files_exist("/usr/bin/gimp") ?
+				     "/usr/lib/gimp/1.2/plug-ins/print" : ())
+				    )))) {
+	    $in->do_pkgs->install('foomatic','printer-utils','printer-testpages','nmap','scli',
+				  if_($in->do_pkgs->is_installed('gimp'), 'gimpprint'));
+	}
+
+	# only experts should be asked for the spooler
+	$printer->{SPOOLER} ||= 'cups' if $::expert;
+
+    }
+
+    # If we have chosen a spooler, install it and mark it as default spooler
+    if (($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '')) {
+	if (!install_spooler($printer, $in, $upNetwork)) { return }
+        printer::default::set_spooler($printer);
+    }
+
+    # Turn on printer autodetection by default
+    $printer->{AUTODETECT} = 1;
+    $printer->{AUTODETECTLOCAL} = 1;
+    $printer->{AUTODETECTNETWORK} = 1;
+    $printer->{AUTODETECTSMB} = 1;
+
+    # Control variables for the main loop
+    my ($menuchoice, $cursorpos, $queue, $continue, $newqueue, $editqueue, $expertswitch, $menushown) = ('', '::', $defaultprname, 1, 0, 0, 0, 0);
+    # Cursor position in queue modification window
+    my $modify = N("Printer options");
+    while ($continue) {
+	$newqueue = 0;
+	# When the queue list is not shown, cancelling the printer type
+	# dialog should leave the program
+	$continue = 0;
+	# Get the default printer
+	if (defined($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '') &&
+	    ((!defined($printer->{DEFAULT})) || ($printer->{DEFAULT} eq ''))) {
+	    my $w = $in->wait_message(N("Printerdrake"),
+				      N("Preparing Printerdrake..."));
+	    $printer->{DEFAULT} = printer::default::get_printer($printer);
+	    if ($printer->{DEFAULT}) {
+		# If a CUPS system has only remote printers and no default
+		# printer defined, it defines the first printer whose
+		# broadcast signal appeared after the start of the CUPS
+		# daemon, so on every start another printer gets the default
+		# printer. To avoid this, make sure that the default printer
+		# is defined.
+		printer::default::set_printer($printer);
+	    } else { $printer->{DEFAULT} = '' }
+	}
+
+	# Configure the current printer queues in applications
+	{
+	    my $w = $in->wait_message(N("Printerdrake"),
+				      N("Configuring applications..."));
+	    printer::main::configureapplications($printer);
+	}
+
+	if ($editqueue) {
+	    # The user was either in the printer modification dialog and did
+	    # not close it or he had set up a new queue and said that the test
+	    # page didn't come out correctly, so let the user edit the queue.
+	    $newqueue = 0;
+	    $continue = 1;
+	    $editqueue = 0;
+	} else {
+	    # Reset modification window cursor when one leaves the window
+	    $modify = N("Printer options");
+	    if (!$ask_multiple_printer && 
+		%{$printer->{configured} || {}} == ()) {
+		$in->set_help('doYouWantToPrint') if $::isInstall;
+		$newqueue = 1;
+		$menuchoice = $printer->{want} || 
+		    $in->ask_yesorno(N("Printer"),
+				    N("Would you like to configure printing?"),
+				    0) ? "\@addprinter" : "\@quit";
+		if ($menuchoice ne "\@quit") {
+		    $printer->{SPOOLER} ||= 
+			setup_default_spooler ($printer, $in, $upNetwork) ||
+			    return;
+		}
+	    } else {
+		# Ask for a spooler when none is defined
+		$printer->{SPOOLER} ||=  setup_default_spooler ($printer, $in, $upNetwork) || return;
+		# This entry and the check for this entry have to use
+		# the same translation to work properly
+		my $spoolerentry = N("Printing system: ");
+		# If networking is configured, start it, but don't ask the
+		# user to configure networking. We want to know whether we
+		# have a local network, to suppress some buttons in the
+		# recommended mode
+		my $havelocalnetworks_or_expert =
+		    (($::expert) ||
+		     (check_network($printer, $in, $upNetwork, 1) && 
+		      (printer::detect::getIPsInLocalNetworks() != ())));
+		# Show a queue list window when there is at least one queue,
+		# when we are in expert mode, or when we are not in the
+		# installation.
+		if (%{$printer->{configured} || {}} || $::expert || !$::isInstall) {
+		    $in->set_help('mainMenu') if $::isInstall;
+		    # Cancelling the printer type dialog should leed to this
+		    # dialog
+		    $continue = 1;
+		    # This is for the "Recommended" installation. When one has
+		    # no printer queue printerdrake starts directly adding
+		    # a printer and in the end it asks whether one wants to
+		    # install another printer. If the user says "Yes", he
+		    # arrives in the main menu of printerdrake. From now
+		    # on the question is not asked any more but the menu
+		    # is shown directly after having done an operation.
+		    $menushown = 1;
+		    # Initialize the cursor position
+		    if (($cursorpos eq "::") && 
+			($printer->{DEFAULT}) &&
+			($printer->{DEFAULT} ne "")) {
+			if ($printer->{configured}{$printer->{DEFAULT}}) {
+			    $cursorpos = 
+				$printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . N(" (Default)");
+			} elsif ($printer->{SPOOLER} eq "cups") {
+			    ($cursorpos) = 
+				grep { /!$printer->{DEFAULT}:[^!]*$/ }
+			    printer::main::get_cups_remote_queues($printer);
+			}
+		    }
+		    # Generate the list of available printers
+		    my @printerlist = 
+			((sort((map { $printer->{configured}{$_}{queuedata}{menuentry} 
+				      . ($_ eq $printer->{DEFAULT} ?
+					 N(" (Default)") : ("")) }
+				 keys(%{$printer->{configured}
+					|| {}})),
+				($printer->{SPOOLER} eq "cups" ?
+				 printer::main::get_cups_remote_queues($printer) :
+				 ())))
+			  );
+		    my $noprinters = ($#printerlist < 0);
+		    # Position the cursor where it were before (in case
+		    # a button was pressed).
+		    $menuchoice = $cursorpos;
+		    # Show the main dialog
+		    $in->ask_from_(
+			{ title => N("Printerdrake"),
+			 messages =>
+			     ($noprinters ? "" :
+			      (($printer->{SPOOLER} eq "cups") ?
+			       N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; to view information about it; or to make a printer on a remote CUPS server available for Star Office/OpenOffice.org/GIMP.") :
+			       N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."))),
+			 cancel => (""),
+			 ok => (""),
+			},
+			# List the queues
+			[ ($noprinters ? () :
+			   { val => \$menuchoice, format => \&translate,
+			     sort => 0, separator => "!",tree_expanded => 1,
+			     quit_if_double_click => 1,allow_empty_list =>1,
+			     list => \@printerlist }),
+			  { clicked_may_quit =>
+			    sub { 
+				# Save the cursor position
+				$cursorpos = $menuchoice;
+				$menuchoice = "\@addprinter";
+				1; 
+			    },
+			    val => N("Add a new printer") },
+			  ((($printer->{SPOOLER} eq "cups") &&
+			    ($havelocalnetworks_or_expert)) ?
+			    ({ clicked_may_quit =>
+				   sub { 
+				       # Save the cursor position
+				       $cursorpos = $menuchoice;
+				       $menuchoice = "\@refresh";
+				       1;
+				   },
+			       val => N("Refresh printer list (to display all available remote CUPS printers)") },
+			     { clicked_may_quit =>
+				   sub { 
+				       # Save the cursor position
+				       $cursorpos = $menuchoice;
+				       $menuchoice = "\@cupsconfig";
+				       1;
+				   },
+			       val => ($::expert ? N("CUPS configuration") :
+				       N("Specify CUPS server")) }) : ()),
+			  ($::expert ?
+			    { clicked_may_quit =>
+				  sub {
+				      # Save the cursor position
+				      $cursorpos = $menuchoice;
+				      $menuchoice = "\@spooler";
+				      1;
+				  },
+				  val => N("Change the printing system") } :
+			    ()),
+			  (!$::isInstall ?
+			    { clicked_may_quit =>
+				  sub { $menuchoice = "\@usermode"; 1 },
+				  val => ($::expert ? N("Normal Mode") :
+					  N("Expert Mode")) } : ()),
+			  { clicked_may_quit =>
+			    sub { $menuchoice = "\@quit"; 1 },
+			    val => ($::isEmbedded || $::isInstall ?
+				    N("Done") : N("Quit")) },
+			  ]
+		    );
+		    # Toggle expert mode and standard mode
+		    if ($menuchoice eq "\@usermode") {
+			printer::main::set_usermode(!$::expert);
+			# make sure that the "cups-drivers" package gets
+			# installed when switching into expert mode
+			if (($::expert) && ($printer->{SPOOLER} eq "cups")) {
+			    install_spooler($printer, $in, $upNetwork);
+			}
+			# Read printer database for the new user mode
+			%printer::main::thedb = ();
+			#my $w = $in->wait_message(N("Printerdrake"), 
+			#                   N("Reading printer database..."));
+		        #printer::main::read_printer_db($printer->{SPOOLER});
+			# Re-read printer queues to switch the tree
+			# structure between expert/normal mode.
+			my $w = $in->wait_message
+			    (N("Printerdrake"), 
+			     N("Reading printer data..."));
+			printer::main::read_configured_queues($printer);
+			$cursorpos = "::";
+			next;
+		    }
+		} else {
+		    #- as there are no printer already configured, Add one
+		    #- automatically.
+		    $menuchoice = "\@addprinter"; 
+		}
+		# Refresh printer list
+		if ($menuchoice eq "\@refresh") {
+		    next;
+		}
+		# Configure CUPS
+		if ($menuchoice eq "\@cupsconfig") {
+		    config_cups($printer, $in, $upNetwork);
+		    next;
+		}
+	        # Determine a default name for a new printer queue
+		if ($menuchoice eq "\@addprinter") {
+		    $newqueue = 1;
+		    my %queues; 
+		    @queues{map { split '\|', $_ } keys %{$printer->{configured}}} = ();
+		    my $i = ''; while ($i < 150) { last unless exists $queues{"$defaultprname$i"}; ++$i }
+		    $queue = "$defaultprname$i";
+		}
+		# Function to switch to another spooler
+		if ($menuchoice eq "\@spooler") {
+		    $printer->{SPOOLER} = setup_default_spooler ($printer, $in, $upNetwork) || $printer->{SPOOLER};
+		    next;
+		}
+		# Rip the queue name out of the chosen menu entry
+		if ($menuchoice =~ /!([^\s!:]+):[^!]*$/) {
+		    $queue = $1;
+		    # Save the cursor position
+		    $cursorpos = $menuchoice;
+		}
+	    }
+	    # Save the default spooler
+	    printer::default::set_spooler($printer);
+	    #- Close printerdrake
+	    $menuchoice eq "\@quit" and last;
+	}
+	if ($newqueue) {
+	    $printer->{NEW} = 1;
+	    #- Set default values for a new queue
+	    $printer::printer_type_inv{$printer->{TYPE}} or 
+		$printer->{TYPE} = printer::default::printer_type($printer);
+	    $printer->{currentqueue} = { queue    => $queue,
+					 foomatic => 0,
+					 desc     => "",
+					 loc      => "",
+					 make     => "",
+					 model    => "",
+					 printer  => "",
+					 driver   => "",
+					 connect  => "",
+					 spooler  => $printer->{SPOOLER},
+				       };
+	    #- Set OLD_QUEUE field so that the subroutines for the
+	    #- configuration work correctly.
+	    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
+	    #- Do all the configuration steps for a new queue
+	  step_0:
+	    #if ((!$::expert) && (!$::isEmbedded) && (!$::isInstall) &&
+	    if ((!$::isEmbedded) && (!$::isInstall) &&
+	    #if ((!$::isInstall) &&
+		($in->isa('interactive::gtk'))) {
+		$continue = 1;
+		# Enter wizard mode
+		$::Wizard_pix_up = "wiz_printerdrake.png";
+		$::Wizard_title = N("Add a new printer");
+		$::isWizard = 1;
+		# Wizard welcome screen
+		$::Wizard_no_previous = 1;
+		undef $::Wizard_no_cancel; undef $::Wizard_finished;
+		wizard_welcome($printer, $in, $upNetwork) or do {
+		    wizard_close($in, 0);
+		    next;
+		};
+		undef $::Wizard_no_previous;
+		eval { 
+		    # eval to catch wizard cancel. The wizard stuff should 
+		    # be in a separate function with steps. see dragw.
+		    # (dams)
+		    $::expert or $printer->{TYPE} = "LOCAL";
+		  step_1:
+		    !$::expert or choose_printer_type($printer, $in) or
+			goto step_0;
+		  step_2:
+		    setup_printer_connection($printer, $in, $upNetwork) or 
+			do {
+			    goto step_1 if $::expert;
+			    goto step_0;
+			};
+		  step_3:
+		    if (($::expert) or ($printer->{MANUAL}) or
+			($printer->{MORETHANONE})) {
+			choose_printer_name($printer, $in) or
+			    goto step_2;
+		    }
+		    get_db_entry($printer, $in);
+		  step_3_9:
+		    if ((!$::expert) and (!$printer->{MANUAL})) {
+			is_model_correct($printer, $in) or do {
+			    goto step_3 if $printer->{MORETHANONE};
+			    goto step_2;
+			}
+		    }
+		  step_4:
+		    # Remember DB entry for "Previous" button in wizard
+		    my $dbentry = $printer->{DBENTRY};
+		    if (($::expert) or ($printer->{MANUAL}) or
+			($printer->{MANUALMODEL})) { 
+			choose_model($printer, $in) or do {
+			    # Restore DB entry
+			    $printer->{DBENTRY} = $dbentry;
+			    goto step_3_9 if $printer->{MANUALMODEL};
+			    goto step_3;
+			};
+		    }
+		    get_printer_info($printer, $in) or next;
+		  step_5:
+		    setup_options($printer, $in) or
+			goto step_4;
+		    configure_queue($printer, $in);
+		    undef $printer->{MANUAL} if $printer->{MANUAL};
+		    $::Wizard_no_previous = 1;
+		    setasdefault($printer, $in);
+		    $cursorpos = 
+			$printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} .
+			($printer->{QUEUE} eq $printer->{DEFAULT} ?
+			 N(" (Default)") : ());
+		    my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
+		    if ($testpages == 1) {
+			# User was content with test pages
+			# Leave wizard mode with congratulations screen
+			wizard_close($in, 1);
+			$continue = ($::expert || !$::isInstall || $menushown ||
+				     $in->ask_yesorno('',N("Do you want to configure another printer?")));
+		    } elsif ($testpages == 2) {
+			# User was not content with test pages
+			# Leave wizard mode without congratulations
+			# screen
+			wizard_close($in, 0);
+			$editqueue = 1;
+			$queue = $printer->{QUEUE};
+		    }
+		};
+		wizard_close($in, 0) if $@ =~ /wizcancel/;
+	    } else {
+		$::expert or $printer->{TYPE} = "LOCAL";
+		wizard_welcome($printer, $in, $upNetwork) or next;
+		!$::expert or choose_printer_type($printer, $in) or next;
+		#- Cancelling the printer connection type window
+		#- should not restart printerdrake in recommended mode,
+		#- it is the first dialog of the sequence there and
+		#- the "Add printer" sequence should be stopped when there
+		#- are no local printers. In expert mode this is the second
+		#- dialog of the sequence.
+		$continue = 1;
+		setup_printer_connection($printer, $in, $upNetwork) or next;
+		#- Cancelling one of the following dialogs should
+		#- restart printerdrake
+		if (($::expert) or ($printer->{MANUAL}) or
+		    ($printer->{MORETHANONE})) {
+		    choose_printer_name($printer, $in) or next;
+		}
+		get_db_entry($printer, $in);
+		if ((!$::expert) and (!$printer->{MANUAL})) {
+		    is_model_correct($printer, $in) or next;
+		}
+		if (($::expert) or ($printer->{MANUAL}) or
+		    ($printer->{MANUALMODEL})) { 
+		    choose_model($printer, $in) or next;
+		}
+		get_printer_info($printer, $in) or next;
+		setup_options($printer, $in) or next;
+		configure_queue($printer, $in);
+		undef $printer->{MANUAL} if $printer->{MANUAL};
+		setasdefault($printer, $in);
+		$cursorpos = 
+		    $printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} .
+		    ($printer->{QUEUE} eq $printer->{DEFAULT} ?
+		     N(" (Default)") : ());
+		my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
+		if ($testpages == 1) {
+		    # User was content with test pages
+		    $continue = ($::expert || !$::isInstall || $menushown ||
+				 $in->ask_yesorno('',N("Do you want to configure another printer?")));
+		} elsif ($testpages == 2) {
+		    # User was not content with test pages
+		    $editqueue = 1;
+		    $queue = $printer->{QUEUE};
+		}
+	    };
+	    undef $printer->{MANUAL} if $printer->{MANUAL};
+	} else {
+	    $printer->{NEW} = 0;
+	    # Modify a queue, ask which part should be modified
+	    $in->set_help('modifyPrinterMenu') if $::isInstall;
+	    # Get some info to display
+	    my $infoline;
+	    if ($printer->{configured}{$queue}) {
+		# Here we must regenerate the menu entry, because the
+		# parameters can be changed.
+		printer::main::make_menuentry($printer,$queue);
+		$printer->{configured}{$queue}{queuedata}{menuentry} =~
+		    /!([^!]+)$/;
+		$infoline = $1 .
+		    ($queue eq $printer->{DEFAULT} ? N(" (Default)") : ()) .
+		    ($printer->{configured}{$queue}{queuedata}{desc} ?
+		     ", Descr.: $printer->{configured}{$queue}{queuedata}{desc}" : ()) .
+		    ($printer->{configured}{$queue}{queuedata}{loc} ?
+		     ", Loc.: $printer->{configured}{$queue}{queuedata}{loc}" : ()) .
+		    ($::expert ?
+		     ", Driver: $printer->{configured}{$queue}{queuedata}{driver}" : ());
+	    } else {
+		# The parameters of a remote CUPS queue cannot be changed,
+		# so we can simply take the menu entry.
+		$cursorpos =~ /!([^!]+)$/;
+		$infoline = $1;
+	    }
+	    if ($in->ask_from_
+		   ({ title => N("Modify printer configuration"),
+		      messages => 
+			   N("Printer %s
+What do you want to modify on this printer?",
+			     $infoline),
+		     cancel => N("Close"),
+		     ok => N("Do it!")
+		     },
+		    [ { val => \$modify, format => \&translate, 
+			type => 'list',
+			list => [ ($printer->{configured}{$queue} ?
+				   (N("Printer connection type"),
+				    N("Printer name, description, location"),
+				    ($::expert ?
+				     N("Printer manufacturer, model, driver") :
+				     N("Printer manufacturer, model")),
+				    (($printer->{configured}{$queue}{queuedata}{make} ne
+				      "") &&
+				     (($printer->{configured}{$queue}{queuedata}{model} ne
+				       N("Unknown model")) &&
+				      ($printer->{configured}{$queue}{queuedata}{model} ne
+				       N("Raw printer"))) ?
+				     N("Printer options") : ())) : ()),
+				   (($queue ne $printer->{DEFAULT}) ?
+				    N("Set this printer as the default") : ()),
+				   ($printer->{configured}{$queue} ? () :
+				    (N("Add this printer to Star Office/OpenOffice.org/GIMP"),
+				     N("Remove this printer from Star Office/OpenOffice.org/GIMP"))),
+				   N("Print test pages"),
+				   N("Know how to use this printer"),
+				   ($printer->{configured}{$queue} ?
+				    N("Remove printer") : ()) ] } ])) {
+		# Stay in the queue edit window until the user clicks "Close"
+		# or deletes the queue
+		$editqueue = 1; 
+		#- Copy the queue data and work on the copy
+		$printer->{currentqueue} = {};
+		my $driver;
+		if ($printer->{configured}{$queue}) {
+		    printer::main::copy_printer_params($printer->{configured}{$queue}{queuedata}, $printer->{currentqueue});
+		    #- Keep in mind the printer driver which was used, so it
+                    #- can be determined whether the driver is only
+		    #- available in expert and so for setting the options
+		    #- for the driver in recommended mode a special
+		    #- treatment has to be applied.
+		    $driver = $printer->{currentqueue}{driver};
+		}
+		#- keep in mind old name of queue (in case of changing)
+		$printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
+		#- Reset some variables
+		$printer->{OLD_CHOICE} = undef;
+		$printer->{DBENTRY} = undef;
+		#- Which printer type did we have before (check beginning of
+		#- URI)
+		if ($printer->{configured}{$queue}) {
+		    foreach my $type (qw(file lpd socket smb ncp postpipe)) {
+			if ($printer->{currentqueue}{connect}
+			    =~ /^$type:/) {
+			    $printer->{TYPE} = 
+				($type eq 'file' ? 'LOCAL' : uc($type));
+			    last;
+			}
+		    }
+		}
+		# Do the chosen task
+		if ($modify eq N("Printer connection type")) {
+		    choose_printer_type($printer, $in) &&
+			setup_printer_connection($printer, $in, $upNetwork) &&
+		            configure_queue($printer, $in);
+		} elsif ($modify eq N("Printer name, description, location")) {
+		    choose_printer_name($printer, $in) &&
+			configure_queue($printer, $in);
+		    # Delete old queue when it was renamed
+		    if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) {
+			my $w = $in->wait_message
+			    (N("Printerdrake"),
+			     N("Removing old printer \"%s\"...",
+			       $printer->{OLD_QUEUE}));
+		        printer::main::remove_queue($printer, $printer->{OLD_QUEUE});
+			# If the default printer was renamed, correct the
+			# the default printer setting of the spooler
+			if ($queue eq $printer->{DEFAULT}) {
+			    $printer->{DEFAULT} = $printer->{QUEUE};
+			    printer::default::set_printer($printer);
+			}
+			$queue = $printer->{QUEUE};
+		    }
+		} elsif (($modify eq N("Printer manufacturer, model, driver")) ||
+			 ($modify eq N("Printer manufacturer, model"))) {
+		    get_db_entry($printer, $in);
+		    choose_model($printer, $in) &&
+			get_printer_info($printer, $in) &&
+			setup_options($printer, $in) &&
+			configure_queue($printer, $in);
+		} elsif ($modify eq N("Printer options")) {
+		    get_printer_info($printer, $in) &&
+			setup_options($printer, $in) &&
+			configure_queue($printer, $in);
+		} elsif ($modify eq N("Set this printer as the default")) {
+		    $printer->{DEFAULT} = $queue;
+		    printer::default::set_printer($printer);
+		    $in->ask_warn(N("Default printer"),
+				  N("The printer \"%s\" is set as the default printer now.", $queue));
+		} elsif ($modify eq N("Add this printer to Star Office/OpenOffice.org/GIMP")) {
+		    if (printer::main::addcupsremotetoapplications
+			($printer, $queue)) {
+			$in->ask_warn(N("Adding printer to Star Office/OpenOffice.org/GIMP"),
+				      N("The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP.", $queue));
+		    } else {
+			$in->ask_warn(N("Adding printer to Star Office/OpenOffice.org/GIMP"),
+				      N("Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP.", $queue));
+		    }
+		} elsif ($modify eq N("Remove this printer from Star Office/OpenOffice.org/GIMP")) {
+		    if (printer::main::removeprinterfromapplications
+			($printer, $queue)) {
+			$in->ask_warn(N("Removing printer from Star Office/OpenOffice.org/GIMP"),
+				      N("The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP.", $queue));
+		    } else {
+			$in->ask_warn(N("Removing printer from Star Office/OpenOffice.org/GIMP"),
+				      N("Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP.", $queue));
+		    }
+		} elsif ($modify eq N("Print test pages")) {
+		    print_testpages($printer, $in, $upNetwork);
+		} elsif ($modify eq N("Know how to use this printer")) {
+		    printer_help($printer, $in);
+		} elsif ($modify eq N("Remove printer")) {
+		    if ($in->ask_yesorno('',
+           N("Do you really want to remove the printer \"%s\"?", $queue), 1)) {
+			{
+			    my $w = $in->wait_message
+				(N("Printerdrake"),
+				 N("Removing printer \"%s\"...", $queue));
+			    if (printer::main::remove_queue($printer, $queue)) { 
+				$editqueue = 0;
+				# Define a new default printer if we have
+				# removed the default one
+				if ($queue eq $printer->{DEFAULT}) {
+				    my @k = sort(keys(%{$printer->{configured}}));
+				    if (@k) {
+					$printer->{DEFAULT} = $k[0];
+				        printer::default::set_printer($printer);
+				    } else {
+					$printer->{DEFAULT} = "";
+				    }
+				}
+				# Let the main menu cursor go to the default
+				# position
+				$cursorpos = "::";
+			    }
+			}
+		    }		
+		}
+		# Make sure that the cursor is still at the same position
+		# in the main menu when one has modified something on the
+		# current printer
+		if (($printer->{QUEUE}) && ($printer->{QUEUE} ne "")) {
+		    if ($printer->{configured}{$printer->{QUEUE}}) {
+			$cursorpos = 
+			    $printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} . 
+			    ($printer->{QUEUE} eq $printer->{DEFAULT} ? 
+			     N(" (Default)") : ());
+		    } else {
+			my $s1 = N(" (Default)");
+			my $s2 = $s1;
+			$s2 =~ s/\(/\\\(/;
+			$s2 =~ s/\)/\\\)/;
+			if (($printer->{QUEUE} eq $printer->{DEFAULT}) &&
+			    ($cursorpos !~ /$s2/)) {
+			    $cursorpos .= $s1;
+			}
+		    }
+		}
+	    } else {
+		$editqueue = 0;
+	    }
+	    $continue = ($editqueue || $::expert || !$::isInstall || 
+			 $menushown ||
+			 $in->ask_yesorno('',N("Do you want to configure another printer?")));
+	}
+
+	# Configure the current printer queue in applications when main menu
+	# will not be shown (During installation in "Recommended" mode)
+	if ($::isInstall && !$::expert && !$menushown && !$continue) {
+	    my $w = $in->wait_message(N("Printerdrake"),
+				      N("Configuring applications..."));
+	    printer::main::configureapplications($printer);
+	}
+
+	# Delete some variables
+	$printer->{OLD_QUEUE} = "";
+	foreach (qw(QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE)) {
+		$printer->{$_} = "";
+	}
+	$printer->{currentqueue} = {};
+	$printer->{complete} = 0;
+    }
+    # Clean up the $printer data structure for auto-install log
+    foreach my $queue (keys %{$printer->{configured}}) {
+	foreach my $item (keys %{$printer->{configured}{$queue}}) {
+	    if ($item ne "queuedata") {
+		delete($printer->{configured}{$queue}{$item});
+	    }
+	}
+	if ($printer->{configured}{$queue}{queuedata}{menuentry}) {
+	    delete($printer->{configured}{$queue}{queuedata}{menuentry});
+	}
+    }
+    foreach (qw(Old_queue QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL AUTODETECT AUTODETECTLOCAL AUTODETECTNETWORK AUTODETECTSMB))
+    { delete $printer->{$_} };
+}
+
diff --git a/perl-install/printer/services.pm b/perl-install/printer/services.pm
new file mode 100644
index 000000000..1b68da96a
--- /dev/null
+++ b/perl-install/printer/services.pm
@@ -0,0 +1,61 @@
+package printer::services;
+
+use strict;
+use services;
+use run_program;
+
+sub restart ($) {
+    my ($service) = @_;
+    if (services::restart($service)) {
+	# CUPS needs some time to come up.
+	wait_for_cups() if $service eq "cups";
+	return 1;
+    } else { return 0 }
+}
+
+sub start ($) {
+    my ($service) = @_;
+    if (services::start($service)) {
+	# CUPS needs some time to come up.
+	wait_for_cups() if $service eq "cups";
+	return 1;
+    } else { return 0 }
+}
+
+sub start_not_running_service ($) {
+    my ($service) = @_;
+    # The exit status is not zero when the service is not running
+    if (services::start_not_running_service($service)) {
+	return 0;
+    } else { 
+	run_program::rooted($::prefix, "/etc/rc.d/init.d/$service", "start");
+	if (($? >> 8) != 0) {
+	    return 0;
+	} else {
+	    # CUPS needs some time to come up.
+	    wait_for_cups() if $service eq "cups";
+	    return 1;
+	}
+    }
+}
+
+sub wait_for_cups {
+    # CUPS needs some time to come up. Wait up to 30 seconds, checking
+    # whether CUPS is ready.
+    my $cupsready = 0;
+    my $i;
+    for ($i = 0; $i < 30; $i++) {
+	run_program::rooted($::prefix, "/usr/bin/lpstat", "-r");
+	if (($? >> 8) != 0) {
+	    # CUPS is not ready, continue
+	    sleep 1;
+	} else {
+	    # CUPS is ready, quit
+	    $cupsready = 1;
+	    last;
+	}
+    }
+    return $cupsready;
+}
+
+1;