CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some missing array set checks

Browse Source
This commit is contained in:
Clemens Schwaighofer
2021-05-17 08:57:50 +09:00
parent 6059b83637
commit be092fc449
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
www/lib/CoreLibs/Output/Form/Generate.php
View File

@@ -1230,7 +1230,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
) { ) {
$mand_okay = 1; $mand_okay = 1;
$row_okay[$i] = 1; $row_okay[$i] = 1;
} elseif ($data_array['type'] == 'radio_group' && !isset($_POST[$prfx.$el_name])) { } elseif (!empty($data_array['type']) && $data_array['type'] == 'radio_group' &&
!isset($_POST[$prfx.$el_name])
) {
// radio group and set where one not active // radio group and set where one not active
// $this->debug('edit_error_chk', 'RADIO GROUP'); // $this->debug('edit_error_chk', 'RADIO GROUP');
$row_okay[$_POST[$prfx.$el_name][$i] ?? 0] = 0; $row_okay[$_POST[$prfx.$el_name][$i] ?? 0] = 0;
@@ -1589,7 +1591,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$this->debug('REF ELEMENT', "[$i] [".$prfx.$el_name."]: WRITE: ".$no_write[$i]); $this->debug('REF ELEMENT', "[$i] [".$prfx.$el_name."]: WRITE: ".$no_write[$i]);
// flag if data is in the text field and we are in a reference data set // flag if data is in the text field and we are in a reference data set
if (isset($reference_array['type']) && $reference_array['type'] == 'reference_data') { if (isset($reference_array['type']) && $reference_array['type'] == 'reference_data') {
if ($data_array['type'] == 'text' && isset($_POST[$prfx.$el_name][$i])) { if (!empty($data_array['type']) && $data_array['type'] == 'text' &&
isset($_POST[$prfx.$el_name][$i])
) {
$block_write[$i] = 1; $block_write[$i] = 1;
} }
} else { } else {
@@ -1644,7 +1648,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$q_names[$i] .= $el_name; $q_names[$i] .= $el_name;
// data part, read from where [POST] // data part, read from where [POST]
// radio group selections (only one can be active) // radio group selections (only one can be active)
if ($data_array['type'] == 'radio_group') { if (isset($data_array['type']) && $data_array['type'] == 'radio_group') {
if (isset($_POST[$prfx.$el_name]) && $i == $_POST[$prfx.$el_name]) { if (isset($_POST[$prfx.$el_name]) && $i == $_POST[$prfx.$el_name]) {
$_value = $i + 1; $_value = $i + 1;
} else { } else {
@@ -1941,9 +1945,18 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
foreach ($q_select as $_pos => $element) { foreach ($q_select as $_pos => $element) {
$_q_select[$_pos] = $table_name.'.'.$element; $_q_select[$_pos] = $table_name.'.'.$element;
} }
// set if missing
if (!isset($this->element_list[$table_name]['read_data']['name'])) {
$this->element_list[$table_name]['read_data']['name'] = '';
}
if (!isset($this->element_list[$table_name]['read_data']['table_name'])) {
$this->element_list[$table_name]['read_data']['table_name'] = '';
}
// add the read names in here, prefix them with the table name // add the read names in here, prefix them with the table name
// earch to read part is split by | // earch to read part is split by |
if ($this->element_list[$table_name]['read_data']['name']) { if (!empty($this->element_list[$table_name]['read_data']['name']) &&
!empty($this->element_list[$table_name]['read_data']['table_name'])
) {
foreach (explode('|', $this->element_list[$table_name]['read_data']['name']) as $read_name) { foreach (explode('|', $this->element_list[$table_name]['read_data']['name']) as $read_name) {
array_unshift($_q_select, $this->element_list[$table_name]['read_data']['table_name'].'.'.$read_name); array_unshift($_q_select, $this->element_list[$table_name]['read_data']['table_name'].'.'.$read_name);
array_unshift($q_select, $read_name); array_unshift($q_select, $read_name);