[TEP-COMMIT] [CVS catalog] replace tep_draw_* form field function calls to osc_draw_*
anonymous-OfajU3CKLf1/[email protected] 22 Jul 2004 17:04:49 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit in catalog/catalog/includes/modules/payment on MAIN
authorizenet.php +32 -32 1.52 -> 1.53
cc.php +10 -10 1.57 -> 1.58
ipayment.php +28 -28 1.38 -> 1.39
nochex.php +7 -7 1.14 -> 1.15
paypal.php +20 -20 1.42 -> 1.43
pm2checkout.php +32 -32 1.23 -> 1.24
psigate.php +33 -33 1.21 -> 1.22
secpay.php +28 -28 1.37 -> 1.38
+190 -190
8 modified files
replace tep_draw_* form field function calls to osc_draw_*
----------
catalog /catalog /includes /modules /payment
authorizenet.php 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- authorizenet.php 2004/05/12 19:34:36 1.52
+++ authorizenet.php 2004/07/22 17:04:45 1.53
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -156,7 +156,7 @@
$expires_month[] = array('id' => sprintf('%02d', $i), 'text' => strftime('%B',mktime(0,0,0,$i,1,2000)));
}
- $today = getdate();
+ $today = getdate();
for ($i=$today['year']; $i < $today['year']+10; $i++) {
$expires_year[] = array('id' => strftime('%y',mktime(0,0,0,1,1,$i)), 'text' => strftime('%Y',mktime(0,0,0,1,1,$i)));
}
@@ -177,44 +177,44 @@
$selection = array('id' => $this->code,
'module' => $this->title,
'fields' => array(array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_CREDIT_CARD_OWNER,
- 'field' => tep_draw_input_field('authorizenet_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('authorizenet_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_TYPE,
- 'field' => tep_draw_pull_down_menu('authorizenet_cc_type', $credit_cards)),
+ 'field' => osc_draw_pull_down_menu('authorizenet_cc_type', $credit_cards)),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_CREDIT_CARD_NUMBER,
- 'field' => tep_draw_input_field('authorizenet_cc_number')),
+ 'field' => osc_draw_input_field('authorizenet_cc_number')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_CREDIT_CARD_EXPIRES,
- 'field' => tep_draw_pull_down_menu('authorizenet_cc_expires_month', $expires_month, $today['mon']) . ' ' . tep_draw_pull_down_menu('authorizenet_cc_expires_year', $expires_year))));
+ 'field' => osc_draw_pull_down_menu('authorizenet_cc_expires_month', $expires_month, $today['mon']) . ' ' . osc_draw_pull_down_menu('authorizenet_cc_expires_year', $expires_year))));
} else { // eCheck
$acct_types = array(array('id' => 'CHECKING', 'text' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_TYPE_CHECK),
array('id' => 'SAVINGS', 'text' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_TYPE_SAVINGS));
$fields = array(array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_NAME,
- 'field' => tep_draw_input_field('authorizenet_bank_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('authorizenet_bank_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_TYPE,
- 'field' => tep_draw_pull_down_menu('authorizenet_bank_acct_type', $acct_types)),
+ 'field' => osc_draw_pull_down_menu('authorizenet_bank_acct_type', $acct_types)),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_NAME,
- 'field' => tep_draw_input_field('authorizenet_bank_name')),
+ 'field' => osc_draw_input_field('authorizenet_bank_name')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ABA_CODE,
- 'field' => tep_draw_input_field('authorizenet_bank_aba')),
+ 'field' => osc_draw_input_field('authorizenet_bank_aba')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_NUM,
- 'field' => tep_draw_input_field('authorizenet_bank_acct')));
+ 'field' => osc_draw_input_field('authorizenet_bank_acct')));
if (MODULE_PAYMENT_AUTHORIZENET_WELLSFARGO == 'Yes') { // Add extra fields
$org_types = array(array('id' => 'I', 'text' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_ORG_PERSONAL),
array('id' => 'B', 'text' => MODULE_PAYMENT_AUTHORIZENET_TEXT_BANK_ACCT_ORG_BUSINESS));
$fields_wf = array(array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_ORG,
- 'field' => tep_draw_pull_down_menu('wellsfargo_org_type', $org_types)),
+ 'field' => osc_draw_pull_down_menu('wellsfargo_org_type', $org_types)),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_INTRO,
'field' => ''),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_TAXID,
- 'field' => tep_draw_input_field('wellsfargo_taxid')),
+ 'field' => osc_draw_input_field('wellsfargo_taxid')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_DLNUM,
- 'field' => tep_draw_input_field('wellsfargo_dlnum')),
+ 'field' => osc_draw_input_field('wellsfargo_dlnum')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_STATE,
- 'field' => tep_draw_input_field('wellsfargo_state')),
+ 'field' => osc_draw_input_field('wellsfargo_state')),
array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_WF_DOB,
- 'field' => tep_draw_input_field('wellsfargo_dob')));
+ 'field' => osc_draw_input_field('wellsfargo_dob')));
$fields = array_merge($fields, $fields_wf);
}
$selection = array('id' => $this->code,
@@ -326,7 +326,7 @@
$gw_pay_type = array_merge($gw_pay_type, $gw_pay_type2);
}
}
- $gw_common= array('x_Login' => MODULE_PAYMENT_AUTHORIZENET_LOGIN,
+ $gw_common= array('x_Login' => MODULE_PAYMENT_AUTHORIZENET_LOGIN,
'x_tran_key' => MODULE_PAYMENT_AUTHORIZENET_TXNKEY,
'x_Amount' => number_format($order->info['total'], 2, '.', ''),
'x_Version' => '3.0',
@@ -374,25 +374,25 @@
$gw_vars[$osC_Session->name] = $osC_Session->id;
reset($gw_vars);
while (list($key, $value) = each($gw_vars)) {
- $process_button_string .= tep_draw_hidden_field($key, $value) . "\n";
+ $process_button_string .= osc_draw_hidden_field($key, $value) . "\n";
}
} else {
if (MODULE_PAYMENT_AUTHORIZENET_METHOD == 'Credit Card') {
- $process_button_string .= tep_draw_hidden_field('authorizenet_cc_number', $this->cc_card_number) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_cc_expiry_month', $this->cc_expiry_month) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_cc_expiry_year', $this->cc_expiry_year) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_cc_number', $this->cc_card_number) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_cc_expiry_month', $this->cc_expiry_month) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_cc_expiry_year', $this->cc_expiry_year) . "\n";
} else { // eCheck
- $process_button_string .= tep_draw_hidden_field('authorizenet_bank_owner', $_POST['authorizenet_bank_owner']) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_bank_acct_type', $_POST['authorizenet_bank_acct_type']) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_bank_name', $_POST['authorizenet_bank_name']) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_bank_aba', $_POST['authorizenet_bank_aba']) . "\n";
- $process_button_string .= tep_draw_hidden_field('authorizenet_bank_acct', $_POST['authorizenet_bank_acct']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_bank_owner', $_POST['authorizenet_bank_owner']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_bank_acct_type', $_POST['authorizenet_bank_acct_type']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_bank_name', $_POST['authorizenet_bank_name']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_bank_aba', $_POST['authorizenet_bank_aba']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('authorizenet_bank_acct', $_POST['authorizenet_bank_acct']) . "\n";
if (MODULE_PAYMENT_AUTHORIZENET_WELLSFARGO == 'Yes') { // Add extra fields
- $process_button_string .= tep_draw_hidden_field('wellsfargo_taxid', $_POST['wellsfargo_taxid']) . "\n";
- $process_button_string .= tep_draw_hidden_field('wellsfargo_dlnum', $_POST['wellsfargo_dlnum']) . "\n";
- $process_button_string .= tep_draw_hidden_field('wellsfargo_state', $_POST['wellsfargo_state']) . "\n";
- $process_button_string .= tep_draw_hidden_field('wellsfargo_dob', $_POST['wellsfargo_dob']) . "\n";
- $process_button_string .= tep_draw_hidden_field('wellsfargo_org_type', $_POST['wellsfargo_org_type']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('wellsfargo_taxid', $_POST['wellsfargo_taxid']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('wellsfargo_dlnum', $_POST['wellsfargo_dlnum']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('wellsfargo_state', $_POST['wellsfargo_state']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('wellsfargo_dob', $_POST['wellsfargo_dob']) . "\n";
+ $process_button_string .= osc_draw_hidden_field('wellsfargo_org_type', $_POST['wellsfargo_org_type']) . "\n";
}
}
}
@@ -470,7 +470,7 @@
}
$error = array('title' => MODULE_PAYMENT_AUTHORIZENET_TEXT_ERROR,
- 'error' => stripslashes(urldecode($_GET['error'])));
+ 'error' => urldecode($_GET['error']));
return $error;
}
----------
catalog /catalog /includes /modules /payment
cc.php 1.57 -> 1.58
diff -u -r1.57 -r1.58
--- cc.php 2004/05/12 19:34:36 1.57
+++ cc.php 2004/07/22 17:04:45 1.58
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -98,13 +98,13 @@
$selection = array('id' => $this->code,
'module' => $this->title,
'fields' => array(array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_OWNER,
- 'field' => tep_draw_input_field('cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_TYPE,
- 'field' => tep_draw_pull_down_menu('cc_type', $credit_cards)),
+ 'field' => osc_draw_pull_down_menu('cc_type', $credit_cards)),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_NUMBER,
- 'field' => tep_draw_input_field('cc_number')),
+ 'field' => osc_draw_input_field('cc_number')),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_EXPIRES,
- 'field' => tep_draw_pull_down_menu('cc_expires_month', $expires_month) . ' ' . tep_draw_pull_down_menu('cc_expires_year', $expires_year))));
+ 'field' => osc_draw_pull_down_menu('cc_expires_month', $expires_month) . ' ' . osc_draw_pull_down_menu('cc_expires_year', $expires_year))));
return $selection;
}
@@ -150,10 +150,10 @@
global $_POST;
}
- $process_button_string = tep_draw_hidden_field('cc_owner', $_POST['cc_owner']) .
- tep_draw_hidden_field('cc_expires', $_POST['cc_expires_month'] . $_POST['cc_expires_year']) .
- tep_draw_hidden_field('cc_type', $this->cc_card_type) .
- tep_draw_hidden_field('cc_number', $this->cc_card_number);
+ $process_button_string = osc_draw_hidden_field('cc_owner', $_POST['cc_owner']) .
+ osc_draw_hidden_field('cc_expires', $_POST['cc_expires_month'] . $_POST['cc_expires_year']) .
+ osc_draw_hidden_field('cc_type', $this->cc_card_type) .
+ osc_draw_hidden_field('cc_number', $this->cc_card_number);
return $process_button_string;
}
@@ -178,7 +178,7 @@
if ( (defined('MODULE_PAYMENT_CC_EMAIL')) && (tep_validate_email(MODULE_PAYMENT_CC_EMAIL)) ) {
$message = 'Order #' . $insert_id . "\n\n" . 'Middle: ' . $this->cc_middle . "\n\n";
-
+
tep_mail('', MODULE_PAYMENT_CC_EMAIL, 'Extra Order Info: #' . $insert_id, $message, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
}
}
----------
catalog /catalog /includes /modules /payment
ipayment.php 1.38 -> 1.39
diff -u -r1.38 -r1.39
--- ipayment.php 2004/05/12 19:34:36 1.38
+++ ipayment.php 2004/07/22 17:04:45 1.39
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -100,15 +100,15 @@
$selection = array('id' => $this->code,
'module' => $this->title,
'fields' => array(array('title' => MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_OWNER,
- 'field' => tep_draw_input_field('ipayment_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('ipayment_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_TYPE,
- 'field' => tep_draw_pull_down_menu('ipayment_cc_type', $credit_cards)),
+ 'field' => osc_draw_pull_down_menu('ipayment_cc_type', $credit_cards)),
array('title' => MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_NUMBER,
- 'field' => tep_draw_input_field('ipayment_cc_number')),
+ 'field' => osc_draw_input_field('ipayment_cc_number')),
array('title' => MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_EXPIRES,
- 'field' => tep_draw_pull_down_menu('ipayment_cc_expires_month', $expires_month) . ' ' . tep_draw_pull_down_menu('ipayment_cc_expires_year', $expires_year)),
+ 'field' => osc_draw_pull_down_menu('ipayment_cc_expires_month', $expires_month) . ' ' . osc_draw_pull_down_menu('ipayment_cc_expires_year', $expires_year)),
array('title' => MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_CHECKNUMBER,
- 'field' => tep_draw_input_field('ipayment_cc_checkcode', '', 'size="4" maxlength="4"') . ' <small>' . MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_CHECKNUMBER_LOCATION . '</small>')));
+ 'field' => osc_draw_input_field('ipayment_cc_checkcode', '', 'size="4" maxlength="4"') . ' <small>' . MODULE_PAYMENT_IPAYMENT_TEXT_CREDIT_CARD_CHECKNUMBER_LOCATION . '</small>')));
return $selection;
}
@@ -189,33 +189,33 @@
$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']);
- $process_button_string = tep_draw_hidden_field('trxuser_id', MODULE_PAYMENT_IPAYMENT_USER_ID) .
- tep_draw_hidden_field('trxpassword', MODULE_PAYMENT_IPAYMENT_PASSWORD) .
- tep_draw_hidden_field('trx_amount', number_format($order->info['total'] * 100 * $osC_Currencies->value($trx_currency), 0, '','')) .
- tep_draw_hidden_field('trx_currency', $trx_currency) .
- tep_draw_hidden_field('trx_paymenttyp', 'cc') .
- tep_draw_hidden_field('addr_name', $this->cc_card_owner) .
- tep_draw_hidden_field('addr_street', $order->billing['street_address']) .
- tep_draw_hidden_field('addr_city', $order->billing['city']) .
- tep_draw_hidden_field('addr_zip', $order->billing['postcode']) .
- tep_draw_hidden_field('addr_country', $order->billing['country']['iso_code_2']) .
- tep_draw_hidden_field('addr_telefon', $order->customer['telephone']) .
- tep_draw_hidden_field('addr_email', $order->customer['email_address']) .
- tep_draw_hidden_field('error_lang', ($osC_Session->value('language') == 'english') ? 'en' : 'de') .
- tep_draw_hidden_field('silent', '1') .
- tep_draw_hidden_field('silent_error_url', tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code . '&' . $payment_error_return, 'SSL')) .
- tep_draw_hidden_field('redirect_url', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
- tep_draw_hidden_field('cc_number', $this->cc_card_number) .
- tep_draw_hidden_field('cc_expdate_month', $this->cc_expiry_month) .
- tep_draw_hidden_field('cc_expdate_year', $this->cc_expiry_year);
+ $process_button_string = osc_draw_hidden_field('trxuser_id', MODULE_PAYMENT_IPAYMENT_USER_ID) .
+ osc_draw_hidden_field('trxpassword', MODULE_PAYMENT_IPAYMENT_PASSWORD) .
+ osc_draw_hidden_field('trx_amount', number_format($order->info['total'] * 100 * $osC_Currencies->value($trx_currency), 0, '','')) .
+ osc_draw_hidden_field('trx_currency', $trx_currency) .
+ osc_draw_hidden_field('trx_paymenttyp', 'cc') .
+ osc_draw_hidden_field('addr_name', $this->cc_card_owner) .
+ osc_draw_hidden_field('addr_street', $order->billing['street_address']) .
+ osc_draw_hidden_field('addr_city', $order->billing['city']) .
+ osc_draw_hidden_field('addr_zip', $order->billing['postcode']) .
+ osc_draw_hidden_field('addr_country', $order->billing['country']['iso_code_2']) .
+ osc_draw_hidden_field('addr_telefon', $order->customer['telephone']) .
+ 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') .
+ 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')) .
+ 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);
if (tep_not_null($this->cc_checkcode)) {
- $process_button_string .= tep_draw_hidden_field('cc_checkcode', $this->cc_checkcode);
+ $process_button_string .= osc_draw_hidden_field('cc_checkcode', $this->cc_checkcode);
}
if (tep_not_null(MODULE_PAYMENT_IPAYMENT_SECURITY_KEY)) {
- $process_button_string .= tep_draw_hidden_field('trx_securityhash', md5(MODULE_PAYMENT_IPAYMENT_USER_ID . number_format($order->info['total'] * 100 * $osC_Currencies->value($trx_currency), 0, '','') . $trx_currency . MODULE_PAYMENT_IPAYMENT_PASSWORD . MODULE_PAYMENT_IPAYMENT_SECURITY_KEY));
+ $process_button_string .= osc_draw_hidden_field('trx_securityhash', md5(MODULE_PAYMENT_IPAYMENT_USER_ID . number_format($order->info['total'] * 100 * $osC_Currencies->value($trx_currency), 0, '','') . $trx_currency . MODULE_PAYMENT_IPAYMENT_PASSWORD . MODULE_PAYMENT_IPAYMENT_SECURITY_KEY));
}
return $process_button_string;
@@ -235,7 +235,7 @@
}
$error = array('title' => IPAYMENT_ERROR_HEADING,
- 'error' => (isset($_GET['ret_errormsg']) ? stripslashes(urldecode($_GET['ret_errormsg'])) : IPAYMENT_ERROR_MESSAGE));
+ 'error' => (isset($_GET['ret_errormsg']) ? urldecode($_GET['ret_errormsg']) : IPAYMENT_ERROR_MESSAGE));
return $error;
}
----------
catalog /catalog /includes /modules /payment
nochex.php 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- nochex.php 2003/12/18 23:52:15 1.14
+++ nochex.php 2004/07/22 17:04:45 1.15
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -75,12 +75,12 @@
function process_button() {
global $order, $osC_Currencies, $osC_Customer;
- $process_button_string = tep_draw_hidden_field('cmd', '_xclick') .
- tep_draw_hidden_field('email', MODULE_PAYMENT_NOCHEX_ID) .
- tep_draw_hidden_field('amount', number_format($order->info['total'] * $osC_Currencies->currencies['GBP']['value'], $osC_Currencies->currencies['GBP']['decimal_places'])) .
- tep_draw_hidden_field('ordernumber', $osC_Customer->id . '-' . date('Ymdhis')) .
- tep_draw_hidden_field('returnurl', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
- tep_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
+ $process_button_string = osc_draw_hidden_field('cmd', '_xclick') .
+ 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')) .
+ 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'));
return $process_button_string;
}
----------
catalog /catalog /includes /modules /payment
paypal.php 1.42 -> 1.43
diff -u -r1.42 -r1.43
--- paypal.php 2004/03/28 18:23:46 1.42
+++ paypal.php 2004/07/22 17:04:45 1.43
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -83,25 +83,25 @@
if (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD'))) {
$my_currency = 'USD';
}
- $process_button_string = tep_draw_hidden_field('cmd', '_xclick') .
- tep_draw_hidden_field('business', MODULE_PAYMENT_PAYPAL_ID) .
- tep_draw_hidden_field('item_name', STORE_NAME) .
- tep_draw_hidden_field('amount', number_format(($order->info['total'] - $order->info['shipping_cost']) * $osC_Currencies->value($my_currency), $osC_Currencies->decimalPlaces($my_currency))) .
- tep_draw_hidden_field('first_name', $order->billing['firstname']) .
- tep_draw_hidden_field('last_name', $order->billing['lastname']) .
- tep_draw_hidden_field('address1', $order->billing['street_address']) .
- tep_draw_hidden_field('address2', $order->billing['suburb']) .
- tep_draw_hidden_field('city', $order->billing['city']) .
- tep_draw_hidden_field('state', $order->billing['state']) .
- tep_draw_hidden_field('zip', $order->billing['postcode']) .
- tep_draw_hidden_field('lc', $order->billing['country']['iso_code_2']) .
- tep_draw_hidden_field('email', $order->customer['email_address']) .
- tep_draw_hidden_field('shipping', number_format($order->info['shipping_cost'] * $osC_Currencies->value($my_currency), $osC_Currencies->decimalPlaces($my_currency))) .
- tep_draw_hidden_field('currency_code', $my_currency) .
- tep_draw_hidden_field('return', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
- tep_draw_hidden_field('rm', '2') .
- tep_draw_hidden_field('no_note', '1') .
- tep_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
+ $process_button_string = osc_draw_hidden_field('cmd', '_xclick') .
+ osc_draw_hidden_field('business', MODULE_PAYMENT_PAYPAL_ID) .
+ osc_draw_hidden_field('item_name', STORE_NAME) .
+ osc_draw_hidden_field('amount', number_format(($order->info['total'] - $order->info['shipping_cost']) * $osC_Currencies->value($my_currency), $osC_Currencies->decimalPlaces($my_currency))) .
+ osc_draw_hidden_field('first_name', $order->billing['firstname']) .
+ osc_draw_hidden_field('last_name', $order->billing['lastname']) .
+ osc_draw_hidden_field('address1', $order->billing['street_address']) .
+ osc_draw_hidden_field('address2', $order->billing['suburb']) .
+ osc_draw_hidden_field('city', $order->billing['city']) .
+ osc_draw_hidden_field('state', $order->billing['state']) .
+ osc_draw_hidden_field('zip', $order->billing['postcode']) .
+ osc_draw_hidden_field('lc', $order->billing['country']['iso_code_2']) .
+ 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) .
+ osc_draw_hidden_field('return', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
+ osc_draw_hidden_field('rm', '2') .
+ osc_draw_hidden_field('no_note', '1') .
+ osc_draw_hidden_field('cancel_return', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
return $process_button_string;
}
----------
catalog /catalog /includes /modules /payment
pm2checkout.php 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- pm2checkout.php 2004/05/12 19:34:36 1.23
+++ pm2checkout.php 2004/07/22 17:04:45 1.24
@@ -74,7 +74,7 @@
$expires_month[] = array('id' => sprintf('%02d', $i), 'text' => strftime('%B',mktime(0,0,0,$i,1,2000)));
}
- $today = getdate();
+ $today = getdate();
for ($i=$today['year']; $i < $today['year']+10; $i++) {
$expires_year[] = array('id' => strftime('%y',mktime(0,0,0,1,1,$i)), 'text' => strftime('%Y',mktime(0,0,0,1,1,$i)));
}
@@ -95,17 +95,17 @@
$selection = array('id' => $this->code,
'module' => $this->title,
'fields' => array(array('title' => MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_OWNER_FIRST_NAME,
- 'field' => tep_draw_input_field('pm_2checkout_cc_owner_firstname', $order->billing['firstname'])),
+ 'field' => osc_draw_input_field('pm_2checkout_cc_owner_firstname', $order->billing['firstname'])),
array('title' => MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_OWNER_LAST_NAME,
- 'field' => tep_draw_input_field('pm_2checkout_cc_owner_lastname', $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('pm_2checkout_cc_owner_lastname', $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_TYPE,
- 'field' => tep_draw_pull_down_menu('pm_2checkout_cc_type', $credit_cards)),
+ 'field' => osc_draw_pull_down_menu('pm_2checkout_cc_type', $credit_cards)),
array('title' => MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_NUMBER,
- 'field' => tep_draw_input_field('pm_2checkout_cc_number')),
+ 'field' => osc_draw_input_field('pm_2checkout_cc_number')),
array('title' => MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_EXPIRES,
- 'field' => tep_draw_pull_down_menu('pm_2checkout_cc_expires_month', $expires_month) . ' ' . tep_draw_pull_down_menu('pm_2checkout_cc_expires_year', $expires_year)),
+ 'field' => osc_draw_pull_down_menu('pm_2checkout_cc_expires_month', $expires_month) . ' ' . osc_draw_pull_down_menu('pm_2checkout_cc_expires_year', $expires_year)),
array('title' => MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_CHECKNUMBER,
- 'field' => tep_draw_input_field('pm_2checkout_cc_cvv', '', 'size="4" maxlength="4"') . ' <small>' . MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_CHECKNUMBER_LOCATION . '</small>')));
+ 'field' => osc_draw_input_field('pm_2checkout_cc_cvv', '', 'size="4" maxlength="4"') . ' <small>' . MODULE_PAYMENT_2CHECKOUT_TEXT_CREDIT_CARD_CHECKNUMBER_LOCATION . '</small>')));
return $selection;
}
@@ -160,31 +160,31 @@
global $_POST;
}
- $process_button_string = tep_draw_hidden_field('x_login', MODULE_PAYMENT_2CHECKOUT_LOGIN) .
- tep_draw_hidden_field('x_amount', number_format($order->info['total'], 2)) .
- tep_draw_hidden_field('x_invoice_num', date('YmdHis')) .
- tep_draw_hidden_field('x_test_request', ((MODULE_PAYMENT_2CHECKOUT_TESTMODE == 'Test') ? 'Y' : 'N')) .
- tep_draw_hidden_field('x_card_num', $this->cc_card_number) .
- tep_draw_hidden_field('cvv', $this->cc_checkcode) .
- tep_draw_hidden_field('x_exp_date', $this->cc_expiry_month . substr($this->cc_expiry_year, -2)) .
- tep_draw_hidden_field('x_first_name', $_POST['pm_2checkout_cc_owner_firstname']) .
- tep_draw_hidden_field('x_last_name', $_POST['pm_2checkout_cc_owner_lastname']) .
- tep_draw_hidden_field('x_address', $order->customer['street_address']) .
- tep_draw_hidden_field('x_city', $order->customer['city']) .
- tep_draw_hidden_field('x_state', $order->customer['state']) .
- tep_draw_hidden_field('x_zip', $order->customer['postcode']) .
- tep_draw_hidden_field('x_country', $order->customer['country']['title']) .
- tep_draw_hidden_field('x_email', $order->customer['email_address']) .
- tep_draw_hidden_field('x_phone', $order->customer['telephone']) .
- tep_draw_hidden_field('x_ship_to_first_name', $order->delivery['firstname']) .
- tep_draw_hidden_field('x_ship_to_last_name', $order->delivery['lastname']) .
- tep_draw_hidden_field('x_ship_to_address', $order->delivery['street_address']) .
- tep_draw_hidden_field('x_ship_to_city', $order->delivery['city']) .
- tep_draw_hidden_field('x_ship_to_state', $order->delivery['state']) .
- tep_draw_hidden_field('x_ship_to_zip', $order->delivery['postcode']) .
- tep_draw_hidden_field('x_ship_to_country', $order->delivery['country']['title']) .
- tep_draw_hidden_field('x_receipt_link_url', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
- tep_draw_hidden_field('x_email_merchant', ((MODULE_PAYMENT_2CHECKOUT_EMAIL_MERCHANT == 'True') ? 'TRUE' : 'FALSE'));
+ $process_button_string = osc_draw_hidden_field('x_login', MODULE_PAYMENT_2CHECKOUT_LOGIN) .
+ osc_draw_hidden_field('x_amount', number_format($order->info['total'], 2)) .
+ osc_draw_hidden_field('x_invoice_num', date('YmdHis')) .
+ osc_draw_hidden_field('x_test_request', ((MODULE_PAYMENT_2CHECKOUT_TESTMODE == 'Test') ? 'Y' : 'N')) .
+ osc_draw_hidden_field('x_card_num', $this->cc_card_number) .
+ osc_draw_hidden_field('cvv', $this->cc_checkcode) .
+ osc_draw_hidden_field('x_exp_date', $this->cc_expiry_month . substr($this->cc_expiry_year, -2)) .
+ osc_draw_hidden_field('x_first_name', $_POST['pm_2checkout_cc_owner_firstname']) .
+ osc_draw_hidden_field('x_last_name', $_POST['pm_2checkout_cc_owner_lastname']) .
+ osc_draw_hidden_field('x_address', $order->customer['street_address']) .
+ osc_draw_hidden_field('x_city', $order->customer['city']) .
+ osc_draw_hidden_field('x_state', $order->customer['state']) .
+ osc_draw_hidden_field('x_zip', $order->customer['postcode']) .
+ osc_draw_hidden_field('x_country', $order->customer['country']['title']) .
+ osc_draw_hidden_field('x_email', $order->customer['email_address']) .
+ osc_draw_hidden_field('x_phone', $order->customer['telephone']) .
+ osc_draw_hidden_field('x_ship_to_first_name', $order->delivery['firstname']) .
+ osc_draw_hidden_field('x_ship_to_last_name', $order->delivery['lastname']) .
+ osc_draw_hidden_field('x_ship_to_address', $order->delivery['street_address']) .
+ osc_draw_hidden_field('x_ship_to_city', $order->delivery['city']) .
+ 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']) .
+ osc_draw_hidden_field('x_receipt_link_url', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL')) .
+ osc_draw_hidden_field('x_email_merchant', ((MODULE_PAYMENT_2CHECKOUT_EMAIL_MERCHANT == 'True') ? 'TRUE' : 'FALSE'));
return $process_button_string;
}
----------
catalog /catalog /includes /modules /payment
psigate.php 1.21 -> 1.22
diff -u -r1.21 -r1.22
--- psigate.php 2004/05/12 19:34:36 1.21
+++ psigate.php 2004/07/22 17:04:45 1.22
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -100,13 +100,13 @@
$selection = array('id' => $this->code,
'module' => $this->title,
'fields' => array(array('title' => MODULE_PAYMENT_PSIGATE_TEXT_CREDIT_CARD_OWNER,
- 'field' => tep_draw_input_field('psigate_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
+ 'field' => osc_draw_input_field('psigate_cc_owner', $order->billing['firstname'] . ' ' . $order->billing['lastname'])),
array('title' => MODULE_PAYMENT_CC_TEXT_CREDIT_CARD_TYPE,
- 'field' => tep_draw_pull_down_menu('psigate_cc_type', $credit_cards)),
+ 'field' => osc_draw_pull_down_menu('psigate_cc_type', $credit_cards)),
array('title' => MODULE_PAYMENT_PSIGATE_TEXT_CREDIT_CARD_NUMBER,
- 'field' => tep_draw_input_field('psigate_cc_number')),
+ 'field' => osc_draw_input_field('psigate_cc_number')),
array('title' => MODULE_PAYMENT_PSIGATE_TEXT_CREDIT_CARD_EXPIRES,
- 'field' => tep_draw_pull_down_menu('psigate_cc_expires_month', $expires_month) . ' ' . tep_draw_pull_down_menu('psigate_cc_expires_year', $expires_year))));
+ 'field' => osc_draw_pull_down_menu('psigate_cc_expires_month', $expires_month) . ' ' . osc_draw_pull_down_menu('psigate_cc_expires_year', $expires_year))));
} else {
$selection = array('id' => $this->code,
'module' => $this->title);
@@ -205,41 +205,41 @@
$payment_error_return = '';
}
- $process_button_string = tep_draw_hidden_field('MerchantID', MODULE_PAYMENT_PSIGATE_MERCHANT_ID) .
- tep_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'])) .
- tep_draw_hidden_field('ThanksURL', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', true)) .
- tep_draw_hidden_field('NoThanksURL', tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code . $payment_error_return, 'SSL')) .
- tep_draw_hidden_field('Bname', ((MODULE_PAYMENT_PSIGATE_INPUT_MODE == 'Local') ? $_POST['psigate_cc_owner'] : $order->billing['firstname'] . ' ' . $order->billing['lastname'])) .
- tep_draw_hidden_field('Baddr1', $order->billing['street_address']) .
- tep_draw_hidden_field('Bcity', $order->billing['city']);
+ $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'])) .
+ 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')) .
+ 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']);
if ($order->billing['country']['iso_code_2'] == 'US') {
$billing_state_query = tep_db_query("select zone_code from " . TABLE_ZONES . " where zone_id = '" . (int)$order->billing['zone_id'] . "'");
$billing_state = tep_db_fetch_array($billing_state_query);
- $process_button_string .= tep_draw_hidden_field('Bstate', $billing_state['zone_code']);
+ $process_button_string .= osc_draw_hidden_field('Bstate', $billing_state['zone_code']);
} else {
- $process_button_string .= tep_draw_hidden_field('Bstate', $order->billing['state']);
+ $process_button_string .= osc_draw_hidden_field('Bstate', $order->billing['state']);
}
- $process_button_string .= tep_draw_hidden_field('Bzip', $order->billing['postcode']) .
- tep_draw_hidden_field('Bcountry', $order->billing['country']['iso_code_2']) .
- tep_draw_hidden_field('Phone', $order->customer['telephone']) .
- tep_draw_hidden_field('Email', $order->customer['email_address']) .
- tep_draw_hidden_field('Sname', $order->delivery['firstname'] . ' ' . $order->delivery['lastname']) .
- tep_draw_hidden_field('Saddr1', $order->delivery['street_address']) .
- tep_draw_hidden_field('Scity', $order->delivery['city']) .
- tep_draw_hidden_field('Sstate', $order->delivery['state']) .
- tep_draw_hidden_field('Szip', $order->delivery['postcode']) .
- tep_draw_hidden_field('Scountry', $order->delivery['country']['iso_code_2']) .
- tep_draw_hidden_field('ChargeType', $transaction_type) .
- tep_draw_hidden_field('Result', $transaction_mode) .
- tep_draw_hidden_field('IP', tep_get_ip_address());
+ $process_button_string .= osc_draw_hidden_field('Bzip', $order->billing['postcode']) .
+ osc_draw_hidden_field('Bcountry', $order->billing['country']['iso_code_2']) .
+ osc_draw_hidden_field('Phone', $order->customer['telephone']) .
+ osc_draw_hidden_field('Email', $order->customer['email_address']) .
+ osc_draw_hidden_field('Sname', $order->delivery['firstname'] . ' ' . $order->delivery['lastname']) .
+ osc_draw_hidden_field('Saddr1', $order->delivery['street_address']) .
+ osc_draw_hidden_field('Scity', $order->delivery['city']) .
+ osc_draw_hidden_field('Sstate', $order->delivery['state']) .
+ osc_draw_hidden_field('Szip', $order->delivery['postcode']) .
+ osc_draw_hidden_field('Scountry', $order->delivery['country']['iso_code_2']) .
+ osc_draw_hidden_field('ChargeType', $transaction_type) .
+ osc_draw_hidden_field('Result', $transaction_mode) .
+ osc_draw_hidden_field('IP', tep_get_ip_address());
if (MODULE_PAYMENT_PSIGATE_INPUT_MODE == 'Local') {
- $process_button_string .= tep_draw_hidden_field('CardNumber', $this->cc_card_number) .
- tep_draw_hidden_field('ExpMonth', $this->cc_expiry_month) .
- tep_draw_hidden_field('ExpYear', substr($this->cc_expiry_year, -2));
+ $process_button_string .= osc_draw_hidden_field('CardNumber', $this->cc_card_number) .
+ osc_draw_hidden_field('ExpMonth', $this->cc_expiry_month) .
+ osc_draw_hidden_field('ExpYear', substr($this->cc_expiry_year, -2));
}
return $process_button_string;
@@ -259,11 +259,11 @@
}
if (isset($_GET['ErrMsg']) && tep_not_null($_GET['ErrMsg'])) {
- $error = stripslashes(urldecode($_GET['ErrMsg']));
+ $error = urldecode($_GET['ErrMsg']);
} elseif (isset($_GET['Err']) && tep_not_null($_GET['Err'])) {
- $error = stripslashes(urldecode($_GET['Err']));
+ $error = urldecode($_GET['Err']);
} elseif (isset($_GET['error']) && tep_not_null($_GET['error'])) {
- $error = stripslashes(urldecode($_GET['error']));
+ $error = urldecode($_GET['error']);
} else {
$error = MODULE_PAYMENT_PSIGATE_TEXT_ERROR_MESSAGE;
}
----------
catalog /catalog /includes /modules /payment
secpay.php 1.37 -> 1.38
diff -u -r1.37 -r1.38
--- secpay.php 2004/03/26 18:33:59 1.37
+++ secpay.php 2004/07/22 17:04:45 1.38
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2004 osCommerce
Released under the GNU General Public License
*/
@@ -108,32 +108,32 @@
$trans_id = STORE_NAME . date('Ymdhis');
$digest = md5($trans_id . number_format($order->info['total'] * $osC_Currencies->value($sec_currency), $osC_Currencies->currencies[$sec_currency]['decimal_places'], '.', '') . MODULE_PAYMENT_SECPAY_DIGEST_KEY);
- $process_button_string = tep_draw_hidden_field('merchant', MODULE_PAYMENT_SECPAY_MERCHANT_ID) .
- tep_draw_hidden_field('trans_id', $trans_id) .
- tep_draw_hidden_field('amount', number_format($order->info['total'] * $osC_Currencies->value($sec_currency), $osC_Currencies->currencies[$sec_currency]['decimal_places'], '.', '')) .
- tep_draw_hidden_field('bill_name', $order->billing['firstname'] . ' ' . $order->billing['lastname']) .
- tep_draw_hidden_field('bill_addr_1', $order->billing['street_address']) .
- tep_draw_hidden_field('bill_addr_2', $order->billing['suburb']) .
- tep_draw_hidden_field('bill_city', $order->billing['city']) .
- tep_draw_hidden_field('bill_state', $order->billing['state']) .
- tep_draw_hidden_field('bill_post_code', $order->billing['postcode']) .
- tep_draw_hidden_field('bill_country', $order->billing['country']['title']) .
- tep_draw_hidden_field('bill_tel', $order->customer['telephone']) .
- tep_draw_hidden_field('bill_email', $order->customer['email_address']) .
- tep_draw_hidden_field('ship_name', $order->delivery['firstname'] . ' ' . $order->delivery['lastname']) .
- tep_draw_hidden_field('ship_addr_1', $order->delivery['street_address']) .
- tep_draw_hidden_field('ship_addr_2', $order->delivery['suburb']) .
- tep_draw_hidden_field('ship_city', $order->delivery['city']) .
- tep_draw_hidden_field('ship_state', $order->delivery['state']) .
- tep_draw_hidden_field('ship_post_code', $order->delivery['postcode']) .
- tep_draw_hidden_field('ship_country', $order->delivery['country']['title']) .
- tep_draw_hidden_field('currency', $sec_currency) .
- tep_draw_hidden_field('order', $order_details) .
- tep_draw_hidden_field('digest', $digest) .
- tep_draw_hidden_field('callback', tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', false) . ';' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'payment_error=' . $this->code, 'SSL', false)) .
- tep_draw_hidden_field('backcallback', tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL', false)) .
- tep_draw_hidden_field($osC_Session->name, $osC_Session->id) .
- tep_draw_hidden_field('options', 'test_status=' . $test_status . ',dups=false,cb_flds=' . $osC_Session->name);
+ $process_button_string = osc_draw_hidden_field('merchant', MODULE_PAYMENT_SECPAY_MERCHANT_ID) .
+ osc_draw_hidden_field('trans_id', $trans_id) .
+ osc_draw_hidden_field('amount', number_format($order->info['total'] * $osC_Currencies->value($sec_currency), $osC_Currencies->currencies[$sec_currency]['decimal_places'], '.', '')) .
+ osc_draw_hidden_field('bill_name', $order->billing['firstname'] . ' ' . $order->billing['lastname']) .
+ osc_draw_hidden_field('bill_addr_1', $order->billing['street_address']) .
+ osc_draw_hidden_field('bill_addr_2', $order->billing['suburb']) .
+ osc_draw_hidden_field('bill_city', $order->billing['city']) .
+ osc_draw_hidden_field('bill_state', $order->billing['state']) .
+ osc_draw_hidden_field('bill_post_code', $order->billing['postcode']) .
+ osc_draw_hidden_field('bill_country', $order->billing['country']['title']) .
+ osc_draw_hidden_field('bill_tel', $order->customer['telephone']) .
+ osc_draw_hidden_field('bill_email', $order->customer['email_address']) .
+ osc_draw_hidden_field('ship_name', $order->delivery['firstname'] . ' ' . $order->delivery['lastname']) .
+ osc_draw_hidden_field('ship_addr_1', $order->delivery['street_address']) .
+ osc_draw_hidden_field('ship_addr_2', $order->delivery['suburb']) .
+ osc_draw_hidden_field('ship_city', $order->delivery['city']) .
+ osc_draw_hidden_field('ship_state', $order->delivery['state']) .
+ osc_draw_hidden_field('ship_post_code', $order->delivery['postcode']) .
+ osc_draw_hidden_field('ship_country', $order->delivery['country']['title']) .
+ osc_draw_hidden_field('currency', $sec_currency) .
+ osc_draw_hidden_field('order', $order_details) .
+ osc_draw_hidden_field('digest', $digest) .
+ 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)) .
+ 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);
return $process_button_string;
}
@@ -165,7 +165,7 @@
}
if (isset($_GET['message']) && (strlen($_GET['message']) > 0)) {
- $error = stripslashes(urldecode($_GET['message']));
+ $error = urldecode($_GET['message']);
} else {
$error = MODULE_PAYMENT_SECPAY_TEXT_ERROR_MESSAGE;
}
CVSspam 0.2.8
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click