make the shop code use URLs generated by the url generator

diff --git a/site/cgi-bin/modules/BSE/Request/Base.pm b/site/cgi-bin/modules/BSE/Request/Base.pm
index 9d4b15f87e0174b91b5e2b36af3611a3f1c7eb8b..24c4993e30cf62de21ee2ef04ea95667f049a241 100644 (file)
--- a/site/cgi-bin/modules/BSE/Request/Base.pm
+++ b/site/cgi-bin/modules/BSE/Request/Base.pm
@@ -510,13 +510,25 @@ sub user_url {
   my $cfg = $req->cfg;
   my $base = $script eq 'shop' ? $cfg->entryVar('site', 'secureurl') : '';
   my $template;
-  if ($script eq 'nuser') {
-    $template = "/cgi-bin/nuser.pl/user/TARGET";
+  if ($target) {
+    if ($script eq 'nuser') {
+      $template = "/cgi-bin/nuser.pl/user/TARGET";
+    }
+    else {
+      $template = "$base/cgi-bin/$script.pl?a_TARGET=1";
+    }
+    $template = $cfg->entry('targets', $script, $template);
+    $template =~ s/TARGET/$target/;
   }
   else {
-    $template = "$base/cgi-bin/$script.pl?a_TARGET=1";
+    if ($script eq 'nuser') {
+      $template = "/cgi-bin/nuser.pl/user";
+    }
+    else {
+      $template = "$base/cgi-bin/$script.pl";
+    }
+    $template = $cfg->entry('targets', $script.'_n', $template);
   }
-  $template =~ s/TARGET/$target/;
   if (@options) {
     $template .= $template =~ /\?/ ? '&' : '?';
     my @entries;

diff --git a/site/cgi-bin/modules/BSE/UI/Shop.pm b/site/cgi-bin/modules/BSE/UI/Shop.pm
index caf7692d1863658f2c83a57a8ce990f3f3c26ab7..dc967bbde0bc1b26115be4e890bb8c1328de53ab 100644 (file)
--- a/site/cgi-bin/modules/BSE/UI/Shop.pm
+++ b/site/cgi-bin/modules/BSE/UI/Shop.pm
@@ -163,7 +163,7 @@ sub req_add {
 
   my $refresh = $cgi->param('r');
   unless ($refresh) {
-    $refresh = $ENV{SCRIPT_NAME};
+    $refresh = $req->user_url(shop => 'cart');
   }
 
   # speed for ajax
@@ -224,7 +224,7 @@ sub req_addsingle {
 
   my $refresh = $cgi->param('r');
   unless ($refresh) {
-    $refresh = $ENV{SCRIPT_NAME};
+    $refresh = $req->user_url(shop => 'cart');
   }
 
   # speed for ajax
@@ -303,7 +303,7 @@ sub req_addmultiple {
 
   my $refresh = $cgi->param('r');
   unless ($refresh) {
-    $refresh = $ENV{SCRIPT_NAME};
+    $refresh = $req->user_url(shop => 'cart');
   }
   if (@messages) {
     my $sep = $refresh =~ /\?/ ? '&' : '?';
@@ -436,7 +436,7 @@ sub req_remove_item {
   $req->session->{cart} = \@cart;
   $req->session->{order_info_confirmed} = 0;
 
-  return BSE::Template->get_refresh($ENV{SCRIPT_NAME}, $req->cfg);
+  return BSE::Template->get_refresh($req->user_url(shop => 'cart'), $req->cfg);
 }
 
 
@@ -499,7 +499,7 @@ sub req_order {
     return $class->req_payment($req);
   }
   else {
-    return BSE::Template->get_refresh("$ENV{SCRIPT_NAME}?a_show_payment=1", $req->cfg);
+    return BSE::Template->get_refresh($req->user_url(shop => 'show_payment'), $req->cfg);
   }
 }
 
@@ -773,7 +773,7 @@ sub req_payment {
   # empty the cart ready for the next order
   delete @{$session}{qw/order_info order_info_confirmed cart order_work/};
 
-  return BSE::Template->get_refresh("$ENV{SCRIPT_NAME}?a_orderdone=1", $req->cfg);
+  return BSE::Template->get_refresh($req->user_url(shop => 'orderdone'), $req->cfg);
 }
 
 sub req_orderdone {

diff --git a/site/templates/cart_base.tmpl b/site/templates/cart_base.tmpl
index 7823269dff3a85e1634257490ba0c6766842322c..f43f46a60ffedb513cccf5a544bdafae218e4738 100644 (file)
--- a/site/templates/cart_base.tmpl
+++ b/site/templates/cart_base.tmpl
@@ -24,7 +24,7 @@
 <:ifMsg:><p><font face="Verdana, Arial, Helvetica, sans-serif"><b><:msg:></b> </font></p><:or:><:eif:>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><b>Contains</b> 
   - <:count:> item<:if Eq [count] "1":><:or Eq:>s<:eif Eq:></font></p>
-<form name="form1" method="POST" action="/cgi-bin/shop.pl">
+<form name="form1" method="POST" action="<:dyntarget shop:>">
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
     <tr> 
       <td align="center" bgcolor="#CCCCCC" width="100%" height="18"> <font size="2" face="Verdana, Arial, Helvetica, sans-serif"> 

diff --git a/site/templates/checkoutnew_base.tmpl b/site/templates/checkoutnew_base.tmpl
index 129fc28bc1f44056f99cdb99ecd517c12c0c5b62..35fcbdb49ffc78d465c6cc316bd25ee3c264431f 100644 (file)
--- a/site/templates/checkoutnew_base.tmpl
+++ b/site/templates/checkoutnew_base.tmpl
@@ -137,7 +137,7 @@ function BSE_validateForm {
     </table>
     <br>
 <:eif User:>
-<form action="/cgi-bin/shop.pl" method="POST" onSubmit="BSE_validateForm();return document.MM_returnValue">
+<form action="<:dyntarget shop:>" method="POST" onSubmit="BSE_validateForm();return document.MM_returnValue">
   <font face="Verdana, Arial, Helvetica, sans-serif" size="3"> <b>Shipping Details:</b></font> 
   <hr noshade size="1">
   <table border="0" cellspacing="0" cellpadding="0">

diff --git a/site/templates/checkoutpay_base.tmpl b/site/templates/checkoutpay_base.tmpl
index d7c12ac19864279b6c0219d8df6a6cfaeb53bff5..19841d6ad15247e240a575b37bebbe0a245c253f 100644 (file)
--- a/site/templates/checkoutpay_base.tmpl
+++ b/site/templates/checkoutpay_base.tmpl
@@ -85,7 +85,7 @@
     <td></td>
   </tr>
 </table>
-<form action="/cgi-bin/shop.pl" method="post">
+<form action="<:dyntarget shop:>" method="post">
   <font face="Verdana, Arial, Helvetica, sans-serif" size="3"> <b>Payment Details:</b></font> 
   <hr size="1" noshade>
 <:ifMsg:><p><b><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:msg:></font></b></p><:or:><:eif:>