From 2e5285979bd79761fde93e05148c0748ca3f62b4 Mon Sep 17 00:00:00 2001
From: jerrykuku <jerrykuku@qq.com>
Date: Mon, 15 Feb 2021 23:38:03 +0800
Subject: [PATCH] fix some error

---
 Makefile                                    |  4 +--
 htdocs/luci-static/argon/js/polyfill.min.js |  3 +++
 luasrc/view/themes/argon/header.htm         |  2 +-
 luasrc/view/themes/argon/sysauth.htm        | 28 ++++++++++-----------
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 htdocs/luci-static/argon/js/polyfill.min.js

diff --git a/Makefile b/Makefile
index 56747a8..1f78622 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=
-PKG_VERSION:=2.2.5
-PKG_RELEASE:=20200914
+PKG_VERSION:=2.2.6
+PKG_RELEASE:=20210215
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/htdocs/luci-static/argon/js/polyfill.min.js b/htdocs/luci-static/argon/js/polyfill.min.js
new file mode 100644
index 0000000..4729194
--- /dev/null
+++ b/htdocs/luci-static/argon/js/polyfill.min.js
@@ -0,0 +1,3 @@
+/* Disable minification (remove `.min` from URL path) for more info */
+
+(function(undefined) {}).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
\ No newline at end of file
diff --git a/luasrc/view/themes/argon/header.htm b/luasrc/view/themes/argon/header.htm
index f0030f1..1da2486 100644
--- a/luasrc/view/themes/argon/header.htm
+++ b/luasrc/view/themes/argon/header.htm
@@ -114,7 +114,7 @@
 		<%=css %>
 	</style>
 	<% end -%>
-	<script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
+	<script src="<%=media%>/js/polyfill.min.js"></script>
 	<script src="<%=url('admin/translations', luci.i18n.context.lang)%>?v=2.2.4"></script>
 	<script src="<%=resource%>/cbi.js?v=2.2.4"></script>
 	<script src="<%=resource%>/luci.js?v=2.2.4"></script>
diff --git a/luasrc/view/themes/argon/sysauth.htm b/luasrc/view/themes/argon/sysauth.htm
index eec4efa..0820aa5 100644
--- a/luasrc/view/themes/argon/sysauth.htm
+++ b/luasrc/view/themes/argon/sysauth.htm
@@ -82,25 +82,23 @@
 			}
 		})
 	</script>
-	<% else %>
-	<div class="main-bg" id="main-bg"
-	<%
-	if (bgcount == 0) then
-		local http = require "luci.sys"
+	<% else 
+	local bg_url = media .. "/img/bg1.jpg"
+	local bing = "123"
+	if (bgcount == 0 ) then
+		local sys = require "luci.sys"
 		local json = require "luci.jsonc"
-		local bg_url = media .. "/img/bg1.jpg"
-		local bing = http.httpget("http://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=en-US")
+		local remote_bg_url="http://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=en-US"
+		--bing = sys.httpget(remote_bg_url)
+		bing = sys.exec("wget --timeout=0.5 -qO- '%s'" %remote_bg_url)
 		if (bing and bing ~= '') then
-			local bingjson  = json.parse(bing)
-			bg_url = "https://www.bing.com" .. bingjson.images[1].url
+			bg_url = "https://www.bing.com" .. json.parse(bing).images[1].url
 		end
+	elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then
+		bg_url = currentBg.url
+	end
 	%>
-		style="background-image:url(<%=bg_url%>)"
-	<% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %>
-		style="background-image:url(<%=currentBg.url%>)"
-	<% end  %>
-	></div>
-
+	<div class="main-bg" id="main-bg" style="background-image:url(<%=bg_url%>)"></div>
 	<% end %>
 	<div class="login-container">
 		<div class="login-form">