From 1ecdfbe3b855b1f13bcddccc20135f7e35f171a6 Mon Sep 17 00:00:00 2001
From: Xavier Roche <xroche@users.noreply.github.com>
Date: Mon, 19 Mar 2012 13:00:51 +0000
Subject: httrack 3.43.12

---
 html/server/addurl.html                     | 10 ++++++++--
 html/server/div/WebHTTrack-Websites.desktop |  6 +-----
 html/server/div/WebHTTrack.desktop          |  6 +-----
 html/server/step3.html                      | 29 ++++++++---------------------
 4 files changed, 18 insertions(+), 33 deletions(-)

(limited to 'html/server')

diff --git a/html/server/addurl.html b/html/server/addurl.html
index 21a0953..41b0f07 100755
--- a/html/server/addurl.html
+++ b/html/server/addurl.html
@@ -78,14 +78,20 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <script language="javascript">
 <!--
+
+// initialize wparent to false if necessary (Konqueror bug workaround)
+if ((typeof wparent) == "undefined") {
+	wparent=false;
+}
+
 function do_load() {
 	window.status=' ';
 }
 function do_unload() {
 }
 function do_add() {
-	if (document.wparent)
-		pparent = document.wparent;
+	if (wparent)
+		pparent = wparent;
 	else if (parent && parent.document)
 		pparent = parent.document;
 	if (pparent
diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
index 6b27c64..92688ed 100644
--- a/html/server/div/WebHTTrack-Websites.desktop
+++ b/html/server/div/WebHTTrack-Websites.desktop
@@ -1,13 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
 Icon=/usr/share/httrack/icons/webhttrack.xpm
-Terminal=false
-MultipleArgs=false
-Type=Application
diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
index 762b31e..b6d75ef 100644
--- a/html/server/div/WebHTTrack.desktop
+++ b/html/server/div/WebHTTrack.desktop
@@ -1,13 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
 Icon=/usr/share/httrack/icons/webhttrack.xpm
-Terminal=false
-MultipleArgs=false
-Type=Application
diff --git a/html/server/step3.html b/html/server/step3.html
index a1b035f..f085101 100755
--- a/html/server/step3.html
+++ b/html/server/step3.html
@@ -99,13 +99,16 @@ function info(str) {
 }
 function doOpenWindow() {
   childWn=window.open('addurl.html', 'addurl', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480');
-  setTimeout(do_check_child, 500);
+  setTimeout("do_check_child()", 100);
 }
 function do_check_child() {
-  if (childWn && childWn.document.location=="about:blank") {
-    setTimeout(do_check_child, 500);
-  } else if (childWn) {
-    childWn.document.wparent=document;
+  if (childWn && childWn.document) {
+    if ((typeof childWn.wparent) == "undefined") {
+      childWn.wparent=document;
+      setTimeout("do_check_child()", 1000);
+    } else {
+      childWn.wparent=document;
+    }
   }
 }
 // -->
@@ -178,22 +181,6 @@ ${do:end-if}
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
 
-<script language="javascript">
-<!--
-function doOpenWindow() {
-childWn=window.open('addurl.html', 'addurl', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480');
-setTimeout(do_check_child, 500);
-}
-function do_check_child() {
-if (childWn && childWn.document.location=="about:blank") {
-setTimeout(do_check_child, 500);
-} else if (childWn) {
-childWn.document.wparent=document;
-}
-}
-// -->
-</script>
-
 <table border="0" width="100%">
 <tr><td>
 		${LANG_G31}
-- 
cgit v1.2.3