Merge branch 'master' of github.com:webmin/webmin

e8e804ddca (r175609008)

bsdfdisk/edit_part.cgi

@@ -112,7 +112,7 @@ if ($canedit) {
     print ui_buttons_row("delete_part.cgi", $text{'part_delete'}, $text{'part_deletedesc'}, $hiddens);
     print ui_buttons_end();
 } else {
-    print ($is_boot) ? "<b>$text{'part_bootcannotedit'}</b><p>\n"
+    print $is_boot ? "<b>$text{'part_bootcannotedit'}</b><p>\n"
                    : "<b>$text{'part_cannotedit'}</b><p>\n";
 }
 # SMART button (physical device)

uptracker.cgi

@@ -33,7 +33,7 @@ if ($in{'uid'}) {
 	$upfile = "$uinfo[7]/.tmp/upload.$id";
 	}
 else {
-	$upfile = &tempname_dir()."/upload.$id";
+	$upfile = "$ENV{'WEBMIN_VAR'}/uploads/upload.$id";
 	}
 
 # Read the tracker file in a loop until done, or until 1 minute has passed

version

@@ -1 +1 @@
-2.620
+2.621

web-lib-funcs.pl

@@ -415,10 +415,10 @@ push(@can_dirs, $gconfig{'tempdir_sys'}) if ($gconfig{'tempdir_sys'});
 # Common fallbacks
 push(@can_dirs, "/dev/shm", "/tmp", "/var/tmp", "/usr/tmp");
 
-# Remove empty and duplicate entries, which can happen when both configured
-# dirs are set to the same path, or when a configured path matches one of
-# the built-in defaults
-@can_dirs = &unique(grep { $_ } @can_dirs);
+# Remove duplicate entries, which can happen when both configured dirs are set
+# to the same path, or when a configured path matches one of the built-in
+# defaults
+@can_dirs = &unique(@can_dirs);
 
 # Test each candidate in turn
 for my $dir (@can_dirs) {
@@ -1071,10 +1071,10 @@ if ($<) {
 	$vardir = "$uinfo[7]/.tmp";
 	}
 else {
-	$vardir = &tempname_dir();
+	$vardir = "$ENV{'WEBMIN_VAR'}/uploads";
 	}
 if (!-d $vardir) {
-	&make_dir($vardir, 0755);
+	&make_dir($vardir, 0750);
 	}
 
 # Remove any upload.* files more than 1 hour old