diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lib/VNDB/Handler/Misc.pm | 12 | ||||
| -rwxr-xr-x | util/vndb.pl | 6 |
3 files changed, 11 insertions, 9 deletions
@@ -14,6 +14,8 @@ (this *requires* PostgreSQL 9.0 or up!) - Added ON DELETE clause to all foreign keys referencing users (id) - Use word-level (instead of character-level) diff for large fields + - Extended IE6 warning message to show up for IE7 as well + 2.13 - 2010-11-11 - Added 'formcode' parameter to all modification requests to fix all diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm index 1a2df93b..b26868d5 100644 --- a/lib/VNDB/Handler/Misc.pm +++ b/lib/VNDB/Handler/Misc.pm @@ -15,7 +15,7 @@ YAWF::register( qr{d([1-9]\d*)}, \&docpage, qr{setlang}, \&setlang, qr{nospam}, \&nospam, - qr{we-dont-like-ie6}, \&ie6message, + qr{we-dont-like-ie}, \&iemessage, qr{opensearch\.xml}, \&opensearch, # redirects for old URLs @@ -364,12 +364,12 @@ sub nospam { } -sub ie6message { +sub iemessage { my $self = shift; if($self->reqParam('i-still-want-access')) { (my $ref = $self->reqHeader('Referer') || '/') =~ s/^\Q$self->{url}//; - $ref = '/' if $ref eq '/we-dont-like-ie6'; + $ref = '/' if $ref eq '/we-dont-like-ie'; $self->resRedirect($ref, 'temp'); $self->resHeader('Set-Cookie', "ie-sucks=1; path=/; domain=$self->{cookie_domain}"); return; @@ -389,16 +389,16 @@ sub ie6message { div; h1 'Oops, we were too lazy to support your browser!'; p; - lit qq|We decided to stop supporting Internet Explorer 6, as it's a royal pain in | + lit qq|We decided to stop supporting Internet Explorer 6 and 7, as it's a royal pain in | .qq|the ass to make our site look good in a browser that doesn't want to cooperate with us.<br />| .qq|You can try one of the following free alternatives: | .qq|<a href="http://www.mozilla.com/firefox/">Firefox</a>, | .qq|<a href="http://www.opera.com/">Opera</a>, | .qq|<a href="http://www.apple.com/safari/">Safari</a>, or | .qq|<a href="http://www.google.com/chrome">Chrome</a>.<br /><br />| - .qq|If you're really stubborn about using Internet Explorer, upgrading to version 7 will also work.<br /><br />| + .qq|If you're really stubborn about using Internet Explorer, upgrading to version 8 will also work.<br /><br />| .qq|...and if you're mad, you can also choose to ignore this warning and | - .qq|<a href="/we-dont-like-ie6?i-still-want-access=1">open the site anyway</a>.|; + .qq|<a href="/we-dont-like-ie?i-still-want-access=1">open the site anyway</a>.|; end; end; end; diff --git a/util/vndb.pl b/util/vndb.pl index b8988fd5..183cea4d 100755 --- a/util/vndb.pl +++ b/util/vndb.pl @@ -70,11 +70,11 @@ sub reqinit { $self->authInit; # check for IE6 - if($self->reqHeader('User-Agent') && $self->reqHeader('User-Agent') =~ /MSIE 6/ - && !$self->reqCookie('ie-sucks') && $self->reqPath ne 'we-dont-like-ie6') { + if($self->reqHeader('User-Agent') && $self->reqHeader('User-Agent') =~ /MSIE [67]/ + && !$self->reqCookie('ie-sucks') && $self->reqPath ne 'we-dont-like-ie') { # act as if we're opening /we-dont-like-ie6 (ugly hack, until YAWF supports preventing URL handlers from firing) $ENV{HTTP_REFERER} = $ENV{REQUEST_URI}; - $ENV{REQUEST_URI} = '/we-dont-like-ie6'; + $ENV{REQUEST_URI} = '/we-dont-like-ie'; } # load some stats (used for about all pageviews, anyway) |