LiveJournal ChangeLog

[ljcom] r7463: LJSUP-4590: The Independent banner is sh...

Fri, 17 Jul 2009 15:00:25 GMT

Committer: gariev

LJSUP-4590: The Independent banner is shown to Perm accounts

U   trunk/htdocs/index.bml

Modified: trunk/htdocs/index.bml
===================================================================
--- trunk/htdocs/index.bml	2009-07-17 10:06:57 UTC (rev 7462)
+++ trunk/htdocs/index.bml	2009-07-17 10:11:52 UTC (rev 7463)
@@ -32,7 +32,7 @@
             ## viewer is from UK
             ($country eq 'UK' || $country eq 'GB') && 
             ## and viewer is either anonymous, or plus (non-paid/perm/sponsored and non-basic) account
-            !$remote || $remote->in_class('force_ads') || !$remote->get_cap('paid') && $remote->in_class('plus')
+            (!$remote || $remote->in_class('force_ads') || !$remote->get_cap('paid') && $remote->in_class('plus'))
         ) ? 
         LJ::Widget::ExtBlock->render(id=>'homepage.uk') : '';

[ljcom] r7462: LJSUP-4590: The Independent banner is sh...

Fri, 17 Jul 2009 14:55:30 GMT

Committer: gariev

LJSUP-4590: The Independent banner is shown to Perm accounts

U   trunk/htdocs/index.bml

Modified: trunk/htdocs/index.bml
===================================================================
--- trunk/htdocs/index.bml	2009-07-17 10:01:23 UTC (rev 7461)
+++ trunk/htdocs/index.bml	2009-07-17 10:06:57 UTC (rev 7462)
@@ -27,9 +27,13 @@
     my $ret = "";
 
     my $country = LJ::GeoLocation->get_country_info_by_ip;
-    my $uk_block = (!$remote ||
-        ($remote && ($remote->in_class('plus') || $remote->in_class('force_ads'))
-         && ($country eq 'UK' || $country eq 'GB') )) ?
+    my $uk_block = 
+        (    
+            ## viewer is from UK
+            ($country eq 'UK' || $country eq 'GB') && 
+            ## and viewer is either anonymous, or plus (non-paid/perm/sponsored and non-basic) account
+            !$remote || $remote->in_class('force_ads') || !$remote->get_cap('paid') && $remote->in_class('plus')
+        ) ? 
         LJ::Widget::ExtBlock->render(id=>'homepage.uk') : '';
  
     ### Logged-in Homepage ###

[ljcom] r7461: LJSUP-4203: Userpic Add-on - LJSUP-4457:...

Fri, 17 Jul 2009 14:49:57 GMT

Committer: ssafronova

LJSUP-4203: Userpic Add-on - LJSUP-4457: move bulk code to class structure - preliminary, incomplete version

U   branches/shop/bin/maint/pay.pl
U   branches/shop/cgi-bin/LJ/Hooks/Caps.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Addon.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Clothes.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Coppa.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Coupon.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Interval.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/PaidAccount/
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/PaidAccount/Permanent.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/PaidAccount.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/RecBillAble.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Rename.pm
A   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/VGift.pm
U   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem.pm
U   branches/shop/cgi-bin/LJ/Pay/Payment.pm
U   branches/shop/cgi-bin/LJ/Pay/ShopVGift.pm
U   branches/shop/cgi-bin/paylib.pl
A   branches/shop/cgi-bin/paylib_cart.pl
A   branches/shop/cgi-bin/paylib_cc.pl
A   branches/shop/cgi-bin/paylib_paypal.pl
A   branches/shop/cgi-bin/paylib_sms.pl
U   branches/shop/htdocs/admin/accounts/acctedit.bml
U   branches/shop/htdocs/manage/account/index.bml
U   branches/shop/htdocs/manage/account/modify.bml
U   branches/shop/htdocs/pay/modify.bml

Modified: branches/shop/bin/maint/pay.pl
===================================================================
--- branches/shop/bin/maint/pay.pl	2009-07-17 03:49:11 UTC (rev 7460)
+++ branches/shop/bin/maint/pay.pl	2009-07-17 10:01:23 UTC (rev 7461)
@@ -337,7 +337,7 @@
 
         # if permanent account, ignore this legacy (non-cart) payment
         my $u = LJ::load_userid($userid);
-        next if $u->{'caps'} & (1 << $LJ::Pay::capinf{'perm'}->{'bit'});
+        next if $u->in_class('perm');
 
         # if there is an error adding paid months, remove from used list
         # so we'll try again later
@@ -415,466 +415,8 @@
             next;
         }
 
-        next if $pi->{'giveafter'} > $now; # delayed payment
-
         my $pp = $get_payment->($pi->{'payid'});
-        my $bu = LJ::load_userid($pp->{'userid'}); # buying user, no force needed
-
-        my $email = $pi->{'rcptemail'};
-        my $ru;  # rcpt user
-        if ($pi->{'rcptid'}) {
-            $ru = LJ::load_userid($pi->{'rcptid'}, "force");
-            warn "Unable to load userid $pi->{rcptid} for payid $pi->{payid}" unless $ru;
-            $email = $ru->email_raw;
-        }
-
-        # does $ru have a perm account?  this affects things from time to time
-        my $has_perm = $ru && $ru->{'caps'} & (1 << $LJ::Pay::capinf{'perm'}->{'bit'});
-
-        # optional gift header
-        my $msg;
-        if ($bu && $bu->{'userid'} != $pi->{'rcptid'}) {
-            if ($pi->{'anon'}) {
-                $msg .= "(the following is an anonymous gift)\n\n"
-            } else {
-                $msg .= "(the following is a gift from $LJ::SITENAMESHORT user \"$bu->{'user'}\")\n\n";
-            }
-        }
-
-        my ($token, $tokenid);
-        my $close = sub {
-            $dbh->do("UPDATE payitems SET status='done', token=?, tokenid=? ".
-                     "WHERE piid=? AND status='pend'", undef, $token,
-                     $tokenid, $pi->{'piid'});
-        };
-
-        # paid/perm accounts
-        if ($pi->{'item'} eq "paidacct" || $pi->{'item'} eq "perm") {
-            my $isacct = $pi->{'item'} eq "paidacct";
-
-            # send 'em a token
-            if ($pi->{'rcptid'} == 0 || $has_perm) { # rcpt is an email address, or perm acct
-                $token = LJ::acct_code_generate($bu ? $bu->{userid} : 0);
-                my ($acid, $auth) = LJ::acct_code_decode($token);
-                $dbh->do("INSERT INTO acctpayitem (piid, acid) VALUES (?,?)",
-                         undef, $pi->{'piid'}, $acid);
-
-                $tokenid = $acid;
-
-                my $what;
-                if ($isacct) {
-                    $what = "$pi->{'qty'} month(s) of paid account time";
-                } else {
-                    $what = "a permanent account";
-                }
-
-                $msg .= "The following code will give $what to any $LJ::SITENAMESHORT account:\n\n";
-                $msg .= "   $token\n\n";
-                $msg .= "To apply it to an existing account, visit:\n\n";
-                $msg .= "   $LJ::SITEROOT/paidaccounts/apply.bml?code=$token\n\n";
-
-                LJ::send_mail({
-                    'to' => $email,
-                    'from' => $LJ::ACCOUNTS_EMAIL,
-                    'fromname' => $LJ::SITENAMESHORT,
-                    'wrap' => 1,
-                    'charset' => 'utf-8',
-                    'subject' => $isacct ? "Paid account" : "Permanent account",
-                    'body' => $msg,
-                });
-
-                # nothing to do here for loyalty userpics since we have rcptid==0
-                # and therefore no $ru
-
-                $close->();
-                # don't need to release lock, no rcptid
-                next;
-            }
-
-            # just set it up now, and tell them it's done.
-            # no need to release lock since no $ru anyway
-            next unless $ru;
-
-            my $mo;
-            $mo = $pi->{'qty'} if $isacct;
-            $mo = 99 if $pi->{'item'} eq "perm";
-            my $bonus_ref = [];
-
-            # modifying paid account status, need to get a lock on the account,
-            # try again later if we fail to get a lock
-            next unless LJ::Pay::get_lock($ru);
-
-            my $res = LJ::Pay::add_paid_months($ru, $mo, $bonus_ref);
-
-            # finished modifying account, can unconditionally release lock and finish payitem now
-            LJ::Pay::release_lock($ru);
-
-            # some sort of error occurred, log to payvars and try again later
-            unless ($res) {
-                LJ::Pay::payvar_append($pp, "error",
-                                       "[" . LJ::mysql_time() . "] unable to apply: item=$pi->{'item'}, qty=$pi->{'qty'}.");
-                next;
-            }
-
-            # account changes were successful: close transaction, only need to send email now
-            $close->();
-
-            # note that this user's bill changed
-            $note_rec_change->($ru, $pp) if $ru;
-
-            # harvest this payitem for loyalty userpics
-            LJ::Pay::LoyaltyUserpic->harvest_payitem($pi) if $ru;
-
-            # finish composing email to send to user
-            my $bonus_added;
-            if (@$bonus_ref) {
-                $bonus_added = "Additionally, the following previously deactivated bonus features\n" .
-                               "have been reactivated so you can use the time remaining on them:\n\n" .
-                               join("\n", map { "   - " . LJ::Pay::product_name($_->{'item'}, $_->{'size'}, undef, "short") .
-                                                ": $_->{'daysleft'} days applied" }
-                                    sort { $a->{'item'} cmp $b->{'item'} } @$bonus_ref) .
-                               "\n\n";
-            }
-
-            if ($isacct) {
-                $msg .= "$mo months of paid account time have been added to your $LJ::SITENAMESHORT ";
-                $msg .= "account \"$ru->{'user'}\".\n\n";
-            } else {
-                $msg .= "Your $LJ::SITENAMESHORT account \"$ru->{'user'}\" has been upgraded to a ";
-                $msg .= "permanent account.\n\n";
-
-                if (! LJ::conf_test($LJ::DISABLED{dec2008_permsale})) {
-                    my $area;
-                    my $charity = 0.00;
-                    if (LJ::SUP->is_sup_enabled($bu)) {
-                        $area = "SUP";
-                        $charity = $LJ::PERM_SALE_CHARITY_AMT
-                            if LJ::conf_test($LJ::PERM_SALE_CHARITY_SUP);
-                    } else {
-                        $charity = $LJ::PERM_SALE_CHARITY_AMT
-                            if LJ::conf_test($LJ::PERM_SALE_CHARITY_NONSUP);
-                    }
-                    # insert into the perm_sale table
-                    my $dbh = LJ::get_db_writer() or die "Could not get db writer";
-                    $dbh->do("INSERT INTO perm_sale(payid, journalid, area, name, price, charity, extra) VALUES (?, ?, ?, ?, ?, ?, ?)", undef, $pi->{payid}, $bu->{'userid'}, $area, 'dec2008', $pi->{'amt'}, $charity, undef);
-
-                    $msg .= "LiveJournal will donate \$$charity from this purchase to charity.\n\n"
-                        if $charity > 0;
-                }
-            }
-
-            if ($ru) {
-                $msg .= "Take advantage of some of your paid account features:\n\n";
-                $msg .= LJ::Pay::usage_summary_text($ru);
-            }
-
-            $msg .= $bonus_added;
-
-            $msg .= "Thank you for supporting the site!\n\n";
-            $msg .= "--\n$LJ::SITENAME Team\n$LJ::SITEROOT";
-
-            # send notification email
-            my $subject = $isacct ? "$LJ::SITENAMEABBREV Paid Account Extension"
-                                  : "$LJ::SITENAMEABBREV Permanent Account Upgrade";
-
-            LJ::send_mail({
-                'to' => $email,
-                'from' => $LJ::ACCOUNTS_EMAIL,
-                'fromname' => $LJ::SITENAMESHORT,
-                'wrap' => 1,
-                'charset' => 'utf-8',
-                'subject' => $subject,
-                'body' => $msg,
-            });
-
-            next;
-        }
-
-        # rename tokens
-        elsif ($pi->{'item'} eq "rename") {
-            next unless ($token, $tokenid) = LJ::Pay::new_rename_token($dbh, $pp->{'payid'});
-
-            # send email notification
-            LJ::send_mail({
-                'to' => $email,
-                'from' => $LJ::ACCOUNTS_EMAIL,
-                'fromname' => $LJ::SITENAMESHORT,
-                'wrap' => 1,
-                'charset' => 'utf-8',
-                'subject' => "You've Received a Rename Token",
-                'body' => "${msg}$LJ::SITENAMESHORT username rename token:\n\n".
-                    "   $token\n\n".
-                    "You can use it here:\n\n".
-                    "   $LJ::SITEROOT/rename/use.bml?token=$token\n\n".
-                    "For more information regarding account renames, read:\n\n".
-                    "   $LJ::SITEROOT/rename/\n\n".
-                    "Thank you for supporting the site!\n\n".
-                    "--\n$LJ::SITENAMESHORT Team\n$LJ::SITEROOT"
-                });
-
-            $close->();
-            next;
-        }
-
-        # clothing items
-        elsif ($pi->{'item'} eq "clothes") {
-            $dbh->do("INSERT IGNORE INTO shipping (payid, status, dateready) VALUES (?, 'needs', NOW())",
-                     undef, $pp->{'payid'}) and $close->();
-            next;
-        }
-
-        # coupons
-        elsif ($pi->{'item'} eq "coupon") {
-
-            # subitem used to be type-dollaramount, but that was redundant
-            my $type = (split('-', $pi->{'subitem'}))[0];
-
-            # If amt < 0, this item is a previously purchased coupon being applied
-            # to this cart.  So we shouldn't generate a new tokenid for it, especially
-            # since it will have rcptid=0, so we wouldn't know where to mail it anyway.
-            if ($type =~  /^dollaroff(int|tan)?$/ && $pi->{'amt'} > 0) {
-
-                ($tokenid, $token) =
-                    LJ::Pay::new_coupon($type, $pi->{'amt'}, $pi->{'rcptid'}, $pp->{'payid'});
-
-                # if there was an error, try again later
-                next unless $tokenid;
-
-                LJ::Pay::send_coupon_email($email, $token, $pi->{'amt'}, $1);
-
-            # close, but preserve token info
-            } else {
-                ($token, $tokenid) = ($pi->{'token'}, $pi->{'tokenid'});
-            }
-            $close->();
-            next;
-        }
-
-        # vgifts
-        elsif (LJ::Pay::is_vgift($pi)) {
-
-            # we'll see if there is already a giftid, which means
-            # that a vgift has already been generated for this
-            # payitem but the status wasn't marked as 'done'
-            # via $close->(), presumably because of an error checking
-            # or applying vgift bonus paid time
-            my $exist_giftid = $pi->get_prop('vgift_giftid');
-
-            unless ($exist_giftid) {
-                my $note  = $pi->get_prop('vgift_note');
-                my $vg = LJ::Pay::ShopVGift->new($pi->{subitem});
-
-                ##
-                ## vgift_10 has id 249
-                ## User can buy no more than 5 free such vgifts
-                ## We store the number of purchased vgifts in user property 'vgifts_restrict'
-                ## format is "vgift_id:number_of_vgifts,vgift_id2:number_of_vgifts2"
-                ##
-                if ($pi->{subitem} eq 'vgift_10' && $pi->{amt} == 0.00) {
-                    my $vgift = LJ::Pay::ShopVGift->new(name => 'vgift_10');
-                    my $vgifts_restrict = $bu ? $bu->prop('vgifts_restrict') : '';
-                    my %vgifts_restrict = map {split ':', $_} split ',', $vgifts_restrict;
-                    $vgifts_restrict{ $vgift->id }++;
-                    $bu->set_prop('vgifts_restrict', join(",", map {"$_:$vgifts_restrict{$_}"} keys %vgifts_restrict));
-                }
-                
-                my $vgift = LJ::VGift->create
-                    ( to   => $ru,
-                      from => $bu,
-                      type => $pi->{subitem},
-                      note => $note,
-                      anon => $pi->{anon},
-                      expires => $vg->expire_time,
-                      );
-
-                # if there was an error we'll start mentioning it every time
-                # we try to process this payitem so it will be noticed but
-                # not stop payment processing altogether
-                unless ($vgift) {
-                    print STDERR "unable to create VGift for piid: $pi->{piid}\n";
-                    next;
-                }
-
-                # save the giftid we created for revokes later
-                $pi->set_prop('vgift_giftid' => $vgift->{giftid});
-
-                my $extra = "";
-                my $html_extra = "";
-                if ($vgift->is_charity) {
-                    $extra = LJ::Lang::ml('esn.vgift.extra_charity.text', { siteroot => $LJ::SITEROOT, });
-                    $html_extra = LJ::Lang::ml('esn.vgift.extra_charity.html', { siteroot => $LJ::SITEROOT, });
-                }
-
-                my $promo = "";
-                my $html_promo = "";
-                if (LJ::Pay::ShopVGiftSponsored->show_promo({viewer => $ru})) {
-                    my $sponsor = $LJ::SPONSORED_VGIFTS{'free'}{'name'};
-                    my $link = $LJ::SPONSORED_VGIFTS{'free'}{'tracking_link_email'};
-                    my $vars = {
-                            siteroot => $LJ::SITEROOT,
-                            sponsor  => $sponsor,
-                            link     => $link,
-                        };
-                    $promo = LJ::Lang::ml('esn.vgift.promo.text',      $vars);
-                    $html_promo = LJ::Lang::ml('esn.vgift.promo.html', $vars);
-                }
-
-                my $vars = {
-                    siteroot        => $LJ::SITEROOT,
-                    sitenameshort   => $LJ::SITENAMESHORT,
-                    user            => $ru->{user},
-                    sender          => ((! $bu || $pi->{anon}) ? LJ::Lang::ml('esn.vgift.anon_sender') : $bu->{user}),
-                    note            => ($note ? LJ::Lang::ml('esn.vgift.note', { note => $note }) : ""),
-                    extra           => $extra,
-                    profile         => $ru->profile_url,
-                    promo           => $promo,
-                };
-
-                my $body = LJ::Lang::ml('esn.vgift.body.text', $vars);
-
-                my $html_body = undef;
-                unless ($ru->{opt_htmlemail} eq 'N') {
-                    $vars->{extra} = $html_extra;
-                    $vars->{promo} = $html_promo;
-                    $vars->{note}  = $note ? LJ::Lang::ml('esn.vgift.note', { note => $note }) : '';
-                    $vars->{user}  = LJ::load_user($ru->{user})->ljuser_display;
-                    $vars->{sender} = LJ::load_user($bu->{user})->ljuser_display if ($bu && !$pi->{anon});
-
-                    $html_body = LJ::Lang::ml('esn.vgift.body.html', $vars);
-                }
-
-                # send email notification
-                LJ::send_mail({
-                    to       => $email,
-                    from     => $LJ::ACCOUNTS_EMAIL,
-                    fromname => $LJ::SITENAMESHORT,
-                    wrap     => 1,
-                    charset  => 'utf-8',
-                    subject  => LJ::Lang::ml('esn.vgift.to_you.subject', { sitenameshort => $LJ::SITENAMESHORT}),
-                    body     => $body,
-                    html     => $html_body,
-                });
-            }
-
-            # now if the user has passed a certain threshold of
-            # vgifts received, then they will receive a bonus!
-            LJ::VGift->check_gifts_for_paid_bonus
-                ( $ru, sub {
-                    my %args = @_;
-                    # u=$ru, sum=$amt
-
-                    my $sum = sprintf("\$%.02f", $args{sum});
-
-                    my $pmt = LJ::Pay::Payment->new
-                        (
-                         anum      => int(rand()*65535), # unused for recbill payments
-                         userid    => $ru->{userid},
-                         datesent  => undef,             # use NOW()
-                         daterecv  => undef,             # use NOW()
-                         amount    => 0.00,
-                         used      => 'N',               # 'C' until payment has gone through
-                         mailed    => 'N',               # 'C' until payment has gone through
-                         method    => 'free',
-                         forwhat   => 'cart',
-                         ) or return undef;
-
-                    my $it = $pmt->add_item
-                        (
-                         item      => 'paidacct',
-                         subitem   => undef,         # no subitem for paidacct
-                         qty       => 2,             # 2 months free
-                         rcptid    => $ru->{userid}, # virtual gift recipient
-                         amt       => 0.00,
-                         status    => 'cart',        # not finished processing
-                         ) or return undef;
-
-                    # add a payvar to preserve history
-                    $pmt->payvar_add('vgift_bonus',
-                                     "2 month paidacct bonus for $sum received vgifts");
-
-                    # and statushistory never hurts...
-                    my $sys_u = LJ::load_user("system");
-                    LJ::statushistory_add($ru, $sys_u, "vgift_bonus",
-                                          "generated 2 month paidacct bonus payment " .
-                                          "[payid=$pmt->{payid}]");
-                }) unless $has_perm;
-
-            # vgift has been applied and bonus given, we can close this payitem
-            $close->();
-
-            next;
-        }
-
-        # bonus features
-        elsif (LJ::Pay::is_bonus($pi)) {
-
-            # if a bonus item of this type failed to apply, don't try to apply any more
-            next if exists $bonus_failure{"$pi->{'payid'}-$pi->{'item'}-$pi->{'subitem'}"};
-
-            # get a lock since we're about to modify their account,
-            # try again later if we can't get a lock
-            next unless LJ::Pay::get_lock($ru);
-
-            # apply the bonus item to the recipient user's account
-            my $res = LJ::Pay::apply_bonus_item($ru, $pi);
-
-            # release lock and close regardless of results of operation
-            LJ::Pay::release_lock($ru);
-
-            # if an error, log to payvars (call above also logged to statushistory) and skip the email
-            unless ($res) {
-                LJ::Pay::payvar_append($pp, "error",
-                                       "[" . LJ::mysql_time() . "] unable to apply: item=$pi->{'item'},  size=" .
-                                       (split("-", $pi->{'subitem'}))[0] . ", qty=$pi->{'qty'}. invalid cart?");
-
-                # if there was a failure, all bonus items of this type were marked
-                # as failed, so we shouldn't try to process any more of them
-                $bonus_failure{"$pi->{'payid'}-$pi->{'item'}-$pi->{'subitem'}"}++;
-
-                next;
-            }
-
-            # at this point time is applied, just need to send mail.  so close.
-            $close->();
-
-            # note that this user's bill changed
-            $note_rec_change->($ru, $pp) if $ru;
-
-            # send notification email to user
-            my $name = LJ::Pay::product_name($pi);
-
-            $msg .= "Your $LJ::SITENAMESHORT account for user \"$ru->{'user'}\" has been ";
-            $msg .= "credited with the following add-on:\n\n";
-
-            $msg .= "   - $name\n\n";
-
-            $msg .= "Your account has been updated so you can use your new feature immediately.\n\n";
-
-            if ($ru) {
-                $msg .= "Take advantage of some of your paid account features:\n\n";
-                $msg .= LJ::Pay::usage_summary_text($ru);
-            }
-
-            $msg .= "Thank you for supporting the site,\n";
-            $msg .= "$LJ::SITENAMESHORT Team\n";
-
-            LJ::send_mail({
-                'to' => $email,
-                'from' => $LJ::ACCOUNTS_EMAIL,
-                'fromname' => $LJ::SITENAMESHORT,
-                'wrap' => 1,
-                'charset' => 'utf-8',
-                'subject' => $name,
-                'body' => $msg,
-            });
-
-            next;
-
-        # just close -- shipping, coppa, etc
-        } else {
-            $close->();
-            next;
-        }
+        $pi->pay_updateaccounts($pp, $now, $note_rec_change);
     }
 
     # respect biller_disable flag

Modified: branches/shop/cgi-bin/LJ/Hooks/Caps.pm
===================================================================
--- branches/shop/cgi-bin/LJ/Hooks/Caps.pm	2009-07-17 03:49:11 UTC (rev 7460)
+++ branches/shop/cgi-bin/LJ/Hooks/Caps.pm	2009-07-17 10:01:23 UTC (rev 7461)
@@ -25,8 +25,7 @@
 LJ::register_hook("get_cap_bit", sub {
     my $name = shift;
     return undef unless $name;
-
-    return $LJ::Pay::capinf{$name}->{'bit'};
+    return LJ::class_bit($name);
 });
 
 # Register hooks for turning on/off certain cap bits
@@ -106,13 +105,6 @@
     return $size || undef;
 });
 
-LJ::register_hook("check_cap_perm", sub {
-    my $u = shift;
-    return undef unless $u;
-
-    return $u->{'caps'} & (1 << $LJ::Pay::capinf{'perm'}->{'bit'}) ? 1 : 0;
-});
-
 LJ::register_hook("check_cap_userpics", sub {
     my $u = shift;
     return undef unless $u;

Added: branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Addon.pm
===================================================================
--- branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Addon.pm	                        (rev 0)
+++ branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/Addon.pm	2009-07-17 10:01:23 UTC (rev 7461)
@@ -0,0 +1,1009 @@
+package LJ::Pay::Payment::PayItem::Addon;
+
+use base LJ::Pay::Payment::PayItem::RecBillAble;
+
+# bonus features are of 2 types:
+# - "bool" are either on or off (userpics), 'cap' key is required
+# - "sized" have a magnitude associated with them (how much disk quota)
+%bonus = (
+           # userpics are a 'bool' item
+           'userpic' => {
+               'name' => 'pay.product.extrauserpics',
+               'type' => 'bool',
+               'cap' => 9, # cap bit to activate for user
+               'items' => {
+                   # quantities
+                   # * undef amount means recurring only
+                   1  => { 'name' => '1 month',   'amount' => undef, 'amount_rec' =>  1, },
+                   2  => { 'name' => '2 months',  'amount' => 2,     'amount_rec' =>  2, },
+                   6  => { 'name' => '6 months',  'amount' => 6,     'amount_rec' =>  6, },
+                   12 => { 'name' => '12 months', 'amount' => 10,    'amount_rec' => 10, }
+               }
+           },
+
+           # disk quota is a 'sized' item
+           'diskquota' => {
+               'name' => 'pay.product.extrastorage',
+               'type' => 'sized',
+               'cap' => undef, # optional
+               'apply_hook' => \&LJ::Pay::Payment::PayItem::Addon::diskquota_apply_hook,
+               'items' => {
+                   # 1024*10 = 10240 = 10GB
+                   10240 => {
+                       'name' => '10 GB',
+                       'qty' => {
+                           1  => { 'name' => '1 months',  'amount' => undef, 'amount_rec' =>  3, },
+                           2  => { 'name' => '2 months',  'amount' => 5,     'amount_rec' =>  5, },
+                           6  => { 'name' => '6 months',  'amount' => 14,    'amount_rec' => 14, },
+                           12 => { 'name' => '12 months', 'amount' => 24,    'amount_rec' => 24, },
+                       }
+                   },
+
+               }
+           }
+          );
+
+# now allow a mechanism for individual bonus items to be disabled
+foreach my $itemname (keys %bonus) {
+    next unless $LJ::DISABLED{"bonus-$itemname"};
+
+    delete $bonus{$itemname};
+}
+
+sub diskquota_apply_hook
+{
+    my ($u, $item) = @_;
+
+    # RIP old business model: this is where used to enqueue a
+    # white-labeled-parent-site ping to update what a user's quota
+    # should be.  for instance: deadjournal pinging LJ where LJ was
+    # hosting all of DJ's photo hosting under DJ's style.  DJ ran this
+    # on their beta site for a bit, but we never went into business
+    # with it.  (around time of SixApart acquistion, and 6a wasn't
+    # interested in FotoBilder code/services).  now this code is
+    # removed because we're killing cmdbuffer usage now that all
+    # cmdbuffer is moving to using our new job queue system.
+}
+
+sub get_bonus_exp {
+    my ($u, @items) = @_;
+    return undef unless @items && ! grep { ! LJ::Pay::is_bonus($_) } @items;
+    my $userid = LJ::want_userid($u);
+    return undef unless $userid;
+
+    my $dbh = LJ::get_db_writer()
+        or return undef;
+
+    my $bind = join(',', map { "?" } @items);
+    my $sth = $dbh->prepare
+        ("SELECT item, UNIX_TIMESTAMP(expdate) FROM paidexp WHERE userid=? AND item IN ($bind)");
+    $sth->execute($userid, @items);
+
+    my %ret = ();
+    while (my ($it, $exp) = $sth->fetchrow_array) {
+        $ret{$it} = $exp;
+    }
+
+    return \%ret;
+}
+
+# get dimensions of current sized bonus block
+sub get_bonus_dim {
+    my ($u, $itemname) = @_;
+    my $userid = LJ::want_userid($u);
+    return undef unless $userid;
+
+    my $dbh = LJ::get_db_writer();
+    my ($exptime, $size) = $dbh->selectrow_array("SELECT UNIX_TIMESTAMP(expdate), size " .
+                                                 "FROM paidexp WHERE userid=? AND item=?",
+                                                 undef, $userid, $itemname);
+    return wantarray ? ($exptime || 0, $size || 0) : $exptime;
+}
+
+# given a cart can we add a given item?
+sub can_apply_sized_bonus {
+    my ($u, $cartobj, $item, $size, $qty, $opts) = @_;
+    $u = LJ::want_user($u);
+
+    my $userid = $u->{userid};
+
+    # easy/obvious checks
+    return undef unless $userid && item_is_bonus($item, 'sized');
+
+    # if the caller doesn't specify a qty they are trying to add, just
+    # validate items already in the cart
+    $qty ||= 0;
+
+    # is there immediately applying paid time in the cart?
+    my $cart_paid_immed = undef;
+
+    # now go through the current cart and see what they have already
+    if ($cartobj) {
+
+        # will be used for checks later on "dimension signature"
+        my ($prev_exp, $prev_size) = get_bonus_dim($userid, $item);
+
+        foreach my $it (@{$cartobj->{'items'}}) {
+            next unless $it->{'rcptid'} == $userid;
+
+            # collect information on when paid account starts in this cart
+            $cart_paid_immed = 1
+                if $it->{'item'} eq 'paidacct' && ! $it->{'giveafter'};
+
+            next unless $it->{'item'} eq $item;
+
+            # can't have a giveafter date on sized items
+            return undef if $it->{'giveafter'};
+
+            # subitem field contains a few useful bits of info
+            my ($itsize, $curr_exp, $curr_size) = split("-", $it->{'subitem'});
+
+            # if no size specified, then just verify that all sizes in the cart are equal
+            $size ||= $itsize;
+
+            # can buy multiple items, but only of the same size
+            return undef if $itsize != $size;
+
+            # when applying sized bonus, we have to make sure that no other sized bonus features have been
+            # applied since this one was added to the cart, so check the previous "dimension signature"
+            # to decide if this item can be legally applied
+            return undef unless $prev_exp == $curr_exp && $prev_size == $curr_size;
+
+            # this is an extension to something already in the cart
+            $qty += $it->{'qty'};
+
+            # can't have more than 12 months in cart
+            return undef if $qty > 12;
+        }
+    }
+
+    # now time to run some checks on the database
+    my $dbh = LJ::get_db_writer();
+
+    # if no paid account in cart starting immediately, check in the database
+    # to see if there is currently paid time there
+    unless ($cart_paid_immed) {
+
+        # sometimes users have the paid cap with no paiduser row in the database, eg when
+        # they have a permanent account ... assume if they have a perm account then
+        # they are paid forever
+        unless ($dbh->selectrow_array("SELECT COUNT(*) FROM paiduser WHERE userid=? AND paiduntil>NOW()", undef, $userid)) {
+
+            # if the query above failed, check to see if they have the paid cap
+            return undef unless $u && $u->in_class('perm');
+        }
+    }
+
+    # now let's see what's in the database, with regards to this bonus item
+    my $row = $dbh->selectrow_hashref("SELECT *, " .
+                                      "(NOW() + INTERVAL ? MONTH <= expdate) AS 'is_short', " .
+                                      "(IF(size=?, expdate, NOW()) + INTERVAL ? MONTH > NOW() + INTERVAL 12 MONTH) AS 'is_long' " .
+                                      "FROM paidexp WHERE userid=? AND item=?", undef, $qty, $size, $qty, $userid, $item);
+
+    # if nothing in database, the checks we've already done are sufficient
+    return 1 unless $row;
+
+    # now we know there was a $row in the db
+
+    # if we are checking for the addition of a recurring item, there is no need to do
+    # short/long checks.  allow a flag to disable them.
+    unless ($opts->{recurring}) {
+        # can't apply if they already have stored, therefore presumably no paid account?
+        return undef if $row->{'daysleft'};
+
+        # can't apply if expiration date won't extend past that of their current time
+        # unless the size is the same as their current size
+        return undef if $row->{'is_short'} && $row->{'size'} != $size;
+
+        # can't apply more than one year in the future
+        return undef if $row->{'is_long'};
+    }
+
+    # can't downgrade to a lower size
+    return undef if $size < $row->{'size'};
+
+    return 1;
+}
+
+sub can_apply_bool_bonus {
+    my ($u, $cartobj, $item) = @_;
+    my $userid = LJ::want_userid($u);
+
+    # easy/obvious checks
+    return undef unless $userid && item_is_bonus($item, 'bool');
+
+    # when does paid time in the cart begin?
+    my $cart_paid_start = undef;
+    my $cart_bonus_start = undef;
+
+    if ($cartobj) {
+
+        # check the cart to see if we can immediately exonerate this bonus feature
+        # without even looking in the database.
+        foreach my $it (@{$cartobj->{'items'}}) {
+            next unless $it->{'rcptid'} == $userid;
+
+            # can't buy bool bonus features for permanent accounts
+            return undef if $it->{'item'} eq 'perm';
+
+            # calculate starting time of first applying amount of paid time in the cart
+            if ($it->{'item'} eq 'paidacct') {
+
+                if ($it->{'giveafter'}) {
+                    $cart_paid_start = $it->{'giveafter'} if ! defined $cart_paid_start || $it->{'giveafter'} < $cart_paid_start;
+                    next;
+                }
+
+                # no giveafter time, applies immediately
+                $cart_paid_start = 0;
+                next;
+            }
+
+            # calculate starting time of this bonus item
+            if ($it->{'item'} eq $item) {
+
+                if ($it->{'giveafter'}) {
+                    $cart_bonus_start = $it->{'giveafter'} if ! defined $cart_bonus_start || $it->{'giveafter'} < $cart_bonus_start;
+                    next;
+                }
+
+                # no giveafter time, applies immediately
+                $cart_bonus_start = 0;
+                next;
+            }
+        }
+
+        # immediately applying paid account == we're in the clear
+        # - note that undef == 0 returns true since undef gets converted to numeric
+        #   context (0) before the comparison is done, blah perl
+        return 1 if defined $cart_paid_start && $cart_paid_start == 0;
+        return 1 if defined $cart_bonus_start && defined $cart_paid_start &&
+                    $cart_bonus_start >= $cart_paid_start;
+    }
+
+    # is the specified userid a permanent account?  if so there's a problem
+    $u = LJ::load_userid($userid, "force");
+    return undef if !$u || $u->in_class('perm');
+
+    # can be applied if they have a currently unexpired paid account
+    my $dbh = LJ::get_db_writer();
+    my $paiduntil = $dbh->selectrow_array("SELECT UNIX_TIMESTAMP(paiduntil) FROM paiduser WHERE userid=? AND paiduntil>NOW()",
+                                          undef, $userid);
+
+    # at this point we know that paid time in the cart doesn't immediately
+    # exonerate the bonus feature, because we would have returned already
+    return undef if !$paiduntil || $paiduntil < $cart_bonus_start;
+
+    # everything checked out
+    return 1;
+}
+
+# upgrade or extend the length of a bonus item
+# qty - 0..98: number of months to add
+#       99:    permanent account (historically)
+#       100+:  exact unixtime when item should expire
+sub apply_bonus_item {
+    my ($u, $item, $subitem, $qty, $payid) = @_;
+
+    # allow u/payitem objects passed optionally
+    my $userid = LJ::want_userid($u);
+    if (ref $item) {
+        $subitem = $item->{'subitem'};
+        $qty = $item->{'qty'};
+        $payid = $item->{'payid'};
+        $item = $item->{'item'};
+    }
+
+    # if $qty is > 100, then we assume it is a unixtime of when
+    # their bonus item should expire
+    my $now = time();
+    return undef if $qty >= 100 && $qty < $now;
+
+    my ($months, $exact_time);
+    $months     = $qty if $qty < 100;
+    $exact_time = $qty if $qty >= $now;
+
+    # userid and item are required regardless of bonus feature type
+    return undef unless $userid && $item;
+
+    my $dbh = LJ::get_db_writer()
+        or return undef;
+
+    # does an existing paidexp row exist?
+    my $exp = $dbh->selectrow_hashref("SELECT userid, item, size, expdate, daysleft, " .
+                                      "UNIX_TIMESTAMP(expdate) AS 'exptime', " .
+                                      "(expdate > NOW()) AS 'unexpired' " .
+                                      "FROM paidexp WHERE userid=? AND item=?",
+                                      undef, $userid, $item);
+
+    # if no row in database, fill in $exp with good values
+    $exp ||= {
+        'userid' => $userid,
+        'item' => $item,
+        'size' => 0,
+        'expdate' => undef,
+        'daysleft' => 0,
+        'exptime' => 0,
+        'unexpired' => 0,
+    };
+
+    my $new_size = $exp->{'size'};
+
+    # activate cap if necessary
+    if (my $cap = $LJ::Pay::bonus{$item}->{'cap'}) {
+        $u = LJ::modify_caps($userid, [$cap], [])
+            or return undef;
+    }
+
+    # actions for 'sized' bonus feature type
+    # -- need to check that account is still in size/exp state it was in
+    #    when this item was purchased so people can't be comp'd more than
+    #    once for existing paid time on upgrades
+
+    my $sized_upgrade = 0;
+
+    if (LJ::Pay::is_bonus($item, 'sized')) {
+        return undef unless $subitem;
+
+        # make sure exp/size signature in subitem still matches
+        my ($it_size, $old_exptime, $old_size) = split("-", $subitem);
+
+        # only do extra checks if old_exptime and old_size were provided for our pleasure
+        if (defined $old_exptime && defined $old_size) {
+
+            # if a payid is passed, then first check to make sure that no other payitems
+            # in this cart have been applied, altering the exp/size signature and making
+            # this check return false-positives
+
+            unless ($payid &&
+                    $dbh->selectrow_array("SELECT COUNT(*) FROM payitems " .
+                                          "WHERE payid=? AND item=? AND subitem=? AND status='done'",
+                                          undef, $payid, $item, $subitem))
+            {
+
+                # zero-fill
+                $old_exptime ||= 0;
+                $old_size ||= 0;
+
+                # check for exptime/size mismatch, now that we know it's necessary
+                unless ($old_exptime == $exp->{'exptime'} && $old_size == $exp->{'size'}) {
+
+                    # all bonus items of this type have the same size and exptime/oldsize signature
+                    # by the rules applied to them when they entered the cart.
+                    #
+                    # so if one item fails, we go ahead and mark them all as having failed.
+                    # the caller (pay.pl) will have to be smart enough to know to not try to process
+                    # subsequent items of the failed bonus type
+
+                    LJ::statushistory_add($userid, undef, 'pay_modify',
+                                          "ERROR: cannot apply bonus feature: $item, " .
+                                          "${old_exptime}x${old_size} != $exp->{'exptime'}x$exp->{'size'}");
+
+                      $dbh->do("UPDATE payitems SET status='done' WHERE payid=? AND item=? AND subitem=?",
+                               undef, $payid, $item, $subitem);
+
+                      return undef;
+                  }
+            }
+
+            # means that we are upgrading a sized bonus item, so the time added should start
+            # from now, not the current expdate
+            $sized_upgrade = 1 unless $old_size == $it_size;
+
+        # no old_exptime or old_size passed -- recbill case, etc
+        } else {
+
+            # it is a sized upgrade if the amount currently applied account (new_size, from $exp)
+            # is not equal to the size being passed from the caller (it_size)
+            $sized_upgrade = 1 unless $new_size == $it_size;
+        }
+
+        # could either be upgrade or extension, but either way we adopt the item's size
+        $new_size = $it_size;
+    }
+
+    # insert a new row, or add time to old one
+    # - this code somewhat duplicates functionality from LJ::Pay::activate_frozen_bonus
+    #   but we need to extend the expdate by $months months anyway, so we'll just do the
+    #   daysleft activation here as well, avoiding some queries
+    {
+        # expdate calculation is tricky
+        # [(expdate || NOW()) + INTERVAL $months MONTH] + INTERVAL $daysleft DAY
+
+        # expiration extends off current expdate if there's a currently unexpired item of
+        # the same size.  otherwise it's an upgrade and starts from NOW()
+        my $expdate;
+
+        # month interval was specified
+        if ($months) {
+            $expdate = $exp->{'unexpired'} && ! $sized_upgrade
+                ? $dbh->quote($exp->{'expdate'}) : "NOW()";
+
+            my $qqty = $dbh->quote($months || 0);
+            $expdate = "($expdate + INTERVAL $qqty MONTH)";
+
+        # exact unix timestamp of expiration was specified
+        } elsif ($exact_time) {
+            $expdate = "FROM_UNIXTIME($exact_time)";
+
+        # shouldn't get here
+        } else {
+            return undef;
+        }
+
+        if ($exp->{'daysleft'}) {
+            my $qdaysleft = $dbh->quote($exp->{'daysleft'});
+            $expdate = "($expdate + INTERVAL $qdaysleft DAY)";
+        }
+
+        # update / insert paidexp row
+        $dbh->do("REPLACE INTO paidexp (userid, item, size, expdate, daysleft) " .
+                 "VALUES (?, ?, ?, $expdate, 0)", undef, $userid, $item, $new_size);
+        return undef if $dbh->err;
+    }
+
+    # call any application hooks for this bonus feature
+    my $apply_hook = $LJ::Pay::bonus{$item}->{'apply_hook'};
+    if ($apply_hook && ref $apply_hook eq 'CODE') {
+        # apply_hook needs a real $u object
+        $u = ref $u ? $u : LJ::load_userid($u);
+        $apply_hook->($u, $item);
+    }
+
+    # log this bonus feature activation
+    {
+        my $msg = "adding bonus feature: item=$item; ";
+        if (LJ::Pay::is_bonus($item, 'sized')) {
+            $msg .= "size=$exp->{'size'}";
+            $msg .= "=>$new_size" if $exp->{'size'} != $new_size;
+            $msg .= "; ";
+        }
+        $msg .= "old_expdate=$exp->{'expdate'}; ";
+        $msg .= "applying $months months" if $months;
+        $msg .= "extending to " . LJ::mysql_time($exact_time) if $exact_time;
+        $msg .= ", $exp->{'daysleft'} existing days";
+
+        LJ::statushistory_add($userid, undef, 'pay_modify', $msg);
+    }
+
+    return 1;
+}
+
+sub expire_bonus {
+    my ($u, $item, $force) = @_;
+
+    # allow u/payitem objects passed optionally
+    my $userid = LJ::want_userid($u);
+    $item = $item->{'item'} if ref $item;
+    return undef unless $userid;
+
+    my $dbh = LJ::get_db_writer();
+    my $sql = "SELECT item FROM paidexp WHERE userid=?";
+
+    # we can either operate on one given item or all items for a user
+    $sql .= (" AND item=" . $dbh->quote($item)) if $item;
+
+    # hard-validate constraints on the paidexp table in here
+    # - this is probably done by the caller too, but outside of a lock
+
+    unless ($force) {
+        $sql .= "AND (daysleft=0 OR daysleft IS NULL) ";
+        $sql .= "AND expdate < NOW() AND expdate > '0000-00-00'";
+    }
+
+    my $sth = $dbh->prepare($sql);
+    $sth->execute($userid);
+
+    my @activated = ();
+    while (my ($item) = $sth->fetchrow_array) {
+        next unless LJ::Pay::is_bonus($item);
+
+        # remove cap if there's one associated with this bonus item
+        if (my $cap = $LJ::Pay::bonus{$item}->{'cap'}) {
+            LJ::modify_caps($userid, [], [$cap])
+                or return undef;
+        }
+
+        # remove paidexp row
+        $dbh->do("DELETE FROM paidexp WHERE userid=? AND item=?", undef, $userid, $item);
+
+        # log this bonus feature expiration
+        LJ::statushistory_add($u, undef, 'pay_modify', "expiring bonus feature: $item");
+    }
+
+    return 1;
+}
+
+sub transfer_bonus {
+    my ($from, $to, $item) = @_;
+
+    # add on any frozen time to the current expiration date
+    activate_frozen_bonus($from, $item);
+
+    my $from_exp = get_bonus_dim($from, $item);
+    my $to_exp = get_bonus_dim($to, $item) || time();
+
+    my $add_secs = $from_exp - time();
+    return 0 unless $add_secs > 0;
+
+    my $new_exp = $to_exp + $add_secs;
+
+    apply_bonus_item($to, $item, '', $new_exp);
+    expire_bonus($from, $item, "force");
+
+    return $add_secs;
+}
+
+# activates frozen bonus features
+# - returns array of hashrefs: { item => { itemname, size, days_activated }
+sub activate_frozen_bonus {
+    my ($u, $item) = @_; # item is optional
+
+    # allow u/payitem objects passed optionally
+    my $userid = LJ::want_userid($u);
+    $item = $item->{'item'} if ref $item;
+    return undef unless $userid;
+
+    my $dbh = LJ::get_db_writer();
+
+    # we can either operate on one given item or all items for a user
+    my $itemand = $item ? (" AND item=" . $dbh->quote($item)) : '';
+
+    # see if there is existing time
+    my $sth = $dbh->prepare("SELECT item, size, expdate, daysleft, (expdate > NOW()) AS 'unexpired' " .
+                            "FROM paidexp WHERE daysleft>0 AND userid=?$itemand");
+    $sth->execute($userid);
+    my @activated = ();
+    while (my ($item, $size, $expdate, $daysleft, $unexpired) = $sth->fetchrow_array) {
+        next unless LJ::Pay::is_bonus($item);
+
+        # it would generally suffice to set expdate to NOW() + INTERVAL daysleft DAY, but to be more
+        # robust we want to handle the case where there are daysleft in the db, but the item isn't
+        # expired yet
+        my $base = $unexpired ? $dbh->quote($expdate) : "NOW()";
+
+        # update database if we found some (need select above to fetch daysleft)
+        $dbh->do("UPDATE paidexp SET expdate=($base + INTERVAL ? DAY), daysleft=0 " .
+                 "WHERE userid=? AND item=?", undef, $daysleft, $userid, $item);
+        return undef if $dbh->err;
+
+        # reactivate caps if necessary
+        if (my $cap = $LJ::Pay::bonus{$item}->{'cap'}) {
+            LJ::modify_caps($userid, [$cap], [])
+                or return undef;
+        }
+
+        # log this bonus feature activation
+        LJ::statushistory_add($userid, undef, 'pay_modify',
+                              "adding bonus feature: item=$item; old_expdate=$expdate; " .
+                              "applying $daysleft existing days");
+
+        push @activated, { 'item' => $item, 'size' => $size, 'daysleft' => $daysleft };
+    }
+
+    return @activated;
+}
+
+# deactivates frozen bonus features
+# - returns array of hashrefs: { item, size, daysleft frozen }
+sub freeze_bonus {
+    my ($u, $item) = @_; # item is optional
+
+    # allow u/payitem objects passed optionally
+    my $userid = LJ::want_userid($u);
+    $item = $item->{'item'} if ref $item;
+    return undef unless $userid;
+
+    my $dbh = LJ::get_db_writer();
+
+    # we can either operate on one given item or all items for a user
+    my $itemand = $item ? (" AND item=" . $dbh->quote($item)) : "";
+
+    # see if there is existing time
+    my $sth = $dbh->prepare("SELECT item, size, (TO_DAYS(expdate)-TO_DAYS(NOW())+daysleft) AS 'new_daysleft' " .
+                            "FROM paidexp WHERE expdate>NOW() AND userid=?$itemand");
+    $sth->execute($userid);
+    my @deactivated = ();
+    while (my ($item, $size, $new_daysleft) = $sth->fetchrow_array) {
+
+        # this shouldn't ever get triggered
+        next unless LJ::Pay::is_bonus($item);
+
+        # remove cap (if necessary) and run applicable hooks
+        if (my $cap = $LJ::Pay::bonus{$item}->{'cap'}) {
+            LJ::modify_caps($userid, [], [$cap])
+                or return 0;
+        }
+
+        # set expdate to now and save current time in daysleft
+        # - to be robust, handle the case where there are currently daysleft but the expdate>NOW(),
+        #   even though it technically shouldn't happen.
+        if ($new_daysleft) {
+            $dbh->do("UPDATE paidexp SET daysleft=?, expdate=NOW() " .
+                     "WHERE userid=? AND item=?", undef, $new_daysleft, $userid, $item);
+
+        # if daysleft ended up being 0 above, delete the row
+        } else {
+            $dbh->do("DELETE FROM paidexp WHERE userid=? AND item=? AND (daysleft=0 OR daysleft IS NULL)",
+                     undef, $userid, $item);
+        }
+
+        # log this bonus feature expiration
+        LJ::statushistory_add($u, undef, 'pay_modify',
+                              "deactivating bonus feature due to paid account expiration: item=$item; ".
+                              "saving $new_daysleft extra days");
+
+        # return a list of deactivated rows
+        push @deactivated, { 'item' => $item, 'size' => $size, 'daysleft' => $new_daysleft };
+    }
+
+    return @deactivated;
+}
+
+sub get_bool_bonus_price {
+    my ($item, $qty, $is_rec) = @_;
+
+    # allow passing of an $it hash
+    if (ref $item) {
+        $qty = $item->{'qty'};
+        $item = $item->{'item'};
+    }
+
+    return undef unless
+        is_valid_bool_bonus($item, $qty, $is_rec);
+
+    return $LJ::Pay::Payment::PayItem::Addon::bonus{$item}->{items}->{$qty}->{$is_rec ? 'amount_rec' : 'amount'};
+}
+
+sub is_valid_bool_bonus {
+    my ($item, $qty, $is_rec) = @_;
+
+    # allow passing of an $it hash
+    if (ref $item) {
+        $qty  = $item->{qty};
+        $item = $item->{item};
+    }
+
+    my $itrec = $LJ::Pay::Payment::PayItem::Addon::bonus{$item};
+    return 0 unless ref $itrec;
+    return 0 unless $itrec->{type} eq 'bool';
+    return 0 unless ref $itrec->{items}->{$qty};
+    return 0 unless defined $itrec->{items}->{$qty}->{$is_rec ? 'amount_rec' : 'amount'};
+    return 1;
+}
+
+sub is_valid_sized_bonus {
+    my ($item, $size, $qty, $is_rec) = @_;
+
+    # allow passing of an $it hash
+    if (ref $item) {
+        $qty  = $item->{qty};
+        $item = $item->{item};
+        $size = $item->{size};
+    }
+
+    my $itrec = $LJ::Pay::Payment::PayItem::Addon::bonus{$item};
+    return 0 unless ref $itrec; # should be hash
+    return 0 unless $itrec->{type} eq 'sized';
+    return 0 unless ref $itrec->{items}->{$size};
+    return 0 unless ref $itrec->{items}->{$size}->{qty}->{$qty};
+    return 0 unless defined $itrec->{items}->{$size}->{qty}->{$qty}->{$is_rec ? 'amount_rec' : 'amount'};
+    return 1;
+}
+
+sub get_sized_bonus_price {
+    my ($u, $cartobj, $item, $size, $qty, $is_rec) = @_;
+
+    my $userid = LJ::want_userid($u);
+
+    # allow passing of an $it hash
+    if (ref $item) {
+        # get size from subitem
+        $size = (split("-", $item->{'subitem'}))[0];
+        $qty = $item->{'qty'};
+        $item = $item->{'item'};
+    }
+
+    # easy/obvious checks
+    return undef unless $userid && $size > 0 &&
+        is_valid_sized_bonus($item, $size, $qty, $is_rec);
+
+    # total price of this item with no comp
+    my $total_price = $LJ::Pay::Payment::PayItem::Addon::bonus{$item}->{'items'}->{$size}->{'qty'}->{$qty}->{'amount'};
+
+    # no negative prices allowed
+    $total_price = 0 if $total_price < 0;
+
+    # if there is already an item of this size in the cart, it already received a comp, so don't do it again
+    return $total_price
+        if grep { $_->{'rcptid'} == $userid && $_->{'item'} eq $item &&
+                  (split("-", $_->{'subitem'}))[0] == $size } @{$cartobj->{'items'}};
+
+    my $dbh = LJ::get_db_writer();
+    my $row = $dbh->selectrow_hashref("SELECT TO_DAYS(expdate)-TO_DAYS(NOW()) AS 'curr_days', " .
+                                      "TO_DAYS(NOW() + INTERVAL ? MONTH)-TO_DAYS(NOW()) AS 'new_days', " .
+                                      "size AS 'curr_size' FROM paidexp WHERE userid=? AND item=?",
+                                      undef, $qty, $userid, $item);
+    $row->{'new_size'} = $size;
+    $row->{'curr_days'} = 0 if $row->{'curr_days'} < 0;
+
+    # if current size is what they're trying to buy or there are no current days, there is no comp'ing to be done
+    return $total_price if $row->{'curr_size'} == $row->{'new_size'} || $row->{'curr_days'} == 0;
+
+    # find areas of new/existing rectangles to be bought
+    my $old_area = $row->{'curr_size'} * $row->{'curr_days'};
+    my $new_area = $row->{'new_size'} * $row->{'new_days'};
+    my $rate = $old_area / ($new_area || 1);
+
+    # calculate comp'd price to subtract from the total
+    my $comp_amt = $total_price * $rate;
+
+    # return final price to user.
+    my $final_price = sprintf("%.02f", $total_price - $comp_amt);
+
+    # don't let final price be < 0
+    $final_price = 0 if $final_price < 0;
+
+    return $final_price;
+}
+
+# return list of bonus items available for purchase,
+# to be plugged into LJ::html_select()
+sub bonus_item_list {
+    my ($u, $cartobj) = @_; # purchasing user
+
+    my @bool;
+    my @sized;
+    foreach my $itemname (keys %LJ::Pay::Payment::PayItem::Addon::bonus) {
+        my $bitem = $LJ::Pay::Payment::PayItem::Addon::bonus{$itemname};
+        next unless ref $bitem && ref $bitem->{'items'}; # eh?
+
+        # bool type
+        if ($bitem->{'type'} eq 'bool') {
+            foreach my $qty (sort { $b <=> $a } keys %{$bitem->{'items'}}) {
+                my $amt = $bitem->{'items'}->{$qty}->{'amount'};
+                push @bool, ("$itemname-$qty",
+                             LJ::Pay::Payment::PayItem::Addon->get_product_name($itemname, undef, $qty) . " (\$$amt.00 USD)");
+            }
+
+            next;
+        }
+
+        # sized type
+        if ($u && $bitem->{'type'} eq 'sized') {
+            foreach my $size (reverse sort { $a <=> $b } keys %{$bitem->{'items'}}) {
+                my $sizeit = $bitem->{'items'}->{$size};
+                foreach my $qty (sort { $b <=> $a } keys %{$sizeit->{'qty'}}) {
+
+                    # do a bunch of checks, $u probably is $remote since gifts aren't allowed
+                    next unless can_apply_sized_bonus($u, $cartobj, $itemname, $size, $qty);
+
+                    # will be interpretted as item-subitem-qty
+                    my $amt = $sizeit->{'qty'}->{$qty}->{'amount'};
+                    my $amt_comp = get_sized_bonus_price($u, $cartobj, $itemname, $size, $qty);
+                    push @sized, ("$itemname-$size-$qty",
+                                  LJ::Pay::Payment::PayItem::Addon->get_product_name($itemname, $size, $qty) . " (\$$amt.00 USD" .
+                                  ($amt == $amt_comp ? "" : "; to upgrade: \$$amt_comp") . ")");
+                }
+            }
+
+            next;
+        }
+    }
+
+    return (@bool, @sized);
+}
+
+sub remove_bonus_item {
+    my ($it, $time) = @_;
+    return undef unless ref $it;
+    return undef unless LJ::Pay::is_bonus($it);
+
+    # infer timeqty from passed item if possible
+    $time ||= $it->{qty};
+
+    # figure out the amount of time, as well
+    # as what type of units it is measured in
+    $time = ref $time ? $time : [ $time, 'month' ];
+
+    my ($timeval, $units) = @$time;
+    return undef unless $timeval > 0;
+    $units = lc($units);
+    $units ||= "month";
+    return undef unless $units =~ /^(?:month|day|second|epoch)$/;
+
+    my $dbh = LJ::get_db_writer()
+        or return undef;
+
+    my $sub_sql;
+    my $qtv = $dbh->quote($timeval);
+    if ($units eq 'epoch') { # explicit expiration time
+        $sub_sql = "FROM_UNIXTIME($qtv)";
+    } else {
+        $sub_sql = "DATE_SUB(expdate, INTERVAL $qtv $units)";
+    }
+
+    # update paidexp
+    $dbh->do("UPDATE paidexp SET expdate=$sub_sql " .
+             "WHERE userid=? AND item=?",
+             undef, $it->{rcptid}, $it->{item});
+
+    # if they're now totally out of time for this bonus feature, we need to
+    # delete their paidexp row altogether and possibly remove their cap
+
+    my $newrow = $dbh->selectrow_hashref("SELECT *, (expdate>NOW()) AS 'timeleft' " .
+                                         "FROM paidexp WHERE userid=? AND item=?",
+                                         undef, $it->{rcptid}, $it->{item});
+
+    unless ($newrow->{timeleft}) {
+
+        # handle recurring billing modifications
+        if (LJ::Pay::RecBill->is_active_recbill_user($it->{rcptid})) {
+
+            # need a $u object to pass to RecBill->load
+            my $rcptu = LJ::load_userid($it->{rcptid})
+                or return undef;
+
+            my $rec = LJ::Pay::RecBill->load( u => $rcptu )
+                or return undef;
+
+            # set recflag to off, revoke any necessary promos, all
+            # those things that we'd otherwise forget
+            $rec->deactivate_item($it->{item})
+                or return undef;
+        }
+
+        # delete empty row
+        $dbh->do("DELETE FROM paidexp WHERE userid=? AND item=? AND expdate<NOW()",
+                 undef, $it->{'rcptid'}, $it->{'item'});
+
+        # update user's cap if necessary
+        my $cap = $LJ::Pay::Payment::PayItem::Addon::bonus{$it->{'item'}}->{'cap'};
+        LJ::modify_caps($it->{'rcptid'}, [], [$cap]) if $cap;
+    }
+
+    # log to statushistory
+    LJ::statushistory_add($it->{rcptid}, undef, 'revoke',
+                          LJ::Pay::product_name($it, "short") . "; $timeval ${units}s");
+
+    return 1;
+}
+
+
+sub get_product_name {
+    my ($class, $subitem, $qty, $short) = @_;
+    my $item = $class->item;
+
+    if (item_is_bonus($item, 'bool')) {
+        my $bitem = $LJ::Pay::Payment::PayItem::Addon::bonus{$item};
+        return LJ::Lang::ml($bitem->{'name'}) . ($short ? "" : (" - " . ($bitem->{'items'}->{$qty}->{'name'} || $qty)));
+    }
+
+    if (item_is_bonus($item, 'sized')) {
+        my $bitem = $LJ::Pay::Payment::PayItem::Addon::bonus{$item};
+
+        my $size = (split("-", $subitem))[0];
+        my $sizeit = $bitem->{'items'}->{$size};
+        my $qtyit = $sizeit->{'qty'}->{$qty};
+
+        return ($sizeit->{'name'} || $size) . " " . LJ::Lang::ml($bitem->{'name'}) .
+            ($short ? "" : (" - " . ($sizeit->{'qty'}->{$qty}->{'name'} || $qty)));
+    }
+
+}
+
+sub item_is_bonus { 
+    my ($item, $type) = @_;
+
+    return undef unless defined $LJ::Pay::Payment::PayItem::Addon::bonus{$item};
+    return 1 unless $type; # check was made for any type
+    return undef unless $LJ::Pay::Payment::PayItem::Addon::bonus{$item}->{'type'} eq $type;
+    return 1; 
+}
+
+sub is_bonus { 
+    my ($self, $type) = @_;
+
+    return 1 unless $type; # check was made for any type
+    return undef unless $LJ::Pay::Payment::PayItem::Addon::bonus{$self->{'item'}}->{'type'} eq $type;
+    return 1; 
+}
+
+sub is_valid_cart_item {
+    my $self = shift;
+    my $cartobj = shift;
+
+    if ($self->is_bonus('sized')) {
+        return undef unless can_apply_sized_bonus($self->{'rcptid'}, $cartobj, $self->{'item'});
+        return 1;
+    }
+
+    if ($self->is_bonus('bool')) {
+        return undef unless can_apply_bool_bonus($self->{'rcptid'}, $cartobj, $self->{'item'});
+        return 1;
+    }
+
+    return undef; # unknown type? wrong!
+}
+
+sub render_cart_item {
+    my $self = shift;
+    my $opts = shift;
+
+    my %result; # keys in hash = columns in page: name(item), type, recipient
+
+    $result{name} = $self->product_name('short');
+    $result{type} = LJ::Lang::ml('pay.account.xmonths', {'num' => $self->{'qty'}});
+
+    return \%result;
+}
+
+sub pay_updateaccounts_item {
+    my ($self, $payment, $buyer_u, $rcpt_u, $note_rec_change) = @_;
+
+    return (0, undef, undef) unless $rcpt_u;
+
+    # get a lock since we're about to modify their account,
+    # try again later if we can't get a lock
+    return (0, undef, undef) unless LJ::Pay::get_lock($rcpt_u);
+
+    # apply the bonus item to the recipient user's account
+    my $res = apply_bonus_item($rcpt_u, $self);
+
+    # release lock and close regardless of results of operation
+    LJ::Pay::release_lock($rcpt_u);
+
+    # if an error, log to payvars (call above also logged to statushistory) and skip the email
+    unless ($res) {
+        LJ::Pay::payvar_append($pp, "error",
+                               "[" . LJ::mysql_time() . "] unable to apply: item=$pi->{'item'},  size=" .
+                               (split("-", $pi->{'subitem'}))[0] . ", qty=$pi->{'qty'}. invalid cart?");
+
+        # if there was a failure, all bonus items of this type were marked
+        # as failed, so we shouldn't try to process any more of them
+        #$bonus_failure{"$pi->{'payid'}-$pi->{'item'}-$pi->{'subitem'}"}++;
+
+        return (0, undef, undef);
+    }
+
+    # note that this user's bill changed
+    $note_rec_change->($rcpt_u, $payment);
+
+    # send notification email to user
+    my $name = $self->product_name;
+
+    my $msg = "Your $LJ::SITENAMESHORT account for user \"$rcpt_u->{'user'}\" has been ";
+    $msg .= "credited with the following add-on:\n\n";
+    $msg .= "   - $name\n\n";
+    $msg .= "Your account has been updated so you can use your new feature immediately.\n\n";
+    $msg .= "Take advantage of some of your paid account features:\n\n";
+    $msg .= LJ::Pay::usage_summary_text($rcpt_u);
+    $msg .= "Thank you for supporting the site,\n";
+    $msg .= "$LJ::SITENAMESHORT Team\n";
+
+    return (1, $name, $msg); 
+}
+
+sub get_item_base_price {
+    my ($item, $qty, $size, $is_rec, %opts) = @_;
+
+    if (LJ::Pay::is_bonus($item, 'bool')) {
+
+        return undef unless LJ::Pay::is_valid_bool_bonus
+            ($item, $qty, $is_rec);
+
+        return $LJ::Pay::Payment::PayItem::Addon::bonus{$item}->{items}->{$qty}->{$is_rec ? 'amount_rec' : 'amount'};
+
+    } elsif (LJ::Pay::is_bonus($item, 'sized')) {
+        return undef unless LJ::Pay::is_valid_sized_bonus
+            ($item, $size, $qty, $is_rec);
+
+        return $LJ::Pay::Payment::PayItem::Addon::bonus{$item}->{'items'}->{$size}->...
 (truncated)

[livejournal] r15511: Pass "dev server" flag to JS

Fri, 17 Jul 2009 14:02:32 GMT

Committer: gariev

Pass "dev server" flag to JS

U   trunk/cgi-bin/weblib.pl

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2009-07-17 03:54:15 UTC (rev 15510)
+++ trunk/cgi-bin/weblib.pl	2009-07-17 09:13:58 UTC (rev 15511)
@@ -2109,6 +2109,7 @@
                 esn_async => $esn_async,
                 );
     $site{default_copyright} = $default_copyright if LJ::is_enabled('default_copyright', $remote);
+    $site{is_dev_server} = 1 if $LJ::IS_DEV_SERVER;
 
     my $site_params = LJ::js_dumper(\%site);
     my $site_param_keys = LJ::js_dumper([keys %site]);

[ljcom] r7459: refactoring shop code

Fri, 17 Jul 2009 08:28:25 GMT

Committer: ssafronova

refactoring shop code

A   branches/shop/

[livejournal] r15509: refactoring shop code

Fri, 17 Jul 2009 08:28:09 GMT

Committer: ssafronova

refactoring shop code

A   branches/shop/

[ljcom] r7458: New release: r51.1

Fri, 17 Jul 2009 07:51:14 GMT

Committer: jirasup

New release: r51.1

A   branches/r51.1/

[livejournal] r15507: New release: r51.1

Fri, 17 Jul 2009 07:51:03 GMT

Committer: jirasup

New release: r51.1

A   branches/r51.1/

[livejournal] r15505: updated to work properly with memcache 1...

Thu, 16 Jul 2009 21:23:30 GMT

Committer: tupshin

updated to work properly with memcache 1.4

U   trunk/htdocs/admin/memcache.bml

Modified: trunk/htdocs/admin/memcache.bml
===================================================================
--- trunk/htdocs/admin/memcache.bml	2009-07-16 16:05:58 UTC (rev 15504)
+++ trunk/htdocs/admin/memcache.bml	2009-07-16 16:34:51 UTC (rev 15505)
@@ -103,7 +103,7 @@
 	    }
             $ret .= sprintf(" %0.02f", $t2-$t1);
 	    $ret .= "</td>";
-	    my $gb_used = ($stat{'malloc'}{'mmapped_space'} + $stat{'malloc'}{'arena_size'}) / (1024*1024*1024);
+	    my $gb_used = $stat{''}{'bytes'} / (1024*1024*1024);
 	    my $gb_max = $stat{''}{'limit_maxbytes'} / (1024*1024*1024);
 	    if ($gb_used >= $gb_max) {
 		$ret .= sprintf("<td align='center'>%0.01fG</td>", $gb_max);
@@ -111,9 +111,8 @@
 		$ret .= sprintf("<td>%0.02f/%0.01fG (%0.02f%%)</td>", $gb_used, $gb_max, $gb_used*100/($gb_max||1));
 	    }
 
-	    my $utiliz = $stat{''}{'bytes'} /
-		(($stat{'malloc'}{'mmapped_space'} + $stat{'malloc'}{'arena_size'}) || 1);
-	    $ret .= sprintf("<td>%0.02f%%</td>", $utiliz*100);
+	    my $utiliz = $gb_used/$gb_max;
+    $ret .= sprintf("<td>%0.02f%%</td>", $utiliz*100);
 	    
 	    my $up = $stat{''}{'uptime'};
 	    my $upstring;

[livejournal] r15504: Display custom message if reports were c...

Thu, 16 Jul 2009 20:54:37 GMT

Committer: henrylyne

Display custom message if reports were closed already.

Thanks to http://bugs.dwscoalition.org/show_bug.cgi?id=1228

U   trunk/htdocs/admin/spamreports.bml

Modified: trunk/htdocs/admin/spamreports.bml
===================================================================
--- trunk/htdocs/admin/spamreports.bml	2009-07-16 14:05:39 UTC (rev 15503)
+++ trunk/htdocs/admin/spamreports.bml	2009-07-16 16:05:58 UTC (rev 15504)
@@ -241,7 +241,7 @@
         $title = "Close Reports";
         $body .= "<?p [ <a href=\"spamreports.bml\"><< Front Page</a> ] $backlink p?>\n";
         my $s = $count == 1 ? '' : 's';
-        $body .= "Closed $count report$s.\n";
+        $body .= $count > 0 ? "Closed $count report$s.\n" : "Reports were already closed.";
 
     } else {
         # standard

[livejournal] r15503: Keep the comment text even if an error i...

Thu, 16 Jul 2009 18:54:19 GMT

Committer: henrylyne

Keep the comment text even if an error is returned.
Don't just return on error right away, push error on to error list.

Thanks to http://bugs.dwscoalition.org/show_bug.cgi?id=126

U   trunk/htdocs/talkpost_do.bml
U   trunk/htdocs/talkpost_do.bml.text

Modified: trunk/htdocs/talkpost_do.bml
===================================================================
--- trunk/htdocs/talkpost_do.bml	2009-07-16 13:48:18 UTC (rev 15502)
+++ trunk/htdocs/talkpost_do.bml	2009-07-16 14:05:39 UTC (rev 15503)
@@ -111,7 +111,7 @@
 
     # FIXME: this isn't entirely correct, if ecphash is present but ignored/incorrect
     # that fix would need to be done in talklib.pl
-    return "<?h1 $ML{'Error'} h1?> $ML{'error.invalidform'}"
+    push @errors, $ML{'.error.invalidform'}
         if $remote && ! ($skip_form_auth || $POST{'ecphash'} || LJ::check_form_auth());
 
     ## preview

Modified: trunk/htdocs/talkpost_do.bml.text
===================================================================
--- trunk/htdocs/talkpost_do.bml.text	2009-07-16 13:48:18 UTC (rev 15502)
+++ trunk/htdocs/talkpost_do.bml.text	2009-07-16 14:05:39 UTC (rev 15503)
@@ -14,6 +14,8 @@
 
 .error.friendsonly=Only friends of [[user]] may post in this journal.
 
+.error.invalidform=Invalid form submission. You may have left the reply form open too long, or logged out since you opened the page. Please try posting again.
+
 .error.membersonly=Only members of [[user]] can post in this community.
 
 .error.lostcookie=Your login cookie seems to have disappeared?

[livejournal] r15502: Fix display of tags and 'track this' in ...

Thu, 16 Jul 2009 18:36:58 GMT

Committer: henrylyne

Fix display of tags and 'track this' in previews.

Much thanks to http://bugs.dwscoalition.org/show_bug.cgi?id=1310

U   trunk/htdocs/preview/entry.bml

Modified: trunk/htdocs/preview/entry.bml
===================================================================
--- trunk/htdocs/preview/entry.bml	2009-07-16 13:32:10 UTC (rev 15501)
+++ trunk/htdocs/preview/entry.bml	2009-07-16 13:48:18 UTC (rev 15502)
@@ -233,11 +233,11 @@
                 'screened' => 0,
             });
 
-        # build tag objects, faking kwid as '0'
+        # build tag objects, faking kwid as '-1'
         # * invalid tags will be stripped by is_valid_tagstring()
         my @taglist = ();
         LJ::Tags::is_valid_tagstring($POST{prop_taglist}, \@taglist);
-        @taglist = map { LJ::S2::Tag($u, 0, $_) } @taglist;
+        @taglist = map { LJ::S2::Tag($u, -1, $_) } @taglist;
 
         # format it
         my $raw_subj = $req{'subject'};
@@ -249,7 +249,7 @@
             'security' => $req{'security'},
             'allowmask' => $req{'allowmask'},
             'props' => $req{'props'},
-            'itemid' => 0,
+            'itemid' => -1,
             'comments' => $comments,
             'journal' => $userlite_journal,
             'poster' => $userlite_poster,

[livejournal] r15501: Expire syndication memcache after 2 hour...

Thu, 16 Jul 2009 18:20:49 GMT

Committer: henrylyne

Expire syndication memcache after 2 hours.
Thanks to http://bugs.dwscoalition.org/show_bug.cgi?id=1288

U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2009-07-16 10:47:33 UTC (rev 15500)
+++ trunk/cgi-bin/LJ/User.pm	2009-07-16 13:32:10 UTC (rev 15501)
@@ -242,7 +242,7 @@
         my $dbr = LJ::get_db_reader();
         return unless $dbr;
         $synd = $dbr->selectrow_hashref("SELECT * FROM syndicated WHERE userid=$u->{'userid'}");
-        LJ::MemCache::set($memkey, $synd) if $synd;
+        LJ::MemCache::set($memkey, $synd, 60 * 120) if $synd;
     }
 
     return $synd;

[livejournal] r15500: LJLMI-93: Display messenger status in us...

Thu, 16 Jul 2009 15:36:14 GMT

Committer: pkornilov

LJLMI-93: Display messenger status in user's profile

U   trunk/htdocs/userinfo.bml

Modified: trunk/htdocs/userinfo.bml
===================================================================
--- trunk/htdocs/userinfo.bml	2009-07-16 09:33:20 UTC (rev 15499)
+++ trunk/htdocs/userinfo.bml	2009-07-16 10:47:33 UTC (rev 15500)
@@ -1005,7 +1005,7 @@
             my $msnname = $mangleaddress->(LJ::ehtml($u->{'msn'}));
             my $msn_alt = $ML{'.im.msn'};
             my $msn_status = $ML{'.im.msn.status'};
-            $instant_message .= "<tr class='im_msn'><td class='im_icon'><img src='$LJ::IMGPREFIX/profile_icons/wlm.gif' alt=\"$msn_alt\" title=\"$msn_alt\" /></td><td>$msnname</td><td class='msn_status'><span class='offline' title='$msn_status offline'>$msn_status offline</span></td></tr>\n";
+            $instant_message .= "<tr class='im_msn'><td class='im_icon'><img src='$LJ::IMGPREFIX/profile_icons/wlm.gif' alt=\"$msn_alt\" title=\"$msn_alt\" /></td><td>$msnname</td><td class='msn_status'><span id='mlm-status' class='offline' title='$msn_status offline'>$msn_status offline</span></td></tr>\n";
         }
         if ($u->{'jabber'}) {
             my $jabber = $mangleaddress->(LJ::ehtml($u->{'jabber'}));

[livejournal] r15499: LJSUP-4584: java script error when user ...

Thu, 16 Jul 2009 14:22:01 GMT

Committer: sebua

LJSUP-4584: java script error when user click button "Login"

U   trunk/cgi-bin/weblib.pl

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2009-07-16 08:50:02 UTC (rev 15498)
+++ trunk/cgi-bin/weblib.pl	2009-07-16 09:33:20 UTC (rev 15499)
@@ -3818,8 +3818,9 @@
     if (! document.getElementById) return true;
     var loginform = document.getElementById(formid);
     if (! loginform) return true;
-    if(document.getElementById('prop_current_location').value=='detecting...') document.getElementById('prop_current_location').value='';
-
+    if(document.getElementById('prop_current_location')){
+        if(document.getElementById('prop_current_location').value=='detecting...') document.getElementById('prop_current_location').value='';
+    }
     // Avoid accessing the password field if there is no username.
     // This works around Opera < 7 complaints when commenting.
     if (checkuser) {

[livejournal] r15497: LJSUP-4580: Security bug in Notes/Alias

Thu, 16 Jul 2009 13:36:49 GMT

Committer: gariev

LJSUP-4580: Security bug in Notes/Alias

U   trunk/cgi-bin/LJ/User.pm
U   trunk/cgi-bin/talklib.pl

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2009-07-16 08:21:44 UTC (rev 15496)
+++ trunk/cgi-bin/LJ/User.pm	2009-07-16 08:48:07 UTC (rev 15497)
@@ -1315,8 +1315,7 @@
 
 
         my $remote = LJ::get_remote();
-        my $alias_enable = $remote && $remote->get_cap('paid');
-        my $alias = $alias_enable ? LJ::ehtml(LJ::ljuser_alias($u->{user})) : '';
+        my $alias = LJ::ehtml(LJ::ljuser_alias($u->{user}) || '');
   
         my $profile = $profile_url ne '' ? $profile_url : "$LJ::SITEROOT/userinfo.bml?userid=$u->{userid}&t=I$andfull";
         
@@ -6404,11 +6403,14 @@
 sub ljuser_alias {
     my $user = shift;
 
+    return if $LJ::DISABLED{'aliases'};
+
     my $remote = LJ::get_remote();
-    return undef unless $remote;
+    return unless $remote;
+    return unless $remote->get_cap('aliases');
 
     my $u = LJ::load_user($user);
-    return undef unless $u;
+    return unless $u;
     
     my $prop_aliases = $remote->prop('aliases');
     my $aliases = JSON::jsonToObj($prop_aliases);
@@ -6467,8 +6469,7 @@
         $url = $journal_url ne '' ? $journal_url : $url;
          
         my $u = LJ::get_remote();
-        my $alias_enable = $u && $u->get_cap('aliases');
-        my $alias = $alias_enable ? LJ::ehtml(LJ::ljuser_alias($user)) : '';
+        my $alias = LJ::ehtml(LJ::ljuser_alias($user) || '');
         
         my $user_html = '';
         $user_html .= "<span class='ljuser ";

Modified: trunk/cgi-bin/talklib.pl
===================================================================
--- trunk/cgi-bin/talklib.pl	2009-07-16 08:21:44 UTC (rev 15496)
+++ trunk/cgi-bin/talklib.pl	2009-07-16 08:48:07 UTC (rev 15497)
@@ -2381,6 +2381,11 @@
                                  )
                 )
             {
+                ## security bug: if aliases are enabled, then e-mail recipient
+                ## may get e-mail with aliases of current remote user.
+                ## TODO: all e-mails should be sent from workers tier, not Apache
+                local $LJ::DISABLED{'aliases'} = 1;
+
                 $parentmailed = $paru->email_raw;
                 $encoding = $paru->mailencoding || "UTF-8";
                 my $part;
@@ -2445,6 +2450,8 @@
         !$entryu->gets_notified(journal => $journalu, arg1 => $ditemid, arg2 => $comment->{talkid})
         )
     {
+        local $LJ::DISABLED{'aliases'} = 1;
+        
         LJ::load_user_props($entryu, 'mailencoding');
         my $part;
 
@@ -2519,6 +2526,8 @@
         && !$u->gets_notified(journal => $journalu, arg1 => $ditemid, arg2 => $comment->{talkid})) {
         my $part;
 
+        local $LJ::DISABLED{'aliases'} = 1;
+
         # Now we going to send email to '$u'.
         $lang = $u->prop('browselang');
         $encoding = $u->mailencoding || "UTF-8";

[livejournal] r15496: LJLMI-93 Display messenger status in use...

Thu, 16 Jul 2009 13:10:26 GMT

Committer: nefimenko

LJLMI-93 Display messenger status in user's profile

U   trunk/htdocs/stc/profile.css

Modified: trunk/htdocs/stc/profile.css
===================================================================
--- trunk/htdocs/stc/profile.css	2009-07-16 03:58:27 UTC (rev 15495)
+++ trunk/htdocs/stc/profile.css	2009-07-16 08:21:44 UTC (rev 15496)
@@ -262,6 +262,7 @@
 		width: 16px;
 		height: 16px;
 		text-indent: -2000px;
+		margin: 0 auto;
     }
 	* HTML .external_services td.msn_status SPAN {
 		background: url('/img/profile_icons/mlm-icons.gif') no-repeat 0 -6px;

[livejournal] r15495: LJSUP-4581 rename column "User alias" to...

Thu, 16 Jul 2009 08:47:12 GMT

Committer: nefimenko

LJSUP-4581 rename column "User alias" to "Notes"

U   trunk/htdocs/manage/banusers.bml.text

Modified: trunk/htdocs/manage/banusers.bml.text
===================================================================
--- trunk/htdocs/manage/banusers.bml.text	2009-07-15 16:02:24 UTC (rev 15494)
+++ trunk/htdocs/manage/banusers.bml.text	2009-07-16 03:58:27 UTC (rev 15495)
@@ -12,7 +12,7 @@
 
 .intro.ban.self=To ban users from commenting in your journal, type in their usernames below. Separate multiple usernames with commas.
 
-.intro.unban.alias=User alias
+.intro.unban.alias=Notes
 
 .intro.unban.comm=You have the following users banned from commenting in your community. Select which ones you'd like to unban.

[ljcom] r7456: Fix display of UK Block.

Thu, 16 Jul 2009 00:48:49 GMT

Committer: henrylyne

Fix display of UK Block.
Note: Will ask someone to remove this logic from index.bml.

U   trunk/htdocs/index.bml

Modified: trunk/htdocs/index.bml
===================================================================
--- trunk/htdocs/index.bml	2009-07-15 09:42:12 UTC (rev 7455)
+++ trunk/htdocs/index.bml	2009-07-15 20:00:04 UTC (rev 7456)
@@ -27,7 +27,9 @@
     my $ret = "";
 
     my $country = LJ::GeoLocation->get_country_info_by_ip;
-    my $uk_block = ($country eq 'UK' || $country eq 'GB') ? 
+    my $uk_block = (!$remote ||
+        ($remote && ($remote->in_class('plus') || $remote->in_class('force_ads'))
+         && ($country eq 'UK' || $country eq 'GB') )) ?
         LJ::Widget::ExtBlock->render(id=>'homepage.uk') : '';
  
     ### Logged-in Homepage ###

[livejournal] r15494: Add link to Moderation page.

Wed, 15 Jul 2009 20:51:11 GMT

Committer: henrylyne

Add link to Moderation page.

U   trunk/htdocs/admin/browse/index.bml

Modified: trunk/htdocs/admin/browse/index.bml
===================================================================
--- trunk/htdocs/admin/browse/index.bml	2009-07-15 09:39:42 UTC (rev 15493)
+++ trunk/htdocs/admin/browse/index.bml	2009-07-15 16:02:24 UTC (rev 15494)
@@ -18,6 +18,8 @@
     my $ret = "";
 
     $ret .= "<h2>Manage Communities</h2><blockquote>";
+    $ret .= "<p><a href='./add_community.bml'>Moderate Community Submissions</a></p>";
+
     $ret .= "<p><a href='./add_community.bml'>Add Community to Category</a></p>";
     $ret .= "<p><a href='./remove_community.bml'>Remove Community from Category</a></p>";
     $ret .= "</blockquote>";

[livejournal] r15492: LJLMI-93 Display messenger status in use...

Wed, 15 Jul 2009 12:25:32 GMT

Committer: nefimenko

LJLMI-93 Display messenger status in user's profile

U   trunk/htdocs/userinfo.bml

Modified: trunk/htdocs/userinfo.bml
===================================================================
--- trunk/htdocs/userinfo.bml	2009-07-15 07:10:50 UTC (rev 15491)
+++ trunk/htdocs/userinfo.bml	2009-07-15 07:36:43 UTC (rev 15492)
@@ -1005,8 +1005,7 @@
             my $msnname = $mangleaddress->(LJ::ehtml($u->{'msn'}));
             my $msn_alt = $ML{'.im.msn'};
             my $msn_status = $ML{'.im.msn.status'};
-            $instant_message .= "<tr class='im_msn'><td class='im_icon'><img src='$LJ::IMGPREFIX/profile_icons/wlm.gif' alt=\"$msn_alt\" title=\"$msn_alt\" /></td><td colspan='2'>$msnname</td></tr>\n";
-        ### $instant_message .= "<tr class='im_msn'><td class='im_icon'><img src='$LJ::IMGPREFIX/profile_icons/wlm.gif' alt=\"$msn_alt\" title=\"$msn_alt\" /></td><td>$msnname</td><td class='msn_status'><span class='offline' title='$msn_status offline'>$msn_status offline</span></td></tr>\n";
+            $instant_message .= "<tr class='im_msn'><td class='im_icon'><img src='$LJ::IMGPREFIX/profile_icons/wlm.gif' alt=\"$msn_alt\" title=\"$msn_alt\" /></td><td>$msnname</td><td class='msn_status'><span class='offline' title='$msn_status offline'>$msn_status offline</span></td></tr>\n";
         }
         if ($u->{'jabber'}) {
             my $jabber = $mangleaddress->(LJ::ehtml($u->{'jabber'}));

[ljcom] r7454: LJSUP-4577 Minor text changes

Wed, 15 Jul 2009 12:00:02 GMT

Committer: nefimenko

LJSUP-4577 Minor text changes

U   trunk/bin/upgrading/en_LJ.dat

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2009-07-15 06:13:38 UTC (rev 7453)
+++ trunk/bin/upgrading/en_LJ.dat	2009-07-15 07:11:13 UTC (rev 7454)
@@ -5303,7 +5303,7 @@
 
 widget.addalias.too.long=You've reached the maximum number of the notes.
 
-widget.addalias.display.helper=Visit the <a [[aopts]]>Manage notes</a> page to manage all your user notes
+widget.addalias.display.helper=Visit the <a [[aopts]]>Manage Notes</a> page to manage all your user notes.
 
 widget.alias.setalias=Set note for

[livejournal] r15491: LJSUP-4577 Minor text changes

Wed, 15 Jul 2009 11:59:40 GMT

Committer: nefimenko

LJSUP-4577 Minor text changes

U   trunk/htdocs/manage/notes.bml.text

Modified: trunk/htdocs/manage/notes.bml.text
===================================================================
--- trunk/htdocs/manage/notes.bml.text	2009-07-15 05:34:16 UTC (rev 15490)
+++ trunk/htdocs/manage/notes.bml.text	2009-07-15 07:10:50 UTC (rev 15491)
@@ -6,7 +6,7 @@
 
 .alias.header.username=Username
 
-.alias.header.alias=Note
+.alias.header.alias=Notes
 
 .alias.header.newalias=New note:

[ljcom] r7453: LJLMI-98: WL problem's alert

Wed, 15 Jul 2009 11:02:28 GMT

Committer: mchernyshev

LJLMI-98: WL problem's alert
added multilanguage vars about and signin_error.

U   trunk/bin/upgrading/en_LJ.dat

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2009-07-15 05:34:40 UTC (rev 7452)
+++ trunk/bin/upgrading/en_LJ.dat	2009-07-15 06:13:38 UTC (rev 7453)
@@ -2771,12 +2771,16 @@
 
 msn.webiface.context.remove=Delete
 
+msn.webiface.about=About
+
 msn.webiface.add_contact=Add [[start_link]]contact[[end_link]]
 
 msn.webiface.add=Add
 
 msn.webiface.signin=Sign in to LJ Messenger
 
+msn.webiface.signin_error=Error ([[code]]). Try again.
+
 msn.webiface.loading=Loading
 
 msn.webiface.min_title=LJ Messenger

[ljcom] r7452: LJSUP-4577 Minor text changes

Wed, 15 Jul 2009 10:23:30 GMT

Committer: nefimenko

LJSUP-4577 Minor text changes

U   trunk/bin/upgrading/en_LJ.dat

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2009-07-13 10:16:32 UTC (rev 7451)
+++ trunk/bin/upgrading/en_LJ.dat	2009-07-15 05:34:40 UTC (rev 7452)
@@ -5299,7 +5299,7 @@
 
 widget.addalias.too.long=You've reached the maximum number of the notes.
 
-widget.addalias.display.helper=Visit <a [[aopts]]>"Manage notes"</a> page to manage all your user's notes
+widget.addalias.display.helper=Visit the <a [[aopts]]>Manage notes</a> page to manage all your user notes
 
 widget.alias.setalias=Set note for