merge branch changes into trunk

2 files changed, 7 insertions, 2 deletions

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index 0deb72776..42fb4a61d 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -13,6 +13,8 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
+require("luci.tools.webadmin")
+
 local is_mini = (luci.dispatcher.context.path[1] == "mini")
 
 
@@ -27,6 +29,10 @@ s.anonymous = false
 
 s:option(Flag, "enabled", translate("Enable"))
 
+interface = s:option(ListValue, "interface", translate("Event interface"), translate("On which interface up should start the ddns script process."))
+luci.tools.webadmin.cbi_add_networks(interface)
+interface.default = "wan"
+
 svc = s:option(ListValue, "service_name", translate("Service"))
 svc.rmempty = false
 
@@ -81,7 +87,6 @@ if is_mini then
 	s.defaults.ip_source = "network"
 	s.defaults.ip_network = "wan"
 else
-	require("luci.tools.webadmin")
 
 	src = s:option(ListValue, "ip_source",
 		translate("Source of IP address"))
diff --git a/applications/luci-transmission/luasrc/model/cbi/transmission.lua b/applications/luci-transmission/luasrc/model/cbi/transmission.lua
index e727a0de3..4f9e3c547 100644
--- a/applications/luci-transmission/luasrc/model/cbi/transmission.lua
+++ b/applications/luci-transmission/luasrc/model/cbi/transmission.lua
@@ -22,7 +22,7 @@ local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0)
 local webinstalled = luci.model.ipkg.installed("transmission-web") 
 local button = ""
 if running and webinstalled then
-	button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.host+':" .. trport .. "')\"/>"
+	button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.hostname+':" .. trport .. "')\"/>"
 end
 
 m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button)