package/gluon-web-logging/Makefile

+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-web-logging
+
+include ../gluon.mk
+
+define Package/gluon-web-logging
+  DEPENDS:=+gluon-web-admin
+  TITLE:=UI for remote syslog configuration
+endef
+
+$(eval $(call BuildPackageGluon,gluon-web-logging))

package/gluon-web-logging/i18n/de.po

+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "Enable"
+msgstr ""
+
+msgid "IP"
+msgstr ""
+
+msgid ""
+"If you want to use a remote syslog server, you can set it up here. Please "
+"keep in mind that the data is not encrypted, which may cause individual-"
+"related data to be transmitted unencrypted over the internet."
+msgstr ""
+"Wenn du einen Remote-Syslog-Server nutzen möchtest, dann kannst du ihn hier "
+"eintragen. Bitte beachte, dass diese Daten nicht verschlüsselt werden. Dies "
+"kann dazu führen, dass personenbezogene Daten unverschlüsselt über das "
+"Internet übertragen werden."
+
+msgid "Logging"
+msgstr "Logging"
+
+msgid "Port"
+msgstr ""

package/gluon-web-logging/i18n/gluon-web-logging.pot

+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Enable"
+msgstr ""
+
+msgid "IP"
+msgstr ""
+
+msgid ""
+"If you want to use a remote syslog server, you can set it up here. Please "
+"keep in mind that the data is not encrypted, which may cause individual-"
+"related data to be transmitted unencrypted over the internet."
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Port"
+msgstr ""

package/gluon-web-logging/luasrc/lib/gluon/config-mode/controller/admin/logging.lua

+package 'gluon-web-logging'
+
+entry({"admin", "logging"}, model("admin/logging"), _("Logging"), 85)

package/gluon-web-logging/luasrc/lib/gluon/config-mode/model/admin/logging.lua

+local uci = require('simple-uci').cursor()
+local system = uci:get_first('system', 'system')
+
+local f = Form(translate('Logging'), translate(
+	"If you want to use a remote syslog server, you can set it up here. "
+	.. "Please keep in mind that the data is not encrypted, which may cause "
+	.. "individual-related data to be transmitted unencrypted over the internet."
+))
+local s = f:section(Section)
+
+local enable = s:option(Flag, 'log_remote', translate('Enable'))
+enable.default = uci:get_bool('system', system, 'log_remote')
+function enable:write(data)
+	uci:set('system', system, 'log_remote', data)
+end
+
+local ip = s:option(Value, 'log_ip', translate('IP'))
+ip.default = uci:get('system', system, 'log_ip')
+ip:depends(enable, true)
+ip.optional = false
+ip.placeholder = '0.0.0.0'
+ip.datatype = 'ipaddr'
+function ip:write(data)
+	uci:set('system', system, 'log_ip', data)
+end
+
+local port = s:option(Value, 'log_port', translate('Port'))
+port.default = uci:get('system', system, 'log_port')
+port:depends(enable, true)
+port.optional = true
+port.placeholder = 514
+port.datatype = 'irange(1, 65535)'
+function port:write(data)
+	uci:set('system', system, 'log_port', data)
+end
+
+function f:write()
+	uci:commit('system')
+end
+
+return f

package/gluon-web-mesh-vpn-fastd/Makefile

+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-web-mesh-vpn-fastd
+
+include ../gluon.mk
+
+define Package/gluon-web-mesh-vpn-fastd
+  TITLE:=gluon-web module to enable and disable encryption for the mesh VPN
+  DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd
+endef
+
+$(eval $(call BuildPackageGluon,gluon-web-mesh-vpn-fastd))

package/gluon-web-mesh-vpn-fastd/check_site.lua

+need_value(in_site({'mesh_vpn', 'fastd', 'configurable'}), true)

package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html

+<div class="gluon-value">
+	<div class="gluon-value-title">
+		<input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %>>
+		<label<%= attr("for", id..'.1')%>></label>
+	</div>
+	<div class="gluon-value-field-long">
+		<label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
+		<br>
+		<%| translate(
+			'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
+			'The encryption ensures that it is impossible for your internet access provider to see what ' ..
+			'data is exchanged over your node.'
+		) %>
+		<br>
+	</div>
+	<div class="gluon-value-field-long-after"></div>
+</div>
+
+<div class="gluon-value gluon-value-last">
+	<div class="gluon-value-title">
+		<input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %>>
+		<label<%= attr("for", id..'.2')%>></label>
+	</div>
+	<div class="gluon-value-field-long">
+		<label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
+		<br>
+		<%| translate(
+			'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
+			'protected against eavesdropping.'
+		) %>
+		<br>
+	</div>
+	<div class="gluon-value-field-long-after"></div>
+</div>

package/gluon-luci-mesh-vpn-fastd/i18n/de.po → package/gluon-web-mesh-vpn-fastd/i18n/de.po

@@ -15,18 +15,18 @@ msgid ""
 "throughput, but the data exchanged over your node is not protected against "
 "eavesdropping."
 msgstr ""
-"Im Modus „Hohe Geschwindigkeit“ wird auf Verschlüsselung "
-"verzichtet. Dies erlaubt häufig eine höhere Bandbreite als mit "
-"Verschlüsselung, aber die Verbindung ist nicht gegen Abhören geschützt."
+"Im Modus „Hohe Geschwindigkeit“ wird auf Verschlüsselung verzichtet. Dies "
+"erlaubt häufig eine höhere Bandbreite als mit Verschlüsselung, aber die "
+"Verbindung ist nicht gegen Abhören geschützt."
 
 msgid ""
 "In security mode, the mesh VPN uses an encrypted tunnel to connect to the "
 "VPN servers. The encryption ensures that it is impossible for your internet "
 "access provider to see what data is exchanged over your node."
 msgstr ""
-"Im Modus „Hohe Sicherheit“ wird ein verschlüsselter Tunnel "
-"verwendet. Dies schließt aus, dass dein Internetzugangsprovider herausfinden "
-"kann, was für Daten über deinen Knoten übertragen werden."
+"Im Modus „Hohe Sicherheit“ wird ein verschlüsselter Tunnel verwendet. Dies "
+"schließt aus, dass dein Internetzugangsprovider herausfinden kann, was für "
+"Daten über deinen Knoten übertragen werden."
 
 msgid "Mesh VPN"
 msgstr "Mesh-VPN"

package/gluon-web-mesh-vpn-fastd/i18n/fr.po

+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-08-19 20:20+0100\n"
+"Last-Translator: Bernot Tobias <tqbs@airmail.cc>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"In performance mode, no encryption is used. This usually allows for higher "
+"throughput, but the data exchanged over your node is not protected against "
+"eavesdropping."
+msgstr ""
+"En mode performance, aucune encryption est utilisé. Ceci permet un débit "
+"plus élevé, mais toutes les données échangées ne sont pas protégées contre "
+"l'écoute."
+
+msgid ""
+"In security mode, the mesh VPN uses an encrypted tunnel to connect to the "
+"VPN servers. The encryption ensures that it is impossible for your internet "
+"access provider to see what data is exchanged over your node."
+msgstr ""
+"En mode sécurité, le mesch VPN utilise un tunnel encrypté pour se connecter "
+"aux serveurs VPN. L'encryption permet de rendre impossible a votre FAI de "
+"voir quelles données sont échangées sur votre nœud."
+
+msgid "Mesh VPN"
+msgstr "Mesh-VPN"
+
+msgid "Performance mode"
+msgstr "Mode performance"
+
+msgid "Security mode"
+msgstr "Mode sécurité"

package/gluon-web-mesh-vpn-fastd/luasrc/lib/gluon/config-mode/controller/admin/mesh_vpn_fastd.lua

+package 'gluon-web-mesh-vpn-fastd'
+
+entry({"admin", "mesh_vpn_fastd"}, model("admin/mesh_vpn_fastd"), _("Mesh VPN"), 50)

package/gluon-web-mesh-vpn-fastd/luasrc/lib/gluon/config-mode/model/admin/mesh_vpn_fastd.lua

+local uci = require("simple-uci").cursor()
+local util = require 'gluon.util'
+
+local f = Form(translate('Mesh VPN'))
+
+local s = f:section(Section)
+
+local mode = s:option(Value, 'mode')
+mode.package = "gluon-web-mesh-vpn-fastd"
+mode.template = "mesh-vpn-fastd"
+
+local methods = uci:get('fastd', 'mesh_vpn', 'method')
+if util.contains(methods, 'null@l2tp') or util.contains(methods, 'null') then
+	-- performance mode will only be used as default, if it is present in site.mesh_vpn.fastd.methods
+	mode.default = 'performance'
+else
+	mode.default = 'security'
+end
+
+function mode:write(data)
+	local site = require 'gluon.site'
+
+	-- site_methods will be recreated and filled with the original values from site.mesh_vpn.fastd.methods
+	-- if performance mode was selected, and the method 'null' was not present in the original table, it will be added
+	local site_methods = {}
+	if data == 'performance' then
+		table.insert(site_methods, 'null@l2tp')
+		table.insert(site_methods, 'null')
+	end
+
+	for _, method in ipairs(site.mesh_vpn.fastd.methods()) do
+		if method ~= 'null@l2tp' and method ~= 'null' then
+			table.insert(site_methods, method)
+		end
+	end
+
+	uci:set('fastd', 'mesh_vpn', 'method', site_methods)
+
+	uci:save('fastd')
+	uci:commit('fastd')
+end
+
+return f

package/gluon-web-model/Makefile

+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-web-model
+
+include ../gluon.mk
+
+define Package/gluon-web-model
+  TITLE:=Minimal Lua web framework derived from LuCI (model support)
+  DEPENDS:=+gluon-web
+endef
+
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-model/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-model.min.js $(1)/lib/gluon/web/www/static/gluon-web-model.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-model.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
+$(eval $(call BuildPackageGluon,gluon-web-model))

package/gluon-web-model/files/lib/gluon/web/view/model/dynlist.html

+<div<%=
+	attr("data-dynlist", {
+		prefix = id,
+		type = self.datatype,
+		optional = self.datatype and self.optional,
+		size = self.size,
+		placeholder = self.placeholder,
+	})
+%>>
+<%
+	for i, val in ipairs(self:cfgvalue()) do
+%>
+	<input value="<%|val%>" data-update="change" type="text"<%=
+		attr("id", id .. "." .. i) ..
+		attr("name", id) ..
+		attr("size", self.size) ..
+		attr("placeholder", self.placeholder)
+	%>><br>
+<% end %>
+</div>

package/gluon-web-model/files/lib/gluon/web/view/model/form.html

+<form method="post" enctype="multipart/form-data" action="<%|url(request)%>" data-update="reset">
+	<input type="hidden" name="<%=id%>" value="1">
+
+	<div class="gluon-form" id="form-<%=id%>">
+		<% if self.title and #self.title > 0 then %><h2 name="content"><%|self.title%></h2><% end %>
+		<% if self.description and #self.description > 0 then %><div class="gluon-form-descr"><%=self.description%></div><% end %>
+		<% self:render_children(renderer, scope) %>
+	</div>
+<%- if self.message then %>
+	<div><%|self.message%></div>
+<%- end %>
+<%- if self.errmessage then %>
+	<div class="error"><%|self.errmessage%></div>
+<%- end %>
+	<div class="gluon-page-actions">
+	<%- if self.submit ~= false then %>
+		<input class="gluon-button gluon-button-submit" type="submit" value="
+			<%- if not self.submit then -%><%-:Save-%><%-else-%><%|self.submit%><%end-%>
+		">
+	<% end %>
+	<%- if self.reset ~= false then %>
+		<input class="gluon-button gluon-button-reset" type="reset" value="
+			<%- if not self.reset then -%><%-:Reset-%><%-else-%><%|self.reset%><%end-%>
+		">
+	<% end %>
+	</div>
+</form>

package/gluon-web-model/files/lib/gluon/web/view/model/fvalue.html

+<input data-update="click change" type="checkbox" value="1"<%=
+	attr("id", id) .. attr("name", id) ..
+	attr("checked", self:cfgvalue() and "checked")
+%>>
+<label<%= attr("for", id)%>></label>

package/gluon-web-model/files/lib/gluon/web/view/model/lvalue.html

+<%
+	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br>'
+	local entries = self:entries()
+%>
+
+<% if self.widget == "select" then %>
+	<div class="select-wrapper">
+		<select data-update="change"<%=
+			attr("id", id) ..
+			attr("name", id) ..
+			attr("size", self.size) ..
+			attr("data-type", "minlength(1)") ..
+			attr("data-optional", self.optional)
+		%>>
+			<% for i, entry in pairs(entries) do -%>
+				<option<%=
+					attr("id", id.."."..entry.key) ..
+					attr("value", entry.key) ..
+					attr("data-index", i) ..
+					attr("data-depends", self:deplist(entry.deps)) ..
+					attr("selected", (self:cfgvalue() == entry.key) and "selected")
+				%>><%|entry.value%></option>
+			<%- end %>
+		</select>
+	</div>
+<% elseif self.widget == "radio" then %>
+	<div>
+		<% for i, entry in pairs(entries) do %>
+			<label<%=
+				attr("data-index", i) ..
+				attr("data-depends", self:deplist(entry.deps))
+			%>>
+				<input data-update="click change" type="radio"<%=
+					attr("id", id.."."..entry.key) ..
+					attr("name", id) ..
+					attr("value", entry.key) ..
+					attr("checked", (self:cfgvalue() == entry.key) and "checked")
+				%>>
+				<label<%= attr("for", id.."."..entry.key)%>></label>
+				<%|entry.value%>
+			</label>
+			<% if i ~= #entries then write(br) end %>
+		<% end %>
+	</div>
+<% end %>

package/gluon-web-model/files/lib/gluon/web/view/model/mlvalue.html

+<%
+	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br>'
+	local entries = self:entries()
+	local util = require 'gluon.util'
+%>
+<div>
+	<% for i, entry in pairs(entries) do %>
+		<label<%=
+			attr("data-index", i) ..
+			attr("data-depends", self:deplist(entry.deps))
+		%>>
+			<input data-update="click change" type="checkbox"<%=
+				attr("id", id.."."..entry.key) ..
+				attr("name", id) ..
+				attr("value", entry.key) ..
+				attr("checked", (util.contains(self:cfgvalue(), entry.key)) and "checked") ..
+				attr("data-exclusive-with", self.exclusions[entry.key]) ..
+				attr("data-update", "change")
+			%>>
+			<label<%= attr("for", id.."."..entry.key)%>></label>
+			<span class="gluon-multi-list-option-descr"><%|entry.value%></span>
+		</label>
+		<% if i ~= #entries then write(br) end %>
+	<% end %>
+</div>

package/gluon-web-model/files/lib/gluon/web/view/model/section.html

+<fieldset class="gluon-section" id="<%=id%>" data-index="<%=self.index%>"<%= attr("data-depends", self:deplist()) %>>
+	<% if self.title and #self.title > 0 then -%>
+		<legend><%|self.title%></legend>
+	<%- end %>
+	<% if self.description and #self.description > 0 then -%>
+		<div class="gluon-section-descr"><%=self.description%></div>
+	<%- end %>
+	<div class="gluon-section-node" id="section-<%=id%>">
+		<% self:render_children(renderer, scope) %>
+	</div>
+</fieldset>