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

uploadprogress: cleanup + added documentation link. Merged from git

Browse Source
This commit is contained in:
Herman van Rink
2010-03-02 10:11:37 +00:00
parent 9e8618c4f9
commit 2d60036978
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/display_import.lib.php
View File

@@ -26,7 +26,7 @@ if (empty($import_list)) {
} }
?> ?>
<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none" src="import.php?<?php echo PMA_generate_common_url(); ?>"></iframe> <iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none"></iframe>
<div id="import_form_status" style="display: none;"></div> <div id="import_form_status" style="display: none;"></div>
<div id="importmain"> <div id="importmain">
<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
@@ -98,7 +98,7 @@ window.addEvent('domready', function() {
<?php <?php
} else { } else {
?> ?>
$('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable; ?>'); $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>');
$('upload_form_status').setStyle("display", "none"); $('upload_form_status').setStyle("display", "none");
<?php <?php
} // else } // else

6
libraries/display_import_ajax.lib.php
View File

@@ -31,7 +31,7 @@ $plugins = array(
"uploadprogress", "uploadprogress",
"apc", "apc",
"noplugin" "noplugin"
); // available plugins. Each plugin has own checkfunction in upload_functions.php and own file with functions in upload_#KEY#.php ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php
// select available plugin // select available plugin
foreach ($plugins as $plugin) { foreach ($plugins as $plugin) {
@@ -40,8 +40,8 @@ foreach ($plugins as $plugin) {
if ($check()) { if ($check()) {
$_SESSION[$SESSION_KEY]["handler"] = $plugin; $_SESSION[$SESSION_KEY]["handler"] = $plugin;
include_once("import/upload/" . $plugin . ".php"); include_once("import/upload/" . $plugin . ".php");
break; break;
} }
} }
/** /**