samba: Remove printer management

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

diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 67823bd1969762daae560624c77d1e7a66d3a497..1d2166ca56ebd92b7226695a132e79651d693f09 100644 (file)
--- a/config/backup/includes/samba
+++ b/config/backup/includes/samba
@@ -1,6 +1,5 @@
 /var/ipfire/samba/global
 /var/ipfire/samba/pdc
-/var/ipfire/samba/printer
 /var/ipfire/samba/private/
 /var/ipfire/samba/settings
 /var/ipfire/samba/shares

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 61e29fe8c82aba1d1a10953c620924ba26484cf7..ad5ffb204782eecb8793165f45ef1a3c1df7bf84 100644 (file)
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/global
 var/ipfire/samba/pdc
-var/ipfire/samba/printer
 #var/ipfire/samba/private
 var/ipfire/samba/private/secrets.tdb
 var/ipfire/samba/private/smbpasswd

diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba
index 16e9dab110b5cca27fbd3f9c67534d0469d22589..9d445db8f45a859456bfc863e11738b1b914d9da 100644 (file)
--- a/config/rootfiles/packages/armv5tel/samba
+++ b/config/rootfiles/packages/armv5tel/samba
@@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/global
 var/ipfire/samba/pdc
-var/ipfire/samba/printer
 #var/ipfire/samba/private
 var/ipfire/samba/private/secrets.tdb
 var/ipfire/samba/private/smbpasswd

diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index dea9aa023730545d7bc0b6aedb84cba6c677bc96..0888fc6edfc1f15ed6ba929e02a8e2691b952709 100644 (file)
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/global
 var/ipfire/samba/pdc
-var/ipfire/samba/printer
 #var/ipfire/samba/private
 var/ipfire/samba/private/secrets.tdb
 var/ipfire/samba/private/smbpasswd

diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index 31328a3a0926f7dc062c84eb909804ee0859a5e9..54afad4d2e733936861fe7e7cb737bb9b1b77ce6 100644 (file)
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/global
 var/ipfire/samba/pdc
-var/ipfire/samba/printer
 #var/ipfire/samba/private
 var/ipfire/samba/private/secrets.tdb
 var/ipfire/samba/private/smbpasswd

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index cd0cc8ab8fa706af2939fb20d32f41464708c0ad..a9478a139c872812f912f42f6d4ea3e01fa6dc9f 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -48,8 +48,6 @@ my $userfile = "${General::swroot}/samba/private/smbpasswd";
 my %selected= () ;
 
 my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba";
-my $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes";
-my %printer = ();
 my %shares = ();
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
@@ -873,120 +871,6 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange')
 
 &Header::closebox();
 
-############################################################################################################################
-################################################ Verwalten von Druckern ####################################################
-
-my %printer =  config("${General::swroot}/samba/printer");
-
-&Header::openbox('100%', 'center', $Lang::tr{'printer'});
-
-my @Printers = keys(%printer);
-print <<END
-<a name="$Lang::tr{'manage printers'}"></a>
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
-<tr><td align='left'><u>$Lang::tr{'printername'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
-END
-;
-foreach my $printerentry (sort @Printers)
-       {
-       chomp $printerentry;
-       print <<END
-       <tr><td align='left'>$printerentry</td>
-       <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                       <input type='hidden' name='NAME' value='$printerentry' />
-                       <input type='hidden' name='ACTION' value='printerchange' />
-                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
-       </form></td>
-       <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                       <input type='hidden' name='NAME' value='$printerentry' />
-                       <input type='hidden' name='ACTION' value='smbprinterdel' />
-                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
-       </form></td></tr>
-END
-;
-       }
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                                                                                               <input type='hidden' name='ACTION' value='printeradd' />
-                                                                                               <input type='image' alt='$Lang::tr{'add printer'}' title='$Lang::tr{'add printer'}' src='/images/list-add.png' />
-                                                                                               </form></td>
-               <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                                                                                               <input type='hidden' name='ACTION' value='printercaption' />
-                                                                                               <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />
-                                                                                               </form></td>
-</tr>
-</table>
-END
-;
-
-if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' )
-       {
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add printer'}</b></td></tr>
-       <tr><td colspan='2' align='center'></td></tr>
-       <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
-       <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><tr><td colspan='2' align='center'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$defaultprinter</textarea></td></tr>
-       </table>
-       <br />
-       <table width='10%' cellspacing='0'>
-       <tr><td align='center'><input type='hidden' name='ACTION' value='smbprinteradd' />
-                                                                                                       <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr>
-       </table>
-       </form>
-END
-;
-       }
-       
-if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq 'printercaption2' )
-       {
-       my $printeroption = $printer{$sambasettings{'NAME'}};
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit printer'}</b></td></tr>
-       <tr><td colspan='2' align='center'></td></tr>
-       <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$printeroption</textarea></td></tr>
-       </table>
-       <br />
-       <table width='10%' cellspacing='0'>
-       <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
-                                                                                                       <input type='image' alt='$Lang::tr{'change share'}' title='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
-                                                                                                       <input type='hidden' name='ACTION' value='smbprinterchange' /></form></td></tr>
-       </table>
-END
-;
-       }
-
-if ($sambasettings{'ACTION'} eq 'smbprinteradd')
-       {
-       $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}";
-       save("printer");
-       my %printer = config("${General::swroot}/samba/printer");
-       }
-
-if ($sambasettings{'ACTION'} eq 'smbprinterdel')
-       {
-       delete $printer{$sambasettings{'NAME'}};
-       save("printer");
-       my %printer = config("${General::swroot}/samba/printer");
-       }
-
-if ($sambasettings{'ACTION'} eq 'smbprinterchange')
-       {
-       $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'};
-       save("printer");
-       my %printer = config("${General::swroot}/samba/printer");
-       }
-
-&Header::closebox();
-
 ############################################################################################################################
 ############################################### Anzeige des Sambastatus ####################################################
 
@@ -1049,9 +933,6 @@ my $smb = shift;
 open (FILE, ">${General::swroot}/samba/$smb") or die "Can't $smb settings $!";
 flock (FILE, 2);
 
-if ( $smb eq 'printer')
-       {while (my ($name, $option) = each %printer){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}}
-
 if ( $smb eq 'shares')
        {while (my ($name, $option) = each %shares){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}        }