validator/httpd/cgi-bin check,1.716,1.717

Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv16660/httpd/cgi-bin

Modified Files:
	check 
Log Message:
Drop unecessary have_*badge template variables.

Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.716
retrieving revision 1.717
diff -u -d -r1.716 -r1.717
--- check	24 Oct 2009 15:59:18 -0000	1.716
+++ check	24 Oct 2009 16:50:06 -0000	1.717
@@ -1468,31 +1468,17 @@
 
     if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}) {
       my $cfg = $CFG->{Types}->{$File->{DOCTYPE}};
-      $T->param(have_badge => TRUE);
-      $T->param(badge_uri  => $cfg->{Badge}->{URI});
-      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'Local URI'}) {
-              $T->param(local_badge_uri  => $cfg->{Badge}->{'Local URI'});
-              $T->param(have_local_badge => TRUE);
-      }
-      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'ALT URI'}) {
-      $T->param(badge_alt_uri  => $cfg->{Badge}->{'ALT URI'});
-        if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'Local ALT URI'}) {
-          $T->param(local_alt_badge_uri  => $cfg->{Badge}->{'Local ALT URI'});
-        }
-      $T->param(have_alt_badge => TRUE);
-      }
-
-      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{RDFa}) {
-        $T->param(have_badge_rdfa => TRUE);
-        $T->param(badge_rdfa => $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{RDFa});
-      } else {
-        $T->param(have_badge_rdfa => FALSE);
-      }
-
-      $T->param(badge_alt  => $cfg->{Badge}->{Alt});
-      $T->param(badge_h    => $cfg->{Badge}->{Height});
-      $T->param(badge_w    => $cfg->{Badge}->{Width});
-      $T->param(badge_tagc => ($cfg->{'Parse Mode'} eq 'XML' ? ' /' : ''));
+      $T->param(
+        badge_uri           => $cfg->{Badge}->{URI},
+        local_badge_uri     => $cfg->{Badge}->{'Local URI'},
+        badge_alt_uri       => $cfg->{Badge}->{'Alt URI'},
+        local_alt_badge_uri => $cfg->{Badge}->{'Local ALT URI'},
+        badge_alt           => $cfg->{Badge}->{Alt},
+        badge_rdfa          => $cfg->{Badge}->{RDFa},
+        badge_h             => $cfg->{Badge}->{Height},
+        badge_w             => $cfg->{Badge}->{Width},
+        badge_tagc          => $cfg->{'Parse Mode'} eq 'XML' ? ' /' : '',
+      );
     }
   } elsif (defined $File->{Tentative}) {
     $T->param(is_tentative => TRUE);

Received on Saturday, 24 October 2009 17:02:23 UTC