merge branch changes into trunk

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index 0deb72776f1578f1b85e032eb5f2ebe0b5e3ef0b..42fb4a61dc9807feef1a44c5b3dff77080835b06 100644 (file)
--- 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 e727a0de38b79a4aef1c812b2b4a0b2eaaf3e472..4f9e3c54766bd3aa83d845be251b10debf953fc8 100644 (file)
--- 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)

diff --git a/libs/nixio/src/process.c b/libs/nixio/src/process.c
index 45c06a644e77ad0cbc6a9f4b0dd8bb2d61c16f6d..5ae9b829ea57b4fb9729261f34bb7c83e48f2fea 100644 (file)
--- a/libs/nixio/src/process.c
+++ b/libs/nixio/src/process.c
@@ -65,14 +65,14 @@ int nixio__exec(lua_State *L, int m) {
                                        return luaL_error(L, "stack overflow");
                                }
 
-                               if (!lua_type(L, -2) != LUA_TSTRING || !lua_isstring(L, -1)) {
+                               if (lua_type(L, -2) != LUA_TSTRING || !lua_isstring(L, -1)) {
                                        return luaL_argerror(L, 3, "invalid environment");
                                }
 
                                lua_pushfstring(L, "%s=%s",
                                                lua_tostring(L, -2), lua_tostring(L, -1));
 
-                               lua_insert(L, 4);
+                               lua_insert(L, 5);
                                lua_pop(L, 1);
                                argn++;
                        }
@@ -80,8 +80,8 @@ int nixio__exec(lua_State *L, int m) {
                        char **env = lua_newuserdata(L, sizeof(char*) * (argn + 1));
                        env[argn] = NULL;
 
-                       for (i = 1; i < argn; i++) {
-                               env[i-1] = (char *)lua_tostring(L, -i);
+                       for (i = 1; i <= argn; i++) {
+                               env[i-1] = (char *)lua_tostring(L, -(i+1));
                        }
 
                        execve(path, args, env);

diff --git a/po/ca/ddns.po b/po/ca/ddns.po
index 6448238e8f64e44718b3b6650bd4b6e76f7d9b76..4bc17886cb38803cf9ed977fa873f4b640e5abaa 100644 (file)
--- a/po/ca/ddns.po
+++ b/po/ca/ddns.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2009-05-26 20:19+0200\n"
 "Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,3 +87,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/cs/ddns.po b/po/cs/ddns.po
index 8705bcbe922589e5461f3db5cedee10ba76c0f2f..bc524eab7add09f3db0cd458e7ce3bb5500c5a98 100644 (file)
--- a/po/cs/ddns.po
+++ b/po/cs/ddns.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-02 13:44+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,3 +81,9 @@ msgstr "min"
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/de/ddns.po b/po/de/ddns.po
index a6a4483c36cd4ddaac9fef9816677c4fe692c264..3791e47c2ddabe3269d0c66d0b49ef2054abd892 100644 (file)
--- a/po/de/ddns.po
+++ b/po/de/ddns.po
@@ -81,3 +81,9 @@ msgstr "Minuten"
 
 msgid "network"
 msgstr "Netzwerk"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/el/ddns.po b/po/el/ddns.po
index bf12b2395d474e23beecefe452f630df34e326d1..2922747a5464049382d61a6247edfc3a2ca241bc 100644 (file)
--- a/po/el/ddns.po
+++ b/po/el/ddns.po
@@ -85,6 +85,12 @@ msgstr "λεπτά"
 msgid "network"
 msgstr "δίκτυο"
 
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""
+
 #, fuzzy
 #~ msgid "ddns_service_updateurl"
 #~ msgstr "Προσαρμογή URL ενημέρωσης"

diff --git a/po/en/ddns.po b/po/en/ddns.po
index 1efc6a849f7eedb203fb73ec8fd34bd7300f24f1..f451163adc9d2d10d31a83bd005c7988968bfad2 100644 (file)
--- a/po/en/ddns.po
+++ b/po/en/ddns.po
@@ -7,6 +7,7 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,3 +80,9 @@ msgstr "min"
 
 msgid "network"
 msgstr "network"
+
+msgid "Event interface"
+msgstr "Event interface"
+
+msgid "On which interface up should start the ddns script process."
+msgstr "On which interface up should start the ddns script process."

diff --git a/po/es/ddns.po b/po/es/ddns.po
index c3e95e8333ba8eb5e19dd2a8f8f09155aee1d8c8..96f065c0f766ef09a1b0d60cabefaa333c0c0640 100644 (file)
--- a/po/es/ddns.po
+++ b/po/es/ddns.po
@@ -81,3 +81,9 @@ msgstr "mín"
 
 msgid "network"
 msgstr "red"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/fr/ddns.po b/po/fr/ddns.po
index cc7e4b760489814a4cb20e97bf49130b6696dd82..f7db18f9d57a71638159f19148796d758bc471f9 100644 (file)
--- a/po/fr/ddns.po
+++ b/po/fr/ddns.po
@@ -7,6 +7,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-02 17:15+0100\n"
 "Last-Translator: Benoît Knecht <benoit.knecht@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,3 +81,9 @@ msgstr "min"
 
 msgid "network"
 msgstr "réseau"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/he/ddns.po b/po/he/ddns.po
index 8c23c090e21bbb6d39cc3e78a2dace954b7373ef..e9637f091d2fdce8ccbb496ab8e70a39933c9682 100644 (file)
--- a/po/he/ddns.po
+++ b/po/he/ddns.po
@@ -85,3 +85,9 @@ msgstr "דק'"
 
 msgid "network"
 msgstr "רשת"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/hu/ddns.po b/po/hu/ddns.po
index cb6d7164085ef9cf2ef21b8b20f208009bee69b6..ecb5700e801f2ec459eff8f9d61ac97c1d631027 100644 (file)
--- a/po/hu/ddns.po
+++ b/po/hu/ddns.po
@@ -83,3 +83,9 @@ msgstr "perc"
 
 msgid "network"
 msgstr "hálózat"
+
+msgid "Event interface"
+msgstr "Esemány interfész"
+
+msgid "On which interface up should start the ddns script process."
+msgstr "Melyik interfész indulása váltsa ki a ddns script indítását."

diff --git a/po/it/ddns.po b/po/it/ddns.po
index ef0113f09ab841ebee356fb2cef7104806dc6617..754e919979597d54fbb1886927aa9bf7f1322dd2 100644 (file)
--- a/po/it/ddns.po
+++ b/po/it/ddns.po
@@ -81,3 +81,9 @@ msgstr "min"
 
 msgid "network"
 msgstr "rete"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/ja/ddns.po b/po/ja/ddns.po
index 9ddbd5d12da12781b25f563fb1ef3454a71abfe7..841b4749daa1989197ec765da21d8344bc9c774f 100644 (file)
--- a/po/ja/ddns.po
+++ b/po/ja/ddns.po
@@ -81,3 +81,9 @@ msgstr "分"
 
 msgid "network"
 msgstr "ネットワーク"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/ms/ddns.po b/po/ms/ddns.po
index f8a7edfc53b387d096269a07e68d5ab256f2d129..07a89c5caf61c05966c01bab725288a00c5123bb 100644 (file)
--- a/po/ms/ddns.po
+++ b/po/ms/ddns.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-02 13:44+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,3 +79,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/no/ddns.po b/po/no/ddns.po
index 50b313a196f28b03e53f1d30de07953eab1d6eaa..d3a53b8d85c6cdd1aab4b82347c9edb6ffc20bff 100644 (file)
--- a/po/no/ddns.po
+++ b/po/no/ddns.po
@@ -70,3 +70,9 @@ msgstr "minutter"
 
 msgid "network"
 msgstr "nettverk"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/pl/ddns.po b/po/pl/ddns.po
index 1c978c975d7203cf38f8f08b1c2d8001ecedce96..1f099e436e1ce235ed471cfb4297c7736335b69c 100644 (file)
--- a/po/pl/ddns.po
+++ b/po/pl/ddns.po
@@ -82,3 +82,9 @@ msgstr "min"
 
 msgid "network"
 msgstr "sieć"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/pt/ddns.po b/po/pt/ddns.po
index f60069de19cb017d3950f65c1674d9c57fbbc3ae..ce1b52c12063ad311c3e0ad2e3d6311e0210c391 100644 (file)
--- a/po/pt/ddns.po
+++ b/po/pt/ddns.po
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2009-05-19 17:04+0200\n"
 "Last-Translator: Jose Monteiro <jm@unimos.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,3 +85,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/pt_BR/ddns.po b/po/pt_BR/ddns.po
index 04fcf16869e1075970d824fac86e77f2c44c3d9a..1964bbcc6ba66cc5eb648768808150e7f1c3c300 100644 (file)
--- a/po/pt_BR/ddns.po
+++ b/po/pt_BR/ddns.po
@@ -81,3 +81,9 @@ msgstr "min"
 
 msgid "network"
 msgstr "rede"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/ro/ddns.po b/po/ro/ddns.po
index 81c1b05080bca735984f3181f2b44307e51bcaf3..6af34ffce5dd9b867577eb0b81d29e17e479ec5b 100644 (file)
--- a/po/ro/ddns.po
+++ b/po/ro/ddns.po
@@ -84,3 +84,9 @@ msgstr "minut(e)"
 
 msgid "network"
 msgstr "retea"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/ru/ddns.po b/po/ru/ddns.po
index 5aa65d13401c7669bf0b9b10d89b3d80b963b43a..d24c3746517e0d2c3e6eaacd6c7233d688e308ce 100644 (file)
--- a/po/ru/ddns.po
+++ b/po/ru/ddns.po
@@ -83,3 +83,9 @@ msgstr "мин"
 
 msgid "network"
 msgstr "сеть"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/templates/ddns.pot b/po/templates/ddns.pot
index d57f23f03214bf37d3f035334de20e7c9e9e6abd..d967c9965bf99731ac1b23b042cecf8b6e9e6225 100644 (file)
--- a/po/templates/ddns.pot
+++ b/po/templates/ddns.pot
@@ -65,3 +65,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/tr/ddns.po b/po/tr/ddns.po
index b115c485cfe1d89d79807546ef91325a4a9c9c47..d649a6992ae3e85f0b9cb4d8658fafb1b9cb2584 100644 (file)
--- a/po/tr/ddns.po
+++ b/po/tr/ddns.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-02 13:44+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,3 +80,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/uk/ddns.po b/po/uk/ddns.po
index e63881951bd30c0aaff931cb1702d6d75e4a8688..dc1676183f998ff26296638408419c0263782ce0 100644 (file)
--- a/po/uk/ddns.po
+++ b/po/uk/ddns.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
 
 msgid "Check for changed IP every"
@@ -84,3 +84,9 @@ msgstr "хв"
 
 msgid "network"
 msgstr "мережа"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/vi/ddns.po b/po/vi/ddns.po
index dc51df7695c1d8ed2757fdff1280a15a5d17c730..856faf8a364086a34f58ca22452c5a6df4f4ad3c 100644 (file)
--- a/po/vi/ddns.po
+++ b/po/vi/ddns.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2009-08-12 18:06+0200\n"
 "Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,3 +87,9 @@ msgstr ""
 
 msgid "network"
 msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""

diff --git a/po/zh_CN/ddns.po b/po/zh_CN/ddns.po
index a2e47082a486cf5b521f8a910e75b8497b714462..5b96eeb6992c90fd267bebac2545c56c1fcdd4ee 100644 (file)
--- a/po/zh_CN/ddns.po
+++ b/po/zh_CN/ddns.po
@@ -80,3 +80,9 @@ msgstr "分"
 
 msgid "network"
 msgstr "网络"
+
+msgid "Event interface"
+msgstr ""
+
+msgid "On which interface up should start the ddns script process."
+msgstr ""