Merge pull request #646 from swelljoe/edit-cron-form

Fix form/table interleaving

.gitignore

@@ -0,0 +1,22 @@
+# thumbnails
+Thumbs.db
+.xvpics
+
+# python byte-compiled
+*.py[cod]
+
+# temp files
+*~
+*.bak
+test
+*.tmp
+*.site
+core
+
+# build files
+.builds
+.build
+
+# makedist.pl
+tarballs/
+minimal/

README

@@ -1,4 +1,4 @@
-Webmin Version 1.840
+Webmin Version 1.860
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

acl/save_user.cgi

@@ -52,11 +52,11 @@ else {
 
 # Validate username, and check for a clash
 $in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ && $in{'name'} !~ /^\@/ ||
-	&error(&text('save_ename', $in{'name'}));
+	&error(&text('save_ename', &html_escape($in{'name'})));
 $in{'name'} eq 'webmin' && &error($text{'save_enamewebmin'});
 if (!$in{'old'} || $in{'old'} ne $in{'name'}) {
 	my $clash = &get_user($in{'name'});
-	$clash && &error(&text('save_edup', $in{'name'}));
+	$clash && &error(&text('save_edup', &html_escape($in{'name'})));
 	}
 !$access{'logouttime'} || $in{'logouttime_def'} ||
 	$in{'logouttime'} =~ /^\d+$/ || &error($text{'save_elogouttime'});

apache/mod_negotiation.pl

@@ -45,7 +45,7 @@ return (2, "$text{'mod_negotiation_pri'}",
 sub save_LanguagePriority
 {
 local $rv = &parse_opt("LanguagePriority", '\S', $text{'mod_negotiation_epri'});
-if ($rv) {
+if ($rv && @$rv) {
 	$rv->[0] =~ s/^"(.*)"/$1/g;
 	}
 return $rv;

backup-config/backup.cgi

@@ -47,7 +47,7 @@ else {
 		&unlink_file($temp);
 		&error($err);
 		}
-	print "Content-type: application/octet-stream\n\n";
+	print "Content-type: application/x-gzip\n\n";
 	my $buf;
 	open(TEMP, $temp);
 	while(read(TEMP, $buf, 1024)) {