github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix typo

Browse Source
This commit is contained in:
yangfl
2017-11-02 21:58:43 +08:00
parent f7b809b332
commit 0f9fb77369
68 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acl/acl-lib.pl
+1 -1
View File
@@ -520,7 +520,7 @@ if ($clone) {
=head2 modify_user(old-name, &details)
Updates an existing Webmin user, identified by the old-name paramter. The
Updates an existing Webmin user, identified by the old-name parameter. The
details hash must be in the same format as returned by list_users or passed
to create_user.
acl/openssl.cnf
+2 -2
View File
@@ -41,7 +41,7 @@ crl = $dir/crl.pem # The current CRL
private_key = $dir/ca.pem # The private key
RANDFILE = $dir/.rand # private random number file
x509_extensions = usr_cert # The extentions to add to the cert
x509_extensions = usr_cert # The extensions to add to the cert
# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
# so this is commented out by default to leave a V1 CRL.
@@ -84,7 +84,7 @@ default_bits = 1024
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
x509_extensions = v3_ca # The extentions to add to the self signed cert
x509_extensions = v3_ca # The extensions to add to the self signed cert
[ req_distinguished_name ]
countryName = Country Name (2 letter code)
apache/apache-lib.pl
+1 -1
View File
@@ -321,7 +321,7 @@ return wantarray ? @vals : !@vals ? undef : $vals[$#vals];
}
# find_directive_struct(name, &directives)
# Returns references to directives maching some name
# Returns references to directives matching some name
sub find_directive_struct
{
local (@vals, $ref);
bacula-backup/bacula-backup-lib.pl
+1 -1
View File
@@ -434,7 +434,7 @@ print "</select>\n";
print "<input name=other size=40> ",&file_chooser_button("other", 1),"\n";
}
# job_select(&dbh, [volumne])
# job_select(&dbh, [volume])
# XXX needs value input?
# XXX needs flag for use of 'any' field?
sub job_select
bind8/CHANGELOG
+1 -1
View File
@@ -75,7 +75,7 @@ Spaces are now allowed in Host Information records.
---- Changes since 1.420 ----
The default TTL for multiple zones can now be changed on the Update Records in Zones page.
When adding a cluster slave server, multiple views can be entered to have slave zones created in all of them.
Record names or values entered like ns.foo.com in the domain foo.com automatically have a . added to make them absolute as the user presumably expected, rather than being coverted to ns.foo.com.foo.com.
Record names or values entered like ns.foo.com in the domain foo.com automatically have a . added to make them absolute as the user presumably expected, rather than being converted to ns.foo.com.foo.com.
Update serial number (by default) when editing records manually.
Try downloading root zone files from the IP for rs.internic.net if the hostname cannot be resolved, to avoid catch-22 problem.
Access control lists are now automatically re-ordered to handle dependencies.
bind8/bind8-lib.pl
+2 -2
View File
@@ -53,7 +53,7 @@ if (open(my $VERSION, "<", "$module_config_directory/version")) {
}
$bind_version ||= &get_bind_version();
if ($bind_version && $bind_version =~ /^(\d+\.\d+)\./) {
# Convery to properly formatted number
# Convert to properly formatted number
$bind_version = $1;
}
@@ -89,7 +89,7 @@ sub have_dnssec_tools_support
}
# get_bind_version()
# Returns the BIND verison number, or undef if unknown
# Returns the BIND version number, or undef if unknown
sub get_bind_version
{
if (&has_command($config{'named_path'})) {
bind8/index.cgi
+1 -1
View File
@@ -45,7 +45,7 @@ if (my $out = &check_bind_8()) {
# Try to get the version number, and save for later calls
my $bind_version = &get_bind_version();
if ($bind_version && $bind_version =~ /^(\d+\.\d+)\./) {
# Convery to properly formatted number
# Convert to properly formatted number
$bind_version = $1;
}
my $VERSION;
burner/CHANGELOG
+1 -1
View File
@@ -3,6 +3,6 @@ Audio CDs can now be burned from WAV and OGG files as well as MP3s.
---- Changes since 1.150 ----
Added detailed access control to limit a Webmin user to only using certain existing burn profiles, or to create profiles limited to selected directories.
---- Changes since 1.190 ----
IDE CDROM devices are shown in the device list on Linux 2.6 systems, which support buring directly via IDE rather than using SCSI emulation.
IDE CDROM devices are shown in the device list on Linux 2.6 systems, which support burning directly via IDE rather than using SCSI emulation.
---- Changes since 1.270 ----
Added checkboxes and a button for deleting multiple profiles at once.
cluster-software/edit_host.cgi
+1 -1
View File
@@ -81,7 +81,7 @@ foreach $c (sort { $a cmp $b } &unique(map { $_->{'class'} } @packages)) {
%heiropen = map { $_, 1 } &get_heiropen($in{'id'});
$heiropen{""}++;
# traverse the heirarchy
# traverse the hierarchy
$spacer = "&nbsp;"x3;
print &ui_hr();
print &ui_subheading($text{'host_installed'});
cluster-useradmin/index.cgi
+1 -1
View File
@@ -98,7 +98,7 @@ if ($config{'conf_add_user'} == 0 &&
$config{'conf_allow_sync'} == 0 &&
$config{'conf_find_user'} == 0 &&
$config{'conf_find_group'} == 0) {
# If we have configured EVERY possible 'host' action off, then dont show
# If we have configured EVERY possible 'host' action off, then don't show
# the header/horizontal-rule/etc...
@hosts = ();
}
dhcpd/dhcpd-lib.pl
+2 -2
View File
@@ -626,7 +626,7 @@ return @rv;
%obj_names2types = qw(host hst group grp subnet sub shared-network sha);
# get_branch(objtype, [addmode])
# usefull for edit_*.cgi and save_*.cgi scripts
# useful for edit_*.cgi and save_*.cgi scripts
# $objtype = one of 'hst' 'grp' 'sub' 'sha'
sub get_branch
{
@@ -805,7 +805,7 @@ return &save_module_acl($_[1]);
# find_recursive(name, &config, [parent])
# Returns a list of all config entries with some name, no matter where they
# are in the heirarchy
# are in the hierarchy
sub find_recursive
{
local ($c, @rv);
dhcpd/save_zones.cgi
+1 -1
View File
@@ -25,7 +25,7 @@ $key=$in{'key'};
# Prepare data structure
local $oldzone=$zone; # backup (neccessary if name changes)
local $oldzone=$zone; # backup (necessary if name changes)
local $zone = {
'values' => [ $zonename ],
'comment' => $in{'desc'},
disk-usage/config.info
+1 -1
View File
@@ -1,7 +1,7 @@
dirs=Directories to index,9,50,5,\t
skip=Directories to skip,9,50,3,\t
fs=Filesystem types to skip,0
units=Minumum units for sizes,1,1-bytes,1024-kB,1048576-MB,1073741824-GB
units=Minimum units for sizes,1,1-bytes,1024-kB,1048576-MB,1073741824-GB
min=Minimum directory size to display,0,10,,bytes
xdev=Limit search to one filesystem?,1,1-Yes,0-No
bsize=Filesystem block size (in bytes),3,Unknown
dnsadmin/change_soa.cgi
+1 -1
View File
@@ -27,7 +27,7 @@ $in{retry} =~ /^[0-9]+$/ ||
$in{expire} =~ /^[0-9]+$/ ||
&error("$in{expire} is not a valid expire time");
$in{min} =~ /^[0-9]+$/ ||
&error("$in{min} is not a valid minumum TTL");
&error("$in{min} is not a valid minimum TTL");
# Save and bounce back
$data[$soa] = "$in{serv} $in{mail} $in{serial} $in{refresh} $in{retry} $in{expire} $in{min}";
dnsadmin/dns-lib.pl
+1 -1
View File
@@ -22,7 +22,7 @@ if (!@get_config_cache) {
return \@get_config_cache;
}
# read_config_file(filename, [dont expand includes])
# read_config_file(filename, [don't expand includes])
# Read and parse a BIND4 format config file
sub read_config_file
{
file/FileManager.java
+2 -2
View File
@@ -1834,7 +1834,7 @@ class FindReplaceWindow extends FixedFrame implements CbButtonCallback
if (findtxt.length() == 0)
return;
if (b == find_b) {
// Find the next occurrance of the text, starting from
// Find the next occurrence of the text, starting from
// the cursor + 1, and select it
int pos = edittxt.indexOf(findtxt,
editor.edit.getSelectionStart()+1);
@@ -1868,7 +1868,7 @@ class FindReplaceWindow extends FixedFrame implements CbButtonCallback
click(find_b);
}
else if (b == all_b) {
// Replace all occurrances of the text in the editor
// Replace all occurrences of the text in the editor
int pos = 0;
int len = findtxt.length();
int st = editor.edit.getSelectionStart(),
file/ResizePanel.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class ResizePanel extends Panel implements LayoutManager
int border = 100;
// Provide two components where component one initially occupies rt fraction of
// parent area. When vertical=true components are layed out one above the other
// parent area. When vertical=true components are laid out one above the other
public ResizePanel(Component one, Component two, double rt, boolean vertical)
{
this.one = one;
filemin/CHANGELOG
+1 -1
View File
@@ -123,7 +123,7 @@
- Fixed copy/cut/paste functionality.
- FreeBSD support added.
Module uses Regexp::Common and URI packages to validate URIs in HTTP/FTP download functionality.
Be sure to install theese to make functionality work.
Be sure to install these to make functionality work.
Admin user created during Webmin installation is not UNIX user, so module won't work for him.
If you want to provide some "system" file operations then convert "root" to Webmin user.
firewall/save_rule.cgi
+1 -1
View File
@@ -356,7 +356,7 @@ else {
push(@mods, "physdev");
}
# Add custom paramters and modules
# Add custom parameters and modules
$rule->{'args'} = $in{'args'};
push(@mods, split(/\s+/, $in{'mods'}));
firewall/save_rule6.cgi
+1 -1
View File
@@ -354,7 +354,7 @@ else {
push(@mods, "physdev");
}
# Add custom paramters and modules
# Add custom parameters and modules
$rule->{'args'} = $in{'args'};
push(@mods, split(/\s+/, $in{'mods'}));
frox/frox-lib.pl
+1 -1
View File
@@ -214,7 +214,7 @@ if ($curr ne $in{$name}) {
}
# config_exists(&config, name, [yes], [no])
# Returns HTML for a table row for yes/no checkboxes, based on the existance
# Returns HTML for a table row for yes/no checkboxes, based on the existence
# of some config item
sub config_exists
{
hpuxexports/exports-lib.pl
+2 -2
View File
@@ -10,7 +10,7 @@ do "hpux-lib.pl";
# parse_options($options, \%options)
# Parse a mount options string like rw=foo,nosuid,... into a associative
# options array. Parts with no value are given an empty string as the value
# usefull for HPUX and DFS - perhaps for linux, too
# useful for HPUX and DFS - perhaps for linux, too
sub parse_options
{
local($opt);
@@ -28,7 +28,7 @@ foreach $opt (split(/,/, $_[0])) {
# join_options(\%options)
# Returns a list of options from a options array, in the form used in
# the exports file
# usefull for HPUX and DFS - perhaps for linux, too
# useful for HPUX and DFS - perhaps for linux, too
sub join_options
{
local $o = $_[0];
init/modifyhostconfig.cgi
+1 -1
View File
@@ -25,7 +25,7 @@ if ( $setting =~ /[ ]/ ) {
$setting = "\"$setting\"";
}
# not all possibile blunders are fixed, but at least intelligently
# not all possible blunders are fixed, but at least intelligently
# made ones...
$setting = "$in{'action'}=$setting";
itsecur-firewall/iptables-lib.pl
+1 -1
View File
@@ -30,7 +30,7 @@ print SAVE ":OUTPUT ACCEPT [0:0]\n";
print SAVE ":FORWARD ACCEPT [0:0]\n";
print SAVE ":SYN-FLOOD -\n";
# Disable bandwith monitor
# Disable bandwidth monitor
# Have a lots of issues.
# AA 2006-02-21
itsecur-firewall/standard-services
+9 -9
View File
@@ -1,4 +1,4 @@
AOL TCP 5190 #AOL Instant Messanger
AOL TCP 5190 #AOL Instant Messenger
AP-Defender TCP 2626 #Defender Authentication Service
BackDoor-Setup TCP 5000 #Use by Boinet Lite, Blazer 5, Bubbel Trojans
Backage TCP 411 #Backage Trojan
@@ -61,7 +61,7 @@ lpdw0rm TCP 515 #Used by Ramen Trojans and Printer Service
Madster TCP 5025 #Formally called Aimster
####Microsoft-TS TCP 445 #Microsoft CIFS's over TCP
Mneah TCP 4666 #The Mneah Trojan
MSN-File Transfer TCP 6891-6900 #MSN File Tranfer
MSN-File Transfer TCP 6891-6900 #MSN File Transfer
MSN-Messenger TCP 1863 #MSN Instant Messenger
MSSQL-Mon TCP 1434 #MSSQL Monitor
MSSQL TCP 1433 #MSSQL Server
@@ -79,7 +79,7 @@ NCP TCP 524 #Novell Netware Core Protocol
NetShow TCP 1755 #Microsoft NetShow-Windows Media Player
NetSTAT TCP 15 #UNIX NetSTAT Protocol
NFSD TCP 2049 UDP 2049 #Network File System Deamon
NNTP TCP 119 #Network News Tranfer Protocol
NNTP TCP 119 #Network News Transfer Protocol
NTP TCP 123 UDP 123 #Network Time Protocol
OAS-NameServer TCP 2649 #Oracle Application Server
OAS-ORB TCP 2651 #Oracle Application Server
@@ -87,7 +87,7 @@ OpenWindows TCP 2000 #Open Windows
####Orbix-1570 TCP 1570 #IONA Orbix Deamon
####Orbix-1571 TCP 1571 #IONA Orbix Deamon
PcAnywhere-Date TCP 5631 #pcAnywhere
PcTele-FileSync TCP 2299 #Symantec PcTelecommute File Syncronization
PcTele-FileSync TCP 2299 #Symantec PcTelecommute File Synchronization
POP2 TCP 109 #Post Office Protocol Verion 2
POP3 TCP 110 #Post Office Protocol Verion 3
667-Trojans TCP 667 #Misc Trojans
@@ -101,12 +101,12 @@ Remote-Strom TCP 1025 #Used by Fraggle Rock, NetSPY and MD5 BackDoor Trojans
Secure-ID-Prop TCP 5510 #Token based Authentication Service
ShadyShell TCP 1337 #ShadyShell Trojan
####RSH TCP 514 #Remote Shell
SMTP TCP 25 #Simple Mail Tranfer Protocol
SMTP TCP 25 #Simple Mail Transfer Protocol
Sockets-DES TCP 1 #Also used by the TCP MUX Service
SQLNET-1 TCP 1521 #Oracle SQL Net Verison 1 Service
SQLNET-2-1521 TCP 1521 #Part of Oracle SQLNet Verison 2 Service
SQLNET-2-1525 TCP 1525 #Part of Oracle SQLNet Verison 2 Service
SQLNET-2-1526 TCP 1526 #Part of Oracle SQLNet Verison 2 Service
SQLNET-1 TCP 1521 #Oracle SQL Net Version 1 Service
SQLNET-2-1521 TCP 1521 #Part of Oracle SQLNet Version 2 Service
SQLNET-2-1525 TCP 1525 #Part of Oracle SQLNet Version 2 Service
SQLNET-2-1526 TCP 1526 #Part of Oracle SQLNet Version 2 Service
SSH TCP 22 #Secure Shell
####SSH2 TCP 22 #Secure Shell Version 2 also blocks version 1
Safe-T-Net TCP 32557 #Safe-T-Net Configuration
ldap-useradmin/CHANGELOG
+1 -1
View File
@@ -60,7 +60,7 @@ By default, all new Unix users are given the person object class too, as this se
Added support for LDAP SSHA passwords, thanks to Bill Moyers and John Gray.
---- Changes since 1.430 ----
The order of the first name and surname in the real name can be changed by a new Module Config setting.
Coverted all pages to use the new Webmin UI library, for a more consistent look. Also updated the groups chooser to use a left-right selector.
Converted all pages to use the new Webmin UI library, for a more consistent look. Also updated the groups chooser to use a left-right selector.
---- Changes since 1.440 ----
Added a Module Config option to allow / as an IMAP folder separator, thanks to Bas van den Heuvel.
Added a check on the module's main page to ensure that the LDAP schema is accessible.
lvm/index.cgi
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl
# index.cgi
# Display a table of all volumne groups and their physical and logical volumes.
# Display a table of all volume groups and their physical and logical volumes.
require './lvm-lib.pl';
&ReadParse();
mailboxes/folders-lib.pl
+1 -1
View File
@@ -2330,7 +2330,7 @@ if ($url =~ /^#/) {
return $before.$url.$after;
}
elsif ($url =~ /^cid:/i) {
# Definately safe (CIDs are harmless)
# Definitely safe (CIDs are harmless)
return $before.$url.$after;
}
elsif ($url =~ /^(http:|https:)/) {
mailboxes/mailboxes-lib.pl
+1 -1
View File
@@ -715,7 +715,7 @@ return $_[0] !~ /^\//;
}
# list_mail_users([max], [filterfunc])
# Returns getpw* style structures for all users who can recieve mail. Those with
# Returns getpw* style structures for all users who can receive mail. Those with
# duplicate info are skipped.
sub list_mail_users
{
mailboxes/xinha/htmlarea.js
+1 -1
View File
@@ -1,6 +1,6 @@
/*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-- COMPATABILITY FILE
-- COMPATIBILITY FILE
-- htmlarea.js is now XinhaCore.js
--
-- $HeadURL:http://svn.xinha.webfactional.com/trunk/htmlarea.js $
mailboxes/xinha/release-notes.txt
+3 -3
View File
@@ -183,7 +183,7 @@ Xinha 0.94
* fixed Ticket #1048 Full Screen plugin doesn't load if many editors on page
* fixed Ticket #1053 ListType plugin doesn't work in panel config with multiple editors
* fixed Ticket #1026 Skins referenced with <link>-tags don't work anymore
* fixed Ticket #1059 [Equation] loosing formula onsubmit
* fixed Ticket #1059 [Equation] losing formula onsubmit
* fixed Ticket #1060 [Equation] various updates
* [Equation] preserve formula on reload in Mozilla
* [Equation] updated ASCIIMathML.js
@@ -194,7 +194,7 @@ Xinha 0.94
* added Thai translation for core
* added complete Portuguese Brazilian translation
* updated lc_parse script
* fixed Ticket #1071 [ExtendedFileManager] external image URL image inserted with width/height 0, amking it invisible
* fixed Ticket #1071 [ExtendedFileManager] external image URL image inserted with width/height 0, making it invisible
* fixed Ticket #1074 [SuperClean] throws warnings in PHP 5
* fixed Ticket #1079 [DynamicCSS] lists Xinha internal CSS
* fixed Ticket #1080 Some plugins leave behind stylesheet links in fullpage mode
@@ -212,7 +212,7 @@ Xinha 0.93
- fixwd Ticket #963 DOMwalk IE: head tag attributes without quotes and closing slash
- Ticket #962 DOMwalk Mozilla: improved source indentation
- fixed Ticket #957 If item in in xinha_editors is not a textarea: skip gracefully
- fixed Ticket #900: catch an fatal error that occured sometimes when switching between modes in fullpage mode in Mozilla
- fixed Ticket #900: catch an fatal error that occurred sometimes when switching between modes in fullpage mode in Mozilla
- fixed Ticket #969 DOMwalk Gecko: line breaks rendered as <br>s inside <pre> blocks
- fixed Ticket #976 Loading message misplaced in IE7
- fixed Ticket #977 TableOperations toolbar off-place in ext_example.html
majordomo/create_list.cgi
+1 -1
View File
@@ -44,7 +44,7 @@ $in{'footer'} =~ s/\r//g;
&set_permissions("$ldir/$in{'name'}");
&unlock_file("$ldir/$in{'name'}");
# use provided template, majordomo provides onyl minimal needed config
# use provided template, majordomo provides only minimal needed config
$lfile = "$ldir/$in{'name'}.config";
# copy listdir template to list.info, fallback copy from template.dist
if ( ! -f "template/list.config") { &copy_source_dest("template/list.config.dist","template/list.config"); }
miniserv.pl
+2 -2
View File
@@ -1566,7 +1566,7 @@ foreach my $m (@mobile_prefixes) {
}
}
# check for the logout flag file, and if existant deny authentication
# check for the logout flag file, and if existent deny authentication
if ($config{'logout'} && -r $config{'logout'}.$in{'miniserv_logout_id'}) {
print DEBUG "handle_request: logout flag set\n";
$deny_authentication++;
@@ -2254,7 +2254,7 @@ if (-d _) {
@stfull = stat($full) if (!$foundidx);
}
if (-d _) {
# This is definately a directory.. list it
# This is definitely a directory.. list it
print DEBUG "handle_request: listing directory\n";
local $resp = "HTTP/1.0 $ok_code $ok_message\r\n".
"Date: $datestr\r\n".
mscstyle3/theme.pl
+1 -1
View File
@@ -2,7 +2,7 @@
#theme_prebody - called just before the main body of every page, so it can print any HTML it likes.
#theme_postbody - called just after the main body of every page.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links whereever you want them.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links wherever you want them.
#theme_footer - called instead of the footer function with the same parameters.
#theme_error - called instead of the error function, with the same parameters.
mscstyle_mini/theme.pl
+1 -1
View File
@@ -2,7 +2,7 @@
#theme_prebody - called just before the main body of every page, so it can print any HTML it likes.
#theme_postbody - called just after the main body of every page.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links whereever you want them.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links wherever you want them.
#theme_footer - called instead of the footer function with the same parameters.
#theme_error - called instead of the error function, with the same parameters.
msctheme-enhanced/theme.pl
+3 -3
View File
@@ -2,7 +2,7 @@
#theme_prebody - called just before the main body of every page, so it can print any HTML it likes.
#theme_postbody - called just after the main body of every page.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links whereever you want them.
#theme_header - called instead of the normal header function, with the same parameters. You could use this to re-write the header function in your own style with help and index links wherever you want them.
#theme_footer - called instead of the footer function with the same parameters.
#theme_error - called instead of the error function, with the same parameters.
@@ -481,7 +481,7 @@ if (@_ > 1 && !$one && $remote_user && !$notabs) {
} else {
###UNKNOWN CATAGORY [ACTIVE]
###UNKNOWN CATEGORY [ACTIVE]
print qq~<td nowrap><center><a href="/?cat=$c" onMouseOver="if (menuLive) showMenu('$c\_menu');"><img src="/images/cats/unknown_over.jpg" alt="$t" width="43" height="44" border="0"></a><img src="/images/list.gif" width="10" height="44" border="0" onClick="setLive(); showMenu('$c\_menu');" onMouseOver="if (menuLive) showMenu('$c\_menu');"><a href="/?cat=$c" onMouseOver="if (menuLive) showMenu('$c\_menu');"><br>~;
@@ -523,7 +523,7 @@ if (@_ > 1 && !$one && $remote_user && !$notabs) {
}
} else {
###UNKNOWN CATAGORY [NON-ACTIVE]
###UNKNOWN CATEGORY [NON-ACTIVE]
print qq~<td nowrap><center><a href="/?cat=$c" onMouseOver="if (menuLive) showMenu('$c\_menu'); mouseover('$c\_image','/images/cats/unknown_over.jpg');" onMouseOut="mouseout('$c\_image','/images/cats/unknown.jpg');"><img src="/images/cats/unknown.jpg" alt="$t" width="43" height="44" border="0" name="$c\_image"></a><img src="/images/list.gif" width="10" height="44" border="0" onClick="setLive(); showMenu('$c\_menu');" onMouseOver="if (menuLive) showMenu('$c\_menu'); mouseover('$c\_image','/images/cats/unknown_over.jpg');" onMouseOut="mouseout('$c\_image','/images/cats/unknown.jpg');"><a href="/?cat=$c" onMouseOver="if (menuLive) showMenu('$c\_menu'); mouseover('$c\_image','/images/cats/unknown_over.jpg');" onMouseOut="mouseout('$c\_image','/images/cats/unknown.jpg');"><br>~;
mysql/CHANGELOG
+1 -1
View File
@@ -41,7 +41,7 @@ Created a page showing database connections, with checkboxes and a button for ki
Create a page listing MySQL server variables, with the ability to edit system variables.
Column headings in the Table Data page can be clicked to sort the data by that column.
---- Changes since 1.300 ----
Added options on the backup form for selecting a compatability format for exporting to other database types.
Added options on the backup form for selecting a compatibility format for exporting to other database types.
Added an option to compress backups with gzip or bzip2.
When executing an SQL file (such as a backup), it will be automatically un-compressed if needed.
Re-factored backup code into a separate function, which can be called from other modules.
mysql/backup_form.cgi
+1 -1
View File
@@ -102,7 +102,7 @@ print &ui_table_row($text{'backup_charset'},
[ &list_character_sets($in{'db'}) ]) ] ]));
if ($mysql_version >= 5.0) {
# Show compatability format option
# Show compatibility format option
$cf = $c{'backup_compatible_'.$in{'db'}};
print &ui_table_row($text{'backup_compatible'},
&ui_radio("compatible_def", $cf ? 0 : 1,
mysql/mysql-lib.pl
+3 -3
View File
@@ -849,7 +849,7 @@ return $rv;
# execute_before(db, handle, escape, path, db-for-config)
# Executes the before-backup command for some DB, and sends output to the
# given file handle. Returns 1 if the command suceeds, or 0 on failure
# given file handle. Returns 1 if the command succeeds, or 0 on failure
sub execute_before
{
local $cmd = $config{'backup_before_'.$_[4]};
@@ -1390,7 +1390,7 @@ return @rv;
}
# list_compatible_formats()
# Returns a list of two-element arrays, containing compatability format
# Returns a list of two-element arrays, containing compatibility format
# codes and descriptions
sub list_compatible_formats
{
@@ -1400,7 +1400,7 @@ return map { [ $_, $text{'compat_'.$_} ] }
}
# list_compatible_options()
# Returns a list of two-element arrays, containing compatability options
# Returns a list of two-element arrays, containing compatibility options
sub list_compatible_options
{
return map { [ $_, $text{'compat_'.$_} ] }
postfix/debug.cgi
+1 -1
View File
@@ -3,7 +3,7 @@
# postfix-module by Guillaume Cottenceau <gc@mandrakesoft.com>,
# for webmin by Jamie Cameron
#
# A form for controling debugging features.
# A form for controlling debugging features.
#
# << Here are all options seen in Postfix sample-debug.cf >>
postfix/ldap.cgi
+1 -1
View File
@@ -3,7 +3,7 @@
# postfix-module by Guillaume Cottenceau <gc@mandrakesoft.com>,
# for webmin by Jamie Cameron
#
# A form for controling ldap lookups.
# A form for controlling ldap lookups.
#
# << Here are all options seen in Postfix sample-ldap.cf >>
postfix/sasl.cgi
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/local/bin/perl
# Show SMTP authentication related paramters
# Show SMTP authentication related parameters
require './postfix-lib.pl';
proftpd/proftpd-lib.pl
+1 -1
View File
@@ -227,7 +227,7 @@ return wantarray ? @vals : !@vals ? undef : $vals[$#vals];
}
# find_directive_struct(name, &directives)
# Returns references to directives maching some name
# Returns references to directives matching some name
sub find_directive_struct
{
local(@rv, $i, @vals);
pserver/cvsweb.cgi
+66 -66
View File
@@ -5,7 +5,7 @@
# Written in their spare time by
# Bill Fenner <fenner@FreeBSD.org> (original work)
# extended by Henner Zeller <zeller@think.de>,
# Henrik Nordström <hno@hem.passagen.se>
# Henrik Nordström <hno@hem.passagen.se>
# Ken Coar <coar@Apache.Org>
# Dick Balaska <dick@buckosoft.com>
# Jens-Uwe Mager <jum@helios.de>
@@ -120,7 +120,7 @@ sub MAGIC2();
sub OSCODE();
##### Start of Configuration Area ########
# == EDIT this ==
# == EDIT this ==
# User configuration is stored in
$config = "./cvsweb.conf";
@@ -145,7 +145,7 @@ $difffontsize = $inputTextSize = $mime_types = $allow_annotate =
$allow_markup = $use_java_script = $open_extern_window =
$extern_window_width = $extern_window_height = $edit_option_form =
$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
$navigationHeaderColor = $tableBorderColor = $markupLogColor =
$navigationHeaderColor = $tableBorderColor = $markupLogColor =
$tabstop = $use_moddate = $moddate = $gzip_open = undef;
##### End of configuration variables #####
@@ -230,7 +230,7 @@ if ($query = $ENV{'QUERY_STRING'}) {
}
}
# For backwards compability, set only_with_tag to only_on_branch if set.
# For backwards compatibility, set only_with_tag to only_on_branch if set.
$input{only_with_tag} = $input{only_on_branch}
if (defined($input{only_on_branch}));
@@ -255,11 +255,11 @@ foreach (keys %DEFAULTVALUE)
}
}
}
$barequery = "";
foreach (@stickyvars) {
# construct a query string with the sticky non default parameters set
if (defined($input{$_}) && ($input{$_} ne "") &&
if (defined($input{$_}) && ($input{$_} ne "") &&
(!defined($DEFAULTVALUE{$_}) || $input{$_} ne $DEFAULTVALUE{$_})) {
if ($barequery) {
$barequery = $barequery . "&amp;";
@@ -346,7 +346,7 @@ $defaultViewable = $allow_markup && viewable($mimetype);
# search for GZIP if compression allowed
# We've to find out if the GZIP-binary exists .. otherwise
# ge get an Internal Server Error if we try to pipe the
# output through the nonexistent gzip ..
# output through the nonexistent gzip ..
# any more elegant ways to prevent this are welcome!
if ($allow_compress && $maycompress && !$has_zlib) {
foreach (split(/:/, $ENV{PATH})) {
@@ -427,13 +427,13 @@ elsif (-d $fullname) {
$input{only_with_tag};
}
print "<HR NOSHADE>\n";
# Using <MENU> in this manner violates the HTML2.0 spec but
# provides the results that I want in most browsers. Another
# case of layout spooging up HTML.
my $infocols = 0;
if ($dirtable) {
if (defined($tableBorderColor)) {
@@ -442,8 +442,8 @@ elsif (-d $fullname) {
}
print "<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
$infocols++;
print "<tr><th align=left bgcolor=\"" . (($byfile) ?
$columnHeaderColorSorted :
print "<tr><th align=left bgcolor=\"" . (($byfile) ?
$columnHeaderColorSorted :
$columnHeaderColorDefault) . "\">";
print "<a href=\"./" . &toggleQuery("sortby","file") .
"#dirlist\">" if (!$byfile);
@@ -454,8 +454,8 @@ elsif (-d $fullname) {
# with revision information:
if (scalar(%fileinfo)) {
$infocols++;
print "<th align=left bgcolor=\"" . (($byrev) ?
$columnHeaderColorSorted :
print "<th align=left bgcolor=\"" . (($byrev) ?
$columnHeaderColorSorted :
$columnHeaderColorDefault) . "\">";
print "<a href=\"./" . &toggleQuery ("sortby","rev") .
"#dirlist\">" if (!$byrev);
@@ -463,8 +463,8 @@ elsif (-d $fullname) {
print "</a>" if (!$byrev);
print "</th>";
$infocols++;
print "<th align=left bgcolor=\"" . (($bydate) ?
$columnHeaderColorSorted :
print "<th align=left bgcolor=\"" . (($bydate) ?
$columnHeaderColorSorted :
$columnHeaderColorDefault) . "\">";
print "<a href=\"./" . &toggleQuery ("sortby","date") .
"#dirlist\">" if (!$bydate);
@@ -473,8 +473,8 @@ elsif (-d $fullname) {
print "</th>";
if ($show_author) {
$infocols++;
print "<th align=left bgcolor=\"" . (($byauthor) ?
$columnHeaderColorSorted :
print "<th align=left bgcolor=\"" . (($byauthor) ?
$columnHeaderColorSorted :
$columnHeaderColorDefault) . "\">";
print "<a href=\"./" . &toggleQuery ("sortby","author") .
"#dirlist\">" if (!$byauthor);
@@ -483,8 +483,8 @@ elsif (-d $fullname) {
print "</th>";
}
$infocols++;
print "<th align=left bgcolor=\"" . (($bylog) ?
$columnHeaderColorSorted :
print "<th align=left bgcolor=\"" . (($bylog) ?
$columnHeaderColorSorted :
$columnHeaderColorDefault) . "\">";
print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);
print "Last log entry";
@@ -502,7 +502,7 @@ elsif (-d $fullname) {
print "<menu>\n";
}
my $dirrow = 0;
my $i;
lookingforattic:
for ($i = 0; $i <= $#dir; $i++) {
@@ -517,7 +517,7 @@ elsif (-d $fullname) {
closedir($dh);
}
my $hideAtticToggleLink = "<a href=\"./" .
my $hideAtticToggleLink = "<a href=\"./" .
&toggleQuery ("hideattic") .
"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});
@@ -580,11 +580,11 @@ elsif (-d $fullname) {
}
print " ", &link($_ . "/", $url), $attic;
if ($_ eq "Attic") {
print "&nbsp; <a href=\"./" .
print "&nbsp; <a href=\"./" .
&toggleQuery ("hideattic") .
"#dirlist\">[Don't hide]</a>";
}
}
}
# Show last change in dir
if ($filename) {
print "</td><td>&nbsp;</td><td>&nbsp;" if ($dirtable);
@@ -653,7 +653,7 @@ elsif (-d $fullname) {
print " ", &link($_, $url), $attic;
print "</td><td>&nbsp;" if ($dirtable);
download_link($fileurl,
$rev, $rev,
$rev, $rev,
$defaultViewable ? "text/x-cvsweb-markup" : undef);
print "</td><td>&nbsp;" if ($dirtable);
if ($date) {
@@ -681,15 +681,15 @@ elsif (-d $fullname) {
print "</td></tr></table>";
}
print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";
if ($filesexists && !$filesfound) {
print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n";
}
if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) {
%tags = %alltags
}
if (scalar %tags
|| $input{only_with_tag}
if (scalar %tags
|| $input{only_with_tag}
|| $edit_option_form
|| defined($input{"options"})) {
print "<hr size=1 NOSHADE>";
@@ -711,7 +711,7 @@ elsif (-d $fullname) {
print ">";
print "<OPTION VALUE=\"\">All tags / default branch</OPTION>\n";
foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {
print "<OPTION",defined($input{only_with_tag}) &&
print "<OPTION",defined($input{only_with_tag}) &&
$input{only_with_tag} eq $tag ? " SELECTED":"",
">$tag</OPTION>\n";
}
@@ -748,14 +748,14 @@ elsif (-d $fullname) {
printDiffSelect(0);
print "</td>";
print "<td>Show Attic files: ";
print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'}?" CHECKED":"",
print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'}?" CHECKED":"",
"></td></tr>\n";
print "<tr><td align=center colspan=2><input type=submit value=\"Change Options\">";
print "</td></tr></table></center></FORM>\n";
}
print &html_footer;
print "</BODY></HTML>\n";
}
}
###############################
# View Files
@@ -889,7 +889,7 @@ sub htmlify($) {
# Special Characters; RFC 1866
$string =~ s/&/&amp;/g;
$string =~ s/\"/&quot;/g;
$string =~ s/\"/&quot;/g;
$string =~ s/</&lt;/g;
$string =~ s/>/&gt;/g;
@@ -921,7 +921,7 @@ sub spacedHtmlText($) {
# leave single space as it is
}
else {
$string =~ s/ /§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;/g;
$string =~ s/ /§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;§nbsp;/g;
$string =~ s/ /§nbsp;/g;
}
@@ -1024,7 +1024,7 @@ sub getMimeTypeFromSuffix($) {
($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/;
$mimetype = $MTYPES{$suffix};
$mimetype = $MTYPES{'*'} if (!$mimetype);
if (!$mimetype && -f $mime_types) {
# okey, this is something special - search the
# mime.types database
@@ -1037,7 +1037,7 @@ sub getMimeTypeFromSuffix($) {
}
close ($fh);
}
# okey, didn't find anything useful ..
if (!($mimetype =~ /\S\/\S/)) {
$mimetype = "text/plain";
@@ -1083,10 +1083,10 @@ sub doAnnotate ($$) {
# It was written by Cyclic Software, http://www.cyclic.com/, and is in
# the public domain.
# we could abandon the use of rlog, rcsdiff and co using
# the cvsserver in a similiar way one day (..after rewrite)
$pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
# the cvsserver in a similar way one day (..after rewrite)
$pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
"Fatal Error - unable to open cvs for annotation");
# OK, first send the request to the server. A simplified example is:
# Root /home/kingdon/zwork/cvsroot
# Argument foo/xx
@@ -1096,7 +1096,7 @@ sub doAnnotate ($$) {
# /home/kingdon/zwork/cvsroot
# annotate
# although as you can see there are a few more details.
print $writer "Root $cvsroot\n";
print $writer "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n";
# Don't worry about sending valid-requests, the server just needs to
@@ -1129,18 +1129,18 @@ sub doAnnotate ($$) {
# And the last "Directory" before "annotate" is the top level.
print $writer "Directory .\n";
print $writer "$cvsroot\n";
print $writer "annotate\n";
# OK, we've sent our command to the server. Thing to do is to
# close the writer side and get all the responses. If "cvs server"
# were nicer about buffering, then we could just leave it open, I think.
close ($writer) || die "cannot close: $!";
# Ready to get the responses from the server.
# For example:
# E Annotations for foo/xx
# E ***************
# M 1.3 (kingdon 06-Sep-97): hello
# M 1.3 (kingdon 06-Sep-97): hello
# ok
my ($lineNr) = 0;
my ($oldLrev, $oldLusr) = ("", "");
@@ -1181,7 +1181,7 @@ sub doAnnotate ($$) {
# is there a less timeconsuming way to strip spaces ?
($lrev = $lrev) =~ s/\s+//g;
my $isCurrentRev = ("$rev" eq "$lrev");
print "<b>" if ($isCurrentRev);
printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
print spacedHtmlText($line);
@@ -1192,7 +1192,7 @@ sub doAnnotate ($$) {
# CVS command line client. But for simplicity, we don't.
}
elsif ($words[0] eq "error") {
fatal ("500 Internal Error", "Error occured during annotate: <b>$_</b>");
fatal ("500 Internal Error", "Error occurred during annotate: <b>$_</b>");
}
}
if ($annTable) {
@@ -1251,7 +1251,7 @@ sub doCheckout($$) {
$moddate=$date{$symrev{HEAD}};
}
}
### just for the record:
### 'cvs co' seems to have a bug regarding single checkout of
### directories/files having spaces in it;
@@ -1261,7 +1261,7 @@ sub doCheckout($$) {
if (! open($fh, "-|")) { # child
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
exec("cvs", "-d", "$cvsroot", "co", "-p", "$revopt", "$where");
}
}
#===================================================================
#Checking out squid/src/ftp.c
#RCS: /usr/src/CVS/squid/src/ftp.c,v
@@ -1319,7 +1319,7 @@ sub cvswebMarkup($$$) {
&download_link(urlencode($fileurl), $revision, "(download)");
if (!$defaultTextPlain) {
print "&nbsp;";
&download_link(urlencode($fileurl), $revision, "(as text)",
&download_link(urlencode($fileurl), $revision, "(as text)",
"text/plain");
}
print "<BR>\n";
@@ -1367,7 +1367,7 @@ sub doDiff($$$$$$) {
my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
my $fh = do {local(*FH);};
my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
if (&forbidden_file($fullname)) {
&fatal("403 Forbidden", "Access forbidden. This file is mentioned in \@DissallowRead");
return;
@@ -1522,7 +1522,7 @@ sub getDirLogs($$@) {
}
# just execute rlog if there are any files
if ($#files < 0) {
if ($#files < 0) {
return;
}
@@ -1567,7 +1567,7 @@ again:
}
if ($state eq "head" && /^symbolic names/) {
$state = "tags";
($branch = $head) =~ s/\.\d+$// if (!defined($branch));
($branch = $head) =~ s/\.\d+$// if (!defined($branch));
$branch =~ s/(\.?)(\d+)$/${1}0.$2/;
$symrev{MAIN} = $branch;
$symrev{HEAD} = $branch;
@@ -1665,7 +1665,7 @@ again:
}
}
if ($. == 0) {
fatal("500 Internal Error",
fatal("500 Internal Error",
"Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");
}
close($fh);
@@ -1791,7 +1791,7 @@ sub readLog($;$) {
# branch, unless there is a branch tag in the RCS file in which case it's the
# highest revision on that branch. Find it by looking through @revorder; it
# is the first commit listed on the appropriate branch.
# This is not neccesary the same revision as marked as head in the RCS file.
# This is not necessary the same revision as marked as head in the RCS file.
my $headrev = $curbranch || "1";
($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;
revision:
@@ -1936,7 +1936,7 @@ sub printLog($;$) {
}
if (not $defaultTextPlain) {
print " / ";
&download_link($fileurl, $_, "(as text)",
&download_link($fileurl, $_, "(as text)",
"text/plain");
}
if (!$defaultViewable) {
@@ -2080,7 +2080,7 @@ sub printLog($;$) {
sub doLog($) {
my($fullname) = @_;
my ($diffrev, $upwhere, $filename, $backurl);
readLog($fullname);
html_header("CVS log for $where");
@@ -2268,7 +2268,7 @@ sub human_readable_diff($){
$rev2 = $r2r;
$date2 = $r2d;
}
print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";
print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";
@@ -2298,7 +2298,7 @@ sub human_readable_diff($){
####
while (<$fh>) {
$difftxt = $_;
if ($difftxt =~ /^@@/) {
($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
print "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";
@@ -2318,7 +2318,7 @@ sub human_readable_diff($){
# Add fontface, size
$_ = "$fs&nbsp;$_$fe";
#########
# little state machine to parse unified-diff output (Hen, zeller@think.de)
# in order to get some nice 'ediff'-mode output
@@ -2336,7 +2336,7 @@ sub human_readable_diff($){
$state = "PreChange";
$rightCol[$rightRow++] = $_;
}
}
}
elsif ($diffcode eq '-') {
$state = "PreChangeRemove";
$leftCol[$leftRow++] = $_;
@@ -2410,7 +2410,7 @@ sub navigateHeader ($$$$$) {
print "<a href=\"$swhere$query#rev$rev\">$backicon";
print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
print "</b> $fileicon</td>";
print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>";
print "</tr></table>";
}
@@ -2452,7 +2452,7 @@ sub readableTime($$) {
31536000, 'year');
my @breaks = sort {$a <=> $b} keys %desc;
$i = 0;
while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {
while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {
$i++;
}
$i--;
@@ -2463,7 +2463,7 @@ sub readableTime($$) {
my $rest = $secs % $break;
$i--;
$break = $breaks[$i];
my $resttime = plural_write(int ($rest / $break),
my $resttime = plural_write(int ($rest / $break),
$desc{"$break"});
if ($resttime) {
$retval = $retval . ", " . $resttime;
@@ -2481,9 +2481,9 @@ sub readableTime($$) {
# basename (last directory/file) is a link as well
##
sub clickablePath($$) {
my ($pathname,$clickLast) = @_;
my ($pathname,$clickLast) = @_;
my $retval = '';
if ($pathname eq '/') {
# this should never happen - chooseCVSRoot() is
# intended to do this
@@ -2525,10 +2525,10 @@ sub chooseCVSRoot() {
my ($k);
print "<form method=\"GET\" action=\"${scriptwhere}\">\n";
foreach $k (keys %input) {
print "<input type=hidden NAME=$k VALUE=$input{$k}>\n"
print "<input type=hidden NAME=$k VALUE=$input{$k}>\n"
if ($input{$k}) && ($k ne "cvsroot");
}
# Form-Elements look wierd in Netscape if the background
# Form-Elements look weird in Netscape if the background
# isn't gray and the form elements are not placed
# within a table ...
print "<table><tr>";
@@ -2559,7 +2559,7 @@ sub chooseMirror() {
# and may not be useful for your site; If you don't
# set %MIRRORS this won't show up, anyway
#
# Should perhaps exlude the current site somehow..
# Should perhaps exlude the current site somehow..
if (keys %MIRRORS) {
print "\nThis cvsweb is mirrored in:\n";
foreach $mirror (keys %MIRRORS) {
@@ -2619,7 +2619,7 @@ sub download_url($$$) {
return $url;
}
# Presents a link to download the
# Presents a link to download the
# selected revision
sub download_link($$$$) {
my ($url,$revision,$textlink,$mimetype) = @_;
quota/quota-lib.pl
+1 -1
View File
@@ -518,7 +518,7 @@ else {
=head2 block_size(dir, [for-filesys])
Returns the size (in bytes) of blocks on some filesystem, if known. All
quota functions deal with blocks, so they must be multipled by the value
quota functions deal with blocks, so they must be multiplied by the value
returned by this function before display to users.
=cut
samba/acl_security.pl
+2 -2
View File
@@ -231,12 +231,12 @@ if ($in{'r_fs'} < $in{'w_fs'} || $in{'r_ps'} < $in{'w_ps'}) {
&error($text{'acl_ernow'});
}
# If create, read, AND write are all turned off... dont SHOW file shares...
# If create, read, AND write are all turned off... don't SHOW file shares...
$_[0]->{'conf_fs'}=1;
if ($in{'c_fs'} == "" && $in{'r_fs'} == "" && $in{'w_fs'} == "") {
$_[0]->{'conf_fs'}=0;
}
# If create, read, AND write are all turned off... dont SHOW print shares...
# If create, read, AND write are all turned off... don't SHOW print shares...
$_[0]->{'conf_ps'}=1;
if ($in{'c_ps'} == "" && $in{'r_ps'} == "" && $in{'w_ps'} == "") {
$_[0]->{'conf_ps'}=0;
samba/samba-lib.pl
+3 -3
View File
@@ -338,7 +338,7 @@ return undef;
# setval(name, value, [default])
# Sets some value in %share. Synonyms with the same meaning are removed.
# If the value is the same as the share or given default, dont store it
# If the value is the same as the share or given default, don't store it
sub setval
{
local($_);
@@ -571,7 +571,7 @@ local $n;
return &ui_group_textbox($n, &getval($_[0]));
}
@sock_opts = ("SO_KEEPALIVE", "SO_REUSEADDR", "SO_BROADCAST", "TCP_NODELAY",
@sock_opts = ("SO_KEEPALIVE", "SO_REUSEADDR", "SO_BROADCAST", "TCP_NODELAY",
"IPTOS_LOWDELAY", "IPTOS_THROUGHPUT", "SO_SNDBUF*", "SO_RCVBUF*",
"SO_SNDLOWAT*", "SO_RCVLOWAT*");
@@ -833,7 +833,7 @@ if ($acc->{'per_' . $stype . '_acls'}) {
return 0 if index($acl, $_) == -1;
}
}
return 1;
return 1;
}
# save_samba_acl($permissions_string, \%access, $share_name)
samba/smbhash.pl
+2 -2
View File
@@ -7,8 +7,8 @@
# Works out if local system has the module Digest::MD4, and uses it
# if it does, otherwise uses ported version of the md4 algorithm
# Performance is alot better with Digest::MD4, so its recommended to
# get Digest::MD4 installed if you intend to generate alot of hashes
# Performance is a lot better with Digest::MD4, so its recommended to
# get Digest::MD4 installed if you intend to generate a lot of hashes
# in a small amount of time.
my $HaveDigestMD4;
smf/property_group_editor.cgi
+1 -1
View File
@@ -97,7 +97,7 @@ foreach $pg (@pgroup_listing) {
print "<input type=checkbox name=\"applyto\" value=\"$sinst/$name\">";
print "</td><td>\n";
print "$sinst</td><td>\n";
# dont allow edit of nonpersistent items!
# don't allow edit of nonpersistent items!
if ($type =~ /NONPERSISTENT/) {
print "$name";
} else {
smf/smf-lib.pl
+4 -4
View File
@@ -91,7 +91,7 @@ $wizard = "page=smfwizard_service.cgi,min=1,max=1; \
# Run all smf commands (separated by ";", check if expected retvals match
# (if needed) and return response(s)
#
# Paramters: cmdlist, [expected_retval]
# Parameters: cmdlist, [expected_retval]
#
sub run_smf_cmds()
{
@@ -130,7 +130,7 @@ return $response;
# Import supplied manifest into repository, expect success
#
# Paramters: manifest
# Parameters: manifest
#
sub svc_import()
{
@@ -286,7 +286,7 @@ foreach $pgroup_info (@pgroup_list) {
return @listing;
}
# Set property (creates if doesnt yet exist)
# Set property (creates if doesn't yet exist)
#
# Parameters: fmri, service_or_instance, pgname, name, type, value
#
@@ -799,7 +799,7 @@ if ($tree_ref->{"$fmri"}->{'exists'} != 1) {
$dep_grouping = &svc_grouping_cmd($parent, $child);
# we need to determine if dep has children, in order
# to disable the expand button if not. however, we
# dont recurse if it does unless it was on expand list
# don't recurse if it does unless it was on expand list
$tree_ref->{"$fmri"}->{'haschildren'} = 1;
chomp($dep_fmri);
push(@{$tree_ref->{"$fmri"}->{'children'}},
smf/svc_chooser.cgi
+1 -1
View File
@@ -131,7 +131,7 @@ EOF
$isvalid = 1;
$expand = 0;
} elsif ($type eq "inst") {
# cannnot select svc...
# cannot select svc...
$isvalid = 0;
$expand = 1;
} else {
smf/wizard.pl
+2 -2
View File
@@ -117,7 +117,7 @@ $add_disabled = "";
$update_disabled = "disabled=\"disabled\"";
$new_disabled = "disabled=\"disabled\"";
$remove_disabled="disabled=\"disabled\"";
# if we have data already for page, dont disable remove/clear, disable add,
# if we have data already for page, don't disable remove/clear, disable add,
# enable update
@thispage_datafiles = &list_wizard_datafiles("$pagename.$pageinst");
if (@thispage_datafiles > 0) {
@@ -397,7 +397,7 @@ if (($button_name eq "$text{'wizard_add'}") ||
&redirect("$pagename?pageinst=$pageinst&validate=1&next_pagename=$next_pagename&next_pageinst=$next_pageinst");
}
# Shouldnt be here!
# Shouldn't be here!
&error("Invalid button name $button_name!");
}
software/csw-lib.pl
+1 -1
View File
@@ -49,7 +49,7 @@ do {
elsif (/Installation of <(.*)> failed/i) {
$failed = 1;
}
elsif (/dependancy\s+(\S+)\s+.*not up to date/i) {
elsif (/dependency\s+(\S+)\s+.*not up to date/i) {
# Needs a dependecy .. so we will need to re-run!
local $dep = $1;
$update = join(" ", &unique(
software/tree.cgi
+2 -2
View File
@@ -7,7 +7,7 @@ require './software-lib.pl';
$spacer = "&nbsp;"x3;
# work out the package heirarchy..
# work out the package hierarchy..
$n = &list_packages();
for($i=0; $i<$n; $i++) {
push(@pack, $packages{$i,'name'});
@@ -39,7 +39,7 @@ foreach $c (sort { $a cmp $b } &unique(@class)) {
%heiropen = map { $_, 1 } &get_heiropen();
$heiropen{""} = 1;
# traverse the heirarchy
# traverse the hierarchy
print "<table width=100%>\n";
&traverse("", 0);
print "</table>\n";
sshd/sshd-lib.pl
+1 -1
View File
@@ -322,7 +322,7 @@ else {
# get_mlvalues(file, id, [splitchar])
# Return an array with values from a file, where the
# values are one per line with an id preceeding them
# values are one per line with an id preceding them
sub get_mlvalues
{
local @rv;
status/space-monitor.pl
+1 -1
View File
@@ -78,7 +78,7 @@ else {
&ui_textbox("other", $_[0]->{'fs'}, 30));
}
# Minumum free space
# Minimum free space
local $min = $_[0]->{'min'};
local $pc = ($min =~ s/\%$// ? 1 : 0);
print &ui_table_row($text{'space_min2'},
status/status-lib.pl
+1 -1
View File
@@ -387,7 +387,7 @@ return $group->{'name'}." (".
}
# list_notification_modes()
# Returns a list of available notifcation modes (like email, sms, etc..)
# Returns a list of available notification modes (like email, sms, etc..)
sub list_notification_modes
{
my @rv = ( "email" );
tcpwrappers/edit_rule.cgi
+6 -6
View File
@@ -24,7 +24,7 @@ if ($in{'new'}) {
@eservices = split /,\s?|\s+/, $2;
} else {
@services = split /,\s?|\s+/, $rule->{'service'};
}
}
if (@xservices) {
# try to find all services (daemons) in xinetd/inetd
@@ -43,7 +43,7 @@ if ($in{'new'}) {
$ehosts = $2
} else {
$hosts = $rule->{'host'};
}
}
}
# Form header
@@ -65,7 +65,7 @@ else {
print &ui_table_row($text{'edit_service'},
&ui_textbox("service_custom", join(",",@services), 40));
print &ui_table_row($text{'edit_except'},
&ui_textbox("service_except_custom", join(",",@eservices), 40));
&ui_textbox("service_except_custom", join(",",@eservices), 40));
}
print &ui_table_hr();
@@ -90,9 +90,9 @@ print &ui_table_hr();
$label = $text{'edit_cmd'};
for ($i = 0; $i <= $#cmds; $i++) {
$cmds[$i] =~ s/^\s*//;
my $choosed = $cmds[$i] =~ /^(spawn|twist)/ ? $1 : 'none';
$cmds[$i] =~ s/^\s*${choosed}\s*// if ($cmds[$i] =~ /^\s*(spawn)|(twist)/);
print &ui_table_row($label, &ui_select("cmd_directive_$i", $choosed, \@directives).' '.&ui_textbox("cmd_$i", $cmds[$i], 50), 3);
my $chosen = $cmds[$i] =~ /^(spawn|twist)/ ? $1 : 'none';
$cmds[$i] =~ s/^\s*${chosen}\s*// if ($cmds[$i] =~ /^\s*(spawn)|(twist)/);
print &ui_table_row($label, &ui_select("cmd_directive_$i", $chosen, \@directives).' '.&ui_textbox("cmd_$i", $cmds[$i], 50), 3);
$label = "";
}
ui-lib.pl
+9 -9
View File
@@ -1,4 +1,4 @@
use vars qw($theme_no_table $ui_radio_selector_donejs $module_name
use vars qw($theme_no_table $ui_radio_selector_donejs $module_name
$ui_multi_select_donejs, $ui_formcount);
=head1 ui-lib.pl
@@ -321,7 +321,7 @@ return $rv;
=head2 ui_checked_columns_row(&columns, &tdtags, checkname, checkvalue, [checked?], [disabled], [tags])
Returns HTML for a row in a multi-column table, in which the first column
Returns HTML for a row in a multi-column table, in which the first column
contains a checkbox. The parameters are :
=item columns - Reference to an array containing the HTML to show in the columns for this row.
@@ -1339,7 +1339,7 @@ return "<input class='ui_submit' type='submit'".
($name ne '' ? " id=\"".&quote_escape($name)."\"" : "").
" value=\"".&quote_escape($label)."\"".
($dis ? " disabled='true'" : "").
($tags ? " ".$tags : "").">\n";
($tags ? " ".$tags : "").">\n";
}
=head2 ui_reset(label, [disabled?], [tags])
@@ -1360,7 +1360,7 @@ return &theme_ui_reset(@_) if (defined(&theme_ui_reset));
my ($label, $dis, $tags) = @_;
return "<input class='ui_reset' type='reset' value=\"".&quote_escape($label)."\"".
($dis ? " disabled='true'" : "").
($tags ? " ".$tags : "").">\n";
($tags ? " ".$tags : "").">\n";
}
=head2 ui_button(label, [name], [disabled?], [tags])
@@ -1456,7 +1456,7 @@ return &theme_ui_buttons_end(@_) if (defined(&theme_ui_buttons_end));
return "</table>\n";
}
=head2 ui_buttons_row(script, button-label, description, [hiddens], [after-submit], [before-submit])
=head2 ui_buttons_row(script, button-label, description, [hiddens], [after-submit], [before-submit])
Returns HTML for a button with a description next to it, and perhaps other
inputs. The parameters are :
@@ -1888,7 +1888,7 @@ my $divid = "hiddendiv_$name";
my $openerid = "hiddenopener_$name";
my $defimg = $status ? "open.gif" : "closed.gif";
my $defclass = $status ? 'opener_shown' : 'opener_hidden';
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
defined($gconfig{'cs_text'}) ? $gconfig{'cs_text'} : "000000";
$rv .= "<table class='ui_table' border $tabletags>\n";
my $colspan = 1;
@@ -2057,7 +2057,7 @@ return $rv;
=head2 ui_tabs_start_tab(name, tab)
Must be called before outputting the HTML for the named tab, and returns HTML
for the required <div> block.
for the required <div> block.
=cut
sub ui_tabs_start_tab
@@ -2072,7 +2072,7 @@ return $rv;
=head2 ui_tabs_start_tabletab(name, tab)
Behaves like ui_tabs_start_tab, but for use within a ui_table_start block.
Behaves like ui_tabs_start_tab, but for use within a ui_table_start block.
I recommend against using this where possible, as it is difficult for themes
to implement.
@@ -2358,7 +2358,7 @@ action, such as deleting a user. The parameters are :
=item buttons - Array ref of two-element array refs, containing form button names and labels.
=item otherinputs - HTML for extra inputs to include in ther form.
=item otheirinputs - HTML for extra inputs to include in their form.
=item extra-warning - An additional separate warning message to show.
update-from-repo.sh
+2 -2
View File
@@ -40,13 +40,13 @@ if [[ "$1" == "-h" || "$1" == "--help" ]] ; then
exit 0
fi
# dont ask -y given
# don't ask -y given
if [[ "$1" == "-y" || "$1" == "-yes" ]] ; then
ASK="NO"
shift
fi
# update onyl lang files
# update only lang files
if [[ "$1" == "-l" || "$1" == "-lang" ]] ; then
LANG="YES"
shift
usermin/usermin-lib.pl
+2 -2
View File
@@ -481,7 +481,7 @@ else {
return $text{'install_enone'};
}
# Get the module.info files to check dependancies
# Get the module.info files to check dependencies
local $ver = &get_usermin_version();
local $tmpdir = &transname();
mkdir($tmpdir, 0700);
@@ -815,7 +815,7 @@ sub flush_modules_cache
=head2 stop_usermin
Kills the running Usermin server process, returning undef on sucess or an
Kills the running Usermin server process, returning undef on success or an
error message on failure.
=cut
web-lib-funcs.pl
+25 -25
View File
@@ -125,7 +125,7 @@ my $rv = &read_file_cached(@_);
$main::read_file_cache_time{$realfile} = $st[9];
return $rv;
}
=head2 write_file(file, &hash, [join-char])
Write out the contents of a hash as name=value lines. The parameters are :
@@ -376,7 +376,7 @@ sub check_ip6address
return 0 if (@blocks == 0 || @blocks > 8);
# The address/netmask format is accepted. So we're looking for a "/" to isolate a possible netmask.
# After that, we delete the netmask to control the address only format, but we verify whether the netmask
# After that, we delete the netmask to control the address only format, but we verify whether the netmask
# value is in [0;128].
my $ib = $#blocks;
my $where = index($blocks[$ib],"/");
@@ -387,8 +387,8 @@ sub check_ip6address
$blocks[$ib]=$b;
}
# The netmask must take its value in [0;128]
return 0 if ($m <0 || $m >128);
# The netmask must take its value in [0;128]
return 0 if ($m <0 || $m >128);
# Check the different blocks of the address : 16 bits block in hexa notation.
# Possibility of 1 empty block or 2 if the address begins with "::".
@@ -878,7 +878,7 @@ my $bgcolor = defined($tconfig{'cs_page'}) ? $tconfig{'cs_page'} :
defined($gconfig{'cs_page'}) ? $gconfig{'cs_page'} : "ffffff";
my $link = defined($tconfig{'cs_link'}) ? $tconfig{'cs_link'} :
defined($gconfig{'cs_link'}) ? $gconfig{'cs_link'} : "0000ee";
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
defined($gconfig{'cs_text'}) ? $gconfig{'cs_text'} : "000000";
my $bgimage = defined($tconfig{'bgimage'}) ? "background=$tconfig{'bgimage'}" : "";
my $dir = $current_lang_info->{'dir'} ? "dir=\"$current_lang_info->{'dir'}\"" : "";
@@ -1145,7 +1145,7 @@ my $bgcolor = defined($tconfig{'cs_page'}) ? $tconfig{'cs_page'} :
defined($gconfig{'cs_page'}) ? $gconfig{'cs_page'} : "ffffff";
my $link = defined($tconfig{'cs_link'}) ? $tconfig{'cs_link'} :
defined($gconfig{'cs_link'}) ? $gconfig{'cs_link'} : "0000ee";
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
defined($gconfig{'cs_text'}) ? $gconfig{'cs_text'} : "000000";
my $bgimage = defined($tconfig{'bgimage'}) ? "background='$tconfig{'bgimage'}'"
: "";
@@ -1162,7 +1162,7 @@ $miniserv::page_capture = 1;
=head2 footer([page, name]+, [noendbody])
Outputs the footer for a Webmin HTML page, possibly with links back to other
pages. The links are specified by pairs of parameters, the first of which is
pages. The links are specified by pairs of parameters, the first of which is
a link destination, and the second the link text. For example :
footer('/', 'Webmin index', '', 'Module menu');
@@ -1514,7 +1514,7 @@ exit;
=head2 error_setup(message)
Registers a message to be prepended to all error messages displayed by the
Registers a message to be prepended to all error messages displayed by the
error function.
=cut
@@ -1952,7 +1952,7 @@ return "$config_directory/webmin.acl";
=head2 acl_check
Does nothing, but kept around for compatability.
Does nothing, but kept around for compatibility.
=cut
sub acl_check
@@ -2077,7 +2077,7 @@ if (!$nowait) {
=head2 reload_miniserv([ignore-errors])
Sends a USR1 signal to the miniserv process, telling it to read-read it's
configuration files. Not all changes will be applied though, such as the
configuration files. Not all changes will be applied though, such as the
IP addresses and ports to accept connections on.
=cut
@@ -2851,7 +2851,7 @@ return 1;
=head2 no_proxy(host)
Checks if some host is on the no proxy list. For internal use by the
Checks if some host is on the no proxy list. For internal use by the
http_download and ftp_download functions.
=cut
@@ -2867,7 +2867,7 @@ return 0;
=head2 open_socket(host, port, handle, [&error])
Open a TCP connection to some host and port, using a file handle. The
Open a TCP connection to some host and port, using a file handle. The
parameters are :
=item host - Hostname or IP address to connect to.
@@ -3471,7 +3471,7 @@ with the same name as the module. The parameters are :
=item file - The API file in that module, like sendmail-lib.pl. If missing, all API files are loaded.
=item package - Perl package to place the module's functions and global variables in.
=item package - Perl package to place the module's functions and global variables in.
If the original module name contains dashes, they will be replaced with _ in
the package name.
@@ -4688,7 +4688,7 @@ if ($module_name && !$main::no_acl_check &&
}
$main::no_acl_check++;
}
# Check for trigger URL to simply redirect to root: required for Authentic Theme 19.00+
if ($ENV{'REQUEST_URI'} =~ /xnavigation=1/) {
redirect("/");
@@ -5389,7 +5389,7 @@ script. The parameters are :
=item hash - Hash reference of names and values to write.
=item export - If set to 1, preceed each variable setting with the word 'export'.
=item export - If set to 1, prepend each variable setting with the word 'export'.
=cut
sub write_env_file
@@ -5641,7 +5641,7 @@ foreach $f (keys %main::locked_file_list) {
=head2 can_lock_file(file)
Returns 1 if some file should be locked, based on the settings in the
Returns 1 if some file should be locked, based on the settings in the
Webmin Configuration module. For internal use by lock_file only.
=cut
@@ -5672,7 +5672,7 @@ else {
=head2 webmin_log(action, type, object, &params, [module], [host, script-on-host, client-ip])
Log some action taken by a user. This is typically called at the end of a
script, once all file changes are complete and all commands run. The
script, once all file changes are complete and all commands run. The
parameters are :
=item action - A short code for the action being performed, like 'create'.
@@ -6526,7 +6526,7 @@ return &remote_rpc_call($_[0], { 'action' => 'call',
=head2 remote_foreign_check(server, module, [api-only])
Checks if some module is installed and supported on a remote server. Equivilant
Checks if some module is installed and supported on a remote server. Equivalent
to foreign_check, but for the remote Webmin system specified by the server
parameter.
@@ -7531,7 +7531,7 @@ return undef;
=head2 read_http_connection(&handle, [bytes])
Reads either one line or up to the specified number of bytes from the handle,
originally supplied by make_http_connection.
originally supplied by make_http_connection.
=cut
sub read_http_connection
@@ -8169,12 +8169,12 @@ my @licrv;
if ($main::licence_module) {
foreach my $m (@themerv) {
if (&foreign_call($main::licence_module,
"check_module_licence", $m->{'dir'})) {
"check_module_licence", $m->{'dir'})) {
push(@licrv, $m);
}
}
}
else {
else {
@licrv = @themerv;
}
@@ -9487,9 +9487,9 @@ return "<input type=button onClick='ifield = document.forms[$form].$_[0]; choose
=head2 substitute_template(text, &hash)
Given some text and a hash reference, for each ocurrance of $FOO or ${FOO} in
Given some text and a hash reference, for each occurrence of $FOO or ${FOO} in
the text replaces it with the value of the hash key foo. Also supports blocks
like ${IF-FOO} ... ${ENDIF-FOO}, whose contents are only included if foo is
like ${IF-FOO} ... ${ENDIF-FOO}, whose contents are only included if foo is
non-zero, and ${IF-FOO} ... ${ELSE-FOO} ... ${ENDIF-FOO}.
=cut
@@ -10130,7 +10130,7 @@ $main::clear_time_locale_count--;
=head2 callers_package(filehandle)
Convert a non-module filehandle like FOO to one qualified with the
Convert a non-module filehandle like FOO to one qualified with the
caller's caller's package, like fsdump::FOO. For internal use only.
=cut
@@ -10440,7 +10440,7 @@ to display. Each is a hash ref with the following keys :
=item html - In "html" mode, the raw HTML to display
=item usage - In "usage" mode, an array ref of things to show some kind of
=item usage - In "usage" mode, an array ref of things to show some kind of
usage for. Each is a hash ref with keys described below.
=item titles - In "usage" mode, an 3-element array ref of titles to show above
webmin/CHANGELOG
+1 -1
View File
@@ -51,7 +51,7 @@ Added a section to the SSL Encryption page for uploading an existing PEM format
Added buttons on the Proxy Servers and Downloads page for viewing and deleting cached files, and clearing the entire cache.
Fixed a bug that prevents module installs from RPMs from working.
---- Changes since 1.320 ----
Added an option to the Advanced page for supressing the display of Perl errors.
Added an option to the Advanced page for suppressing the display of Perl errors.
Added a new Mobile Device Options page for defining a custom theme and login process for mobile browsers.
---- Changes since 1.330 ----
Added an option to the Logging page to write Webmin actions to syslog.
webmin/edit_web.cgi
+1 -1
View File
@@ -13,7 +13,7 @@ print &ui_table_row($text{'web_expires'},
&ui_opt_textbox("expires", $miniserv{'expires'}, 10,
$text{'web_expiresdef'}, $text{'web_expiressecs'}), undef, [ "valign=middle","valign=middle" ]);
# Additonal expiry times based on path
# Additional expiry times based on path
my @expires_paths;
foreach my $pe (split(/\t+/, $miniserv{'expires_paths'})) {
my ($p, $e) = split(/=/, $pe);
webmin/letsencrypt-cleanup.pl
+1 -1
View File
@@ -33,5 +33,5 @@ if ($r) {
# Apply the change
&bind8::restart_bind();
sleep(10); # Wait for DNS propogation
sleep(10); # Wait for DNS propagation
&webmin_log("letsencryptcleanup", undef, $dname);
webmin/letsencrypt-dns.pl
+1 -1
View File
@@ -42,6 +42,6 @@ if ($r) {
# Apply the change
&bind8::restart_bind();
sleep(10); # Wait for DNS propogation
sleep(10); # Wait for DNS propagation
&webmin_log("letsencryptdns", undef, $dname);
exit(0);
webmin/upgrade.cgi
+1 -1
View File
@@ -284,7 +284,7 @@ elsif ($in{'mode'} eq 'solaris-pkg' || $in{'mode'} eq 'sun-pkg') {
my @p = &foreign_call("software", "file_packages", $file);
#
# The package name will always include "webmin" in lower case,
# but may be preceeded by the source package source ("WS" for the
# but may be preceded by the source package source ("WS" for the
# Webmin.com package, "SUNW" for the Sun distributed package).
# and it could have trailing characters to define a set of items
# that are installed separately ("r" for the Sun "root" package,
webmin/webmin-lib.pl
+7 -7
View File
@@ -132,10 +132,10 @@ Installs a webmin module or theme, and returns either an error message
or references to three arrays for descriptions, directories and sizes.
On success or failure, the file is deleted if the unlink parameter is set.
Unless the nodeps parameter is set to 1, any missing dependencies will cause
installation to fail.
installation to fail.
Any new modules will be granted to the users and groups named in the fourth
paramter, which must be an array reference.
parameter, which must be an array reference.
=cut
sub install_webmin_module
@@ -280,7 +280,7 @@ else {
return $text{'install_enone'};
}
# Get the module.info or theme.info files to check dependancies
# Get the module.info or theme.info files to check dependencies
my $ver = &get_webmin_version();
my $tmpdir = &transname();
mkdir($tmpdir, 0700);
@@ -455,7 +455,7 @@ sub grant_user_module
my %acl;
&read_acl(undef, \%acl);
my $fh = "GRANTS";
&open_tempfile($fh, ">".&acl_filename());
&open_tempfile($fh, ">".&acl_filename());
my $u;
foreach $u (keys %acl) {
my @mods = @{$acl{$u}};
@@ -843,7 +843,7 @@ return @sockets;
=head2 fetch_updates(url, [login, pass], [sig-mode])
Returns a list of updates from some URL, or calls &error. Each element is an
Returns a list of updates from some URL, or calls &error. Each element is an
array reference containing :
=item Module directory name.
@@ -1126,7 +1126,7 @@ if (($realos{'os_version'} ne $gconfig{'os_version'} ||
}
else {
# Large enough change to tell the user
push(@notifs,
push(@notifs,
&ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
&text('os_incorrect', $realos{'real_os_type'},
$realos{'real_os_version'})."<p>\n".
@@ -1396,7 +1396,7 @@ if (exists($gconfig{'shared_root'}) && $gconfig{'shared_root'} eq '1') {
return 1;
}
elsif (exists($gconfig{'shared_root'}) && $gconfig{'shared_root'} eq '0') {
# Definately not shared
# Definitely not shared
return 0;
}
if (&running_in_zone()) {