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

Refactor to remove display_import.inc.php

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-08-13 13:52:22 -04:00
parent b7a28847ad
commit 75da81b1bd
5 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
db_import.php
View File

@ -22,5 +22,10 @@ $scripts->addFile('import.js');
require 'libraries/db_common.inc.php';
require 'libraries/db_info.inc.php';
$import_type = 'database';
require 'libraries/display_import.inc.php';
require 'libraries/display_import.lib.php';
$response = PMA_Response::getInstance();
$response->addHTML(
PMA_getImportDisplay(
'database', $db, $table, $max_upload_size
)
);

64
libraries/display_import.inc.php
View File

@ -1,64 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* include file for display import : server, database, table
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
require_once './libraries/file_listing.lib.php';
require_once './libraries/plugin_interface.lib.php';
require_once './libraries/display_import.lib.php';
require_once './libraries/display_import_ajax.lib.php';
/* Scan for plugins */
/* @var $import_list ImportPlugin[] */
$import_list = PMA_getPlugins(
"import",
'libraries/plugins/import/',
$import_type
);
/* Fail if we didn't find any plugin */
if (empty($import_list)) {
PMA_Message::error(
__(
'Could not load import plugins, please check your installation!'
)
)->display();
exit;
}
if (PMA_isValid($_REQUEST['offset'], 'numeric')) {
$offset = $_REQUEST['offset'];
}
if (isset($_REQUEST['timeout_passed'])) {
$timeout_passed = $_REQUEST['timeout_passed'];
}
if (isset($_REQUEST['local_import_file'])) {
$local_import_file = $_REQUEST['local_import_file'];
}
$timeout_passed_str = isset($timeout_passed)? $timeout_passed : null;
$offset_str = isset($offset)? $offset : null;
$html = PMA_getHtmlForImport(
$upload_id,
$import_type,
$db,
$table,
$max_upload_size,
$import_list,
$timeout_passed_str,
$offset_str
);
$response = PMA_Response::getInstance();
$response->addHTML($html);

59
libraries/display_import.lib.php
View File

@ -618,3 +618,62 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
return $html;
}
/**
* Gets HTML to display import dialogs
*
* @param String $import_type Import type: server|database|table
* @param String $db Selected DB
* @param String $table Selected Table
* @param int $max_upload_size Max upload size
*
* @return string $html
*/
function PMA_getImportDisplay($import_type, $db, $table, $max_upload_size)
{
global $SESSION_KEY;
require_once './libraries/file_listing.lib.php';
require_once './libraries/plugin_interface.lib.php';
// this one generates also some globals
require_once './libraries/display_import_ajax.lib.php';
/* Scan for plugins */
/* @var $import_list ImportPlugin[] */
$import_list = PMA_getPlugins(
"import",
'libraries/plugins/import/',
$import_type
);
/* Fail if we didn't find any plugin */
if (empty($import_list)) {
PMA_Message::error(
__(
'Could not load import plugins, please check your installation!'
)
)->display();
exit;
}
if (PMA_isValid($_REQUEST['offset'], 'numeric')) {
$offset = $_REQUEST['offset'];
}
if (isset($_REQUEST['timeout_passed'])) {
$timeout_passed = $_REQUEST['timeout_passed'];
}
if (isset($_REQUEST['local_import_file'])) {
$local_import_file = $_REQUEST['local_import_file'];
}
$timeout_passed_str = isset($timeout_passed)? $timeout_passed : null;
$offset_str = isset($offset)? $offset : null;
return PMA_getHtmlForImport(
$upload_id,
$import_type,
$db,
$table,
$max_upload_size,
$import_list,
$timeout_passed_str,
$offset_str
);
}

9
server_import.php
View File

@ -24,5 +24,10 @@ $scripts->addFile('import.js');
*/
require 'libraries/server_common.inc.php';
$import_type = 'server';
require 'libraries/display_import.inc.php';
require 'libraries/display_import.lib.php';
$response = PMA_Response::getInstance();
$response->addHTML(
PMA_getImportDisplay(
'server', $db, $table, $max_upload_size
)
);

9
tbl_import.php
View File

@ -27,5 +27,10 @@ $url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
require_once 'libraries/tbl_info.inc.php';
$import_type = 'table';
require_once 'libraries/display_import.inc.php';
require 'libraries/display_import.lib.php';
$response = PMA_Response::getInstance();
$response->addHTML(
PMA_getImportDisplay(
'table', $db, $table, $max_upload_size
)
);