Add prefs info files

Fix for restore job locking when using SQLite

README.md

@@ -10,11 +10,11 @@
 
 **Webmin** is a web-based system administration tool for Unix-like servers, and services with over _1,000,000_ installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and [many more](https://doxfer.webmin.com/Webmin/Introduction). 
 
-![](https://github.com/webmin-devel/webmin/blob/master/media/webmin-demo-basic.gif?raw=true)
+[![Quick UI overview 2021](https://rostovtsev.io/pub/media/screenshots/webmin-2021-screenshot-updated.png)](https://www.youtube.com/watch?v=daYG6O4AsEw&feature=emb_logo)
 
 Usability can be expanded by installing modules, which can be custom made. Aside from this, there are two other major projects that extend its functionality:
 
-* [Virtualmin](https://www.virtualmin.com) is a powerful, flexible, most popular, and most comprehensive web-hosting control panel for Linux, and BSD systems, with over _100,000_ installations worldwide. It is available in an open-source community-supported version, and a more feature-filled version with premium support;
+* [Virtualmin](https://www.virtualmin.com) is a powerful, flexible, most popular, and most comprehensive web-hosting control panel for Linux, and BSD systems, with over _150,000_ installations worldwide. It is available in an open-source community-supported version, and a more feature-filled version with premium support;
 * [Usermin](https://github.com/webmin/usermin) presents and controls a subset of user-centred features, rather than administrator-level tasks.
 
 Webmin includes _116_ [standard modules](https://doxfer.webmin.com/Webmin/Webmin_Modules), and there are at least as many third-party modules.
@@ -29,7 +29,7 @@ Webmin can be installed in two different ways:
  1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) from our [download page](http://webmin.com/download.html);
   <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
 
- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.970.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.972.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
   <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
 
 ## Documentation

acl/edit_acl.cgi

@@ -26,7 +26,8 @@ else {
 
 my %minfo = $in{'mod'} ? &get_module_info($in{'mod'})
 		       : ( 'desc' => $text{'index_global'} );
-my $below = &text($in{'group'} ? 'acl_title3' : 'acl_title2', "<tt>$who</tt>",
+my $below = &text($in{'group'} ? 'acl_title3' : 'acl_title2', 
+	          "<tt>".&html_escape($who)."</tt>",
 	          "<tt>$minfo{'desc'}</tt>");
 &ui_print_header($below, $text{'acl_title'}, "",
 		 -r &help_file($in{'mod'}, "acl_info") ?

acl/edit_sql.cgi

@@ -96,6 +96,16 @@ print &ui_table_row(undef,
 		  [ [ 0, $text{'sql_addto0'} ],
 		    [ 1, $text{'sql_addto1'} ] ]), 2);
 
+print &ui_table_row(undef,
+	&ui_radio("nocache", int($miniserv{'userdb_nocache'} || 0),
+		  [ [ 0, $text{'sql_nocache0'} ],
+		    [ 1, $text{'sql_nocache1'} ] ]), 2);
+
+print &ui_table_row(undef,
+	&ui_opt_textbox("timeout", $miniserv{'userdb_cache_timeout'},
+			5, $text{'sql_timeout_def'}, $text{'sql_timeout_for'}).
+			" ".$text{'sql_timeout_secs'});
+
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'save'} ] ]);
 

acl/lang/en

@@ -81,7 +81,7 @@ edit_egone=Selected user no longer exists!
 edit_ecreate=You are not allowed to create users
 edit_theme=Personal UI theme
 edit_themeglobal=From Webmin Configuration
-edit_themedef=Old Webmin theme
+edit_themedef=Legacy Theme
 edit_overlay=Personal theme overlay
 edit_overlayglobal=None - use theme defaults
 edit_log=View Logs
@@ -444,6 +444,8 @@ sql_ldap=Use LDAP server
 sql_prefix=Create under DN
 sql_addto0=Add new users to database selected above
 sql_addto1=Add new users to local files
+sql_nocache0=Cache connections to database
+sql_nocache1=Open a new connection for each lookup
 sql_emod=Missing required Perl module <tt>$1</tt>
 sql_etable=Failed to query required table $1 : $2
 sql_eldapdn=Base LDAP DN $1 was not found
@@ -464,6 +466,10 @@ sql_dnerr=User and group database settings are valid, but the LDAP DN needed by
 sql_dnerr2=Click the <b>Create DN</b> button below to have it create automatically, or add it to your LDAP server manually.
 sql_makedn=Create DN
 sql_schema=Download LDAP Schema
+sql_timeout_def=Use default connection timeout (60 seconds)
+sql_timeout_for=Close cached connections after
+sql_timeout_secs=seconds
+sql_etimeout=Cached connection timeout must be a number
 
 make_title=Create User and Group Tables
 make_err=Failed to create user and group tables

acl/prefs.info

@@ -0,0 +1 @@
+allowed=display,order

acl/save_sql.cgi

@@ -102,6 +102,14 @@ else {
 	&lock_file($ENV{'MINISERV_CONFIG'});
 	$miniserv{'userdb'} = $str;
 	$miniserv{'userdb_addto'} = $in{'addto'};
+	$miniserv{'userdb_nocache'} = $in{'nocache'};
+	if ($in{'timeout_def'}) {
+		delete($miniserv{'userdb_cache_timeout'});
+		}
+	else {
+		$in{'timeout'} =~ /^(\d+\.)?\d+$/ || &error($text{'sql_etimeout'});
+		$miniserv{'userdb_cache_timeout'} = $in{'timeout'};
+		}
 	&put_miniserv_config(\%miniserv);
 	&unlock_file($ENV{'MINISERV_CONFIG'});
 	&reload_miniserv();

ajaxterm/index.cgi

@@ -16,7 +16,7 @@ our $module_name;
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
 
 # Check for python
-my $python = &has_command("python");
+my $python = &get_python_cmd();
 if (!$python) {
 	&ui_print_endpage(&text('index_epython', "<tt>python</tt>"));
 	}

apache/prefs.info

@@ -0,0 +1 @@
+allowed=show_list,show_order,max_servers,show_names

at/acl_security.pl

@@ -8,34 +8,35 @@ require 'at-lib.pl';
 # Output HTML for editing security options for the at module
 sub acl_security_form
 {
-print "<tr> <td valign=top><b>$text{'acl_users'}</b></td> <td colspan=3>\n";
-printf "<input type=radio name=mode value=0 %s> $text{'acl_all'}<br>\n",
-	$_[0]->{'mode'} == 0 ? "checked" : "";
-printf "<input type=radio name=mode value=3 %s> $text{'acl_this'}<br>\n",
-	$_[0]->{'mode'} == 3 ? "checked" : "";
-printf "<input type=radio name=mode value=1 %s> $text{'acl_only'}\n",
-	$_[0]->{'mode'} == 1 ? "checked" : "";
-printf "<input name=userscan size=40 value='%s'> %s<br>\n",
-	$_[0]->{'mode'} == 1 ? $_[0]->{'users'} : "",
-	&user_chooser_button("userscan", 1);
-printf "<input type=radio name=mode value=2 %s> $text{'acl_except'}\n",
-	$_[0]->{'mode'} == 2 ? "checked" : "";
-printf "<input name=userscannot size=40 value='%s'> %s</td> </tr>\n",
-	$_[0]->{'mode'} == 2 ? $_[0]->{'users'} : "",
-	&user_chooser_button("userscannot", 1);
+my ($o) = @_;
 
-print "<tr> <td valign=top><b>$text{'acl_allow'}</b></td> <td colspan=3>\n";
-print &ui_yesno_radio("allow", $_[0]->{'allow'}),"</td> </tr>\n";
+print &ui_table_row($text{'acl_users'},
+    &ui_radio_table("mode", $o->{'mode'},
+	[ [ 0, $text{'acl_all'} ],
+	  [ 3,$text{'acl_this'} ],
+	  [ 1, $text{'acl_only'},
+		&ui_textbox("userscan", $o->{'mode'} == 1 ? $o->{'users'} : "", 40)." ".&user_chooser_button("userscan", 1) ],
+	  [ 2, $text{'acl_except'},
+		&ui_textbox("userscannot", $o->{'mode'} == 2 ? $o->{'users'} : "", 40)." ".&user_chooser_button("userscannot", 1) ],
+	]), 3);
+
+print &ui_table_row($text{'acl_allow'},
+	&ui_yesno_radio("allow", $o->{'allow'}), 3);
+
+print &ui_table_row($text{'acl_stop'},
+	&ui_yesno_radio("stop", $o->{'stop'}), 3);
 }
 
 # acl_security_save(&options)
 # Parse the form for security options for the cron module
 sub acl_security_save
 {
-$_[0]->{'mode'} = $in{'mode'};
-$_[0]->{'users'} = $in{'mode'} == 0 || $in{'mode'} == 3 ? "" :
-		   $in{'mode'} == 1 ? $in{'userscan'}
-				    : $in{'userscannot'};
-$_[0]->{'allow'} = $in{'allow'};
+my ($o) = @_;
+$o->{'mode'} = $in{'mode'};
+$o->{'users'} = $in{'mode'} == 0 || $in{'mode'} == 3 ? "" :
+		$in{'mode'} == 1 ? $in{'userscan'}
+				 : $in{'userscannot'};
+$o->{'allow'} = $in{'allow'};
+$o->{'stop'} = $in{'stop'};
 }
 

at/bootup.cgi

@@ -4,6 +4,7 @@
 require './at-lib.pl';
 &ReadParse();
 &foreign_require("init");
+$access{'stop'} || &error($text{'bootup_ecannot'});
 $init = &get_init_name();
 if ($in{'boot'}) {
 	&init::enable_at_boot($init);

at/defaultacl

@@ -2,3 +2,4 @@ noconfig=0
 users=
 mode=0
 allow=1
+stop=1

at/index.cgi

@@ -140,7 +140,7 @@ if ($access{'allow'} && $config{'allow_file'}) {
 # If there is an init script that runs an atd server, show status
 &foreign_require("init");
 my $init = defined(&get_init_name) ? &get_init_name() : undef;
-if ($init) {
+if ($access{'stop'} && $init) {
 	print &ui_hr();
 	print &ui_buttons_start();
 

at/lang/en

@@ -55,6 +55,7 @@ acl_this=Current Webmin user
 acl_only=Only users
 acl_except=All except users
 acl_allow=Can edit allowed At users?
+acl_stop=Can stop and start <tt>atd</tt>?
 
 run_title=Running Command
 run_output=Output from scheduled command ..
@@ -79,5 +80,8 @@ log_bootdown=Disabled scheduled commands server at boot
 
 stop_err=Failed to stop server
 start_err=Failed to start server
+stop_ecannot=You are not allowed to stop the server
+start_ecannot=You are not allowed to start the server
+bootup_ecannot=You are not allowed to enable the server at boot
 
 __norefs=1

at/negativeacl

@@ -0,0 +1 @@
+stop=0

at/start.cgi

@@ -3,6 +3,7 @@
 
 require './at-lib.pl';
 &error_setup($text{'start_err'});
+$access{'stop'} || &error($text{'start_ecannot'});
 &foreign_require("init");
 my $init = &get_init_name();
 my ($ok, $err) = &init::start_action($init);

at/stop.cgi

@@ -3,6 +3,7 @@
 
 require './at-lib.pl';
 &error_setup($text{'stop_err'});
+$access{'stop'} || &error($text{'stop_ecannot'});
 &foreign_require("init");
 my $init = &get_init_name();
 my ($ok, $err) = &init::stop_action($init);

bacula-backup/restore.cgi

@@ -62,6 +62,8 @@ else {
 	@clients = ( [ $in{'client'}, $in{'job'} ] );
 	}
 
+$dbh->disconnect();
+
 foreach $clientjob (@clients) {
 	$client = $clientjob->[0];
 	$job = $clientjob->[1];

bin/update-devel

@@ -15,7 +15,7 @@ use Cwd qw(cwd);
 my %opt;
 GetOptions('help|h'      => \$opt{'help'},
            'product|p=s' => \$opt{'product'},
-           'theme|t!'   => \$opt{'theme'});
+           'theme|p:s'   => \$opt{'theme'});
 pod2usage(0) if ($opt{'help'} || !$opt{'product'});
 
 # Get current path
@@ -38,8 +38,9 @@ if ($p =~ /^webmin$|^usermin$/i) {
         $path =~ s/webmin/$p/;
     }
     my $cmd = "cd $path && ./update-from-repo.sh -force";
-    if ($opt{'theme'}) {
-        $cmd = "cd $path/authentic-theme && ./theme-update.sh -force";
+    if (defined($opt{'theme'})) {
+        my $tver = $opt{'theme'} ? " -release:$opt{'theme'}" : "";
+        $cmd = "cd $path/authentic-theme && ./theme-update.sh$tver -force";
     } 
     system($cmd);
 } else {

bind8/bind8-lib.pl

@@ -3491,25 +3491,27 @@ return $out if ($tries >= 10);
 
 # Merge records back into original file, by deleting all NSEC and RRSIG records
 # and then copying over
-for(my $i=$#recs; $i>=0; $i--) {
-	if ($recs[$i]->{'type'} eq 'NSEC' ||
-	    $recs[$i]->{'type'} eq 'NSEC3' ||
-	    $recs[$i]->{'type'} eq 'RRSIG' ||
-	    $recs[$i]->{'type'} eq 'NSEC3PARAM') {
-		&delete_record($fn, $recs[$i]);
+my @delrecs;
+foreach my $r (@recs) {
+	if ($r->{'type'} eq 'NSEC' ||
+	    $r->{'type'} eq 'NSEC3' ||
+	    $r->{'type'} eq 'RRSIG' ||
+	    $r->{'type'} eq 'NSEC3PARAM') {
+		push(@delrecs, $r);
 		}
 	}
+&delete_multiple_records($fn, \@delrecs);
 my @signedrecs = &read_zone_file($fn.".webmin-signed", $dom);
+my @addrecs;
 foreach my $r (@signedrecs) {
 	if ($r->{'type'} eq 'NSEC' ||
 	    $r->{'type'} eq 'NSEC3' ||
 	    $r->{'type'} eq 'RRSIG' ||
 	    $r->{'type'} eq 'NSEC3PARAM') {
-		&create_record($fn, $r->{'name'}, $r->{'ttl'}, $r->{'class'},
-			       $r->{'type'}, join(" ", @{$r->{'values'}}),
-			       $r->{'comment'});
+		push(@addrecs, $r);
 		}
 	}
+&create_multiple_records($fn, \@addrecs);
 &unlink_file($signed);
 return undef;
 }

bind8/edit_text.cgi

@@ -3,7 +3,7 @@
 # Display a form for manually editing a records file
 use strict;
 use warnings;
-our (%access, %text, %in);
+our (%access, %text, %in, %config);
 
 require './bind8-lib.pl';
 &ReadParse();
@@ -27,7 +27,8 @@ print &ui_hidden("zone", $in{'zone'});
 print &ui_hidden("view", $in{'view'});
 print &ui_table_row(undef, &ui_textarea("text", $text, 20, 80,
 					undef, 0, "style='width:100%'"), 2);
-print &ui_table_row(undef, &ui_checkbox("soa", 1, $text{'text_soa'}, 1), 2);
+print &ui_table_row(undef, &ui_checkbox("soa", $config{'updserial_on'},
+					$text{'text_soa'}, 1), 2);
 print &ui_table_end();
 print &ui_form_end($access{'ro'} ? [ ] : [ [ undef, $text{'save'} ] ]);
 

bind8/edit_zonekey.cgi

@@ -2,7 +2,7 @@
 # Display the signing key for a zone, or offer to set one up
 use strict;
 use warnings;
-our (%access, %in, %text, $in);
+our (%access, %in, %text, $in, %config);
 
 require './bind8-lib.pl';
 &ReadParse();
@@ -101,7 +101,7 @@ else {
 
 	# Key algorithm
 	print &ui_table_row($text{'zonekey_alg'},
-		&ui_select("alg", "RSASHA256",
+		&ui_select("alg", $config{'tmpl_dnssecalg'} || "RSASHA256",
 			   [ &list_dnssec_algorithms() ]));
 
 	# Key size

bind8/log_parser.pl

@@ -53,7 +53,8 @@ elsif ($action eq 'text') {
 elsif ($action eq 'soa') {
 	return &text("log_soa", "<tt>$object</tt>");
 	}
-elsif ($action eq 'zonekeyon' || $action eq 'zonekeyoff' || $action eq 'sign') {
+elsif ($action eq 'zonekeyon' || $action eq 'zonekeyoff' || $action eq 'sign' ||
+       $action eq 'resign') {
 	return &text("log_".$action, "<tt>$object</tt>");
 	}
 elsif ($action eq 'opts') {

bind8/prefs.info

@@ -0,0 +1 @@
+allowed=show_list,by_view,records_order,max_zones,largezones

bind8/records-lib.pl

@@ -327,10 +327,27 @@ return @rv;
 # Add a new record of some type to some zone file
 sub create_record
 {
-my $fn = &make_chroot(&absolute_path($_[0]));
+my ($file, @rec) = @_;
+my $fn = &make_chroot(&absolute_path($file));
 &is_raw_format_records($fn) && &error("Raw format zone files cannot be edited");
 my $lref = &read_file_lines($fn);
-push(@$lref, &make_record(@_[1..$#_]));
+push(@$lref, &make_record(@rec));
+&flush_file_lines($fn);
+}
+
+# create_multiple_records(file, &records)
+# Create records from structures 
+sub create_multiple_records
+{
+my ($file, $recs) = @_;
+my $fn = &make_chroot(&absolute_path($file));
+&is_raw_format_records($fn) && &error("Raw format zone files cannot be edited");
+my $lref = &read_file_lines($fn);
+foreach my $r (@$recs) {
+	push(@$lref, &make_record($r->{'name'}, $r->{'ttl'}, $r->{'class'},
+			          $r->{'type'}, join(" ", @{$r->{'values'}}),
+			          $r->{'comment'}));
+	}
 &flush_file_lines($fn);
 }
 
@@ -350,11 +367,27 @@ splice(@$lref, $_[1]->{'line'}, $lines, &make_record(@_[2..$#_]));
 # Deletes a record in some zone file
 sub delete_record
 {
-my $fn = &make_chroot(&absolute_path($_[0]));
+my ($file, $r) = @_;
+my $fn = &make_chroot(&absolute_path($file));
 &is_raw_format_records($fn) && &error("Raw format zone files cannot be edited");
 my $lref = &read_file_lines($fn);
-my $lines = $_[1]->{'eline'} - $_[1]->{'line'} + 1;
-splice(@$lref, $_[1]->{'line'}, $lines);
+my $lines = $r->{'eline'} - $r->{'line'} + 1;
+splice(@$lref, $r->{'line'}, $lines);
+&flush_file_lines($fn);
+}
+
+# delete_multiple_records(file, &records)
+# Delete many records from the same file at once
+sub delete_multiple_records
+{
+my ($file, $recs) = @_;
+my $fn = &make_chroot(&absolute_path($file));
+&is_raw_format_records($fn) && &error("Raw format zone files cannot be edited");
+my $lref = &read_file_lines($fn);
+foreach my $r (sort { $b->{'line'} <=> $a->{'line'} } @$recs) {
+	my $lines = $r->{'eline'} - $r->{'line'} + 1;
+	splice(@$lref, $r->{'line'}, $lines);
+	}
 &flush_file_lines($fn);
 }
 
@@ -705,8 +738,11 @@ return $_[0] eq "." ||
 # If a path does not start with a /, prepend the base directory
 sub absolute_path
 {
-if ($_[0] =~ /^([a-zA-Z]:)?\//) { return $_[0]; }
-return &base_directory()."/".$_[0];
+my ($path) = @_;
+if ($path =~ /^([a-zA-Z]:)?\//) {
+	return $path;
+	}
+return &base_directory()."/".$path;
 }
 
 # parse_spf(text, ...)

change-user/lang/ar

@@ -12,7 +12,7 @@ index_passleave=اترك بدون تغيير
 index_passset=تعيين على ..
 index_passagain=أعد إدخال كلمة المرور
 index_ok=حفظ التغييرات
-index_themedef=Old Webmin Theme
+index_themedef=Legacy Theme
 index_desc2=يمكن استخدام هذه الوحدة لتغيير $1 ، لحساب Webmin الخاص بك فقط.
 index_d3=$1, $2 و $3
 index_d2=$1 و $2

change-user/lang/en

@@ -12,7 +12,7 @@ index_passleave=Leave unchanged
 index_passset=Set to ..
 index_passagain=Re-enter password
 index_ok=Make Changes
-index_themedef=Old Webmin Theme
+index_themedef=Legacy Theme
 index_desc2=This module can be used to change $1, for your Webmin account only.
 index_d3=$1, $2 and $3
 index_d2=$1 and $2

cluster-passwd/prefs.info

@@ -0,0 +1 @@
+allowed=max_users,input_type,sort_mode

cluster-software/prefs.info

@@ -0,0 +1 @@
+allowed=sort_mode,table_mode

cluster-useradmin/prefs.info

@@ -0,0 +1 @@
+allowed=sort_mode,table_mode

cluster-usermin/prefs.info

@@ -0,0 +1 @@
+allowed=sort_mode,table_mode

cluster-webmin/prefs.info

@@ -0,0 +1 @@
+allowed=sort_mode,table_mode

config-lib.pl

@@ -361,5 +361,35 @@ foreach my $c (@$info_order) {
 return @new_order;
 }
 
+# save_module_preferences(module, &config)
+# Check which user preferences can be save for
+# given module based on module's prefs.info file
+sub save_module_preferences
+{
+my ($module, $curr_config) = @_;
+my $module_dir = &module_root_directory($module);
+my $module_prefs_conf = "$module_dir/prefs.info";
+if (-r $module_prefs_conf) {
+	my %module_prefs_conf_allowed;
+	&read_file($module_prefs_conf, \%module_prefs_conf_allowed);
+	mkdir("$config_directory/$module", 0700);
+	my $user_prefs_file = "$config_directory/$module/prefs.$remote_user";
+	&lock_file($user_prefs_file);
+	if ($module_prefs_conf_allowed{'allowed'} eq "*") {
+		&write_file($user_prefs_file, \%$curr_config);
+		}
+	else {
+		my %newconfigtmp;
+		foreach my $key (keys %{$curr_config}) {
+			if (grep(/^$key$/, split(",", $module_prefs_conf_allowed{'allowed'}))) {
+				$newconfigtmp->{$key} = $curr_config->{$key};
+				}
+			}
+		&write_file($user_prefs_file, \%$newconfigtmp);
+		}
+	&unlock_file($user_prefs_file);
+	}
+}
+
 1;
 

config.cgi

@@ -28,7 +28,7 @@ print &ui_hidden("module", $m),"\n";
 print &ui_table_start(&text('config_header', $module_info{'desc'}),
 		      "width=100%", 2);
 &read_file("$config_directory/$m/config", \%newconfig);
-
+&load_module_preferences($m, \%newconfig);
 $mdir = &module_root_directory($m);
 if (-r "$mdir/config_info.pl") {
 	# Module has a custom config editor
@@ -41,7 +41,12 @@ if (-r "$mdir/config_info.pl") {
 	}
 if (!$func) {
 	# Use config.info to create config inputs
-	&generate_config(\%newconfig, "$mdir/config.info", $m);
+	my $cdir;
+	foreach my $d (map { $_."/".$m } @theme_root_directories) {
+		$cdir = $d if (-r $d."/config.info");
+		}
+	$cdir ||= $mdir;
+	&generate_config(\%newconfig, "$cdir/config.info", $m);
 	}
 print &ui_table_end();
 print &ui_form_end([ [ "save", $text{'save'} ] ]);

config_save.cgi

@@ -32,10 +32,16 @@ if (-r "$mdir/config_info.pl") {
 	}
 if (!$func) {
 	# Use config.info to parse config inputs
-	&parse_config(\%newconfig, "$mdir/config.info", $m);
+	my $cdir;
+	foreach my $d (map { $_."/".$m } @theme_root_directories) {
+		$cdir = $d if (-r $d."/config.info");
+		}
+	$cdir ||= $mdir;
+	&parse_config(\%newconfig, "$cdir/config.info", $m);
 	}
 &write_file("$config_directory/$m/config", \%newconfig);
 &unlock_file("$config_directory/$m/config");
+&save_module_preferences($m, \%newconfig);
 
 # Call any post-config save function
 local $pfn = "${m}::config_post_save";

cron/prefs.info

@@ -0,0 +1 @@
+allowed=max_len,max_jobs,show_time,show_comment,show_next

custom/prefs.info

@@ -0,0 +1 @@
+allowed=display_mode,columns,sort

dhcpd/prefs.info

@@ -0,0 +1 @@
+allowed=lease_sort,hostnet_list,dhcpd_nocols,lease_tz,lease_vendor,lease_refresh_def,lease_refresh,show_ip,show_mac,group_name,desc_name,display_max_def,display_max

dovecot/dovecot-lib.pl

@@ -95,6 +95,7 @@ foreach (@lines) {
 			push(@{$section->{'members'}}, $dir);
 			$section->{'eline'} = $lnum;
 			}
+		$dir->{'value'} =~ s/\s+$//;
 
 		# Fix up references to other variables
 		my @w = split(/\s+/, $dir->{'value'});

exports/exports-lib.pl

@@ -44,6 +44,7 @@ while(my $line = <EXP>) {
 			$exp{'active'} = $active;
 			$exp{'dir'} = $dir;
 			$exp{'host'} = $1;
+			$exp{'options'} = { };
 			my $ostr = $2;
 			$rest = $3;
 			while($ostr =~ /^([a-z_]+)=([0-9,\-]+)\s*,\s*(.*)$/ ||

fetchmail/prefs.info

@@ -0,0 +1 @@
+allowed=view_mode,max_users_def,max_users

file/lang/it

@@ -1,6 +1,6 @@
 index_title=File Manager
 index_nojava=Questo modulo richiede java per funzionare, il tuo browser non supporta java
-index_eremote=Non esiste un utente Unix corrispondente il login Webmin $1.
+index_eremote=Non esiste un utente Unix corrispondente al nome utente Webmin $1.
 index_index=Torna alla <a href='$1'>pagina principale di Webmin</a>.
 switch_euser=L'utente Unix non esiste!
 top_ret=Indice
@@ -13,16 +13,16 @@ top_info=Informazioni
 top_eacl=ACL
 top_attr=Attributi
 top_ext=EXT
-top_delete=Cancella
+top_delete=Elimina
 top_new=Nuovo
-top_upload=Upload
+top_upload=Carica
 top_extract=Estrai
 top_rename=Rinomina
 top_copy=Copia
 top_cut=Taglia
 top_paste=Incolla
-top_share=Condivisione
-top_mount=Mount
+top_share=Condividi
+top_mount=Monta
 top_search=Cerca
 top_config=Configura
 top_efile=Nessun file selezionato
@@ -47,7 +47,7 @@ edit_esave=Salvataggio file non riuscito: $1
 edit_eaccess=Non sei autorizzato a salvare '$1'
 edit_efollow=Non hai i permessi per scrivere sul link simbolico '$1'
 edit_notfound=Il testo $1 non è�stato trovato
-edit_saveclose=Salva & Esci
+edit_saveclose=Salva ed esci
 edit_elength=Il file è troncato!
 edit_textmode=Passa alla modalità testo
 info_file=File
@@ -62,7 +62,7 @@ info_group=Gruppo:
 info_other=Altri:
 info_octal=Ottale:
 info_sticky=Sticky:
-info_sticky2=Solo i proprietari possono cancellare file
+info_sticky2=Solo i proprietari possono eliminare i file
 info_own=Possesso
 info_setuid=Setuid:
 info_setuid2=Esegui come utente
@@ -70,18 +70,18 @@ info_setgid=Setgid:
 info_setgid2=I file ereditano il gruppo
 info_setgid3=Esegui come gruppo
 info_apply=Applica modifiche a
-info_apply1=Solo questa directory
-info_apply2=Questa directory e i suoi file
-info_apply3=Questa directory e tutte le subdirectory
+info_apply1=Solo questa cartella
+info_apply2=Questa cartella e i suoi file
+info_apply3=Questa cartella e tutte le sottocartelle
 info_efailed=Aggiornamento di $1 non riuscito: $2
 info_read=Lettura
 info_write=Scrittura
 info_list=Elenco
 info_exec=Esecuzione
-info_sizeheader=Dimensione directory
+info_sizeheader=Dimensione cartella
 info_bytes=Byte totali:
 info_files=File totali:
-info_dirs=Directory totali:
+info_dirs=Cartelle totali:
 info_getsize=Calcola dimensione
 info_esize=Non è stato possibile calcolare la dimensione: $1
 eacl_eacls=Lettura ACL non riuscita: $1
@@ -110,17 +110,17 @@ acltype_default_user=Utente di default
 acltype_default_group=Gruppo di default
 acltype_default_other=Altri di default
 acltype_default_mask=Maschera di default
-delete_mtitle=Cancellazione multipla di file
-delete_dtitle=Cancellazione directory
-delete_ftitle=Cancellazione file
-delete_ddesc=Sei sicuro di voler cancellare definitivamente la directory $1 e tutto il suo contenuto?
-delete_fdesc=Sei sicuro di voler cancellare definitivamente il file $1 ?
-delete_mdesc=Sei sicuro di voler cancellare definitivamente questi file e directory? :
-delete_efailed=Cancellazione di $1 non riuscita: $2
-mkdir_title=Nuova Directory
-mkdir_dir=Nuova directory:
-mkdir_eexists=$1 gi�esistente
-mkdir_efailed=Creazione directory non riuscita: $1
+delete_mtitle=Eliminazione multipla di file
+delete_dtitle=Eliminazione cartella
+delete_ftitle=Eliminazione file
+delete_ddesc=Sei sicuro di voler eliminare definitivamente la cartella $1 e tutto il suo contenuto?
+delete_fdesc=Sei sicuro di voler eliminare definitivamente il file $1 ?
+delete_mdesc=Sei sicuro di voler eliminare definitivamente questi file e cartelle?
+delete_efailed=Eliminazione di $1 non riuscita: $2
+mkdir_title=Nuova cartella
+mkdir_dir=Nuova cartella:
+mkdir_eexists=$1 gi�esistentem
+mkdir_efailed=Creazione cartella non riuscita: $1
 mkdir_eaccess=Non sei autorizzato a creare '$1'
 link_title=Creazione Link
 link_from=Link da:
@@ -139,7 +139,7 @@ rename_eslash=Il nuovo nome file per $1 contiene un /
 rename_efailed=Rinominazione non riuscita : $1
 rename_eold=Non sei autorizzato a rinominare '$1'
 rename_enew=Non sei autorizzato a rinominare a '$1'
-file_type0=Directory
+file_type0=Cartella
 file_type1=File di testo
 file_type2=File immagine
 file_type3=File binario
@@ -151,11 +151,11 @@ view_enormal=Possono essere visualizzati solo file normali
 view_enormal2=Possono essere scaricati solo file normali
 view_eaccess=Non sei autorizzato ad accedere $1
 view_eopen=Apertura di $1 non riuscita : $2
-view_edir=Un archivio può essere creato solo per una directory
+view_edir=Un archivio può essere creato solo per una cartella
 view_ecmd=Il comando $1 necessario per creare un archivio non è installato
 view_ecomp=Creazione dell'archivio non riuscita: $1
 view_earchive=Non hai i permessi per scaricare gli archivi
-view_earchmax=La directory selezionata ha una dimensione che supera quella massima permessa per gli archivi ($1 byte)
+view_earchmax=La cartella selezionata ha una dimensione che supera quella massima permessa per gli archivi ($1 byte)
 paste_ecopy=Devi tagliare o copiare prima di incollare
 paste_egone=Il file copiato $1 non esite pi
 paste_eover=$1 non può essere sovrascritto
@@ -169,11 +169,11 @@ over_ok=Vai
 upload_efailed=Inizio trasferimento non riuscito : $1
 upload_title=Trasferisci file (upload)
 upload_file=File da trasferire
-upload_dir=Trasferisci alla directory
+upload_dir=Trasferisci alla cartella
 upload_ok=Trasferimento
 upload_conv=Convertire nuovariga DOS?
 upload_efile=Nessun file selezionato per il trasferimento.
-upload_edir=La directory di destinazine non esiste.
+upload_edir=La cartella di destinazine non esiste.
 upload_euser=L'utente selezionato non esiste.
 upload_eperm=Non sei autorizzato a creare $1
 upload_ewrite=Scrittura $1 non riuscita : $2.
@@ -184,7 +184,7 @@ upload_yes=Si, quindi rimuovilo
 upload_user=Fai l'upload come utente
 find_eaccess=Non sei autorizzato ad accedere $1
 find_eexist=$1 non esiste in $2
-find_edir=$1 non �una directory in $2
+find_edir=$1 non �una cartella in $2
 cancel=Annulla
 close=Chiudi
 eopen=Download non riuscito: $1
@@ -198,27 +198,27 @@ chmod_efollow=Non sei autorizzato a modificare link simbolici
 copy_efrom=Non sei autorizzato a copiare da '$1'
 copy_eto=Non sei autorizzato a copiare in '$1'
 copy_elink=Link simbolico non riuscito: $1
-delete_eaccess=Non sei autorizzato a cancellare '$1'
-delete_eroot=La directory '$1' è una di quelle su cui hai un accesso limitato, quindi non può essere rimossa
-list_eaccess=Non sei autorizzato ad accedere questa directory
+delete_eaccess=Non sei autorizzato a eliminare '$1'
+delete_eroot=La cartella '$1' è una di quelle su cui hai un accesso limitato, quindi non può essere rimossa
+list_eaccess=Non sei autorizzato ad accedere questa cartella
 list_edir=Elenco di $1 non riuscito : $2
 move_eto=Non sei autorizzato a muovere in '$1'
 move_afrom=Non sei autorizzato a muovere '$1'
 acl_user=Accesso file sul server come utente
-acl_user_def=Uguale al login Webmin
+acl_user_def=Uguale al nome utente Webmin
 acl_umask=Umask per i nuovi file
 acl_follow=Seguire sempre i link simbolici?
 acl_fyes=Se il proprietario corrisponde
 acl_ro=Modalità sola lettura?
-acl_dirs=Autorizza accesso alle sole directory
-acl_nodirs=Nega l'accesso alle directory
-acl_home=Includi la home directory dell'utente Webmin
+acl_dirs=Autorizza accesso alle sole cartelle
+acl_nodirs=Nega l'accesso alle cartelle
+acl_home=Includi la cartella home dell'utente Webmin
 acl_log=Registrare tutte le modifiche ai file?
-acl_goto=Aprire la prima directory autorizzata?
+acl_goto=Aprire la prima cartella autorizzata?
 acl_max=Dimensione massima di upload
 acl_unlim=Illimitato
 acl_b=byte
-acl_archive=Può scaricare gli archivi dalle directory?
+acl_archive=Può scaricare gli archivi dalle cartelle?
 acl_archmax=Si, se più piccoli di
 acl_buttons=Pulsanti disponibili nella barra degli strumenti
 acl_button_save=Salva (scarica un file)
@@ -229,10 +229,10 @@ acl_button_acl=ACL (modifica l'ACL Posix)
 acl_button_attr=Attr (modifica gli attributi XFS)
 acl_button_ext=EXT (modifica gli attributi EXT)
 acl_button_search=Trova (trova i file)
-acl_button_delete=Cancella (cancella i file)
+acl_button_delete=Elimina (elimina i file)
 acl_button_new=Nuovo (crea un file di testo)
 acl_button_upload=Invia (invia un file da un client o lo preleva sul server)
-acl_button_mkdir=Nuovo (crea una directory)
+acl_button_mkdir=Nuovo (crea una cartella)
 acl_button_makelink=Nuovo (crea link simbolico)
 acl_button_rename=Rinomina (rinomina un file)
 acl_button_sharing=Condivisione (imposta una condivisione Samba o NFS)
@@ -243,26 +243,26 @@ acl_unarchive2=Prova sempre a
 acl_unarchive1=$si
 acl_unarchive0=$no
 acl_dostounix=Può convertire i ritorni a capo di Windows?
-acl_chroot=Directory chroot per l' intero file manager
-acl_relto=(relativo ad ogni directory chroot)
+acl_chroot=Chroot cartella per l' intero file manager
+acl_relto=(relativo ai chroot di ogni cartella)
 acl_noperms=Può modificare i permessi ai file?
 acl_nousers=Può cambiare il proprietario di un file?
 acl_filesystems=Può vedere i punti di montaggio dei filesystem?
 acl_contents=Permettere la ricerca di contenuti nel file?
-share_title=Sharing
-share_samba=Windows
+share_title=Condivisione
+share_samba=Windows (Samba)
 share_nfs=NFS
-share_son=File sharing windows abilitato
-share_soff=File sharing windows disabilitato
+share_son=Condivisione file Windows (Samba) abilitata
+share_soff=Condivisione file Windows (Samba) disabilitata
 share_writable=Scrivibile?
 share_available=Attualmente attivo?
-share_sheader=Opzioni di sharing
+share_sheader=Opzioni di condivisione
 share_only=Solamente
 share_guest=Accesso guest?
 share_comment=Commento
-share_nheader=Opzioni export NFS
-share_non=File sharing NFS abilitato
-share_noff=File sharing NFS disabilitato
+share_nheader=Opzioni esportazione NFS
+share_non=Condivisione File NFS abilitata
+share_noff=Condivisione File NFS disabilitata
 share_desc=Descrizione
 share_ro=Host sola lettura
 share_rw=Host lettura e scrittura
@@ -277,27 +277,27 @@ share_s1=Fidati degli utenti non-root
 share_s2=Fidati di tutti
 share_lro=Sola lettura
 share_lrw=Lettura scrittura
-log_create_export=Creato export NFS $1
-log_modify_export=Modificato export NFS $1
-log_delete_export=Cancellato export NFS $1
+log_create_export=Creata esportazione NFS $1
+log_modify_export=Modificata esportazione NFS $1
+log_delete_export=Eliminata esportazione NFS $1
 log_create_share=Creato share Samba $1
-log_modify_share=Modificato share Samba $1
-log_delete_share=Cancellato share Samba $1
+log_modify_share=Modificata condivisione Windows (Samba) $1
+log_delete_share=Eliminata condivisione Windows (Samba) $1
 log_save=File $1 salvato
 log_chmod=Cambiati permessi del file $1
-log_mkdir=Creata directory $1
+log_mkdir=Creata cartella $1
 log_upload=Trasferito file $1
 log_link=Creato link simbolico $1 a $2
 log_relink=Modificato link simbolico $1 a $2
 log_copy=Copiato file $1 a $2
 log_move=Spostato file $1 a $2
-log_delete=Cancellato file $1
-log_attr=Settati attributi del file $1
-log_acl=Settati ACL al file $1
-search_eaccess=Non sei autorizzato a cercare questa directory
+log_delete=Eliminato file $1
+log_attr=Impostati attributi del file $1
+log_acl=Impostati ACL al file $1
+search_eaccess=Non sei autorizzato a cercare questa cartella
 search_title=Cerca file
 search_ok=Esegui Ricerca
-search_dir=Cerca directory
+search_dir=Cerca cartella
 search_match=File corrispondenti
 search_cont=Contenente il testo
 search_user=Utente proprietario
@@ -306,14 +306,14 @@ search_any=Qualsiasi
 search_type=Tipo file
 search_types_=Qualsiasi
 search_types_f=File
-search_types_d=Directory
+search_types_d=Cartella
 search_types_l=Link simbolico
 search_types_p=Named pipe
 search_size=Dimensione File
-search_more=Pi di
+search_more=Più di
 search_less=Meno di
-search_xdev=Cerco sotto i mount?
-search_edir=Directory di ricerca mancante o invalido
+search_xdev=Cerco sotto i punti di montaggio?
+search_edir=Cartella di ricerca mancante o invalido
 search_ematch=regexp di corrispondenza mancante o invalida
 search_euser=Nome utente mancante o invalido
 search_egroup=Nome gruppo mancante
@@ -322,7 +322,7 @@ search_crit=Criterio di ricerca
 search_list=Risultati ricerca
 search_down=Download
 search_edown=Non è stato selezionato nessun file di risultati delle ricerche da scaricare
-facl_eaccess=Non sei autorizzato a settare ACL per questo file
+facl_eaccess=Non sei autorizzato a impostare ACL per questo file
 attr_eattrs=Lettura attributi non riuscita : $1
 attr_efs=Il filesystem $1 non supporta attributi
 attr_add=Aggiungi Attributo
@@ -343,9 +343,9 @@ eattr_a=Puoi solo appendere al file
 eattr_c=Dati compressi sul disco
 eattr_d=Non fare backup con dump
 eattr_i=Non permettere modifiche
-eattr_s=Azzera blocchi in cancellazione
+eattr_s=Azzera blocchi in eliminazione
 eattr_S=Sync dopo la scrittura
-eattr_u=Salva il contenuto per de-cancellazione
+eattr_u=Salva il contenuto per de-eliminazione
 mount_eaccess=Non sei autorizzato a montare filesystem
 mount_efstab=Non esiste filesystem in questo punto di montaggio
 mount_epoint=$1 non è un punto di montaggio
@@ -353,15 +353,15 @@ mount_rusure1=Sei sicuro di voler montare $1 in $2 ?
 mount_rusure2=Sei sicuro di voler smontare $1 da $2 ?
 mount_err1=Montaggio di $1 non riuscito : $2
 mount_err2=Smontaggio di $1 non riuscito : $2
-mount_title1=Mount filesystem
-mount_title2=Un-mount filesystem
+mount_title1=Monta filesystem
+mount_title2=Smonta filesystem
 zip_err=Non è stato possibile estrarre il file: $1
 zip_ecmd=Comando $1 mancante
 zip_eunzip=Estrazione ZIP non riuscita: $1
 zip_ename=Non sembra essere un file di tipo ZIP, TAR o TAR.GZ
 zip_euntar=Estrazione TAR non riuscita: $1
 zip_euntar2=Decompressione ed estrazione TAR non riuscita: $1
-ddir_title=Scarica directory
+ddir_title=Scarica cartella
 ddir_rusure=Per scaricare i contenuti di $1 come archivio clicca su uno dei pulsanti relativi al tipo di archivio desiderato
 ddir_zip=ZIP
 ddir_tgz=TAR.GZ
@@ -385,7 +385,7 @@ history_button=Cronologia
 extract_etype=Sono i file possono essere estratti
 extract_title=Estrai file compresso
 extract_rusure=Sei sicuro di voler estrarre il file compresso:
-extract_rusure2=I file esistenti nella stessa directory potrebbero essere sovrascritti.
+extract_rusure2=I file esistenti nella stessa cartella potrebbero essere sovrascritti.
 extract_err=Estrazione del file non riuscita: $1
 extract_yes=Si, e dopo rimuovilo
 extract_show=Mostra contenuto

filemin/acl_security.pl

@@ -3,9 +3,17 @@ require 'filemin-lib.pl';
 sub acl_security_form {
     my ($access) = @_;
 
+    # Check if user we're editing ACLs for is root capable user
+    # and later display default `$HOME` as `/` to avoid confusion
+    my @given_user = getpwnam($in{'user'});
+    if ((!defined($given_user[0]) ||
+        $base_remote_user eq 'root') &&
+        $access->{'allowed_paths'} eq '$HOME') {
+        $access->{'allowed_paths'} = '/';
+    }
+
     # Directories the user can access
-    print &ui_table_row($text{'acl_allowed_paths'}."<br>\n".
-			$text{'acl_allowed_paths2'},
+    print &ui_table_row($text{'acl_allowed_paths'}."\n",
 	ui_textarea("allowed_paths",
 		    join("\n", split(/\s+/, $access->{'allowed_paths'})),
 		    10, 80, undef, undef, "style='width: 100%'"), 2);

filemin/config.cgi

@@ -32,6 +32,7 @@ print &ui_table_row($text{'config_columns_to_display'},
     &ui_checkbox('columns', 'size', $text{'size'}, $config{'columns'} =~ /size/).
     &ui_checkbox('columns', 'owner_user', $text{'ownership'}, $config{'columns'} =~ /owner_user/).
     &ui_checkbox('columns', 'permissions', $text{'permissions'}, $config{'columns'} =~ /permissions/).
+    (get_acls_status() ? &ui_checkbox('columns', 'acls', $text{'acls'}, $config{'columns'} =~ /acls/) : undef).
     (get_attr_status() ? &ui_checkbox('columns', 'attributes', $text{'attributes'}, $config{'columns'} =~ /attributes/) : undef).
     (get_selinux_status() ? &ui_checkbox('columns', 'selinux', $text{'selinux'}, $config{'columns'} =~ /selinux/) : undef).
     &ui_checkbox('columns', 'last_mod_time', $text{'last_mod_time'}, $config{'columns'} =~ /last_mod_time/)
@@ -39,6 +40,7 @@ print &ui_table_row($text{'config_columns_to_display'},
 print &ui_table_row($text{'config_per_page'}, ui_textbox("per_page", $config{'per_page'}, 80));
 print &ui_table_row($text{'config_disable_pagination'}, &ui_checkbox('disable_pagination', 1, '', $config{'disable_pagination'}));
 print &ui_table_row($text{'config_toolbar_style'}, &ui_yesno_radio('menu_style', $config{'menu_style'}, 1, 0));
+print &ui_table_row($text{'file_detect_encoding'}, &ui_yesno_radio('config_portable_module_filemanager_editor_detect_encoding', $config{'config_portable_module_filemanager_editor_detect_encoding'}, 'true', 'false'));
 print &ui_table_row($text{'config_bookmarks'}, &ui_textarea("bookmarks", $bookmarks, 5, 40));
 
 print &ui_table_end();

filemin/config.info

@@ -1,2 +1,2 @@
-allowed_paths=Directories accessible to Usermin users,9,60,5,\t
 max=Maximum size for uploaded files,3,Unlimited
+config_portable_module_filemanager_editor_detect_encoding=Fix to prevent encoding detection if forbidden,1,true-Yes,false-No

filemin/config.info.ar

@@ -1,2 +1 @@
-allowed_paths=الدلائل التي يمكن الوصول إليها لمستخدمين Usermin,9,60,5,\t
 max=الحد الأقصى لحجم الملفات التي يتم رفعها,3,غير محدود

filemin/config.info.ca

@@ -1,2 +1 @@
-allowed_paths=Directoris accessibles als usuaris de Usermin,9,60,5,\t
 max=Mida màxima dels fitxers pujats,3,Il·limitada

filemin/config.info.de

@@ -1,2 +1 @@
-allowed_paths=Verzeichnisse auf die Usermin Benutzer zugreifen dürfen,9,60,5,\t
 max=Maximale Größe für hochzuladende Dateien,3,Unbegrenzt

filemin/config.info.fr

@@ -1,2 +1 @@
-allowed_paths=Répertoires accessibles aux utilisateurs d'Usermin,9,60,5,\t
 max=Taille maximale des fichiers téléchargés,3,Illimité

filemin/defaultuconf

@@ -1,4 +1,5 @@
 columns=size,owner_user,permissions,last_mod_time
 per_page=50
 disable_pagination=0
-menu_style=1
+menu_style=1
+config_portable_module_filemanager_editor_detect_encoding=true

filemin/edit_file.cgi

@@ -19,14 +19,17 @@ eval "use Encode::Detect::Detector;";
 if (!$@) {
     $encoding_name = Encode::Detect::Detector::detect($data);
 }
-my $forced = ($data =~ /(.*\n)(.*\n)(.*\n)/);
-$forced = (($1 . $2 . $3) =~ /coding[=:]\s*([-\w.]+)/);
-if ((lc(get_charset()) eq "utf-8" && ($encoding_name && lc($encoding_name) ne "utf-8")) || $forced) {
-    if ($forced) {
-        $encoding_name = "$1";
+if ($userconfig{'config_portable_module_filemanager_editor_detect_encoding'} ne 'false') {
+    my $forced = ($data =~ /(.*\n)(.*\n)(.*\n)/);
+    $forced = (($1 . $2 . $3) =~ /coding[=:]\s*([-\w.]+)/);
+    if ((lc(get_charset()) eq "utf-8" && ($encoding_name && lc($encoding_name) ne "utf-8")) || $forced) {
+        if ($forced) {
+            $encoding_name = "$1";
+        }
+        eval {$data = Encode::encode('utf-8', Encode::decode($encoding_name, $data))};
     }
-    eval {$data = Encode::encode('utf-8', Encode::decode($encoding_name, $data))};
 }
+
 my $file_binary = -s $file >= 128 && -B $file;
 &ui_print_header(undef, $text{'edit_file'}, "");
 $head = "<link rel='stylesheet' type='text/css' href='unauthenticated/css/style.css' />";
@@ -49,7 +52,6 @@ if ($current_theme ne 'authentic-theme') {
 print $head;
 
 print ui_table_start(&html_escape("$path/$in{'file'}"), undef, 1);
-
 print &ui_form_start("save_file.cgi", "post", undef, "data-encoding=\"$encoding_name\" data-binary=\"$file_binary\"");
 print &ui_hidden("file", $in{'file'}), "\n";
 print &ui_hidden("encoding", $encoding_name), "\n";

filemin/filemin-lib.pl

@@ -10,6 +10,15 @@ use Encode qw(decode encode);
 use File::Basename;
 eval "use File::MimeInfo";
 
+
+sub get_acls_status {
+  return has_command('getfacl');
+}
+
+sub get_list_acls_command {
+  return has_command('getfacl') . " -p ";
+}
+
 sub get_attr_status {
   return has_command('lsattr');
 }
@@ -19,9 +28,9 @@ sub get_attr_command {
 }
 
 sub get_selinux_status {
-  # return 1;
   return is_selinux_enabled();
 }
+
 sub get_selinux_command_type {
   my $out = backquote_command("ls --help 2>&1 </dev/null");
   return $out =~ /--scontext/ ? 1 : 0;
@@ -57,7 +66,8 @@ sub get_paths {
     }
 
     # Get and check allowed paths
-    @allowed_paths = split(/\s+/, $access{'allowed_paths'});
+    my @allowed_paths_arr = split(/\s+/, $access{'allowed_paths'});
+    @allowed_paths = @allowed_paths_arr;
     if (&get_product_name() eq 'usermin') {
         # Add paths from Usermin config
         push(@allowed_paths, split(/\t+/, $config{'allowed_paths'}));
@@ -66,8 +76,21 @@ sub get_paths {
         # Assume any directory can be accessed
         $base = "/";
         @allowed_paths = ( $base );
+
+        # Assume limited to certain dirs only
+        my $allowed_paths_number = scalar(@allowed_paths_arr);
+        if (
+            $allowed_paths_number &&
+            $allowed_paths_arr[0] ne '$ROOT' &&
+            ($allowed_paths_arr[0] ne '$HOME' ||
+            ($allowed_paths_arr[0] eq '$HOME' && $allowed_paths_number > 1))
+        ) {
+            @allowed_paths = map { $_ eq '$HOME' ? $remote_user_info[7] : $_ }
+                             @allowed_paths_arr;
+            @allowed_paths = grep { $_ ne '$ROOT' } @allowed_paths;
+        }
     } else {
-        @allowed_paths = map { $_ eq '$HOME' ? @remote_user_info[7] : $_ }
+        @allowed_paths = map { $_ eq '$HOME' ? $remote_user_info[7] : $_ }
                              @allowed_paths;
         @allowed_paths = map { s/\$USER/$remote_user/g; $_ } @allowed_paths;
         @allowed_paths = &unique(@allowed_paths);
@@ -125,6 +148,7 @@ sub get_paths {
     } else {
         &read_file_cached("$confdir/.config", \%userconfig);
     }
+    &load_module_preferences(&get_module_name(), \%userconfig);
 }
 
 sub print_template {
@@ -291,6 +315,7 @@ sub print_interface {
     push @ui_columns, ('<span data-head-size>' . $text{'size'} . '</span>') if($userconfig{'columns'} =~ /size/);
     push @ui_columns, ('<span data-head-owner_user>' . $text{'ownership'} . '</span>') if($userconfig{'columns'} =~ /owner_user/);
     push @ui_columns, ('<span data-head-permissions>' . $text{'permissions'} . '</span>') if($userconfig{'columns'} =~ /permissions/);
+    push @ui_columns, ('<span data-head-acls>' . $text{'acls'} . '</span>') if(get_acls_status() && $userconfig{'columns'} =~ /acls/);
     push @ui_columns, ('<span data-head-attributes>' . $text{'attributes'} . '</span>') if(get_attr_status() && $userconfig{'columns'} =~ /attributes/);
     push @ui_columns, ('<span data-head-selinux>' . $text{'selinux'} . '</span>') if(get_selinux_status() && $userconfig{'columns'} =~ /selinux/);
     push @ui_columns, ('<span data-head-last_mod_time>' . $text{'last_mod_time'} . '</span>') if($userconfig{'columns'} =~ /last_mod_time/);
@@ -301,8 +326,9 @@ sub print_interface {
         if ($count > scalar(@list)) { last; }
         my $class = $count & 1 ? "odd" : "even";
         my $link = $list[$count - 1][0];
-        my $selinux;
+        my $acls;
         my $attributes;
+        my $selinux;
         $link =~ s/\Q$cwd\E\///;
         $link =~ s/^\///g;
         $vlink = html_escape($link);
@@ -328,6 +354,10 @@ sub print_interface {
           $attributes = $list[$count - 1][18];
         }
 
+        if(get_acls_status() && $userconfig{'columns'} =~ /acls/) {
+          $acls = $list[$count - 1][19];
+        }
+
         $mod_time = POSIX::strftime('%Y/%m/%d - %T', localtime($list[$count - 1][10]));
 
         $actions = "<a class='action-link' href='javascript:void(0)' onclick='renameDialog(\"$vlink\")' title='$text{'rename'}' data-container='body'>$rename_icon</a>";
@@ -381,6 +411,7 @@ sub print_interface {
         push @row_data, $size if($userconfig{'columns'} =~ /size/);
         push @row_data, $user.':'.$group if($userconfig{'columns'} =~ /owner_user/);
         push @row_data, $permissions if($userconfig{'columns'} =~ /permissions/);
+        push @row_data, $acls if(get_acls_status() && $userconfig{'columns'} =~ /acls/);
         push @row_data, $attributes if(get_attr_status() && $userconfig{'columns'} =~ /attributes/);
         push @row_data, $selinux if(get_selinux_status() && $userconfig{'columns'} =~ /selinux/);
         push @row_data, $mod_time if($userconfig{'columns'} =~ /last_mod_time/);
@@ -420,6 +451,28 @@ sub get_paste_buffer_file
     }
 }
 
+# test_allowed_paths()
+# Check if we need to test allowed paths to limit listing
+sub test_allowed_paths
+{
+    my $allowed_paths_number = scalar(@allowed_paths);
+    if (
+        # Test for regular users
+        ($remote_user_info[0] ne 'root' && $allowed_paths[0] ne '$ROOT') ||
+
+        # Test for privileged users
+        ($remote_user_info[0] eq 'root' && $allowed_paths_number &&
+            $allowed_paths[0] ne '$ROOT' &&
+            ($allowed_paths[0] ne '$HOME' ||
+            ($allowed_paths[0] eq '$HOME' && $allowed_paths_number > 1)))
+
+        )
+    {
+        return 1;
+    }
+    return 0;
+}
+
 # check_allowed_path(file)
 # Calls error if some path isn't allowed
 sub check_allowed_path

filemin/index.cgi

@@ -12,16 +12,17 @@ unless (opendir ( DIR, $cwd )) {
 } else {
     &ui_print_header(undef, $module_info{'name'}, "", undef, 0 , 0, 0, "<a href='config.cgi?path=".&urlize($path)."' data-config-pagination='$userconfig{'per_page'}'>$text{'module_config'}</a>");
 
+    my %acls;
+    my %attributes;
     my $setype = get_selinux_command_type();
     my %secontext;
-    my %attributes;
 
     # Push file names with full paths to array, filtering out "." and ".."
     @list = map { &simplify_path("$cwd/$_") } grep { $_ ne '.' && $_ ne '..' } readdir(DIR);
     closedir(DIR);
 
     # Filter out not allowed entries
-    if($remote_user_info[0] ne 'root' && $allowed_paths[0] ne '$ROOT') {
+    if(test_allowed_paths()) {
         # Leave only allowed
         for $path (@allowed_paths) {
             my $slashed = $path;
@@ -34,13 +35,27 @@ unless (opendir ( DIR, $cwd )) {
         @list = keys %hash;
     }
 
+    # List ACLs
+    if ($userconfig{'columns'} =~ /acls/ && get_acls_status()) {
+        my $command = get_list_acls_command() . " " . join(' ', map {quotemeta("$_")} @list);
+        my $output  = `$command`;
+        my @aclsArr;
+        foreach my $aclsStr (split(/\n\n/, $output)) {
+            $aclsStr =~ /#\s+file:\s*(.*)/;
+            my ($file)  = ($aclsStr =~ /#\s+file:\s*(.*)/);
+            my @aclsA = ($aclsStr =~ /^(?!(#|user::|group::|other::))([\w\:\-\_]+)/gm);
+            push(@aclsArr, [$file, \@aclsA]);
+        }
+        %acls = map {$_->[0] => ('<span data-acls>' . join("<br>", (grep /\S/, @{ $_->[1] })) . '</span>')} @aclsArr;
+    }
+
     # List attributes
     if ( $userconfig{'columns'} =~ /attributes/ && get_attr_status() ) {
         my $command = get_attr_command() . join( ' ', map { quotemeta("$_") } @list );
         my $output = `$command`;
         my @attributesArr =
           map { [ split( /\s+/, $_, 2 ) ] } split( /\n/, $output );
-        %attributes = map { $_->[1] => ('<span data-attributes="x">' . $_->[0] . '</span>') } @attributesArr;
+        %attributes = map { $_->[1] => ('<span data-attributes>' . $_->[0] . '</span>') } @attributesArr;
     }
 
     # List security context
@@ -51,11 +66,11 @@ unless (opendir ( DIR, $cwd )) {
         my $delimiter = ( $setype ? '\n' : ',' );
         my @searray =
           map { [ split( /\s+/, $_, 2 ) ] } split( /$delimiter/, $output );
-        %secontext = map { $_->[1] => ($_->[0] eq "?" ? undef : ('<span>' . $_->[0] . '</span>') ) } @searray;
+        %secontext = map { $_->[1] => ($_->[0] eq "?" ? undef : ('<span data-secontext>' . $_->[0] . '</span>') ) } @searray;
     }
 
     # Get info about directory entries
-    @info = map { [ $_, lstat($_), &clean_mimetype($_), -d, -l $_, $secontext{$_}, $attributes{$_} ] } @list;
+    @info = map { [ $_, lstat($_), &clean_mimetype($_), -d, -l $_, $secontext{$_}, $attributes{$_}, $acls{$_} ] } @list;
 
     # Filter out folders
     @folders = map {$_} grep {$_->[15] == 1 } @info;

filemin/lang/af.auto

@@ -124,7 +124,6 @@ http_downloading=aflaai
 http_done=$1 tot $2 afgelaai.
 uploading=Laai op, wag asseblief. ..
 acl_allowed_paths=Laat toegang tot kaarte toe
-acl_allowed_paths2=(Vir nie-wortelgebruikers)
 acl_allowed_for_edit=Mimetipes word toegelaat vir redigering deur ingeboude redakteur
 acl_work_as=Verkry toegang tot lêers as Unix-gebruiker
 acl_root=Wortel (gee sorgvuldig aan onbetroubare gebruikers!)
@@ -162,3 +161,6 @@ info_total3=Totaal: $1 lêer en $2 -kaarte
 info_total4=Totaal: $1 lêers en $2 -kaarte
 
 ownership=Eienaar
+acls=Toegangsbeheerlys
+file_detect_encoding=Bespeur lêerkodering outomaties
+index_return=lêerlys

filemin/lang/ar

@@ -124,7 +124,6 @@ http_downloading=تحميل
 http_done=تم تنزيل $1 إلى $2.
 uploading=التحميل ، يرجى الانتظار ...
 acl_allowed_paths=السماح بالوصول إلى الأدلة
-acl_allowed_paths2=(للمستخدمين غير root)
 acl_allowed_for_edit=أنواع Mimetypes مسموح بها للتحرير بواسطة محرر مدمج
 acl_work_as=الوصول إلى الملفات كمستخدم Unix
 acl_root=root (منح مع الرعاية للمستخدمين غير الموثوق بهم!)

filemin/lang/ar.auto

@@ -0,0 +1,3 @@
+acls=قائمة نظام الدخول
+file_detect_encoding=كشف ملف ترميز تلقائيا
+index_return=قائمة الملفات

filemin/lang/be.auto

@@ -124,7 +124,6 @@ http_downloading=Загрузка
 http_done=Спампавана $1 да $2.
 uploading=Загрузка, пачакайце. ..
 acl_allowed_paths=Дазволіць доступ да каталогаў
-acl_allowed_paths2=(Для некарэнных карыстальнікаў)
 acl_allowed_for_edit=Мімітыпы дазволеныя для рэдагавання ўбудаваным рэдактарам
 acl_work_as=Доступ да файлаў як карыстальнік Unix
 acl_root=Root (прадаставіць з асцярожнасцю нянадзейным карыстальнікам!)
@@ -162,3 +161,6 @@ info_total3=Усяго: $1 файл і $2 каталогі
 info_total4=Усяго: $1 файлаў і $2 каталогаў
 
 ownership=Уладальнік
+acls=Спіс кантролю доступу
+file_detect_encoding=Аўтаматычнае вызначэнне кадавання файлаў
+index_return=спіс файлаў

filemin/lang/bg.auto

@@ -124,7 +124,6 @@ http_downloading=Изтеглянето
 http_done=Изтеглени $1 до $2.
 uploading=Качва се, моля изчакайте. ..
 acl_allowed_paths=Разрешаване на достъп до директории
-acl_allowed_paths2=(За не-root потребители)
 acl_allowed_for_edit=Миметипите, разрешени за редактиране от вградения редактор
 acl_work_as=Достъп до файловете като потребител на Unix
 acl_root=Root (предоставяйте внимателно на недоверие на потребителите!)
@@ -162,3 +161,6 @@ info_total3=Общо: $1 файл и $2 директории
 info_total4=Общо: $1 файлове и $2 директории
 
 ownership=собственик
+acls=Списък за контрол на достъпа
+file_detect_encoding=Автоматично откриване на кодиране на файлове
+index_return=списък с файлове

filemin/lang/ca

@@ -124,7 +124,6 @@ http_downloading=S'està descarregant
 http_done=S'ha descarregat $1 a $2.
 uploading=S'està pujant, espera si et plau...
 acl_allowed_paths=Permet l'accés als directoris
-acl_allowed_paths2=(Per a usuaris no root)
 acl_allowed_for_edit=Tipus MIME permesos per a editar amb l'editor integrat
 acl_work_as=Accedeix als fitxers com l'usuari Unix
 acl_root=Root (compte amb els usuaris no fiables!)

filemin/lang/ca.auto

@@ -0,0 +1,3 @@
+acls=Llista de control d’accés
+file_detect_encoding=Detecta automàticament la codificació de fitxers
+index_return=llistat de fitxers

filemin/lang/cs.auto

@@ -124,7 +124,6 @@ http_downloading=Stahování
 http_done=Staženo $1 až $2.
 uploading=Nahrávání, čekejte prosím. ..
 acl_allowed_paths=Povolit přístup k adresářům
-acl_allowed_paths2=(Pro uživatele bez oprávnění root)
 acl_allowed_for_edit=Mimetypy byly povoleny pro úpravy vestavěným editorem
 acl_work_as=Přístup k souborům jako uživatel Unix
 acl_root=Root (udělejte opatrně nedůvěryhodným uživatelům!)
@@ -162,3 +161,6 @@ info_total3=Celkem: $1 soubor a $2 adresáře
 info_total4=Celkem: $1 souborů a $2 adresářů
 
 ownership=Majitel
+acls=Seznam řízení přístupu
+file_detect_encoding=Automaticky detekovat kódování souborů
+index_return=seznam souborů

filemin/lang/da.auto

@@ -124,7 +124,6 @@ http_downloading=Downloading
 http_done=Downloadet $1 til $2.
 uploading=Uploader, vent venligst. ..
 acl_allowed_paths=Tillad adgang til mapper
-acl_allowed_paths2=(For ikke-root-brugere)
 acl_allowed_for_edit=Mimetyper tilladt at redigere af den indbyggede editor
 acl_work_as=Få adgang til filer som Unix-bruger
 acl_root=Root (bevilg med omhu til ikke-betroede brugere!)
@@ -162,3 +161,6 @@ info_total3=I alt: $1 fil og $2 mapper
 info_total4=I alt: $1 filer og $2 mapper
 
 ownership=Ejer
+acls=Adgangskontroliste
+file_detect_encoding=Registrer automatisk filkodning
+index_return=filoversigt

filemin/lang/de

@@ -124,7 +124,6 @@ http_downloading=Wird heruntergeladen
 http_done=$1 von $2 heruntergeladen.
 uploading=Hochladen, bitte warten ...
 acl_allowed_paths=Zugang zu Verzeichnissen erlauben
-acl_allowed_paths2=(Nur für root-Benutzer
 acl_allowed_for_edit=Mimetypen erlaubt zum Editieren von engebautenEditor
 acl_work_as=Auf Dateien als System-Benutzer zugreifen
 acl_root=Root (nicht vertrauenswürdigen Benutzern mit Vorsicht zu gewähren!)

filemin/lang/de.auto

@@ -0,0 +1,3 @@
+acls=Zugriffskontrollliste
+file_detect_encoding=Dateicodierung automatisch erkennen
+index_return=Dateiliste

filemin/lang/el.auto

@@ -124,7 +124,6 @@ http_downloading=Λήψη
 http_done=Λήψη του $1 στο $2.
 uploading=Μεταφόρτωση, παρακαλώ περιμένετε. ..
 acl_allowed_paths=Να επιτρέπεται η πρόσβαση στους καταλόγους
-acl_allowed_paths2=(Για μη χρήστες root)
 acl_allowed_for_edit=Οι τύποι μεγεθών επιτρέπονται για επεξεργασία από ενσωματωμένο επεξεργαστή
 acl_work_as=Πρόσβαση στα αρχεία ως χρήστης Unix
 acl_root=Root (χορηγήστε με προσοχή σε μη αξιόπιστους χρήστες!)
@@ -162,3 +161,6 @@ info_total3=Σύνολο: $1 αρχείο και $2 κατάλογοι
 info_total4=Σύνολο: $1 αρχεία και $2 κατάλογοι
 
 ownership=Ιδιοκτήτης
+acls=Λίστα ελέγχου πρόσβασης
+file_detect_encoding=Αυτόματη ανίχνευση κωδικοποίησης αρχείων
+index_return=λίστα αρχείων

filemin/lang/en

@@ -25,7 +25,7 @@ size=Size
 owner_user=Owner user
 owner_group=Owner group
 permissions=Mode
-selinux=Security context
+selinux=Security Context
 attributes=Attributes
 last_mod_time=Modified
 rename=Rename
@@ -124,7 +124,6 @@ http_downloading=Downloading
 http_done=Downloaded $1 to $2.
 uploading=Uploading, please wait...
 acl_allowed_paths=Allow access to directories
-acl_allowed_paths2=(For non-root users)
 acl_allowed_for_edit=Mimetypes allowed for edit by builtin editor
 acl_work_as=Access files as Unix user
 acl_root=Root (grant with care to un-trusted users!)
@@ -152,7 +151,7 @@ menu_file=File
 menu_edit=Edit
 menu_tools=Tools
 menu_bookmarks=Bookmarks
-notallowed=You are not allowed to access $1. The allowed directories are : $2
+notallowed=You are not allowed to access $1. The only allowed directories are: $2
 error_upload_emax=Uploaded file is larger than the limit of $1
 extract_etype=Unsupported archive file type
 
@@ -162,3 +161,6 @@ info_total3=Total: $1 file and $2 directories
 info_total4=Total: $1 files and $2 directories
 
 ownership=Owner
+acls=Access Control List
+file_detect_encoding=Automatically detect file encoding
+index_return=file listing

filemin/lang/es.auto

@@ -124,7 +124,6 @@ http_downloading=Descargando
 http_done=Descargado $1 a $2.
 uploading=Cargando... Por favor espere. ..
 acl_allowed_paths=Permitir acceso a directorios
-acl_allowed_paths2=(Para usuarios no root)
 acl_allowed_for_edit=Mimetypes permitidos para edición por editor incorporado
 acl_work_as=Acceder a archivos como usuario de Unix
 acl_root=Root (otorgar con cuidado a usuarios no confiables)
@@ -162,3 +161,6 @@ info_total3=Total: $1 archivo y $2 directorios
 info_total4=Total: $1 archivos y $2 directorios
 
 ownership=Propietario
+acls=Lista de control de acceso
+file_detect_encoding=Detecta automáticamente la codificación de archivos
+index_return=listado de archivos

filemin/lang/eu.auto

@@ -124,7 +124,6 @@ http_downloading=Deskargen
 http_done=$1 etik $2 deskargatu dira.
 uploading=Kargatzen, itxaron. ..
 acl_allowed_paths=Baimendu direktorioetara sarbidea
-acl_allowed_paths2=(Ez diren erroko erabiltzaileentzat)
 acl_allowed_for_edit=Eraiki editatu editore editoreak baimendutako tipografia
 acl_work_as=Sartu fitxategiak Unix erabiltzaile gisa
 acl_root=Erro (laguntza eman konfiantzarik ez duten erabiltzaileei arretaz!)
@@ -162,3 +161,6 @@ info_total3=Guztira: $1 fitxategia eta $2 direktorio
 info_total4=Guztira: $1 fitxategi eta $2 direktorio
 
 ownership=Jabea
+acls=Sarbide Kontrol Zerrenda
+file_detect_encoding=Automatikoki detektatu fitxategien kodeketa
+index_return=fitxategi zerrenda

filemin/lang/fa.auto

@@ -124,7 +124,6 @@ http_downloading=بارگیری
 http_done=بارگیری$1 تا$2
 uploading=در حال بارگذاری ، لطفا صبر کنید. ..
 acl_allowed_paths=دسترسی به دایرکتوری ها را مجاز کنید
-acl_allowed_paths2=(برای کاربران غیر ریشه)
 acl_allowed_for_edit=mimetypes مجاز به ویرایش توسط ویرایشگر داخلی است
 acl_work_as=به عنوان کاربر یونیکس به پرونده ها دسترسی پیدا کنید
 acl_root=ریشه (با احتیاط به کاربران غیر قابل اعتماد کمک مالی کنید!)
@@ -162,3 +161,6 @@ info_total3=تعداد کل: $1 پرونده و$2 فهرست
 info_total4=مجموع:$1 پرونده و$2 فهرست
 
 ownership=صاحب
+acls=لیست کنترل دسترسی
+file_detect_encoding=به طور خودکار رمزگذاری فایل را شناسایی کنید
+index_return=لیست پرونده

filemin/lang/fi.auto

@@ -124,7 +124,6 @@ http_downloading=lataaminen
 http_done=Ladattu $1 - $2.
 uploading=Lähetetään, odota. ..
 acl_allowed_paths=Salli pääsy hakemistoihin
-acl_allowed_paths2=(Muille kuin pääkäyttäjille)
 acl_allowed_for_edit=Sisältöeditori voi muokata tyyppejä
 acl_work_as=Käytä tiedostoja Unix-käyttäjänä
 acl_root=Juuri (myöntä huolellisesti epäluotettaville käyttäjille!)
@@ -162,3 +161,6 @@ info_total3=Yhteensä: $1 tiedosto ja $2 hakemistoa
 info_total4=Yhteensä: $1 tiedostoa ja $2 hakemistoa
 
 ownership=Omistaja
+acls=Kulunvalvontaluettelo
+file_detect_encoding=Tunnista tiedostojen koodaus automaattisesti
+index_return=tiedostoluettelo

filemin/lang/fr

@@ -124,7 +124,6 @@ http_downloading=Téléchargement
 http_done=Téléchargé $1 à $2.
 uploading=Téléchargement, veuillez patienter. ..
 acl_allowed_paths=Autoriser l'accès aux répertoires
-acl_allowed_paths2=(Pour les utilisateurs non root)
 acl_allowed_for_edit=Types de mime autorisés pour l'édition par l'éditeur intégré
 acl_work_as=Accéder aux fichiers en tant qu'utilisateur Unix
 acl_root=Root (accordez avec soin aux utilisateurs non fiables!)

filemin/lang/fr.auto

@@ -0,0 +1,3 @@
+acls=Liste de contrôle d'accès
+file_detect_encoding=Détecter automatiquement le codage des fichiers
+index_return=liste de fichiers

filemin/lang/he.auto

@@ -124,7 +124,6 @@ http_downloading=מוריד
 http_done=הורדת $1 ל- $2.
 uploading=מעלה, אנא המתן. ..
 acl_allowed_paths=אפשר גישה לספריות
-acl_allowed_paths2=(למשתמשים שאינם שורש)
 acl_allowed_for_edit=סוגי mimet מותר לערוך על ידי עורך מובנה
 acl_work_as=גישה לקבצים כמשתמש יוניקס
 acl_root=שורש (הענק בזהירות למשתמשים שאינם מהימנים!)
@@ -162,3 +161,6 @@ info_total3=סה"כ: קובץ $1 ו- $2 ספריות
 info_total4=סה"כ: $1 קבצים ו- $2 ספריות
 
 ownership=בעלים
+acls=גש לרשימת השליטה
+file_detect_encoding=זיהוי אוטומטי של קידוד קבצים
+index_return=רישום קבצים

filemin/lang/hr.auto

@@ -124,7 +124,6 @@ http_downloading=preuzimanje
 http_done=Preuzeto $1 do $2.
 uploading=Prijenos, pričekajte. ..
 acl_allowed_paths=Dopusti pristup direktorijima
-acl_allowed_paths2=(Za korisnike koji nisu korijeni)
 acl_allowed_for_edit=Mimetipi dopušteni za uređivanje pomoću uređenog uređivača
 acl_work_as=Pristupite datotekama kao Unix korisnik
 acl_root=Korijen (dajte pažljivo korisnicima bez povjerenja!)
@@ -162,3 +161,6 @@ info_total3=Ukupno: $1 datoteka i $2 direktorije
 info_total4=Ukupno: $1 datoteka i $2 direktorije
 
 ownership=Vlasnik
+acls=Popis kontrole pristupa
+file_detect_encoding=Automatski otkrij kodiranje datoteka
+index_return=popis datoteka

filemin/lang/hu.auto

@@ -124,7 +124,6 @@ http_downloading=A letöltés
 http_done=Letöltve: $1 - $2.
 uploading=Feltöltés, kérjük, várjon. ..
 acl_allowed_paths=Hozzáférés engedélyezése a könyvtárakhoz
-acl_allowed_paths2=(Nem root felhasználók számára)
 acl_allowed_for_edit=A betűtípusok szerkeszthetők a beépített szerkesztő által
 acl_work_as=A fájlok elérése Unix felhasználóként
 acl_root=Gyökér (óvatosan adja meg a megbízhatatlan felhasználók számára!)
@@ -162,3 +161,6 @@ info_total3=Összesen: $1 fájl és $2 könyvtár
 info_total4=Összesen: $1 fájl és $2 könyvtár
 
 ownership=Tulajdonos
+acls=Beléptető lista
+file_detect_encoding=A fájlkódolás automatikus észlelése
+index_return=fájl felsorolása

filemin/lang/it.auto

@@ -124,7 +124,6 @@ http_downloading=Download
 http_done=Scaricato da $1 a $2.
 uploading=Caricamento in corso, attendere. ..
 acl_allowed_paths=Consentire l'accesso alle directory
-acl_allowed_paths2=(Per utenti non root)
 acl_allowed_for_edit=Mimetipi consentiti per la modifica dall'editor integrato
 acl_work_as=Accedi ai file come utente Unix
 acl_root=Root (concedi con attenzione agli utenti non fidati!)
@@ -162,3 +161,6 @@ info_total3=Totale: file $1 e $2 directory
 info_total4=Totale: $1 file e $2 directory
 
 ownership=Proprietario
+acls=Elenco di controllo degli accessi
+file_detect_encoding=Rileva automaticamente la codifica dei file
+index_return=elenco dei file

filemin/lang/ja.auto

@@ -124,7 +124,6 @@ http_downloading=ダウンロード中
 http_done=$1を $2にダウンロードしました。
 uploading=アップロードしています。お待ちください. ..
 acl_allowed_paths=ディレクトリへのアクセスを許可する
-acl_allowed_paths2=（非rootユーザーの場合）
 acl_allowed_for_edit=組み込みエディターによる編集が許可されているMIMEタイプ
 acl_work_as=Unixユーザーとしてファイルにアクセスする
 acl_root=ルート（信頼されていないユーザーに注意して付与してください！）
@@ -162,3 +161,6 @@ info_total3=合計： $1ファイルと $2ディレクトリ
 info_total4=合計： $1ファイルと $2ディレクトリ
 
 ownership=オーナー
+acls=アクセス制御リスト
+file_detect_encoding=ファイルエンコーディングを自動的に検出
+index_return=ファイルリスト

filemin/lang/ko.auto

@@ -124,7 +124,6 @@ http_downloading=다운로드 중
 http_done=$1 을 (를) $2 에 다운로드했습니다.
 uploading=업로드 중입니다. 잠시만 기다려주세요. ..
 acl_allowed_paths=디렉토리 접근 허용
-acl_allowed_paths2=(루트가 아닌 사용자의 경우)
 acl_allowed_for_edit=내장 편집기로 편집 할 수있는 Mimetypes
 acl_work_as=Unix 사용자로 파일에 액세스
 acl_root=루트 (신뢰할 수없는 사용자에게주의를 기울임)
@@ -162,3 +161,6 @@ info_total3=총계 : $1 파일 및 $2 디렉토리
 info_total4=총계 : $1 개 파일 및 $2 개 디렉토리
 
 ownership=소유자
+acls=액세스 제어 목록
+file_detect_encoding=파일 인코딩 자동 감지
+index_return=파일 목록

filemin/lang/lt.auto

@@ -124,7 +124,6 @@ http_downloading=Atsisiuntimas
 http_done=Atsisiųsta nuo $1 iki $2.
 uploading=Įkeliama, palaukite. ..
 acl_allowed_paths=Leisti pasiekti katalogus
-acl_allowed_paths2=(Ne root vartotojams)
 acl_allowed_for_edit=Įrenginio redaktorius gali redaguoti pamėgdytus tipus
 acl_work_as=Prieikite prie failų kaip „Unix“ vartotojas
 acl_root=Šaknis (atsargiai suteikite nepatikimiems vartotojams!)
@@ -162,3 +161,6 @@ info_total3=Iš viso: $1 failas ir $2 katalogai
 info_total4=Iš viso: $1 failai ir $2 katalogai
 
 ownership=Savininkas
+acls=Prieigos kontrolės sąrašas
+file_detect_encoding=Automatiškai aptikti failų kodavimą
+index_return=failų sąrašas

filemin/lang/lv.auto

@@ -124,7 +124,6 @@ http_downloading=Lejupielāde
 http_done=Lejupielādēts no $1 līdz $2.
 uploading=Notiek augšupielāde, lūdzu, uzgaidiet. ..
 acl_allowed_paths=Ļaut piekļūt direktorijiem
-acl_allowed_paths2=(Lietotājiem, kas nav root lietotāji)
 acl_allowed_for_edit=Iebūvēto redaktoru atļauts rediģēt atdarinājumus
 acl_work_as=Piekļūstiet failiem kā Unix lietotājs
 acl_root=Sakne (piešķiriet uzmanīgi neuzticamiem lietotājiem!)
@@ -162,3 +161,6 @@ info_total3=Kopā: $1 fails un $2 direktoriji
 info_total4=Kopā: $1 faili un $2 direktoriji
 
 ownership=Īpašnieks
+acls=Piekļuves kontroles saraksts
+file_detect_encoding=Automātiski noteikt failu kodējumu
+index_return=failu saraksts

filemin/lang/ms.auto

@@ -124,7 +124,6 @@ http_downloading=Memuat turun
 http_done=Muat turun $1 hingga $2.
 uploading=Memuat naik, sila tunggu. ..
 acl_allowed_paths=Benarkan akses kepada direktori
-acl_allowed_paths2=(Untuk pengguna bukan akar)
 acl_allowed_for_edit=Mimetype dibenarkan untuk diedit oleh editor terbina
 acl_work_as=Akses fail sebagai pengguna Unix
 acl_root=Root (memberi perhatian kepada pengguna yang tidak dipercayai!)
@@ -162,3 +161,6 @@ info_total3=Jumlah: $1 fail dan $2 direktori
 info_total4=Jumlah: $1 fail dan $2 direktori
 
 ownership=Pemilik
+acls=Senarai Kawalan Akses
+file_detect_encoding=Mengesan pengekodan fail secara automatik
+index_return=senarai fail

filemin/lang/mt.auto

@@ -124,7 +124,6 @@ http_downloading=Tniżżil
 http_done=Niżżilt $1 sa $2.
 uploading=Tella, jekk jogħġbok stenna. ..
 acl_allowed_paths=Ħalli aċċess għad-direttorji
-acl_allowed_paths2=(Għal utenti li mhumiex radikali)
 acl_allowed_for_edit=Tipi permessi għall-editjar minn editur builtin
 acl_work_as=Aċċess għall-fajls bħala utent Unix
 acl_root=Għerq (għotja b'attenzjoni lil utenti mhux fdati!)
@@ -162,3 +161,6 @@ info_total3=Total: $1 fajl u $2 direttorji
 info_total4=Total: $1 fajls u $2 direttorji
 
 ownership=Sid il-prodott
+acls=Lista tal-Kontroll tal-Aċċess
+file_detect_encoding=Skopri awtomatikament il-kodifikazzjoni tal-fajl
+index_return=elenkar tal-fajl

filemin/lang/nl.auto

@@ -124,7 +124,6 @@ http_downloading=Downloaden
 http_done=$1 tot $2 gedownload.
 uploading=Uploaden, even geduld. ..
 acl_allowed_paths=Sta toegang tot mappen toe
-acl_allowed_paths2=(Voor niet-rootgebruikers)
 acl_allowed_for_edit=Mimetypes toegestaan voor bewerking door ingebouwde editor
 acl_work_as=Toegang tot bestanden als Unix-gebruiker
 acl_root=Root (wees voorzichtig met niet-vertrouwde gebruikers!)
@@ -162,3 +161,6 @@ info_total3=Totaal: $1 bestand en $2 mappen
 info_total4=Totaal: $1 bestanden en $2 mappen
 
 ownership=Eigenaar
+acls=Toegangscontrole lijst
+file_detect_encoding=Automatisch bestandscodering detecteren
+index_return=bestandslijst

filemin/lang/no

@@ -124,7 +124,6 @@ http_downloading=Laster ned
 http_done=Lastet ned $1 til $2
 uploading=Laster opp, vennligst vent...
 acl_allowed_paths=Tillatte stier
-acl_allowed_paths2=(For ikke-root brukere)
 acl_allowed_for_edit=Minetyper tillatt for redigering av innebygd editor
 acl_work_as=Les filer som Unix bruker
 acl_root=Root (vær forsiktig med å gi tilgang til ikke-betrodde brukere!)

filemin/lang/no.auto

@@ -0,0 +1,3 @@
+acls=Tilgangskontrolliste
+file_detect_encoding=Registrer filkoding automatisk
+index_return=filoppføring

filemin/lang/pl.auto

@@ -124,7 +124,6 @@ http_downloading=Ściąganie
 http_done=Pobrano $1 do $2.
 uploading=Wgrywanie... Proszę Czekać. ..
 acl_allowed_paths=Zezwalaj na dostęp do katalogów
-acl_allowed_paths2=(Dla użytkowników innych niż root)
 acl_allowed_for_edit=Mimetypes dozwolone do edycji przez wbudowany edytor
 acl_work_as=Uzyskaj dostęp do plików jako użytkownik systemu Unix
 acl_root=Root (udzielaj ostrożnie niezaufanym użytkownikom!)
@@ -162,3 +161,6 @@ info_total3=Łącznie: $1 plik i $2 katalogi
 info_total4=Łącznie: $1 plików i $2 katalogów
 
 ownership=Właściciel
+acls=Lista kontroli dostępu
+file_detect_encoding=Automatycznie wykrywaj kodowanie plików
+index_return=lista plików

filemin/lang/pt.auto

@@ -124,7 +124,6 @@ http_downloading=Baixando
 http_done=$1 a $2 baixados.
 uploading=A carregar, aguarde. ..
 acl_allowed_paths=Permitir acesso a diretórios
-acl_allowed_paths2=(Para usuários não root)
 acl_allowed_for_edit=Tipos de mim permitidos para edição pelo editor incorporado
 acl_work_as=Acessar arquivos como usuário Unix
 acl_root=Raiz (conceda com cuidado a usuários não confiáveis!)
@@ -162,3 +161,6 @@ info_total3=Total: $1 arquivo e $2 diretórios
 info_total4=Total: $1 arquivos e $2 diretórios
 
 ownership=Proprietário
+acls=Lista de controle de acesso
+file_detect_encoding=Detectar automaticamente a codificação do arquivo
+index_return=lista de arquivos

filemin/lang/pt_BR.auto

@@ -124,7 +124,6 @@ http_downloading=Baixando
 http_done=$1 a $2 baixados.
 uploading=A carregar, aguarde. ..
 acl_allowed_paths=Permitir acesso a diretórios
-acl_allowed_paths2=(Para usuários não root)
 acl_allowed_for_edit=Tipos de mim permitidos para edição pelo editor incorporado
 acl_work_as=Acessar arquivos como usuário Unix
 acl_root=Raiz (conceda com cuidado a usuários não confiáveis!)
@@ -162,3 +161,6 @@ info_total3=Total: $1 arquivo e $2 diretórios
 info_total4=Total: $1 arquivos e $2 diretórios
 
 ownership=Proprietário
+acls=Lista de controle de acesso
+file_detect_encoding=Detectar automaticamente a codificação do arquivo
+index_return=lista de arquivos

filemin/lang/ro.auto

@@ -124,7 +124,6 @@ http_downloading=Descărcarea
 http_done=Descărcat $1 la $2.
 uploading=Se încarcă, vă rugăm să așteptați. ..
 acl_allowed_paths=Permiteți accesul la directoare
-acl_allowed_paths2=(Pentru utilizatorii non-root)
 acl_allowed_for_edit=Tipuri permise pentru editare de către editorul încorporat
 acl_work_as=Accesați fișierele ca utilizator Unix
 acl_root=Root (acordare cu grijă pentru utilizatori care nu au încredere!)
@@ -162,3 +161,6 @@ info_total3=Total: $1 fișier și $2 directoare
 info_total4=Total: $1 fișiere și $2 directoare
 
 ownership=Proprietar
+acls=Lista de control acces
+file_detect_encoding=Detectează automat codificarea fișierului
+index_return=listarea fișierelor

filemin/lang/ru.auto

@@ -124,7 +124,6 @@ http_downloading=загрузка
 http_done=Загрузил $1 в $2.
 uploading=Загрузка, пожалуйста, подождите. ..
 acl_allowed_paths=Разрешить доступ к каталогам
-acl_allowed_paths2=(Для пользователей без полномочий root)
 acl_allowed_for_edit=Mimetypes разрешены для редактирования встроенным редактором
 acl_work_as=Доступ к файлам от имени пользователя Unix
 acl_root=Root (с осторожностью предоставляйте ненадежным пользователям!)
@@ -162,3 +161,6 @@ info_total3=Всего: $1 файл и $2 каталоги
 info_total4=Всего: $1 файлов и $2 каталогов
 
 ownership=владелец
+acls=Список контроля доступа
+file_detect_encoding=Автоматически определять кодировку файлов
+index_return=список файлов

filemin/lang/sk.auto

@@ -124,7 +124,6 @@ http_downloading=sťahovanie
 http_done=Stiahnuté $1 až $2.
 uploading=Nahrávanie, čakajte prosím. ..
 acl_allowed_paths=Povoliť prístup k adresárom
-acl_allowed_paths2=(Pre používateľov typu non-root)
 acl_allowed_for_edit=Mimetypy povolené vstavaným editorom upravovať
 acl_work_as=Prístup k súborom ako užívateľ systému Unix
 acl_root=Root (grant s opatrnosťou pre nedôveryhodných používateľov!)
@@ -162,3 +161,6 @@ info_total3=Spolu: $1 súbor a $2 adresáre
 info_total4=Celkom: $1 súborov a $2 adresárov
 
 ownership=vlastník
+acls=Zoznam riadenia prístupu
+file_detect_encoding=Automaticky zistiť kódovanie súborov
+index_return=zoznam súborov

filemin/lang/sl.auto

@@ -124,7 +124,6 @@ http_downloading=Prenašanje
 http_done=Preneseni od $1 do $2.
 uploading=Nalaganje, počakajte. ..
 acl_allowed_paths=Dovoli dostop do imenikov
-acl_allowed_paths2=(Za uporabnike, ki niso koreninski)
 acl_allowed_for_edit=Mimetipi, ki jih omogoča urejanje urejevalnika
 acl_work_as=Do datotek dostopate kot Unixov uporabnik
 acl_root=Root (dodelite previdno uporabnikom brez zaupanja!)
@@ -162,3 +161,6 @@ info_total3=Skupaj: $1 datoteka in $2 imeniki
 info_total4=Skupaj: $1 datotek in $2 imenikov
 
 ownership=Lastnik
+acls=Seznam nadzora dostopa
+file_detect_encoding=Samodejno zaznaj kodiranje datotek
+index_return=seznam datotek

filemin/lang/sv.auto

@@ -124,7 +124,6 @@ http_downloading=Laddar ner
 http_done=Nedladdat $1 till $2.
 uploading=Laddar upp, vänta. ..
 acl_allowed_paths=Tillåt åtkomst till kataloger
-acl_allowed_paths2=(För icke-root-användare)
 acl_allowed_for_edit=Mimetyper tillåtna för redigering av den inbyggda redigeraren
 acl_work_as=Få åtkomst till filer som Unix-användare
 acl_root=Rot (bevilja med försiktighet till icke-betrodda användare!)
@@ -162,3 +161,6 @@ info_total3=Totalt: $1 fil och $2 kataloger
 info_total4=Totalt: $1 filer och $2 kataloger
 
 ownership=Ägare
+acls=Åtkomstkontrollista
+file_detect_encoding=Identifiera filkodning automatiskt
+index_return=fillista

filemin/lang/th.auto

@@ -124,7 +124,6 @@ http_downloading=ดาวน์โหลด
 http_done=ดาวน์โหลด $1 ถึง $2 
 uploading=กำลังอัปโหลดโปรดรอ. ..
 acl_allowed_paths=อนุญาตให้เข้าถึงไดเรกทอรี
-acl_allowed_paths2=(สำหรับผู้ใช้ที่ไม่ใช่รูท)
 acl_allowed_for_edit=Mimetypes อนุญาตให้แก้ไขได้โดย builtin editor
 acl_work_as=เข้าถึงไฟล์ในฐานะผู้ใช้ Unix
 acl_root=รูท (ให้ด้วยความระมัดระวังต่อผู้ใช้ที่ไม่น่าเชื่อถือ!)
@@ -162,3 +161,6 @@ info_total3=ผลรวม: $1 ไฟล์และไดเรกทอรี
 info_total4=ผลรวม: $1 ไฟล์และไดเรกทอรี $2 
 
 ownership=เจ้าของ
+acls=รายการควบคุมการเข้าถึง
+file_detect_encoding=ตรวจจับการเข้ารหัสไฟล์โดยอัตโนมัติ
+index_return=รายชื่อไฟล์

filemin/lang/tr.auto

@@ -124,7 +124,6 @@ http_downloading=İndirilmesi
 http_done=$1 - $2 arasında indirildi.
 uploading=Yükleniyor... Lütfen Bekleyin. ..
 acl_allowed_paths=Dizinlere erişime izin ver
-acl_allowed_paths2=(Kök olmayan kullanıcılar için)
 acl_allowed_for_edit=Yerleşik düzenleyici tarafından düzenlemeye izin verilen mime türleri
 acl_work_as=Dosyalara Unix kullanıcısı olarak erişin
 acl_root=Kök (güvenilir olmayan kullanıcılara özenle verin!)
@@ -162,3 +161,6 @@ info_total3=Toplam: $1 dosya ve $2 dizin
 info_total4=Toplam: $1 dosya ve $2 dizin
 
 ownership=Sahip
+acls=Erişim kontrol Listesi
+file_detect_encoding=Dosya kodlamasını otomatik olarak algıla
+index_return=dosya listesi

filemin/lang/uk.auto

@@ -124,7 +124,6 @@ http_downloading=Завантаження
 http_done=Завантажено $1 до $2.
 uploading=Завантаження, зачекайте. ..
 acl_allowed_paths=Дозволити доступ до каталогів
-acl_allowed_paths2=(Для некоріальних користувачів)
 acl_allowed_for_edit=Міметипи, дозволені для редагування вбудованим редактором
 acl_work_as=Доступ до файлів як користувач Unix
 acl_root=Root (надайте з обережністю недовіреним користувачам!)
@@ -162,3 +161,6 @@ info_total3=Всього: $1 файл та $2 каталоги
 info_total4=Всього: $1 файлів і $2 каталогів
 
 ownership=Власник
+acls=Список контролю доступу
+file_detect_encoding=Автоматично виявляти кодування файлів
+index_return=список файлів

filemin/lang/ur.auto

@@ -124,7 +124,6 @@ http_downloading=ڈاؤن لوڈ ہو رہا ہے
 http_done=$1 سے$2 ڈاؤن لوڈ کیا۔
 uploading=اپ لوڈ ہو رہا ہے ، براہ کرم انتظار کریں…
 acl_allowed_paths=ڈائریکٹریوں تک رسائی کی اجازت دیں
-acl_allowed_paths2=(غیر جڑوں صارفین کے لئے)
 acl_allowed_for_edit=مائیم ٹائپس کو بلٹ ان ایڈیٹر کے ذریعہ ترمیم کرنے کی اجازت ہے
 acl_work_as=یونکس صارف کی حیثیت سے فائلوں تک رسائی حاصل کریں
 acl_root=جڑ (غیر بھروسہ مند صارفین کی دیکھ بھال کے ساتھ گرانٹ!)
@@ -162,3 +161,6 @@ info_total3=کل:$1 فائل اور$2 ڈائریکٹریز
 info_total4=کل:$1 فائلیں اور$2 ڈائریکٹریاں
 
 ownership=مالک
+acls=رسائی کی فہرست تک رسائی حاصل کریں
+file_detect_encoding=خود کار طریقے سے فائل انکوڈنگ کا پتہ لگائیں
+index_return=فائل کی فہرست

filemin/lang/vi.auto

@@ -124,7 +124,6 @@ http_downloading=Đang tải xuống
 http_done=Đã tải xuống $1 đến $2.
 uploading=Đang tải lên, vui lòng đợi. ..
 acl_allowed_paths=Cho phép truy cập vào thư mục
-acl_allowed_paths2=(Dành cho người dùng không root)
 acl_allowed_for_edit=Mimetypes được phép chỉnh sửa bởi trình soạn thảo dựng sẵn
 acl_work_as=Truy cập tệp dưới dạng người dùng Unix
 acl_root=Root (cấp quyền chăm sóc cho người dùng không đáng tin cậy!)
@@ -162,3 +161,6 @@ info_total3=Tổng cộng: $1 tệp và $2 thư mục
 info_total4=Tổng cộng: $1 tệp và $2 thư mục
 
 ownership=Chủ nhân
+acls=Danh sách điều khiển truy cập
+file_detect_encoding=Tự động phát hiện mã hóa tệp
+index_return=danh sách hồ sơ

filemin/lang/zh.auto

@@ -124,7 +124,6 @@ http_downloading=正在下载
 http_done=已将 $1下载到 $2。
 uploading=上载中，请稍候. ..
 acl_allowed_paths=允许访问目录
-acl_allowed_paths2=（对于非root用户）
 acl_allowed_for_edit=内置编辑器允许编辑的Mimetypes
 acl_work_as=以Unix用户访问文件
 acl_root=根（小心不信任的用户！）
@@ -162,3 +161,6 @@ info_total3=总计： $1个文件和 $2个目录
 info_total4=总计： $1个文件和 $2个目录
 
 ownership=所有者
+acls=访问控制列表
+file_detect_encoding=自动检测文件编码
+index_return=文件清单

filemin/lang/zh_TW.auto

@@ -124,7 +124,6 @@ http_downloading=正在下載
 http_done=已將 $1下載到 $2。
 uploading=上載中，請稍候. ..
 acl_allowed_paths=允許訪問目錄
-acl_allowed_paths2=（對於非root用戶）
 acl_allowed_for_edit=內置編輯器允許編輯的Mimetypes
 acl_work_as=以Unix用戶訪問文件
 acl_root=根（小心不信任的用戶！）
@@ -162,3 +161,6 @@ info_total3=總計： $1個文件和 $2個目錄
 info_total4=總計： $1個文件和 $2個目錄
 
 ownership=所有者
+acls=訪問控制列表
+file_detect_encoding=自動檢測文件編碼
+index_return=文件清單