X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/b6e2318111ec35ec2015ddf17679dd31270d77cb..6aa0cd21ab8b74949d95d375e22dae72a9f35b8c:/webbw.mlt

diff --git a/webbw.mlt b/webbw.mlt
index 95a8591..272a281 100644
--- a/webbw.mlt
+++ b/webbw.mlt
@@ -1,6 +1,6 @@
 <% @header [("title", ["Web usage stats"])] %>
 
-<b><u>Web virtual host bandwidth</u></b> (bandwidth usage of Apache sites in this calendar month)<br>
+<b><u>Web virtual host bandwidth</u></b> (bandwidth usage of Apache sites <% case $"last" of "1" => "last month" | "2" => "two months ago" | _ => "this calendar month" %>)<br>
 <% if $"last" = "1" then %>
 	<a href="webbw?last=2">[Previous]</a> | <a href="webbw?last=0">[Current]</a>
 <% elseif $"last" = "2" then %>
@@ -10,18 +10,18 @@
 <% end %>
 <br><br>
 
-<% val (sum, doms, groups) = iff $"last" = "" then
+<% val stats = iff $"last" = "" then
 			Stats.getWebbw 0
 		else	
 			Stats.getWebbw (Web.stoi ($"last")) %>
 
 <table>
 <tr><td></td><td><b>Bandwidth (kB)</b></td></tr>
-<tr><td align="right"><b>Total Apache bandwidth</b></td> <td><% sum %></td></tr>
+<tr><td align="right"><b>Total Apache bandwidth</b></td> <td><% #total stats %></td></tr>
 <tr><td>&nbsp;</td></tr>
 
-<% foreach (d, n) in doms do %>
-	<tr><td align="right"><a href="<% if #ssl d then %>https<% else %>http<% end %>://<% #hostname d %>/"><% #hostname d %></a> <a href="/webalizer/<% #id d %>/">[detail]</a></td><td><% n %></td></tr>
+<% foreach dom in #vhosts stats do %>
+	<tr><td align="right"><a href="<% if #ssl (#host dom) then %>https<% else %>http<% end %>://<% #hostname (#host dom) %>/"><% #hostname (#host dom) %><% if #ssl (#host dom) then %> (SSL)<% end %></a> <a href="/webalizer/<% #id (#host dom) %>/">[detail]</a></td><td><% #size dom %></td></tr>
 <% end %>
 
 </table>
@@ -34,12 +34,12 @@
 <tr><td></td><td></td><td><b>Bandwidth (kB)</b></td></tr>
 <tr><td>&nbsp;</td></tr>
 
-<% foreach (gr, ds, n) in groups do %>
-	<tr><td align="right"><% gr %></td><td>
-	<% foreach dom in ds do %>
-		[<a href="/webalizer/<% #id dom %>/"><% #hostname dom %></a> <a href="<% if #ssl dom then %>https<% else %>http<% end %>://<% #hostname dom %>/">(S)</a>]
+<% foreach group in #users stats do %>
+	<tr><td align="right"><% #user group %></td><td>
+	<% foreach dom in #hosts group do %>
+		[<a href="/webalizer/<% #id dom %>/"><% #hostname dom %><% if #ssl dom then %> (SSL)<% end %></a> <a href="<% if #ssl dom then %>https<% else %>http<% end %>://<% #hostname dom %>/">(S)</a>]
 	<% end %>
-	</td><td><% n %></td></tr>
+	</td><td><% #size group %></td></tr>
 <% end %>
 
 </table>