Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Commit

Permalink
Code updates
Browse files Browse the repository at this point in the history
  • Loading branch information
condor2 committed Jan 10, 2024
1 parent 99e6eab commit 4978a82
Show file tree
Hide file tree
Showing 823 changed files with 76,767 additions and 77,518 deletions.
891 changes: 445 additions & 446 deletions upload/admin/controller/catalog/attribute.php

Large diffs are not rendered by default.

787 changes: 393 additions & 394 deletions upload/admin/controller/catalog/attribute_group.php

Large diffs are not rendered by default.

1,015 changes: 507 additions & 508 deletions upload/admin/controller/catalog/category.php

Large diffs are not rendered by default.

1,117 changes: 558 additions & 559 deletions upload/admin/controller/catalog/download.php

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions upload/admin/controller/catalog/filter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
class ControllerCatalogFilter extends Controller {
private $error = array();
private $error = array();

public function index() {
$this->language->load('catalog/filter');
Expand Down Expand Up @@ -196,7 +196,7 @@ protected function getList() {

$this->data['column_group'] = $this->language->get('column_group');
$this->data['column_sort_order'] = $this->language->get('column_sort_order');
$this->data['column_action'] = $this->language->get('column_action');
$this->data['column_action'] = $this->language->get('column_action');

$this->data['button_insert'] = $this->language->get('button_insert');
$this->data['button_delete'] = $this->language->get('button_delete');
Expand Down Expand Up @@ -289,7 +289,7 @@ protected function getForm() {
$this->data['error_filter'] = $this->error['filter'];
} else {
$this->data['error_filter'] = array();
}
}

$url = '';

Expand Down Expand Up @@ -321,7 +321,7 @@ protected function getForm() {

if (!isset($this->request->get['filter_group_id'])) {
$this->data['action'] = $this->url->link('catalog/filter/insert', 'token=' . $this->session->data['token'] . $url, 'SSL');
} else {
} else {
$this->data['action'] = $this->url->link('catalog/filter/update', 'token=' . $this->session->data['token'] . '&filter_group_id=' . $this->request->get['filter_group_id'] . $url, 'SSL');
}

Expand All @@ -343,7 +343,7 @@ protected function getForm() {
$this->data['filter_group_description'] = $this->model_catalog_filter->getFilterGroupDescriptions($this->request->get['filter_group_id']);
} else {
$this->data['filter_group_description'] = array();
}
}

if (isset($this->request->post['sort_order'])) {
$this->data['sort_order'] = $this->request->post['sort_order'];
Expand Down Expand Up @@ -385,10 +385,10 @@ protected function validateForm() {
foreach ($this->request->post['filter'] as $filter_id => $filter) {
foreach ($filter['filter_description'] as $language_id => $filter_description) {
if ((utf8_strlen($filter_description['name']) < 1) || (utf8_strlen($filter_description['name']) > 64)) {
$this->error['filter'][$filter_id][$language_id] = $this->language->get('error_name');
}
$this->error['filter'][$filter_id][$language_id] = $this->language->get('error_name');
}
}
}
}
}

if (!$this->error) {
Expand All @@ -408,7 +408,7 @@ protected function validateDelete() {
} else {
return false;
}
}
}

public function autocomplete() {
$json = array();
Expand All @@ -424,7 +424,7 @@ public function autocomplete() {

$filters = $this->model_catalog_filter->getFilters($data);

foreach ($filters as $filter) {
foreach ($filters as $filter) {
$json[] = array(
'filter_id' => $filter['filter_id'],
'name' => strip_tags(html_entity_decode($filter['group'] . ' &gt; ' . $filter['name'], ENT_QUOTES, 'UTF-8'))
Expand All @@ -443,4 +443,3 @@ public function autocomplete() {
$this->response->setOutput(json_encode($json));
}
}
?>
Loading

0 comments on commit 4978a82

Please sign in to comment.