diff options
9 files changed, 16 insertions, 13 deletions
diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua index 9dc0857509..2f06200146 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua @@ -28,7 +28,7 @@ local ns = m:section( NamedSection, "global", "ddns", .. [[<br /><strong>]] .. translate("It is NOT recommended for casual users to change settings on this page.") .. [[</strong><br />]] - .. [[<a href="http://wiki.openwrt.org/doc/uci/ddns#version_2x1" target="_blank">]] + .. [[<a href="https://openwrt.org/docs/guide-user/base-system/ddns#section_ddns" target="_blank">]] .. translate("For detailed information about parameter settings look here.") .. [[</a>]] ) diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 6f0c7f0952..2b92e3e636 100755 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -103,7 +103,7 @@ function env_info(type) end local function has_nslookup() - return (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)"]] ) ~= 0) + return (SYS.call( [[which nslookup >/dev/null 2>&1]] ) == 0) end if type == "has_bindhost" then diff --git a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua index 8f0e3224b4..967110fbf8 100644 --- a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua +++ b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua @@ -59,7 +59,7 @@ m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"), translate("Configuration of the DNSCrypt-Proxy package. ") .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" - .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt")) + .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt")) m:chain("dhcp") function m.on_after_commit(self) @@ -146,7 +146,7 @@ if not fs.access("/etc/resolv-crypt.conf") or fs.stat("/etc/resolv-crypt.conf"). translate("Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS upstream timeouts with multiple DNSCrypt instances.<br />") .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" - .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt")) + .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt")) btn2.inputtitle = translate("Create Config File") btn2.inputstyle = "apply" btn2.disabled = false diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 274a982929..4a36b0a3c3 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -135,7 +135,7 @@ function display(pattern) if (currentDisplayMode === 'updates') { var avail = packages.available.pkgs[name]; - if (!avail || avail.version === pkg.version) + if (!avail || compareVersion(avail.version, pkg.version) <= 0) continue; ver = '%s ยป %s'.format( @@ -291,6 +291,9 @@ function compareVersion(val, ref) val = val || ''; ref = ref || ''; + if (val === ref) + return 0; + while (vi < val.length || ri < ref.length) { var first_diff = 0; diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua index 4a01bed247..553b297ac0 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua @@ -98,8 +98,8 @@ else o.inputstyle = "apply" o.write = function() return luci.http.redirect( - luci.dispatcher.build_url("admin/system/packages") .. - "?submit=1&install=iptables-mod-conntrack-extra" + luci.dispatcher.build_url("admin/system/opkg") .. + "?query=iptables-mod-conntrack-extra" ) end end diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index 5fc20c52bc..cbe32afde6 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -199,8 +199,8 @@ function option_install_package(s, tab) function p_install.write() return luci.http.redirect( - luci.dispatcher.build_url("admin/system/packages") .. - "?submit=1&install=%s" % opkg_package + luci.dispatcher.build_url("admin/system/opkg") .. + "?query=%s" % opkg_package ) end end diff --git a/documentation/CBI.md b/documentation/CBI.md index d4bc4c34e5..933380d22f 100644 --- a/documentation/CBI.md +++ b/documentation/CBI.md @@ -12,7 +12,7 @@ This Reference covers **the basics** of the CBI system. ## class Map (_config, title, description_) This is the root object of the model. -* **config:** configuration filename to be mapped, see [UCI documentation](http://wiki.openwrt.org/doc/uci) and the files in /etc/config +* **config:** configuration filename to be mapped, see [UCI documentation](https://openwrt.org/docs/guide-user/base-system/uci) and the files in /etc/config * **title:** title shown in the UI * **description:** description shown in the UI diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js index acca7cf8a5..145f5807a0 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js @@ -113,7 +113,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null, var e = document.getElementById(ifc.id + '-ifc-edit'); if (e) e.disabled = true; - var link = L.url('admin/system/packages') + '?query=luci-proto&display=available'; + var link = L.url('admin/system/opkg') + '?query=luci-proto'; L.dom.content(d, [ E('em', _('Unsupported protocol type.')), E('br'), E('a', { href: link }, _('Install protocol extensions...')) diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua index bff859befa..5b230795c3 100644 --- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua @@ -226,8 +226,8 @@ if not net:is_installed() then function p_install.write() return luci.http.redirect( - luci.dispatcher.build_url("admin/system/packages") .. - "?submit=1&install=%s" % net:opkg_package() + luci.dispatcher.build_url("admin/system/opkg") .. + "?query=%s" % net:opkg_package() ) end end |