Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge branch changes into trunk

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-10-29 13:09:31 +00:00
parent 94784db12b
commit 431d4e8eff
26 changed files with 159 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
View file

@ -13,6 +13,8 @@ You may obtain a copy of the License at
$Id$ $Id$
]]-- ]]--
require("luci.tools.webadmin")
local is_mini = (luci.dispatcher.context.path[1] == "mini") local is_mini = (luci.dispatcher.context.path[1] == "mini")
@ -27,6 +29,10 @@ s.anonymous = false
s:option(Flag, "enabled", translate("Enable")) 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 = s:option(ListValue, "service_name", translate("Service"))
svc.rmempty = false svc.rmempty = false
@ -81,7 +87,6 @@ if is_mini then
s.defaults.ip_source = "network" s.defaults.ip_source = "network"
s.defaults.ip_network = "wan" s.defaults.ip_network = "wan"
else else
require("luci.tools.webadmin")
src = s:option(ListValue, "ip_source", src = s:option(ListValue, "ip_source",
translate("Source of IP address")) translate("Source of IP address"))

2
applications/luci-transmission/luasrc/model/cbi/transmission.lua
View file

@ -22,7 +22,7 @@ local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0)
local webinstalled = luci.model.ipkg.installed("transmission-web") local webinstalled = luci.model.ipkg.installed("transmission-web")
local button = "" local button = ""
if running and webinstalled then 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 end
m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button) m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button)

8
libs/nixio/src/process.c
View file

@ -65,14 +65,14 @@ int nixio__exec(lua_State *L, int m) {
return luaL_error(L, "stack overflow"); 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"); return luaL_argerror(L, 3, "invalid environment");
} }
lua_pushfstring(L, "%s=%s", lua_pushfstring(L, "%s=%s",
lua_tostring(L, -2), lua_tostring(L, -1)); lua_tostring(L, -2), lua_tostring(L, -1));
lua_insert(L, 4); lua_insert(L, 5);
lua_pop(L, 1); lua_pop(L, 1);
argn++; argn++;
} }
@ -80,8 +80,8 @@ int nixio__exec(lua_State *L, int m) {
char **env = lua_newuserdata(L, sizeof(char*) * (argn + 1)); char **env = lua_newuserdata(L, sizeof(char*) * (argn + 1));
env[argn] = NULL; env[argn] = NULL;
for (i = 1; i < argn; i++) { for (i = 1; i <= argn; i++) {
env[i-1] = (char *)lua_tostring(L, -i); env[i-1] = (char *)lua_tostring(L, -(i+1));
} }
execve(path, args, env); execve(path, args, env);

7
po/ca/ddns.po
View file

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

7
po/cs/ddns.po
View file

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

6
po/de/ddns.po
View file

@ -81,3 +81,9 @@ msgstr "Minuten"
msgid "network" msgid "network"
msgstr "Netzwerk" msgstr "Netzwerk"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/el/ddns.po
View file

@ -85,6 +85,12 @@ msgstr "λεπτά"
msgid "network" msgid "network"
msgstr "δίκτυο" msgstr "δίκτυο"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""
#, fuzzy #, fuzzy
#~ msgid "ddns_service_updateurl" #~ msgid "ddns_service_updateurl"
#~ msgstr "Προσαρμογή URL ενημέρωσης" #~ msgstr "Προσαρμογή URL ενημέρωσης"

7
po/en/ddns.po
View file

@ -7,6 +7,7 @@ msgstr ""
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -79,3 +80,9 @@ msgstr "min"
msgid "network" msgid "network"
msgstr "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."

6
po/es/ddns.po
View file

@ -81,3 +81,9 @@ msgstr "mín"
msgid "network" msgid "network"
msgstr "red" msgstr "red"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

7
po/fr/ddns.po
View file

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

6
po/he/ddns.po
View file

@ -85,3 +85,9 @@ msgstr "דק'"
msgid "network" msgid "network"
msgstr "רשת" msgstr "רשת"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/hu/ddns.po
View file

@ -83,3 +83,9 @@ msgstr "perc"
msgid "network" msgid "network"
msgstr "hálózat" 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."

6
po/it/ddns.po
View file

@ -81,3 +81,9 @@ msgstr "min"
msgid "network" msgid "network"
msgstr "rete" msgstr "rete"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/ja/ddns.po
View file

@ -81,3 +81,9 @@ msgstr "分"
msgid "network" msgid "network"
msgstr "ネットワーク" msgstr "ネットワーク"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

7
po/ms/ddns.po
View file

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

6
po/no/ddns.po
View file

@ -70,3 +70,9 @@ msgstr "minutter"
msgid "network" msgid "network"
msgstr "nettverk" msgstr "nettverk"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/pl/ddns.po
View file

@ -82,3 +82,9 @@ msgstr "min"
msgid "network" msgid "network"
msgstr "sieć" msgstr "sieć"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

7
po/pt/ddns.po
View file

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

6
po/pt_BR/ddns.po
View file

@ -81,3 +81,9 @@ msgstr "min"
msgid "network" msgid "network"
msgstr "rede" msgstr "rede"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/ro/ddns.po
View file

@ -84,3 +84,9 @@ msgstr "minut(e)"
msgid "network" msgid "network"
msgstr "retea" msgstr "retea"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/ru/ddns.po
View file

@ -83,3 +83,9 @@ msgstr "мин"
msgid "network" msgid "network"
msgstr "сеть" msgstr "сеть"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

6
po/templates/ddns.pot
View file

@ -65,3 +65,9 @@ msgstr ""
msgid "network" msgid "network"
msgstr "" msgstr ""
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""

7
po/tr/ddns.po
View file

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

10
po/uk/ddns.po
View file

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

7
po/vi/ddns.po
View file

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

6
po/zh_CN/ddns.po
View file

@ -80,3 +80,9 @@ msgstr "分"
msgid "network" msgid "network"
msgstr "网络" msgstr "网络"
msgid "Event interface"
msgstr ""
msgid "On which interface up should start the ddns script process."
msgstr ""