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

add PMA_getCurrentValueForMultipleEdit function to insert_edit-lib

Browse Source
This commit is contained in:
Thilina Buddika 2012-06-13 11:21:54 +05:30
parent 87df239500
commit 90abdfe593
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libraries/insert_edit.lib.php
View File

@ -1737,7 +1737,7 @@ function PMA_getWarningMessages()
}
/**
* Field to display from the foreign table?
* Column to display from the foreign table?
*
* @param string $where_comparison string that contain relation field value
* @param string $relation_field_value relation field value
@ -1747,7 +1747,7 @@ function PMA_getWarningMessages()
*
* @return string $dispval display value from the foriegn table
*/
function PMA_displayForiengTableColumn($where_comparison, $relation_field_value, $map, $relation_field)
function PMA_getDisplayValueForForiengTableColumn($where_comparison, $relation_field_value, $map, $relation_field)
{
$display_field = PMA_getDisplayField($map[$relation_field]['foreign_db'], $map[$relation_field]['foreign_table']);
// Field to display from the foreign table?
@ -1824,7 +1824,7 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field, $where_comp
* @return array $extra_data
*/
function PMA_getTransformationFunctionAndTransformationOptions($db, $table,
$transformation, $edited_values, $extra_data
$transformation, $edited_values, $extra_data, $include_file
) {
foreach ($edited_values as $cell_index => $curr_cell_edited_values) {
if (isset($curr_cell_edited_values[$column_name])) {
@ -1859,4 +1859,46 @@ function PMA_getTransformationFunctionAndTransformationOptions($db, $table,
return $extra_data;
}
/**
* Get current value in multi edit mode
*
* @param array $multi_edit_colummns multiple edit column array
* @param array $multi_edit_columns_name multiple edit columns name array
* @param array $multi_edit_funcs multiple edit functions array
* @param array $gis_from_text_functions array that contains gis from text functions
* @param string $val
* @param array $gis_from_wkb_functions initialy $val is $multi_edit_colummns[$key]
* @param array $func_optional_param array('RAND','UNIX_TIMESTAMP')
* @param array $func_no_param array of set of string
* @param string $key an md5 of the fieldname
*
* @return array $val, $cur_value
*/
function PMA_getCurrentValueForMultipleEdit($multi_edit_colummns, $multi_edit_columns_name, $multi_edit_funcs,
$gis_from_text_functions, $val, $gis_from_wkb_functions, $func_optional_param, $func_no_param, $key
) {
if (empty($multi_edit_funcs[$key])) {
$cur_value = $val;
} elseif ('UUID' === $multi_edit_funcs[$key]) {
/* This way user will know what UUID new row has */
$uuid = PMA_DBI_fetch_value('SELECT UUID()');
$cur_value = "'" . $uuid . "'";
} elseif ((in_array($multi_edit_funcs[$key], $gis_from_text_functions)
&& substr($val, 0, 3) == "'''")
|| in_array($multi_edit_funcs[$key], $gis_from_wkb_functions)
) {
// Remove enclosing apostrophes
$val = substr($val, 1, strlen($val) - 2);
// Remove escaping apostrophes
$val = str_replace("''", "'", $val);
$cur_value = $multi_edit_funcs[$key] . '(' . $val . ')';
} elseif (! in_array($multi_edit_funcs[$key], $func_no_param)
|| ($val != "''" && in_array($multi_edit_funcs[$key], $func_optional_param))) {
$cur_value = $multi_edit_funcs[$key] . '(' . $val . ')';
} else {
$cur_value = $multi_edit_funcs[$key] . '()';
}
return array($val, $cur_value);
}
?>

28
tbl_replace.php
View File

@ -176,32 +176,12 @@ foreach ($loop_array as $rownumber => $where_clause) {
// when inserting multiple entries
foreach ($multi_edit_columns_name as $key => $colummn_name) {
$val = $multi_edit_colummns[$key];
// Note: $key is an md5 of the fieldname. The actual fieldname is available in $multi_edit_columns_name[$key]
include 'libraries/tbl_replace_fields.inc.php';
if (empty($multi_edit_funcs[$key])) {
$cur_value = $val;
} elseif ('UUID' === $multi_edit_funcs[$key]) {
/* This way user will know what UUID new row has */
$uuid = PMA_DBI_fetch_value('SELECT UUID()');
$cur_value = "'" . $uuid . "'";
} elseif ((in_array($multi_edit_funcs[$key], $gis_from_text_functions)
&& substr($val, 0, 3) == "'''")
|| in_array($multi_edit_funcs[$key], $gis_from_wkb_functions)
) {
// Remove enclosing apostrophes
$val = substr($val, 1, strlen($val) - 2);
// Remove escaping apostrophes
$val = str_replace("''", "'", $val);
$cur_value = $multi_edit_funcs[$key] . '(' . $val . ')';
} elseif (! in_array($multi_edit_funcs[$key], $func_no_param)
|| ($val != "''" && in_array($multi_edit_funcs[$key], $func_optional_param))) {
$cur_value = $multi_edit_funcs[$key] . '(' . $val . ')';
} else {
$cur_value = $multi_edit_funcs[$key] . '()';
}
list($val, $cur_value) = PMA_getCurrentValueForMultipleEdit($multi_edit_colummns,
$multi_edit_columns_name, $multi_edit_funcs, $gis_from_text_functions, $val,
$gis_from_wkb_functions, $func_optional_param, $func_no_param, $key);
// i n s e r t
if ($is_insert) {
@ -344,7 +324,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
$include_file = PMA_securePath($transformation['transformation']);
$column_name = $transformation['column_name'];
$extra_data = PMA_getTransformationFunctionAndTransformationOptions($db, $table,
$transformation, $edited_values, $include_file, $column_name, $extra_data);
$transformation, $edited_values, $include_file, $column_name, $extra_data, $include_file);
} // end of loop for each $mime_map
}