vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-28 23:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Partially fixes external link prot in ntopng (#6626)

Browse source
This commit is contained in:
MatteoBiscosi 2022-05-27 13:04:54 +02:00
parent f7cf547a65
commit ee96f77bac
3 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

40
scripts/lua/modules/lua_utils.lua
View file

@ -5274,26 +5274,6 @@ end
-- ##############################################
-- @brief This function format the info field used in tables
-- @params info: A string containing the info field
-- no_html: A boolean, true if no_html is requested (e.g. Download in CSV format),
-- false otherwise
-- @return A string containing the info field formatted
function format_info_field(info, no_html, proto)
local info_field = info
proto = ternary(((proto) and (proto == 'http')), 'http', 'https')
if no_html == false then
if not isEmptyString(info) then
info_field = i18n("external_link_url", { proto = proto, url = info, url_name = info})
end
end
return info_field
end
-- ##############################################
-- @brief This function, given an IP and a vlan return the concat of host@vlan
-- @params host_ip: A string containing the IP
-- vlan: A string or a number containing the vlan id
@ -5326,6 +5306,26 @@ end
-- ##############################################
-- @brief This function format the info field used in tables
-- @params info: A string containing the info field
-- no_html: A boolean, true if no_html is requested (e.g. Download in CSV format),
-- false otherwise
-- @return A string containing the info field formatted
function format_external_link(url, name, no_html, proto)
local info_field = info
proto = ternary(((proto) and (proto == 'http')), 'http', 'https')
if no_html == false then
if not isEmptyString(info) then
info_field = i18n("external_link_url", { proto = proto, url = url, url_name = name})
end
end
return info_field
end
-- ##############################################
--
-- IMPORTANT
-- Leave it at the end so it can use the functions