[livejournal] r18951: LJSV-1528: Adult content and hyphenated ...

U   trunk/cgi-bin/Apache/LiveJournal.pm

Modified: trunk/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- trunk/cgi-bin/Apache/LiveJournal.pm	2011-04-22 03:25:48 UTC (rev 18950)
+++ trunk/cgi-bin/Apache/LiveJournal.pm	2011-04-22 03:49:39 UTC (rev 18951)
@@ -512,14 +512,18 @@
         ## check that request URL is canonical (i.e. it starts with $u->journal_base)
         ## if not, construct canonical URL and redirect there 
         ## (redirect cases: old http://community.lj.com/name URL, upper-case URLs, hyphen/underscore in usernames etc)
-        my $current_url = "http://$host/$uri";
-        my $journal_base = $u->journal_base;
-        if (substr($current_url, 0, length($journal_base)) ne $journal_base) {
-            my $new_url = $journal_base;
-            if ($host =~ /^(?:users|community)\./) {
-                $uri =~ s!^/[^/]+/!!;
+        {
+            ## warning: $uri from outer scope has stripped <user> part from http://users.livejournal.com/<user> URLs
+            my $uri  = LJ::Request->uri; 
+            my $current_url = "http://$host$uri";
+            my $journal_base = $u->journal_base;
+            if (substr($current_url, 0, length($journal_base)) ne $journal_base) {
+                my $new_url = $journal_base;
+                if ($host =~ /^(?:users|community)\./) {
+                    $uri =~ s!^/[^/]+/!/!;
+                }
+                return redir("$journal_base$uri$args_wq");
             }
-            return redir("$journal_base$uri$args_wq");
         }
 
         if ($u->is_community) {
@@ -876,7 +880,7 @@
                 return LJ::Request::OK;
             } 
 # end of temporary block            
-            elsif ($uri !~ m!^/(\w{1,15})(/.*)?$!) {
+            elsif ($uri !~ m!^/([\w\-]{1,15})(/.*)?$!) {
                 return LJ::Request::DECLINED if $uri eq "/favicon.ico";
                 my $redir = LJ::run_hook("journal_subdomain_redirect_url",
                                          $host, $uri);