# HG changeset patch # User Waqas Hussain # Date 1311542500 -18000 # Node ID 20ef4a289d7d1c0692329b3b55f1d4c96fa18d2d # Parent 369e665ae4719f9ab48c48fca2c92d53cf57c1ea mod_muc_log_http: Improved page titles a little. diff -r 369e665ae471 -r 20ef4a289d7d mod_muc_log_http/muc_log_http/mod_muc_log_http.lua --- a/mod_muc_log_http/muc_log_http/mod_muc_log_http.lua Mon Jul 25 02:21:40 2011 +0500 +++ b/mod_muc_log_http/muc_log_http/mod_muc_log_http.lua Mon Jul 25 02:21:40 2011 +0500 @@ -69,19 +69,6 @@ return false; end -function createDoc(body) - assert(body, " HTTP response"); - body = body:gsub("%%", "%%%%"); - return html.doc:gsub("###BODY_STUFF###", body); -end - -function urlunescape (escapedUrl) - escapedUrl = escapedUrl:gsub("+", " ") - escapedUrl = escapedUrl:gsub("%%(%x%x)", function(h) return strchar(tonumber(h,16)) end) - escapedUrl = escapedUrl:gsub("\r\n", "\n") - return escapedUrl -end - local function htmlEscape(t) if t then t = t:gsub("<", "<"); @@ -98,6 +85,20 @@ return t; end +function createDoc(body, title) + assert(body, " HTTP response"); + body = body:gsub("%%", "%%%%"); + return html.doc:gsub("###BODY_STUFF###", body) + :gsub("muc_log", ""..(title and htmlEscape(title) or "Chatroom logs")..""); +end + +function urlunescape (escapedUrl) + escapedUrl = escapedUrl:gsub("+", " ") + escapedUrl = escapedUrl:gsub("%%(%x%x)", function(h) return strchar(tonumber(h,16)) end) + escapedUrl = escapedUrl:gsub("\r\n", "\n") + return escapedUrl +end + local function generateComponentListSiteContent() local components = ""; for component,host in pairs(hosts) do @@ -105,7 +106,7 @@ components = components .. html.components.bit:gsub("###COMPONENT###", component); end end - return html.components.body:gsub("###COMPONENTS_STUFF###", components); + return (html.components.body:gsub("###COMPONENTS_STUFF###", components)); end local function generateRoomListSiteContent(component) @@ -117,7 +118,7 @@ rooms = rooms .. html.rooms.bit:gsub("###ROOM###", node):gsub("###COMPONENT###", component); end end - return html.rooms.body:gsub("###ROOMS_STUFF###", rooms):gsub("###COMPONENT###", component); + return html.rooms.body:gsub("###ROOMS_STUFF###", rooms):gsub("###COMPONENT###", component), "Chatroom logs for "..component; end end @@ -320,7 +321,7 @@ tmp = tmp:gsub("###ROOMTOPIC###", topic); tmp = tmp:gsub("###SINCE###", since); tmp = tmp:gsub("###TO###", to); - return tmp:gsub("###JID###", bareRoomJid); + return tmp:gsub("###JID###", bareRoomJid), "Chatroom logs for "..bareRoomJid; end local function parseIqStanza(stanza, timeStuff, nick) @@ -631,7 +632,7 @@ tmp = tmp:gsub("###NEXT_LINK###", nextDay or ""); tmp = tmp:gsub("###PREVIOUS_LINK###", previousDay or ""); - return tmp; + return tmp, "Chatroom logs for "..bareRoomJid.." ("..tostring(os_date("%A, %B %d, %Y", os_time(temptime)))..")"; end end end