diff --git a/aliddns/aliddns/webs/Module_aliddns.asp b/aliddns/aliddns/webs/Module_aliddns.asp index fbe6dab..d2cfc91 100644 --- a/aliddns/aliddns/webs/Module_aliddns.asp +++ b/aliddns/aliddns/webs/Module_aliddns.asp @@ -164,16 +164,9 @@ $(function () { }) }) -var enable_ss = "<% nvram_get("enable_ss"); %>"; -var enable_soft = "<% nvram_get("enable_soft"); %>"; function menu_hook(title, tab) { - if(enable_ss == "1" && enable_soft == "1"){ - tabtitle[17] = new Array("", "Aliddns"); - tablink[17] = new Array("", "Module_aliddns.asp"); - }else{ - tabtitle[16] = new Array("", "Aliddns"); - tablink[16] = new Array("", "Module_aliddns.asp"); - } + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "Aliddns"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_aliddns.asp"); } function reload_Soft_Center(){ diff --git a/aria2/aria2.tar.gz b/aria2/aria2.tar.gz index 4c9ce53..56351da 100644 Binary files a/aria2/aria2.tar.gz and b/aria2/aria2.tar.gz differ diff --git a/aria2/aria2/webs/Module_aria2.asp b/aria2/aria2/webs/Module_aria2.asp index 4c759b2..bac0d8f 100644 --- a/aria2/aria2/webs/Module_aria2.asp +++ b/aria2/aria2/webs/Module_aria2.asp @@ -106,8 +106,8 @@ function init() { generate_glutton_link(); } function menu_hook(title, tab) { - tabtitle[tabtitle.length -1] = new Array("", "aria2"); - tablink[tablink.length -1] = new Array("", "Module_aria2.asp"); + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "aria2"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_aria2.asp"); } function done_validating(action) { return true; @@ -121,9 +121,6 @@ function check_ddnsto() { $G("aria2_ddnsto").checked = false; $G("f_aria2_ddnsto").value = "false"; $G("ddnsto_status").innerHTML = "如需远程连接Aria，请正确设置DDNSTO插件并启用！"; - if (validForm()) { - document.aria2_form.submit(); - } } if ($G("aria2_ddnsto").checked){ $G("aria2_rpc_secret").readOnly=true; @@ -286,7 +283,7 @@ function version_check() { } function get_status() { $.ajax({ - url: 'applydb.cgi?current_page=Module_aria2.asp&next_page=Module_aria2.asp&group_id=&modified=0&action_mode=+Refresh+&action_script=aria2_status.sh&action_wait=&first_time=&preferred_lang=CN', + url: 'applydb.cgi?p=aria2_¤t_page=Module_aria2.asp&next_page=Module_aria2.asp&group_id=&modified=0&action_mode=+Refresh+&action_script=aria2_status.sh&action_wait=&first_time=&preferred_lang=CN', dataType: 'html', error: function(xhr) { alert("error"); @@ -553,7 +550,7 @@ function initial_dir_status(data) { if (data != "" && data.length != 2) { get_layer_items("0"); //eval('var default_dir=' + data); - var default_dir= data; + var default_dir= data; } else { //document.getElementById("EditExports").style.display = "none"; disk_flag = 1; @@ -1027,8 +1024,8 @@ function toggle_func() { - - + + "/> diff --git a/aria2/config.json.js b/aria2/config.json.js index d10c2c4..57d006b 100644 --- a/aria2/config.json.js +++ b/aria2/config.json.js @@ -1,8 +1,8 @@ { "version":"2.4", -"md5":"f4e5e3027db9cafbddd77b4f649f8b64", +"md5":"bb97c3ddf4f861781df65e6f0b7cb775", "home_url":"Module_aria2.asp", "title":"Aria2", "description":"linux下载利器", -"build_date":"2019-01-13_18:35:15" +"build_date":"2019-01-23_19:00:26" } diff --git a/aria2/version b/aria2/version index 4d69368..fdd6693 100644 --- a/aria2/version +++ b/aria2/version @@ -1,2 +1,2 @@ 2.4 -f4e5e3027db9cafbddd77b4f649f8b64 +bb97c3ddf4f861781df65e6f0b7cb775 diff --git a/cfddns/cfddns/webs/Module_cfddns.asp b/cfddns/cfddns/webs/Module_cfddns.asp index 0b9535b..49543fd 100755 --- a/cfddns/cfddns/webs/Module_cfddns.asp +++ b/cfddns/cfddns/webs/Module_cfddns.asp @@ -168,8 +168,8 @@ }) function menu_hook(title, tab) { - tabtitle[tabtitle.length -1] = new Array("", "Cloudflare DDNS"); - tablink[tablink.length -1] = new Array("", "Module_cfddns.asp"); + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "Cloudflare DDNS"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_cfddns.asp"); } function reload_Soft_Center(){ diff --git a/ddnspod/ddnspod/webs/Module_ddnspod.asp b/ddnspod/ddnspod/webs/Module_ddnspod.asp index 27fa9c4..d63cedf 100644 --- a/ddnspod/ddnspod/webs/Module_ddnspod.asp +++ b/ddnspod/ddnspod/webs/Module_ddnspod.asp @@ -27,7 +27,7 @@ diff --git a/frpc/frpc/webs/Module_frpc.asp b/frpc/frpc/webs/Module_frpc.asp index c555e94..99af3a0 100644 --- a/frpc/frpc/webs/Module_frpc.asp +++ b/frpc/frpc/webs/Module_frpc.asp @@ -228,15 +228,8 @@ function reload_Soft_Center(){ //返回软件中心按钮 location.href = "/Main_Soft_center.asp"; } function menu_hook(title, tab) { - var enable_ss = "<% nvram_get("enable_ss"); %>"; - var enable_soft = "<% nvram_get("enable_soft"); %>"; - if(enable_ss == "1" && enable_soft == "1"){ - tabtitle[tabtitle.length -2] = new Array("", "Frpc 内网穿透"); - tablink[tablink.length -2] = new Array("", "Module_frpc.asp"); - }else{ - tabtitle[tabtitle.length -1] = new Array("", "Frpc 内网穿透"); - tablink[tablink.length -1] = new Array("", "Module_frpc.asp"); - } + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "Frpc 内网穿透"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_frpc.asp"); } function addTr(o) { //添加配置行操作 var _form_addTr = document.form; diff --git a/frps/frps/webs/Module_frps.asp b/frps/frps/webs/Module_frps.asp index 0a880d7..67cd449 100644 --- a/frps/frps/webs/Module_frps.asp +++ b/frps/frps/webs/Module_frps.asp @@ -249,15 +249,8 @@ function reload_Soft_Center(){ //返回软件中心按钮 location.href = "/Main_Soft_center.asp"; } function menu_hook(title, tab) { - var enable_ss = "<% nvram_get("enable_ss"); %>"; - var enable_soft = "<% nvram_get("enable_soft"); %>"; - if(enable_ss == "1" && enable_soft == "1"){ - tabtitle[tabtitle.length -2] = new Array("", "Frps 内网穿透"); - tablink[tablink.length -2] = new Array("", "Module_frps.asp"); - }else{ - tabtitle[tabtitle.length -1] = new Array("", "Frps 内网穿透"); - tablink[tablink.length -1] = new Array("", "Module_frps.asp"); - } + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "Frps 内网穿透"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_frps.asp"); } function version_show(){ $j.ajax({ diff --git a/kms/kms/webs/Module_kms.asp b/kms/kms/webs/Module_kms.asp index a47b31b..2c4e9ca 100644 --- a/kms/kms/webs/Module_kms.asp +++ b/kms/kms/webs/Module_kms.asp @@ -86,6 +86,8 @@ function menu_hook(title, tab) { tabtitle[tabtitle.length -1] = new Array("", "KMS"); tablink[tablink.length -1] = new Array("", "Module_kms.asp"); + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "KMS"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_kms.asp"); } diff --git a/koolproxy/koolproxy/webs/Module_koolproxy.asp b/koolproxy/koolproxy/webs/Module_koolproxy.asp index 4edcfd2..120584c 100644 --- a/koolproxy/koolproxy/webs/Module_koolproxy.asp +++ b/koolproxy/koolproxy/webs/Module_koolproxy.asp @@ -1,3068 +1,1535 @@ - - - - - - - - - 软件中心 - koolproxy - - - - - - - - - - - - - - - - - -
- - - - - - - - -
  - - - - - - - - - -
- - - - -
-
 
-
软件中心 - koolproxy
-
- -
-
-
-
  • - koolproxy是一款高效的基于规则过滤上网流量包的软件，用于过滤页面垃圾推广元素、不良信息、不健康内容等，并且支持https！ -
    • -
    - -
    -
    koolproxy自定义规则
    -
    1  点击【保存文件】按钮，文本框内的内容会保存到/jffs/softcenter/koolproxy/data/user.txt。
    -
    2  如果你更改了user.txt，你需要重新重启koolproxy插件才，新加入的规则才能生效。
    -
    3  虽然koolproxy支持adblock规则，但是我们一点都不建议你直接使用他们的规则内容，因为这极可能导致规则冲突。
    -
    - -
    -
    - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    基础设置
    - - -
    - -
    - -
    koolproxy运行状态
    选择过滤模式 - -
    插件自动重启 - - -      - 每天 - - - 重启 -      - - -      - 每隔 - - - 重启koolproxy -      - -
    访问控制匹配方法 - -
    证书下载（用于https过滤） - - https过滤使用教程 -
    koolproxy交流 - 加入QQ群① - 加入QQ群② - 加入电报群 - koolproxy官网 -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    规则控制   [说明]
    启用文件地址别名备注编辑删除
    - - - koolproxy.txt - - https://kprule.com/koolproxy.txt - - 静态规则 - - - -
    - - - daily.txt - - https://kprule.com/daily.txt - - 每日规则 - - - -
    - - - kp.dat - - https://kprule.com/kp.dat - - 视频规则 - - - -
    - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - -
    访问控制
    主机IP地址mac地址主机别名访问控制添加/删除
    - - -
    -     		- - - - - - - -
    -
    -
    -
    1  过滤https站点需要为相应设备安装证书，并启用http + https过滤！
    -
    2  在路由器下的设备，不管是电脑，还是移动设备，都可以在浏览器中输入110.110.110.110来下载证书。
    -
    3  如果想在多台装有koolroxy的路由设备上使用一个证书，请用winscp软件备份/jffs/softcenter/koolproxy/data文件夹，并上传到另一台路由。
    -
    -
    - -
    -
    -
    - - - diff --git a/softcenter/app.json.js b/softcenter/app.json.js index 9f4f297..4482748 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -61,10 +61,10 @@ "version": "0.3.6" }, { - "build_date": "2019-01-13_18:35:15", + "build_date": "2019-01-23_19:00:26", "description": "linux下载利器", "home_url": "Module_aria2.asp", - "md5": "f4e5e3027db9cafbddd77b4f649f8b64", + "md5": "bb97c3ddf4f861781df65e6f0b7cb775", "name": "aria2", "tar_url": "aria2/aria2.tar.gz", "title": "Aria2", @@ -132,7 +132,7 @@ } ], "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", - "md5": "501f7f2235efa298fe5f28bc8f4ed7e9", + "md5": "387f00b348fa27764f0778dbc84542f5", "tar_url": "softcenter/softcenter.tar.gz", "version": "1.1.6" } \ No newline at end of file diff --git a/softcenter/config.json.js b/softcenter/config.json.js index d78c9c6..951ce53 100644 --- a/softcenter/config.json.js +++ b/softcenter/config.json.js @@ -1,4 +1,4 @@ { "version":"1.1.6", -"md5":"501f7f2235efa298fe5f28bc8f4ed7e9" +"md5":"387f00b348fa27764f0778dbc84542f5" } diff --git a/softcenter/gen_install.py b/softcenter/gen_install.py index 3d40e9b..d765fb8 100755 --- a/softcenter/gen_install.py +++ b/softcenter/gen_install.py @@ -31,7 +31,7 @@ def work_paths_by_walk(): print os.path.join(root,sub) def work_parent(): - ignore_paths = frozenset(["maintain_files", "softcenter", "v2ray", "adbyby", "gdddns"]) + ignore_paths = frozenset(["maintain_files", "softcenter", "v2ray", "adbyby", "gdddns", "mdial"]) for fname in os.listdir(parent_path): if fname[0] == "." or fname in ignore_paths: diff --git a/softcenter/softcenter.tar.gz b/softcenter/softcenter.tar.gz index bf60418..0d25a55 100644 Binary files a/softcenter/softcenter.tar.gz and b/softcenter/softcenter.tar.gz differ diff --git a/softcenter/version b/softcenter/version index cfb9da7..17285e9 100644 --- a/softcenter/version +++ b/softcenter/version @@ -1,2 +1,2 @@ 1.1.6 -501f7f2235efa298fe5f28bc8f4ed7e9 +387f00b348fa27764f0778dbc84542f5 diff --git a/speedtest/speedtest/webs/Module_speedtest.asp b/speedtest/speedtest/webs/Module_speedtest.asp index a4e3f5a..ae3fc6a 100644 --- a/speedtest/speedtest/webs/Module_speedtest.asp +++ b/speedtest/speedtest/webs/Module_speedtest.asp @@ -385,8 +385,8 @@ return true; } function menu_hook(title, tab) { - tabtitle[tabtitle.length -1] = new Array("", "speedtest"); - tablink[tablink.length -1] = new Array("", "Module_speedtest.asp"); + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "speedtest"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_speedtest.asp"); } diff --git a/ssserver/ssserver/webs/Module_ssserver.asp b/ssserver/ssserver/webs/Module_ssserver.asp index 5a8c90f..f2f291f 100644 --- a/ssserver/ssserver/webs/Module_ssserver.asp +++ b/ssserver/ssserver/webs/Module_ssserver.asp @@ -24,7 +24,7 @@ diff --git a/swap/swap/webs/Module_swap.asp b/swap/swap/webs/Module_swap.asp index 25db318..381fee5 100644 --- a/swap/swap/webs/Module_swap.asp +++ b/swap/swap/webs/Module_swap.asp @@ -218,8 +218,8 @@ function reload_Soft_Center(){ location.href = "/Main_Soft_center.asp"; } function menu_hook(title, tab) { - tabtitle[tabtitle.length -1] = new Array("", "虚拟内存"); - tablink[tablink.length -1] = new Array("", "Module_swap.asp"); + tabtitle[tabtitle.length -1] = new Array("", "软件中心", "离线安装", "虚拟内存"); + tablink[tablink.length -1] = new Array("", "Main_Soft_center.asp", "Main_Soft_setting.asp", "Module_swap.asp"); } diff --git a/v2ray/v2ray/webs/Module_v2ray.asp b/v2ray/v2ray/webs/Module_v2ray.asp index 6691879..854a1bd 100644 --- a/v2ray/v2ray/webs/Module_v2ray.asp +++ b/v2ray/v2ray/webs/Module_v2ray.asp @@ -93,7 +93,7 @@ top: 250px;