diff options
Diffstat (limited to 'core')
32 files changed, 0 insertions, 1850 deletions
diff --git a/core/root/etc/config/luci b/core/root/etc/config/luci deleted file mode 100644 index 87170a9b1..000000000 --- a/core/root/etc/config/luci +++ /dev/null @@ -1,39 +0,0 @@ -config core main - option lang de - option mediaurlbase /luci/fledermaus - option resourcebase /luci/resources - -config core brand - option title "OpenWRT Kamikaze" - option subtitle Freifunkedition - option firmware "OpenWRT Kamikaze" - option distro "Freifunk Firmware 2.x" - -config extern flash_keep - option uci "/etc/config" - option dropbear "/etc/dropbear" - option openvpn "/etc/openvpn" - option passwd "/etc/passwd" - option ipkg "/etc/ipkg.conf" - option httpd "/etc/httpd.conf" - option firewall "/etc/firewall.user" - -config event uci_oncommit - option network "/etc/init.d/network restart" - option wireless "/etc/init.d/network restart" - option olsr "/sbin/reboot" - option dhcp "/etc/init.d/dnsmasq restart" - option luci_fw "/etc/init.d/luci_fw restart" - option dropbear "/etc/init.d/dropbear restart" - option httpd "/etc/init.d/httpd restart" - option fstab "/etc/init.d/fstab restart" - option qos "/etc/init.d/qos restart" - option luci_splash "/etc/init.d/luci_splash restart" - option freifunk "/etc/init.d/luci_freifunk restart" - -config internal languages - option de "Deutsch" - option en "English" - -config internal themes - option Fledermaus "/luci/fledermaus" diff --git a/core/root/www/resources/cbi.js b/core/root/www/resources/cbi.js deleted file mode 100644 index a3a47aa45..000000000 --- a/core/root/www/resources/cbi.js +++ /dev/null @@ -1,42 +0,0 @@ -var cbi_d = {}; - -function cbi_d_add(field, target, value) { - if (!cbi_d[target]) { - cbi_d[target] = {}; - } - if (!cbi_d[target][value]) { - cbi_d[target][value] = []; - } - cbi_d[target][value].push(field); -} - -function cbi_d_update(target) { - if (!cbi_d[target]) { - return; - } - - for (var x in cbi_d[target]) { - for (var i=0; i<cbi_d[target][x].length; i++) { - var y = document.getElementById(cbi_d[target][x][i]) - y.style.display = "none"; - } - } - - var t = document.getElementById(target); - if (t && t.value && cbi_d[target][t.value]) { - for (var i=0; i<cbi_d[target][t.value].length; i++) { - var y = document.getElementById(cbi_d[target][t.value][i]) - if (!y.value) { - y.style.display = "table-row"; - } else { - y.style.display = "block"; - } - } - } -} - -function cbi_d_init() { - for (var x in cbi_d) { - cbi_d_update(x); - } -}
\ No newline at end of file diff --git a/core/src/cbi.lua b/core/src/cbi.lua deleted file mode 100644 index b7097b5d9..000000000 --- a/core/src/cbi.lua +++ /dev/null @@ -1,747 +0,0 @@ ---[[ -LuCI - Configuration Bind Interface - -Description: -Offers an interface for binding confiugration values to certain -data types. Supports value and range validation and basic dependencies. - -FileId: -$Id$ - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- -module("luci.cbi", package.seeall) - -require("luci.template") -require("luci.util") -require("luci.http") -require("luci.model.uci") - -local class = luci.util.class -local instanceof = luci.util.instanceof - --- Loads a CBI map from given file, creating an environment and returns it -function load(cbimap) - require("luci.fs") - require("luci.i18n") - require("luci.config") - require("luci.sys") - - local cbidir = luci.sys.libpath() .. "/model/cbi/" - local func, err = loadfile(cbidir..cbimap..".lua") - - if not func then - return nil - end - - luci.i18n.loadc("cbi") - - luci.util.resfenv(func) - luci.util.updfenv(func, luci.cbi) - luci.util.extfenv(func, "translate", luci.i18n.translate) - - local map = func() - - if not instanceof(map, Map) then - error("CBI map returns no valid map object!") - return nil - end - - return map -end - --- Node pseudo abstract class -Node = class() - -function Node.__init__(self, title, description) - self.children = {} - self.title = title or "" - self.description = description or "" - self.template = "cbi/node" -end - --- Append child nodes -function Node.append(self, obj) - table.insert(self.children, obj) -end - --- Parse this node and its children -function Node.parse(self, ...) - for k, child in ipairs(self.children) do - child:parse(...) - end -end - --- Render this node -function Node.render(self, scope) - scope = scope or {} - scope.self = self - - luci.template.render(self.template, scope) -end - --- Render the children -function Node.render_children(self, ...) - for k, node in ipairs(self.children) do - node:render(...) - end -end - - ---[[ -A simple template element -]]-- -Template = class(Node) - -function Template.__init__(self, template) - Node.__init__(self) - self.template = template -end - - ---[[ -Map - A map describing a configuration file -]]-- -Map = class(Node) - -function Map.__init__(self, config, ...) - Node.__init__(self, ...) - self.config = config - self.template = "cbi/map" - self.uci = luci.model.uci.Session() - self.ucidata, self.uciorder = self.uci:sections(self.config) - if not self.ucidata or not self.uciorder then - error("Unable to read UCI data: " .. self.config) - end -end - --- Use optimized UCI writing -function Map.parse(self, ...) - self.uci:t_load(self.config) - Node.parse(self, ...) - self.uci:t_save(self.config) -end - --- Creates a child section -function Map.section(self, class, ...) - if instanceof(class, AbstractSection) then - local obj = class(self, ...) - self:append(obj) - return obj - else - error("class must be a descendent of AbstractSection") - end -end - --- UCI add -function Map.add(self, sectiontype) - local name = self.uci:t_add(self.config, sectiontype) - if name then - self.ucidata[name] = {} - self.ucidata[name][".type"] = sectiontype - table.insert(self.uciorder, name) - end - return name -end - --- UCI set -function Map.set(self, section, option, value) - local stat = self.uci:t_set(self.config, section, option, value) - if stat then - local val = self.uci:t_get(self.config, section, option) - if option then - self.ucidata[section][option] = val - else - if not self.ucidata[section] then - self.ucidata[section] = {} - end - self.ucidata[section][".type"] = val - table.insert(self.uciorder, section) - end - end - return stat -end - --- UCI del -function Map.del(self, section, option) - local stat = self.uci:t_del(self.config, section, option) - if stat then - if option then - self.ucidata[section][option] = nil - else - self.ucidata[section] = nil - for i, k in ipairs(self.uciorder) do - if section == k then - table.remove(self.uciorder, i) - end - end - end - end - return stat -end - --- UCI get (cached) -function Map.get(self, section, option) - if not section then - return self.ucidata, self.uciorder - elseif option and self.ucidata[section] then - return self.ucidata[section][option] - else - return self.ucidata[section] - end -end - - ---[[ -AbstractSection -]]-- -AbstractSection = class(Node) - -function AbstractSection.__init__(self, map, sectiontype, ...) - Node.__init__(self, ...) - self.sectiontype = sectiontype - self.map = map - self.config = map.config - self.optionals = {} - - self.optional = true - self.addremove = false - self.dynamic = false -end - --- Appends a new option -function AbstractSection.option(self, class, ...) - if instanceof(class, AbstractValue) then - local obj = class(self.map, ...) - self:append(obj) - return obj - else - error("class must be a descendent of AbstractValue") - end -end - --- Parse optional options -function AbstractSection.parse_optionals(self, section) - if not self.optional then - return - end - - self.optionals[section] = {} - - local field = luci.http.formvalue("cbi.opt."..self.config.."."..section) - for k,v in ipairs(self.children) do - if v.optional and not v:cfgvalue(section) then - if field == v.option then - field = nil - else - table.insert(self.optionals[section], v) - end - end - end - - if field and #field > 0 and self.dynamic then - self:add_dynamic(field) - end -end - --- Add a dynamic option -function AbstractSection.add_dynamic(self, field, optional) - local o = self:option(Value, field, field) - o.optional = optional -end - --- Parse all dynamic options -function AbstractSection.parse_dynamic(self, section) - if not self.dynamic then - return - end - - local arr = luci.util.clone(self:cfgvalue(section)) - local form = luci.http.formvaluetable("cbid."..self.config.."."..section) - for k, v in pairs(form) do - arr[k] = v - end - - for key,val in pairs(arr) do - local create = true - - for i,c in ipairs(self.children) do - if c.option == key then - create = false - end - end - - if create and key:sub(1, 1) ~= "." then - self:add_dynamic(key, true) - end - end -end - --- Returns the section's UCI table -function AbstractSection.cfgvalue(self, section) - return self.map:get(section) -end - --- Removes the section -function AbstractSection.remove(self, section) - return self.map:del(section) -end - --- Creates the section -function AbstractSection.create(self, section) - return self.map:set(section, nil, self.sectiontype) -end - - - ---[[ -NamedSection - A fixed configuration section defined by its name -]]-- -NamedSection = class(AbstractSection) - -function NamedSection.__init__(self, map, section, ...) - AbstractSection.__init__(self, map, ...) - self.template = "cbi/nsection" - - self.section = section - self.addremove = false -end - -function NamedSection.parse(self) - local s = self.section - local active = self:cfgvalue(s) - - - if self.addremove then - local path = self.config.."."..s - if active then -- Remove the section - if luci.http.formvalue("cbi.rns."..path) and self:remove(s) then - return - end - else -- Create and apply default values - if luci.http.formvalue("cbi.cns."..path) and self:create(s) then - for k,v in pairs(self.children) do - v:write(s, v.default) - end - end - end - end - - if active then - AbstractSection.parse_dynamic(self, s) - if luci.http.formvalue("cbi.submit") then - Node.parse(self, s) - end - AbstractSection.parse_optionals(self, s) - end -end - - ---[[ -TypedSection - A (set of) configuration section(s) defined by the type - addremove: Defines whether the user can add/remove sections of this type - anonymous: Allow creating anonymous sections - validate: a validation function returning nil if the section is invalid -]]-- -TypedSection = class(AbstractSection) - -function TypedSection.__init__(self, ...) - AbstractSection.__init__(self, ...) - self.template = "cbi/tsection" - self.deps = {} - self.excludes = {} - - self.anonymous = false -end - --- Return all matching UCI sections for this TypedSection -function TypedSection.cfgsections(self) - local sections = {} - local map, order = self.map:get() - - for i, k in ipairs(order) do - if map[k][".type"] == self.sectiontype then - if self:checkscope(k) then - table.insert(sections, k) - end - end - end - - return sections -end - --- Creates a new section of this type with the given name (or anonymous) -function TypedSection.create(self, name) - if name then - self.map:set(name, nil, self.sectiontype) - else - name = self.map:add(self.sectiontype) - end - - for k,v in pairs(self.children) do - if v.default then - self.map:set(name, v.option, v.default) - end - end -end - --- Limits scope to sections that have certain option => value pairs -function TypedSection.depends(self, option, value) - table.insert(self.deps, {option=option, value=value}) -end - --- Excludes several sections by name -function TypedSection.exclude(self, field) - self.excludes[field] = true -end - -function TypedSection.parse(self) - if self.addremove then - -- Create - local crval = "cbi.cts." .. self.config .. "." .. self.sectiontype - local name = luci.http.formvalue(crval) - if self.anonymous then - if name then - self:create() - end - else - if name then - -- Ignore if it already exists - if self:cfgvalue(name) then - name = nil; - end - - name = self:checkscope(name) - - if not name then - self.err_invalid = true - end - - if name and name:len() > 0 then - self:create(name) - end - end - end - - -- Remove - crval = "cbi.rts." .. self.config - name = luci.http.formvaluetable(crval) - for k,v in pairs(name) do - if self:cfgvalue(k) and self:checkscope(k) then - self:remove(k) - end - end - end - - for i, k in ipairs(self:cfgsections()) do - AbstractSection.parse_dynamic(self, k) - if luci.http.formvalue("cbi.submit") then - Node.parse(self, k) - end - AbstractSection.parse_optionals(self, k) - end -end - --- Verifies scope of sections -function TypedSection.checkscope(self, section) - -- Check if we are not excluded - if self.excludes[section] then - return nil - end - - -- Check if at least one dependency is met - if #self.deps > 0 and self:cfgvalue(section) then - local stat = false - - for k, v in ipairs(self.deps) do - if self:cfgvalue(section)[v.option] == v.value then - stat = true - end - end - - if not stat then - return nil - end - end - - return self:validate(section) -end - - --- Dummy validate function -function TypedSection.validate(self, section) - return section -end - - ---[[ -AbstractValue - An abstract Value Type - null: Value can be empty - valid: A function returning the value if it is valid otherwise nil - depends: A table of option => value pairs of which one must be true - default: The default value - size: The size of the input fields - rmempty: Unset value if empty - optional: This value is optional (see AbstractSection.optionals) -]]-- -AbstractValue = class(Node) - -function AbstractValue.__init__(self, map, option, ...) - Node.__init__(self, ...) - self.option = option - self.map = map - self.config = map.config - self.tag_invalid = {} - self.deps = {} - - self.rmempty = false - self.default = nil - self.size = nil - self.optional = false -end - --- Add a dependencie to another section field -function AbstractValue.depends(self, field, value) - table.insert(self.deps, {field=field, value=value}) -end - --- Return whether this object should be created -function AbstractValue.formcreated(self, section) - local key = "cbi.opt."..self.config.."."..section - return (luci.http.formvalue(key) == self.option) -end - --- Returns the formvalue for this object -function AbstractValue.formvalue(self, section) - local key = "cbid."..self.map.config.."."..section.."."..self.option - return luci.http.formvalue(key) -end - -function AbstractValue.parse(self, section) - local fvalue = self:formvalue(section) - - if fvalue and fvalue ~= "" then -- If we have a form value, write it to UCI - fvalue = self:validate(fvalue) - if not fvalue then - self.tag_invalid[section] = true - end - if fvalue and not (fvalue == self:cfgvalue(section)) then - self:write(section, fvalue) - end - else -- Unset the UCI or error - if self.rmempty or self.optional then - self:remove(section) - end - end -end - --- Render if this value exists or if it is mandatory -function AbstractValue.render(self, s, scope) - if not self.optional or self:cfgvalue(s) or self:formcreated(s) then - scope = scope or {} - scope.section = s - Node.render(self, scope) - end -end - --- Return the UCI value of this object -function AbstractValue.cfgvalue(self, section) - return self.map:get(section, self.option) -end - --- Validate the form value -function AbstractValue.validate(self, value) - return value -end - --- Write to UCI -function AbstractValue.write(self, section, value) - return self.map:set(section, self.option, value) -end - --- Remove from UCI -function AbstractValue.remove(self, section) - return self.map:del(section, self.option) -end - - - - ---[[ -Value - A one-line value - maxlength: The maximum length - isnumber: The value must be a valid (floating point) number - isinteger: The value must be a valid integer - ispositive: The value must be positive (and a number) -]]-- -Value = class(AbstractValue) - -function Value.__init__(self, ...) - AbstractValue.__init__(self, ...) - self.template = "cbi/value" - - self.maxlength = nil - self.isnumber = false - self.isinteger = false -end - --- This validation is a bit more complex -function Value.validate(self, val) - if self.maxlength and tostring(val):len() > self.maxlength then - val = nil - end - - return luci.util.validate(val, self.isnumber, self.isinteger) -end - - --- DummyValue - This does nothing except being there -DummyValue = class(AbstractValue) - -function DummyValue.__init__(self, map, ...) - AbstractValue.__init__(self, map, ...) - self.template = "cbi/dvalue" - self.value = nil -end - -function DummyValue.parse(self) - -end - -function DummyValue.render(self, s) - luci.template.render(self.template, {self=self, section=s}) -end - - ---[[ -Flag - A flag being enabled or disabled -]]-- -Flag = class(AbstractValue) - -function Flag.__init__(self, ...) - AbstractValue.__init__(self, ...) - self.template = "cbi/fvalue" - - self.enabled = "1" - self.disabled = "0" -end - --- A flag can only have two states: set or unset -function Flag.parse(self, section) - local fvalue = self:formvalue(section) - - if fvalue then - fvalue = self.enabled - else - fvalue = self.disabled - end - - if fvalue == self.enabled or (not self.optional and not self.rmempty) then - if not(fvalue == self:cfgvalue(section)) then - self:write(section, fvalue) - end - else - self:remove(section) - end -end - - - ---[[ -ListValue - A one-line value predefined in a list - widget: The widget that will be used (select, radio) -]]-- -ListValue = class(AbstractValue) - -function ListValue.__init__(self, ...) - AbstractValue.__init__(self, ...) - self.template = "cbi/lvalue" - self.keylist = {} - self.vallist = {} - - self.size = 1 - self.widget = "select" -end - -function ListValue.value(self, key, val) - val = val or key - table.insert(self.keylist, tostring(key)) - table.insert(self.vallist, tostring(val)) -end - -function ListValue.validate(self, val) - if luci.util.contains(self.keylist, val) then - return val - else - return nil - end -end - - - ---[[ -MultiValue - Multiple delimited values - widget: The widget that will be used (select, checkbox) - delimiter: The delimiter that will separate the values (default: " ") -]]-- -MultiValue = class(AbstractValue) - -function MultiValue.__init__(self, ...) - AbstractValue.__init__(self, ...) - self.template = "cbi/mvalue" - self.keylist = {} - self.vallist = {} - - self.widget = "checkbox" - self.delimiter = " " -end - -function MultiValue.value(self, key, val) - val = val or key - table.insert(self.keylist, tostring(key)) - table.insert(self.vallist, tostring(val)) -end - -function MultiValue.valuelist(self, section) - local val = self:cfgvalue(section) - - if not(type(val) == "string") then - return {} - end - - return luci.util.split(val, self.delimiter) -end - -function MultiValue.validate(self, val) - if not(type(val) == "string") then - return nil - end - - local result = "" - - for value in val:gmatch("[^\n]+") do - if luci.util.contains(self.keylist, value) then - result = result .. self.delimiter .. value - end - end - - if result:len() > 0 then - return result:sub(self.delimiter:len() + 1) - else - return nil - end -end
\ No newline at end of file diff --git a/core/src/config.lua b/core/src/config.lua deleted file mode 100644 index 854b12814..000000000 --- a/core/src/config.lua +++ /dev/null @@ -1,48 +0,0 @@ ---[[ -LuCI - Configuration - -Description: -Some LuCI configuration values read from uci file "luci" - - -FileId: -$Id$ - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- - -module("luci.config", package.seeall) -require("luci.model.uci") -require("luci.util") -require("luci.sys") - --- Warning! This is only for fallback and compatibility purporses! -- -main = {} - --- This is where stylesheets and images go -main.mediaurlbase = "/luci/media" - --- Does anybody think about browser autodetect here? --- Too bad busybox doesn't populate HTTP_ACCEPT_LANGUAGE -main.lang = "de" - - --- Now overwrite with UCI values -local ucidata = luci.model.uci.sections("luci") -if ucidata then - luci.util.update(luci.config, ucidata) -end
\ No newline at end of file diff --git a/core/src/dispatcher.lua b/core/src/dispatcher.lua deleted file mode 100644 index 103260c48..000000000 --- a/core/src/dispatcher.lua +++ /dev/null @@ -1,278 +0,0 @@ ---[[ -LuCI - Dispatcher - -Description: -The request dispatcher and module dispatcher generators - -FileId: -$Id$ - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- -module("luci.dispatcher", package.seeall) -require("luci.http") -require("luci.sys") -require("luci.fs") - --- Local dispatch database -local tree = {nodes={}} - --- Index table -local index = {} - --- Global request object -request = {} - --- Active dispatched node -dispatched = nil - --- Status fields -built_index = false -built_tree = false - - --- Builds a URL -function build_url(...) - return luci.http.dispatcher() .. "/" .. table.concat(arg, "/") -end - --- Sends a 404 error code and renders the "error404" template if available -function error404(message) - luci.http.status(404, "Not Found") - message = message or "Not Found" - - require("luci.template") - if not pcall(luci.template.render, "error404") then - luci.http.prepare_content("text/plain") - print(message) - end - return false -end - --- Sends a 500 error code and renders the "error500" template if available -function error500(message) - luci.http.status(500, "Internal Server Error") - - require("luci.template") - if not pcall(luci.template.render, "error500", {message=message}) then - luci.http.prepare_content("text/plain") - print(message) - end - return false -end - --- Creates a request object for dispatching -function httpdispatch() - local pathinfo = luci.http.env.PATH_INFO or "" - local c = tree - - for s in pathinfo:gmatch("([%w_]+)") do - table.insert(request, s) - end - - dispatch() -end - --- Dispatches a request -function dispatch() - if not built_tree then - createtree() - end - - local c = tree - local track = {} - - for i, s in ipairs(request) do - c = c.nodes[s] - if not c then - break - end - - for k, v in pairs(c) do - track[k] = v - end - end - - - if track.i18n then - require("luci.i18n").loadc(track.i18n) - end - - if track.setgroup then - luci.sys.process.setgroup(track.setgroup) - end - - if track.setuser then - luci.sys.process.setuser(track.setuser) - end - - -- Init template engine - local tpl = require("luci.template") - tpl.viewns.translate = function(...) return require("luci.i18n").translate(...) end - tpl.viewns.controller = luci.http.dispatcher() - tpl.viewns.uploadctrl = luci.http.dispatcher_upload() - tpl.viewns.media = luci.config.main.mediaurlbase - tpl.viewns.resource = luci.config.main.resourcebase - - - if c and type(c.target) == "function" then - dispatched = c - - stat, err = pcall(c.target) - if not stat then - error500(err) - end - else - error404() - end -end - --- Generates the dispatching tree -function createindex() - index = {} - local path = luci.sys.libpath() .. "/controller/" - local suff = ".lua" - - if pcall(require, "fastindex") then - createindex_fastindex(path, suff) - else - createindex_plain(path, suff) - end - - built_index = true -end - --- Uses fastindex to create the dispatching tree -function createindex_fastindex(path, suffix) - local fi = fastindex.new("index") - fi.add(path .. "*" .. suffix) - fi.add(path .. "*/*" .. suffix) - fi.scan() - - for k, v in pairs(fi.indexes) do - index[v[2]] = v[1] - end -end - --- Calls the index function of all available controllers -function createindex_plain(path, suffix) - local controllers = luci.util.combine( - luci.fs.glob(path .. "*" .. suffix) or {}, - luci.fs.glob(path .. "*/*" .. suffix) or {} - ) - - for i,c in ipairs(controllers) do - c = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".") - stat, mod = pcall(require, c) - - if stat and mod and type(mod.index) == "function" then - index[c] = mod.index - end - end -end - --- Creates the dispatching tree from the index -function createtree() - if not built_index then - createindex() - end - - for k, v in pairs(index) do - luci.util.updfenv(v, _M) - - local stat, mod = pcall(require, k) - if stat then - luci.util.updfenv(v, mod) - end - - pcall(v) - end - - built_tree = true -end - --- Shortcut for creating a dispatching node -function entry(path, target, title, order, add) - add = add or {} - - local c = node(path) - c.target = target - c.title = title - c.order = order - - for k,v in pairs(add) do - c[k] = v - end - - return c -end - --- Fetch a dispatching node -function node(...) - local c = tree - - if arg[1] and type(arg[1]) == "table" then - arg = arg[1] - end - - for k,v in ipairs(arg) do - if not c.nodes[v] then - c.nodes[v] = {nodes={}} - end - - c = c.nodes[v] - end - - return c -end - --- Subdispatchers -- -function alias(...) - local req = arg - return function() - request = req - dispatch() - end -end - -function template(name) - require("luci.template") - return function() luci.template.render(name) end -end - -function cbi(model) - require("luci.cbi") - require("luci.template") - - return function() - local stat, res = pcall(luci.cbi.load, model) - if not stat then - error500(res) - return true - end - - local stat, err = pcall(res.parse, res) - if not stat then - error500(err) - return true - end - - luci.template.render("cbi/header") - res:render() - luci.template.render("cbi/footer") - end -end diff --git a/core/src/http.lua b/core/src/http.lua deleted file mode 100644 index fa8821c5a..000000000 --- a/core/src/http.lua +++ /dev/null @@ -1,36 +0,0 @@ ---[[ -LuCI - HTTP-Interaction - -Description: -HTTP-Header manipulator and form variable preprocessor - -FileId: -$Id$ - -ToDo: -- Cookie handling - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- - -module("luci.http", package.seeall) - -if ENV and ENV.HASERLVER then - require("luci.sgi.haserl") -elseif webuci then - require("luci.sgi.webuci") -end
\ No newline at end of file diff --git a/core/src/i18n.lua b/core/src/i18n.lua deleted file mode 100644 index 3a8a9a6c7..000000000 --- a/core/src/i18n.lua +++ /dev/null @@ -1,63 +0,0 @@ ---[[ -LuCI - Internationalisation - -Description: -A very minimalistic but yet effective internationalisation module - -FileId: -$Id$ - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- - -module("luci.i18n", package.seeall) -require("luci.sys") - -table = {} -i18ndir = luci.sys.libpath() .. "/i18n/" - --- Clears the translation table -function clear() - table = {} -end - --- Loads a translation and copies its data into the global translation table -function load(file) - local f = loadfile(i18ndir .. file) - if f then - setfenv(f, table) - f() - return true - else - return false - end -end - --- Same as load but autocompletes the filename with .LANG from config.lang -function loadc(file) - return load(file .. "." .. require("luci.config").main.lang) -end - --- Returns the i18n-value defined by "key" or if there is no such: "default" -function translate(key, default) - return table[key] or default -end - --- Translate shourtcut with sprintf/string.format inclusion -function translatef(key, default, ...) - return translate(key, default):format(...) -end
\ No newline at end of file diff --git a/core/src/i18n/cbi.en b/core/src/i18n/cbi.en deleted file mode 100644 index 6069cec45..000000000 --- a/core/src/i18n/cbi.en +++ /dev/null @@ -1,4 +0,0 @@ -cbi_add = "Add entry" -cbi_del = "Remove entry" -cbi_invalid = "Error: Invalid input value" -cbi_addopt = "-- Field --"
\ No newline at end of file diff --git a/core/src/i18n/default.en b/core/src/i18n/default.en deleted file mode 100644 index d76b770e9..000000000 --- a/core/src/i18n/default.en +++ /dev/null @@ -1,14 +0,0 @@ -add = "Add" -save = "Save" -reset = "Reset" - -load = "Load" -webif = "Webinterface" -public = "Public" -admin = "Administration" -apply = "Apply" -changes = "Changes" -revert = "Revert" - -config = "Configuration" -path = "Path"
\ No newline at end of file diff --git a/core/src/template.lua b/core/src/template.lua deleted file mode 100644 index 369aa0a30..000000000 --- a/core/src/template.lua +++ /dev/null @@ -1,220 +0,0 @@ ---[[ -LuCI - Template Parser - -Description: -A template parser supporting includes, translations, Lua code blocks -and more. It can be used either as a compiler or as an interpreter. - -FileId: $Id$ - -License: -Copyright 2008 Steven Barth <steven@midlink.org> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -]]-- -module("luci.template", package.seeall) - -require("luci.config") -require("luci.util") -require("luci.fs") -require("luci.http") - -viewdir = luci.sys.libpath() .. "/view/" - - --- Compile modes: --- none: Never compile, only use precompiled data from files --- memory: Always compile, do not save compiled files, ignore precompiled --- file: Compile on demand, save compiled files, update precompiled -compiler_mode = "memory" - - --- This applies to compiler modes "always" and "smart" --- --- Produce compiled lua code rather than lua sourcecode --- WARNING: Increases template size heavily!!! --- This produces the same bytecode as luac but does not have a strip option -compiler_enable_bytecode = false - - --- Define the namespace for template modules -viewns = { - write = io.write, - include = function(name) Template(name):render(getfenv(2)) end, -} - --- Compiles a given template into an executable Lua module -function compile(template) - -- Search all <% %> expressions (remember: Lua table indexes begin with #1) - local function expr_add(command) - table.insert(expr, command) - return "<%" .. tostring(#expr) .. "%>" - end - - -- As "expr" should be local, we have to assign it to the "expr_add" scope - local expr = {} - luci.util.extfenv(expr_add, "expr", expr) - - -- Save all expressiosn to table "expr" - template = template:gsub("<%%(.-)%%>", expr_add) - - local function sanitize(s) - s = luci.util.escape(s) - s = luci.util.escape(s, "'") - s = luci.util.escape(s, "\n") - return s - end - - -- Escape and sanitize all the template (all non-expressions) - template = sanitize(template) - - -- Template module header/footer declaration - local header = "write('" - local footer = "')" - - template = header .. template .. footer - - -- Replacements - local r_include = "')\ninclude('%s')\nwrite('" - local r_i18n = "'..translate('%1','%2')..'" - local r_pexec = "'..(%s or '')..'" - local r_exec = "')\n%s\nwrite('" - - -- Parse the expressions - for k,v in pairs(expr) do - local p = v:sub(1, 1) - local re = nil - if p == "+" then - re = r_include:format(sanitize(string.sub(v, 2))) - elseif p == ":" then - re = sanitize(v):gsub(":(.-) (.+)", r_i18n) - elseif p == "=" then - re = r_pexec:format(v:sub(2)) - else - re = r_exec:format(v) - end - template = template:gsub("<%%"..tostring(k).."%%>", re) - end - - if compiler_enable_bytecode then - tf = loadstring(template) - template = string.dump(tf) - end - - return template -end - --- Oldstyle render shortcut -function render(name, scope, ...) - scope = scope or getfenv(2) - local s, t = pcall(Template, name) - if not s then - error(t) - else - t:render(scope, ...) - end -end - - --- Template class -Template = luci.util.class() - --- Shared template cache to store templates in to avoid unnecessary reloading -Template.cache = {} - - --- Constructor - Reads and compiles the template on-demand -function Template.__init__(self, name) - if self.cache[name] then - self.template = self.cache[name] - else - self.template = nil - end - - -- Create a new namespace for this template - self.viewns = {} - - -- Copy over from general namespace - for k, v in pairs(viewns) do - self.viewns[k] = v - end - - -- If we have a cached template, skip compiling and loading - if self.template then - return - end - - -- Compile and build - local sourcefile = viewdir .. name .. ".htm" - local compiledfile = viewdir .. name .. ".lua" - local err - - if compiler_mode == "file" then - local tplmt = luci.fs.mtime(sourcefile) - local commt = luci.fs.mtime(compiledfile) - - -- Build if there is no compiled file or if compiled file is outdated - if ((commt == nil) and not (tplmt == nil)) - or (not (commt == nil) and not (tplmt == nil) and commt < tplmt) then - local source - source, err = luci.fs.readfile(sourcefile) - - if source then - local compiled = compile(source) - luci.fs.writefile(compiledfile, compiled) - self.template, err = loadstring(compiled) - end - else - self.template, err = loadfile(compiledfile) - end - - elseif compiler_mode == "none" then - self.template, err = loadfile(self.compiledfile) - - elseif compiler_mode == "memory" then - local source - source, err = luci.fs.readfile(sourcefile) - if source then - self.template, err = loadstring(compile(source)) - end - - end - - -- If we have no valid template throw error, otherwise cache the template - if not self.template then - error(err) - else - self.cache[name] = self.template - end -end - - --- Renders a template -function Template.render(self, scope) - scope = scope or getfenv(2) - - -- Save old environment - local oldfenv = getfenv(self.template) - - -- Put our predefined objects in the scope of the template - luci.util.resfenv(self.template) - luci.util.updfenv(self.template, scope) - luci.util.updfenv(self.template, self.viewns) - - -- Now finally render the thing - self.template() - - -- Reset environment - setfenv(self.template, oldfenv) -end diff --git a/core/src/view/cbi/dvalue.htm b/core/src/view/cbi/dvalue.htm deleted file mode 100644 index f54667def..000000000 --- a/core/src/view/cbi/dvalue.htm +++ /dev/null @@ -1,12 +0,0 @@ -<%+cbi/valueheader%> -<% if self.value then - if type(self.value) == "function" then %> - <%=self:value(section)%> -<% else %> - <%=self.value%> -<% end -else %> - <%=self:cfgvalue(section)%> -<% end %> - -<%+cbi/valuefooter%> diff --git a/core/src/view/cbi/footer.htm b/core/src/view/cbi/footer.htm deleted file mode 100644 index 2acf710cd..000000000 --- a/core/src/view/cbi/footer.htm +++ /dev/null @@ -1,7 +0,0 @@ - <div> - <input type="submit" value="<%:save Speichern%>" /> - <input type="reset" value="<%:reset Zurücksetzen%>" /> - <script type="text/javascript">cbi_d_init();</script> - </div> - </form> -<%+footer%>
\ No newline at end of file diff --git a/core/src/view/cbi/full_valuefooter.htm b/core/src/view/cbi/full_valuefooter.htm deleted file mode 100644 index 6151a3a66..000000000 --- a/core/src/view/cbi/full_valuefooter.htm +++ /dev/null @@ -1,8 +0,0 @@ - <div class="cbi-value-description"><%=self.description%> </div> - </div> - <% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %>
\ No newline at end of file diff --git a/core/src/view/cbi/full_valueheader.htm b/core/src/view/cbi/full_valueheader.htm deleted file mode 100644 index 062efa2dd..000000000 --- a/core/src/view/cbi/full_valueheader.htm +++ /dev/null @@ -1,3 +0,0 @@ - <div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> - <div class="cbi-value-title"><%=self.title%></div> - <div class="cbi-value-field">
\ No newline at end of file diff --git a/core/src/view/cbi/fvalue.htm b/core/src/view/cbi/fvalue.htm deleted file mode 100644 index b609f1d4f..000000000 --- a/core/src/view/cbi/fvalue.htm +++ /dev/null @@ -1,3 +0,0 @@ -<%+cbi/valueheader%> - <input onchange="cbi_d_update(this.id)" type="checkbox" id="cbid.<%=self.config.."."..section.."."..self.option%>" name="cbid.<%=self.config.."."..section.."."..self.option%>"<% if self:cfgvalue(section) == self.enabled then %> checked="checked"<% end %> value="1" /> -<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/core/src/view/cbi/header.htm b/core/src/view/cbi/header.htm deleted file mode 100644 index 4229aaf0d..000000000 --- a/core/src/view/cbi/header.htm +++ /dev/null @@ -1,7 +0,0 @@ -<%+header%> - <form method="post" action="<%=luci.http.env.REQUEST_URI%>"> - <div> - <script type="text/javascript" src="<%=resource%>/cbi.js"></script> - <input type="hidden" name="cbi.submit" value="1" /> - <input type="submit" value="<%:save Speichern%>" class="hidden" /> - </div> diff --git a/core/src/view/cbi/lvalue.htm b/core/src/view/cbi/lvalue.htm deleted file mode 100644 index f1ae5a093..000000000 --- a/core/src/view/cbi/lvalue.htm +++ /dev/null @@ -1,16 +0,0 @@ -<%+cbi/valueheader%> -<% if self.widget == "select" then %> - <select onchange="cbi_d_update(this.id)" id="cbid.<%=self.config.."."..section.."."..self.option%>" name="cbid.<%=self.config.."."..section.."."..self.option%>"<% if self.size then %> size="<%=self.size%>"<% end %>> -<%for i, key in pairs(self.keylist) do%> - <option<% if self:cfgvalue(section) == key then %> selected="selected"<% end %> value="<%=key%>"><%=self.vallist[i]%></option> -<% end %> - </select> -<% elseif self.widget == "radio" then - local c = 0; - for i, key in pairs(self.keylist) do - c = c + 1%> - <%=self.vallist[i]%><input type="radio" name="cbid.<%=self.config.."."..section.."."..self.option%>"<% if self:cfgvalue(section) == key then %> checked="checked"<% end %> value="<%=key%>" /> -<% if c == self.size then c = 0 %><br /> -<% end end %> -<% end %> -<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/core/src/view/cbi/map.htm b/core/src/view/cbi/map.htm deleted file mode 100644 index 835393c1c..000000000 --- a/core/src/view/cbi/map.htm +++ /dev/null @@ -1,6 +0,0 @@ - <div class="cbi-map" id="cbi-<%=self.config%>"> - <h1><%=self.title%></h1> - <div class="cbi-map-descr"><%=self.description%></div> -<% self:render_children() %> - <br /> - </div> diff --git a/core/src/view/cbi/mvalue.htm b/core/src/view/cbi/mvalue.htm deleted file mode 100644 index bed66e569..000000000 --- a/core/src/view/cbi/mvalue.htm +++ /dev/null @@ -1,19 +0,0 @@ -<% -local v = self:valuelist(section) -%> -<%+cbi/valueheader%> -<% if self.widget == "select" then %> - <select multiple="multiple" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if self.size then %> size="<%=self.size%>"<% end %>> -<%for i, key in pairs(self.keylist) do %> - <option<% if luci.util.contains(v, key) then %> selected="selected"<% end %> value="<%=key%>"><%=self.vallist[i]%></option> -<% end %> - </select> -<% elseif self.widget == "checkbox" then - local c = 0; - for i, key in pairs(self.keylist) do - c = c + 1%> - <%=self.vallist[i]%><input type="checkbox" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if luci.util.contains(v, key) then %> checked="checked"<% end %> value="<%=key%>" /> -<% if c == self.size then c = 0 %><br /> -<% end end %> -<% end %> -<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/core/src/view/cbi/nsection.htm b/core/src/view/cbi/nsection.htm deleted file mode 100644 index fff597ad0..000000000 --- a/core/src/view/cbi/nsection.htm +++ /dev/null @@ -1,20 +0,0 @@ -<% if self:cfgvalue(self.section) then -section = self.section %> - <div class="cbi-section" id="cbi-<%=self.config%>-<%=section%>"> - <h2><%=self.title%></h2> - <div class="cbi-section-descr"><%=self.description%></div> - <% if self.addremove then %><div class="cbi-section-remove right"> - <input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del Eintrag entfernen%>" /> - </div><% end %> -<div class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>"> -<%+cbi/ucisection%> -</div> -<br /> - </div> -<% elseif self.addremove then %> - <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>"> - <h2><%=self.title%></h2> - <div class="cbi-section-descr"><%=self.description%></div> - <input type="submit" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add Eintrag anlegen%>" /> - </div> -<% end %> diff --git a/core/src/view/cbi/tblsection.htm b/core/src/view/cbi/tblsection.htm deleted file mode 100644 index df16efbed..000000000 --- a/core/src/view/cbi/tblsection.htm +++ /dev/null @@ -1,39 +0,0 @@ - <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>"> - <h2><%=self.title%></h2> - <div class="cbi-section-descr"><%=self.description%></div> - <div class="cbi-section-node"> - <div class="cbi-section-row"> -<% for i, k in pairs(self.children) do %> - <div class="cbi-section-row-head"><%=k.title%></div> -<% end %> - </div> - <div class="cbi-section-row"> -<% for i, k in pairs(self.children) do %> - <div class="cbi-section-row-descr"><%=k.description%></div> -<% end %> - </div> -<% for i, k in ipairs(self:cfgsections()) do%> - <% if not self.anonymous then %><h3 class="table-cell"><%=k%></h3><% end %> -<% -section = k -scope = {valueheader = "cbi/tiny_valueheader", valuefooter = "cbi/tiny_valuefooter"} -%> -<div class="cbi-section-row" id="cbi-<%=self.config%>-<%=section%>"> -<%+cbi/ucisection%> - <% if self.addremove then %><div class="cbi-section-remove table-cell"> - <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="X" /> - </div><% end %> -</div> -<% end %> -<% if self.addremove then %> - <div class="cbi-section-create"> - <% if self.anonymous then %> - <input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% else %> - <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" /> - <input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> - </div> -<% end %> - </div> diff --git a/core/src/view/cbi/tiny_valuefooter.htm b/core/src/view/cbi/tiny_valuefooter.htm deleted file mode 100644 index e65ebb6c0..000000000 --- a/core/src/view/cbi/tiny_valuefooter.htm +++ /dev/null @@ -1,6 +0,0 @@ - <% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %>
\ No newline at end of file diff --git a/core/src/view/cbi/tiny_valueheader.htm b/core/src/view/cbi/tiny_valueheader.htm deleted file mode 100644 index b9b26bd6a..000000000 --- a/core/src/view/cbi/tiny_valueheader.htm +++ /dev/null @@ -1 +0,0 @@ - <div class="cbi-value-field" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> diff --git a/core/src/view/cbi/tsection.htm b/core/src/view/cbi/tsection.htm deleted file mode 100644 index 37b18b5d4..000000000 --- a/core/src/view/cbi/tsection.htm +++ /dev/null @@ -1,25 +0,0 @@ - <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>"> - <h2><%=self.title%></h2> - <div class="cbi-section-descr"><%=self.description%></div> -<% for i, k in ipairs(self:cfgsections()) do%> - <% if self.addremove then %><div class="cbi-section-remove right"> - <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:cbi_del Eintrag entfernen%>" /> - </div><% end %> - <% if not self.anonymous then %><h3><%=k%></h3><% end %> -<% section = k %> -<div class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>"> -<%+cbi/ucisection%> -</div> -<br /> -<% end %> -<% if self.addremove then %> - <div class="cbi-section-create"> - <% if self.anonymous then %> - <input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% else %> - <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" /> - <input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> -<% end %> - </div> diff --git a/core/src/view/cbi/ucisection.htm b/core/src/view/cbi/ucisection.htm deleted file mode 100644 index 0abc37e7c..000000000 --- a/core/src/view/cbi/ucisection.htm +++ /dev/null @@ -1,20 +0,0 @@ -<% self:render_children(section, scope or {}) %> - <% if #self.optionals[section] > 0 or self.dynamic then %> - <div class="cbi-optionals"> - <% if self.dynamic then %> - <input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" /> - <% else %> - <select name="cbi.opt.<%=self.config%>.<%=section%>"> - <option><%:cbi_addopt -- Feld --%></option> - <% for key, val in pairs(self.optionals[section]) do %> - <option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option> - <% end %> - </select> - <script type="text/javascript"><% for key, val in pairs(self.optionals[section]) do %> - <% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..val.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %><% end %> - <% end %></script> - <% end %> - <input type="submit" value="<%:add hinzufügen%>" /> - </div> - <% end %>
\ No newline at end of file diff --git a/core/src/view/cbi/value.htm b/core/src/view/cbi/value.htm deleted file mode 100644 index 31bf38f77..000000000 --- a/core/src/view/cbi/value.htm +++ /dev/null @@ -1,3 +0,0 @@ -<%+cbi/valueheader%> - <input type="text" onchange="cbi_d_update(this.id)" <% if self.size then %>size="<%=self.size%>" <% end %><% if self.maxlength then %>maxlength="<%=self.maxlength%>" <% end %>name="cbid.<%=self.config.."."..section.."."..self.option%>" id="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=self:cfgvalue(section)%>" /> -<%+cbi/valuefooter%> diff --git a/core/src/view/cbi/valuefooter.htm b/core/src/view/cbi/valuefooter.htm deleted file mode 100644 index bc9d1b127..000000000 --- a/core/src/view/cbi/valuefooter.htm +++ /dev/null @@ -1,5 +0,0 @@ -<% if valuefooter then - include(valuefooter) -else - include("cbi/full_valuefooter") -end %>
\ No newline at end of file diff --git a/core/src/view/cbi/valueheader.htm b/core/src/view/cbi/valueheader.htm deleted file mode 100644 index 8d9802f57..000000000 --- a/core/src/view/cbi/valueheader.htm +++ /dev/null @@ -1,5 +0,0 @@ -<% if valueheader then - include(valueheader) -else - include("cbi/full_valueheader") -end %>
\ No newline at end of file diff --git a/core/src/view/error404.htm b/core/src/view/error404.htm deleted file mode 100644 index 60daee2cb..000000000 --- a/core/src/view/error404.htm +++ /dev/null @@ -1,5 +0,0 @@ -<%+header%> -<h1>404 Not Found</h1> -<p>Sorry, the object you requested was not found.</p> -<tt>Unable to dispatch: <%=luci.http.env.PATH_INFO%></tt> -<%+footer%>
\ No newline at end of file diff --git a/core/src/view/error500.htm b/core/src/view/error500.htm deleted file mode 100644 index 8af22e8f2..000000000 --- a/core/src/view/error500.htm +++ /dev/null @@ -1,5 +0,0 @@ -<%+header%> -<h1>500 Internal Server Error</h1> -<p>Sorry, the server encountered an unexpected error.</p> -<tt><%=message%></tt> -<%+footer%>
\ No newline at end of file diff --git a/core/src/view/footer.htm b/core/src/view/footer.htm deleted file mode 100644 index c8506ac5c..000000000 --- a/core/src/view/footer.htm +++ /dev/null @@ -1,7 +0,0 @@ - </div> - <div class="clear"></div> -</div></div> - -<div class="separator magenta bold"><a href="http://luci.freifunk-halle.net"><%=require("luci").__appname__ .. " " .. luci.__version__%> - Lua Configuration Interface</a></div> -</body> -</html>
\ No newline at end of file diff --git a/core/src/view/header.htm b/core/src/view/header.htm deleted file mode 100644 index 5f876781f..000000000 --- a/core/src/view/header.htm +++ /dev/null @@ -1,137 +0,0 @@ -<% -require("luci.sys") -local load1, load5, load15 = luci.sys.loadavg() - -local request = require("luci.dispatcher").request -local category = request[1] -local tree = luci.dispatcher.node() -local cattree = category and luci.dispatcher.node(category) -local node = luci.dispatcher.dispatched - -local c = tree -for i,r in ipairs(request) do - if c.nodes and c.nodes[r] then - c = c.nodes[r] - c._menu_selected = true - end -end - -require("luci.i18n").loadc("default") - -require("luci.http").prepare_content("text/html") -%><?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" /> - <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %> - <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" /> - <meta http-equiv="content-script-type" content="text/javascript" /> - <title>LuCI - Lua Configuration Interface</title> -</head> -<body> -<div id="header"> - <div class="headerlogo left"><img src="<%=media%>/logo.png" alt="<%=luci.config.brand.title%>" /></div> - <div class="whitetext smalltext right"> - <%=luci.config.brand.firmware%><br /> - <%=luci.config.brand.distro%><br /> - <%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br /> - <%:hostname Hostname%>: <%=luci.sys.hostname()%> - </div> - <div> - <span class="headertitle"><%=luci.config.brand.title%></span><br /> - <span class="whitetext bold"><%=luci.config.brand.subtitle%></span> - </div> -</div> - -<div class="separator yellow bold"> -<%:path Pfad%>: <% -local c = tree -local url = controller -for k,v in pairs(request) do - if c.nodes and c.nodes[v] then - c = c.nodes[v] - url = url .. "/" .. v - %><a href="<%=url%>"><%=c.title or v%></a> <% if k ~= #request then %>» <% end - end -end -%> -</div> - -<div id="columns"><div id="columnswrapper"> - <div class="sidebar left"> -<% -local function submenu(prefix, node) - if not node._menu_selected or not node.nodes then - return false - end - local index = {} - for k, n in pairs(node.nodes) do - table.insert(index, {name=k, order=n.order or 100}) - end - - table.sort(index, function(a, b) return a.order < b.order end) -%> - <ul> - <% for j, v in pairs(index) do - local nnode = node.nodes[v.name]%> - <li> - <span<% if nnode._menu_selected then %> class="yellowtext"<%end%>><a href="<%=controller .. prefix .. v.name%>"><%=nnode.title%></a></span> - <% submenu(prefix .. v.name .. "/", nnode) %> - </li> - <% end %> - </ul> -<% -end - -if cattree and cattree.nodes then - local index = {} - for k, node in pairs(cattree.nodes) do - table.insert(index, {name=k, order=node.order or 100}) - end - - table.sort(index, function(a, b) return a.order < b.order end) - - for i, k in ipairs(index) do - node = cattree.nodes[k.name] - if node.title then %> - <div<% if node._menu_selected then %> class="yellowtext"<%end%>><a href="<%=controller%>/<%=category%>/<%=k.name%>"><%=node.title%></a> - <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> - </div> -<% end - end -end -%> - </div> - <div class="sidebar right"> - <div><%:webif Weboberfläche%> - <ul><% - for k,node in pairs(tree.nodes) do - if node.title then %> - <li<% if request[1] == k then %> class="yellowtext"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li> -<% end - end%> - </ul> - </div> - <% - if "admin" == request[1] then - require("luci.model.uci") - local ucic = luci.model.uci.changes() - if ucic then - ucic = #luci.util.split(ucic) - end - %> - <div><%:config Konfiguration%> - <ul> - <% if ucic then %> - <li><a href="<%=controller%>/admin/uci/changes"><%:changes Änderungen%>: <%=ucic%></a></li> - <li><a href="<%=controller%>/admin/uci/apply"><%:apply Anwenden%></a></li> - <li><a href="<%=controller%>/admin/uci/revert"><%:revert Verwerfen%></a></li> - <% else %> - <li><%:changes Änderungen%>: 0</li> - <% end %> - </ul> - </div> - <% end %> - </div> - <div id="content">
\ No newline at end of file |