Index: branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/incs/export.js
===================================================================
diff -u -r4332 -r4354
--- branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/incs/export.js	(.../export.js)	(revision 4332)
+++ branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/incs/export.js	(.../export.js)	(revision 4354)
@@ -1,85 +1,80 @@
-var $http_request = getXMLHTTPObject();
-var $last_responce = new Date();
-
-function formatNumber($number, $digits_count)
-{
-	return parseInt($number) < Math.pow(10, $digits_count - 1) ? str_repeat('0', $digits_count - 1) + $number : $number;
-}
-
-function formatDate($date)
-{
-	var $hour = formatNumber($date.getHours(), 2);
-	var $minute = formatNumber($date.getMinutes(), 2);
-	var $second = formatNumber($date.getSeconds(), 2);
-	return $hour + ':' + $minute + ':' + $second;
-}
-
-function getSeconds($from_date, $to_date)
-{
-	var $from_seconds = $from_date.getSeconds() +  $from_date.getMinutes() * 60 + $from_date.getHours() * 3600;
-	var $to_seconds = $to_date.getSeconds() +  $to_date.getMinutes() * 60 + $to_date.getHours() * 3600;
-	return $to_seconds - $from_seconds;
-}
-
-var $aborting = false;
-function queryProgress($url, $responce_func)
-{
-//	alert('queryProgress');
-	if ($http_request && $http_request.readyState != 0) {
-//		alert('aborting');
-		$aborting = true;
-		$http_request.abort();
-//		alert('After Abort: readyState: '+$http_request.readyState+' status: '+$http_request.status);
-		$aborting = false;
-	}
-
-//	alert('opening');
-	$http_request.open('POST', $url, true);
-	$http_request.setRequestHeader("referer", $url);
-	$http_request.onreadystatechange = function() { processExportResponce($url, $responce_func); };
-//	alert('sending new req');
-	$http_request.send('is_xml=1');
-	$last_responce = new Date();
-}
-
-function setProgress($percent)
-{
-	$percent = parseInt($percent);
-	document.getElementById('percent_done').style.width = $percent + '%';
-	document.getElementById('percent_left').style.width = (100 - $percent) + '%';
-	document.getElementById('progress_display').innerHTML = $percent;
-	document.getElementById('progress_time').innerHTML = '[' + $phrase_LastResponce + ': ' + formatDate($last_responce) + ']';
-}
-
-function processExportResponce($url, $responce_func)
-{
-//	alert('processExportResponce ready: '+$http_request.readyState);
-	if ($aborting) return;
-	if ($http_request.readyState == 4) {
-		if ($http_request.status == 200) {
-//			alert('readyState: '+$http_request.readyState+' status: '+$http_request.status);
-			var $progress = parseFloat($http_request.responseText);
-			if ($progress) {
-				setProgress($progress);
-				if ($progress < 100) {
-					// proceed to next import step
-					//alert('ANOTHER abort');
-					//$http_request.abort();
-					//alert('After ANOTHER Abort: readyState: '+$http_request.readyState+' status: '+$http_request.status);
-					setTimeout( function() {
-//							alert('quering after timeout');
-							queryProgress($url, $responce_func);
-						}, 500)
-				}
-				else {
-					// proceed to finish screen
-					window.location.href = $finish_template;
-				}
-      }
-      else {
-//      	alert('progress: '+$progress+' ('+$http_request.responseText+')');
-      	alert($phrase_ResponceError);
-      }
-		}
-  }
+var $http_request = getXMLHTTPObject();
+var $last_responce = new Date();
+
+function formatNumber($number, $digits_count)
+{
+	return parseInt($number) < Math.pow(10, $digits_count - 1) ? str_repeat('0', $digits_count - 1) + $number : $number;
+}
+
+function formatDate($date)
+{
+	var $hour = formatNumber($date.getHours(), 2);
+	var $minute = formatNumber($date.getMinutes(), 2);
+	var $second = formatNumber($date.getSeconds(), 2);
+	return $hour + ':' + $minute + ':' + $second;
+}
+
+function getSeconds($from_date, $to_date)
+{
+	var $from_seconds = $from_date.getSeconds() +  $from_date.getMinutes() * 60 + $from_date.getHours() * 3600;
+	var $to_seconds = $to_date.getSeconds() +  $to_date.getMinutes() * 60 + $to_date.getHours() * 3600;
+	return $to_seconds - $from_seconds;
+}
+
+var $aborting = false;
+function queryProgress($url, $responce_func)
+{
+	if ($http_request && $http_request.readyState != 0) {
+		$aborting = true;
+		$http_request.abort();
+		$aborting = false;
+	}
+
+	$http_request.open('POST', $url, true);
+	$http_request.setRequestHeader("referer", $url);
+	$http_request.onreadystatechange = function() { processExportResponce($url, $responce_func); };
+	$http_request.send('is_xml=1');
+	$last_responce = new Date();
+}
+
+function setProgress($percent)
+{
+	$percent = parseInt($percent);
+	document.getElementById('percent_done').style.width = $percent + '%';
+	document.getElementById('percent_left').style.width = (100 - $percent) + '%';
+	document.getElementById('progress_display').innerHTML = $percent;
+	document.getElementById('progress_time').innerHTML = '[' + $phrase_LastResponce + ': ' + formatDate($last_responce) + ']';
+}
+
+function processExportResponce($url, $responce_func)
+{
+//	alert('processExportResponce ready: '+$http_request.readyState);
+	if ($aborting) return;
+	if ($http_request.readyState == 4) {
+		if ($http_request.status == 200) {
+//			alert('readyState: '+$http_request.readyState+' status: '+$http_request.status);
+			var $progress = parseFloat($http_request.responseText);
+			if ($progress) {
+				setProgress($progress);
+				if ($progress < 100) {
+					// proceed to next import step
+					//alert('ANOTHER abort');
+					//$http_request.abort();
+					//alert('After ANOTHER Abort: readyState: '+$http_request.readyState+' status: '+$http_request.status);
+					setTimeout( function() {
+//							alert('quering after timeout');
+							queryProgress($url, $responce_func);
+						}, 500)
+				}
+				else {
+					// proceed to finish screen
+					window.location.href = $finish_template;
+				}
+      }
+      else {
+//      	alert('progress: '+$progress+' ('+$http_request.responseText+')');
+      	alert($phrase_ResponceError);
+      }
+		}
+  }
 }
\ No newline at end of file