+ {% if fs.filters %} +
| {% trans "Actions" %} | +{% trans "Name" %} | +{% trans "Active" %} | +
|---|---|---|
| {% filter_actions fs.name filter forloop.counter forloop.last %} | +{{ filter.name }} | ++ + {{ filter.enabled|yesno }} + + | +
- %s" % content - - def viewmail_html(self, content, **kwargs): - if content is None or content == "": - return (False, "") - links = kwargs.has_key("links") and kwargs["links"] or "0" - html = lxml.html.fromstring(content) - if links == "0": - html.rewrite_links(lambda x: None) - else: - html.rewrite_links(self.map_cid) - body = html.find("body") - if body is None: - body = lxml.html.tostring(html) - else: - body = lxml.html.tostring(body) - body = re.sub("<(/?)body", lambda m: "<%sdiv" % m.group(1), body) - body = Template(body).render(Context({})) - return body - def parse_search_parameters(request): if request.GET.has_key("pattern"): request.session["pattern"] = re.escape(request.GET["pattern"]) diff --git a/lib/emailutils.py b/lib/emailutils.py new file mode 100644 index 000000000..33552c025 --- /dev/null +++ b/lib/emailutils.py @@ -0,0 +1,178 @@ +# coding: utf-8 + +import email +import lxml +from django.template import Template, Context +from django.template.loader import render_to_string +import u2u_decode +from lib import decode + +class EmailAddress(object): + def __init__(self, address): + self.fulladdress = u2u_decode.u2u_decode(address).strip("\r\t\n") + (self.name, self.address) = email.utils.parseaddr(self.fulladdress) + if self.name == "": + self.fulladdress = self.address + + def __str__(self): + return self.fulladdress + +class Email(object): + def __init__(self, msg, mformat="plain", dformat="plain", links="0"): + self.attached_map = {} + self.contents = {"html" : "", "plain" : ""} + self.headers = [] + self.attachments = {} + self.mformat = mformat + self.dformat = dformat + self.links = links + + self.__parse(msg) + + if not self.contents.has_key(mformat) or self.contents[mformat] == "": + # Fallback + self.mformat = mformat == "html" and "plain" or "html" + + self.body = \ + getattr(self, "viewmail_%s" % self.mformat) \ + (self.contents[self.mformat], links=links) + + def __parse_default(self, msg, level): + """Default parser + + All parts handled by this parser will be consireded as + attachments. + """ + fname = msg.get_filename() + if fname is not None: + decoded = decode_header(fname) + value = decoded[0][1] is None and decoded[0][0] \ + or unicode(decoded[0][0], decoded[0][1]) + else: + value = "part_%s" % level + self.attachments[level] = value + + def _parse_text(self, msg, level): + """Displayable content parser + + text, html, calendar, etc. All those contents can be displayed + inside a navigator. + """ + if msg.get_content_subtype() not in ["plain", "html"]: + self.__parse_default(msg, level) + target = "plain" + else: + target = msg.get_content_subtype() + self.contents[target] += decode(msg.get_payload(decode=True), + charset=msg.get_content_charset()) + + def _parse_image(self, msg, level): + """image/* parser + + The only reason to make a specific parser for images is that, + sometimes, messages embark inline images, which means they + must be displayed and not attached. + """ + if self.dformat == "html" and self.links != "0" \ + and msg.has_key("Content-Disposition"): + if msg["Content-Disposition"].startswith("inline"): + cid = None + if msg.has_key("Content-ID"): + m = re.match("<(.+)>", msg["Content-ID"]) + cid = m is not None and m.group(1) or msg["Content-ID"] + fname = msg.get_filename() + if fname is None: + if msg.has_key("Content-Location"): + fname = msg["Content-Location"] + elif cid is not None: + fname = cid + else: + # I give up for now :p + return + self.attached_map[cid] = re.match("^http:", fname) and fname \ + or self.__save_image(fname, msg) + return + self.__parse_default(msg, level) + + def __parse(self, msg, level=None): + """Recursive email parser + + A message structure can be complex. To correctly handle + unknown MIME types, a simple rule is applied : if I don't know + how to display a specific part, it becomes an attachment! If + no name is specified for an attachment, the part number + described in the RFC 3501 (which retrieves BODY sections) is + used to build a file name (like part_1.1). + + :param msg: message (or part) to parse + :param level: current part number + """ + if msg.is_multipart() and msg.get_content_maintype() != "message": + cpt = 1 + for part in msg.get_payload(): + nlevel = level is None and ("%d" % cpt) \ + or "%s.%d" % (level, cpt) + self.__parse(part, nlevel) + cpt += 1 + return + + if level is None: + level = "1" + try: + getattr(self, "_parse_%s" % msg.get_content_maintype())(msg, level) + except AttributeError: + self.__parse_default(msg, level) + + def __save_image(self, fname, part): + """Save an inline image on the filesystem. + + Some HTML messages are using inline images (attached images + with links on them inside the body). In order to display them, + images are saved on the filesystem and links contained in the + message are modified. + + :param fname: the image associated filename + :param part: the email part that contains the image payload + """ + if re.search("\.\.", fname): + return None + path = "/static/tmp/" + fname + fp = open(settings.MODOBOA_DIR + path, "wb") + fp.write(part.get_payload(decode=True)) + fp.close() + return path + + def map_cid(self, url): + import re + + m = re.match(".*cid:(.+)", url) + if m: + if self.attached_map.has_key(m.group(1)): + return self.attached_map[m.group(1)] + return url + + def render_headers(self, **kwargs): + return render_to_string("common/mailheaders.html", { + "headers" : self.headers, + }) + + def viewmail_plain(self, content, **kwargs): + return "
%s" % content + + def viewmail_html(self, content, **kwargs): + if content is None or content == "": + return (False, "") + links = kwargs.has_key("links") and kwargs["links"] or "0" + html = lxml.html.fromstring(content) + if links == "0": + html.rewrite_links(lambda x: None) + else: + html.rewrite_links(self.map_cid) + body = html.find("body") + if body is None: + body = lxml.html.tostring(html) + else: + body = lxml.html.tostring(body) + body = re.sub("<(/?)body", lambda m: "<%sdiv" % m.group(1), body) + body = Template(body).render(Context({})) + return body diff --git a/static/css/box.css b/static/css/box.css index 11eb64575..2cd66ece8 100644 --- a/static/css/box.css +++ b/static/css/box.css @@ -73,7 +73,7 @@ td.even { .title h1 { float: left; - margin: 5px 10px; + margin: 5px; font-size: medium; font-weight: bold; } diff --git a/static/js/anchor_nav.js b/static/js/anchor_nav.js new file mode 100644 index 000000000..c98624711 --- /dev/null +++ b/static/js/anchor_nav.js @@ -0,0 +1,209 @@ +/* + * Class that implements a simple anchor based navigation system for + * AJAX applications. + */ +var AnchorNavigation = new Class({ + Implements: [Options], + + options: { + checkinterval: 300, + defloadingtext: gettext("Loading..."), + defloadingcolor: "gray", + defcallback: null + }, + + initialize: function(deflocation, options) { + this.setOptions(options); + + this.deflocation = deflocation; + this.callbacks = {}; + this.params = $H(); + this.base = ''; + this.serialized = null; + this.reset_loading_infos(); + if (this.options.defcallback) { + this.register_callback("default", this.options.defcallback); + this.ca_id = + this.check_anchor.bind(this).periodical(this.options.checkinterval); + } + }, + + reset_loading_infos: function() { + this.loading_message = this.options.defloadingtext; + this.loading_color = this.options.defloadingcolor; + }, + + reset: function() { + this.base = null; + this.params.empty(); + return this; + }, + + parse_string: function(value, reset) { + var splits = (value.charAt(0) == '#') + ? value.substring(1).split('?') : value.split('?'); + + if (splits.length == 0) { + return this; + } + if (!$defined(reset)) { + reset = false; + } + if (reset) { + this.reset(); + } + this.base = (splits[0] == "") ? this.deflocation : splits[0]; + + var re = new RegExp("/$"); + if (!this.base.match(re)) { + this.base += '/'; + } + if (splits.length > 1) { + var params = splits[1].split('&'); + for (var i = 0; i < params.length; i++) { + var tmp = params[i].split('='); + this.setparam(tmp[0], tmp[1]); + } + } + return this; + }, + + from_string: function(value, reset) { + this.parse_string(value); + this.serialized = value; + return this; + }, + + serialize: function() { + var res = this.base; + + if (this.params.getLength() != 0) { + res += "?" + this.params.toQueryString(); + } + return res; + }, + + update: function(force) { + window.fireEvent("pageRefresh"); + location.hash = this.serialize(); + if ($defined(force)) { + this.force = force; + } + }, + + deleteParam: function(str) { + this.params.erase(str); + }, + + updateparams: function(str) { + if (str.charAt(0) == '?') { + str = str.substring(1); + } + var elems = str.split('&'); + for (var i = 0; i < elems.length; i++) { + this.setparamfromstring(elems[i]); + } + }, + + setparamfromstring: function(str) { + var def = str.split('='); + this.params.set(def[0], def[1]); + }, + + setparam: function(name, value) { + this.params.set(name, value); + return this; + }, + + setparams: function(params) { + this.params.extend(params); + return this; + }, + + getparam: function(name) { + if (!this.params.has(name)) { + return ""; + } + return this.params.get(name); + }, + + baseurl: function(value, noreset) { + if (!$defined(noreset) || noreset == 0) { + this.reset(); + } + this.base = value; + var re = new RegExp("/$"); + if (!this.base.match(re)) { + this.base += '/'; + } + return this; + }, + + addbaseurl: function(value) { + var newbase = this.base + value; + return this.baseurl(newbase); + }, + + getbaseurl: function() { + return this.base.substr(0, this.base.length - 1); + }, + + delparam: function(name) { + if (!this.params.has(name)) { + return false; + } + this.params.erase(name); + return this; + }, + + register_callback: function(name, callback) { + this.callbacks[name] = callback; + }, + + get_callback: function(name) { + return this.callbacks[name]; + }, + + set_default_callback: function(callback) { + this.register_callback("default", callback); + if (!$defined(this.ca_id)) { + this.ca_id = + this.check_anchor.bind(this).periodical(this.options.checkinterval); + } + }, + + check_anchor: function() { + if (this.serialized == location.hash + && !$defined(this.force)) { + return; + } + delete(this.force); + this.from_string(location.hash); + if (!this.serialized) { + location.hash = this.deflocation; + return; + } + + var query = this.serialized.substring(1); + + infobox.show(this.loading_message, { + profile: this.loading_color, + spinner: true + }); + new Request.JSON({ + url: query, + noCache : true, + onSuccess: function(resp) { + var callback = ($defined(resp.callback)) ? resp.callback : "default"; + this.callbacks[callback](resp); + infobox.info(gettext("Done")); + infobox.hide(1); + this.reset_loading_infos(); + }.bind(this), + onFailure: function(xhr) { + $(document.body).set("html", xhr.responseText); + $(document.body).setStyle("overflow", "auto"); + } + }).get(); + } +}); diff --git a/static/js/common.js b/static/js/common.js index b697a0b5d..b5c8214b3 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -9,7 +9,6 @@ window.addEvent('domready', function(){ }); var media_url = ""; -callbacks = {}; /* * A simple function to initialize the value of the global variable @@ -27,202 +26,6 @@ function static_url(value) { return media_url + value; } -function register_callback(name, callback) { - callbacks[name] = callback; -}; - -get_callback = function(name) { - return callbacks[name]; -}; - -/* - * AJAX anchor based navigation - */ -var current_anchor = null; - -function check_anchor() { - if (current_anchor.serialized == location.hash - && !$defined(current_anchor.force)) { - return; - } - delete(current_anchor.force); - current_anchor.from_string(location.hash); - if (!current_anchor.serialized) { - location.hash = current_anchor.deflocation; - return; - } - - var query = current_anchor.serialized.substring(1); - - infobox.show(current_anchor.loading_message, { - profile: current_anchor.loading_color, - spinner: true - }); - new Request.JSON({ - url: query, - noCache : true, - onSuccess: function(resp) { - var callback = ($defined(resp.callback)) ? resp.callback : "default"; - callbacks[callback](resp); - infobox.info(gettext("Done")); - infobox.hide(1); - current_anchor.reset_loading_infos(); - }, - onFailure: function(xhr) { - $(document.body).set("html", xhr.responseText); - $(document.body).setStyle("overflow", "auto"); - } - }).get(); -}; - -/* - * Initialize the AJAX anchor based navigation - */ -function ajaxListener(deflocation, defcallback) { - current_anchor = new HashWrapper(deflocation); - register_callback("default", defcallback); - check_anchor.periodical(300); -}; - -/* - * - */ -function HashWrapper(deflocation) { - this.deflocation = deflocation; - this.params = $H(); - this.base = ''; - this.serialized = null; - - this.reset_loading_infos = function() { - this.loading_message = gettext("Loading..."); - this.loading_color = "gray"; - }; - this.reset_loading_infos(); - - this.reset = function() { - this.base = null; - this.params.empty(); - return this; - }; - - this.parse_string = function(value, reset) { - var splits = (value.charAt(0) == '#') - ? value.substring(1).split('?') : value.split('?'); - - if (splits.length == 0) { - return this; - } - if (!$defined(reset)) { - reset = false; - } - if (reset) { - this.reset(); - } - this.base = (splits[0] == "") ? this.deflocation : splits[0]; - - var re = new RegExp("/$"); - if (!this.base.match(re)) { - this.base += '/'; - } - if (splits.length > 1) { - var params = splits[1].split('&'); - for (var i = 0; i < params.length; i++) { - var tmp = params[i].split('='); - this.setparam(tmp[0], tmp[1]); - } - } - return this; - }; - - this.from_string = function(value, reset) { - this.parse_string(value); - this.serialized = value; - return this; - }; - - this.serialize = function() { - var res = this.base; - - if (this.params.getLength() != 0) { - res += "?" + this.params.toQueryString(); - } - return res; - }; - - this.update = function(force) { - window.fireEvent("pageRefresh"); - location.hash = this.serialize(); - if ($defined(force)) { - this.force = force; - } - }; - - this.deleteParam = function(str) { - this.params.erase(str); - }; - - this.updateparams = function(str) { - if (str.charAt(0) == '?') { - str = str.substring(1); - } - var elems = str.split('&'); - for (var i = 0; i < elems.length; i++) { - this.setparamfromstring(elems[i]); - } - }; - - this.setparamfromstring = function(str) { - var def = str.split('='); - this.params.set(def[0], def[1]); - }; - - this.setparam = function(name, value) { - this.params.set(name, value); - return this; - }; - - this.setparams = function(params) { - this.params.extend(params); - return this; - }; - - this.getparam = function(name) { - if (!this.params.has(name)) { - return ""; - } - return this.params.get(name); - }; - - this.baseurl = function(value, noreset) { - if (!$defined(noreset) || noreset == 0) { - this.reset(); - } - this.base = value; - var re = new RegExp("/$"); - if (!this.base.match(re)) { - this.base += '/'; - } - return this; - }; - - this.addbaseurl = function(value) { - var newbase = this.base + value; - return this.baseurl(newbase); - }; - - this.getbaseurl = function() { - return this.base.substr(0, this.base.length - 1); - }; - - this.delparam = function(name) { - if (!this.params.has(name)) { - return false; - } - this.params.erase(name); - return this; - }; -}; - function parse_menubar(id) { if ($(id)) { $(id).getElements('li.dropdown').each(function(elem){ diff --git a/static/js/domains.js b/static/js/domains.js index e4758ac29..991d4be06 100644 --- a/static/js/domains.js +++ b/static/js/domains.js @@ -1,11 +1,6 @@ window.addEvent('domready', function() { var handlers = new Array(); - if ($defined($("domcontent"))) { - SqueezeBox.assign($("domcontent").getElements('a[class=boxed]'), { - parse: 'rel' - }); - } if ($defined($("subcontent"))) { SqueezeBox.assign($("subcontent").getElements('a[class=boxed]'), { parse: 'rel' diff --git a/static/js/dynamic_textinput.js b/static/js/dynamic_textinput.js index d8891d067..5c1682529 100644 --- a/static/js/dynamic_textinput.js +++ b/static/js/dynamic_textinput.js @@ -10,6 +10,7 @@ var DynamicTextInput = new Class({ if (!$defined(targets) || !targets.length) { return; } + this.fields_cnt = 0; for (var cpt = 0; cpt < targets.length; cpt++) { var target = targets[cpt]; var btn; @@ -18,31 +19,28 @@ var DynamicTextInput = new Class({ btn = new Element("img", { src: parent.static_url("pics/add.png") }); - btn.addEvent("click", this.newinput.bind(this)); + btn.addEvent("click", this.newelement.bind(this)); } else { var btnid = "btn_" + cpt; btn = new Element("img", { src: parent.static_url("pics/remove.png"), id: btnid }); - btn.addEvent("click", this.removeinput.bind(this)); + btn.addEvent("click", this.removeelement.bind(this)); } btn.setStyles({ "float": "right", "margin-top": "2px" }); btn.inject(target, "after"); + this.fields_cnt++; } this.nextid = targets.length; this.target = targets[0]; this.setOptions(options); }, - newinput: function(event) { - if (this.target.get("value") == "") { - return; - } - var coords = this.target.getCoordinates(); + createfield: function() { var div = new Element("div").addClass("row"); var label = new Element("label").inject(div); var ninput = new Element("input", { @@ -51,6 +49,15 @@ var DynamicTextInput = new Class({ name: this.target.get("name"), value: this.target.get("value") }).inject(div); + + return [div, ninput]; + }, + + newelement: function(event) { + if (this.target.get("value") == "") { + return; + } + var field = this.createfield(); var delbtn = new Element("img", { id: "delbtn_" + this.nextid, src: parent.static_url("pics/remove.png") @@ -61,17 +68,19 @@ var DynamicTextInput = new Class({ "float" : "right", "margin-top": "2px" }); - div.inject(this.target.getParent(), "after"); - delbtn.inject(ninput, "after"); - delbtn.addEvent("click", this.removeinput.bind(this)); + field[0].inject(this.target.getParent(), "after"); + delbtn.inject(field[1], "after"); + delbtn.addEvent("click", this.removeelement.bind(this)); this.target.set("value", ""); + this.fields_cnt++; }, - removeinput: function(event) { + removeelement: function(event) { var id = (event.target.get("id").split("_"))[1]; var input = $("id_" + this.target.get("name") + "_" + id); input.destroy(); event.target.destroy(); + this.fields_cnt--; } }); \ No newline at end of file diff --git a/static/pics/movedown.png b/static/pics/movedown.png new file mode 100644 index 000000000..3dd7fccdf Binary files /dev/null and b/static/pics/movedown.png differ diff --git a/static/pics/moveup.png b/static/pics/moveup.png new file mode 100644 index 000000000..fa9a7d71b Binary files /dev/null and b/static/pics/moveup.png differ diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html index 3c283df94..2314b20ac 100644 --- a/templates/common/email_listing.html +++ b/templates/common/email_listing.html @@ -3,6 +3,7 @@ {% load libextras %} {% block html_head %} + {% block css %}{% endblock %} @@ -27,6 +28,8 @@ {% endblock %}