Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

interchange · Mar 15, 2014 · af0fbd5 · af0fbd5
2 parents 415be04 + 01b3df9
commit af0fbd5
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 23 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -75,6 +75,7 @@ code/Filter/strftime.filter
 code/Filter/strikeout.filter
 code/Filter/strip.filter
 code/Filter/strip_html.filter
+code/Filter/strip_path.filter
 code/Filter/tabbed.filter
 code/Filter/text2html.filter
 code/Filter/textarea_get.filter
@@ -1060,6 +1061,7 @@ eg/jedit/catalog
 eg/jedit/interchange.xml
 eg/jedit/README
 eg/merge-tab-files
+eg/migrate-sessions-to-dbi
 eg/news_feature/dbconf/default_db/news.dbm
 eg/news_feature/dbconf/mysql/news.mysql
 eg/news_feature/dbconf/oracle/news.ora
@@ -1205,8 +1207,6 @@ LICENSE
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
-MYMETA.json
-MYMETA.yml
 README
 README-DEVELOPMENT
 README.debian

diff --git a/Makefile.PL b/Makefile.PL
@@ -154,7 +154,7 @@ sub copyright_prompt {
 
  Interchange V$VERSION
  
- Copyright (C) 2002-2013 Interchange Development Group.
+ Copyright (C) 2002-2014 Interchange Development Group.
  Copyright (C) 1996-2002 Red Hat, Inc.
  Interchange is free under the terms of the GNU General Public License.
 

diff --git a/README b/README
@@ -4,7 +4,7 @@
 
 Interchange 5.8.1
 
-Copyright (C) 2002-2013 Interchange Development Group
+Copyright (C) 2002-2014 Interchange Development Group
 Copyright (C) 1996-2002 Red Hat, Inc.
 
 Originally based on Vend 0.2 and 0.3, copyright 1995-96 by Andrew M. Wilcox.

diff --git a/WHATSNEW-5.7 b/WHATSNEW-5.7
@@ -8,7 +8,56 @@
 ------------------------------------------------------------------------------
 
 
-Interchange 5.8.1 not yet released.
+Interchange 5.8.1 released on 2014-03-12.
+
+Core
+----
+
+* Improved Unicode support in core: improvements to [area] tag, email.tag
+
+* Fixed a bug in session cookie parsing which could result in lost sessions.
+
+* Add strip_path filter.
+
+* Improvements in UserTag Alias handling of embedded hyphens
+
+* Added new full-page caching features
+
+* Fixed one-off [item-increment] bug when passing fm (jump) parameter to a search.
+
+* [weight] UserTag now supports "adder" options.
+
+* Re-connect session variables when doing an su.
+
+* Fix XSS in error tag display of failed submissions
+
+
+Payments
+--------
+
+* Fixes for a change in behavior with  Authorize.net's handling of AUTH and CAPTURE transaction types.
+
+* Fixes to PayPal alternate address handling.
+
+* Allow Union Pay cards to skip luhn-10
+
+* Update Cardsave payment module to 0.9.8.
+
+
+Standard Demo
+-------------
+
+* Updated checkout to recognise Internet Explorer 10
+
+* Optimized lookup of order items for ship notice.
+
+
+External Tools
+--------------
+
+* Added script to migrate sessions from Storable to DBI.
+
+* Use su directive in Debian's logrotate file to avoid skipping due to permissions issues.
 
 
 ------------------------------------------------------------------------------

diff --git a/code/UserTag/email.tag b/code/UserTag/email.tag
@@ -147,7 +147,7 @@ sub {
             $msg->attach(
                          Type => $opt->{body_mime},
                          Encoding => $opt->{body_encoding},
-                         Data => $body,
+                         Data => ($utf8 ? utf8_to_other($body, 'utf-8') : $body),
                          Disposition => $opt->{body_disposition} || 'inline',
                          Format => $opt->{body_format} || $att1_format,
                         );
@@ -189,6 +189,7 @@ sub {
 		my %encoding_types = (
 			'text/plain' => ($utf8 ? 'quoted-printable' : '8bit'),
 			'text/html' => 'quoted-printable',
+            'text/html; charset=UTF-8' => 'quoted-printable',
 		);
 
 		for my $ref (@$att) {

diff --git a/configure b/configure
@@ -4,7 +4,7 @@ cat <<EOF
 
  Interchange
 
- Copyright 2002-2013 Interchange Development Group (http://www.icdevgroup.org/)
+ Copyright 2002-2014 Interchange Development Group (http://www.icdevgroup.org/)
  Copyright 1996-2002 Red Hat, Inc.
 
  Interchange was originally based on Vend 0.2 and 0.3

diff --git a/dist/standard/variables/COPYRIGHT b/dist/standard/variables/COPYRIGHT
@@ -2,6 +2,6 @@
     [if variable MV_DEMO_MODE]
       <p>[page admin/index][L]Admin[/L]</a></p>
     [/if]
-	<p style="font-size: 10px; color: #000000">Portions copyright 2002-2013 Interchange Development Group, freely redistributable under GPL</p>
+	<p style="font-size: 10px; color: #000000">Portions copyright 2002-2014 Interchange Development Group, freely redistributable under GPL</p>
   </div>
 
diff --git a/lib/Vend/Order.pm b/lib/Vend/Order.pm
@@ -22,6 +22,7 @@
 # MA  02110-1301  USA.
 
 package Vend::Order;
+use Vend::Error;
 require Exporter;
 
 $VERSION = '2.110';
@@ -2063,6 +2064,15 @@ my @Scan_modifiers = qw/
 sub update_quantity {
     return 1 unless defined  $CGI::values{"quantity0"}
 		|| $CGI::values{mv_quantity_update};
+
+	if ( my $n = $CGI::values{mv_nlines} ) {
+		my $check = scalar(@$Vend::Items);
+		if ( $n != $check ) {
+			Vend::Error::interaction_error();
+			return undef;
+		}
+	}
+
 	my ($h, $i, $quantity, $modifier, $cart, $cartname, %altered_items, %old_items);
 
 	if ($CGI::values{mv_cartname}) {

diff --git a/lib/Vend/Payment/PayflowPro.pm b/lib/Vend/Payment/PayflowPro.pm
@@ -615,25 +615,32 @@ sub payflowpro {
     if($tender eq 'P') {
         @query{keys %paypal_query} = values %paypal_query;
         my $i = 0;
-        for my $it (@{$::Carts->{main}}) {
-            $query{'L_PAYMENTREQUEST_0_NAME'    .$i} = $it->{description} || Vend::Data::item_description($it);
-            $query{'L_PAYMENTREQUEST_0_NUMBER'  .$i} = $it->{code};
-            $query{'L_PAYMENTREQUEST_0_DESC'    .$i} = Vend::Data::item_description($it);
-            $query{'L_PAYMENTREQUEST_0_AMT'     .$i} = Vend::Data::item_price($it);
-            $query{'L_PAYMENTREQUEST_0_QTY'     .$i} = $it->{quantity};
-            ##$query{'L_PAYMENTREQUEST_0_TAXAMT'.$i} = (Vend::Data::item_price($it)/$itemTotal * $taxTotal);
-            $i++;
+        if ($action ne 'D') {
+            for my $it ( @{ $::Carts->{main} } ) {
+                my $it_price = Vend::Data::item_price($it);
+                my $disc_price = Vend::Interpolate::discount_price( $it, $it_price, $it->{quantity} );
+#::logDebug("payflowpro: prices for $it->{code}: it_price=$it_price, disc_price=$disc_price");
+                $query{ 'L_PAYMENTREQUEST_0_NAME'   . $i } = $it->{description} || Vend::Data::item_description($it);
+                $query{ 'L_PAYMENTREQUEST_0_NUMBER' . $i } = $it->{code};
+                $query{ 'L_PAYMENTREQUEST_0_DESC'   . $i } = Vend::Data::item_description($it);
+                $query{ 'L_PAYMENTREQUEST_0_AMT'    . $i } = $disc_price;
+                $query{ 'L_PAYMENTREQUEST_0_QTY'    . $i } = $it->{quantity};
+                ##$query{'L_PAYMENTREQUEST_0_TAXAMT'    .$i} = ($disc_price/$itemTotal * $taxTotal);
+                $i++;
+            }
         }
         $opt->{check_sub} = undef;
     }
     else {
         my $i = 1;
         for my $it (@{$::Carts->{main}}) {
+        my $it_price = Vend::Data::item_price($it);
+        my $disc_price = Vend::Interpolate::discount_price($it, $it_price, $it->{quantity});
             $query{'L_NAME' . $i} = $it->{description} || Vend::Data::item_description($it);
-            $query{'L_COST' . $i} = Vend::Data::item_price($it);
+            $query{'L_COST' . $i} = $disc_price;
             $query{'L_QTY'  . $i} = $it->{quantity};
             $query{'L_SKU'  . $i} = $it->{code};
-            ##$query{'L_TAXAMT'.$i} = (Vend::Data::item_price($it)/$itemTotal * $taxTotal);
+            ##$query{'L_TAXAMT'.$i} = ($disc_price/$itemTotal * $taxTotal);
             $i++;
         }
     }
@@ -655,6 +662,9 @@ sub payflowpro {
         }
     }
     else {
+        if ( $Vend::Session->{admin} and $::Values->{order_desk_entry} ) {
+            delete $query{CUSTIP};    # prevent 'IP/Address Mismatch' fraud reports for UI orders
+        }
         ## these not for PayPal authorizations, only capture/void (and credit cards):
         $query{ORIGID} = $order_id;
         $query{EXPDATE} = $exp;

diff --git a/lib/Vend/Payment/PaypalExpress.pm b/lib/Vend/Payment/PaypalExpress.pm
@@ -955,7 +955,7 @@ return $Tag->deliver({ location => $redirecturl });
 # populate the billing address rather than shipping address when the basket is being shipped to
 # another address, eg it is a wish list.
 	  if (($result{'Ack'} eq "Success") and ($::Values->{'pp_use_billing_address'} == 1)) {
-		$::Values->{'b_phone_day'}      = $result{'GetExpressCheckoutDetailsResponseDetails'}{'ContactPhone'};
+		$::Values->{'b_phone_day'}      = $result{'GetExpressCheckoutDetailsResponseDetails'}{'ContactPhone'} || $::Values->{b_phone} || $::Values->{phone_day} || $::Values->{phone_night};
 		$::Values->{'email'}            = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Payer'};
 		$::Values->{'payerid'}          = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'PayerID'};
 		$::Values->{'payerstatus'}      = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'PayerStatus'};
@@ -966,7 +966,7 @@ return $Tag->deliver({ location => $redirecturl });
 	    $::Values->{'b_lname'}          = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'PayerName'}{'LastName'};
 	    $::Values->{'suffix'}           = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'PayerName'}{'Suffix'};
 	    $::Values->{'address_status'}   = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Address'}{'AddressStatus'};
-	    $::Values->{'b_name'}           = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'PayerName'}{'PayerName'};
+	    $::Values->{'b_name'}           = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Address'}{'Name'};
 	    $::Values->{'b_address1'}       = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Address'}{'Street1'};
 	    $::Values->{'b_address2'}       = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Address'}{'Street2'};
 	    $::Values->{'b_city'}           = $result{'GetExpressCheckoutDetailsResponseDetails'}{'PayerInfo'}{'Address'}{'CityName'};
@@ -1009,10 +1009,19 @@ return $Tag->deliver({ location => $redirecturl });
 # If shipping address and name are chosen at Paypal to be different to the billing address/name, then {name} contains 		
 # the shipping name but {fname} and {lname} still contain the billing names.
 ### In this case the returned 'name' may be a company name as it turns out, so what should we do?
+    if ($::Values->{pp_use_billing_address}) {
+       if (($::Values->{'b_fname'} !~ /$::Values->{'b_name'}/) and ($::Values->{'b_name'} =~ /\s/)) {
+           $::Values->{'b_name'} =~ /(\S*)\s+(.*)/;
+           $::Values->{'b_fname'} = $1;
+           $::Values->{'b_lname'} = $2;
+       }
+    }
+    else {
    if (($::Values->{'fname'} !~ /$::Values->{'name'}/) and ($::Values->{'name'} =~ /\s/)) {
        $::Values->{'name'} =~ /(\S*)\s+(.*)/;
        $::Values->{'fname'} = $1;
        $::Values->{'lname'} = $2;
+       }
     }
 
 		  $::Session->{'errors'}{'PaypalExpress'} = $result{'Errors'}{'LongMessage'}  if ($result{'Errors'} !~ /ARRAY/);

diff --git a/lib/Vend/Util.pm b/lib/Vend/Util.pm
@@ -189,6 +189,12 @@ sub escape_chars_url {
     my($c, $r);
 
     $r = '';
+    if ($::Variable->{MV_UTF8} || $Global::Variable->{MV_UTF8}) {
+        # check if it's decoded
+        if (is_utf8($in)) {
+            $in = encode_utf8($in);
+        }
+    }
     foreach $c (split(m{}, $in)) {
 		$r .= $ESCAPE_CHARS::translate_url[ord($c)];
     }

diff --git a/scripts/interchange.PL b/scripts/interchange.PL
@@ -3,7 +3,7 @@
 #
 # Interchange version 5.8.1
 #
-# Copyright (C) 2002-2013 Interchange Development Group
+# Copyright (C) 2002-2014 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 # http://www.icdevgroup.org/
 #
@@ -347,7 +347,7 @@ sub dontwarn {
 }
 
 sub version {
-	print "Interchange version $VERSION copyright 2002-2013 Interchange Development Group and others.\n";
+	print "Interchange version $VERSION copyright 2002-2014 Interchange Development Group and others.\n";
 }
 
 =head1 NAME
@@ -986,7 +986,7 @@ GNU General Public License.
 
 =head1 COPYRIGHT
 
-    Copyright (C) 2002-2013 Interchange Development Group
+    Copyright (C) 2002-2014 Interchange Development Group
     Copyright (C) 1995-2002 Red Hat, Inc.
     All rights reserved except those granted in the license.