gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various coding style fixes

Browse Source
This commit is contained in:
Michal Čihař 2013-08-06 15:43:08 +02:00
parent deca3cb971
commit ef30133a94
14 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db_create.php
View File

@ -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']
);
}

6
db_datadict.php
View File

@ -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

9
db_export.php
View File

@ -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

5
db_import.php
View File

@ -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';
?>

11
db_operations.php
View File

@ -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);

4
db_qbe.php
View File

@ -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,

1
db_sql.php
View File

@ -1,6 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Database SQL executor
*
* @package PhpMyAdmin
*/

1
db_structure.php
View File

@ -1,6 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Database structure manipulation
*
* @package PhpMyAdmin
*/

16
db_tracking.php
View File

@ -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; ?>&amp;report=true&amp;version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a>
| <a href="<?php echo $tmp_link; ?>&amp;snapshot=true&amp;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; ?>&amp;report=true&amp;version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a>
|
<a href="<?php echo $tmp_link; ?>&amp;snapshot=true&amp;version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td>
</tr>
<?php
if ($style == 'even') {

9
server_collations.php
View File

@ -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;
?>

2
server_import.php
View File

@ -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';
?>

1
server_privileges.php
View File

@ -1,6 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Server privileges and users manipulations
*
* @package PhpMyAdmin
*/

1
server_sql.php
View File

@ -1,6 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Server SQL executor
*
* @package PhpMyAdmin
*/

1
tbl_sql.php
View File

@ -1,6 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Table SQL executor
*
* @package PhpMyAdmin
*/