michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Start of work on UI lib conversion

Browse Source
This commit is contained in:
Jamie Cameron
2012-05-02 23:06:55 -07:00
parent 4332435026
commit 1d85697da1
12 changed files with 124 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
mount/edit_mount.cgi
View File

@@ -38,24 +38,22 @@ else {
$msave = ($mmodes[0]==0 ? 0 : $msave);
$mnow = ($mmodes[1]==0 ? $msave : $mnow);
print "<form action=\"save_mount.cgi\">\n";
print "<input name=return type=hidden value='$in{'return'}'>\n";
# Start of the form
print &ui_form_start("save_mount.cgi", "post");
print &ui_hidden("return", $in{'return'});
if (!$newm) {
print "<input type=hidden name=old value=\"$in{index}\">\n";
print "<input type=hidden name=temp value=\"$in{temp}\">\n";
print "<input type=hidden name=oldmnow value=$mnow>\n";
print "<input type=hidden name=oldmsave value=$msave>\n";
print &ui_hidden("old", $in{'index'});
print &ui_hidden("temp", $in{'temp'});
print &ui_hidden("oldmnow", $mnow);
print &ui_hidden("oldmsave", $msave);
}
print "<input type=hidden name=type value=\"$type\">\n";
print "<table border width=100%>\n";
print "<tr $tb> <td><b>",&text('edit_header', &fstype_name($type)),
"</b></td> </tr>\n";
print "<tr $cb> <td><table>\n";
print &ui_hidden("type", $in{'type'});
print &ui_table_start(&text('edit_header', &fstype_name($type)),
"width=100%", 2);
print "<tr> <td>",&hlink("<b>$text{'edit_dir'}</b>", "edit_dir"), "</td>\n";
# Mount point
if ($type eq "swap") {
print "<td colspan=3><i>$text{'edit_swap'}</i></b>\n";
$mfield = "<i>$text{'edit_swap'}</i>";
}
else {
local $dir = $minfo[0] || $in{'newdir'};
@@ -63,76 +61,67 @@ else {
# Make relative to first allowed dir
$dir =~ s/^$access_fs[0]\///;
}
print "<td colspan=3><input size=30 name=directory value=\"",
$dir,"\">\n";
$mfield = &ui_textbox("directory", $dir, 40);
if ($access{'browse'}) {
print &file_chooser_button("directory", 1);
$mfield .= " ".&file_chooser_button("directory", 1);
}
}
print &ui_table_row(&hlink($text{'edit_dir'}, "edit_dir"),
$mfield);
# Total and free space
if (!$newm && (($size,$free) = &disk_space($type, $minfo[0]))) {
print "&nbsp;" x 8;
printf "<b>$text{'edit_size'}</b> <i>%s</i> / \n",
&nice_size($size*1024);
printf "<b>$text{'edit_free'}</b> <i>%s</i></td>\n",
&nice_size($free*1024);
print &ui_table_row($text{'edit_usage'},
"<b>$text{'edit_size'}</b> ",
&nice_size($size*1024)," ",
"<b>$text{'edit_free'}</b> ",
&nice_size($free*1024));
}
print "</td> </tr>\n";
# Show save mount options
if ($mmodes[0] != 0 && !$access{'simple'}) {
print "<tr> <td><b>$text{'edit_savemount'}</b></td> <td colspan=3>\n";
printf "<input type=radio name=msave value=2 %s> $text{'edit_boot'}\n",
$minfo[5] eq "yes" || $newm ? "checked" : "";
@opts = ( [ 2, $text{'edit_boot'} ] );
if ($mmodes[0] != 1) {
printf "<input type=radio name=msave value=1 %s> %s\n",
$minfo[5] eq "no" ? "checked" : "", $text{'edit_save'};
push(@opts, [ 1, $text{'edit_save'} ]);
}
if (!$newm && $mmodes[1] == 0) {
printf "<input type=radio name=msave value=0 %s> %s\n",
$minfo[5] eq "" && !$newm ? "checked" : "",
$text{'edit_delete'};
push(@opts, [ 0, $text{'edit_delete'} ]);
}
else {
printf "<input type=radio name=msave value=0 %s> %s\n",
$minfo[5] eq "" && !$newm ? "checked" : "",
$text{'edit_dont'};
push(@opts, [ 0, $text{'edit_dont'} ]);
}
print "</td> </tr>\n";
print &ui_table_row($text{'edit_savemount'},
&ui_radio("msave", $minfo[5] eq "yes" || $newm ? 2 :
$minfo[5] eq "no" ? 1 :
$minfo[5] eq "" && !$newm ? 0 : undef,
\@opts));
}
# Show mount now options
if ($mmodes[1] == 1 && ($mmodes[3] == 0 || !$mnow) && !$access{'simple'}) {
print "<tr> <td><b>$text{'edit_now'}</b></td> <td colspan=3>\n";
printf "<input type=radio name=mmount value=1 %s> %s\n",
$mnow || $newm ? "checked" : "", $text{'edit_mount'};
if ($mmodes[0] == 0) {
printf "<input type=radio name=mmount value=0 %s> %s\n",
$mnow || $newm ? "" : "checked", $text{'edit_delete'};
}
else {
printf "<input type=radio name=mmount value=0 %s> %s\n",
$mnow || $newm ? "" : "checked",
$newm ? $text{'edit_dont2'} : $text{'edit_unmount'};
}
print "</td> </tr>\n";
print &ui_table_row($text{'edit_now'},
&ui_radio("mmount", $mnow || $newm ? 1 : 0,
[ [ 1, $text{'edit_mount'} ],
[ 0, $mmodes[0] == 0 ? $text{'edit_delete'} :
$newm ? $text{'edit_dont2'} :
$text{'edit_unmount'} ] ]));
}
# Show fsck order options
if ($mmodes[2] && !$access{'simple'}) {
print "<tr> <td><b>$text{'edit_order'}</b></td>\n";
printf "<td colspan=3><input type=radio name=order value=0 %s> %s\n",
$newm || $minfo[4] == 0 ? "checked" : "", $text{'no'};
printf "<input type=radio name=order value=1 %s> %s\n",
$minfo[4] == 1 ? "checked" : "", $text{'edit_first'};
printf "<input type=radio name=order value=%s %s> %s</td\n",
$minfo[4] > 1 ? $minfo[4] : 2 , $minfo[4] > 1 ? "checked" : "",
$text{'edit_second'};
print "</tr>\n";
$second = $minfo[4] > 1 ? $minfo[4] : 2;
print &ui_table_row($text{'edit_order'},
&ui_radio("order", $newm || $minfo[4] == 0 ? 0 :
$minfo[4] == 1 ? 1 :
$second,
[ [ 0, $text{'no'} ],
[ 1, $text{'edit_first'} ],
[ $second, $text{'edit_second'} ] ]));
}
# Show filesystem-specific mount source
&generate_location($type, $minfo[1] || $in{'newdev'});
print "</table></td> </tr></table><p>\n";
print &ui_table_end();
if (!$access{'simple'} || !defined($access{'opts'}) ||
$access{'opts'} =~ /$type/) {

8
mount/freebsd-lib.pl
View File

@@ -379,11 +379,11 @@ if ($_[0] eq "nfs") {
$_[1] =~ /^([^:]+):(.*)$/;
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$1\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$2\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
elsif ($_[0] eq "smbfs") {
@@ -391,11 +391,11 @@ elsif ($_[0] eq "smbfs") {
$_[1] =~ /^\\\\(.*)\\(.*)$/;
print "<tr> <td><b>$text{'linux_smbserver'}</b></td>\n";
print "<td><input name=smbfs_server value=\"$1\" size=20>\n";
&smb_server_chooser_button("smbfs_server");
print &smb_server_chooser_button("smbfs_server");
print "</td>\n";
print "<td><b>$text{'linux_smbshare'}</b></td>\n";
print "<td><input name=smbfs_share value=\"$2\" size=20>\n";
&smb_share_chooser_button("smbfs_server", "smbfs_share");
print &smb_share_chooser_button("smbfs_server", "smbfs_share");
print "</td> </tr>\n";
}
else {

4
mount/hpux-lib.pl
View File

@@ -312,11 +312,11 @@ if ($_[0] eq "nfs") {
$onenfs = !$_[1] || $_[1] =~ /^([A-z0-9\-\.]+):([^,]+)$/;
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$1\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$2\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
elsif ($_[0] eq "hfs") {

4
mount/irix-lib.pl
View File

@@ -350,11 +350,11 @@ if ($_[0] eq "nfs") {
local ($nfshost, $nfspath) = $_[1] =~ /^([^:]+):(.*)/ ? ( $1, $2 ) : ();
print "<tr> <td><b>$text{'irix_nhost'}</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>$text{'irix_ndir'}</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
elsif ($_[0] eq "autofs") {

9
mount/lang/en
View File

@@ -18,11 +18,12 @@ create_title=Create Mount
edit_err=Failed to edit mount
edit_egone=This mount no longer exists
edit_header=$1 Mount Details
edit_dir=Mounted As
edit_dir=Mounted as
edit_usage=Disk usage
edit_swap=Virtual Memory
edit_size=Size
edit_free=Free
edit_savemount=Save Mount?
edit_savemount=Save mount?
edit_boot=Save and mount at boot
edit_save=Save
edit_delete=Delete
@@ -32,8 +33,8 @@ edit_mount=Mount
edit_dont2=Don't mount
edit_unmount=Unmount
edit_order=Check filesystem at boot?
edit_first=Check First
edit_second=Check Second
edit_first=Check first
edit_second=Check second
edit_adv=Mount Options
edit_comm_opt=Common mount options
edit_ext_opt=ext2/ext3 specific options

70
mount/linux-lib.pl
View File

@@ -986,33 +986,32 @@ return ($_[0] eq "nfs" || $_[0] eq "nfs4" || $_[0] eq "auto" ||
# Output HTML for editing the mount location of some filesystem.
sub generate_location
{
if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
local ($type, $loc) = @_;
if ($type eq "nfs" || $type eq "nfs4") {
# NFS mount from some host and directory
local ($host, $dir) = $_[1] =~ /^([^:]+):(.*)$/ ? ( $1, $2 ) : ( );
print "<tr> <td>", &hlink("<b>$text{'linux_nfshost'}</b>", "nfshost"), "</td>\n";
print "<td><input name=nfs_host size=20 value=\"$host\">\n";
&nfs_server_chooser_button("nfs_host");
print "&nbsp;", &hlink("<b>$text{'linux_nfsdir'}</b>", "nfsdir"), "\n";
printf "<input name=nfs_dir size=20 value=%s>\n",
($_[0] eq "nfs4") && ($dir eq "") ? "/" : $dir;
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
local ($host, $dir) = $loc =~ /^([^:]+):(.*)$/ ? ( $1, $2 ) : ( );
print &ui_table_row(&hlink($text{'linux_nfshost'}, "nfshost"),
&ui_textbox("nfs_host", $host, 30).
&nfs_server_chooser_button("nfs_host").
"&nbsp;".
"<b>".&hlink($text{'linux_nfsdir'}, "nfsdir")."</b> ".
&ui_textbox("nfs_dir",
($_[0] eq "nfs4") && ($dir eq "") ? "/" : $dir, 30).
&nfs_export_chooser_button("nfs_host", "nfs_dir"));
}
elsif ($_[0] eq "auto") {
elsif ($type eq "auto") {
# Using some automounter map
print "<tr> <td><b>$text{'linux_map'}</b></td>\n";
print "<td><input name=auto_map size=20 value=\"$_[1]\">\n";
print &file_chooser_button("auto_map", 0);
print "</td> <td colspan=2></td> </tr>\n";
print &ui_table_row($text{'linux_map'},
&ui_textbox("auto_map", $loc, 30)." ".
&file_chooser_button("auto_map", 0));
}
elsif ($_[0] eq "autofs") {
elsif ($type eq "autofs") {
# Using some kernel automounter map
print "<tr> <td><b>$text{'linux_map'}</b></td>\n";
print "<td><input name=autofs_map size=20 value=\"$_[1]\">\n";
print &file_chooser_button("autofs_map", 0);
print "</td> <td colspan=2></td> </tr>\n";
print &ui_table_row($text{'linux_map'},
&ui_textbox("autofs_map", $loc, 30)." ".
&file_chooser_button("autofs_map", 0));
}
elsif ($_[0] eq "swap") {
elsif ($type eq "swap") {
# Swap file or device
&foreign_require("fdisk");
printf "<tr> <td valign=top><b>$text{'linux_swapfile'}</b></td>\n";
@@ -1041,27 +1040,26 @@ elsif ($_[0] eq "swap") {
&file_chooser_button("lnx_other");
print "</td> </tr>\n";
}
elsif ($_[0] eq $smbfs_fs || $_[0] eq "cifs") {
elsif ($type eq $smbfs_fs || $type eq "cifs") {
# Windows filesystem
local ($server, $share) = $_[1] =~ /^\\\\([^\\]*)\\(.*)$/ ?
local ($server, $share) = $loc =~ /^\\\\([^\\]*)\\(.*)$/ ?
($1, $2) : ( );
print "<tr> <td><b>$text{'linux_smbserver'}</b></td>\n";
print "<td><input name=smbfs_server value=\"$server\" size=20>\n";
&smb_server_chooser_button("smbfs_server");
print "</td>\n";
print "<td><b>$text{'linux_smbshare'}</b></td>\n";
print "<td><input name=smbfs_share value=\"$share\" size=20>\n";
&smb_share_chooser_button("smbfs_server", "smbfs_share");
print "</td> </tr>\n";
print &ui_table_row($text{'linux_smbserver'},
&ui_textbox("smbfs_server", $server, 30)." ".
&smb_server_chooser_button("smbfs_server")." ".
"&nbsp;".
"<b>$text{'linux_smbshare'}</b> ".
&ui_textbox("smbfs_share", $share, 30)." ".
&smb_share_chooser_button("smbfs_server", "smbfs_share"));
}
elsif ($_[0] eq "tmpfs") {
elsif ($type eq "tmpfs") {
# RAM disk (no location needed)
}
elsif ($_[0] eq "bind") {
elsif ($type eq "bind") {
# Loopback filesystem, mounted from some other directory
print "<tr> <td><b>$text{'linux_bind'}</b></td> <td colspan=3>\n";
printf "<input name=bind_dir value='%s' size=35> %s</td> </tr>\n",
$_[1], &file_chooser_button("bind_dir", 1);
print &ui_table_row($text{'linux_bind'},
&ui_textbox("bind_dir", $loc, 40)." ".
&file_chooser_button("bind_dir", 1));
}
else {
# This is some linux disk-based filesystem

12
mount/mount-lib.pl
View File

@@ -117,8 +117,9 @@ sub nfs_server_chooser_button
local($form);
$form = @_ > 1 ? $_[1] : 0;
if ($access{'browse'}) {
print "<input type=button onClick='ifield = document.forms[$form].$_[0]; nfs_server = window.open(\"../$module_name/nfs_server.cgi\", \"nfs_server\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); nfs_server.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
return "<input type=button onClick='ifield = document.forms[$form].$_[0]; nfs_server = window.open(\"../$module_name/nfs_server.cgi\", \"nfs_server\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); nfs_server.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
}
return undef;
}
# nfs_export_chooser_button(serverinput, exportinput, [form])
@@ -127,8 +128,9 @@ sub nfs_export_chooser_button
local($form);
$form = @_ > 2 ? $_[2] : 0;
if ($access{'browse'}) {
print "<input type=button onClick='if (document.forms[$form].$_[0].value != \"\") { ifield = document.forms[$form].$_[1]; nfs_export = window.open(\"../$module_name/nfs_export.cgi?server=\"+document.forms[$form].$_[0].value, \"nfs_export\", \"toolbar=no,menubar=no,scrollbars=yes,width=500,height=200\"); nfs_export.ifield = ifield; window.ifield = ifield }' value=\"...\">\n";
return "<input type=button onClick='if (document.forms[$form].$_[0].value != \"\") { ifield = document.forms[$form].$_[1]; nfs_export = window.open(\"../$module_name/nfs_export.cgi?server=\"+document.forms[$form].$_[0].value, \"nfs_export\", \"toolbar=no,menubar=no,scrollbars=yes,width=500,height=200\"); nfs_export.ifield = ifield; window.ifield = ifield }' value=\"...\">\n";
}
return undef;
}
# smb_server_chooser_button(serverinput, [form])
@@ -137,8 +139,9 @@ sub smb_server_chooser_button
local($form);
$form = @_ > 1 ? $_[1] : 0;
if (&has_command($config{'smbclient_path'}) && $access{'browse'}) {
print "<input type=button onClick='ifield = document.forms[$form].$_[0]; smb_server = window.open(\"../$module_name/smb_server.cgi\", \"smb_server\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); smb_server.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
return "<input type=button onClick='ifield = document.forms[$form].$_[0]; smb_server = window.open(\"../$module_name/smb_server.cgi\", \"smb_server\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); smb_server.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
}
return undef;
}
# smb_share_chooser_button(serverinput, shareinput, [form])
@@ -147,8 +150,9 @@ sub smb_share_chooser_button
local($form);
$form = @_ > 2 ? $_[2] : 0;
if (&has_command($config{'smbclient_path'}) && $access{'browse'}) {
print "<input type=button onClick='if (document.forms[$form].$_[0].value != \"\") { ifield = document.forms[$form].$_[1]; smb_share = window.open(\"../$module_name/smb_share.cgi?server=\"+document.forms[$form].$_[0].value, \"smb_share\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); smb_share.ifield = ifield; window.ifield = ifield }' value=\"...\">\n";
return "<input type=button onClick='if (document.forms[$form].$_[0].value != \"\") { ifield = document.forms[$form].$_[1]; smb_share = window.open(\"../$module_name/smb_share.cgi?server=\"+document.forms[$form].$_[0].value, \"smb_share\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300\"); smb_share.ifield = ifield; window.ifield = ifield }' value=\"...\">\n";
}
return undef;
}
# Include the correct OS-specific functions file

4
mount/netbsd-lib.pl
View File

@@ -284,11 +284,11 @@ if ($_[0] eq "nfs") {
$_[1] =~ /^([^:]+):(.*)$/;
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$1\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$2\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
else {

4
mount/openbsd-lib.pl
View File

@@ -285,11 +285,11 @@ if ($_[0] eq "nfs") {
$_[1] =~ /^([^:]+):(.*)$/;
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$1\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$2\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
else {

12
mount/osf1-lib.pl
View File

@@ -333,10 +333,10 @@ if ($_[0] eq "nfs") {
$nfsmode == 0 ? "checked" : "";
print "<b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "&nbsp;<b>NFS Directory</b>\n";
print "<input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
print "<tr> <td></td>\n";
@@ -360,11 +360,11 @@ if ($_[0] eq "nfs") {
else {
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
}
@@ -516,11 +516,11 @@ elsif ($_[0] eq "rumba") {
$_[1] =~ /^\\\\(.*)\\(.*)$/;
print "<tr> <td><b>Server Name</b></td>\n";
print "<td><input name=rumba_server value=\"$1\" size=20>\n";
&smb_server_chooser_button("rumba_server");
print &smb_server_chooser_button("rumba_server");
print "</td>\n";
print "<td><b>Share Name</b></td>\n";
print "<td><input name=rumba_share value=\"$2\" size=20>\n";
&smb_share_chooser_button("rumba_server", "rumba_share");
print &smb_share_chooser_button("rumba_server", "rumba_share");
print "</td> </tr>\n";
}
}

12
mount/solaris-lib.pl
View File

@@ -428,10 +428,10 @@ if ($_[0] eq "nfs") {
$nfsmode == 0 ? "checked" : "";
print "<b>$text{'solaris_nhost'}</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "&nbsp;<b>$text{'solaris_ndir'}</b>\n";
print "<input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
print "<tr> <td></td>\n";
@@ -455,11 +455,11 @@ if ($_[0] eq "nfs") {
else {
print "<tr> <td><b>$text{'solaris_nhost'}</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>$text{'solaris_ndir'}</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
}
@@ -628,11 +628,11 @@ elsif ($_[0] eq "rumba") {
$_[1] =~ /^\\\\(.*)\\(.*)$/;
print "<tr> <td><b>$text{'solaris_server'}</b></td>\n";
print "<td><input name=rumba_server value=\"$1\" size=20>\n";
&smb_server_chooser_button("rumba_server");
print &smb_server_chooser_button("rumba_server");
print "</td>\n";
print "<td><b>$text{'solaris_share'}</b></td>\n";
print "<td><input name=rumba_share value=\"$2\" size=20>\n";
&smb_share_chooser_button("rumba_server", "rumba_share");
print &smb_share_chooser_button("rumba_server", "rumba_share");
print "</td> </tr>\n";
}
}

12
mount/unixware-lib.pl
View File

@@ -411,10 +411,10 @@ if ($_[0] eq "nfs") {
$nfsmode == 0 ? "checked" : "";
print "<b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "&nbsp;<b>NFS Directory</b>\n";
print "<input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
print "<tr> <td></td>\n";
@@ -438,11 +438,11 @@ if ($_[0] eq "nfs") {
else {
print "<tr> <td><b>NFS Hostname</b></td>\n";
print "<td><input name=nfs_host size=20 value=\"$nfshost\">\n";
&nfs_server_chooser_button("nfs_host");
print &nfs_server_chooser_button("nfs_host");
print "</td>\n";
print "<td><b>NFS Directory</b></td>\n";
print "<td><input name=nfs_dir size=20 value=\"$nfspath\">\n";
&nfs_export_chooser_button("nfs_host", "nfs_dir");
print &nfs_export_chooser_button("nfs_host", "nfs_dir");
print "</td> </tr>\n";
}
}
@@ -633,11 +633,11 @@ elsif ($_[0] eq "rumba") {
$_[1] =~ /^\\\\(.*)\\(.*)$/;
print "<tr> <td><b>Server Name</b></td>\n";
print "<td><input name=rumba_server value=\"$1\" size=20>\n";
&smb_server_chooser_button("rumba_server");
print &smb_server_chooser_button("rumba_server");
print "</td>\n";
print "<td><b>Share Name</b></td>\n";
print "<td><input name=rumba_share value=\"$2\" size=20>\n";
&smb_share_chooser_button("rumba_server", "rumba_share");
print &smb_share_chooser_button("rumba_server", "rumba_share");
print "</td> </tr>\n";
}
}