From 971ae5ec199729ffbb24044873ffe78b074c7d02 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Tue, 24 Mar 2020 13:18:35 +0400 Subject: [PATCH] Correcting indentation problems --- application/controllers/Attributes.php | 74 +++++++++++++------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/application/controllers/Attributes.php b/application/controllers/Attributes.php index f190c5c3e..b07abbd1f 100644 --- a/application/controllers/Attributes.php +++ b/application/controllers/Attributes.php @@ -8,14 +8,14 @@ class Attributes extends Secure_Controller { parent::__construct('attributes'); } - + public function index() { $data['table_headers'] = $this->xss_clean(get_attribute_definition_manage_table_headers()); - + $this->load->view('attributes/manage', $data); } - + /* Returns customer table data rows. This will be called with AJAX. */ @@ -26,108 +26,107 @@ class Attributes extends Secure_Controller $offset = $this->input->get('offset'); $sort = $this->input->get('sort'); $order = $this->input->get('order'); - + $attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order); $total_rows = $this->Attribute->get_found_rows($search); - + $data_rows = array(); foreach($attributes->result() as $attribute) { $attribute->definition_flags = $this->_get_attributes($attribute->definition_flags); $data_rows[] = get_attribute_definition_data_row($attribute, $this); } - + $data_rows = $this->xss_clean($data_rows); - + echo json_encode(array('total' => $total_rows, 'rows' => $data_rows)); } - + public function save_attribute_value($attribute_value) { $success = $this->Attribute->save_value(urldecode($attribute_value), $this->input->post('definition_id'), $this->input->post('item_id'), $this->input->post('attribute_id')); - + echo json_encode(array('success' => $success != 0)); } - + public function delete_attribute_value($attribute_value) { $success = $this->Attribute->delete_value($attribute_value, $this->input->post('definition_id')); - + echo json_encode(array('success' => $success)); } - + public function save_definition($definition_id = -1) { - $definition_flags = 0; - + $flags = (empty($this->input->post('definition_flags'))) ? array() : $this->input->post('definition_flags'); - + foreach($flags as $flag) { $definition_flags |= $flag; } - - //Save definition data + + //Save definition data $definition_data = array( 'definition_name' => $this->input->post('definition_name'), 'definition_unit' => $this->input->post('definition_unit') != '' ? $this->input->post('definition_unit') : NULL, 'definition_flags' => $definition_flags, 'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL ); - + if ($this->input->post('definition_type') != null) { $definition_data['definition_type'] = DEFINITION_TYPES[$this->input->post('definition_type')]; } - + $definition_name = $this->xss_clean($definition_data['definition_name']); - + if($this->Attribute->save_definition($definition_data, $definition_id)) { - //New definition + //New definition if($definition_id == -1) { $definition_values = json_decode($this->input->post('definition_values')); - + foreach($definition_values as $definition_value) { $this->Attribute->save_value($definition_value, $definition_data['definition_id']); } - + echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_adding').' '. $definition_name, 'id' => $definition_data['definition_id'])); } - //Existing definition + //Existing definition else { echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_updating').' '. $definition_name, 'id' => $definition_id)); } } - //Failure + //Failure else { echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_error_adding_updating', $definition_name), 'id' => -1)); } } - + public function suggest_attribute($definition_id) { $suggestions = $this->xss_clean($this->Attribute->get_suggestions($definition_id, $this->input->get('term'))); - + echo json_encode($suggestions); } - + public function get_row($row_id) { $attribute_definition_info = $this->Attribute->get_info($row_id); $attribute_definition_info->definition_flags = $this->_get_attributes($attribute_definition_info->definition_flags); $data_row = $this->xss_clean(get_attribute_definition_data_row($attribute_definition_info)); - + echo json_encode($data_row); } - + private function _get_attributes($definition_flags = 0) { $definition_flag_names = array(); @@ -140,7 +139,7 @@ class Attributes extends Secure_Controller } return $definition_flag_names; } - + public function view($definition_id = -1) { $info = $this->Attribute->get_info($definition_id); @@ -148,30 +147,30 @@ class Attributes extends Secure_Controller { $info->$property = $this->xss_clean($value); } - + $data['definition_id'] = $definition_id; $data['definition_values'] = $this->Attribute->get_definition_values($definition_id); $data['definition_group'] = $this->Attribute->get_definitions_by_type(GROUP, $definition_id); $data['definition_group'][''] = $this->lang->line('common_none_selected_text'); $data['definition_info'] = $info; - + $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES; $data['definition_flags'] = $this->_get_attributes($show_all); $selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags; $data['selected_definition_flags'] = $this->_get_attributes($selected_flags); - + $this->load->view("attributes/form", $data); } - + public function delete_value($attribute_id) { return $this->Attribute->delete_value($attribute_id); } - + public function delete() { $attributes_to_delete = $this->input->post('ids'); - + if($this->Attribute->delete_definition_list($attributes_to_delete)) { $message = $this->lang->line('attributes_definition_successful_deleted') . ' ' . count($attributes_to_delete) . ' ' . $this->lang->line('attributes_definition_one_or_multiple'); @@ -182,5 +181,4 @@ class Attributes extends Secure_Controller echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_cannot_be_deleted'))); } } - } \ No newline at end of file