Committer: akanashin
LJSUP-12170: ?\208?\182?\208?\182.?\209?\128?\209?\13U trunk/cgi-bin/Apache/LiveJournal.pm
Modified: trunk/cgi-bin/Apache/LiveJournal.pm =================================================================== --- trunk/cgi-bin/Apache/LiveJournal.pm 2012-06-01 09:15:53 UTC (rev 22148) +++ trunk/cgi-bin/Apache/LiveJournal.pm 2012-06-01 13:06:10 UTC (rev 22149) @@ -1211,14 +1211,14 @@ } unless ($u) { - if ($ru_lj_user) { - if (!$LJ::DOMAIN_JOURNALS_RU_MAINPAGE{$ru_lj_user}) { + if ($host =~ /(.*?)\.?(?:xn--80adlbihqogw6a|xn--f1aa)\.xn--p1ai/) { + if (!$1 || $LJ::DOMAIN_JOURNALS_RU_MAINPAGE{$1}) { + return redir($LJ::SITEROOT); + } else { LJ::Request->pnotes ('error' => 'baddomainru'); LJ::Request->pnotes ('domainname' => $host); LJ::Request->pnotes ('uri_domain_shop' => "$LJ::SITEROOT/shop/domain_ru.bml"); return LJ::Request::NOT_FOUND; - } else { - return redir($LJ::SITEROOT); } } else { LJ::Request->pnotes ('error' => 'baduser');