[TEP-COMMIT] [CVS catalog] update page links
hpdl-OfajU3CKLf1/[email protected] 30 Mar 2005 00:28:07 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog/includes/modules/payment</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">authorizenet.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php?rev=1.55&content-type=text/vnd.viewcvs-markup">1.55</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php.diff?r1=1.55&r2=1.56">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php?rev=1.56&content-type=text/vnd.viewcvs-markup">1.56</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">cc.php</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php?rev=1.60&content-type=text/vnd.viewcvs-markup">1.60</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php.diff?r1=1.60&r2=1.61">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a></td></tr>
<tr><td><tt><a href="#file3">ipayment.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php?rev=1.41&content-type=text/vnd.viewcvs-markup">1.41</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php.diff?r1=1.41&r2=1.42">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php?rev=1.42&content-type=text/vnd.viewcvs-markup">1.42</a></td></tr>
<tr class="alt"><td><tt><a href="#file4">nochex.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php.diff?r1=1.17&r2=1.18">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a></td></tr>
<tr><td><tt><a href="#file5">paypal.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php?rev=1.46&content-type=text/vnd.viewcvs-markup">1.46</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php.diff?r1=1.46&r2=1.47">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php?rev=1.47&content-type=text/vnd.viewcvs-markup">1.47</a></td></tr>
<tr class="alt"><td><tt><a href="#file6">pm2checkout.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php.diff?r1=1.26&r2=1.27">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php?rev=1.27&content-type=text/vnd.viewcvs-markup">1.27</a></td></tr>
<tr><td><tt><a href="#file7">psigate.php</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php?rev=1.25&content-type=text/vnd.viewcvs-markup">1.25</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php.diff?r1=1.25&r2=1.26">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a></td></tr>
<tr class="alt"><td><tt><a href="#file8">secpay.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php?rev=1.40&content-type=text/vnd.viewcvs-markup">1.40</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php.diff?r1=1.40&r2=1.41">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php?rev=1.41&content-type=text/vnd.viewcvs-markup">1.41</a></td></tr>
<tr><td></td><td align="right" id="added">+22</td><td align="right" id="removed">-22</td><td></td></tr>
</table>
<small id="info">8 modified files</small><br />
<pre class="comment">
update page links
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>authorizenet.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php?rev=1.55&content-type=text/vnd.viewcvs-markup">1.55</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php.diff?r1=1.55&r2=1.56">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/authorizenet.php?rev=1.56&content-type=text/vnd.viewcvs-markup">1.56</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.55 -r1.56
--- authorizenet.php 2005/02/24 01:13:34 1.55
+++ authorizenet.php 2005/03/30 00:28:01 1.56
@@ -250,7 +250,7 @@
</small></pre><pre class="diff" id="context">
$payment_error_return = 'payment_error=' . $this->code . '&error=' . urlencode($error) . '&authorizenet_cc_owner=' . urlencode($_POST['authorizenet_cc_owner']) . '&authorizenet_cc_expires_month=' . $_POST['authorizenet_cc_expires_month'] . '&authorizenet_cc_expires_year=' . $_POST['authorizenet_cc_expires_year'];
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="context"> }
$this->cc_card_owner = $_POST['ipayment_cc_owner'];
</pre><pre class="diff"><small id="info">@@ -378,7 +378,7 @@
</small></pre><pre class="diff" id="context"> $gw_vars = $this->make_gateway_vars();
$sequence = rand(1, 1000);
$gw_vars = array_merge($gw_vars, $this->InsertFP(MODULE_PAYMENT_AUTHORIZENET_LOGIN, MODULE_PAYMENT_AUTHORIZENET_TXNKEY, $gw_vars['X_Amount'], $sequence));
</pre><pre class="diff" id="removed">- $gw_vars['x_Relay_URL'] = tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PROCESS, '</span>', 'SSL', false);
</pre><pre class="diff" id="added">+ $gw_vars['x_Relay_URL'] = tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'process</span>', 'SSL', false);
</pre><pre class="diff" id="context"> $gw_vars['x_Relay_Response'] = 'TRUE';
$gw_vars['x_delim_data'] = 'TRUE';
$gw_vars['x_delim_char'] = '|';
</pre><pre class="diff"><small id="info">@@ -466,10 +466,10 @@
</small></pre><pre class="diff" id="context">
if ($x_response_code == '1') return;
if ($x_response_code == '2') {
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT, '</span>error_message=' . urlencode(MODULE_PAYMENT_AUTHORIZENET_TEXT_DECLINED_MESSAGE.$x_response_reason_text), 'SSL', true, false));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&</span>error_message=' . urlencode(MODULE_PAYMENT_AUTHORIZENET_TEXT_DECLINED_MESSAGE.$x_response_reason_text), 'SSL', true, false));
</pre><pre class="diff" id="context"> }
// Code 3 is an error - but anything else is an error too (IMHO)
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT, '</span>error_message=' . urlencode(MODULE_PAYMENT_AUTHORIZENET_TEXT_ERROR_MESSAGE.$x_response_reason_text) . '&error=' . urlencode($x_response_reason_text), 'SSL', true, false));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&</span>error_message=' . urlencode(MODULE_PAYMENT_AUTHORIZENET_TEXT_ERROR_MESSAGE.$x_response_reason_text) . '&error=' . urlencode($x_response_reason_text), 'SSL', true, false));
</pre><pre class="diff" id="context"> }
function after_process() {
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>cc.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php?rev=1.60&content-type=text/vnd.viewcvs-markup">1.60</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php.diff?r1=1.60&r2=1.61">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/cc.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.60 -r1.61
--- cc.php 2005/02/24 01:13:35 1.60
+++ cc.php 2005/03/30 00:28:01 1.61
@@ -133,7 +133,7 @@
</small></pre><pre class="diff" id="context">
$payment_error_return = 'cc_owner=' . urlencode($_POST['cc_owner']) . '&cc_expires_month=' . urlencode($_POST['cc_expires_month']) . '&cc_expires_year=' . urlencode($_POST['cc_expires_year']);
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="context"> }
$this->cc_card_type = $_POST['cc_type'];
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>ipayment.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php?rev=1.41&content-type=text/vnd.viewcvs-markup">1.41</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php.diff?r1=1.41&r2=1.42">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/ipayment.php?rev=1.42&content-type=text/vnd.viewcvs-markup">1.42</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.41 -r1.42
--- ipayment.php 2005/02/24 01:13:35 1.41
+++ ipayment.php 2005/03/30 00:28:01 1.42
@@ -136,7 +136,7 @@
</small></pre><pre class="diff" id="context">
$payment_error_return = 'ipayment_cc_owner=' . urlencode($_POST['ipayment_cc_owner']) . '&ipayment_cc_expires_month=' . urlencode($_POST['ipayment_cc_expires_month']) . '&ipayment_cc_expires_year=' . urlencode($_POST['ipayment_cc_expires_year']) . '&ipayment_cc_checkcode=' . urlencode($_POST['ipayment_cc_checkcode']);
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="context"> }
$this->cc_card_owner = $_POST['ipayment_cc_owner'];
</pre><pre class="diff"><small id="info">@@ -214,8 +214,8 @@
</small></pre><pre class="diff" id="context"> osc_draw_hidden_field('addr_email', $order->customer['email_address']) .
osc_draw_hidden_field('error_lang', ($osC_Session->value('language') == 'english') ? 'en' : 'de') .
osc_draw_hidden_field('silent', '1') .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('silent_error_url', tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code . '&' . $payment_error_return, 'SSL')) .
- osc_draw_hidden_field('redirect_url', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('silent_error_url', tep_href_link(FILENAME_CHECKOUT, 'payment&payment_error=' . $this->code . '&' . $payment_error_return, 'SSL')) .
+ osc_draw_hidden_field('redirect_url', tep_href_link(FILENAME_CHECKOUT, 'process', 'SSL')) .
</pre><pre class="diff" id="context"> osc_draw_hidden_field('cc_number', $this->cc_card_number) .
osc_draw_hidden_field('cc_expdate_month', $this->cc_expiry_month) .
osc_draw_hidden_field('cc_expdate_year', $this->cc_expiry_year);
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>nochex.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php?rev=1.17&content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php.diff?r1=1.17&r2=1.18">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/nochex.php?rev=1.18&content-type=text/vnd.viewcvs-markup">1.18</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.17 -r1.18
--- nochex.php 2005/02/24 01:13:36 1.17
+++ nochex.php 2005/03/30 00:28:01 1.18
@@ -90,8 +90,8 @@
</small></pre><pre class="diff" id="context"> osc_draw_hidden_field('email', MODULE_PAYMENT_NOCHEX_ID) .
osc_draw_hidden_field('amount', number_format($order->info['total'] * $osC_Currencies->currencies['GBP']['value'], $osC_Currencies->currencies['GBP']['decimal_places'])) .
osc_draw_hidden_field('ordernumber', $osC_Customer->id . '-' . date('Ymdhis')) .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('returnurl', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
- osc_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('returnurl', tep_href_link(FILENAME_CHECKOUT, 'process', 'SSL')) .
+ osc_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT, 'payment', 'SSL'));
</pre><pre class="diff" id="context">
return $process_button_string;
}
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>paypal.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php?rev=1.46&content-type=text/vnd.viewcvs-markup">1.46</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php.diff?r1=1.46&r2=1.47">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/paypal.php?rev=1.47&content-type=text/vnd.viewcvs-markup">1.47</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.46 -r1.47
--- paypal.php 2005/02/24 01:13:36 1.46
+++ paypal.php 2005/03/30 00:28:01 1.47
@@ -109,11 +109,11 @@
</small></pre><pre class="diff" id="context"> osc_draw_hidden_field('email', $order->customer['email_address']) .
osc_draw_hidden_field('shipping', number_format($order->info['shipping_cost'] * $osC_Currencies->value($my_currency), $osC_Currencies->decimalPlaces($my_currency))) .
osc_draw_hidden_field('currency_code', $my_currency) .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('return', tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PROCESS, '</span>', 'SSL')) .
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('return', tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'process</span>', 'SSL')) .
</pre><pre class="diff" id="context"> osc_draw_hidden_field('rm', '2') .
tep_draw_hidden_field('bn', 'osCommerce') .
osc_draw_hidden_field('no_note', '1') .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT, '</span>', 'SSL'));
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment</span>', 'SSL'));
</pre><pre class="diff" id="context">
return $process_button_string;
}
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>pm2checkout.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php.diff?r1=1.26&r2=1.27">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/pm2checkout.php?rev=1.27&content-type=text/vnd.viewcvs-markup">1.27</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.26 -r1.27
--- pm2checkout.php 2005/02/24 01:13:36 1.26
+++ pm2checkout.php 2005/03/30 00:28:02 1.27
@@ -133,7 +133,7 @@
</small></pre><pre class="diff" id="context">
$payment_error_return = 'pm_2checkout_cc_owner_firstname=' . urlencode($_POST['pm_2checkout_cc_owner_firstname']) . '&pm_2checkout_cc_owner_lastname=' . urlencode($_POST['pm_2checkout_cc_owner_lastname']) . '&pm_2checkout_cc_expires_month=' . urlencode($_POST['pm_2checkout_cc_expires_month']) . '&pm_2checkout_cc_expires_year=' . urlencode($_POST['pm_2checkout_cc_expires_year']) . '&pm_2checkout_cc_cvv=' . urlencode($_POST['pm_2checkout_cc_cvv']);
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="context"> }
$this->cc_card_type = $_POST['pm_2checkout_cc_type'];
</pre><pre class="diff"><small id="info">@@ -194,7 +194,7 @@
</small></pre><pre class="diff" id="context"> osc_draw_hidden_field('x_ship_to_state', $order->delivery['state']) .
osc_draw_hidden_field('x_ship_to_zip', $order->delivery['postcode']) .
osc_draw_hidden_field('x_ship_to_country', $order->delivery['country']['title']) .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('x_receipt_link_url', tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PROCESS, '</span>', 'SSL')) .
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('x_receipt_link_url', tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'process</span>', 'SSL')) .
</pre><pre class="diff" id="context"> osc_draw_hidden_field('x_email_merchant', ((MODULE_PAYMENT_2CHECKOUT_EMAIL_MERCHANT == 'True') ? 'TRUE' : 'FALSE'));
return $process_button_string;
</pre><pre class="diff"><small id="info">@@ -210,7 +210,7 @@
</small></pre><pre class="diff" id="context"> if ($_POST['x_response_code'] != '1') {
$messageStack->add_session('checkout_payment', MODULE_PAYMENT_2CHECKOUT_TEXT_ERROR_MESSAGE, 'error');
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT, '</span>', 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment</span>', 'SSL'));
</pre><pre class="diff" id="context"> }
}
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>psigate.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php?rev=1.25&content-type=text/vnd.viewcvs-markup">1.25</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php.diff?r1=1.25&r2=1.26">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/psigate.php?rev=1.26&content-type=text/vnd.viewcvs-markup">1.26</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.25 -r1.26
--- psigate.php 2005/02/24 01:19:19 1.25
+++ psigate.php 2005/03/30 00:28:02 1.26
@@ -139,7 +139,7 @@
</small></pre><pre class="diff" id="context">
$payment_error_return = 'psigate_cc_owner=' . urlencode($_POST['psigate_cc_owner']) . '&psigate_cc_expires_month=' . urlencode($_POST['psigate_cc_expires_month']) . '&psigate_cc_expires_year=' . urlencode($_POST['psigate_cc_expires_year']);
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $payment_error_return, 'SSL'));
</pre><pre class="diff" id="context"> }
$this->cc_card_owner = $_POST['psigate_cc_owner'];
</pre><pre class="diff"><small id="info">@@ -218,8 +218,8 @@
</small></pre><pre class="diff" id="context">
$process_button_string = osc_draw_hidden_field('MerchantID', MODULE_PAYMENT_PSIGATE_MERCHANT_ID) .
osc_draw_hidden_field('FullTotal', number_format($order->info['total'] * $osC_Currencies->value(MODULE_PAYMENT_PSIGATE_CURRENCY), $osC_Currencies->currencies[MODULE_PAYMENT_PSIGATE_CURRENCY]['decimal_places'])) .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('ThanksURL', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', true)) .
- osc_draw_hidden_field('NoThanksURL', tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code . $payment_error_return, 'SSL')) .
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('ThanksURL', tep_href_link(FILENAME_CHECKOUT, 'process', 'SSL', true)) .
+ osc_draw_hidden_field('NoThanksURL', tep_href_link(FILENAME_CHECKOUT, 'payment&payment_error=' . $this->code . $payment_error_return, 'SSL')) .
</pre><pre class="diff" id="context"> osc_draw_hidden_field('Bname', ((MODULE_PAYMENT_PSIGATE_INPUT_MODE == 'Local') ? $_POST['psigate_cc_owner'] : $order->billing['firstname'] . ' ' . $order->billing['lastname'])) .
osc_draw_hidden_field('Baddr1', $order->billing['street_address']) .
osc_draw_hidden_field('Bcity', $order->billing['city']);
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment">payment</a><br /></span>
<div class="fileheader"><big><b>secpay.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php?rev=1.40&content-type=text/vnd.viewcvs-markup">1.40</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php.diff?r1=1.40&r2=1.41">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/payment/secpay.php?rev=1.41&content-type=text/vnd.viewcvs-markup">1.41</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.40 -r1.41
--- secpay.php 2005/02/24 01:13:36 1.40
+++ secpay.php 2005/03/30 00:28:02 1.41
@@ -141,8 +141,8 @@
</small></pre><pre class="diff" id="context"> osc_draw_hidden_field('currency', $sec_currency) .
osc_draw_hidden_field('order', $order_details) .
osc_draw_hidden_field('digest', $digest) .
</pre><pre class="diff" id="removed">- osc_draw_hidden_field('callback', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', false) . ';' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code, 'SSL', false)) .
- osc_draw_hidden_field('backcallback', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL', false)) .
</pre><pre class="diff" id="added">+ osc_draw_hidden_field('callback', tep_href_link(FILENAME_CHECKOUT, 'process', 'SSL', false) . ';' . tep_href_link(FILENAME_CHECKOUT, 'payment&payment_error=' . $this->code, 'SSL', false)) .
+ osc_draw_hidden_field('backcallback', tep_href_link(FILENAME_CHECKOUT, 'payment', 'SSL', false)) .
</pre><pre class="diff" id="context"> osc_draw_hidden_field($osC_Session->name, $osC_Session->id) .
osc_draw_hidden_field('options', 'test_status=' . $test_status . ',dups=false,cb_flds=' . $osC_Session->name);
</pre><pre class="diff"><small id="info">@@ -159,10 +159,10 @@
</small></pre><pre class="diff" id="context"> if ($_GET['valid'] == 'true') {
list($REQUEST_URI) = split("hash=", $_SERVER['REQUEST_URI']);
if ($_GET['hash'] != MD5($REQUEST_URI . MODULE_PAYMENT_SECPAY_DIGEST_KEY)) {
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $osC_Session->name . '=' . $_GET[$osC_Session->name] . '&payment_error=' . $this->code, 'SSL', false, false));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $osC_Session->name . '=' . $_GET[$osC_Session->name] . '&payment_error=' . $this->code, 'SSL', false, false));
</pre><pre class="diff" id="context"> }
} else {
</pre><pre class="diff" id="removed">- tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="removedchars">_PAYMENT,</span> $osC_Session->name . '=' . $_GET[$osC_Session->name] . '&payment_error=' . $this->code, 'SSL', false, false));
</pre><pre class="diff" id="added">+ tep_redirect(tep_href_link(FILENAME_CHECKOUT<span id="addedchars">, 'payment&' .</span> $osC_Session->name . '=' . $_GET[$osC_Session->name] . '&payment_error=' . $this->code, 'SSL', false, false));
</pre><pre class="diff" id="context"> }
}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click