nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undefined indexes bug

Browse Source
This commit is contained in:
Garvin Hicking
2003-12-11 10:43:52 +00:00
parent 32c8aa478c
commit 56edf51600
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-12-11 Garvin Hicking <me@supergarv.de>
* tbl_replace.php, tbl_replace_fields.php: Fixed #857445, #857684
where non-existant fields caused PHP notices.
2003-12-10 Garvin Hicking <me@supergarv.de> 2003-12-10 Garvin Hicking <me@supergarv.de>
* db_datadict.php: Bug 857186: Real fix for the problem. The '@' * db_datadict.php: Bug 857186: Real fix for the problem. The '@'
delimiter slipped to the replacement's end instead of the expression's delimiter slipped to the replacement's end instead of the expression's

20
tbl_replace.php
View File

@@ -86,11 +86,11 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
$valuelist = ''; $valuelist = '';
// Map multi-edit keys to single-level arrays, dependent on how we got the fields // Map multi-edit keys to single-level arrays, dependent on how we got the fields
$me_fields = (isset($fields['multi_edit']) ? $fields['multi_edit'][$enc_primary_key] : $fields); $me_fields = (isset($fields['multi_edit']) ? $fields['multi_edit'][$enc_primary_key] : isset($fields) ? $fields : null);
$me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : $fields_prev); $me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : isset($fields_prev) ? $fields_prev : null);
$me_funcs = (isset($funcs['multi_edit']) ? $funcs['multi_edit'][$enc_primary_key] : $funcs); $me_funcs = (isset($funcs['multi_edit']) ? $funcs['multi_edit'][$enc_primary_key] : isset($funcs) ? $funcs : null);
$me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : $fields_type); $me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : isset($fields_type) ? $fields_type : null);
$me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : $fields_null); $me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : isset($fields_null) ? $fields_null : null);
foreach($me_fields AS $key => $val) { foreach($me_fields AS $key => $val) {
$encoded_key = $key; $encoded_key = $key;
@@ -153,11 +153,11 @@ else {
$fieldlist = ''; $fieldlist = '';
$valuelist = ''; $valuelist = '';
$me_fields = (isset($fields['multi_edit']) ? $fields['multi_edit'][$enc_primary_key] : $fields); $me_fields = (isset($fields['multi_edit']) ? $fields['multi_edit'][$enc_primary_key] : isset($fields) ? $fields : null);
$me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : $fields_prev); $me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : isset($fields_prev) ? $fields_prev : null);
$me_funcs = (isset($funcs['multi_edit']) ? $funcs['multi_edit'][$enc_primary_key] : $funcs); $me_funcs = (isset($funcs['multi_edit']) ? $funcs['multi_edit'][$enc_primary_key] : isset($funcs) ? $funcs : null);
$me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : $fields_type); $me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : isset($fields_type) ? $fields_type : null);
$me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : $fields_null); $me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : isset($fields_null) ? $fields_null : null);
// garvin: Get, if sent, any protected fields to insert them here: // garvin: Get, if sent, any protected fields to insert them here:
if (isset($me_fields_type) && is_array($me_fields_type) && isset($enc_primary_key)) { if (isset($me_fields_type) && is_array($me_fields_type) && isset($enc_primary_key)) {

8
tbl_replace_fields.php
View File

@@ -28,8 +28,8 @@ PMA_checkParameters(array('db','encoded_key'));
$check_stop = false; $check_stop = false;
// Check if a multi-edit row was found // Check if a multi-edit row was found
${'me_fields_upload_' . $encoded_key} = (isset($enc_primary_key) && isset(${'fields_upload_' . $encoded_key}['multi_edit']) ? ${'fields_upload_' . $encoded_key}['multi_edit'][$enc_primary_key] : ${'fields_upload_' . $encoded_key}); ${'me_fields_upload_' . $encoded_key} = (isset($enc_primary_key) && isset(${'fields_upload_' . $encoded_key}['multi_edit']) ? ${'fields_upload_' . $encoded_key}['multi_edit'][$enc_primary_key] : isset(${'fields_upload_' . $encoded_key}) ? ${'fields_upload_' . $encoded_key} : null);
${'me_fields_uploadlocal_' . $encoded_key} = (isset($enc_primary_key) && isset(${'fields_uploadlocal_' . $encoded_key}['multi_edit']) ? ${'fields_uploadlocal_' . $encoded_key}['multi_edit'][$enc_primary_key] : ${'fields_uploadlocal_' . $encoded_key}); ${'me_fields_uploadlocal_' . $encoded_key} = (isset($enc_primary_key) && isset(${'fields_uploadlocal_' . $encoded_key}['multi_edit']) ? ${'fields_uploadlocal_' . $encoded_key}['multi_edit'][$enc_primary_key] : isset(${'fields_uploadlocal_' . $encoded_key}) ? ${'fields_uploadlocal_' . $encoded_key} : null);
if (isset(${'me_fields_upload_' . $encoded_key}) && ${'me_fields_upload_' . $encoded_key} != 'none'){ if (isset(${'me_fields_upload_' . $encoded_key}) && ${'me_fields_upload_' . $encoded_key} != 'none'){
// garvin: This fields content is a blob-file upload. // garvin: This fields content is a blob-file upload.
@@ -119,9 +119,9 @@ if (!$check_stop) {
else $type = ''; else $type = '';
$f = 'field_' . md5($key); $f = 'field_' . md5($key);
$t_fval = $$f; $t_fval = (isset($$f) ? $$f : null);
if (isset($t_fval['multi_edit'][$enc_primary_key])) { if (isset($t_fval['multi_edit']) && isset($t_fval['multi_edit'][$enc_primary_key])) {
$fval = &$t_fval['multi_edit'][$enc_primary_key]; $fval = &$t_fval['multi_edit'][$enc_primary_key];
} else { } else {
$fval = &$t_fval; $fval = &$t_fval;