Skip to content

Commit

Permalink
Merge pull request #1 from opencart/3.0.x.x_Maintenance
Browse files Browse the repository at this point in the history 
3.0.x.x maintenance
  • Loading branch information
@condor2
condor2 committed Jul 20, 2020
2 parents 2f93e6a + d82babe commit 885ec10
Show file tree
Hide file tree
Showing 39 changed files with 49 additions and 48 deletions.
6 changes: 3 additions & 3 deletions upload/.htaccess.txt
View file
Expand Up @@ -6,11 +6,11 @@

Options +FollowSymlinks

# Prevent Directoy listing
# Prevent Directory listing
Options -Indexes

# Prevent Direct Access to files
<FilesMatch "(?i)((\.tpl|.twig|\.ini|\.log|(?<!robots)\.txt))">
<FilesMatch "(?i)((\.tpl|\.twig|\.ini|\.log|(?<!robots)\.txt))">
Require all denied
## For apache 2.2 and older, replace "Require all denied" with these two lines :
# Order deny,allow
Expand Down Expand Up @@ -53,4 +53,4 @@ RewriteRule ^([^?]*) index.php?_route_=$1 [L,QSA]
# php_value max_input_time 200

# 7. disable open_basedir limitations
# php_admin_value open_basedir none
# php_admin_value open_basedir none
7 changes: 4 additions & 3 deletions upload/.idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion upload/admin/controller/catalog/download.php
View file
Expand Up @@ -317,7 +317,7 @@ protected function getForm() {
$data['user_token'] = $this->session->data['user_token'];

if (isset($this->request->get['download_id'])) {
$data['download_id'] = $this->request->get['download_id'];
$data['download_id'] = (int)$this->request->get['download_id'];
} else {
$data['download_id'] = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/customer/customer.php
View file
Expand Up @@ -542,7 +542,7 @@ protected function getForm() {
$data['user_token'] = $this->session->data['user_token'];

if (isset($this->request->get['customer_id'])) {
$data['customer_id'] = $this->request->get['customer_id'];
$data['customer_id'] = (int)$this->request->get['customer_id'];
} else {
$data['customer_id'] = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/amazon_login_pay.php
View file
Expand Up @@ -391,7 +391,7 @@ public function order() {

$data['amazon_login_pay_order'] = $amazon_login_pay_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/amazon_login_pay_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/bluepay_hosted.php
View file
Expand Up @@ -185,7 +185,7 @@ public function order() {

$data['bluepay_hosted_order'] = $bluepay_hosted_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/bluepay_hosted_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/bluepay_redirect.php
View file
Expand Up @@ -168,7 +168,7 @@ public function order() {

$data['bluepay_redirect_order'] = $bluepay_redirect_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/bluepay_redirect_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/cardconnect.php
View file
Expand Up @@ -285,7 +285,7 @@ public function order() {

$data['cardconnect_order'] = $cardconnect_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/cardinity.php
View file
Expand Up @@ -123,7 +123,7 @@ public function order() {
$this->load->language('extension/payment/cardinity');

$data['user_token'] = $this->session->data['user_token'];
$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

return $this->load->view('extension/payment/cardinity_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/eway.php
View file
Expand Up @@ -232,7 +232,7 @@ public function order() {

$data['eway_order'] = $eway_order;
$data['user_token'] = $this->session->data['user_token'];
$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

return $this->load->view('extension/payment/eway_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/firstdata.php
View file
Expand Up @@ -282,7 +282,7 @@ public function order() {
$data['text_confirm_void'] = $this->language->get('text_confirm_void');
$data['text_confirm_capture'] = $this->language->get('text_confirm_capture');

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/firstdata_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/firstdata_remote.php
View file
Expand Up @@ -310,7 +310,7 @@ public function order() {
$data['button_refund'] = $this->language->get('button_refund');
$data['button_void'] = $this->language->get('button_void');

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['user_token'] = $this->session->data['user_token'];

return $this->load->view('extension/payment/firstdata_remote_order', $data);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/g2apay.php
View file
Expand Up @@ -212,7 +212,7 @@ public function order() {

$data['g2apay_order'] = $g2apay_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/globalpay.php
View file
Expand Up @@ -243,7 +243,7 @@ public function order() {

$data['auto_settle'] = $globalpay_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/globalpay_remote.php
View file
Expand Up @@ -214,7 +214,7 @@ public function order() {

$data['auto_settle'] = $globalpay_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/extension/payment/klarna_checkout.php
View file
Expand Up @@ -307,7 +307,7 @@ public function order() {

$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

return $this->load->view('extension/payment/klarna_checkout_order', $data);
}
Expand Down Expand Up @@ -346,7 +346,7 @@ public function getTransaction() {

$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['store_url'] = $this->request->server['HTTPS'] ? HTTPS_CATALOG : HTTP_CATALOG;

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pilibaba.php
View file
Expand Up @@ -267,7 +267,7 @@ public function order() {

$data['barcode'] = $this->url->link('extension/payment/pilibaba/barcode', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $this->request->get['order_id'], true);

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pp_braintree.php
View file
Expand Up @@ -551,7 +551,7 @@ public function order() {

$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

return $this->load->view('extension/payment/pp_braintree_order', $data);
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pp_express.php
View file
Expand Up @@ -464,7 +464,7 @@ public function order() {
if ($paypal_info) {
$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['capture_status'] = $paypal_info['capture_status'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pp_payflow_iframe.php
View file
Expand Up @@ -400,7 +400,7 @@ public function order() {
if ($paypal_order) {
$data['complete'] = $paypal_order['complete'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/pp_pro_iframe.php
View file
Expand Up @@ -231,7 +231,7 @@ public function order() {

$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$captured = number_format($this->model_extension_payment_pp_pro_iframe->getTotalCaptured($data['paypal_order']['paypal_iframe_order_id']), 2);
$refunded = number_format($this->model_extension_payment_pp_pro_iframe->getTotalRefunded($data['paypal_order']['paypal_iframe_order_id']), 2);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/realex.php
View file
Expand Up @@ -243,7 +243,7 @@ public function order() {

$data['auto_settle'] = $realex_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/realex_remote.php
View file
Expand Up @@ -213,7 +213,7 @@ public function order() {

$data['auto_settle'] = $realex_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/sagepay_direct.php
View file
Expand Up @@ -175,7 +175,7 @@ public function order() {

$data['auto_settle'] = $sagepay_direct_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/sagepay_server.php
View file
Expand Up @@ -176,7 +176,7 @@ public function order() {

$data['auto_settle'] = $sagepay_server_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/securetrading_pp.php
View file
Expand Up @@ -260,7 +260,7 @@ public function order() {

$data['auto_settle'] = $securetrading_pp_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/securetrading_ws.php
View file
Expand Up @@ -351,7 +351,7 @@ public function order() {

$data['auto_settle'] = $securetrading_ws_order['settle_type'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/squareup.php
View file
Expand Up @@ -785,7 +785,7 @@ public function order() {

$data['url_list_transactions'] = html_entity_decode($this->url->link('extension/payment/squareup/transactions', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $this->request->get['order_id'] . '&page={PAGE}', true));
$data['user_token'] = $this->session->data['user_token'];
$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['catalog'] = $this->request->server['HTTPS'] ? HTTPS_CATALOG : HTTP_CATALOG;

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/payment/worldpay.php
View file
Expand Up @@ -219,7 +219,7 @@ public function order() {

$data['payment_worldpay_order'] = $worldpay_order;

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['user_token'] = $this->session->data['user_token'];

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/marketing/coupon.php
View file
Expand Up @@ -259,7 +259,7 @@ protected function getForm() {
$data['user_token'] = $this->session->data['user_token'];

if (isset($this->request->get['coupon_id'])) {
$data['coupon_id'] = $this->request->get['coupon_id'];
$data['coupon_id'] = (int)$this->request->get['coupon_id'];
} else {
$data['coupon_id'] = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/sale/order.php
View file
Expand Up @@ -467,7 +467,7 @@ public function getForm() {
}

if (!empty($order_info)) {
$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['store_id'] = $order_info['store_id'];
$data['store_url'] = $this->request->server['HTTPS'] ? HTTPS_CATALOG : HTTP_CATALOG;

Expand Down Expand Up @@ -788,7 +788,7 @@ public function info() {

$data['user_token'] = $this->session->data['user_token'];

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];

$data['store_id'] = $order_info['store_id'];
$data['store_name'] = $order_info['store_name'];
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/sale/return.php
View file
Expand Up @@ -529,7 +529,7 @@ protected function getForm() {
$data['user_token'] = $this->session->data['user_token'];

if (isset($this->request->get['return_id'])) {
$data['return_id'] = $this->request->get['return_id'];
$data['return_id'] = (int)$this->request->get['return_id'];
} else {
$data['return_id'] = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/sale/voucher.php
View file
Expand Up @@ -268,7 +268,7 @@ protected function getForm() {
$data['text_form'] = !isset($this->request->get['voucher_id']) ? $this->language->get('text_add') : $this->language->get('text_edit');

if (isset($this->request->get['voucher_id'])) {
$data['voucher_id'] = $this->request->get['voucher_id'];
$data['voucher_id'] = (int)$this->request->get['voucher_id'];
} else {
$data['voucher_id'] = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/startup/sass.php
View file
Expand Up @@ -11,7 +11,7 @@ public function index() {
$stylesheet = DIR_APPLICATION . 'view/stylesheet/' . $filename . '.css';

if (!is_file($stylesheet) || !$this->config->get('developer_sass')) {
$scss = new \Leafo\ScssPhp\Compiler();
$scss = new \ScssPhp\ScssPhp\Compiler();
$scss->setImportPaths(DIR_APPLICATION . 'view/stylesheet/');

$output = $scss->compile('@import "' . $filename . '.scss"');
Expand Down
8 changes: 4 additions & 4 deletions upload/admin/view/template/common/filemanager.twig
View file
Expand Up @@ -51,10 +51,10 @@ $('a.thumbnail').on('click', function(e) {
e.preventDefault();
{% if thumb %}
$('#{{ thumb }}').find('img').attr('src', $(this).find('img').attr('src'));
$('#{{ thumb|escape('js') }}').find('img').attr('src', $(this).find('img').attr('src'));
{% endif %}
$('#{{ target }}').val($(this).parent().find('input').val());
$('#{{ target|escape('js') }}').val($(this).parent().find('input').val());
$('#modal-image').modal('hide');
});
Expand Down Expand Up @@ -100,11 +100,11 @@ $('#button-search').on('click', function(e) {
}
{% if thumb %}
url += '&thumb=' + '{{ thumb }}';
url += '&thumb=' + '{{ thumb|escape('js') }}';
{% endif %}
{% if target %}
url += '&target=' + '{{ target }}';
url += '&target=' + '{{ target|escape('js') }}';
{% endif %}
$('#modal-image').load(url);
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/account/order.php
View file
Expand Up @@ -157,7 +157,7 @@ public function info() {
$data['invoice_no'] = '';
}

$data['order_id'] = $this->request->get['order_id'];
$data['order_id'] = (int)$this->request->get['order_id'];
$data['date_added'] = date($this->language->get('date_format_short'), strtotime($order_info['date_added']));

if ($order_info['payment_address_format']) {
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/account/recurring.php
View file
Expand Up @@ -135,7 +135,7 @@ public function info() {
'href' => $this->url->link('account/recurring/info', 'order_recurring_id=' . $this->request->get['order_recurring_id'] . $url, true),
);

$data['order_recurring_id'] = $this->request->get['order_recurring_id'];
$data['order_recurring_id'] = (int)$this->request->get['order_recurring_id'];
$data['date_added'] = date($this->language->get('date_format_short'), strtotime($recurring_info['date_added']));

if ($recurring_info['status']) {
Expand Down

0 comments on commit 885ec10

Please sign in to comment.