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

Problems with latest fix and SET columns

Browse Source
This commit is contained in:
Marc Delisle
2010-12-17 09:31:42 -05:00
parent 4a71a1e5f1
commit 45ec0da621
2 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libraries/tbl_replace_fields.inc.php
View File

@@ -69,44 +69,31 @@ if (false !== $possibly_uploaded_val) {
// $key contains the md5() of the fieldname // $key contains the md5() of the fieldname
if (0 === strlen($val)) { if (0 === strlen($val)) {
// default // best way to avoid problems in strict mode (works also in non-strict mode)
$val = "''"; if (isset($me_auto_increment) && isset($me_auto_increment[$key])) {
$val = 'NULL';
switch ($type) { } else {
case 'enum': $val = "''";
// if we have an enum, then construct the value
case 'set':
// if we have a set, then construct the value
case 'foreign':
// if we have a foreign key, then construct the value
if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) {
$val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]);
$val = "'" . PMA_sqlAddslashes($val) . "'";
}
break;
case 'protected':
// here we are in protected mode (asked in the config)
// so tbl_change has put this special value in the
// fields array, so we do not change the field value
// but we can still handle field upload
// when in UPDATE mode, do not alter field's contents. When in INSERT
// mode, insert empty field because no values were submitted. If protected
// blobs where set, insert original fields content.
if (! empty($prot_row[$me_fields_name[$key]])) {
$val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]);
} else {
$val = '';
}
break;
default:
// best way to avoid problems in strict mode (works also in non-strict mode)
if (isset($me_auto_increment) && isset($me_auto_increment[$key])) {
$val = 'NULL';
}
break;
} }
} elseif ($type == 'set') {
if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) {
$val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]);
$val = "'" . PMA_sqlAddslashes($val) . "'";
}
} elseif ($type == 'protected') {
// here we are in protected mode (asked in the config)
// so tbl_change has put this special value in the
// fields array, so we do not change the field value
// but we can still handle field upload
// when in UPDATE mode, do not alter field's contents. When in INSERT
// mode, insert empty field because no values were submitted. If protected
// blobs where set, insert original fields content.
if (! empty($prot_row[$me_fields_name[$key]])) {
$val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]);
} else {
$val = '';
}
} elseif ($type == 'bit') { } elseif ($type == 'bit') {
$val = preg_replace('/[^01]/', '0', $val); $val = preg_replace('/[^01]/', '0', $val);
$val = "b'" . PMA_sqlAddslashes($val) . "'"; $val = "b'" . PMA_sqlAddslashes($val) . "'";

2
tbl_change.php
View File

@@ -804,7 +804,7 @@ foreach ($rows as $row_id => $vrow) {
echo $backup_field . "\n"; echo $backup_field . "\n";
?> ?>
<input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" /> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" />
<select name="fields<?php echo $field_name_appendix; ?>" <select name="fields<?php echo $field_name_appendix . '[]'; ?>"
class="textfield" class="textfield"
size="<?php echo $select_size; ?>" size="<?php echo $select_size; ?>"
multiple="multiple" <?php echo $unnullify_trigger; ?> multiple="multiple" <?php echo $unnullify_trigger; ?>