diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 52ed2267b6..71b2a91ba1 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1,510 +1,510 @@ - $db - ); - - if ($action == 'tbl_create.php') { - $form_params['reload'] = 1; - } elseif ($action == 'tbl_addfield.php') { - $form_params['field_where'] = $_REQUEST['field_where']; - $form_params['after_field'] = $_REQUEST['after_field']; - $form_params['table'] = $table; - } else { - $form_params['table'] = $table; - } - - if (isset($num_fields)) { - $form_params['orig_num_fields'] = $num_fields; - } - - if (isset($_REQUEST['field_where'])) { - $form_params['orig_field_where'] = $_REQUEST['field_where']; - } - - if (isset($_REQUEST['after_field'])) { - $form_params['orig_after_field'] = $_REQUEST['after_field']; - } - - if (isset($selected) && is_array($selected)) { - foreach ($selected as $o_fld_nr => $o_fld_val) { - $form_params['selected[' . $o_fld_nr . ']'] = $o_fld_val; - } - } - - return $form_params; -} - -/** - * Function to get html for table comments, storage engine, collation and - * partition definition - * - * @return string - */ -function PMA_getHtmlForTableConfigurations() -{ - $html = '
| ' . __('Table comments:') . ' | ' - . '' - . ' | ' . __('Storage Engine:') - . PMA_Util::showMySQLDocu('Storage_engines', 'Storage_engines') - . ' | ' - . '' - . ' | ' . __('Collation:') . ' | ' - . '
|---|---|---|---|---|
| ' - . ' | ' - . '' - . ' | ' - . PMA_StorageEngine::getHtmlSelect( - 'tbl_storage_engine', null, - (isset($_REQUEST['tbl_storage_engine']) - ? $_REQUEST['tbl_storage_engine'] - : null - ) - ) - . ' | ' - . '' - . ' | ' - . PMA_generateCharsetDropdownBox( - PMA_CSDROPDOWN_COLLATION, 'tbl_collation', null, - (isset($_REQUEST['tbl_collation']) - ? $_REQUEST['tbl_collation'] - : null - ), - false, 3 - ) - . ' | ' - . '
| ' . __('PARTITION definition:') . ' ' - . PMA_Util::showMySQLDocu('Partitioning', 'Partitioning') - . ' | ' - . '||||
| ' - . '' - . ' | ' - . '
| ' . __('Table name') - . ': ' - . ' | ' - . ''; - $html .= sprintf( - __('Add %s column(s)'), '' - ); - - $html .= ''; - - $html .= ' | ' - . '
| ' . $header_val . ' | '; - } - $html .= '
|---|
| ' . $content_row_val . ' | '; - } - } - $html .= '
| ' . __('Table name') + . ': ' + . ' | ' + . ''; + $html .= sprintf( + __('Add %s column(s)'), '' + ); + + $html .= ''; + + $html .= ' | ' + . '
| ' . $header_val . ' | '; + } + $html .= '
|---|
| ' . $content_row_val . ' | '; + } + } + $html .= '