mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-17 09:46:08 +01:00
Statistics plugin almost done. Needs more testing.
This commit is contained in:
@@ -43,13 +43,13 @@ def urls():
|
||||
include('mailng.extensions.amavis_quarantine.urls'))
|
||||
|
||||
def menu(**kwargs):
|
||||
if kwargs["target"] != "user_menu_box":
|
||||
return []
|
||||
return [
|
||||
{"name" : _("Quarantine"),
|
||||
"url" : reverse(index),
|
||||
"img" : "/static/pics/quarantine.png"}
|
||||
]
|
||||
if kwargs["target"] == "user_menu_box":
|
||||
return [
|
||||
{"name" : _("Quarantine"),
|
||||
"url" : reverse(index),
|
||||
"img" : "/static/pics/quarantine.png"}
|
||||
]
|
||||
return []
|
||||
|
||||
def lookup(*args):
|
||||
filter = ""
|
||||
|
||||
+46
-29
@@ -4,19 +4,48 @@ import os
|
||||
import time
|
||||
import datetime
|
||||
import rrdtool
|
||||
from django.utils.translation import ugettext as _
|
||||
from mailng.lib import getoption
|
||||
|
||||
default_avg_template = {
|
||||
traffic_avg_template = {
|
||||
'name' : 'traffic',
|
||||
'width' : '540',
|
||||
'height' : '100',
|
||||
'title' : 'average message flow per minute',
|
||||
'vertlabel' : 'msgs/min',
|
||||
'cf' : 'AVERAGE',
|
||||
'vars' : {
|
||||
'sent' : { "type" : "AREA", "color" : "#00FF00", "legend" : "sent messages" },
|
||||
'recv' : { "type" : "AREA", "color" : "#0000FF", "legend" : "received messages" },
|
||||
# 'bounced' : { "color" : "#FFFF00", "legend" : "bounced messages" },
|
||||
# 'reject' : { "color" : "#FF0000", "legend" : "rejected messages" },
|
||||
'sent' : { "type" : "AREA", "color" : "#00FF00",
|
||||
"legend" : _("sent messages") },
|
||||
'recv' : { "type" : "AREA", "color" : "#0000FF",
|
||||
"legend" : _("received messages") },
|
||||
}
|
||||
}
|
||||
|
||||
badtraffic_avg_template = {
|
||||
'name' : 'badtraffic',
|
||||
'width' : '540',
|
||||
'height' : '100',
|
||||
'vertlabel' : _('msgs/min'),
|
||||
'cf' : 'AVERAGE',
|
||||
'vars' : {
|
||||
'bounced' : { "type" : "AREA", "color" : "#FFFF00",
|
||||
"legend" : _("bounced messages") },
|
||||
'reject' : { "type" : "AREA", "color" : "#FF0000",
|
||||
"legend" : _("rejected messages") },
|
||||
}
|
||||
}
|
||||
|
||||
size_avg_template = {
|
||||
'name' : 'size',
|
||||
'width' : '540',
|
||||
'height' : '100',
|
||||
'vertlabel' : _('bytes/min'),
|
||||
'cf' : 'AVERAGE',
|
||||
'vars' : {
|
||||
'size_recv' : { "type" : "AREA", "color" : "#FF9900",
|
||||
"legend" : _("received size") },
|
||||
'size_sent' : { "type" : "AREA", "color" : "#339999",
|
||||
"legend" : _("sent size") },
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,12 +54,13 @@ class Grapher(object):
|
||||
self.rrd_rootdir = getoption("RRD_ROOTDIR", "/tmp")
|
||||
self.img_rootdir = getoption("IMG_ROOTDIR", "/tmp")
|
||||
|
||||
def process(self, target, suffix, start, end, tpl=default_avg_template):
|
||||
def process(self, target, suffix, start, end, tpl=traffic_avg_template):
|
||||
rrdfile = "%s/%s.rrd" % (self.rrd_rootdir, target)
|
||||
if not os.path.exists(rrdfile):
|
||||
return
|
||||
ext = "png"
|
||||
path = "%s/%s_%s_%s.%s" % (self.img_rootdir, target, tpl['cf'], suffix, ext)
|
||||
path = "%s/%s_%s_%s_%s.%s" % (self.img_rootdir, tpl['name'],
|
||||
target, tpl['cf'], suffix, ext)
|
||||
start = str(start)
|
||||
end = str(end)
|
||||
defs = []
|
||||
@@ -39,7 +69,8 @@ class Grapher(object):
|
||||
defs += ['DEF:%s=%s:%s:%s' % (v, rrdfile, v, tpl['cf']),
|
||||
'CDEF:%spm=%s,60,*' % (v, v)]
|
||||
type = d.has_key("type") and d["type"] or "LINE"
|
||||
lines += ["%s:%spm%s:%s" % (type, v, d["color"], d["legend"])]
|
||||
lines += ["%s:%spm%s:%s" % (type, v, d["color"],
|
||||
d["legend"].encode("utf-8"))]
|
||||
params = defs + lines
|
||||
rrdtool.graph(path,
|
||||
"--imgformat", "PNG",
|
||||
@@ -47,30 +78,16 @@ class Grapher(object):
|
||||
"--height", tpl["height"],
|
||||
"--start", start,
|
||||
"--end", end,
|
||||
"--vertical-label", tpl["vertlabel"],
|
||||
"--title", tpl["title"],
|
||||
"--vertical-label", tpl["vertlabel"].encode("utf-8"),
|
||||
"--lower-limit", "0",
|
||||
"--slope-mode",
|
||||
*params)
|
||||
|
||||
def make_defaults(self, target):
|
||||
#now = int(time.time())
|
||||
#start = now - (now % 86400)
|
||||
#end = start + 86400
|
||||
def make_defaults(self, target, tpl=traffic_avg_template):
|
||||
end = "now"
|
||||
self.process(target, "day", "-1day", end)
|
||||
|
||||
#today = datetime.date.today()
|
||||
#day = today.day - today.weekday()
|
||||
#weekbegin = datetime.date(today.year, today.month, day)
|
||||
#start = weekbegin.strftime("%Y%m%d")
|
||||
#end = "+1week"
|
||||
self.process(target, "week", "-1week", end)
|
||||
|
||||
# monthbegin = datetime.date(today.year, today.month, 1)
|
||||
# start = monthbegin.strftime("%Y%m%d")
|
||||
# end = "+1month"
|
||||
self.process(target, "month", "-1month", end)
|
||||
self.process(target, "year", "-1year", end)
|
||||
self.process(target, "day", "-1day", end, tpl)
|
||||
self.process(target, "week", "-1week", end, tpl)
|
||||
self.process(target, "month", "-1month", end, tpl)
|
||||
self.process(target, "year", "-1year", end, tpl)
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import sys
|
||||
import os
|
||||
import re
|
||||
import rrdtool
|
||||
import string
|
||||
from optparse import OptionParser
|
||||
from mailng.lib import getoption
|
||||
from mailng.admin.models import Domain
|
||||
@@ -19,6 +20,8 @@ Postfix log parser.
|
||||
rrdstep = 60
|
||||
xpoints = 540
|
||||
points_per_sample = 3
|
||||
variables = ["sent", "recv", "bounced", "reject", "spam", "virus",
|
||||
"size_sent", "size_recv"]
|
||||
|
||||
class LogParser(object):
|
||||
def __init__(self, logfile, workdir,
|
||||
@@ -86,7 +89,7 @@ class LogParser(object):
|
||||
|
||||
# Set up data sources for our RRD
|
||||
params = []
|
||||
for v in ["sent", "recv", "bounced", "reject"]:
|
||||
for v in variables:
|
||||
params += ['DS:%s:%s:%s:0:U' % (v, ds_type, rrdstep * 2)]
|
||||
|
||||
# Set up RRD to archive data
|
||||
@@ -125,39 +128,54 @@ class LogParser(object):
|
||||
print "[rrd] VERBOSE events at %s already recorded in RRD" %m
|
||||
return False
|
||||
|
||||
tpl = ""
|
||||
for v in variables:
|
||||
if tpl != "":
|
||||
tpl += ":"
|
||||
tpl += v
|
||||
# Missing some RRD steps
|
||||
# Est ce vraiment nécessaire... ?
|
||||
if m > self.lupdates[fname] + rrdstep:
|
||||
values = ""
|
||||
for v in variables:
|
||||
if values != "": values += ":"
|
||||
values += "0"
|
||||
for p in range(self.lupdates[fname] + rrdstep, m, rrdstep):
|
||||
if self.verbose:
|
||||
print "[rrd] VERBOSE update %s:%s:%s:%s:%s (SKIP)" \
|
||||
%(p,'0','0','0','0')
|
||||
rrdtool.update(fname, "%s:%s:%s:%s:%s" \
|
||||
% (p, '0', '0', '0', '0'))
|
||||
rrdtool.update(fname, "-t", tpl, "%s:%s" % (p, values))
|
||||
|
||||
if self.verbose:
|
||||
print "[rrd] VERBOSE update %s:%s:%s:%s:%s" \
|
||||
%(m, self.data[dom][m]['sent'], self.data[dom][m]['recv'],\
|
||||
self.data[dom][m]['bounced'], self.data[dom][m]['reject'])
|
||||
|
||||
rrdtool.update(fname, "%s:%s:%s:%s:%s" \
|
||||
% (m, self.data[dom][m]['sent'],
|
||||
self.data[dom][m]['recv'],
|
||||
self.data[dom][m]['bounced'],
|
||||
self.data[dom][m]['reject']))
|
||||
values = "%s" % m
|
||||
tpl = ""
|
||||
for v in variables:
|
||||
values += ":"
|
||||
values += str(self.data[dom][m][v])
|
||||
if tpl != "":
|
||||
tpl += ":"
|
||||
tpl += v
|
||||
rrdtool.update(fname, "-t", tpl, values)
|
||||
self.lupdates[fname] = m
|
||||
return True
|
||||
|
||||
def inc_counter(self, dom, cur_t, counter):
|
||||
def initcounters(self, dom, cur_t):
|
||||
init = {}
|
||||
for v in variables: init[v] = 0
|
||||
self.data[dom][cur_t] = init
|
||||
|
||||
def inc_counter(self, dom, cur_t, counter, val=1):
|
||||
if not self.data[dom].has_key(cur_t):
|
||||
self.data[dom][cur_t] = \
|
||||
{'sent' : 0, 'recv' : 0, 'bounced' : 0, 'reject' : 0}
|
||||
self.data[dom][cur_t][counter] += 1
|
||||
self.initcounters(dom, cur_t)
|
||||
self.data[dom][cur_t][counter] += val
|
||||
|
||||
if not self.data["global"].has_key(cur_t):
|
||||
self.data["global"][cur_t] = \
|
||||
{'sent' : 0, 'recv' : 0, 'bounced' : 0, 'reject' : 0}
|
||||
self.data["global"][cur_t][counter] += 1
|
||||
self.initcounters("global", cur_t)
|
||||
self.data["global"][cur_t][counter] += val
|
||||
|
||||
def process(self):
|
||||
for line in self.f.readlines():
|
||||
@@ -170,9 +188,10 @@ class LogParser(object):
|
||||
cur_t = self.str2Time(self.year, mo, da, ho, mi, se)
|
||||
cur_t = cur_t - cur_t % rrdstep
|
||||
|
||||
m = re.search("(\w{10}): from=<(.*)>", log)
|
||||
m = re.search("(\w{10}): from=<(.*)>, size=(\d+)", log)
|
||||
if m:
|
||||
self.workdict[m.group(1)] = {'from' : m.group(2)}
|
||||
self.workdict[m.group(1)] = {'from' : m.group(2),
|
||||
'size' : string.atoi(m.group(3))}
|
||||
continue
|
||||
|
||||
m = re.search("(\w{10}): to=<(.*)>.*status=(\S+)", log)
|
||||
@@ -183,10 +202,14 @@ class LogParser(object):
|
||||
addrfrom = re.match("([^@]+)@(.+)", self.workdict[m.group(1)]['from'])
|
||||
if addrfrom and addrfrom.group(2) in self.domains:
|
||||
self.inc_counter(addrfrom.group(2), cur_t, 'sent')
|
||||
self.inc_counter(addrfrom.group(2), cur_t, 'size_sent',
|
||||
self.workdict[m.group(1)]['size'])
|
||||
addrto = re.match("([^@]+)@(.+)", m.group(2))
|
||||
if addrto.group(2) in self.domains:
|
||||
if m.group(3) == "sent":
|
||||
self.inc_counter(addrto.group(2), cur_t, 'recv')
|
||||
self.inc_counter(addrto.group(2), cur_t, 'size_recv',
|
||||
self.workdict[m.group(1)]['size'])
|
||||
else:
|
||||
self.inc_counter(addrto.group(2), cur_t, m.group(3))
|
||||
continue
|
||||
@@ -205,7 +228,10 @@ class LogParser(object):
|
||||
sortedData = [ (i, data[i]) for i in sorted(data.keys()) ]
|
||||
for t, dict in sortedData:
|
||||
self.update_rrd(dom, t)
|
||||
G.make_defaults(dom)
|
||||
|
||||
G.make_defaults(dom, tpl=grapher.traffic_avg_template)
|
||||
G.make_defaults(dom, tpl=grapher.badtraffic_avg_template)
|
||||
G.make_defaults(dom, tpl=grapher.size_avg_template)
|
||||
|
||||
if __name__ == "__main__":
|
||||
log_file = getoption("LOGFILE", "/var/log/maillog")
|
||||
|
||||
+41
-31
@@ -11,38 +11,36 @@ from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.conf.urls.defaults import *
|
||||
from mailng.lib import events, _render
|
||||
from mailng.admin.views import is_superuser
|
||||
from mailng.admin.views import good_domain
|
||||
from mailng.admin.models import Domain, Mailbox
|
||||
#from mailng.extensions.stats.mailrrd import parser
|
||||
from django.contrib.auth.decorators \
|
||||
import login_required
|
||||
import pdb
|
||||
import login_required, user_passes_test, permission_required
|
||||
|
||||
graph_nature = ["sent_recv","boun_reje"]
|
||||
graph_types = ["AVERAGE","MAX"]
|
||||
tmp_path = "static/tmp"
|
||||
graph_types = ['AVERAGE', 'MAX']
|
||||
|
||||
def init():
|
||||
events.register("AdminMenuDisplay", menu)
|
||||
events.register("AdminMenuDisplay", menu)
|
||||
|
||||
def urls():
|
||||
return (r'^mailng/stats/',
|
||||
include('mailng.extensions.stats.urls'))
|
||||
|
||||
|
||||
def menu(**kwargs):
|
||||
print kwargs
|
||||
domain_id = kwargs['domain']
|
||||
if kwargs["target"] == "admin_menu_bar":
|
||||
domain_id = kwargs['domain']
|
||||
return [
|
||||
{"label" : _("Statistics"),
|
||||
"name" : "stats",
|
||||
"url" : reverse('domindex', args=[domain_id]),
|
||||
"img" : "/static/pics/graph.png"}
|
||||
]
|
||||
else:
|
||||
return []
|
||||
|
||||
if kwargs["target"] == "admin_menu_box":
|
||||
return [
|
||||
{"name" : _("Statistics"),
|
||||
"url" : reverse('fullindex'),
|
||||
"img" : "/static/pics/graph.png"}
|
||||
]
|
||||
return []
|
||||
|
||||
@login_required
|
||||
def domain(request,dom_id):
|
||||
@@ -82,26 +80,38 @@ def graph_display(request,dom_id,graph_t=graph_types):
|
||||
"domain":domain,"domains" : domains, "messages" : errors ,
|
||||
"types" : graph_type, "tmp_path" : tmp_path})
|
||||
|
||||
@login_required
|
||||
@user_passes_test(lambda u: u.is_superuser)
|
||||
def adminindex(request):
|
||||
period = request.GET.has_key("period") and request.GET["period"] or "day"
|
||||
domain = request.GET.has_key("domain") and request.GET["domain"] or "global"
|
||||
if domain != "global":
|
||||
domain = Domain.objects.get(pk=domain)
|
||||
domain = domain.name
|
||||
domains = Domain.objects.all()
|
||||
return _render(request, 'stats/adminindex.html', {
|
||||
"domains" : domains, "domain" : domain,
|
||||
"graphs" : {"traffic" : _("Average normal traffic"),
|
||||
"badtraffic" : _("Average bad traffic"),
|
||||
"size" : _("Average normal traffic size")},
|
||||
"periods" : ["day", "week", "month", "year"],
|
||||
"period" : period
|
||||
})
|
||||
|
||||
@login_required
|
||||
@good_domain
|
||||
@permission_required("admin.view_mailboxes")
|
||||
def index(request, dom_id=None):
|
||||
domains = []
|
||||
errors = []
|
||||
domain = None
|
||||
if dom_id:
|
||||
if request.user.has_perm("admin.view_mailboxes"):
|
||||
domain = Domain.objects.get(pk=dom_id)
|
||||
if domain:
|
||||
domains.append(domain)
|
||||
else:
|
||||
print "pas de dom"
|
||||
else:
|
||||
domains = Domain.objects.all()
|
||||
period = request.GET.has_key("period") and request.GET["period"] or "day"
|
||||
if request.user.has_perm("admin.view_mailboxes"):
|
||||
domain = Domain.objects.get(pk=dom_id)
|
||||
|
||||
if domains == []:
|
||||
errors.append(_("No Domain defined"))
|
||||
return _render(request, 'stats/index.html', {
|
||||
"page" : "Statistics",
|
||||
"domain" : domain, "domains": domains, "messages" : errors ,
|
||||
"periods" : ["day", "week", "month", "year"]
|
||||
})
|
||||
"domain" : domain,
|
||||
"graphs" : {"traffic" : _("Average normal traffic"),
|
||||
"badtraffic" : _("Average bad traffic"),
|
||||
"size" : _("Average normal traffic size")},
|
||||
"periods" : ["day", "week", "month", "year"],
|
||||
"period" : period
|
||||
})
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{% extends "layout.html" %}
|
||||
{% load i18n %}
|
||||
{% load stats_extra %}
|
||||
{% block html_head %}
|
||||
<script src="/static/js/mootools-more.js" type="text/javascript"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/static/stylesheets/box.css" />
|
||||
<style type="text/css">
|
||||
#graphcontent {
|
||||
margin: 25px auto 10px;
|
||||
width:90%;
|
||||
}
|
||||
|
||||
#selectors {
|
||||
float: right;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
window.addEvent("domready", function() {
|
||||
$("period").addEvent("change", function(event) {
|
||||
{% url extensions.stats.main.adminindex as stats_url %}
|
||||
location.href = "{{ stats_url }}" + "?period=" + $("period").value;
|
||||
});
|
||||
$("domain").addEvent("change", function(event) {
|
||||
{% url extensions.stats.main.adminindex as stats_url %}
|
||||
location.href = "{{ stats_url }}" + "?domain=" + $("domain").value;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
{% block middletitle %}{% trans "Global statistics" %}{% endblock %}
|
||||
{% block content %}
|
||||
<div id="graphcontent">
|
||||
<div id="selectors">
|
||||
<label for="domain">{% trans "Domain:" %}</label>
|
||||
<select id="domain" name="domain">
|
||||
<option value="global" {% ifequal domain "global" %}selected{% endifequal %}>{% trans "Global" %}</option>
|
||||
{% for d in domains %}
|
||||
<option value="{{ d.id }}" {% ifequal d.name domain %}selected{% endifequal %}>{{ d.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
||||
<label for="period">{% trans "Period:" %}</label>
|
||||
<select id="period" name="period">
|
||||
{% for p in periods %}
|
||||
<option value="{{ p }}" {% ifequal p period %}selected{% endifequal %}>{% getLabel p %}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
{% include "stats/graphs.html" %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,6 @@
|
||||
{% load i18n %}
|
||||
{% for g, title in graphs.items %}
|
||||
<h3>{{ title }}</h3>
|
||||
<p><img src="/static/graphs/{{ g }}_{{ domain }}_AVERAGE_{{ period }}.png"
|
||||
alt="{% trans 'No statistics available' %}" /></p>
|
||||
{% endfor %}
|
||||
@@ -1,34 +1,21 @@
|
||||
{% extends "layout.html" %}
|
||||
{% extends "admin/domain_header.html" %}
|
||||
{% load i18n %}
|
||||
{% block html_head %}
|
||||
<script src="/static/js/mootools-more.js" type="text/javascript"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/static/stylesheets/box.css" />
|
||||
<style type="text/css">
|
||||
form {
|
||||
margin: 0 auto;
|
||||
width: 98%;
|
||||
#selectors {
|
||||
float: right;
|
||||
}
|
||||
|
||||
td {
|
||||
font-size: smaller;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
errors {
|
||||
text-align: center;
|
||||
width: 100%;
|
||||
margin: 20px 20px;
|
||||
color: red;
|
||||
}
|
||||
|
||||
#graphcontent {
|
||||
margin:60px auto 10px;
|
||||
width:90%;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
window.addEvent("domready", function() {
|
||||
$("period").addEvent("change", function(event) {
|
||||
{% url extensions.stats.main.index domain.id as stats_url %}
|
||||
location.href = "{{ stats_url }}" + "?period=" + $("period").value;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -38,45 +25,15 @@
|
||||
{% domain_menu domain.id "stats" perms %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block middletitle %}
|
||||
{% if domain %}
|
||||
{% trans "Statistics for" %} {{ domain.name }}
|
||||
{% else %}
|
||||
{% trans "Global statistics" %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div id="graphcontent">
|
||||
<table>
|
||||
{% if domain %}
|
||||
{% for p in periods %}
|
||||
<tr>
|
||||
<td>
|
||||
<img src="/static/graphs/{{ domain.name }}_AVERAGE_{{ p }}.png" alt="No statistics available" />
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{% if domains %}
|
||||
<tr>
|
||||
<th width="50px">{% trans "Graph type" %}</th>
|
||||
<th width="80px">{% trans "Domain name" %}</th>
|
||||
</tr>
|
||||
|
||||
{% for dom in domains %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>
|
||||
{% for t in types %}
|
||||
{% url extensions.stats.main.graph_display dom.id,t as graphurl %}
|
||||
<a name="loadGraph" href="{{ graphurl }}">{{ t|lower }} </a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
{% url extensions.stats.main.domain dom.id as domurl %}
|
||||
<td><a name="loadDom" href="{{ domurl }}">{{ dom.name }}</a></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</table>
|
||||
{% block domcontent %}
|
||||
<div id="selectors">
|
||||
<label for="period">{% trans "Period:" %}</label>
|
||||
<select id="period" name="period">
|
||||
{% for p in periods %}
|
||||
<option value="{{ p }}" {% ifequal p period %}selected{% endifequal %}>{{ p }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
{% include "stats/graphs.html" %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
from django import template
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
register = template.Library()
|
||||
|
||||
@register.simple_tag
|
||||
def getLabel(var):
|
||||
labels = {
|
||||
"day" : _("Day"),
|
||||
"week" : _("Week"),
|
||||
"month" : _("Month"),
|
||||
"year" : _("Year")
|
||||
}
|
||||
return labels.has_key(var) and labels[var] or var
|
||||
@@ -1,7 +1,7 @@
|
||||
from django.conf.urls.defaults import *
|
||||
|
||||
urlpatterns = patterns('mailng.extensions.stats.main',
|
||||
url(r'^$', 'index', name='fullindex'),
|
||||
url(r'^$', 'adminindex', name='fullindex'),
|
||||
url(r'^(?P<dom_id>\d+)/$', 'index', name='domindex'),
|
||||
(r'^display/(?P<dom_id>\d+)/(?P<graph_t>\w+)/$', 'graph_display'),
|
||||
(r'^domain/(?P<dom_id>\d+)/$', 'domain'),
|
||||
|
||||
Reference in New Issue
Block a user