diff options
| -rw-r--r-- | db_create.php | 5 | ||||
| -rw-r--r-- | db_datadict.php | 6 | ||||
| -rw-r--r-- | db_export.php | 9 | ||||
| -rw-r--r-- | db_import.php | 5 | ||||
| -rw-r--r-- | db_operations.php | 11 | ||||
| -rw-r--r-- | db_qbe.php | 4 | ||||
| -rw-r--r-- | db_sql.php | 1 | ||||
| -rw-r--r-- | db_structure.php | 1 | ||||
| -rw-r--r-- | db_tracking.php | 16 | ||||
| -rw-r--r-- | server_collations.php | 9 | ||||
| -rw-r--r-- | server_import.php | 2 | ||||
| -rw-r--r-- | server_privileges.php | 1 | ||||
| -rw-r--r-- | server_sql.php | 1 | ||||
| -rw-r--r-- | tbl_sql.php | 1 |
14 files changed, 46 insertions, 26 deletions
diff --git a/db_create.php b/db_create.php index d9cea0ebb0..d99a851090 100644 --- a/db_create.php +++ b/db_create.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Database creating page * * @package PhpMyAdmin */ @@ -30,7 +31,7 @@ if (! empty($_POST['db_collation'])) { if (in_array($db_charset, $mysql_charsets) && in_array($_POST['db_collation'], $mysql_collations[$db_charset]) ) { - $sql_query .= ' DEFAULT' + $sql_query .= ' DEFAULT' . PMA_generateCharsetQueryPart($_POST['db_collation']); } $db_collation_for_ajax = $_POST['db_collation']; @@ -106,7 +107,7 @@ if (! $result) { ); } else { $current = array( - 'SCHEMA_NAME' => $_POST['new_db'] + 'SCHEMA_NAME' => $_POST['new_db'] ); } diff --git a/db_datadict.php b/db_datadict.php index 7278c576c7..688d18ca50 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -107,9 +107,11 @@ foreach ($tables as $table) { $indexes_info[$row['Key_name']]['Comment'] = $row['Comment']; - $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] = $row['Column_name']; + $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] + = $row['Column_name']; if (isset($row['Sub_part'])) { - $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part']; + $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] + = $row['Sub_part']; } } // end while diff --git a/db_export.php b/db_export.php index f051a21b2d..5313e0e022 100644 --- a/db_export.php +++ b/db_export.php @@ -36,16 +36,19 @@ if ($num_tables < 1) { $multi_values = '<div>'; $multi_values .= '<a href="#"'; -$multi_values .= ' onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">'; +$multi_values .= ' onclick="setSelectOptions(\'dump\', \'table_select[]\', true);' + . ' return false;">'; $multi_values .= __('Select All'); $multi_values .= '</a>'; $multi_values .= ' / '; $multi_values .= '<a href="#"'; -$multi_values .= ' onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">'; +$multi_values .= ' onclick="setSelectOptions(\'dump\', \'table_select[]\', false);' + . ' return false;">'; $multi_values .= __('Unselect All'); $multi_values .= '</a><br />'; -$multi_values .= '<select name="table_select[]" id="table_select" size="10" multiple="multiple">'; +$multi_values .= '<select name="table_select[]" id="table_select" size="10"' + . ' multiple="multiple">'; $multi_values .= "\n"; // when called by libraries/mult_submits.inc.php diff --git a/db_import.php b/db_import.php index 436136a1f2..70425b2183 100644 --- a/db_import.php +++ b/db_import.php @@ -1,13 +1,11 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Database import page * * @package PhpMyAdmin */ -/** - * - */ require_once 'libraries/common.inc.php'; $response = PMA_Response::getInstance(); @@ -25,4 +23,3 @@ $import_type = 'database'; require 'libraries/display_import.inc.php'; ?> - diff --git a/db_operations.php b/db_operations.php index e3c2baeed3..9682498d7f 100644 --- a/db_operations.php +++ b/db_operations.php @@ -126,11 +126,15 @@ if (strlen($db) $sql_query .= "\n" . $local_query; $GLOBALS['dbi']->query($local_query); - $message = PMA_Message::success(__('Database %1$s has been renamed to %2$s')); + $message = PMA_Message::success( + __('Database %1$s has been renamed to %2$s') + ); $message->addParam($db); $message->addParam($_REQUEST['newname']); } elseif (! $_error) { - $message = PMA_Message::success(__('Database %1$s has been copied to %2$s')); + $message = PMA_Message::success( + __('Database %1$s has been copied to %2$s') + ); $message->addParam($db); $message->addParam($_REQUEST['newname']); } @@ -255,7 +259,8 @@ if (!$is_information_schema) { __('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.') ); $message->addParam( - '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', + '<a href="' . $cfg['PmaAbsoluteUri'] + . 'chk_rel.php?' . $url_query . '">', false ); $message->addParam('</a>', false); diff --git a/db_qbe.php b/db_qbe.php index 003b2fe033..849d10eff0 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -28,9 +28,9 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) { $message_to_display = true; } else { $goto = 'db_sql.php'; - + // Parse and analyze the query - require_once 'libraries/parse_analyze.inc.php'; + include_once 'libraries/parse_analyze.inc.php'; PMA_executeQueryAndSendQueryResponse( $analyzed_sql_results, false, $_REQUEST['db'], null, null, null, null, diff --git a/db_sql.php b/db_sql.php index e2a0069cff..c4418b4e7f 100644 --- a/db_sql.php +++ b/db_sql.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Database SQL executor * * @package PhpMyAdmin */ diff --git a/db_structure.php b/db_structure.php index b1887727fa..3437122454 100644 --- a/db_structure.php +++ b/db_structure.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Database structure manipulation * * @package PhpMyAdmin */ diff --git a/db_tracking.php b/db_tracking.php index b849928843..983be487be 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -1,6 +1,8 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Tracking configuration for database + * * @package PhpMyAdmin */ @@ -132,10 +134,16 @@ if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) { <td><?php echo $version_data['date_created'];?></td> <td><?php echo $version_data['date_updated'];?></td> <td><?php echo $version_status;?></td> - <td><a class="drop_tracking_anchor ajax" href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> - <td> <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a> - | <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a> - | <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td> + <td> + <a class="drop_tracking_anchor ajax" href="<?php echo $delete_link;?>" > + <?php echo $drop_image_or_text; ?></a> + </td> + <td> + <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a> + | + <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a> + | + <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td> </tr> <?php if ($style == 'even') { diff --git a/server_collations.php b/server_collations.php index d547901740..b1b9c71a09 100644 --- a/server_collations.php +++ b/server_collations.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Server collations page * * @package PhpMyAdmin */ @@ -27,14 +28,12 @@ $response = PMA_Response::getInstance(); $response->addHTML(PMA_getHtmlForSubPageHeader('collations')); $response->addHTML( PMA_getHtmlForCharsets( - $mysql_charsets, + $mysql_charsets, $mysql_collations, - $mysql_charsets_descriptions, - $mysql_default_collations, + $mysql_charsets_descriptions, + $mysql_default_collations, $mysql_collations_available ) ); -exit; - ?> diff --git a/server_import.php b/server_import.php index b2fbac7a88..83d27cf7c1 100644 --- a/server_import.php +++ b/server_import.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Server import page * * @package PhpMyAdmin */ @@ -24,4 +25,3 @@ $import_type = 'server'; require 'libraries/display_import.inc.php'; ?> - diff --git a/server_privileges.php b/server_privileges.php index 3136e9a8b3..8942389795 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Server privileges and users manipulations * * @package PhpMyAdmin */ diff --git a/server_sql.php b/server_sql.php index 408d2b2858..cfbad79531 100644 --- a/server_sql.php +++ b/server_sql.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Server SQL executor * * @package PhpMyAdmin */ diff --git a/tbl_sql.php b/tbl_sql.php index b06be2760c..0d1006feb2 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -1,6 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** + * Table SQL executor * * @package PhpMyAdmin */ |