Changeset 74

Timestamp:

05/22/06 15:23:24 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Added options for mailto_cc and ticket_update
• Ticket updates are now working

INSTALL:

• Adjusted the docs for new options

Location:

emailtotracscript/trunk

Files:

• INSTALL (modified) (1 diff)
• email2trac.py.in (modified) (7 diffs)

emailtotracscript/trunk/INSTALL

@@ -18 +18 @@
  umask: 022                 # OPTIONAL, Use this umask for saving attachments
  mailto_link: 1             # OPTIONAL, if set then [mailto:<CC>] in description
+ mailto_cc: basv@sara.nl    # OPTIONAL, Use ths address as CC in mailto line
+ ticket_update: 1           # OPTIONAL, if set then check if this is an update for a ticket
  email_header: 1            # OPTIONAL, if set then show TO/CC fields in description
  trac_version: 0.8          # OPTIONAL, if set use this as trac version (D: 0.9)

emailtotracscript/trunk/email2trac.py.in

@@ -47 +47 @@
 ----------
  * Create an config file:
-        [DEFAULT]                        # REQUIRED
-        project      : /data/trac/test   # REQUIRED
-        debug        : 1                 # OPTIONAL, if set print some DEBUG info
-        spam_level   : 4                 # OPTIONAL, if set check for SPAM mail 
-        reply_address: 1                 # OPTIONAL, if set then fill in ticket CC field
-    umask        : 022               # OPTIONAL, if set then use this umask for creation of the attachments
-        mailto_link  : 1                 # OPTIONAL, if set then [mailto:<CC>] in description 
-        trac_version : 0.8               # OPTIONAL, default is 0.9
+        [DEFAULT]                      # REQUIRED
+        project      : /data/trac/test # REQUIRED
+        debug        : 1               # OPTIONAL, if set print some DEBUG info
+        spam_level   : 4               # OPTIONAL, if set check for SPAM mail 
+        reply_address: 1               # OPTIONAL, if set then fill in ticket CC field
+    umask        : 022             # OPTIONAL, if set then use this umask for creation of the attachments
+        mailto_link  : 1               # OPTIONAL, if set then [mailto:<>] in description 
+        mailto_cc    : basv@sara.nl    # OPTIONAL, Use this address as CC in mailto line
+        ticket_update: 1               # OPTIONAL, if set then check if this is an update for a ticket
+        trac_version : 0.8             # OPTIONAL, default is 0.9
 
         [jouvin]                         # OPTIONAL project declaration, if set both fields necessary
@@ -82 +84 @@
 import unicodedata
 import ConfigParser
+import sqlite
 from email import Header
 from stat import *
@@ -121 +124 @@
                 if parameters.has_key('mailto_link'):
                         self.MAILTO = int(parameters['mailto_link'])
+                        if parameters.has_key('mailto_cc'):
+                                self.MAILTO_CC = parameters['mailto_cc']
+                        else:
+                                self.MAILTO_CC = ''
                 else:
                         self.MAILTO = 0
@@ -146 +153 @@
                 else:
                         self.REPLY_ALL = 0
+
+                if parameters.has_key('ticket_update'):
+                        self.TICKET_UPDATE = int(parameters['ticket_update'])
+                else:
+                        self.TICKET_UPDATE = 0
 
 
@@ -355 +367 @@
                         self.notification = 0
 
-                # Is this a previous ticket
-                #
-                if self.ticket_update(msg):
-                        return True
+                # Must we update existing tickets
+                #
+                if self.TICKET_UPDATE > 0:
+                        if self.ticket_update(msg):
+                                return True
                 
                 tkt = Ticket(self.env)
@@ -498 +511 @@
 
                 # Temporary fix
-                str = 'mailto:%s?subject=%s' %(urllib.quote(self.email_addr), urllib.quote('Re: #%s: %s' %(id, subject)))
+                str = 'mailto:%s?Subject=%s&Cc=%s' %( 
+                       urllib.quote(self.email_addr), 
+                           urllib.quote('Re: #%s: %s' %(id, subject)),
+                           urllib.quote(self.MAILTO_CC)
+                           )
+
                 str = '\n{{{\n#!html\n<a href="%s">Reply to: %s</a>\n}}}\n' %(str, author)
 
@@ -682 +700 @@
                 from trac.Href import Href
                 from trac import util
-                import sqlite
         elif version == 0.9:
                 from trac import attachment