|
@@ -16,15 +16,15 @@ discard block |
|
|
block discarded – undo |
|
16
|
16
|
$usedCategories = $this->Tracker->getUsedCategories($this->User->id); |
|
17
|
17
|
|
|
18
|
18
|
//NOTE: The checkbox validation is handled in run() |
|
19
|
|
- $this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
20
|
|
- $this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
21
|
|
- $this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
|
19
|
+ $this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
|
20
|
+ $this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
|
21
|
+ $this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]'); |
|
22
|
22
|
$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]'); |
|
23
|
|
- $this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]'); |
|
24
|
|
- $this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]'); |
|
25
|
|
- $this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]'); |
|
|
23
|
+ $this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]'); |
|
|
24
|
+ $this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]'); |
|
|
25
|
+ $this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]'); |
|
26
|
26
|
|
|
27
|
|
- if ($isValid = $this->form_validation->run() === TRUE) { |
|
|
27
|
+ if($isValid = $this->form_validation->run() === TRUE) { |
|
28
|
28
|
foreach($customCategories as $categoryK => $category) { |
|
29
|
29
|
if(!in_array($categoryK, $usedCategories)) { |
|
30
|
30
|
$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled'); |
|
@@ -37,7 +37,7 @@ discard block |
|
|
block discarded – undo |
|
37
|
37
|
|
|
38
|
38
|
$this->User_Options->set('enable_live_countdown_timer', $this->input->post('enable_live_countdown_timer')); |
|
39
|
39
|
|
|
40
|
|
- $this->User_Options->set('list_sort_type', $this->input->post('list_sort_type')); |
|
|
40
|
+ $this->User_Options->set('list_sort_type', $this->input->post('list_sort_type')); |
|
41
|
41
|
$this->User_Options->set('list_sort_order', $this->input->post('list_sort_order')); |
|
42
|
42
|
|
|
43
|
43
|
$this->User_Options->set('theme', $this->input->post('theme')); |