From 030f8e6cd09bdee8efe5b59f558180b360b122bd Mon Sep 17 00:00:00 2001
From: Victor Xie <FTPiano@users.noreply.github.com>
Date: Sat, 31 Mar 2018 22:19:44 +0800
Subject: [PATCH] Minor fixes.

- Improve web browser compatibility: 'onclick' will be fired AFTER 'onchange' on Safari.
- Fix JS error on web page: useless eval() invocation will raise error on external HDD with multiple partitions.
- Kill dangling aria2c process before forking the service process.
---
 aria2/perp/aria2/rc.main    |  1 +
 aria2/webs/Module_aria2.asp | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/aria2/perp/aria2/rc.main b/aria2/perp/aria2/rc.main
index a36c5bd..361525f 100755
--- a/aria2/perp/aria2/rc.main
+++ b/aria2/perp/aria2/rc.main
@@ -15,6 +15,7 @@ if test ${1} = 'start' ; then
       echo "Awaiting $Aria2_sleep seconds before launching aria2..."
       sleep $Aria2_sleep
     fi
+    killall -q aria2c
     exec /koolshare/aria2/aria2c --conf-path=/koolshare/aria2/aria2.conf
   fi
 fi
diff --git a/aria2/webs/Module_aria2.asp b/aria2/webs/Module_aria2.asp
index 372513b..bd7b81f 100644
--- a/aria2/webs/Module_aria2.asp
+++ b/aria2/webs/Module_aria2.asp
@@ -222,6 +222,8 @@ function buildswitch() {
 }
 
 function update_visibility(r) {
+    if (r && r.type == "checkbox")
+        oncheckclick(r);
 	var rrt = document.getElementById("switch");
 	if (document.aria2_form.aria2_enable.value !== "1") {
 		rrt.checked = false;
@@ -556,7 +558,7 @@ function initial_dir() {
 function initial_dir_status(data) {
 	if (data != "" && data.length != 2) {
 		get_layer_items("0");
-		eval("var default_dir=" + data);
+		//eval("var default_dir=" + data);
 	} else {
 		//document.getElementById("EditExports").style.display = "none";
 		disk_flag = 1;
@@ -1176,7 +1178,7 @@ function toggle_func() {
                               <label>启用CPU占用限制</label>
                             </td>
                             <td>
-                              <input type="checkbox" id="aria2_cpulimit_enable" checked="" onclick="oncheckclick(this)" onchange="update_visibility();">
+                              <input type="checkbox" id="aria2_cpulimit_enable" checked="" onchange="update_visibility(this);">
                               <input type="hidden" id="f_aria2_cpulimit_enable" name="aria2_cpulimit_enable" value="" />
                               <input style="display: none;" type="text" class="input_ss_table" style="width:auto;" name="aria2_cpulimit_value" value="30" maxlength="40" size="40" id="aria2_cpulimit_value">
                               <small>(范围: 1 - 100; 默认: 30)</small>
@@ -1293,7 +1295,7 @@ function toggle_func() {
                               <label>启用 RPC</label>
                             </td>
                             <td>
-                              <input type="checkbox" id="aria2_enable_rpc" checked="" onclick="oncheckclick(this)" onchange="update_visibility();">
+                              <input type="checkbox" id="aria2_enable_rpc" checked="" onchange="update_visibility(this);">
                               <input type="hidden" id="f_aria2_enable_rpc" name="aria2_enable_rpc" value="" />
                               <small>*</small>
                             </td>
@@ -1463,7 +1465,7 @@ function toggle_func() {
                               <label>启用 DHT</label>
                             </td>
                             <td>
-                              <input type="checkbox" id="aria2_enable_dht" checked="" onclick="oncheckclick(this)"  onchange="update_visibility();">
+                              <input type="checkbox" id="aria2_enable_dht" checked="" onchange="update_visibility(this);">
                               <input type="hidden" id="f_aria2_enable_dht" name="aria2_enable_dht" value="" />
                               <small>*</small>
                             </td>
@@ -1564,7 +1566,7 @@ function toggle_func() {
                               <label>启用会话session强制保存</label>
                             </td>
                             <td>
-                              <input type="checkbox" id="aria2_force_save" checked="" onclick="oncheckclick(this)"  onchange="update_visibility();">
+                              <input type="checkbox" id="aria2_force_save" checked="" onchange="update_visibility(this);">
                               <input type="hidden" id="f_aria2_force_save" name="aria2_force_save" value="" />
                               <small>*</small>
                             </td>