update kms

kms/config.json.js

@@ -1,8 +1,8 @@
 {
 "version":"1.5",
-"md5":"647a16ede1b4cea1615391b6465b1525",
+"md5":"963a0702e0e37aa67a64c674544f30a6",
 "home_url":"Module_kms.asp",
 "title":"kms",
 "description":"kms",
-"build_date":"2018-12-06_13:29:29"
+"build_date":"2019-01-13_19:04:43"
 }

kms/kms/install.sh

@@ -5,7 +5,7 @@ enable=`dbus get kms_enable`
 if [ "$enable" == "1" ];then
 	restart=1
 	dbus set kms_enable=0
-	sh /jffs/softcenter/scripts/k3c_kms.sh
+	sh /jffs/softcenter/scripts/kms.sh
 fi
 
 # cp files
@@ -17,14 +17,11 @@ cp -rf /tmp/kms/res/* /jffs/softcenter/res/
 # delete install tar
 rm -rf /tmp/kms* >/dev/null 2>&1
 
-chmod a+x /jffs/softcenter/scripts/k3c_kms.sh
+chmod a+x /jffs/softcenter/scripts/kms.sh
 chmod 0755 /jffs/softcenter/bin/vlmcsd
 
 # re-enable kms
 if [ "$restart" == "1" ];then
 	dbus set kms_enable=1
-	sh /jffs/softcenter/scripts/k3c_kms.sh
+	sh /jffs/softcenter/scripts/kms.sh
 fi
-
-
-

kms/kms/uninstall.sh

@@ -2,5 +2,5 @@
 
 rm /jffs/softcenter/bin/vlmcsd
 rm /jffs/softcenter/res/icon-kms.png
-rm /jffs/softcenter/scripts/k3c_kms.sh
+rm /jffs/softcenter/scripts/kms.sh
 rm /jffs/softcenter/webs/Module_kms.asp

kms/kms/webs/Module_kms.asp

@@ -22,10 +22,9 @@
 		<script type="text/javascript" src="/general.js"></script>
 		<script type="text/javascript" src="/switcherplugin/jquery.iphone-switch.js"></script>
 		<script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
+		<script type="text/javascript" src="/dbconf?p=kms_&v=<% uptime(); %>"></script>
 		<script>
 			var $j = jQuery.noConflict();
-			var softcenter_kms_ver="<% dbus_get("kms_ver"); %>";
-			var softcenter_kms_wan_port="<% dbus_get("kms_wan_port"); %>";
 			function init() {
 				show_menu(menu_hook);
 				buildswitch();
@@ -36,7 +35,7 @@
 				} else {
 					rrt.checked = true;
 				}
-				 $j('#kms_wan_port').val(softcenter_kms_wan_port);
+				 $j('#kms_wan_port').val(db_kms_["kms_wan_port"]);
 			}
 			function done_validating() {
 				return true;
@@ -53,7 +52,8 @@
 				});
 			}
 			
-			function onSubmitCtrl() {
+			function onSubmitCtrl(o, s) {
+				document.form.action_mode.value = s;
 				showLoading(3);
 				document.form.submit();
 			}
@@ -63,12 +63,20 @@
 			}
 			
 			function version_show(){
+				$j("#kms_version_status").html("<i>当前版本：" + db_kms_['kms_version']);
 			    $j.ajax({
 			        url: 'https://raw.githubusercontent.com/paldier/softcenter/master/kms/config.json.js',
 			        type: 'GET',
-			        dataType: 'json',
 			        success: function(res) {
-						$j("#kms_install_show").html("<i>有新版本：" + res.version);
+			            var txt = $j(res.responseText).text();
+			            if(typeof(txt) != "undefined" && txt.length > 0) {
+			                //console.log(txt);
+			                var obj = $j.parseJSON(txt.replace("'", "\""));
+					$j("#kms_version_status").html("<i>当前版本：" + obj.version);
+					if(obj.version != db_kms_["kms_version"]) {
+						$j("#kms_version_status").html("<i>有新版本：" + obj.version);
+					}
+			            }
 			        }
 			    });
 			}
@@ -90,7 +98,7 @@
 			<input type="hidden" name="next_page" value="Module_kms.asp" />
 			<input type="hidden" name="group_id" value="" />
 			<input type="hidden" name="modified" value="0" />
-			<input type="hidden" name="action_mode" value=" Refresh " />
+			<input type="hidden" name="action_mode" value="" />
 			<input type="hidden" name="action_script" value="kms.sh" />
 			<input type="hidden" name="action_wait" value="5" />
 			<input type="hidden" name="first_time" value="" />
@@ -142,7 +150,7 @@
 																	</div>
 																</label>
 															</div>
-															<div id="kms_version_show" style="padding-top:5px;margin-left:230px;margin-top:0px;"><i>当前版本：<% dbus_get_def("kms_ver", "未知"); %></i>
+															<div id="kms_version_show" style="padding-top:5px;margin-left:230px;margin-top:0px;"><i>当前版本：<% dbus_get_def("kms_version", "未知"); %></i>
 															</div>
 															<div id="kms_install_show" style="padding-top:5px;margin-left:330px;margin-top:-25px;"></div>
 															<a style="margin-left: 318px;" href="https://raw.githubusercontent.com/paldier/softcenter/master/kms/Changelog.txt" target="_blank"><em>[<u> 更新日志 </u>]</em></a>
@@ -210,5 +218,4 @@
 		</td>
 		<div id="footer"></div>
 	</body>
-
 </html>

kms/version

@@ -1,2 +1,2 @@
 1.5
-647a16ede1b4cea1615391b6465b1525
+963a0702e0e37aa67a64c674544f30a6

softcenter/app.json.js

@@ -51,10 +51,10 @@
             "version": "2.4"
         }, 
         {
-            "build_date": "2018-12-06_13:29:29", 
+            "build_date": "2019-01-13_19:04:43", 
             "description": "kms", 
             "home_url": "Module_kms.asp", 
-            "md5": "647a16ede1b4cea1615391b6465b1525", 
+            "md5": "963a0702e0e37aa67a64c674544f30a6", 
             "name": "kms", 
             "tar_url": "kms/kms.tar.gz", 
             "title": "kms", 
@@ -72,7 +72,7 @@
         }
     ], 
     "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", 
-    "md5": "2fcb8ccf6c0a97c160df7d6fa3e32929", 
+    "md5": "ad50bc75f8a05449e8d65d03216be3db", 
     "tar_url": "softcenter/softcenter.tar.gz", 
     "version": "1.1.6"
 }

softcenter/config.json.js

@@ -1,4 +1,4 @@
 {
 "version":"1.1.6",
-"md5":"2fcb8ccf6c0a97c160df7d6fa3e32929"
+"md5":"ad50bc75f8a05449e8d65d03216be3db"
 }

softcenter/version

@@ -1,2 +1,2 @@
 1.1.6
-2fcb8ccf6c0a97c160df7d6fa3e32929
+ad50bc75f8a05449e8d65d03216be3db