Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r8099: LJSV-850: and war war is the battle cry,...

Committer: ailyin
LJSV-850: and war war is the battle cry, and it's wild, wild, wild

U   trunk/cgi-bin/LJ/Widget/IPPU/AddVGift.pm
U   trunk/htdocs/admin/accounts/enterbatch.bml
U   trunk/htdocs/paidaccounts/pp_notify.bml
U   trunk/htdocs/pay/paymeth/webmoney.bml
U   trunk/htdocs/pay/yandex.bml
U   trunk/htdocs/shop/index.bml
U   trunk/ssldocs/pay/cc.bml
U   trunk/ssldocs/pay/ccpay.bml
Modified: trunk/cgi-bin/LJ/Widget/IPPU/AddVGift.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/IPPU/AddVGift.pm	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/cgi-bin/LJ/Widget/IPPU/AddVGift.pm	2009-12-23 10:30:16 UTC (rev 8099)
@@ -105,7 +105,7 @@
         }
     };
 
-    my $cartobj = LJ::Pay::Payment::load_cart($cart);
+    my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
     unless ($cartobj) {
         $cartobj = LJ::Pay::Payment::new_cart($remote);
         $cart = "$cartobj->{'payid'}-$cartobj->{'anum'}";

Modified: trunk/htdocs/admin/accounts/enterbatch.bml
===================================================================
--- trunk/htdocs/admin/accounts/enterbatch.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/htdocs/admin/accounts/enterbatch.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -56,7 +56,7 @@
         return $err->("Invalid payment amount")
             unless $amt =~ /^\d+(\.\d\d)?$/;
 
-        my $cartobj = LJ::Pay::Payment::load_cart($cart);
+        my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
         return $err->("Cannot find order number") unless $cartobj;
         return $err->("Order price of \$$cartobj->{'amount'} doesn't match paid amount")
             unless $cartobj->{'amount'}*100 == $amt*100;

Modified: trunk/htdocs/paidaccounts/pp_notify.bml
===================================================================
--- trunk/htdocs/paidaccounts/pp_notify.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/htdocs/paidaccounts/pp_notify.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -83,7 +83,7 @@
 
     if ($FORM{custom}) {
         if (my $custom = LJ::Pay::Transaction::PayPal::paypal_parse_custom($FORM{custom})) {
-            if (my $cartobj = LJ::Pay::Payment::load_cart($custom->{cart})) {
+            if (my $cartobj = eval { LJ::Pay::Payment::load_cart($custom->{cart}) }) {
                LJ::Pay::send_fraud_email($cartobj);
 
                if (my $u = LJ::load_userid($cartobj->{userid})) {

Modified: trunk/htdocs/pay/paymeth/webmoney.bml
===================================================================
--- trunk/htdocs/pay/paymeth/webmoney.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/htdocs/pay/paymeth/webmoney.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -35,7 +35,7 @@
     }
 
     my $cart = $POST{'cart'} || $COOKIE{cart};
-    my $cartobj = LJ::Pay::Payment::load_cart($cart);
+    my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
 
     # make sure they own this cart
     if ($cartobj && $cartobj->{'userid'}) {

Modified: trunk/htdocs/pay/yandex.bml
===================================================================
--- trunk/htdocs/pay/yandex.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/htdocs/pay/yandex.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -6,7 +6,7 @@
     use vars qw(%GET %POST $title $headextra @errors @warnings);
 
     my $cart = $GET{'c'};
-    my $cartobj = LJ::Pay::Payment::load_cart($cart);
+    my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
     return BML::redirect("/pay/") unless $cartobj;
 
     # set title now that we have a cart

Modified: trunk/htdocs/shop/index.bml
===================================================================
--- trunk/htdocs/shop/index.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/htdocs/shop/index.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -33,7 +33,7 @@
 
     # now load remote and $cartobj
     $remote = LJ::get_remote();
-    $cartobj = LJ::Pay::Payment::load_cart($cart);
+    $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
     $can_mod = ! $cartobj || $cartobj->can_modify;
 
     # see if cart's dead, c=new requested, or already checked out

Modified: trunk/ssldocs/pay/cc.bml
===================================================================
--- trunk/ssldocs/pay/cc.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/ssldocs/pay/cc.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -15,7 +15,7 @@
     my $remote_ip = LJ::get_remote_ip();
 
     my $cart = $GET{c} || $POST{cart};
-    my $cartobj = LJ::Pay::Payment::load_cart($cart);
+    my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) };
 
     return BML::redirect("$LJ::SITEROOT/pay/") unless $cartobj;
 

Modified: trunk/ssldocs/pay/ccpay.bml
===================================================================
--- trunk/ssldocs/pay/ccpay.bml	2009-12-23 10:13:39 UTC (rev 8098)
+++ trunk/ssldocs/pay/ccpay.bml	2009-12-23 10:30:16 UTC (rev 8099)
@@ -55,7 +55,7 @@
         return LJ::bad_input($_[0], $no_charge);
     };
 
-    my $cartobj = LJ::Pay::Payment::load_cart($cart)
+    my $cartobj = eval { LJ::Pay::Payment::load_cart($cart) }
         or return $error->("Order not found.");
 
     # do time-based rate-limiting

Tags: andy, bml, ljcom, pm
Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 1 comment