[18/54] samba: Remove help popup

Message ID 20201013160812.27754-18-michael.tremer@ipfire.org
State Accepted
Commit a88ea3463cec44f653452d4f6423bbf054714af2
Headers show
Series [01/54] samba: Migrate configuration from Samba 3.6 to 4.x | expand

Commit Message

Michael Tremer Oct. 13, 2020, 4:07 p.m. UTC
This is outdated and should be put into the wiki.

It is also some very ugly JS.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/web-user-interface |  1 -
 config/rootfiles/packages/aarch64/samba    |  1 -
 config/rootfiles/packages/armv5tel/samba   |  1 -
 config/rootfiles/packages/i586/samba       |  1 -
 config/rootfiles/packages/x86_64/samba     |  1 -
 html/cgi-bin/samba.cgi                     |  5 --
 html/cgi-bin/sambahlp.cgi                  | 94 ----------------------
 7 files changed, 104 deletions(-)
 delete mode 100644 html/cgi-bin/sambahlp.cgi

Patch

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index aa32053a2..44856fcc2 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -75,7 +75,6 @@  srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/remote.cgi
 srv/web/ipfire/cgi-bin/routing.cgi
 #srv/web/ipfire/cgi-bin/samba.cgi
-#srv/web/ipfire/cgi-bin/sambahlp.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/shutdown.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 3bef0733e..61e29fe8c 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -809,6 +809,5 @@  var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
 var/ipfire/menu.d/EX-samba.menu
 usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba
index f58d4fc2f..16e9dab11 100644
--- a/config/rootfiles/packages/armv5tel/samba
+++ b/config/rootfiles/packages/armv5tel/samba
@@ -809,6 +809,5 @@  var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
 var/ipfire/menu.d/EX-samba.menu
 usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index e74caeea0..dea9aa023 100644
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -809,6 +809,5 @@  var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
 var/ipfire/menu.d/EX-samba.menu
 usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index c91252a30..31328a3a0 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -809,6 +809,5 @@  var/lib/samba/private
 var/lib/samba/winbindd_privileged
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
 var/ipfire/menu.d/EX-samba.menu
 usr/local/bin/sambactrl
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 31751ff4c..abf5e3295 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -859,8 +859,6 @@  if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
 	<table width='95%' cellspacing='0'>
 	<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
 	<tr><td colspan='2' align='center'></td></tr>
-	<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
 	<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
 	</table>
 	<br />
@@ -880,7 +878,6 @@  if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
 	<table width='95%' cellspacing='0'>
 	<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
 	<tr><td colspan='2' align='center'></td></tr>
-	<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
 	<tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
 	</table>
 	<br />
@@ -975,7 +972,6 @@  if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri
 	<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'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
 	<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 />
@@ -996,7 +992,6 @@  if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq '
 	<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'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></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 />
diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi
deleted file mode 100644
index 0ed099ab1..000000000
--- a/html/cgi-bin/sambahlp.cgi
+++ /dev/null
@@ -1,94 +0,0 @@ 
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-use strict;
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-&Header::showhttpheaders();
-&Header::openpagewithoutmenu('Samba', 1, '');
-&Header::openbigbox('100%', 'left', '', 'BigBox');
-&Header::openbox('100%', 'left', '', 'Sambahelp');
-
-	print <<END
-	<br />
-	<table width='95%' cellspacing='0'>
-	<tr><td><b>$Lang::tr{'caption'}</b></td></tr>
-	<tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
-	<tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
-	<tr><td></td><td>comment = $Lang::tr{'my new share'}</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>path</td><td>$Lang::tr{'path to directory'}</td></tr>
-	<tr><td></td><td>path = /tmp</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>writeable</td><td>$Lang::tr{'directory writeable'}</td></tr>
-	<tr><td></td><td>writeable = yes</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
-	<tr><td></td><td>browsable = yes</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>user</td><td>Besitzer der Freigabe</td></tr>
-	<tr><td></td><td>user = samba</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
-	<tr><td></td><td>valid users = samba, user1</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>write list</td><td>$Lang::tr{'visible in browselist'}</td></tr>
-	<tr><td></td><td>write list = samba</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>hosts allow</td><td>$Lang::tr{'host allow'}</td></tr>
-	<tr><td></td><td>hosts allow = localhost 192.168.1.1 192.168.2.0/24</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>hosts deny</td><td>$Lang::tr{'host deny'}</td></tr>
-	<tr><td></td><td>hosts deny = 192.168.1.2 192.168.3.0/24</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>read list</td><td>$Lang::tr{'read list'}</td></tr>
-	<tr><td></td><td>read list = user1</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>admin users</td><td>$Lang::tr{'admin users'}</td></tr>
-	<tr><td></td><td>admin users = user1</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>invalid users</td><td>$Lang::tr{'invalid users'}</td></tr>
-	<tr><td></td><td>invalid users = user2</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>force user</td><td>$Lang::tr{'force user'}</td></tr>
-	<tr><td></td><td>force user = samba</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>directory mask</td><td>$Lang::tr{'directory mask'}</td></tr>
-	<tr><td></td><td>directory mask = 0777</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>create mask</td><td>U$Lang::tr{'create mask'}</td></tr>
-	<tr><td></td><td>create mask = 0777</td></tr>
-	<tr><td><br /></td><td></td></tr>
-	<tr><td>guest ok</td><td>$Lang::tr{'guest ok'}</td></tr>
-	<tr><td></td><td>guest ok = yes</td></tr>
-	</table>
-END
-;
-
-&Header::closebox();
-&Header::closebigbox();
-&Header::closepage();