Faq-O-Matic Faq-O-Matic : Administrators' Guide : Suggestions :
Patch to make 2.709 HTML-4-clean
diff -aur ./usr/lib/perl5/FAQ/OMatic/Appearance.pm /usr/lib/perl5/FAQ/OMatic/Appearance.pm
--- ./usr/lib/perl5/FAQ/OMatic/Appearance.pm Fri Jul 30 04:49:48 1999
+++ /usr/lib/perl5/FAQ/OMatic/Appearance.pm Mon Apr 17 22:31:49 2000
@@ -429,7 +429,7 @@
my $itemFile = $item->{'filename'};
my $itemName = $item->getTitle();
$rt.="\n<!--Item: $itemName file: $itemFile--><tr>\n"
- ."<td bgcolor=$FAQ::OMatic::Config::itemBarColor "
+ ."<td bgcolor=\"$FAQ::OMatic::Config::itemBarColor\" "
."valign=top align=center rowspan=$tablerows width=$sw>\n"
."$spacer\n</td>\n";
my $first = 1;
@@ -500,7 +500,7 @@
my $hashref = shift;
my $color = $hashref->{'color'} || '';
my $size = $hashref->{'size'} || '';
- $color = "bgcolor=$color" if ($color);
+ $color = "bgcolor=\"$color\"" if ($color);
my $text = $hashref->{'text'} || '';
if ($size eq 'edit') {
# The editing buttons are smaller so that they'll not look as much like
@@ -565,7 +565,7 @@
# the width tag, which helps keep the item-tall bar skinny
# in Internet Exploder. (Nothing seems to help in Netscape.)
$rt.="\n<!--Item: $itemName file: $itemFile--><tr>\n"
- ."<td bgcolor=$FAQ::OMatic::Config::itemBarColor "
+ ."<td bgcolor=\"$FAQ::OMatic::Config::itemBarColor\" "
."valign=top align=center rowspan=$tablerows width=$sw>\n"
."$spacer\n</td>\n";
my $first = 1;
diff -aur ./usr/lib/perl5/FAQ/OMatic/ImageRef.pm /usr/lib/perl5/FAQ/OMatic/ImageRef.pm
--- ./usr/lib/perl5/FAQ/OMatic/ImageRef.pm Thu Jul 29 07:36:55 1999
+++ /usr/lib/perl5/FAQ/OMatic/ImageRef.pm Mon Apr 17 22:36:11 2000
@@ -147,7 +147,7 @@
my $alt = FAQ::OMatic::Bags::getBagProperty($bagName, 'Alt', $name);
if (wantarray) {
- return ("<img src=\"$url\" alt=$alt $imgargs$swt$sht>", $sw, $sh);
+ return ("<img src=\"$url\" alt=\"$alt\" $imgargs$swt$sht>", $sw, $sh);
} else {
return "<img src=\"$url\" alt=\"$alt \" $imgargs$swt$sht>";
}
diff -aur ./usr/lib/perl5/FAQ/OMatic/Item.pm /usr/lib/perl5/FAQ/OMatic/Item.pm
--- ./usr/lib/perl5/FAQ/OMatic/Item.pm Fri Jul 30 04:46:26 1999
+++ /usr/lib/perl5/FAQ/OMatic/Item.pm Mon Apr 17 22:56:27 2000
@@ -849,7 +849,7 @@
} else {
$titlebox.="<font size=\"+1\"><b>$thisTitle</b></font>";
}
- $titlebox.="</a>"; # close <a name=...
+ #$titlebox.="</a>"; # close <a name=...
}
push @rowboxes, { 'type'=>'wide', 'text'=>$titlebox,
'id'=>'title' };
@@ -1154,6 +1154,7 @@
$rt.="<!-- Sibling links -->\n";
$rt.= $self->displaySiblings($params);
$rt.="</table>\n" if $useTable;
+ $rt =~ s[<table><!-- Sibling links -->\n</table>\n][<!-- Sibling links -->\n];
$rt.="<p>\n" if not $useTable;
}
diff -aur ./usr/lib/perl5/FAQ/OMatic/install.pm /usr/lib/perl5/FAQ/OMatic/install.pm
--- ./usr/lib/perl5/FAQ/OMatic/install.pm Fri Jul 30 05:44:14 1999
+++ /usr/lib/perl5/FAQ/OMatic/install.pm Mon Apr 17 22:52:17 2000
@@ -383,14 +383,14 @@
$rt.="$par<li>"
.checkBoxFor('rebuildCache')
."<a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret&tasks=rebuildCache\">"
+ ."&secret=$maintenanceSecret&tasks=rebuildCache\">"
.gettext("Rebuild the cache and dependency files.")
."</a>\n";
$rt.="$par<li>"
.checkBoxFor('systemBags')
."<a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret&tasks=bagAllImages\">"
+ ."&secret=$maintenanceSecret&tasks=bagAllImages\">"
.gettext("Install system images and icons.")
."</a>\n";
} else {
@@ -398,7 +398,7 @@
$rt.="$par<li>"
.checkBoxFor('nothing')
."<a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret&tasks=mirrorClient\">"
+ ."&secret=$maintenanceSecret&tasks=mirrorClient\">"
.gettext("Update mirror from master now. (this can be slow!)")
."</a>\n";
}
@@ -409,7 +409,7 @@
."</a>\n";
if ($maintenanceSecret) {
$rt.="$par<li><a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret\">"
+ ."&secret=$maintenanceSecret\">"
.checkBoxFor('manualMaintenance')
.gettext("Run maintenance script manually now")
.".</a>\n";
@@ -486,7 +486,7 @@
$rt.="$par<li>"
.checkBoxFor('nothing')
."<a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret&tasks=expireBags\">"
+ ."&secret=$maintenanceSecret&tasks=expireBags\">"
.gettext("Check for unreferenced bags (not linked by any FAQ item).")
."</a>\n";
# rebuildCache shows up again at the end, because it doesn't show
@@ -494,7 +494,7 @@
$rt.="$par<li>"
.checkBoxFor('nothing')
."<a href=\"".installUrl('', 'url', 'maintenance')
- ."&secret=$maintenanceSecret&tasks=rebuildCache\">"
+ ."&secret=$maintenanceSecret&tasks=rebuildCache\">"
.gettext("Rebuild the cache and dependency files.")
."</a>\n";
@@ -1222,7 +1222,7 @@
my $host = cgi()->virtual_host();
my $port = cgi()->server_port();
my $path = cgi()->script_name();
- my $req = $path."?cmd=maintenance&secret=$secret";
+ my $req = $path."?cmd=maintenance&secret=$secret";
# Figure out a suitable -I include path in case we're picking up FAQ-O-Matic
# modules relative to . (current working dir)
@@ -1389,23 +1389,23 @@
$rt.=gettext("Use the")." <u>$button</u> ".gettext("links to change the color of a feature.\n");
# an outer table provides the background (page) color
- $rt.="<table bgcolor=$FAQ::OMatic::Config::backgroundColor width=\"100%\">\n";
+ $rt.="<table bgcolor=\"$FAQ::OMatic::Config::backgroundColor\" width=\"100%\">\n";
$rt.="<tr><td>\n";
$rt.="<table width=\"100%\">\n";
- $rt.="<tr><td rowspan=5 bgcolor=".$FAQ::OMatic::Config::itemBarColor
- ." width=20 valign=bottom>\n";
+ $rt.="<tr><td rowspan=5 bgcolor=\"".$FAQ::OMatic::Config::itemBarColor
+ ."\" width=20 valign=bottom>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$itemBarColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$itemBarColor\">"
."$button</a>\n";
$rt.="</td>\n";
- $rt.="<td bgcolor=$FAQ::OMatic::Config::backgroundColor>\n";
+ $rt.="<td bgcolor=\"$FAQ::OMatic::Config::backgroundColor\">\n";
$rt.="<b><font color=$FAQ::OMatic::Config::textColor>".gettext("An Item Title")."</font></b>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::regularPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::regularPartColor\">\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$regularPartColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$regularPartColor\">"
."$button</a><p>\n";
$rt.="<font color=$FAQ::OMatic::Config::textColor>"
.gettext("A regular part is how most of your content will appear. The text colors should be most pleasantly readable on this backgr
ound.")
@@ -1416,9 +1416,9 @@
.gettext("A search hit")."</b></font>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::directoryPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::directoryPartColor\">\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$directoryPartColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$directoryPartColor\">"
."$button</a><p>\n";
$rt.="<font color=$FAQ::OMatic::Config::textColor>"
.gettext("A directory part should stand out")."</font>\n";
@@ -1428,34 +1428,34 @@
.gettext("A search hit")."</b></font>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::regularPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::regularPartColor\">\n";
$rt.=" <p>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::regularPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::regularPartColor\">\n";
$rt.=" <p>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td colspan=2 bgcolor=$FAQ::OMatic::Config::backgroundColor>\n";
+ $rt.="<tr><td colspan=2 bgcolor=\"$FAQ::OMatic::Config::backgroundColor\">\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$backgroundColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$backgroundColor\">"
."$button</a>\n";
#$rt.="<font color=$FAQ::OMatic::Config::textColor>Page background color</font>";
$rt.="<p>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$textColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$textColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::textColor>".gettext("Regular text color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$linkColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$linkColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::linkColor>".gettext("Link color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$vlinkColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$vlinkColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::vlinkColor>".gettext("Visited link color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$directoryPartColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$directoryPartColor\">"
."$button</a><p>\n";
$rt.="<font color=$FAQ::OMatic::Config::textColor>"
.gettext("A directory part should stand out")."</font>\n";
@@ -1428,34 +1428,34 @@
.gettext("A search hit")."</b></font>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::regularPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::regularPartColor\">\n";
$rt.=" <p>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td bgcolor=$FAQ::OMatic::Config::regularPartColor>\n";
+ $rt.="<tr><td bgcolor=\"$FAQ::OMatic::Config::regularPartColor\">\n";
$rt.=" <p>\n";
$rt.="</td></tr>\n";
- $rt.="<tr><td colspan=2 bgcolor=$FAQ::OMatic::Config::backgroundColor>\n";
+ $rt.="<tr><td colspan=2 bgcolor=\"$FAQ::OMatic::Config::backgroundColor\">\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$backgroundColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$backgroundColor\">"
."$button</a>\n";
#$rt.="<font color=$FAQ::OMatic::Config::textColor>Page background color</font>";
$rt.="<p>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$textColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$textColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::textColor>".gettext("Regular text color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$linkColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$linkColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::linkColor>".gettext("Link color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$vlinkColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$vlinkColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::vlinkColor>".gettext("Visited link color")."</font><br>\n";
$rt.="<a href=\""
- .installUrl('askColor', 'url')."&whichColor=\$highlightColor\">"
+ .installUrl('askColor', 'url')."&whichColor=\$highlightColor\">"
."$button</a>\n";
$rt.="<font color=$FAQ::OMatic::Config::highlightColor><b>"
.gettext("A search hit")."</b></font>\n";
@@ -1473,7 +1473,7 @@
$rt.=gettext("Select a color for")." $which:<p>\n";
$rt.="<a href=\""
.installUrl('setColor', 'url')
- ."&whichColor=$which&color=\"><img src=\""
+ ."&whichColor=$which&color=\"><img src=\""
.installUrl('', 'url', 'img', 'picker')
."\" border=1 ismap width=256 height=128></a>\n";
@@ -1569,7 +1569,7 @@
$temppass = cgi()->param('temppass') || '';
}
- my $imarg = ($name) ? ("&name=$name") : '';
+ my $imarg = ($name) ? ("&name=$name") : '';
if ($FAQ::OMatic::Config::secureInstall) {
# What a hack. When coming from an invocation of install.pm,
@@ -1597,8 +1597,8 @@
}
return $rt;
} else {
- my $tpa = ($temppass ne '') ? "&temppass=$temppass" : '';
- return "$url?cmd=${cmd}${tpa}&step=${step}${imarg}";
+ my $tpa = ($temppass ne '') ? "&temppass=$temppass" : '';
+ return "$url?cmd=${cmd}${tpa}&step=${step}${imarg}";
}
}
diff -aur ./usr/lib/perl5/FAQ/OMatic/submitPass.pm /usr/lib/perl5/FAQ/OMatic/submitPass.pm
--- ./usr/lib/perl5/FAQ/OMatic/submitPass.pm Thu Jul 29 07:37:05 1999
+++ /usr/lib/perl5/FAQ/OMatic/submitPass.pm Mon Apr 17 22:50:51 2000
@@ -164,7 +164,7 @@
# generate a cookie. We know it's you by your secret, but
# we don't have your (uncrypted) password to let you go through the
# normal password check. So we'll just create a cookie right now.
- my $newauth = "&auth=".FAQ::OMatic::Auth::newCookie($idf);
+ my $newauth = "&auth=".FAQ::OMatic::Auth::newCookie($idf);
FAQ::OMatic::redirect($cgi, $saveurl.$newauth);
}
}
diff -aur ./usr/lib/perl5/FAQ/OMatic.pm /usr/lib/perl5/FAQ/OMatic.pm
--- ./usr/lib/perl5/FAQ/OMatic.pm Fri Jul 30 08:20:21 1999
+++ /usr/lib/perl5/FAQ/OMatic.pm Mon Apr 17 22:50:34 2000
@@ -858,7 +858,7 @@
# value into the config file. Ouch!
} else {
# regular GET, not <form> GET. URL-style key=val&key=val
- $rt.="&".CGI::escape($i)."=".CGI::escape($newParams{$i});
+ $rt.="&".CGI::escape($i)."=".CGI::escape($newParams{$i});
}
}
if (($refType eq 'POST') or ($refType eq 'GET')) {
number of answers contained in category behind category name