[livejournal] r18549: LJSUP-7874 (SMS notification - new featu...

U   trunk/cgi-bin/LJ/Widget/SubscribeInterface.pm
U   trunk/htdocs/manage/profile/index.bml

Modified: trunk/cgi-bin/LJ/Widget/SubscribeInterface.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/SubscribeInterface.pm	2011-03-15 08:28:20 UTC (rev 18548)
+++ trunk/cgi-bin/LJ/Widget/SubscribeInterface.pm	2011-03-15 08:45:00 UTC (rev 18549)
@@ -25,7 +25,7 @@
     my $phone = LJ::SMS::API::RU::Phone->get_phone($u->userid);
     if ($LJ::DISABLED{smsru} or
         ($country ne 'RU'
-        and not ($phone && LJ::SMS::API::RU::Phone->get_cur_phone_statuses($phone) ne 'verified')
+        and not ($phone && LJ::SMS::API::RU::Phone->get_status($u->userid, $phone) ne 'verified')
         )
     ){
         @ntypes = grep { $_ ne 'LJ::NotificationMethod::SMSru' ? 1 : 0 } @ntypes;

Modified: trunk/htdocs/manage/profile/index.bml
===================================================================
--- trunk/htdocs/manage/profile/index.bml	2011-03-15 08:28:20 UTC (rev 18548)
+++ trunk/htdocs/manage/profile/index.bml	2011-03-15 08:45:00 UTC (rev 18549)
@@ -579,8 +579,6 @@
 			$ret .= "<script type='text/javascript'>";
             my $phone = LJ::SMS::API::RU::Phone->normalize($tminfo->{'number'});
             my $status = LJ::SMS::API::RU::Phone->get_status($u->{'userid'}, $phone);
-            my $statuses = LJ::SMS::API::RU::Phone->get_cur_phone_statuses($phone);
-            $status = 'already_use' if grep { $_->[0] eq 'verified' && $_->[1] != $u->{'userid'} } @$statuses;
 			$ret .= "smsNotifyInitialState = \"".$status."\";";
 			$ret .= "var supportedDEF = [" . join(',', keys %{$LJ::SMSRU{provider_by_def}}) . "];";
 			$ret .= "var smsCountry = '$country';";