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

Whitespace cleanup.

Browse Source
This commit is contained in:
Michal Čihař
2010-04-09 15:39:56 +02:00
parent ea8cc56bec
commit ab325e609a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libraries/display_import.lib.php
View File

@@ -29,7 +29,7 @@ if (empty($import_list)) {
<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none"></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;" />
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
window.addEvent('domready', function() { window.addEvent('domready', function() {
@@ -42,12 +42,12 @@ window.addEvent('domready', function() {
if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
?> ?>
$('upload_form_status').set('html', '<div class="upload_progress_bar_outer"><div id="status" class="upload_progress_bar_inner"></div></div>'); // add the progress bar $('upload_form_status').set('html', '<div class="upload_progress_bar_outer"><div id="status" class="upload_progress_bar_inner"></div></div>'); // add the progress bar
var finished = false; var finished = false;
var percent = 0.0; var percent = 0.0;
var total = 0; var total = 0;
var complete = 0; var complete = 0;
var perform_upload; var perform_upload;
var periodical_upload; var periodical_upload;
@@ -57,9 +57,9 @@ window.addEvent('domready', function() {
update: 'upload_form_status', update: 'upload_form_status',
onComplete: function(response) { onComplete: function(response) {
objectsReturned = JSON.decode(response); objectsReturned = JSON.decode(response);
$each(objectsReturned, function(item, index) { $each(objectsReturned, function(item, index) {
if (index=="finished") { if (index=="finished") {
finished = item; finished = item;
if (finished==true) { if (finished==true) {
@@ -68,19 +68,19 @@ window.addEvent('domready', function() {
$('import_form_status').setStyle('display', 'inline'); $('import_form_status').setStyle('display', 'inline');
$('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportProceedingFile; ?> '); $('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportProceedingFile; ?> ');
$('import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error $('import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error
<?php <?php
// reload the left sidebar when the import is finished // reload the left sidebar when the import is finished
$GLOBALS['reload']=true; $GLOBALS['reload']=true;
PMA_reloadNavigation(true); PMA_reloadNavigation(true);
?> ?>
} // if finished==item } // if finished==item
} // if index==finished } // if index==finished
if (index=="percent") if (index=="percent")
percent = item; percent = item;
if (index=="total") if (index=="total")
total = item; total = item;
if (index=="complete") if (index=="complete")
complete = item; complete = item;
}); // $each }); // $each
if (total==0 && complete==0 && percent==0) { if (total==0 && complete==0 && percent==0) {
$('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportLargeFileUploading); ?>'); $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportLargeFileUploading); ?>');
@@ -91,8 +91,8 @@ window.addEvent('domready', function() {
} // else } // else
} // onComplete } // onComplete
}); // [equest }); // [equest
perform_upload = function () { perform_upload = function () {
request_upload.send('r=' + $time() + $random(0, 100)); // hack for IE7,8 & webkit (Safari, Chrome, Arora...) request_upload.send('r=' + $time() + $random(0, 100)); // hack for IE7,8 & webkit (Safari, Chrome, Arora...)
} }
periodical_upload = perform_upload.periodical(1000); periodical_upload = perform_upload.periodical(1000);
<?php <?php
@@ -101,8 +101,8 @@ window.addEvent('domready', function() {
$('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_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
?> ?>
}); // if click }); // if click
}); // domready }); // domready
@@ -112,7 +112,7 @@ window.addEvent('domready', function() {
<noscript> <noscript>
<form action="import.php" method="post" enctype="multipart/form-data" name="import"> <form action="import.php" method="post" enctype="multipart/form-data" name="import">
</noscript> </noscript>
<input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" /> <input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" />
<?php <?php
if ($import_type == 'server') { if ($import_type == 'server') {
echo PMA_generate_common_hidden_inputs('', '', 1); echo PMA_generate_common_hidden_inputs('', '', 1);