[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-5-g5377377

[Jon Jensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  5377377546fc2934106cdf540ff0c3c91f2b7feb (commit)
       via  ad9d4571c0d3a134056bf6d361650864c8da9ddf (commit)
      from  47afbc2d6b78c39076d50b0cc77c974dd480b063 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5377377546fc2934106cdf540ff0c3c91f2b7feb
Author: Jon Jensen <jon at endpoint.com>
Date:   Mon Sep 28 13:44:50 2009 -0600

    Correct bounces to nonexistent error pages
    
    If someone tries to do an order return for an order that's not their
    own, I'm not worried about explaining the details; just bounce them to
    their order return list page now instead of the 404 they were getting
    before.
    
    This was reported by John Young <john_young at sonic.net> on 2004-04-13 but
    apparently fell between the cracks:
    
    http://www.icdevgroup.org/pipermail/interchange-users/2004-April/038696.html

commit ad9d4571c0d3a134056bf6d361650864c8da9ddf
Author: Jon Jensen <jon at endpoint.com>
Date:   Mon Sep 28 13:44:40 2009 -0600

    Correct file path

-----------------------------------------------------------------------

Summary of changes and diff:
 UPGRADE                                     |    2 +-
 dist/standard/pages/query/order_return.html |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/UPGRADE b/UPGRADE
index 44d0a36..41c4e08 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -629,7 +629,7 @@ EOS
 In the standard and foundation catalogs, the "lost password" feature makes use
 of the remote search feature to be able to retrieve lost passwords. We recommend
 that you remove catalog/pages/query/get_password.html from your catalog, and
-replace catalog/pages/lost_password.html with an updated version from this
+replace catalog/pages/query/lost_password.html with an updated version from this
 distribution. As an alternative, you may apply the following patch to your
 existing catalog/pages/query/get_password.html:
 
diff --git a/dist/standard/pages/query/order_return.html b/dist/standard/pages/query/order_return.html
index 6e80421..a7d1880 100644
--- a/dist/standard/pages/query/order_return.html
+++ b/dist/standard/pages/query/order_return.html
@@ -29,7 +29,7 @@ ui_template_name: leftonly
 [if session arg]
 	[seti arg][data session arg][/seti]
 [else]
-	[bounce href="[area special/violation arg_missing]"]
+	[bounce page=member/returns]
 [/else]
 
 [/if]
@@ -42,17 +42,12 @@ ui_template_name: leftonly
 	]"
 hide=1]
 
-[if value test_user]
-[else]
-	[bounce href="[area special/violation user_missing]&user=[value test_user]&arg=[scratch arg]"]
-[/else]
-[/if]
 [if type=explicit compare=`
-	return 1 if ! $Session->{username};
+	return 1 if ! $Values->{test_user} or ! $Session->{username};
 	return 0 if $Session->{username} eq $Values->{test_user};
 	return 1;
 `]
-[bounce href="[area special/user_violation username_no_match]&s=[data session username]&v=[value test_user]"]
+    [bounce page=member/returns]
 [/if]
 
 [seti order_status][data table=transactions column=status key='[scratch arg]'][/seti]


hooks/post-receive
-- 
Interchange