Changeset 105:87a0409582f7

Timestamp:

05/02/2010 19:07:51 (7 months ago)

Author:

tonio

Branch:

default

Message:

Ticket #32 + minor CSS modifications.

Files:

• admin/templatetags/admin_extras.py (modified) (1 diff)
• admin/views.py (modified) (1 diff)
• extensions/webmail/imap_listing.py (modified) (5 diffs)
• extensions/webmail/main.py (modified) (4 diffs)
• extensions/webmail/templates/index.html (modified) (2 diffs)
• lib/__init__.py (modified) (1 diff)
• lib/email_listing.py (modified) (1 diff)
• lib/parameters.py (modified) (1 diff)
• static/js/common.js (modified) (1 diff)
• static/js/domains.js (modified) (1 diff)
• static/js/settings.js (modified) (1 diff)
• static/stylesheets/default.css (modified) (2 diffs)
• templates/common/error.html (added)
• templates/common/tables.html (modified) (1 diff)

admin/templatetags/admin_extras.py

@@ -91 +91 @@
 @register.simple_tag
 def param(app, definition):
-    print definition
     result = """<div class='row'>
   <label>%s</label>""" % definition["name"]
+    name = "%s.%s" % (app, definition["name"])
     if definition["type"] in ["string", "int"]:
         value = definition.has_key("value") \
             and definition["value"] or definition["default"]
-        name = "%s.%s" % (app, definition["name"])
         result += """
   <input type='text' name='%s' id='%s' value='%s' />""" % (name, name, value)
-    if definition["type"] in ["list"]:
+    if definition["type"] in ["list", "list_yesno"]:
         result += """
-<select name='' id=''>"""
-        
+<select name='%s' id='%s'>""" % (name, name)
+        values = []
+        if definition["type"] == "list_yesno":
+            values = [("yes", _("Yes")), ("no", _("No"))]
+        else:
+            if definition.has_key("values"):
+                values = definition["values"]
+        value = definition.has_key("value") \
+            and definition["value"] or definition["default"]
+        for v in values:
+            selected = ""
+            if value == v[0]:
+                selected = " selected='selected'"
+            result += "<option value='%s'%s>%s</option>\n" % (v[0], selected, v[1])
         result += """
 </select>

admin/views.py

@@ -414 +414 @@
         tmp = {"name" : app, "params" : []}
         for p in sorted(parameters._params[app]):
-            tmp["params"] += [{"name" : p, "value" : parameters.get(app, p),
+            tmp["params"] += [{"name" : p, 
+                               "value" : parameters.get(app, p),
                                "help" : parameters._params[app][p]["help"],
+                               "default" : parameters._params[app][p]["default"],
                                "type" : parameters._params[app][p]["type"]}]
         gparams += [tmp]

extensions/webmail/imap_listing.py

@@ -4 +4 @@
 import time
 import imaplib
+import ssl
 from datetime import datetime, timedelta
 from email.header import decode_header
@@ -70 +71 @@
     @staticmethod
     def parse_date(value):
-        ndate = datetime(*(email.utils.parsedate_tz(value))[:7])
+        tmp = email.utils.parsedate_tz(value)
+        if not tmp:
+            return value
+        ndate = datetime(*(tmp)[:7])
         now = datetime.now()
         if now - ndate > timedelta(7):
@@ -91 +95 @@
     def __init__(self, request=None, user=None, password=None):
         self.address = parameters.get("webmail", "IMAP_SERVER")
+        self.port = int(parameters.get("webmail", "IMAP_PORT"))
         if request:
             status, msg = self.login(request.user.username, 
@@ -97 +102 @@
             status, msg = self.login(user, password)
         if not status:
-            # Gestion d'erreur
-            pass
+            raise Exception(msg)
 
     def login(self, user, passwd):
         import imaplib
         try:
-            self.m = imaplib.IMAP4_SSL(self.address)
+            secured = parameters.get("webmail", "IMAP_SECURED")
+            if secured == "yes":
+                self.m = imaplib.IMAP4_SSL(self.address, self.port)
+            else:
+                self.m = imaplib.IMAP4(self.address, self.port)
+        except (imaplib.IMAP4.error, ssl.SSLError), error:
+            return False, _("Connection to IMAP server failed, check your configuration")
+        try:
             self.m.login(user, passwd)
-        except imaplib.IMAP4.error, test:
-            return False, test
+        except (imaplib.IMAP4.error, ssl.SSLError), error:
+            return False, _("Authentication failed, check your configuration")
+            
         return True, None
 
@@ -114 +126 @@
         return folder.encode("imap4-utf-7")
 
-    def messages_count(self, folder=None):
+    def messages_count(self, folder=None, order=None):
+        if order:
+            sign = order[:1]
+            criterion = order[1:].upper()
+            if sign == '-':
+                criterion = "REVERSE %s" % criterion
+        else:
+            criterion = "REVERSE DATE"
+        print criterion
+
         (status, data) = self.m.select(self._encodefolder(folder))
-        (status, data) = self.m.sort("(REVERSE DATE)", "UTF-8", "(NOT DELETED)")
+        (status, data) = self.m.sort("(%s)" % criterion, "UTF-8", "(NOT DELETED)")
         self.messages = data[0].split()
         return len(self.messages)

extensions/webmail/main.py

@@ -10 +10 @@
 from django.contrib.auth.decorators import login_required
 from mailng.admin.models import Mailbox
-from mailng.lib import events, parameters, _render
+from mailng.lib import events, parameters, _render, _render_error
 from mailng.lib.email_listing import Email
 from imap_listing import *
@@ -21 +21 @@
     parameters.register("webmail", "IMAP_SERVER", "string", "127.0.0.1",
                         help=_("Address of your IMAP server"))
-    parameters.register("webmail", "IMAP_SECURED", "list", "No",
+    parameters.register("webmail", "IMAP_SECURED", "list_yesno", "no",
                         help=_("Use a secure connexion to access IMAP server"))
     parameters.register("webmail", "IMAP_PORT", "int", "143",
@@ -61 +61 @@
         request.session["folder"] = name
         request.session["page"] = pageid
+    order = request.GET.has_key("order") and request.GET["order"] or None
     lst = ImapListing(request.user.username, request.session["password"],
-                      name, folder=name)
+                      name, folder=name, order=order)
     page = lst.paginator.getpage(request.session["page"])
     if page:
@@ -76 +77 @@
 @login_required
 def index(request):
-    lst = ImapListing(request.user.username, request.session["password"],
-                      "INBOX", folder="INBOX")
+    try:
+        lst = ImapListing(request.user.username, request.session["password"],
+                          "INBOX", folder="INBOX")
+    except Exception as exp:
+        return _render_error(request, {"error" : exp})
     return lst.render(request, empty=True)
 

extensions/webmail/templates/index.html

@@ -208 +208 @@
     });
     $$("tr").addEvent("dblclick", viewmail);
+    var sortOrder = "";
+    $$("th[class=sortable]").addEvent("click", function(evt) {
+        var tmp = "?";
+        
+        if (sortOrder == "") {
+            test = /order=([\+\-]\w+$|&)/.exec(location.hash);
+            if (test) {
+                sortOrder = test[1];
+            }
+        }
+        if (sortOrder.substring(1) == evt.target.id) {
+            var sign = (sortOrder.charAt(0) == '+') ? '-' : '+';
+            sortOrder = sign + evt.target.id;
+        } else {
+            sortOrder = "-" + evt.target.id;
+        }
+        if (location.hash.indexOf("?") != -1) {
+            if (location.hash.indexOf("order") != -1) {
+                location.hash = location.hash.replace(/order=[\+\-]\w+$|&/, 
+                                                      "order=" + sortOrder);
+                return;
+            }
+            tmp = "&";
+        }
+        location.hash += tmp + "order=" + sortOrder;
+    });
   });
 
@@ -225 +251 @@
 {% endblock %}
 {% block middletitle %}{% trans "Webmail" %}{% endblock %}
-{% block menu %}
-  {% load webextras %}
-  {% listing_menu "" "INBOX" perms %}
-{% endblock %}
 {% block leftcol %}
 <div id="leftcol" class="box">

lib/__init__.py

@@ -51 +51 @@
                               context_instance=RequestContext(request))
 
+def _render_error(request, user_context):
+    return render_to_response("common/error.html", user_context,
+                              context_instance=RequestContext(request))
+
 def exec_as_vuser(cmd):
     code, output = exec_pipe("sudo -u %s %s" % (settings.VIRTUAL_UID, cmd))

lib/email_listing.py

@@ -81 +81 @@
         self.folder = folder
         self.elems_per_page = elems_per_page
-        self.paginator = Paginator(self.mbc.messages_count(self.folder), 
+        order = "order" in kwargs.keys() and kwargs["order"] or None
+        self.paginator = Paginator(self.mbc.messages_count(self.folder, order), 
                                    elems_per_page)
 

lib/parameters.py

@@ -25 +25 @@
                                                                        self.name)
 
-def register(app, name, type="string", deflt=None, help=None):
+def register(app, name, type="string", deflt=None, help=None, **kwargs):
     """Register a new parameter.
 

static/js/common.js

@@ -24 +24 @@
     } else {
         var splits = current_anchor.substring(1).split('?');
-        var section = splits[0];
+        var section = (splits[0] != "") ? splits[0] : "INBOX";
         delete splits[0];
         var params = splits.join('&');

static/js/domains.js

@@ -67 +67 @@
         }
     });
+    setDivHeight("content", 20, 0);
 });
 

static/js/settings.js

@@ -4 +4 @@
         
     });
+    setDivHeight("content", 20, 0);
 
     if ($$("a[name=deletePerm]"))

static/stylesheets/default.css

@@ -263 +263 @@
 
 .toggler {
-    color: #222;
-    margin: 0;
+    margin: 5px auto;
     padding: 2px 5px;
-    background: #eee;
-    border-bottom: 1px solid #ddd;
-    border-right: 1px solid #ddd;
-    border-top: 1px solid #f5f5f5;
-    border-left: 1px solid #f5f5f5;
-    font-size: small;
-    font-weight: normal;
+    background: #CEDBEC;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    /*border: 1px solid #CCC;*/
+    font-size: 1.1em;
 }
 
@@ -288 +285 @@
     padding: 3px 0;
 }
+
+.error {
+    margin: 0 auto;
+    padding: 5px;
+    background: red;
+    width: 500px;
+    text-align: center;
+    background-color: #F9D2D2;
+    border: 3px solid #FF2A2A;
+    color: #FF2A00;
+}

templates/common/tables.html

@@ -3 +3 @@
     <tr>
       {% for c in table.columns %}
-      <th width="{{ c.width }}">{{ c|safe }}</th>
+      <th id="{{ c.name }}" class="sortable" width="{{ c.width }}">{{ c|safe }}</th>
       {% endfor %}
     </tr>