Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauriciofauth@gmail.com>2018-05-30 10:33:50 +0300
committerMaurício Meneghini Fauth <mauriciofauth@gmail.com>2018-05-30 15:07:56 +0300
commit285e38e931635a5d72bc75d38c891ee27a491d1a (patch)
tree69d809e2551f80c7831a51da6d3e54b37d9ddbdc /export.php
parentd248fd419d5ed78c42ff2b7ce590239932479b0c (diff)
Fix some PSR-2 coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'export.php')
-rw-r--r--export.php111
1 files changed, 88 insertions, 23 deletions
diff --git a/export.php b/export.php
index 3710a3d5a3..fde12c7761 100644
--- a/export.php
+++ b/export.php
@@ -351,7 +351,10 @@ if ($asfile) {
$remember_template = '';
}
list($filename, $mime_type) = $export->getFilenameAndMimetype(
- $export_type, $remember_template, $export_plugin, $compression,
+ $export_type,
+ $remember_template,
+ $export_plugin,
+ $compression,
$filename_template
);
} else {
@@ -361,7 +364,8 @@ if ($asfile) {
// Open file on server if needed
if ($save_on_server) {
list($save_filename, $message, $file_handle) = $export->openFile(
- $filename, $quick_export
+ $filename,
+ $quick_export
);
// problem opening export file on server?
@@ -395,7 +399,9 @@ if ($save_on_server) {
}
}
list($html, $back_button, $refreshButton) = $export->getHtmlForDisplayedExportHeader(
- $export_type, $db, $table
+ $export_type,
+ $db,
+ $table
);
echo $html;
unset($html);
@@ -438,9 +444,18 @@ do {
$db_select = '';
}
$export->exportServer(
- $db_select, $whatStrucOrData, $export_plugin, $crlf, $err_url,
- $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
- $aliases, $separate_files
+ $db_select,
+ $whatStrucOrData,
+ $export_plugin,
+ $crlf,
+ $err_url,
+ $export_type,
+ $do_relation,
+ $do_comments,
+ $do_mime,
+ $do_dates,
+ $aliases,
+ $separate_files
);
} elseif ($export_type == 'database') {
if (!isset($table_structure) || !is_array($table_structure)) {
@@ -457,9 +472,20 @@ do {
$export->lockTables($db, $tables, "READ");
try {
$export->exportDatabase(
- $db, $tables, $whatStrucOrData, $table_structure,
- $table_data, $export_plugin, $crlf, $err_url, $export_type,
- $do_relation, $do_comments, $do_mime, $do_dates, $aliases,
+ $db,
+ $tables,
+ $whatStrucOrData,
+ $table_structure,
+ $table_data,
+ $export_plugin,
+ $crlf,
+ $err_url,
+ $export_type,
+ $do_relation,
+ $do_comments,
+ $do_mime,
+ $do_dates,
+ $aliases,
$separate_files
);
} finally {
@@ -467,9 +493,21 @@ do {
}
} else {
$export->exportDatabase(
- $db, $tables, $whatStrucOrData, $table_structure, $table_data,
- $export_plugin, $crlf, $err_url, $export_type, $do_relation,
- $do_comments, $do_mime, $do_dates, $aliases, $separate_files
+ $db,
+ $tables,
+ $whatStrucOrData,
+ $table_structure,
+ $table_data,
+ $export_plugin,
+ $crlf,
+ $err_url,
+ $export_type,
+ $do_relation,
+ $do_comments,
+ $do_mime,
+ $do_dates,
+ $aliases,
+ $separate_files
);
}
} else {
@@ -488,26 +526,50 @@ do {
try {
$export->lockTables($db, [$table], "READ");
$export->exportTable(
- $db, $table, $whatStrucOrData, $export_plugin, $crlf,
- $err_url, $export_type, $do_relation, $do_comments,
- $do_mime, $do_dates, $allrows, $limit_to, $limit_from,
- $sql_query, $aliases
+ $db,
+ $table,
+ $whatStrucOrData,
+ $export_plugin,
+ $crlf,
+ $err_url,
+ $export_type,
+ $do_relation,
+ $do_comments,
+ $do_mime,
+ $do_dates,
+ $allrows,
+ $limit_to,
+ $limit_from,
+ $sql_query,
+ $aliases
);
} finally {
$export->unlockTables();
}
} else {
$export->exportTable(
- $db, $table, $whatStrucOrData, $export_plugin, $crlf, $err_url,
- $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
- $allrows, $limit_to, $limit_from, $sql_query, $aliases
+ $db,
+ $table,
+ $whatStrucOrData,
+ $export_plugin,
+ $crlf,
+ $err_url,
+ $export_type,
+ $do_relation,
+ $do_comments,
+ $do_mime,
+ $do_dates,
+ $allrows,
+ $limit_to,
+ $limit_from,
+ $sql_query,
+ $aliases
);
}
}
if (! $export_plugin->exportFooter()) {
break;
}
-
} while (false);
// End of fake loop
@@ -536,18 +598,21 @@ if ($output_charset_conversion) {
if ($compression) {
if (! empty($separate_files)) {
$dump_buffer = $export->compress(
- $dump_buffer_objects, $compression, $filename
+ $dump_buffer_objects,
+ $compression,
+ $filename
);
} else {
$dump_buffer = $export->compress($dump_buffer, $compression, $filename);
}
-
}
/* If we saved on server, we have to close file now */
if ($save_on_server) {
$message = $export->closeFile(
- $file_handle, $dump_buffer, $save_filename
+ $file_handle,
+ $dump_buffer,
+ $save_filename
);
$export->showPage($db, $table, $export_type);
} else {