mailmanager/sql addTextSearch.zsql,1.4.2.2,1.4.2.3 createCategoryAndTemplateTables.zsql,1.1.4.6,1.1.4.7 createTables.zsql,1.5.2.1,1.5.2.2

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2045/sql

Modified Files:
      Tag: RELENG_2_0_1
	addTextSearch.zsql createCategoryAndTemplateTables.zsql 
	createTables.zsql 
Log Message:
Some initial work on the migration directly from 1.1 to MySQL 2.0.3:
 - Support migration to MySQL.
 - Explicitly set the MySQL tables to UTF-8.
 - If we're on MySQL, the textSearch tables need to be created at the same
   time as the rest of the tables.
Note: It still doesn't work!  I'm getting UnicodeEncodeErrors when pushing
non-ASCII data into the database (somewhere in ZMySQLDA).


Index: createTables.zsql
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/sql/createTables.zsql,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- createTables.zsql	10 Aug 2005 13:13:12 -0000	1.5.2.1
+++ createTables.zsql	3 Nov 2005 16:25:36 -0000	1.5.2.2
@@ -13,7 +13,7 @@
     reports <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>,
     settings <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>,
     password VARCHAR(42)
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_customer (
     username VARCHAR(12) PRIMARY KEY,
@@ -21,19 +21,19 @@
     email TEXT,
     signature TEXT,
     password VARCHAR(42)
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_group (
     group_name VARCHAR(128) PRIMARY KEY,
     group_turn INT DEFAULT 0
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_group_members (
     group_name VARCHAR(128),
         FOREIGN KEY (group_name) REFERENCES <dtml-var schema>mm_group(group_name) ON DELETE CASCADE <dtml-var sql_deferrable>,
     username VARCHAR(12),
         FOREIGN KEY (username) REFERENCES <dtml-var schema>mm_user(username) <dtml-var sql_deferrable>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_account (
     email VARCHAR(255) PRIMARY KEY,
@@ -67,7 +67,7 @@
     signature <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>,
     signature_text TEXT,
     html_signature <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_ticket (
     id <dtml-var sql_serialpkey>,
@@ -104,7 +104,7 @@
     date_opened <dtml-var sql_datetimestamp>,
     date_responded <dtml-var sql_datetimestamp>,
     date_closed <dtml-var sql_datetimestamp>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_message (
     id <dtml-var sql_serialpkey>,
@@ -123,7 +123,7 @@
     raw_headers TEXT,
     body TEXT,
     html_body TEXT
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_attachment (
     id <dtml-var sql_serialpkey>,
@@ -137,7 +137,7 @@
     is_file <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>,
     body <dtml-var sql_binary>,
     dangerous <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_history (
     id <dtml-var sql_serialpkey>,
@@ -154,7 +154,7 @@
     category2 TEXT,
     changed_by VARCHAR(12),
     change_date <dtml-var sql_datetimestamp> 
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_filter (
     id <dtml-var sql_serialpkey>,
@@ -179,11 +179,11 @@
     category1 TEXT,
     category2 TEXT,
     response_target <dtml-var sql_interval>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_customer_email (
     username VARCHAR(12),
         FOREIGN KEY (username)
              REFERENCES <dtml-var schema>mm_customer(username) ON DELETE CASCADE <dtml-var sql_deferrable>,
     access_email TEXT
-) <dtml-var sql_tabletype>
+) <dtml-var sql_tabletype> <dtml-var sql_charset>

Index: addTextSearch.zsql
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/sql/addTextSearch.zsql,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- addTextSearch.zsql	10 Oct 2005 16:37:56 -0000	1.4.2.2
+++ addTextSearch.zsql	3 Nov 2005 16:25:36 -0000	1.4.2.3
@@ -155,7 +155,7 @@
         body TEXT,
         html_body TEXT,
         FULLTEXT (body, html_body)
-    ) <dtml-var sql_delimiter>
+    ) <dtml-var sql_charset> <dtml-var sql_delimiter>
 
     CREATE TABLE mm_ticket_index (
         id INT,
@@ -163,6 +163,6 @@
         body TEXT,
         html_body TEXT,
         FULLTEXT (body, html_body)
-    ) <dtml-var sql_delimiter>
+    ) <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 </dtml-if>

Index: createCategoryAndTemplateTables.zsql
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/sql/createCategoryAndTemplateTables.zsql,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- createCategoryAndTemplateTables.zsql	12 Sep 2005 15:19:37 -0000	1.1.4.6
+++ createCategoryAndTemplateTables.zsql	3 Nov 2005 16:25:36 -0000	1.1.4.7
@@ -27,7 +27,7 @@
        CHECK (id IN (0,1,2)),
     label TEXT,
     enabled BOOL
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 CREATE TABLE <dtml-var schema>mm_category_choices (
     category_id INT,
@@ -38,7 +38,7 @@
     <dtml-elif expr="sql_database == 'mysql'">
       PRIMARY KEY(category_id, choice(255))
     </dtml-if>
-) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
 
 <dtml-comment>
@@ -62,5 +62,5 @@
     <dtml-elif expr="sql_database == 'mysql'">
       PRIMARY KEY(name(255))
     </dtml-if>
-) <dtml-var sql_tabletype> 
+) <dtml-var sql_tabletype> <dtml-var sql_charset> 
 

mailmanager/tests testDatabase.py,1.4.2.10,1.4.2.11

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2045/tests

Modified Files:
      Tag: RELENG_2_0_1
	testDatabase.py 
Log Message:
Some initial work on the migration directly from 1.1 to MySQL 2.0.3:
 - Support migration to MySQL.
 - Explicitly set the MySQL tables to UTF-8.
 - If we're on MySQL, the textSearch tables need to be created at the same
   time as the rest of the tables.
Note: It still doesn't work!  I'm getting UnicodeEncodeErrors when pushing
non-ASCII data into the database (somewhere in ZMySQLDA).


Index: testDatabase.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/tests/testDatabase.py,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -u -d -r1.4.2.10 -r1.4.2.11
--- testDatabase.py	31 Oct 2005 11:23:42 -0000	1.4.2.10
+++ testDatabase.py	3 Nov 2005 16:25:36 -0000	1.4.2.11
@@ -297,12 +297,12 @@
         CREATE TABLE <dtml-var schema>timestamp_test (
             id <dtml-var sql_serialpkey>,
             ts <dtml-var sql_datetimestamp>
-        ) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+        ) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
 
         CREATE TABLE <dtml-var schema>interval_test (
             id <dtml-var sql_serialpkey>,
             iv int
-        ) <dtml-var sql_tabletype> <dtml-var sql_delimiter>
+        ) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>
     """
 
     def afterSetUp(self):

mailmanager MailManager.py,1.159.2.22,1.159.2.23 migration.py,1.5.2.9,1.5.2.10

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2045

Modified Files:
      Tag: RELENG_2_0_1
	MailManager.py migration.py 
Log Message:
Some initial work on the migration directly from 1.1 to MySQL 2.0.3:
 - Support migration to MySQL.
 - Explicitly set the MySQL tables to UTF-8.
 - If we're on MySQL, the textSearch tables need to be created at the same
   time as the rest of the tables.
Note: It still doesn't work!  I'm getting UnicodeEncodeErrors when pushing
non-ASCII data into the database (somewhere in ZMySQLDA).


Index: MailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/MailManager.py,v
retrieving revision 1.159.2.22
retrieving revision 1.159.2.23
diff -u -d -r1.159.2.22 -r1.159.2.23
--- MailManager.py	2 Nov 2005 16:53:43 -0000	1.159.2.22
+++ MailManager.py	3 Nov 2005 16:25:35 -0000	1.159.2.23
@@ -75,7 +75,7 @@
 from tests.classes.mmtestdata import TestDataMixin
 
 # Constants.
-mversion = 13
+mversion = 14
 url_pat = re.compile(r'(https?|ftp)://\S*[^,;:.!?)\]\'"\s]')
 
 __extra_epydoc_fields__ = [
@@ -345,6 +345,7 @@
         self.sql_indexlimit = ''
         self.sql_serialpkey = 'SERIAL PRIMARY KEY'
         self.sql_tabletype = ''
+        self.sql_charset = ''
         self.sql_true = '\'t\''
         self.sql_false = '\'f\''
         self.sql_truevar = 't'
@@ -363,6 +364,7 @@
         self.sql_indexlimit = '(255)'
         self.sql_serialpkey = 'INT PRIMARY KEY AUTO_INCREMENT'
         self.sql_tabletype = 'TYPE=InnoDB'
+        self.sql_charset = 'DEFAULT CHARSET=UTF8'
         self.sql_true = 1
         self.sql_false = 0
         self.sql_truevar = 1

Index: migration.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/migration.py,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -d -r1.5.2.9 -r1.5.2.10
--- migration.py	3 Nov 2005 15:11:51 -0000	1.5.2.9
+++ migration.py	3 Nov 2005 16:25:36 -0000	1.5.2.10
@@ -115,8 +115,11 @@
 
         # Optionally create the tables
         if create_tables:
-            if schema:
-                self.sql.createSchema()
+            if self.dbplatform == 'mysql':
+                self.sql.addTextSearch()
+            else:
+                if schema:
+                    self.sql.createSchema()
             self.sql.createTables()
 
         # Migrate the users first
@@ -370,7 +373,8 @@
     
             # Add on text search capability
             get_transaction().commit()
-            self.sql.addTextSearch()
+            if self.dbplatform != 'mysql':
+                self.sql.addTextSearch()
 
     # Migration for categories and templates for 2.0-r7
     if self.mversion < 11:
@@ -428,9 +432,9 @@
         self.manage_delObjects(['sql'])
         self._setObject('sql', self.sqldirclass('sql'))
 
-		# This is the case if we were on 10 < mversion < 12, ie it has
-		# been migrated to PostgreSQL
-		if not hasattr(self, dbplatform):
+        # This is the case if we were on 10 < mversion < 12, ie it has
+        # been migrated to PostgreSQL
+        if not hasattr(self, dbplatform):
             self.dbplatform = 'postgres'
             self.configurePostgres()
             self.sql.migrate_2_0_1()
@@ -450,6 +454,10 @@
         except psycopg.ProgrammingError:
             pass
 
+    # Migration to set the character set correctly on MySQL tables
+    if self.mversion < 14:
+        self.sql.setTableCharsets()
+        
     # Update the migration & display versions
     self.mversion = MailManager.mversion
     self.version = self.Control_Panel.Products['MailManager'].version

mailmanager/support setupdb.py,1.1.2.3,1.1.2.4

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/support

Modified Files:
      Tag: RELENG_2_0_1
	setupdb.py 
Log Message:
Allow connecting to a MySQL database via a socket.


Index: setupdb.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/support/Attic/setupdb.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- setupdb.py	25 Oct 2005 15:06:32 -0000	1.1.2.3
+++ setupdb.py	3 Nov 2005 16:21:20 -0000	1.1.2.4
@@ -182,13 +182,14 @@
 
 
 
-def getMySQLCursor(dbname, host = None, user = None, password = None, port=None):
+def getMySQLCursor(dbname, host = None, user = None, password = None, port=None, socket=None):
     args = {}
     if dbname:   args['db']     = dbname
     if host:     args['host']   = host
     if user:     args['user']   = user
     if password: args['passwd'] = password
     if port:     args['port']   = port
+    if socket:   args['socket'] = socket
     conn = MySQLdb.connect(**args)
     return conn.cursor()
 
@@ -209,7 +210,7 @@
     cursor.close()
 
 def createMySQLDatabase(dbname, mm_user, mm_password, su_user, su_pass, port=None,
-                        db_host=None, mm_host=None, schema=None):
+                        db_host=None, mm_host=None, schema=None, socket = None):
 
     cursor = getMySQLCursor(dbname='mysql', user=su_user, password=su_pass, host=db_host, port=port)
 

mailmanager migration.py,1.5.2.8,1.5.2.9

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18943

Modified Files:
      Tag: RELENG_2_0_1
	migration.py 
Log Message:
(Hopefully) fix the migration so that it'll work from ZODB directly to
MySQL (1340301).  Untested as of yet - I'm still hunting for an old 1.1
Data.fs. :-)


Index: migration.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/migration.py,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -d -r1.5.2.8 -r1.5.2.9
--- migration.py	14 Oct 2005 10:55:03 -0000	1.5.2.8
+++ migration.py	3 Nov 2005 15:11:51 -0000	1.5.2.9
@@ -32,7 +32,7 @@
 import time
 
 
-def migrate(self, schema='', create_tables=False, REQUEST=None):
+def migrate(self, schema='', create_tables=False, dbplatform='postgres', REQUEST=None):
     """Upgrade a MailManager instance to the current version.
 
     Take all of the existing objects in the ZODB and put them into the new
@@ -81,8 +81,14 @@
         # had an mversion of 10 were instead given an mversion of 9.
 
         # Backport from mversion 12, add on the sql attributes
-        self.dbplatform = 'postgres'
-        self.configurePostgres()
+        self.dbplatform = dbplatform
+        if dbplatform == 'postgres':
+            self.configurePostgres()
+        # Also clean up schemas so they are in lowercase
+        elif dbplatform == 'mysql':
+            self.configureMySQL()
+        else:
+            raise Exception('Unknown database')
 
         # We no longer keep the login/logout pages in the ZODB
         self.Cookie.manage_delObjects(['Login', 'LoggedOut'])
@@ -422,10 +428,13 @@
         self.manage_delObjects(['sql'])
         self._setObject('sql', self.sqldirclass('sql'))
 
-        self.dbplatform = 'postgres'
-        self.configurePostgres()
-        self.sql.migrate_2_0_1()
-        self._p_changed = 1
+		# This is the case if we were on 10 < mversion < 12, ie it has
+		# been migrated to PostgreSQL
+		if not hasattr(self, dbplatform):
+            self.dbplatform = 'postgres'
+            self.configurePostgres()
+            self.sql.migrate_2_0_1()
+            self._p_changed = 1
 
     # Additional migration for postgres databases moving to 2.0.1
     # that was elided in previous mversion==12 migration

mailmanager/www manage_migrateForm.zpt,1.3.2.2,1.3.2.3

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18943/www

Modified Files:
      Tag: RELENG_2_0_1
	manage_migrateForm.zpt 
Log Message:
(Hopefully) fix the migration so that it'll work from ZODB directly to
MySQL (1340301).  Untested as of yet - I'm still hunting for an old 1.1
Data.fs. :-)


Index: manage_migrateForm.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/manage_migrateForm.zpt,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- manage_migrateForm.zpt	3 Nov 2005 12:06:14 -0000	1.3.2.2
+++ manage_migrateForm.zpt	3 Nov 2005 15:11:51 -0000	1.3.2.3
@@ -52,6 +52,17 @@
       </td>
     </tr>
 
+    <tr tal:condition="python:here.mversion < 10">
+      <td align="left" valign="top" class="form-optional">
+        Database
+      </td>
+      <td>
+        <select name="dbplatform">
+          <option value="postgres">PostgreSQL
+          <option value="mysql">MySQL
+        </select>
+      </td>
+    </tr>
 
     <!-- Migration required? -->
     <tr tal:condition="python:here.mversion < here.latestversion">

mailmanager/www AccountSettings.zpt,1.31.2.8,1.31.2.9 Create.zpt,1.22.4.4,1.22.4.5 CustomerSettings.zpt,1.12,1.12.2.1 FilterSettings.zpt,1.25.2.4,1.25.2.5 GenerateMail.zpt,1.2,1.2.4.1 GroupSettings.zpt,1.18.2.1,1.18.2.2 Login.zpt,1.8,1.8.2.1 OptionSettings.zpt,1.21.2.2,1.21.2.3 Reports.zpt,1.25.2.3,1.25.2.4 Search.zpt,1.16.4.2,1.16.4.3 SystemSettings.zpt,1.30.2.3,1.30.2.4 Tickets.zpt,1.42.2.1,1.42.2.2 UserSettings.zpt,1.19,1.19.2.1 addUser.dtml,1.2,1.2.4.1 macros.zpt,1.8,1.8.8.1 mainUser.dtml,1.2,1.2.4.1 manage_addMailManagerForm.zpt,1.8.4.1,1.8.4.2 manage_migrateForm.zpt,1.3.2.1,1.3.2.2 master.zpt,1.33.2.1,1.33.2.2 test.zpt,1.4,1.4.2.1 ticket_index_html.zpt,1.81.2.3,1.81.2.4

[Graeme Mathieson <mathie@us...>]

Update of /cvsroot/mailmanager/mailmanager/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26607/www

Modified Files:
      Tag: RELENG_2_0_1
	AccountSettings.zpt Create.zpt CustomerSettings.zpt 
	FilterSettings.zpt GenerateMail.zpt GroupSettings.zpt 
	Login.zpt OptionSettings.zpt Reports.zpt Search.zpt 
	SystemSettings.zpt Tickets.zpt UserSettings.zpt addUser.dtml 
	macros.zpt mainUser.dtml manage_addMailManagerForm.zpt 
	manage_migrateForm.zpt master.zpt test.zpt 
	ticket_index_html.zpt 
Log Message:
Force form encoding to UTF-8.  This should solve the current problem on the
hosted platform.


Index: Reports.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/Reports.zpt,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -d -r1.25.2.3 -r1.25.2.4
--- Reports.zpt	7 Oct 2005 14:23:46 -0000	1.25.2.3
+++ Reports.zpt	3 Nov 2005 12:06:14 -0000	1.25.2.4
@@ -222,7 +222,7 @@
            the performace reports Daily/Monthly, as you cannot obtain that 
            resolution.
       -->
-      <form action="setReportDate" method="post"
+      <form accept-charset="utf-8" action="setReportDate" method="post"
             tal:condition="python:section=='received' or section=='performance'">
         <tr>
           <td>&nbsp;</td>

Index: CustomerSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/CustomerSettings.zpt,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- CustomerSettings.zpt	18 Jul 2005 09:50:34 -0000	1.12
+++ CustomerSettings.zpt	3 Nov 2005 12:06:14 -0000	1.12.2.1
@@ -95,7 +95,7 @@
         <!-- end if section in ('list', 'remove') -->
 
         <!-- if section in ('add', 'edit') -->
-        <form action="addOrEditCustomer" method="post"
+        <form accept-charset="utf-8" action="addOrEditCustomer" method="post"
               tal:condition="python:section in ('add', 'edit')">
           <table cellpadding="5" cellspacing="0" border="0" class="content"
 	             tal:define="person python:test(section=='edit' and not request.has_key('error'), here.getCustomer(username=request.get('username')), request)">

Index: addUser.dtml
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/addUser.dtml,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- addUser.dtml	5 May 2005 12:24:45 -0000	1.2
+++ addUser.dtml	3 Nov 2005 12:06:14 -0000	1.2.4.1
@@ -25,7 +25,7 @@
 from which the user is allowed to login. 
 </p>
 
-<form action="manage_users" method="post">
+<form accept-charset="utf-8" action="manage_users" method="post">
 <table>
 <tr>
   <td align="left" valign="top">

Index: SystemSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/SystemSettings.zpt,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -d -r1.30.2.3 -r1.30.2.4
--- SystemSettings.zpt	2 Nov 2005 16:53:44 -0000	1.30.2.3
+++ SystemSettings.zpt	3 Nov 2005 12:06:14 -0000	1.30.2.4
@@ -82,7 +82,7 @@
     <td valign="top">
 
       <!-- if section == 'delete' -->
-      <form action="deleteTickets" method="post"
+      <form accept-charset="utf-8" action="deleteTickets" method="post"
             tal:condition="python:section == 'delete'">
         <table cellpadding="5" cellspacing="0" border="0" class="content">
           <tr class="table_head">
@@ -209,7 +209,7 @@
       <!-- end if section == 'delete' -->
 
       <!-- if section == 'restore' -->
-      <form method="post" action="restoreTickets" enctype="multipart/form-data"
+      <form accept-charset="utf-8" method="post" action="restoreTickets" enctype="multipart/form-data"
             tal:condition="python:section == 'restore'">
         <table cellpadding="5" cellspacing="0" border="0" class="content">
           <tr class="table_head">
@@ -230,7 +230,7 @@
       <!-- end if section == 'restore' -->
 
       <!-- if section == 'confirm' -->
-      <form action="deleteTickets" method="post"
+      <form accept-charset="utf-8" action="deleteTickets" method="post"
             tal:condition="python:section == 'confirm'">
         <table cellpadding="5" cellspacing="0" border="0" class="content"
                tal:define="count python:here.sql.listTickets()[0].count">
@@ -290,7 +290,7 @@
       <!-- end if section == 'confirm' -->
 
       <!-- if section == 'tickets' -->
-      <form action="setTicketsScreen" method="post"
+      <form accept-charset="utf-8" action="setTicketsScreen" method="post"
             tal:condition="python:section == 'tickets'">
         <table cellpadding="5" cellspacing="0" border="0" class="content">
           <tr class="table_head">     
@@ -380,7 +380,7 @@
       <!-- end if section == 'tickets' -->
 
       <!-- if section == 'datetime' -->
-      <form action="setDateAndTimezone" method="post"
+      <form accept-charset="utf-8" action="setDateAndTimezone" method="post"
             tal:condition="python:section == 'datetime'">
         <table cellpadding="5" cellspacing="0" border="0" class="content">
           <tr class="table_head">
@@ -441,7 +441,7 @@
       <!-- end if section == 'diskusage' -->
 
       <!-- if section == 'testdata' -->
-      <form action="setTestData" method="post"
+      <form accept-charset="utf-8" action="setTestData" method="post"
             tal:condition="python:section == 'testdata'">
         <table cellpadding="5" cellspacing="0" border="0" class="content">
           <tr class="table_head">

Index: Tickets.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/Tickets.zpt,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -d -r1.42.2.1 -r1.42.2.2
--- Tickets.zpt	7 Sep 2005 15:15:04 -0000	1.42.2.1
+++ Tickets.zpt	3 Nov 2005 12:06:14 -0000	1.42.2.2
@@ -90,7 +90,7 @@
     <!-- End table_head_nav slot -->
 
     <!-- support_cell_left slot -->
-    <form metal:fill-slot="support_cell_left" action="setSession" method="post">
+    <form accept-charset="utf-8" metal:fill-slot="support_cell_left" action="setSession" method="post">
       <table cellpadding="0" cellspacing="0" border="0" class="content">
         <tr tal:define="num_screens python:max(num_tickets-1, 0)/here.batch_size+1">
           <td tal:condition="python:num_tickets > here.batch_size">
@@ -115,7 +115,7 @@
     <!-- End support_cell_left slot -->
 
     <div metal:fill-slot="content_table" align="center">
-      <form action="changeSelected" method="post">
+      <form accept-charset="utf-8" action="changeSelected" method="post">
         <table cellpadding="5" cellspacing="0" border="0" width="95%">
 
           <!-- Column headings. -->

Index: mainUser.dtml
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/mainUser.dtml,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- mainUser.dtml	5 May 2005 12:24:45 -0000	1.2
+++ mainUser.dtml	3 Nov 2005 12:06:14 -0000	1.2.4.1
@@ -1,7 +1,7 @@
 <dtml-var manage_page_header>
 <dtml-var manage_tabs>
 
-<form action="manage_users" method="post">
+<form accept-charset="utf-8" action="manage_users" method="post">
 <dtml-if user_names>
 <p class="form-help">
 The following users have been defined. Click on the name of a 

Index: master.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/master.zpt,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- master.zpt	7 Oct 2005 14:23:47 -0000	1.33.2.1
+++ master.zpt	3 Nov 2005 12:06:14 -0000	1.33.2.2
@@ -27,7 +27,7 @@
 
 	<!-- agent_list slot -->
 	<td metal:define-slot="agent_list" align="center">
-	  <form action="setSession" method="post"
+	  <form accept-charset="utf-8" action="setSession" method="post"
                 tal:define="assigned request/SESSION/assigned | user/getUserName"
                 tal:condition="python:user.has_role('Tickets')">
 	    <table cellpadding="0" cellspacing="0" border="0">
@@ -61,7 +61,7 @@
 
 	<!-- account_list slot -->
 	<td metal:define-slot="account_list" align="right">
-	  <form action="setSession" method="post"
+	  <form accept-charset="utf-8" action="setSession" method="post"
                 tal:define="acc_id request/SESSION/account_id | nothing"
                 tal:condition="python:user.has_role('Tickets')">
 	    <table cellpadding="0" cellspacing="0" border="0">
@@ -104,7 +104,7 @@
 
 	<!-- Get Ticket box -->
         <td>
-          <form action="getTicket" method="post"
+          <form accept-charset="utf-8" action="getTicket" method="post"
                 tal:condition="python:user.has_role('Tickets')">
             <table cellpadding="0" cellspacing="0" border="0">
 	      <tr class="nav_two">

Index: OptionSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/OptionSettings.zpt,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- OptionSettings.zpt	7 Oct 2005 14:23:46 -0000	1.21.2.2
+++ OptionSettings.zpt	3 Nov 2005 12:06:14 -0000	1.21.2.3
@@ -77,7 +77,7 @@
       <td valign="top">
 
 	  <!-- if section in ('templates', 'edit') -->
-          <form action="addOrEditTemplate" method="post"
+          <form accept-charset="utf-8" action="addOrEditTemplate" method="post"
                 tal:condition="python:section in ('templates', 'edit')">
 
 	    <!-- if section == 'templates' -->
@@ -197,7 +197,7 @@
 	  <!-- end if section in ('templates', 'edit') -->
 
 	  <!-- if section.startswith('category') -->
-          <form action="." method="post"
+          <form accept-charset="utf-8" action="." method="post"
                 tal:condition="python:section.startswith('category')">
             <table cellpadding="5" cellspacing="0" border="0" class="content"
                    tal:define="number python:int(section[8:])">
@@ -252,7 +252,7 @@
 	  <!-- end if section.startswith('category') -->
 
       <!-- if section == 'attachments' -->
-          <form action="addStandardAttachment" method="post"
+          <form accept-charset="utf-8" action="addStandardAttachment" method="post"
                 enctype="multipart/form-data"
                 tal:condition="python:section == 'attachments'">
             <table cellpadding="5" cellspacing="0" border="0" class="content">

Index: manage_addMailManagerForm.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/manage_addMailManagerForm.zpt,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -d -r1.8.4.1 -r1.8.4.2
--- manage_addMailManagerForm.zpt	28 Jul 2005 14:23:35 -0000	1.8.4.1
+++ manage_addMailManagerForm.zpt	3 Nov 2005 12:06:14 -0000	1.8.4.2
@@ -9,7 +9,7 @@
   <i>mailmanager_db</i> before you can use MailManager.
 </p>
 
-<form action="manage_addMailManager" method="post">
+<form accept-charset="utf-8" action="manage_addMailManager" method="post">
   <table cellspacing="0" cellpadding="2" border="0">
 
     <tr>

Index: Create.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/Create.zpt,v
retrieving revision 1.22.4.4
retrieving revision 1.22.4.5
diff -u -d -r1.22.4.4 -r1.22.4.5
--- Create.zpt	7 Oct 2005 14:23:46 -0000	1.22.4.4
+++ Create.zpt	3 Nov 2005 12:06:14 -0000	1.22.4.5
@@ -61,7 +61,7 @@
     <!-- end table_head_nav slot -->
 
     <!-- content_table slot -->
-    <form method="post" action="." enctype="multipart/form-data"
+    <form accept-charset="utf-8" method="post" action="." enctype="multipart/form-data"
           metal:fill-slot="content_table">
       <table cellpadding="0" cellspacing="0" border="0" class="content">
         <tr>

Index: FilterSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/FilterSettings.zpt,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -d -r1.25.2.4 -r1.25.2.5
--- FilterSettings.zpt	15 Sep 2005 16:08:22 -0000	1.25.2.4
+++ FilterSettings.zpt	3 Nov 2005 12:06:14 -0000	1.25.2.5
@@ -149,7 +149,7 @@
 
 
         <!-- Add section -->
-        <form action="addFilter" method="post"
+        <form accept-charset="utf-8" action="addFilter" method="post"
               tal:condition="python:section == 'add'">
           <table cellpadding="5" cellspacing="0" border="0" class="content">
 
@@ -289,7 +289,7 @@
 	    <!-- End add section -->
 
         <!-- Edit headers section -->
-        <form action="addFilterHeader" method="post"
+        <form accept-charset="utf-8" action="addFilterHeader" method="post"
               tal:condition="python:section == 'headers'">
           <table cellpadding="5" cellspacing="0" border="0" class="content">
  

Index: Search.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/Search.zpt,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -u -d -r1.16.4.2 -r1.16.4.3
--- Search.zpt	7 Oct 2005 14:23:47 -0000	1.16.4.2
+++ Search.zpt	3 Nov 2005 12:06:14 -0000	1.16.4.3
@@ -28,7 +28,7 @@
     </table>
     <div metal:fill-slot="main_content" tal:omit-tag="">
       <td valign="top">
-        <form action="doSearch" method="post">
+        <form accept-charset="utf-8" action="doSearch" method="post">
           <table cellpadding="5" cellspacing="0" border="0" class="content">
             <tr class="table_head">
               <td class="white" colspan="2">

Index: UserSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/UserSettings.zpt,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- UserSettings.zpt	18 Jul 2005 09:50:34 -0000	1.19
+++ UserSettings.zpt	3 Nov 2005 12:06:14 -0000	1.19.2.1
@@ -123,7 +123,7 @@
 	  <!-- end if section in ('list', 'remove') -->
 
 	  <!-- if section in ('add', 'edit') -->
-          <form method="post"
+          <form accept-charset="utf-8" method="post"
                 tal:attributes="action python:test(section == 'add',
                                                    'addMMUser', 'editMMUser')"
                 tal:condition="python:section in ('add', 'edit')">
@@ -250,7 +250,7 @@
 	  <!-- end if section in ('add', 'edit') -->
 
           <!-- if section == 'delete' -->	
-          <form action="delAgent" method="post"
+          <form accept-charset="utf-8" action="delAgent" method="post"
                 tal:condition="python:section == 'delete'">
             <table cellpadding="5" cellspacing="0" border="0" class="content"
                 tal:define="constraints python:here.getUserConstraints(request.username)">

Index: Login.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/Login.zpt,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- Login.zpt	18 Jul 2005 09:50:34 -0000	1.8
+++ Login.zpt	3 Nov 2005 12:06:14 -0000	1.8.2.1
@@ -16,7 +16,7 @@
     <table cellpadding="0" cellspacing="0" border="0" height="100%" width="100%">
       <tr class="nav_four">
         <td>
-          <form tal:attributes="action request/came_from | string:logged_in"
+          <form accept-charset="utf-8" tal:attributes="action request/came_from | string:logged_in"
                  method="post">
             <table cellpadding="0" cellspacing="0" border="0" width="100%">
               <tr class="nav_one">

Index: AccountSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/AccountSettings.zpt,v
retrieving revision 1.31.2.8
retrieving revision 1.31.2.9
diff -u -d -r1.31.2.8 -r1.31.2.9
--- AccountSettings.zpt	25 Oct 2005 14:18:21 -0000	1.31.2.8
+++ AccountSettings.zpt	3 Nov 2005 12:06:12 -0000	1.31.2.9
@@ -136,7 +136,7 @@
         <!-- end if section in ('list', 'remove') -->
 
         <!-- if section in ('add', 'edit') -->
-        <form action="addOrEditAccount" method="post"
+        <form accept-charset="utf-8" action="addOrEditAccount" method="post"
               tal:condition="python:section in ('add', 'edit')">
           <table cellpadding="5" cellspacing="0" border="0" class="content"
                  tal:define="acc_or_req python: test(section == 'edit' and not request.has_key('error'), here.getAccount(email=request.get('account_id')), request)">
@@ -507,7 +507,7 @@
         <!-- end if section in ('add', 'edit') -->
 
         <!-- if section == 'confirm' -->
-        <form action="addOrEditAccount" method="post"
+        <form accept-charset="utf-8" action="addOrEditAccount" method="post"
               tal:condition="python:section == 'confirm'">
           <table cellpadding="5" cellspacing="0" border="0" class="content"
                  tal:define="pss modules/Products/PythonScripts/standard;

Index: test.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/test.zpt,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- test.zpt	17 May 2005 07:58:30 -0000	1.4
+++ test.zpt	3 Nov 2005 12:06:14 -0000	1.4.2.1
@@ -8,7 +8,7 @@
       Enter a raw email below (including all headers) to test the email
       processing engine.
     </p>
-    <form action="testMail" method="post">
+    <form accept-charset="utf-8" action="testMail" method="post">
       <p>
 	Parent Account:
 	<select name="account_id">

Index: GenerateMail.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/GenerateMail.zpt,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- GenerateMail.zpt	4 May 2005 14:07:52 -0000	1.2
+++ GenerateMail.zpt	3 Nov 2005 12:06:14 -0000	1.2.4.1
@@ -1,5 +1,5 @@
 <html>
-  <form action="generateMail" method="post"
+  <form accept-charset="utf-8" action="generateMail" method="post"
     tal:condition="python:here.sql.listAccounts(email='')">
     Account:
     <select name="account_name">

Index: ticket_index_html.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/ticket_index_html.zpt,v
retrieving revision 1.81.2.3
retrieving revision 1.81.2.4
diff -u -d -r1.81.2.3 -r1.81.2.4
--- ticket_index_html.zpt	24 Oct 2005 14:54:57 -0000	1.81.2.3
+++ ticket_index_html.zpt	3 Nov 2005 12:06:14 -0000	1.81.2.4
@@ -129,7 +129,7 @@
     <!-- End support_cell_left slot -->
 
     <!-- options_table slot -->
-    <form metal:fill-slot="options_table" method="post"
+    <form accept-charset="utf-8" metal:fill-slot="options_table" method="post"
           tal:define="method python:test(request.get('details'),
                                          'save', 'change')"
           tal:attributes="action python:'ticket/%06d/%s' % (here.id, method)">
@@ -664,7 +664,7 @@
         <!-- End display of existing messages. -->
 
          <!-- Form to add message. -->
-        <form tal:condition="python:here.status != 'closed' and user.has_role('Tickets')"
+        <form accept-charset="utf-8" tal:condition="python:here.status != 'closed' and user.has_role('Tickets')"
               tal:attributes="action python:'ticket/%06d' % here.id"
               tal:define="template_name request/template_name | string:_plain;
                           body_is_html request/body_is_html | python:0;

Index: manage_migrateForm.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/manage_migrateForm.zpt,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- manage_migrateForm.zpt	13 Sep 2005 16:24:27 -0000	1.3.2.1
+++ manage_migrateForm.zpt	3 Nov 2005 12:06:14 -0000	1.3.2.2
@@ -29,7 +29,7 @@
 </p>
 
 
-<form action="migrate" method="post">
+<form accept-charset="utf-8" action="migrate" method="post">
   <table cellspacing="0" cellpadding="2" border="0">
 
     <!-- Pre 10 migration -->

Index: macros.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/macros.zpt,v
retrieving revision 1.8
retrieving revision 1.8.8.1
diff -u -d -r1.8 -r1.8.8.1
--- macros.zpt	21 Feb 2005 16:21:35 -0000	1.8
+++ macros.zpt	3 Nov 2005 12:06:14 -0000	1.8.8.1
@@ -19,7 +19,7 @@
     <tr>
       <td class="shade">
 
-        <form action="quickFind" method="post">
+        <form accept-charset="utf-8" action="quickFind" method="post">
           <table cellpadding="3" cellspacing="0" border="0" class="content">
             <tr>
               <td colspan="2">

Index: GroupSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/GroupSettings.zpt,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- GroupSettings.zpt	7 Oct 2005 14:23:46 -0000	1.18.2.1
+++ GroupSettings.zpt	3 Nov 2005 12:06:14 -0000	1.18.2.2
@@ -95,7 +95,7 @@
 	  <!-- end if section in ('list', 'remove') -->
 
 	  <!-- if section == 'add' -->
-          <form action="addGroup" method="post"
+          <form accept-charset="utf-8" action="addGroup" method="post"
                 tal:condition="python:section == 'add'">
             <table cellpadding="5" cellspacing="0" border="0" class="content">
               <tr class="table_head">
@@ -140,7 +140,7 @@
 	  <!-- end if section == 'add' -->
 
 	  <!-- if section == 'edit' -->
-          <form action="editGroup" method="post"
+          <form accept-charset="utf-8" action="editGroup" method="post"
                 tal:condition="python:section == 'edit'">
             <table cellpadding="5" cellspacing="0" border="0" class="content">
               <tr class="table_head">
@@ -187,7 +187,7 @@
 	  <!-- end if section == 'edit' -->
 
 	  <!-- if section == 'delete' -->
-          <form action="delGroup" method="post"
+          <form accept-charset="utf-8" action="delGroup" method="post"
                 tal:condition="python:section == 'delete'">
 
             <table cellpadding="5" cellspacing="0" border="0" class="content"