random html cleanup

2026-02-03 06:03:28 +00:00 · 2013-11-08 03:55:38 +08:00
parent 8465a290bb
commit ac1a2d43b3
13 changed files with 66 additions and 41 deletions
--- a/acl/acl_security.pl
+++ b/acl/acl_security.pl
@@ -20,12 +20,14 @@ map { $ucan{$_}++ } split(/\s+/, $o->{'users'});
 foreach $u (&list_users()) {
 	printf "<option %s>%s\n",
 		$ucan{$u->{'name'}} ? 'selected' : '',
-		$u->{'name'};
+		$u->{'name'},
+		"</option>";
 	}
 foreach $g (&list_groups()) {
 	printf "<option %s value=%s>%s\n",
 		$ucan{'_'.$g->{'name'}} ? 'selected' : '',
-		'_'.$g->{'name'}, &text('acl_gr', $g->{'name'});
+		'_'.$g->{'name'}, &text('acl_gr', $g->{'name'}),
+		"</option>";
 	}
 print "</select></td>\n";

@@ -42,7 +44,8 @@ map { $mcan{$_}++ } split(/\s+/, $o->{'mods'});
 foreach $m (&list_module_infos()) {
 	printf "<option value=%s %s>%s\n",
 		$m->{'dir'}, $mcan{$m->{'dir'}} ? 'selected' :'',
-		$m->{'desc'};
+		$m->{'desc'},
+		"</option>";
 	}
 print "</select></td> </tr>\n";

@@ -179,10 +182,12 @@ printf "<input type=radio name=gassign_def value=0 %s> %s<br>\n",
 print "<select name=gassign multiple size=3 width=150>\n";
 map { $gcan{$_}++ } split(/\s+/, $o->{'gassign'});
 printf "<option value=_none %s>&lt;%s&gt;\n",
-	$gcan{'_none'} ? 'selected' : '', $text{'acl_gnone'};
+	$gcan{'_none'} ? 'selected' : '', $text{'acl_gnone'},
+	"</option>";
 foreach $g (&list_groups()) {
 	printf "<option %s>%s\n",
-		$gcan{$g->{'name'}} ? 'selected' : '', $g->{'name'};
+		$gcan{$g->{'name'}} ? 'selected' : '', $g->{'name'},
+		"</option>";
 	}
 print "</select></td> </tr>\n";
 }
--- a/acl/edit_sync.cgi
+++ b/acl/edit_sync.cgi
@@ -27,7 +27,8 @@ print "$text{'sync_group'} <select name=group>\n";
 foreach $g (@glist) {
 	printf "<option %s>%s\n",
 		$g->{'name'} eq $config{'sync_group'} ? "selected" : "",
-		$g->{'name'};
+		$g->{'name'},
+		"</option>";
 	}
 print "</select><p>\n";

--- a/adsl-client/index.cgi
+++ b/adsl-client/index.cgi
@@ -59,11 +59,13 @@ else {
 		next if ($i->{'fullname'} !~ /^eth(\d+)$/);
 		printf "<option value='%s' %s>%s\n",
 			$i->{'name'}, $eth eq $i->{'name'} ? "selected" : "",
-			$i->{'name'};
+			$i->{'name'},
+			"</option>";
 		$found++ if ($eth eq $i->{'name'});
 		}
 	printf "<option value='' %s>%s\n",
-		$found ? "" : "selected", $text{'index_other'};
+		$found ? "" : "selected", $text{'index_other'},
+		"</option>";
 	print "</select>\n";
 	printf "<input name=other size=6 value='%s'></td>\n",
 		$found ? "" : $eth;
@@ -127,7 +129,8 @@ else {
 		foreach $f ('NONE', 'STANDALONE', 'MASQUERADE') {
 			printf "<option value=%s %s>%s\n",
 				$f, lc($f) eq lc($fw) ? "selected" : "",
-				$text{'index_fw_'.lc($f)};
+				$text{'index_fw_'.lc($f)},
+				"</option>";
 			}
 		print "</select></td> </tr>\n";
 		}
--- a/apache/acl_security.pl
+++ b/apache/acl_security.pl
@@ -23,24 +23,29 @@ foreach $v (@virts) {
 	local $vn = $can || $vn[0];
 	printf "<option value=\"%s\" %s>%s\n",
 		$vn, $can ? "selected" : "",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
+		$vn eq "__default__" ? $text{'acl_defserv'} : $vn,
+		"</option>";
 	delete($vcan{$can}) if ($can);
 	}
 foreach $vn (keys %vcan) {
 	next if ($vn eq "*");
 	printf "<option value=\"%s\" %s>%s\n",
 		$vn, "selected",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
+		$vn eq "__default__" ? $text{'acl_defserv'} : $vn,
+		"</option>";
 	}
 print "</select></td>\n";

 print "<td><b>$text{'acl_global'}</b></td> <td><select name=global>\n";
 printf "<option value=1 %s> $text{'yes'}\n",
-	$_[0]->{'global'} == 1 ? "selected" : "";
+	$_[0]->{'global'} == 1 ? "selected" : "",
+	"</option>";
 printf "<option value=2 %s> $text{'acl_htaccess'}\n",
-	$_[0]->{'global'} == 2 ? "selected" : "";
+	$_[0]->{'global'} == 2 ? "selected" : "",
+	"</option>";
 printf "<option value=0 %s> $text{'no'}</select></td> </tr>\n",
-	$_[0]->{'global'} == 0 ? "selected" : "";
+	$_[0]->{'global'} == 0 ? "selected" : "",
+	"</option>";

 print "<tr> <td><b>$text{'acl_create'}</b></td> <td>\n";
 printf "<input type=radio name=create value=1 %s> $text{'yes'}\n",
@@ -102,7 +107,8 @@ map { $types{$_}++ } split(/\s+/, $_[0]->{'types'});
 print "<select name=types size=5 multiple>\n";
 for($i=0; $text{"type_$i"}; $i++) {
 	printf "<option value=\"%d\" %s>%s\n",
-		$i, $types{$i} ? "selected" : "", $text{"type_$i"};
+		$i, $types{$i} ? "selected" : "", $text{"type_$i"},
+		"</option>";
 	}
 print "</select></td> </tr>\n";

--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -976,7 +976,8 @@ $rv = "<select name=\"$_[1]\">\n";
 for($i=3; $i<@_; $i++) {
 	$_[$i] =~ /^([^,]*),(.*)$/;
 	$rv .= sprintf "<option value=\"$2\" %s> $1\n",
-		lc($2) eq lc($_[0]) || !defined($_[0]) && lc($2) eq lc($_[2]) ? "selected" : "";
+		lc($2) eq lc($_[0]) || !defined($_[0]) && lc($2) eq lc($_[2]) ? "selected" : "",
+		"</option>";
 	}
 $rv .= "</select>\n";
 return $rv;
@@ -1004,10 +1005,12 @@ if (&indexof($_[0], @hl) < 0) { push(@hl, $_[0]); }
 $rv = "<select name=$_[1]>\n";
 foreach $h (&unique(@hl)) {
 	$rv .= sprintf "<option value=\"$h\" %s>$h\n",
-		$h eq $_[0] ? "selected" : "";
+		$h eq $_[0] ? "selected" : "",
+		"</option>";
 	}
 $rv .= sprintf "<option value=\"None\" %s>&lt;$text{'core_none'}&gt;\n",
-	$_[0] eq "None" ? "selected" : "";
+	$_[0] eq "None" ? "selected" : "",
+	"</option>";
 $rv .= "</select>\n";
 return $rv;
 }
--- a/apache/index.cgi
+++ b/apache/index.cgi
@@ -306,15 +306,15 @@ if ($config{'max_servers'} && @vname > $config{'max_servers'}) {
 	print "<b>$text{'index_toomany'}</b><p>\n";
 	print "<form action=search_virt.cgi>\n";
 	print "<b>$text{'index_find'}</b> <select name=field>\n";
-	print "<option value=name checked> $text{'index_name'}\n";
-	print "<option value=port> $text{'index_port'}\n";
-	print "<option value=addr> $text{'index_addr'}\n";
-	print "<option value=root> $text{'index_root'}\n";
+	print "<option value=name checked>$text{'index_name'}</option>\n";
+	print "<option value=port>$text{'index_port'}</option>\n";
+	print "<option value=addr>$text{'index_addr'}</option>\n";
+	print "<option value=root>$text{'index_root'}</option>\n";
 	print "</select> <select name=match>\n";
-	print "<option value=0 checked>$text{'index_equals'}\n";
-	print "<option value=1>$text{'index_matches'}\n";
-	print "<option value=2>$text{'index_nequals'}\n";
-	print "<option value=3>$text{'index_nmatches'}\n";
+	print "<option value=0 checked>$text{'index_equals'}</option>\n";
+	print "<option value=1>$text{'index_matches'}</option>\n";
+	print "<option value=2>$text{'index_nequals'}</option>\n";
+	print "<option value=3>$text{'index_nmatches'}</option>\n";
 	print "</select> <input name=what size=15>&nbsp;&nbsp;\n";
 	print "<input type=submit value=\"$text{'find'}\"></form><p>\n";
 	$formno++;
--- a/apache/mod_autoindex.pl
+++ b/apache/mod_autoindex.pl
@@ -25,19 +25,25 @@ $rv .= sprintf "<input type=radio name=IndexOrderDefault_def value=0 %s>\n",
 	$_[0] ? "checked" : "";
 $rv .= "<select name=IndexOrderDefault_asc>\n";
 $rv .= sprintf "<option value=Ascending %s>$text{'mod_autoindex_asc'}\n",
-		$_[0]->{'words'}->[0] eq "Ascending" ? "selected" : "";
+		$_[0]->{'words'}->[0] eq "Ascending" ? "selected" : "",
+		"</option>";
 $rv .= sprintf "<option value=Descending %s>$text{'mod_autoindex_descend'}\n",
-		$_[0]->{'words'}->[0] eq "Descending" ? "selected" : "";
+		$_[0]->{'words'}->[0] eq "Descending" ? "selected" : "",
+		"</option>";
 $rv .= "</select>\n";
 $rv .= "<select name=IndexOrderDefault_what>\n";
 $rv .= sprintf "<option value=Name %s>$text{'mod_autoindex_name'}\n",
-		$_[0]->{'words'}->[1] eq "Name" ? "selected" : "";
+		$_[0]->{'words'}->[1] eq "Name" ? "selected" : "",
+		"</option>";
 $rv .= sprintf "<option value=Date %s>$text{'mod_autoindex_date'}\n",
-		$_[0]->{'words'}->[1] eq "Date" ? "selected" : "";
+		$_[0]->{'words'}->[1] eq "Date" ? "selected" : "",
+		"</option>";
 $rv .= sprintf "<option value=Size %s>$text{'mod_autoindex_size'}\n",
-		$_[0]->{'words'}->[1] eq "Size" ? "selected" : "";
+		$_[0]->{'words'}->[1] eq "Size" ? "selected" : "",
+		"</option>";
 $rv .= sprintf "<option value=Description %s>$text{'mod_autoindex_desc'}\n",
-		$_[0]->{'words'}->[1] eq "Description" ? "selected" : "";
+		$_[0]->{'words'}->[1] eq "Description" ? "selected" : "",
+		"</option>";
 $rv .= "</select>\n";
 return (2, "$text{'mod_autoindex_sort'}", $rv);
 }
--- a/apache/show_dir.cgi
+++ b/apache/show_dir.cgi
@@ -31,7 +31,7 @@ print "<b>$text{'show_edit'}</b>\n";
 print "<select name=type>\n";
 foreach $e (@elist) {
 	print "<option value=",$e->{'edit'}->{'type'},">",
-	      $e->{'name'},"\n";
+	      $e->{'name'},"</option>\n";
 	}
 print "</select> <input type=submit value=\"$text{'show_ok'}\">\n";
 print "</form>\n";
--- a/apache/show_files.cgi
+++ b/apache/show_files.cgi
@@ -31,7 +31,7 @@ print "<b>$text{'show_edit'}</b>\n";
 print "<select name=type>\n";
 foreach $e (@elist) {
 	print "<option value=",$e->{'edit'}->{'type'},">",
-	      $e->{'name'},"\n";
+	      $e->{'name'},"</option>\n";
 	}
 print "</select> <input type=submit value=\"$text{'show_ok'}\">\n";
 print "</form>\n";
--- a/apache/show_htaccess.cgi
+++ b/apache/show_htaccess.cgi
@@ -28,7 +28,8 @@ print "<b>$text{'show_edit'}</b>\n";
 print "<select name=type>\n";
 foreach $e (@elist) {
 	print "<option value=",$e->{'edit'}->{'type'},">",
-	      $e->{'name'},"\n";
+	      $e->{'name'},
+		"</option>\n";
 	}
 print "</select> <input type=submit value=\"$text{'show_ok'}\">\n";
 print "</form>\n";
--- a/apache/show_virt.cgi
+++ b/apache/show_virt.cgi
@@ -28,7 +28,8 @@ print "<b>$text{'show_edit'}</b>\n";
 print "<select name=type>\n";
 foreach $e (@elist) {
 	print "<option value=",$e->{'edit'}->{'type'},">",
-	      $e->{'name'},"\n";
+	      $e->{'name'},
+		"</option>\n";
 	}
 print "</select> <input type=submit value=\"$text{'show_ok'}\">\n";
 print "</form>\n";
--- a/chooser.cgi
+++ b/chooser.cgi
@@ -226,10 +226,9 @@ EOF
 	print &ui_form_start(undef, undef, undef,
 		"onSubmit='filechosen(); return false'");
 	print &ui_table_start(undef, "width=100%", 2);
-	print &ui_table_row(undef,
-		&ui_submit($text{'chooser_ok'})." ".
+	print &ui_table_row(&ui_submit($text{'chooser_ok'}),
 		&ui_textbox("path", $dir.$file, 45, 0, undef,
-			    "style='width:90%'"), 2);
+			    "style='width:100%'"), 1);
 	print &ui_table_end();
 	print &ui_form_end();
 	&popup_footer();
--- a/ui-lib.pl
+++ b/ui-lib.pl
@@ -865,13 +865,13 @@ foreach $o (@$opts) {
 	$o = [ $o ] if (!ref($o));
 	$rv .= "<option value=\"".&quote_escape($o->[0])."\"".
 	       ($sel{$o->[0]} ? " selected" : "")." ".$o->[2].">".
-	       ($o->[1] || $o->[0])."\n";
+	       ($o->[1] || $o->[0])."</option>\n";
 	$opt{$o->[0]}++;
 	}
 foreach $s (keys %sel) {
 	if (!$opt{$s} && $missing) {
 		$rv .= "<option value=\"".&quote_escape($s)."\"".
-		       "selected>".($s eq "" ? "&nbsp;" : $s)."\n";
+		       "selected>".($s eq "" ? "&nbsp;" : $s)."</option>\n";
 		}
 	}
 $rv .= "</select>\n";