# HG changeset patch # User Thilo Cestonaro # Date 1259793666 -3600 # Node ID dc0fe152cadc52460c7c47ae3a01dc9ec225c598 # Parent 0491aa849c91ee891f5f0f6092b5be5b18ae663e mod_muc_log_http: show only months where log is actually available diff -r 0491aa849c91 -r dc0fe152cadc mod_muc_log_http/mod_muc_log_http.lua --- a/mod_muc_log_http/mod_muc_log_http.lua Wed Dec 02 23:07:58 2009 +0100 +++ b/mod_muc_log_http/mod_muc_log_http.lua Wed Dec 02 23:41:06 2009 +0100 @@ -285,6 +285,7 @@ local weekDays = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; local weekDay = 0; local weeks = 1; + local logAvailableForMinimumOneDay = false; local weekDaysHtml = ""; for _, tmp in ipairs(weekDays) do @@ -307,10 +308,15 @@ end end if i < days + 1 then - tmp = tostring(i); + local tmp = tostring(""..tostring(i)..""); if dayCallback ~= nil and dayCallback.callback ~= nil then tmp = dayCallback.callback(dayCallback.path, i, month, year); end + if tmp == nil then + tmp = tostring(""..tostring(i)..""); + else + logAvailableForMinimumOneDay = true; + end htmlStr = htmlStr .. html.month.day:gsub("###DAY###", tmp) .. "\n"; end @@ -345,19 +351,25 @@ end end htmlStr = htmlStr .. html.month.footer; - return htmlStr; + if logAvailableForMinimumOneDay then + return htmlStr; + end end local function createYear(year, dayCallback) local year = year; + local tmp; if tonumber(year) <= 99 then year = year + 2000; end local htmlStr = "
" .. html.year.title:gsub("###YEAR###", tostring(year)); for i=1, 12 do - htmlStr = htmlStr .. "
\n" .. createMonth(i, year, dayCallback) .. "
\n"; + tmp = createMonth(i, year, dayCallback); + if tmp then + htmlStr = htmlStr .. "
\n" .. tmp .. "
\n"; + end end - return htmlStr .. "
\n"; + return htmlStr .. "

\n"; end local function perDayCallback(path, day, month, year) @@ -372,9 +384,8 @@ s = s:gsub("###BARE_DAY###", bareDay); s = s:gsub("###DAY###", day); return s; - else - return tostring(""..day..""); end + return; end local function generateDayListSiteContentByRoom(bareRoomJid)