From 68521fca04e9b2ae801cc2daa4f920a2c43bc03f Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sat, 6 Jul 2019 14:18:15 +0200 Subject: luci-base(-libs): move pcdata() and striptags() from util- to xml-class To complete the previous commit these functions are defined in the resulting luci-base package but are also used in the new luci-base-libs package. So move them into the new xml-module of the new package. Signed-off-by: Sven Roederer --- modules/luci-base/luasrc/xml.lua | 26 ++++++++++++++++++++++++++ modules/luci-base/luasrc/xml.luadoc | 23 +++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 modules/luci-base/luasrc/xml.lua create mode 100644 modules/luci-base/luasrc/xml.luadoc (limited to 'modules/luci-base/luasrc') diff --git a/modules/luci-base/luasrc/xml.lua b/modules/luci-base/luasrc/xml.lua new file mode 100644 index 0000000000..30b37210bd --- /dev/null +++ b/modules/luci-base/luasrc/xml.lua @@ -0,0 +1,26 @@ +-- Copyright 2008 Steven Barth +-- Licensed to the public under the Apache License 2.0. + +local tparser = require "luci.template.parser" +local string = require "string" + +local tostring = tostring + +module "luci.xml" + +-- +-- String and data manipulation routines +-- + +function pcdata(value) + return value and tparser.pcdata(tostring(value)) +end + +function striptags(value) + return value and tparser.striptags(tostring(value)) +end + + +-- also register functions above in the central string class for convenience +string.pcdata = pcdata +string.striptags = striptags diff --git a/modules/luci-base/luasrc/xml.luadoc b/modules/luci-base/luasrc/xml.luadoc new file mode 100644 index 0000000000..58de533966 --- /dev/null +++ b/modules/luci-base/luasrc/xml.luadoc @@ -0,0 +1,23 @@ +---[[ +LuCI utility functions. +]] +module "luci.xml" + +---[[ +Create valid XML PCDATA from given string. + +@class function +@name pcdata +@param value String value containing the data to escape +@return String value containing the escaped data +]] + +---[[ +Strip HTML tags from given string. + +@class function +@name striptags +@param value String containing the HTML text +@return String with HTML tags stripped of +]] + -- cgit v1.2.3