diff options
Diffstat (limited to 'libraries/insert_edit.lib.php')
| -rw-r--r-- | libraries/insert_edit.lib.php | 82 |
1 files changed, 29 insertions, 53 deletions
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 5b8fd4262d..5607a69870 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -313,11 +313,8 @@ function PMA_getColumnTitle($column, $comments_map) */ function PMA_isColumn($column, $types) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - foreach ($types as $one_type) { - if ($pmaString->stripos($column['Type'], $one_type) === 0) { + if (/*overload*/mb_stripos($column['Type'], $one_type) === 0) { return true; } } @@ -383,9 +380,6 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix, $unnullify_trigger, $no_support_types, $tabindex_for_function, $tabindex, $idindex, $insert_mode ) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $html_output = ''; if (($GLOBALS['cfg']['ProtectBinary'] === 'blob' && $column['is_blob'] && !$is_upload) @@ -395,8 +389,8 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix, && $column['is_binary']) ) { $html_output .= '<td class="center">' . __('Binary') . '</td>' . "\n"; - } elseif ($pmaString->strstr($column['True_Type'], 'enum') - || $pmaString->strstr($column['True_Type'], 'set') + } elseif (/*overload*/mb_strstr($column['True_Type'], 'enum') + || /*overload*/mb_strstr($column['True_Type'], 'set') || in_array($column['pma_type'], $no_support_types) ) { $html_output .= '<td class="center">--</td>' . "\n"; @@ -480,16 +474,14 @@ function PMA_getNullColumn($column, $column_name_appendix, $real_null_value, */ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; $foreigner = PMA_searchColumnInForeigners($foreigners, $column['Field']); - if ($pmaString->strstr($column['True_Type'], 'enum')) { - if ($pmaString->strlen($column['Type']) > 20) { + if (/*overload*/mb_strstr($column['True_Type'], 'enum')) { + if (/*overload*/mb_strlen($column['Type']) > 20) { $nullify_code = '1'; } else { $nullify_code = '2'; } - } elseif ($pmaString->strstr($column['True_Type'], 'set')) { + } elseif (/*overload*/mb_strstr($column['True_Type'], 'set')) { $nullify_code = '3'; } elseif ($foreigners && $foreigner @@ -557,8 +549,6 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, $data_type = $GLOBALS['PMA_Types']->getTypeClass($column['True_Type']); $html_output = ''; - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; if ($foreignData['foreign_link'] == true) { $html_output .= PMA_getForeignLink( $column, $backup_field, $column_name_appendix, @@ -574,7 +564,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, ); } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea'] - && $pmaString->strstr($column['pma_type'], 'longtext') + && /*overload*/mb_strstr($column['pma_type'], 'longtext') ) { $html_output = ' </td>'; $html_output .= '</tr>'; @@ -586,7 +576,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, $special_chars_encoded, $data_type ); - } elseif ($pmaString->strstr($column['pma_type'], 'text')) { + } elseif (/*overload*/mb_strstr($column['pma_type'], 'text')) { $html_output .= PMA_getTextarea( $column, $backup_field, $column_name_appendix, $unnullify_trigger, @@ -594,7 +584,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, $special_chars_encoded, $data_type ); $html_output .= "\n"; - if ($pmaString->strlen($special_chars) > 32000) { + if (/*overload*/mb_strlen($special_chars) > 32000) { $html_output .= "</td>\n"; $html_output .= '<td>' . __( 'Because of its length,<br /> this column might not be editable.' @@ -764,7 +754,7 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix, $extracted_columnspec = PMA_Util::extractColumnSpec($column['Type']); $maxlength = $extracted_columnspec['spec_in_brackets']; } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea'] - && $GLOBALS['PMA_String']->strstr($column['pma_type'], 'longtext') + && /*overload*/mb_strstr($column['pma_type'], 'longtext') ) { $textAreaRows = $GLOBALS['cfg']['TextareaRows'] * 2; $textareaCols = $GLOBALS['cfg']['TextareaCols'] * 2; @@ -819,7 +809,7 @@ function PMA_getPmaTypeEnum($column, $backup_field, $column_name_appendix, $html_output .= '<input type="hidden" name="fields' . $column_name_appendix . '" value="" />'; $html_output .= "\n" . ' ' . $backup_field . "\n"; - if ($GLOBALS['PMA_String']->strlen($column['Type']) > 20) { + if (/*overload*/mb_strlen($column['Type']) > 20) { $html_output .= PMA_getDropDownDependingOnLength( $column, $column_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data, $column_enum_values @@ -1052,7 +1042,7 @@ function PMA_getBinaryAndBlobColumn( $html_output .= __('Binary - do not edit'); if (isset($data)) { $data_size = PMA_Util::formatByteDown( - $GLOBALS['PMA_String']->strlen(stripslashes($data)), 3, 1 + /*overload*/mb_strlen(stripslashes($data)), 3, 1 ); $html_output .= ' (' . $data_size[0] . ' ' . $data_size[1] . ')'; unset($data_size); @@ -1256,16 +1246,13 @@ function PMA_getValueColumnForOtherDatatypes($column, $default_char_editing, $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded, $data, $extracted_columnspec ) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // HTML5 data-* attribute data-type $data_type = $GLOBALS['PMA_Types']->getTypeClass($column['True_Type']); $fieldsize = PMA_getColumnSize($column, $extracted_columnspec); $html_output = $backup_field . "\n"; if ($column['is_char'] && ($GLOBALS['cfg']['CharEditing'] == 'textarea' - || $pmaString->strpos($data, "\n") !== false) + || /*overload*/mb_strpos($data, "\n") !== false) ) { $html_output .= "\n"; $GLOBALS['cfg']['CharEditing'] = $default_char_editing; @@ -1284,11 +1271,11 @@ function PMA_getValueColumnForOtherDatatypes($column, $default_char_editing, $html_output .= '<input type="hidden" name="auto_increment' . $column_name_appendix . '" value="1" />'; } - if ($pmaString->substr($column['pma_type'], 0, 9) == 'timestamp') { + if (substr($column['pma_type'], 0, 9) == 'timestamp') { $html_output .= '<input type="hidden" name="fields_type' . $column_name_appendix . '" value="timestamp" />'; } - if ($pmaString->substr($column['pma_type'], 0, 8) == 'datetime') { + if (substr($column['pma_type'], 0, 8) == 'datetime') { $html_output .= '<input type="hidden" name="fields_type' . $column_name_appendix . '" value="datetime" />'; } @@ -1298,7 +1285,7 @@ function PMA_getValueColumnForOtherDatatypes($column, $default_char_editing, } if ($column['pma_type'] == 'date' || $column['pma_type'] == 'datetime' - || $pmaString->substr($column['pma_type'], 0, 9) == 'timestamp' + || substr($column['pma_type'], 0, 9) == 'timestamp' ) { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox @@ -1611,9 +1598,6 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow( $current_row, $column, $extracted_columnspec, $real_null_value, $gis_data_types, $column_name_appendix, $as_is ) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $special_chars_encoded = ''; $data = null; // (we are editing) @@ -1629,10 +1613,10 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow( $current_row[$column['Field']], $extracted_columnspec['spec_in_brackets'] ); - } elseif (($pmaString->substr($column['True_Type'], 0, 9) == 'timestamp' + } elseif ((substr($column['True_Type'], 0, 9) == 'timestamp' || $column['True_Type'] == 'datetime' || $column['True_Type'] == 'time') - && ($pmaString->strpos($current_row[$column['Field']], ".") !== false) + && (/*overload*/mb_strpos($current_row[$column['Field']], ".") !== false) ) { $current_row[$column['Field']] = $as_is ? $current_row[$column['Field']] @@ -1675,7 +1659,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow( && $_REQUEST['default_action'] === 'insert' ) { if ($column['Key'] === 'PRI' - && $pmaString->strpos($column['Extra'], 'auto_increment') !== false + && /*overload*/mb_strpos($column['Extra'], 'auto_increment') !== false ) { $data = $special_chars_encoded = $special_chars = null; } @@ -1721,7 +1705,7 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode( if ($trueType == 'bit') { $special_chars = PMA_Util::convertBitDefaultValue($column['Default']); - } elseif ($GLOBALS['PMA_String']->substr($trueType, 0, 9) == 'timestamp' + } elseif (substr($trueType, 0, 9) == 'timestamp' || $trueType == 'datetime' || $trueType == 'time' ) { @@ -1830,9 +1814,6 @@ function PMA_setSessionForEditNext($one_where_clause) */ function PMA_getGotoInclude($goto_include) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $valid_options = array('new_insert', 'same_insert', 'edit_next'); if (isset($_REQUEST['after_insert']) && in_array($_REQUEST['after_insert'], $valid_options) @@ -1847,13 +1828,13 @@ function PMA_getGotoInclude($goto_include) $goto_include = $GLOBALS['goto']; } if ($GLOBALS['goto'] == 'db_sql.php' - && $pmaString->strlen($GLOBALS['table']) + && /*overload*/mb_strlen($GLOBALS['table']) ) { $GLOBALS['table'] = ''; } } if (! $goto_include) { - if (! $pmaString->strlen($GLOBALS['table'])) { + if (! /*overload*/mb_strlen($GLOBALS['table'])) { $goto_include = 'db_sql.php'; } else { $goto_include = 'tbl_sql.php'; @@ -2011,7 +1992,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, $foreigner['foreign_table'] ); // Field to display from the foreign table? - if (isset($display_field) && $GLOBALS['PMA_String']->strlen($display_field)) { + if (isset($display_field) && /*overload*/mb_strlen($display_field)) { $dispsql = 'SELECT ' . PMA_Util::backquote($display_field) . ' FROM ' . PMA_Util::backquote($foreigner['foreign_db']) . '.' . PMA_Util::backquote($foreigner['foreign_table']) @@ -2152,9 +2133,6 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit( $multi_edit_funcs, $gis_from_text_functions, $current_value, $gis_from_wkb_functions, $func_optional_param, $func_no_param, $key ) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - if (empty($multi_edit_funcs[$key])) { return $current_value; } elseif ('UUID' === $multi_edit_funcs[$key]) { @@ -2162,13 +2140,11 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit( $multi_edit_funcs, $uuid = $GLOBALS['dbi']->fetchValue('SELECT UUID()'); return "'" . $uuid . "'"; } elseif ((in_array($multi_edit_funcs[$key], $gis_from_text_functions) - && $pmaString->substr($current_value, 0, 3) == "'''") + && substr($current_value, 0, 3) == "'''") || in_array($multi_edit_funcs[$key], $gis_from_wkb_functions) ) { // Remove enclosing apostrophes - $current_value = $pmaString->substr( - $current_value, 1, $pmaString->strlen($current_value) - 2 - ); + $current_value = /*overload*/mb_substr($current_value, 1, -1); // Remove escaping apostrophes $current_value = str_replace("''", "'", $current_value); return $multi_edit_funcs[$key] . '(' . $current_value . ')'; @@ -2217,7 +2193,7 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_ // i n s e r t if ($is_insert) { // no need to add column into the valuelist - if ($GLOBALS['PMA_String']->strlen($current_value_as_an_array)) { + if (/*overload*/mb_strlen($current_value_as_an_array)) { $query_values[] = $current_value_as_an_array; // first inserted row so prepare the list of fields if (empty($value_sets)) { @@ -2304,7 +2280,7 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key, } if ($type != 'protected' && $type != 'set' - && 0 === $GLOBALS['PMA_String']->strlen($current_value) + && 0 === /*overload*/mb_strlen($current_value) ) { // best way to avoid problems in strict mode // (works also in non-strict mode) @@ -2399,7 +2375,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData( $meta = $fields_meta[0]; $new_value = $GLOBALS['dbi']->fetchValue($result); if ($new_value !== false) { - if (($GLOBALS['PMA_String']->substr($meta->type, 0, 9) == 'timestamp') + if ((substr($meta->type, 0, 9) == 'timestamp') || ($meta->type == 'datetime') || ($meta->type == 'time') ) { @@ -2589,7 +2565,7 @@ function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix) return '<tr class="noclick ' . ($odd_row ? 'odd' : 'even' ) . '">' . '<td ' . ($longDoubleTextArea - && $GLOBALS['PMA_String']->strstr($column['True_Type'], 'longtext') + && /*overload*/mb_strstr($column['True_Type'], 'longtext') ? 'rowspan="2"' : '' ) |