From 9e8618c4f9478dbcd7ecd76acb1d7afd075b32b4 Mon Sep 17 00:00:00 2001
From: Tomas Srnka <tomas.srnka@gmail.com>
Date: Tue, 2 Mar 2010 09:28:56 +0000
Subject: [PATCH] Import progress bar fix from GIT

---
 import_status.php                       |   1 +
 libraries/display_import.lib.php        |  59 ++++++------------------
 libraries/server_synchronize.lib.php    |   2 +-
 server_synchronize.php                  |   6 +--
 themes/darkblue_orange/img/new_data.jpg | Bin 0 -> 1925 bytes
 5 files changed, 19 insertions(+), 49 deletions(-)
 create mode 100644 themes/darkblue_orange/img/new_data.jpg

diff --git a/import_status.php b/import_status.php
index 93cd7ba00..dccd41fdd 100644
--- a/import_status.php
+++ b/import_status.php
@@ -18,6 +18,7 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) {
 
     header('Content-type: text/html');
 
+	usleep(300000); // wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php 
     while ($_SESSION['Import_message']['message'] == null) { // wait until message is available 
         usleep(250000); // 0.25 sec
     }
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 2d854ad40..c24ff9914 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -26,41 +26,13 @@ if (empty($import_list)) {
 }
 ?>
 
-<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none" src="import.php"></iframe>
+<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>
 <div id="import_form_status" style="display: none;"></div>
 <div id="importmain">
 <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> 
 <script type="text/javascript">
 //<![CDATA[
-<!--
-// Mootools code for handling Ajax requests
-  window.addEvent('load', function() {
-	  // webkit fix from 3rd source, but it does not work sometimes (??) --
-	  // toms
-  ////////////////////////////// {{{{{
- Request.HTML.implement({
-  
-     processHTML: function(text) {
-         var match = text.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
-         text = (match) ? match[1] : text;
-            
-         var container = new Element('div');
-            
-         return $try(function(){
-         var root = '<root>' + text + '</root>', doc;
-             doc = new DOMParser().parseFromString(root, 'text/html');
-             root = doc.getElementsByTagName('root')[0];
-             for (var i = 0, k = root.childNodes.length; i < k; i++){
-                 var child = Element.clone(root.childNodes[i], true, true);
-                 if (child) container.grab(child);
-             }
-             return container;
-         }) || container.set('html', text);
-     }
-    
- });
-
-  ////////////////////////// }}}}}
+window.addEvent('domready', function() {
   // add event when user click on "Go" button
   $('buttonGo').addEvent('click', function() {
     $('upload_form_form').setStyle("display", "none"); // hide form
@@ -84,7 +56,7 @@ if (empty($import_list)) {
       method: 'get',
       update: 'upload_form_status',
       onComplete: function(response) {
-	objectsReturned = JSON.decode(response);
+	   objectsReturned = JSON.decode(response);
 	
 	$each(objectsReturned, function(item, index) {
 					    
@@ -96,32 +68,29 @@ if (empty($import_list)) {
 	      $('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').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error
-//]]>
 	      <?php  
 		// reload the left sidebar when the import is finished
 		$GLOBALS['reload']=true; 
 		PMA_reloadNavigation(true); 
 	      ?>
-//<![CDATA[
-	    } // if [finished==item]
-	  } // if [index==finished]    
+	    } // if finished==item
+	  } // if index==finished    
 	  if (index=="percent")
 	    percent = item;
-
 	  if (index=="total")
 	    total = item;
 	  if (index=="complete")
 	    complete = item;			    
-	}); // [$each]
+	}); // $each
 	 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').setStyle("display", "none");
 	 } else {
 	  $('upload_form_status_info').set('html', ' '+Math.round(percent)+'%, '+complete+'/'+total);
 	  $('status').tween('width', Math.round(percent)*2+'px');
-	 } //[else]
-    } //[onComplete]
-   }); // [request]
+	 } // else
+    } // onComplete
+   }); // [equest
    perform_upload = function () { 
      request_upload.send('r=' + $time() + $random(0, 100)); // hack for IE7,8 & webkit (Safari, Chrome, Arora...) 
    }
@@ -132,12 +101,12 @@ if (empty($import_list)) {
 	  $('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').setStyle("display", "none");
 	<?php
-	} //[else]
+	} // else 
 	?> 
-  }); //if [click]
-}); // if [load]
-  document.write('<form action="import.php" method="post" enctype="multipart/form-data" name="import" <?php if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") echo 'target="import_upload_iframe"'; ?>>');
--->
+  }); // if click
+}); // domready
+
+  document.write('<form action="import.php" method="post" enctype="multipart/form-data" name="import"<?php if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") echo ' target="import_upload_iframe"'; ?>>');
 //]]>
 </script>
 <noscript>
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 0716f98e0..8978cc655 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1334,7 +1334,7 @@ function PMA_displayQuery($query) {
 function PMA_syncDisplayHeaderSource($src_db) {
     echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0px; margin-bottom: 1em "> ';
 
-    echo '<table id="serverstatustraffic" class="data" width="55%">';
+    echo '<table id="serverstatusconnections" class="data" width="55%">';
     echo '<tr>';
     echo '<th>' . $GLOBALS['strDatabase_src'] . ':  ' . $src_db . '<br />(';
     if ('cur' == $_SESSION['src_type']) {
diff --git a/server_synchronize.php b/server_synchronize.php
index 7d7fe3d6e..ca5250ca3 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -255,7 +255,7 @@ if ((isset($_REQUEST['submit_connect']))) {
             */
             echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">'
             . PMA_generate_common_hidden_inputs('', '');
-            echo '<table class="data" width = "50%">
+            echo '<table id="serverstatustraffic" class="data" width = "60%">
             <tr>
             <td> <h2>'
             . ($GLOBALS['cfg']['MainPageIconic']
@@ -455,7 +455,7 @@ if ((isset($_REQUEST['submit_connect']))) {
             *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables
             */
             echo '<fieldset>
-            <p><input type= "checkbox" name="delete_rows" id ="delete_rows" />' . $strTableDeleteRows . ' </p>
+            <p><input type= "checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . $strTableDeleteRows . '</label> </p>
             </fieldset>
             <fieldset class="tblFooters">';
             echo '<input type="button" name="apply_changes" value="' . $GLOBALS['strApplyChanges']
@@ -899,7 +899,7 @@ if (isset($_REQUEST['Table_ids'])) {
     *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables
     */
     echo '<fieldset>
-    <p><input type= "checkbox" name="delete_rows" id ="delete_rows" />' . $strTableDeleteRows . ' </p>
+    <p><input type="checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . $strTableDeleteRows . '</label> </p>
     </fieldset>';
 
     echo '<fieldset class="tblFooters">';
diff --git a/themes/darkblue_orange/img/new_data.jpg b/themes/darkblue_orange/img/new_data.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..08d30d34a728e7c558c9fb97b7e34063b4ae1eb4
GIT binary patch
literal 1925
zcmex=<NpH&0WUXCHwH#VMur521O|rx4;k8AD>Bm<7(6|-7&sUh7}yx37+Dz@85kJC
z7#J9&q3k#Y1_ljAX0SLDg9L*iBNKxF0|P@E0|NsiGemtE0|NsyGb30H!~g#W7#J8p
zR)F~lAax833;~Imc_n&&t|1C##(KtP3=7&A8TvOeF#NyG;LO0p2m&CI2?SV}K_n{+
z3o{EFD;paavvYE=v2(Jsv2k#7aB_hF8wWQJHy00x12TjWq=$)#m6@59i=B-fq=Gd3
z{{Vv^2ZJ($GBcwR1Ct;lvmoRDBMkBk42-NG*D-=Z2IMmaMkZz!RyKAHPA=~MM;NvW
zFfcJPGc&O;v$C?VFfcIIGBPnUun4jWDH=Mm2?r*!D;0_uHBMZ}q3pErplHy=4=Tn<
zMNOPsV&W2#QmSg|8k$-rre@|AmR8O#u5Rugo?gKrp<&?>kx|JhscGpMnOVgprDf$6
zl~v6xt!?ccon4bAPnkMx`iz;g7A;<~blLJ1D_3pWyk+aQ?K^hvI&}ER(PPI?oIG{u
z@|COCuHU$M>*1rvPo6$|{^I4UkDoq&`TFhqkDtFl{$gZchIk8<B(V8Qkb#Mj2^0tH
zAb&A3m4iGk$ik{<$R^|%$evgztYp;4A>uS~;l_iU%Emz-M3agxa*3&!JXHM%@*3D@
z#CfcVET6$WhVa)d1|DWc1|~sfK?Zw<zs@c{ZhoBoIQ^~QBYA=U3<q886lyd+)F0~a
z5Zh(i+TK>Oo_*Qu<Ynud|JbjIiM?|tTT1oG!98!i-p+HI;kI!V!zz)<&+R{4w%_>t
zudeKWhMDXS`TsK*U#Yun|0#X`hmiW;GwQzv{7Bp9@VD2F^+)ozz90V?mj2QB*tfnu
zdHKCtasIaFW^O(guXf9`A@;#~RfZ=erXThs9t-`EEZuY{;Ba;3qoo?hK0onX&a(CC
zw0Cu3+k>BNey6Z{a#Fz+&5PeAt+^HVU3XTY_nW;x_pGU{|Iff{{9CU6(#88fC)5f2
zXZUOzJO7~dd4_+N?kVm1(EjG}e+G8$it~@y)+VRq>zC|jd2P>a8r@x8@Tx7n@A_fC
zlXBl(?>R`8N}d$`<a_+h!QZAeNk0-FotLUR`JX|=CbV=-g|?T~y44TwOJ+`RSH0Sm
zes&sr!^9~P51P-hOE<3A|DfkT!>1{C?f;$q&v5iV!>^hTODkrocS@|e-eIsaH%25;
z>Q$bpa%4#FLP_&%$Jl!|Yt3fueY^F~o88^39~VbiSU$WG8mhKzmFD_Vvu|Cm)?B?D
zJ%4fh2mkqUe>{J*|F$?^`!W3y@B6N=YlR=>_w6zHr*!4bnz!%Pzb)w(d-W@H$>!s!
zEMkv>bJN*Aiv%vVNaNUfRCM-#2A0eJ877y0l>a-2{b>K+h&shZ`$O$+{QS@GZRUT5
z$u|EPnil_OxO4bF!>abfrk}<C2)7@b$M>WDcVtGL>c{6@IVQ12w$?#ix$eO`1)Zfm
zQ;pP~+3;*;{A&8`TlWV;`^>-M-+up{mGaT@qWB~ABa(lNZe7^?+jE2Xe+KS9>e=7=
zwW}(3+uZ$azV7XgJ3CMOeEd)GKf~V@^)D6e82>XIso(pb;n}SH`XAZbKL2@ce7bOF
zin4m!lx0_zo|?VaT=etPay#R$O+DugjwO7QuvlqjRFt{9v^oBlw~?J()E}k4opn-w
zT(3X>ySPUAalXKh{Rg+p$zJ#p&+e~!YT*tAo6jC67BaD(<Bv&5nV>!8KSPu8e}+@R
zCI1<IoBwAJ|IhI9^P#CP;y?2LXL#%UpTU#!1OGqezwiGum|T4`|AYVjA1dib-ru<Y
zZAtyD=ttpi!x#LxyZ8g!%7?RM#hrhonsq3PZ@-m#`HrW~uC4E9ZvSm4py2YKA?nC>
zhVU~5+gS?z;*Uzm_$jqoMdVnmn38O+{{C2b?(S`Omh4uUcK1)t^mgMlYQ=49!{#Kq
zO`6x`yT8ildTey=`iXDiKls}JG>;ej&v5fVO~ikOtL=}ZH2yO*W&US4x$8&&zjMrw
zj{jR@FK{t__xxp2a#sHtnyTu~{<Hrv{gHk5^y&W@gule*AHDt|zGC7Y;g9!^-jm(B
ze^=Y7TgR;1w_N(_U0rVy9Tn{o<0d(c<&K|m<bQ?_Z|!eh|JP;ymhnGBXEG=}rf&&!
zVE<$7|E=^t!=m2b4)u>B{y6_<c=}czyIQ%0AG9BYANIew`{B~{hwNLbLjNx7%&f1k
uS-tA@^<7J^To2#A`F`vj-|||M>*7MEi;Hd6eLC?b%K5ybt4IL*|C<0&uR`zu

literal 0
HcmV?d00001