[livejournal] r21842: LJSUP-11857: Cyr sub domains

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

Modified: trunk/bin/deleteusers.pl
===================================================================
--- trunk/bin/deleteusers.pl	2012-04-28 07:57:52 UTC (rev 21841)
+++ trunk/bin/deleteusers.pl	2012-04-28 08:04:58 UTC (rev 21842)
@@ -147,7 +147,7 @@
     $runsql->($user, "DELETE FROM reluser WHERE targetid=$uid");
     $runsql->($user, "DELETE FROM userlog WHERE userid=$uid");
 
-    $runsql->($user, "UPDATE payitems SET status='refund' WHERE item='domainru' AND rcptid=$uid");
+    $runsql->($user, "UPDATE payitems SET item='domainru_free' WHERE item='domainru' AND rcptid=$uid");
     $runsql->($user, "UPDATE user SET statusvis='X', statusvisdate=NOW(), password='' WHERE userid=$uid");
 
 }

Modified: trunk/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- trunk/cgi-bin/Apache/LiveJournal.pm	2012-04-28 07:57:52 UTC (rev 21841)
+++ trunk/cgi-bin/Apache/LiveJournal.pm	2012-04-28 08:04:58 UTC (rev 21842)
@@ -1210,13 +1210,20 @@
 
         $u = LJ::want_user($u);
 
-        if ($LJ::DOMAIN_JOURNALS_REVERSE{$u->user} || $LJ::DOMAIN_JOURNALS{$u->user}) {
+        if ($LJ::DOMAIN_JOURNALS_REVERSE{$host} || $LJ::DOMAIN_JOURNALS{$u->user}) {
             my $view = $determine_view->($u->user, "other:$host$hostport", $uri);
             return $view if defined $view;
         } else {
-            return redir("http://".$u->user.".".$LJ::USER_DOMAIN);
+            return redir("http://".$u->journal_base);
         }
 
+        if ($host =~ /(?:xn--80adlbbiisqhy9a|xn--f1aa)\.xn--p1ai/) {
+            LJ::Request->pnotes ('error' => 'baddomainru');
+            LJ::Request->pnotes ('journal_username' => $host);
+            LJ::Request->pnotes ('uri' => 'http://www.livejournal.com/shop/domain_ru.bml');
+            return LJ::Request::NOT_FOUND;
+        }
+
         LJ::Request->pnotes ('error' => 'baduser');
         LJ::Request->pnotes ('remote' => LJ::get_remote());
         return LJ::Request::NOT_FOUND;