From e7b4530cf04564df01e24295b1eab508e62ac6e0 Mon Sep 17 00:00:00 2001 From: Spun Nakandala Date: Thu, 8 Aug 2013 00:23:57 +0530 Subject: [PATCH] phpcs errors corrected --- libraries/tbl_columns_definition_form.inc.php | 9 +- libraries/tbl_columns_definition_form.lib.php | 87 +++++++++++-------- 2 files changed, 58 insertions(+), 38 deletions(-) diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 520ae1a39b..ff55f3bf43 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -90,7 +90,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { ); } elseif (isset($fields_meta[$columnNumber])) { $columnMeta = PMA_getColumnMetaForDefault( - $fields_meta[$columnNumber], isset($analyzed_sql[0]['create_table_fields'] + $fields_meta[$columnNumber], + isset($analyzed_sql[0]['create_table_fields'] [$fields_meta[$columnNumber]['Field']]['default_value']) ); } @@ -112,7 +113,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { // old column name if ($is_backup) { if (isset($columnMeta['Field'])) { - $_form_params['field_orig[' . $columnNumber . ']'] = $columnMeta['Field']; + $_form_params['field_orig[' . $columnNumber . ']'] + = $columnMeta['Field']; } else { $_form_params['field_orig[' . $columnNumber . ']'] = ''; } @@ -223,7 +225,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { // column comments $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnComment( - $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null, $comments_map + $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null, + $comments_map ); $ci++; diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 22feab4405..51f7df6b30 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -12,11 +12,11 @@ if (!defined('PHPMYADMIN')) { /** * Function to get form parameters * - * @param string $db database - * @param string $table table - * @param string $action action - * @param int $num_fields number of fields - * @param bool $selected selected + * @param string $db database + * @param string $table table + * @param string $action action + * @param int $num_fields number of fields + * @param bool $selected selected * * @return array $form_params form parameters */ @@ -261,11 +261,11 @@ function PMA_getHtmlForTableCreateOrAddField($action, $form_params, $content_cel /** * Function to get header cells * - * @param bool $is_backup whether backup or not - * @param array $columnMeta column meta data - * @param bool $mimework whether mimework or not - * @param string $db current database - * @param string $table current table + * @param bool $is_backup whether backup or not + * @param array $columnMeta column meta data + * @param bool $mimework whether mimework or not + * @param string $db current database + * @param string $table current table * * @return array */ @@ -407,12 +407,14 @@ function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext) } // put None in the drop-down for Default, when someone adds a field - $columnMeta['DefaultType'] = isset($_REQUEST['field_default_type'][$columnNumber]) - ? $_REQUEST['field_default_type'][$columnNumber] - : 'NONE'; - $columnMeta['DefaultValue'] = isset($_REQUEST['field_default_value'][$columnNumber]) - ? $_REQUEST['field_default_value'][$columnNumber] - : ''; + $columnMeta['DefaultType'] + = isset($_REQUEST['field_default_type'][$columnNumber]) + ? $_REQUEST['field_default_type'][$columnNumber] + : 'NONE'; + $columnMeta['DefaultValue'] + = isset($_REQUEST['field_default_value'][$columnNumber]) + ? $_REQUEST['field_default_value'][$columnNumber] + : ''; switch ($columnMeta['DefaultType']) { case 'NONE' : @@ -490,7 +492,8 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map, = PMA_getSubmitPropertiesForRegeneration(); if (isset($_REQUEST['field_comments'][$columnNumber])) { - $comments_map[$columnMeta['Field']] = $_REQUEST['field_comments'][$columnNumber]; + $comments_map[$columnMeta['Field']] + = $_REQUEST['field_comments'][$columnNumber]; } if (isset($_REQUEST['field_mimetype'][$columnNumber])) { @@ -509,8 +512,8 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map, } return array( - $columnMeta, $submit_length, $submit_attribute, $submit_default_current_timestamp, - $comments_map, $mime_map + $columnMeta, $submit_length, $submit_attribute, + $submit_default_current_timestamp, $comments_map, $mime_map ); } @@ -570,7 +573,8 @@ function PMA_getHtmlForColumnName($columnNumber, $ci, $ci_offset, $columnMeta) . ' maxlength="64" class="textfield" title="' . __('Column') . '"' . ' size="10"' . ' value="' - . (isset($columnMeta['Field']) ? htmlspecialchars($columnMeta['Field']) : '') + . (isset($columnMeta['Field']) + ? htmlspecialchars($columnMeta['Field']) : '') . '"' . ' />'; return $html; @@ -608,13 +612,16 @@ function PMA_getHtmlForColumnType($columnNumber, $ci, $ci_offset, $type_upper) * * @return string */ -function PMA_getHtmlForTransformationOption($columnNumber, $ci, $ci_offset, $columnMeta, - $mime_map +function PMA_getHtmlForTransformationOption($columnNumber, $ci, $ci_offset, + $columnMeta, $mime_map ) { $val = isset($columnMeta['Field']) && isset($mime_map[$columnMeta['Field']]['transformation_options']) - ? htmlspecialchars($mime_map[$columnMeta['Field']]['transformation_options']) - : ''; + ? htmlspecialchars( + $mime_map[$columnMeta['Field']] + ['transformation_options'] + ) + : ''; $html = '' - . '

'; $html .= __('ENUM or SET data too long?') . ' ' @@ -1109,7 +1123,8 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper 'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP', ); - // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value + // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default + // value if ($type_upper == 'TIMESTAMP' && ! empty($default_current_timestamp) && isset($columnMeta['Default']) @@ -1128,7 +1143,9 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper foreach ($default_options as $key => $value) { $html .= '