From c393fe1b795a7566bc869d597105724a89a02aac Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 11:48:33 +0530 Subject: [PATCH 01/16] $found_unique_key can be confusing --- libraries/insert_edit.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 2f17f20db0..091300aa32 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -54,12 +54,11 @@ function PMA_getFormParametersForInsertForm($db, $table, $where_clauses, */ function PMA_getStuffForEditMode($where_clause, $table, $db) { - $found_unique_key = false; if (isset($where_clause)) { $where_clause_array = PMA_getWhereClauseArray($where_clause); list($whereClauses, $resultArray, $rowsArray, $found_unique_key) = PMA_analyzeWhereClauses( - $where_clause_array, $table, $db, $found_unique_key + $where_clause_array, $table, $db, false ); return array( false, $whereClauses, @@ -68,7 +67,7 @@ function PMA_getStuffForEditMode($where_clause, $table, $db) ); } else { list($results, $row) = PMA_loadFirstRowInEditMode($table, $db); - return array(true, null, $results, $row, null, $found_unique_key); + return array(true, null, $results, $row, null, false); } } From 5ec2b4deabe020a568da000b960293065315b084 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 11:55:08 +0530 Subject: [PATCH 02/16] Shorten a long line --- libraries/insert_edit.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 091300aa32..4c4efd000d 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -107,12 +107,12 @@ function PMA_analyzeWhereClauses( $where_clauses = array(); foreach ($where_clause_array as $key_id => $where_clause) { - $local_query = 'SELECT * FROM ' + $local_query = 'SELECT * FROM ' . PMA_CommonFunctions::getInstance()->backquote($db) . '.' . PMA_CommonFunctions::getInstance()->backquote($table) . ' WHERE ' . $where_clause . ';'; - $result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE); - $rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]); + $result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE); + $rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]); $where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause); $found_unique_key = PMA_showEmptyResultMessageOrSetUniqueCondition( From f535769f4b7ae7f359e82c55e28a837569a21528 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 12:22:38 +0530 Subject: [PATCH 03/16] Remove redundant space --- libraries/insert_edit.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 4c4efd000d..eec2abad4c 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -480,7 +480,7 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix, || strstr($column['True_Type'], 'set') || in_array($column['pma_type'], $no_support_types) ) { - $html_output .= ' --' . "\n"; + $html_output .= '--' . "\n"; } else { $html_output .= '' . "\n"; From fb233ef327c3ca29c6afd1a57c86c3705855e379 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 12:39:31 +0530 Subject: [PATCH 04/16] Proper spacing --- libraries/insert_edit.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index eec2abad4c..20a90ea804 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -484,10 +484,10 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix, } else { $html_output .= '' . "\n"; - $html_output .= ''; $html_output .= PMA_CommonFunctions::getInstance() ->getFunctionsForField($column, $insert_mode) . "\n"; From b72f93eac1d4cacae1e89012caae9b5cad842686 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 12:55:07 +0530 Subject: [PATCH 05/16] Improve clarity --- libraries/insert_edit.lib.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 20a90ea804..65fa41cb9d 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -736,14 +736,18 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix, list($db, $table) = $paramTableDbArray; $html_output = ''; $html_output .= $backup_field . "\n"; + $html_output .= ''; - $html_output .= '' - . ''; + + $html_output .= '' - . ' Date: Wed, 11 Jul 2012 13:07:42 +0530 Subject: [PATCH 07/16] Add missing tab index --- libraries/insert_edit.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 0a43a5f665..258da0d3b7 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -782,7 +782,8 @@ function PMA_dispRowForeignData($backup_field, $column_name_appendix, $html_output .= ''; + . ' id="field_' . $idindex . '_3">'; + $html_output .= PMA_foreignDropdown( + $foreignData['disp_row'], $foreignData['foreign_field'], + $foreignData['foreign_display'], $data, + $GLOBALS['cfg']['ForeignKeyMaxLimit'] + ); + $html_output .= ''; return $html_output; } From f1ec63a65e5a7c5682ea13bbcedbb5448521613b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 13:17:18 +0530 Subject: [PATCH 10/16] spaces between operands --- libraries/insert_edit.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index d0179f5fc2..297a5c9fb9 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -826,8 +826,8 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix, } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea'] && strstr($column['pma_type'], 'longtext') ) { - $textAreaRows = $GLOBALS['cfg']['TextareaRows']*2; - $textareaCols = $GLOBALS['cfg']['TextareaCols']*2; + $textAreaRows = $GLOBALS['cfg']['TextareaRows'] * 2; + $textareaCols = $GLOBALS['cfg']['TextareaCols'] * 2; } $html_output = $backup_field . "\n" . ''; From e97a4978e5b975f9748620819224ce698fe16b2f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 13:52:21 +0530 Subject: [PATCH 12/16] Fix indentation --- libraries/insert_edit.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index f55d7e9fc8..c91f04e3a9 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -909,9 +909,9 @@ function PMA_getColumnEnumValues($column, $extracted_columnspec) // Removes automatic MySQL escape format $val = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $val)); $column['values'][] = array( - 'plain' => $val, - 'html' => htmlspecialchars($val), - ); + 'plain' => $val, + 'html' => htmlspecialchars($val), + ); } return $column['values']; } From f186ab5c240f89e239fbdf59028b16fc6d5969e8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 14:06:27 +0530 Subject: [PATCH 13/16] Spaces between html attributes. Remove redundant space in html --- libraries/insert_edit.lib.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index c91f04e3a9..697a7b66b8 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -935,14 +935,13 @@ function PMA_getDropDownDependingOnLength( $tabindex, $tabindex_for_value, $idindex, $data, $column_enum_values ) { $html_output = ''; $html_output .= ' '; list($html_out, $biggest_max_file_size) = PMA_getMaxUploadSize( $column, $biggest_max_file_size ); @@ -1176,10 +1176,10 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars, $the_class .= ' datetimefield'; } return ''; + . ' value="' . $special_chars . '" size="' . $fieldsize . '"' + . ' class="' . $the_class . '" ' . $unnullify_trigger + . ' tabindex="' . ($tabindex + $tabindex_for_value). '"' + . ' id="field_' . ($idindex) . '_3" />'; } /** From 9260e7685df6e09d9985e8ed5c6f253ea24ce12d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Jul 2012 14:19:11 +0530 Subject: [PATCH 15/16] Coding style fixes --- libraries/insert_edit.lib.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 148dd2e726..601d4ea534 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1231,7 +1231,8 @@ function PMA_getMaxUploadSize($column, $biggest_max_file_size) 'tinyblob' => '256', 'blob' => '65536', 'mediumblob' => '16777216', - 'longblob' => '4294967296'); // yeah, really + 'longblob' => '4294967296' // yeah, really + ); $this_field_max_size = $max_upload_size; // from PHP max if ($this_field_max_size > $max_field_sizes[$column['pma_type']]) { @@ -1396,13 +1397,13 @@ function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url if (isset($_REQUEST['where_clause'])) { foreach ($where_clause_array as $key_id => $where_clause) { - $html_output .= ''. "\n"; + $html_output .= ''. "\n"; } } $tmp = '