1
=== modified file 'Mailman/Cgi/listinfo.py'
2
--- Mailman/Cgi/listinfo.py	2009-08-14 15:41:17 +0000
3
+++ Mailman/Cgi/listinfo.py	2012-06-28 22:40:23 +0000
4
@@ -22,6 +22,7 @@
5
22
import os
22
import os
6
23
import cgi
23
import cgi
7
24
24
8
25
from Mailman import DlistUtils
9
25
from Mailman import mm_cfg
26
from Mailman import mm_cfg
10
26
from Mailman import Utils
27
from Mailman import Utils
11
27
from Mailman import MailList
28
from Mailman import MailList
12
@@ -36,7 +37,6 @@
13
36
i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
37
i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
14
37
38
15
38
39
16
39
17
40
40
18
41
def main():
41
def main():
19
42
    parts = Utils.GetPathPieces()
42
    parts = Utils.GetPathPieces()
20
43
    if not parts:
43
    if not parts:
21
@@ -53,6 +53,8 @@
22
53
        syslog('error', 'No such list "%s": %s', listname, e)
53
        syslog('error', 'No such list "%s": %s', listname, e)
23
54
        return
54
        return
24
55
55
25
56
    ##acoconut formquestion = DlistUtils.FormQuestion(mlist)
26
57
    ##acoconut formquestion.recordAnswer("coconut@coconut.net", 1, "yes, i am", 1)
27
56
    # See if the user want to see this page in other language
58
    # See if the user want to see this page in other language
28
57
    cgidata = cgi.FieldStorage()
59
    cgidata = cgi.FieldStorage()
29
58
    language = cgidata.getvalue('language')
60
    language = cgidata.getvalue('language')
30
@@ -62,7 +64,6 @@
31
62
    list_listinfo(mlist, language)
64
    list_listinfo(mlist, language)
32
63
65
33
64
66
34
65
35
66
67
36
67
def listinfo_overview(msg=''):
68
def listinfo_overview(msg=''):
37
68
    # Present the general listinfo overview
69
    # Present the general listinfo overview
38
69
    hostname = Utils.get_domain()
70
    hostname = Utils.get_domain()
39
@@ -152,7 +153,6 @@
40
152
    print doc.Format()
153
    print doc.Format()
41
153
154
42
154
155
43
155
44
156
156
45
157
def list_listinfo(mlist, lang):
157
def list_listinfo(mlist, lang):
46
158
    # Generate list specific listinfo
158
    # Generate list specific listinfo
47
159
    doc = HeadlessDocument()
159
    doc = HeadlessDocument()
48
@@ -190,9 +190,22 @@
49
190
    # If activated, the content and presence of questions and a field to answer them. Added by Systers.
190
    # If activated, the content and presence of questions and a field to answer them. Added by Systers.
50
191
    try:
191
    try:
51
192
        if mlist.essay_enabled:
192
        if mlist.essay_enabled:
55
193
            replacements['<mm-questions>'] = """<TR>
193
            html_questions = [] # Added to support subscribe essays
56
194
            <TD COLSPAN="3">""" + mlist.questions
194
            for question in mlist.questions:
57
195
            replacements['<mm-essay-box>'] = TextArea('essay', '', rows=8, cols=60).Format() + """        </TD></TR>"""# Added to support subscribe essays
195
                html_questions.append("""<TR> 
58
196
                <TD COLSPAN="3">""" + question[0] + """</TD>""")
59
197
                if (question[2] == 'smallbox'):
60
198
                    html_questions.append("""<TD>""" + TextArea(question[1],\
61
199
                            '', rows=1, cols=60).Format() + """</TD></TR>""") 
62
200
                elif (question[2] == 'largebox'):
63
201
                    html_questions.append("""<TD>""" + TextArea(question[1], \
64
202
                            '', rows=8, cols=60).Format() + """</TD></TR>""") 
65
203
                elif (question[2] == 'checkbox'):
66
204
                    #TODO (Ana Cutillas): consider creating a class like TextArea for checkboxes?
67
205
                    html_questions.append("""<TD><input type='checkbox' name='""" + \
68
206
                            question[1] + """' value ='""" + \
69
207
                            question[1] + """'></TD></TR>""") 
70
208
            replacements['<mm-questions>'] = ''.join(html_questions)
71
196
        else:
209
        else:
72
197
            replacements['<mm-questions>'] = ''
210
            replacements['<mm-questions>'] = ''
73
198
            replacements['<mm-essay-box>'] = ''
211
            replacements['<mm-essay-box>'] = ''
74
199
212
75
=== modified file 'Mailman/DlistUtils.py'
76
--- Mailman/DlistUtils.py	2010-01-31 20:29:48 +0000
77
+++ Mailman/DlistUtils.py	2012-06-28 22:40:23 +0000
78
@@ -40,17 +40,17 @@
79
40
        if self == classObject:
40
        if self == classObject:
80
41
            if self.store == None:#for the case when same object is used for calling more than one functions
41
            if self.store == None:#for the case when same object is used for calling more than one functions
81
42
                self.store = Store(self.database)
42
                self.store = Store(self.database)
83
43
                result = f(self,*args)
43
                result = f(self, *args)
84
44
                self.store.commit()
44
                self.store.commit()
85
45
                self.store.close()
45
                self.store.close()
86
46
                self.store = None
46
                self.store = None
87
47
            else:#To handle the nesting issue
47
            else:#To handle the nesting issue
89
48
                result = f(self,*args)
48
                result = f(self, *args)
90
49
                self.store.commit()
49
                self.store.commit()
91
50
        else:#for the case whenever a new object calls its decorated member function
50
        else:#for the case whenever a new object calls its decorated member function
92
51
            classObject = self
51
            classObject = self
93
52
            self.store = Store(self.database)
52
            self.store = Store(self.database)
95
53
            result = f(self,*args)
53
            result = f(self, *args)
96
54
            self.store.commit()
54
            self.store.commit()
97
55
            self.store.close()
55
            self.store.close()
98
56
            self.store = None
56
            self.store = None
99
@@ -60,14 +60,14 @@
100
60
#Define all the classes corresponding to the tables in the database
60
#Define all the classes corresponding to the tables in the database
101
61
class Subscriber(object):
61
class Subscriber(object):
102
62
    __storm_table__ = "subscriber"
62
    __storm_table__ = "subscriber"
104
63
    subscriber_id = Int(primary = True,default = AutoReload)
63
    subscriber_id = Int(primary = True, default = AutoReload)
105
64
    mailman_key = Unicode()
64
    mailman_key = Unicode()
106
65
    preference = Int(default = 1)
65
    preference = Int(default = 1)
107
66
    format = Int(default = 3)
66
    format = Int(default = 3)
108
67
    deleted = Bool(default = False)
67
    deleted = Bool(default = False)
109
68
    suppress = Int(default = 0)
68
    suppress = Int(default = 0)
110
69
69
112
70
    def __init__(self,mlist):
70
    def __init__(self, mlist):
113
71
        self.mlist = mlist
71
        self.mlist = mlist
114
72
        self.database = getConn(mlist)
72
        self.database = getConn(mlist)
115
73
73
116
@@ -76,11 +76,11 @@
117
76
        if addr == None:
76
        if addr == None:
118
77
            return None
77
            return None
119
78
78
121
79
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(addr.lower(),'utf-8'))\na = [(subscriber.subscriber_id) for subscriber in result]\n"
79
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(addr.lower(),'utf-8'))\na = [(subscriber.subscriber_id) for subscriber in result]\n"
122
80
        if DEBUG_MODE:
80
        if DEBUG_MODE:
123
81
            syslog('info', "DlistUtils:(getSubscriber_id_raw)executing query:\n%s", command)
81
            syslog('info', "DlistUtils:(getSubscriber_id_raw)executing query:\n%s", command)
124
82
        #storm recognizes unicode only
82
        #storm recognizes unicode only
126
83
        result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(addr.lower(),"utf-8")) 
83
        result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(addr,"utf-8")) 
127
84
        a = [(subscriber.subscriber_id) for subscriber in result]
84
        a = [(subscriber.subscriber_id) for subscriber in result]
128
85
        if DEBUG_MODE:
85
        if DEBUG_MODE:
129
86
            syslog('info', 'value of a is: %s\n', a)
86
            syslog('info', 'value of a is: %s\n', a)
130
@@ -136,70 +136,70 @@
131
136
    @decfunc
136
    @decfunc
132
137
    def setDisable(self, member, flag):
137
    def setDisable(self, member, flag):
133
138
        """Disable/enable delivery based on mm_cfg.DisableDelivery"""
138
        """Disable/enable delivery based on mm_cfg.DisableDelivery"""
135
139
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8'))\noldval = [(subscriber.suppress) for subscriber in result]\n"
139
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8'))\noldval = [(subscriber.suppress) for subscriber in result]\n"
136
140
        if DEBUG_MODE:
140
        if DEBUG_MODE:
139
141
            syslog('info', 'DlistUtils(setDisable):Executing query:\n%s\n Member whoes suppress value is to be found \n %s', command,member)
141
            syslog('info', 'DlistUtils(setDisable):Executing query:\n%s\n Member whose suppress value is to be found \n %s', command, member)
140
142
        result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8"))
142
        result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8"))
141
143
        oldval = [(subscriber.suppress) for subscriber in result]
143
        oldval = [(subscriber.suppress) for subscriber in result]
142
144
	if oldval == []:
144
	if oldval == []:
143
145
	    if DEBUG_MODE:
145
	    if DEBUG_MODE:
144
146
	        syslog('info','oldval is an empty list.\nThis can happen either because of\n 1)Permission issues (Do a: bin/check_perms)\n 2)Inconsistency between database and pickle files (A user is in the database but not in pickle files or vice versa,Do a bin/find_problems.py)')
146
	        syslog('info','oldval is an empty list.\nThis can happen either because of\n 1)Permission issues (Do a: bin/check_perms)\n 2)Inconsistency between database and pickle files (A user is in the database but not in pickle files or vice versa,Do a bin/find_problems.py)')
145
147
        oldval = oldval[0]
147
        oldval = oldval[0]
146
148
	if DEBUG_MODE:
148
	if DEBUG_MODE:
148
149
            syslog('info','the value of oldval is %s:',oldval)
149
            syslog('info','the value of oldval is %s:', oldval)
149
150
150
150
151
        if flag:
151
        if flag:
151
152
            newval = oldval | 1          # Disable delivery
152
            newval = oldval | 1          # Disable delivery
152
153
        else:
153
        else:
153
154
            newval = oldval & ~1          # Enable delivery
154
            newval = oldval & ~1          # Enable delivery
154
155
        if DEBUG_MODE:
155
        if DEBUG_MODE:
157
156
            syslog('info','the value of newval is %s:',newval)
156
            syslog('info','the value of newval is %s:', newval)
158
157
        command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8')).set(suppress = newval)\n"
157
        command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8')).set(suppress = newval)\n"
159
158
        if DEBUG_MODE:
158
        if DEBUG_MODE:
160
159
            syslog('info', 'DlistUtils(setDisable):Executing query:\n%s', command)
159
            syslog('info', 'DlistUtils(setDisable):Executing query:\n%s', command)
162
160
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8")).set(suppress = newval)       
160
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8")).set(suppress = newval)       
163
161
161
164
162
    @decfunc
162
    @decfunc
165
163
    def setDigest(self, member, flag):
163
    def setDigest(self, member, flag):
166
164
        """Disable/enable delivery based on user digest status"""
164
        """Disable/enable delivery based on user digest status"""
167
165
165
169
166
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8'))\noldval = [(subscriber.suppress) for subscriber in result]\n"
166
        command = "result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8'))\noldval = [(subscriber.suppress) for subscriber in result]\n"
170
167
        if DEBUG_MODE:
167
        if DEBUG_MODE:
171
168
            syslog('info', 'DlistUtils(setDigest):Executing query:\n%s', command)
168
            syslog('info', 'DlistUtils(setDigest):Executing query:\n%s', command)
173
169
        result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8"))
169
        result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8"))
174
170
        oldval = [(subscriber.suppress) for subscriber in result]
170
        oldval = [(subscriber.suppress) for subscriber in result]
175
171
	if oldval == []:
171
	if oldval == []:
176
172
	    if DEBUG_MODE:
172
	    if DEBUG_MODE:
177
173
	        syslog('info','oldval is an empty list.\nThis can happen either because of\n 1)permission issues (Do a: bin/check_perms)\n 2)Inconsistency between database and pickle files (A user is in the database but not in pickle files or vice versa,Do a bin/find_problems.py)')
173
	        syslog('info','oldval is an empty list.\nThis can happen either because of\n 1)permission issues (Do a: bin/check_perms)\n 2)Inconsistency between database and pickle files (A user is in the database but not in pickle files or vice versa,Do a bin/find_problems.py)')
178
174
        oldval = oldval[0]
174
        oldval = oldval[0]
179
175
        if DEBUG_MODE:
175
        if DEBUG_MODE:
181
176
            syslog('info','value of oldval %s:',oldval)
176
            syslog('info','value of oldval %s:', oldval)
182
177
177
183
178
        if flag:
178
        if flag:
184
179
            newval = oldval | 2          # Suppress delivery (in favor of digests)
179
            newval = oldval | 2          # Suppress delivery (in favor of digests)
185
180
        else:
180
        else:
186
181
            newval = oldval & ~2          # Enable delivery (instead of digests)
181
            newval = oldval & ~2          # Enable delivery (instead of digests)
187
182
182
189
183
        command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8')).set(suppress = newval)\n"
183
        command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8')).set(suppress = newval)\n"
190
184
        if DEBUG_MODE:
184
        if DEBUG_MODE:
191
185
            syslog('info', 'DlistUtils(setDigest):Executing query:\n%s', command)
185
            syslog('info', 'DlistUtils(setDigest):Executing query:\n%s', command)
193
186
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8")).set(suppress = newval)
186
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8")).set(suppress = newval)
194
187
187
195
188
    @decfunc
188
    @decfunc
196
189
    def changePreference(self, member, preference):
189
    def changePreference(self, member, preference):
197
190
        """Change a user's default preference for new threads."""
190
        """Change a user's default preference for new threads."""
199
191
        command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8')).set(preference = preference)\n"
191
        command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8')).set(preference = preference)\n"
200
192
        if DEBUG_MODE:
192
        if DEBUG_MODE:
201
193
            syslog('info', 'DlistUtils(changePreference):Executing query:\n%s', command)    
193
            syslog('info', 'DlistUtils(changePreference):Executing query:\n%s', command)    
203
194
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8")).set(preference = preference)
194
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8")).set(preference = preference)
204
195
195
205
196
    @decfunc
196
    @decfunc
206
197
    def changeFormat(self, member, format):
197
    def changeFormat(self, member, format):
207
198
        """Change a user's preferred delivery format (plain text and/or html)"""
198
        """Change a user's preferred delivery format (plain text and/or html)"""
209
199
        command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,'utf-8')).set(format = format)\n"
199
        command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,'utf-8')).set(format = format)\n"
210
200
        if DEBUG_MODE:
200
        if DEBUG_MODE:
211
201
            syslog('info', 'DlistUtils(changeFormat):Executing query:\n%s', command)
201
            syslog('info', 'DlistUtils(changeFormat):Executing query:\n%s', command)
213
202
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(member,"utf-8")).set(format = format)    
202
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(member,"utf-8")).set(format = format)    
214
203
203
215
204
    ### We have to watch out for a tricky case (that actually happened):
204
    ### We have to watch out for a tricky case (that actually happened):
216
205
    ### User foo@bar.com changes her address to something already in the
205
    ### User foo@bar.com changes her address to something already in the
217
@@ -207,32 +207,32 @@
218
207
    @decfunc
207
    @decfunc
219
208
    def changeAddress(self, oldaddr, newaddr):
208
    def changeAddress(self, oldaddr, newaddr):
220
209
        """Change email address in SQL database"""
209
        """Change email address in SQL database"""
223
210
        #if DEBUG_MODE:
210
        if DEBUG_MODE:
224
211
        #syslog('info', "Changing email address on %s from '%s' to '%s'", self.mlist.internal_name(), oldaddr, newaddr)
211
        	syslog('info', "Changing email address on %s from '%s' to '%s'", self.mlist.internal_name(), oldaddr, newaddr)
225
212
        ## Check if newaddr is in sql database        
212
        ## Check if newaddr is in sql database        
227
213
        num_matches = self.store.find(Subscriber,Subscriber.mailman_key == unicode(newaddr,"utf-8")).count()
213
        num_matches = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(newaddr.lower(),"utf-8")).count()
228
214
214
229
215
        if num_matches > 1:
215
        if num_matches > 1:
231
216
            #syslog('error', 'Multiple users with same key (%s): %s', self.mlist.internal_name(), newaddr)
216
            syslog('error', 'Multiple users with same key (%s): %s', self.mlist.internal_name(), newaddr)
232
217
            return
217
            return
233
218
        if num_matches == 1:
218
        if num_matches == 1:
234
219
            self.mergeSubscribers(oldaddr, newaddr)
219
            self.mergeSubscribers(oldaddr, newaddr)
235
220
220
237
221
        command = "num_matches = self.store.find(Subscriber,Subscriber.mailman_key == unicode(newaddr,'utf-8')).count()\nself.store.find(Subscriber,Subscriber.mailman_key == unicode(oldaddr,'utf-8')).set(mailman_key = unicode(newaddr,'utf-8'))\nself.store.find(Subscriber,Subscriber.mailman_key == unicode(newaddr,'utf-8')).set(deleted = False)\n"
221
        command = "num_matches = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(newaddr,'utf-8')).count()\nself.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(oldaddr,'utf-8')).set(mailman_key = unicode(newaddr,'utf-8'))\nself.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(newaddr.lower(),'utf-8')).set(deleted = False)\n"
238
222
        if DEBUG_MODE:
222
        if DEBUG_MODE:
239
223
            syslog('info', 'DlistUtils(changeAddress):Executing query:\n%s', command)
223
            syslog('info', 'DlistUtils(changeAddress):Executing query:\n%s', command)
241
224
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(oldaddr,"utf-8")).set(mailman_key = unicode(newaddr,"utf-8")) 
224
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(oldaddr,"utf-8")).set(mailman_key = unicode(newaddr,"utf-8")) 
242
225
        self.store.commit()            
225
        self.store.commit()            
244
226
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(newaddr,"utf-8")).set(deleted = False)
226
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(newaddr.lower(),"utf-8")).set(deleted = False)
245
227
227
246
228
    @decfunc
228
    @decfunc
247
229
    def unsubscribeFromList(self, key):
229
    def unsubscribeFromList(self, key):
248
230
        """Indicate that a user has unsubscribed by setting the deleted flag in the subscriber table."""
230
        """Indicate that a user has unsubscribed by setting the deleted flag in the subscriber table."""
249
231
231
251
232
        command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,'utf-8')).set(deleted = True)\nself.store.find(Alias,Alias.subscriber_id == subscriber_id).remove()\n"
232
        command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key,'utf-8')).set(deleted = True)\nself.store.find(Alias,Alias.subscriber_id == subscriber_id).remove()\n"
252
233
        if DEBUG_MODE:
233
        if DEBUG_MODE:
253
234
            syslog('info', 'DlisUtils(unsubscribeFromList):Executing query:\n%s', command)          
234
            syslog('info', 'DlisUtils(unsubscribeFromList):Executing query:\n%s', command)          
255
235
        self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,"utf-8")).set(deleted = True)
235
        self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key,"utf-8")).set(deleted = True)
256
236
        # get the subscriber id from the mailman_key & delete all aliases  
236
        # get the subscriber id from the mailman_key & delete all aliases  
257
237
        subscriber_id = self.getSubscriber_id_raw(key)
237
        subscriber_id = self.getSubscriber_id_raw(key)
258
238
238
259
@@ -245,20 +245,27 @@
260
245
    def subscribeToList(self, key):
245
    def subscribeToList(self, key):
261
246
        """Add a member to the subscriber database, or change the record from deleted if it was already present."""
246
        """Add a member to the subscriber database, or change the record from deleted if it was already present."""
262
247
247
264
248
        command = "count = (self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,'utf-8'))).count()\n"
248
        command = "count = (self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),'utf-8'))).count()\n"
265
249
        if DEBUG_MODE:
249
        if DEBUG_MODE:
266
250
            syslog('info', 'DlistUtils(subscribeToList):Executing query:\n%s', command)
250
            syslog('info', 'DlistUtils(subscribeToList):Executing query:\n%s', command)
267
251
        # First see if member is subscribed with deleted field = false
251
        # First see if member is subscribed with deleted field = false
269
252
        count = (self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,"utf-8"))).count()
252
        count = (self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),"utf-8"))).count()
270
253
253
271
254
        if count:
254
        if count:
273
255
            command = "self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,'utf-8')).set(deleted = False)"
255
            command = "self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),'utf-8')).set(deleted = False)"
274
256
            if DEBUG_MODE:
256
            if DEBUG_MODE:
275
257
                syslog('info', 'DlistUtils(subscribeToList):Executing query:\n%s', command)
257
                syslog('info', 'DlistUtils(subscribeToList):Executing query:\n%s', command)
277
258
            self.store.find(Subscriber,Subscriber.mailman_key == unicode(key,"utf-8")).set(deleted = False)
258
            self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),"utf-8")).set(deleted = False)
278
259
279
260
	    result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),"utf-8"))
280
261
            Email = [(subscriber.mailman_key) for subscriber in result]
281
262
	    Email = Email[0]
282
263
	    if Email != key: #That is if one was in lowercase and other in uppercase then update mailman_key with case sensitivity same as key
283
264
		self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(key.lower(),"utf-8")).set(mailman_key = unicode(key,"utf-8"))
284
265
	    
285
259
        else:
266
        else:
286
260
            # format is text-only (1) by default
267
            # format is text-only (1) by default
288
261
            command = "subscriber = self.store.add(Subscriber())\nsubscriber.mailman_key = unicode(key,'utf-8')\nsubscriber.preference = 1\nsubscriber.deleted = False\nsubscriber.format = 1\nsubscriber.suppress = 0"
268
            command = "subscriber = self.store.add(Subscriber())\nmailman_key = unicode(key,'utf-8')\npreference = 1\ndeleted = False\nformat = 1\nsuppress = 0"
289
262
            if DEBUG_MODE:
269
            if DEBUG_MODE:
290
263
                syslog('info', 'DlistUtils(subscribeToList)Executing query:\n%s', command)
270
                syslog('info', 'DlistUtils(subscribeToList)Executing query:\n%s', command)
291
264
            self.mailman_key = unicode(key,"utf-8")
271
            self.mailman_key = unicode(key,"utf-8")
292
@@ -273,12 +280,12 @@
293
273
        # use the original subscriber id as the ID going forward
280
        # use the original subscriber id as the ID going forward
294
274
        if DEBUG_MODE:
281
        if DEBUG_MODE:
295
275
            syslog('info', 'Executing commands of mergeSubscribers:')
282
            syslog('info', 'Executing commands of mergeSubscribers:')
297
276
        result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(oldaddr,"utf-8"))
283
        result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(oldaddr,"utf-8"))
298
277
        new_id = [(subscriber.subscriber_id) for subscriber in result]
284
        new_id = [(subscriber.subscriber_id) for subscriber in result]
299
278
        new_id = new_id[0]
285
        new_id = new_id[0]
300
279
        if DEBUG_MODE:
286
        if DEBUG_MODE:
301
280
            syslog('info', 'the value of new_id: %s', new_id)
287
            syslog('info', 'the value of new_id: %s', new_id)
303
281
        result = self.store.find(Subscriber,Subscriber.mailman_key == unicode(newaddr,"utf-8"))
288
        result = self.store.find(Subscriber,Subscriber.mailman_key.lower() == unicode(newaddr.lower(),"utf-8"))
304
282
        obsolete_id = [(subscriber.subscriber_id) for subscriber in result]
289
        obsolete_id = [(subscriber.subscriber_id) for subscriber in result]
305
283
        obsolete_id = obsolete_id[0]    
290
        obsolete_id = obsolete_id[0]    
306
284
        if DEBUG_MODE:
291
        if DEBUG_MODE:
307
@@ -291,13 +298,13 @@
308
291
298
309
292
class Message(object):
299
class Message(object):
310
293
    __storm_table__ = "message"
300
    __storm_table__ = "message"
312
294
    message_id = Int(primary = True,default = AutoReload)
301
    message_id = Int(primary = True, default = AutoReload)
313
295
    sender_id = Int()
302
    sender_id = Int()
315
296
    subscriber = Reference(sender_id,Subscriber.subscriber_id)
303
    subscriber = Reference(sender_id, Subscriber.subscriber_id)
316
297
    subject = Unicode()
304
    subject = Unicode()
317
298
    thread_id = Int()
305
    thread_id = Int()
318
299
306
320
300
    def __init__(self,mlist):
307
    def __init__(self, mlist):
321
301
        self.mlist = mlist
308
        self.mlist = mlist
322
302
        self.database = getConn(mlist)
309
        self.database = getConn(mlist)
323
303
310
324
@@ -314,7 +321,7 @@
325
314
            threadID = -1
321
            threadID = -1
326
315
        command = "message = self.store.add(Message())\nmessage.sender_id = senderID\nmessage.thread_id = threadID\nmessage.subject = unicode(subject,'utf-8')\nmessageID = self.store.find(Message).max(Message.message_id)\n"
322
        command = "message = self.store.add(Message())\nmessage.sender_id = senderID\nmessage.thread_id = threadID\nmessage.subject = unicode(subject,'utf-8')\nmessageID = self.store.find(Message).max(Message.message_id)\n"
327
316
        if DEBUG_MODE:
323
        if DEBUG_MODE:
329
317
            syslog('info','DlistUtils:(createMessage)executing query:\n%s',command)
324
            syslog('info','DlistUtils:(createMessage)executing query:\n%s', command)
330
318
        #message_id has autoreload set,its value will be serially updated in database 
325
        #message_id has autoreload set,its value will be serially updated in database 
331
319
        self.sender_id = senderID
326
        self.sender_id = senderID
332
320
        self.thread_id = threadID
327
        self.thread_id = threadID
333
@@ -322,19 +329,19 @@
334
322
        self.store.add(self) 
329
        self.store.add(self) 
335
323
        messageID = self.store.find(Message).max(Message.message_id)     
330
        messageID = self.store.find(Message).max(Message.message_id)     
336
324
        if DEBUG_MODE:
331
        if DEBUG_MODE:
338
325
            syslog('info','Result of query(messageID) is: %s\n',messageID)
332
            syslog('info','Result of query(messageID) is: %s\n', messageID)
339
326
        return messageID
333
        return messageID
340
327
334
341
328
class Thread(object):
335
class Thread(object):
342
329
    __storm_table__ = "thread"
336
    __storm_table__ = "thread"
344
330
    thread_id = Int(primary = True,default = AutoReload)
337
    thread_id = Int(primary = True, default = AutoReload)
345
331
    thread_name = Unicode()
338
    thread_name = Unicode()
346
332
    base_message_id = Int()
339
    base_message_id = Int()
348
333
    message = Reference(base_message_id,Message.message_id)
340
    message = Reference(base_message_id, Message.message_id)
349
334
    status = Int(default = 0)
341
    status = Int(default = 0)
350
335
    parent = Int()
342
    parent = Int()
351
336
343
353
337
    def __init__(self,mlist):
344
    def __init__(self, mlist):
354
338
        self.mlist = mlist
345
        self.mlist = mlist
355
339
        self.database = getConn(mlist)
346
        self.database = getConn(mlist)
356
340
347
357
@@ -347,7 +354,7 @@
358
347
        senderID = subscriber.getSubscriber_id(msg, msgdata, safe=1, loose=1)
354
        senderID = subscriber.getSubscriber_id(msg, msgdata, safe=1, loose=1)
359
348
        command = "thread = self.store.add(Thread())\nthread.base_message_id = msgdata['message_id']\nthreadID = self.store.find(Thread).max(Thread.thread_id)\nself.store.find(Message,Message.message_id == msgdata['message_id']).set(thread_id = threadID)\n"
355
        command = "thread = self.store.add(Thread())\nthread.base_message_id = msgdata['message_id']\nthreadID = self.store.find(Thread).max(Thread.thread_id)\nself.store.find(Message,Message.message_id == msgdata['message_id']).set(thread_id = threadID)\n"
360
349
        if DEBUG_MODE:
356
        if DEBUG_MODE:
362
350
            syslog('info','DlistUtils:(createThread)executing query:\n%s',command)
357
            syslog('info','DlistUtils:(createThread)executing query:\n%s', command)
363
351
        self.base_message_id = msgdata['message_id']
358
        self.base_message_id = msgdata['message_id']
364
352
        self.store.add(self)
359
        self.store.add(self)
365
353
        threadID = self.store.find(Thread).max(Thread.thread_id)          
360
        threadID = self.store.find(Thread).max(Thread.thread_id)          
366
@@ -370,7 +377,7 @@
367
370
        threadBase = threadBase[:13]
377
        threadBase = threadBase[:13]
368
371
        command = "num = self.store.find(Thread,Thread.thread_name == unicode(threadBase,'utf-8')).count()\nself.store.find(Thread,Thread.thread_id == threadID).set(thread_name = threadName)\n"
378
        command = "num = self.store.find(Thread,Thread.thread_name == unicode(threadBase,'utf-8')).count()\nself.store.find(Thread,Thread.thread_id == threadID).set(thread_name = threadName)\n"
369
372
        if DEBUG_MODE:
379
        if DEBUG_MODE:
371
373
            syslog('info','DlistUtils:(createThread)executing query:\n%s',command)
380
            syslog('info','DlistUtils:(createThread)executing query:\n%s', command)
372
374
        # If the threadBase is not unique, make threadBase unique by appending a number
381
        # If the threadBase is not unique, make threadBase unique by appending a number
373
375
        num = self.store.find(Thread,Thread.thread_name.like(unicode(threadBase + "%","utf-8"))).count()
382
        num = self.store.find(Thread,Thread.thread_name.like(unicode(threadBase + "%","utf-8"))).count()
374
376
        if not num:
383
        if not num:
375
@@ -405,26 +412,24 @@
376
405
        msg['To'] =  '%s+%s@%s' % (self.mlist.internal_name(),
412
        msg['To'] =  '%s+%s@%s' % (self.mlist.internal_name(),
377
406
                             	   name,
413
                             	   name,
378
407
                             	   self.mlist.host_name)    
414
                             	   self.mlist.host_name)    
380
408
        for i in (1,2):
415
        for i in (1, 2):
381
409
            # different footers for different prefs, so we need to queue separately
416
            # different footers for different prefs, so we need to queue separately
382
410
            if(i==1):
417
            if(i==1):
383
411
                #For condition where preference = True
418
                #For condition where preference = True
384
412
                pref=True
419
                pref=True
388
413
           #     command = "lists = [(subscriber.mailman_key.encode('utf-8')) for subscriber in result_new_sql]\n"
420
                if DEBUG_MODE:
389
414
            #    if DEBUG_MODE:
421
                    syslog('info', 'DlistUtils:(newThread)executing query:\nfor pref = true\n\n')
387
415
             #       syslog('info', 'DlistUtils:(newThread)executing query:\n%sfor pref = true\n', command)
390
416
            if(i==2):
422
            if(i==2):
391
417
                #For condition where preference = False
423
                #For condition where preference = False
392
418
                pref=False
424
                pref=False
396
419
              #  command = "lists = [(subscriber.mailman_key.encode('utf-8')) for subscriber in result_new_sql]\n"
425
                if DEBUG_MODE:
397
420
               # if DEBUG_MODE:
426
                    syslog('info', 'DlistUtils:(newThread)executing query:\nfor pref = false\n\n')
395
421
                #    syslog('info', 'DlistUtils:(newThread)executing query:\n%sfor pref = false\n', command)
398
422
427
399
423
            #Execute a SELECT statement, to find the list of matching subscribers.
428
            #Execute a SELECT statement, to find the list of matching subscribers.
400
424
            result_new_sql = self.store.find(Subscriber,And(Subscriber.preference == pref,Subscriber.deleted == False,Subscriber.suppress == 0))
429
            result_new_sql = self.store.find(Subscriber,And(Subscriber.preference == pref,Subscriber.deleted == False,Subscriber.suppress == 0))
401
425
            lists = [(subscriber.mailman_key.encode('utf-8')) for subscriber in result_new_sql]
430
            lists = [(subscriber.mailman_key.encode('utf-8')) for subscriber in result_new_sql]
402
426
            if DEBUG_MODE:
431
            if DEBUG_MODE:
404
427
                syslog('info', 'value of lists: %s\n', lists)
432
                syslog('info','value of lists: %s\n', lists)
405
428
            self.email_recipients(msg, msgdata, lists, pref)
433
            self.email_recipients(msg, msgdata, lists, pref)
406
429
434
407
430
        # Make original message go to nobody (but be archived)
435
        # Make original message go to nobody (but be archived)
408
@@ -514,12 +519,12 @@
409
514
        override = Override(self.mlist)
519
        override = Override(self.mlist)
410
515
        override.override(msg, msgdata, 0)
520
        override.override(msg, msgdata, 0)
411
516
521
413
517
    def alphanumericOnly(self,s):
522
    def alphanumericOnly(self, s):
414
518
        """Filter any non-letter characters from a string"""
523
        """Filter any non-letter characters from a string"""
415
519
        result = [letter for letter in s if letter in string.ascii_letters or letter in string.digits]
524
        result = [letter for letter in s if letter in string.ascii_letters or letter in string.digits]
416
520
        return string.join(result, '')
525
        return string.join(result, '')
417
521
526
419
522
    def subjectToName(self,subject, threadID):
527
    def subjectToName(self, subject, threadID):
420
523
        """Return a lower-case name for a new thread based on the subject, if present, or on the threadID"""
528
        """Return a lower-case name for a new thread based on the subject, if present, or on the threadID"""
421
524
        result = None
529
        result = None
422
525
530
423
@@ -589,9 +594,9 @@
424
589
    __storm_table__ = "alias"    
594
    __storm_table__ = "alias"    
425
590
    pseudonym = Unicode(primary = True)
595
    pseudonym = Unicode(primary = True)
426
591
    subscriber_id = Int()
596
    subscriber_id = Int()
428
592
    subscriber = Reference(subscriber_id,Subscriber.subscriber_id)
597
    subscriber = Reference(subscriber_id, Subscriber.subscriber_id)
429
593
598
431
594
    def __init__(self,mlist):
599
    def __init__(self, mlist):
432
595
        self.mlist = mlist
600
        self.mlist = mlist
433
596
        self.database = getConn(mlist)
601
        self.database = getConn(mlist)
434
597
602
435
@@ -604,8 +609,8 @@
436
604
             syslog('info', 'DlistUtils(canonicalize_sender)Executing query:\n%s', command)
609
             syslog('info', 'DlistUtils(canonicalize_sender)Executing query:\n%s', command)
437
605
610
438
606
        for alias in aliases:
611
        for alias in aliases:
441
607
            #if DEBUG_MODE:
612
            if DEBUG_MODE:
442
608
                #syslog('info', 'Checking if <%s> is an alias', alias)
613
                syslog('info', 'Checking if <%s> is an alias', alias)
443
609
            result = self.store.find((Subscriber,Alias),And(Alias.pseudonym == unicode(alias,'utf-8'),Subscriber.subscriber_id == Alias.subscriber_id))
614
            result = self.store.find((Subscriber,Alias),And(Alias.pseudonym == unicode(alias,'utf-8'),Subscriber.subscriber_id == Alias.subscriber_id))
444
610
            lists = [(subscriber.mailman_key.encode('utf-8')) for (subscriber,alias) in result]
615
            lists = [(subscriber.mailman_key.encode('utf-8')) for (subscriber,alias) in result]
445
611
616
446
@@ -654,12 +659,12 @@
447
654
    __storm_table__ = "override"
659
    __storm_table__ = "override"
448
655
    __storm_primary__ = "subscriber_id", "thread_id"
660
    __storm_primary__ = "subscriber_id", "thread_id"
449
656
    subscriber_id = Int()
661
    subscriber_id = Int()
451
657
    subscriber = Reference(subscriber_id,Subscriber.subscriber_id)
662
    subscriber = Reference(subscriber_id, Subscriber.subscriber_id)
452
658
    thread_id = Int()
663
    thread_id = Int()
454
659
    thread = Reference(thread_id,Thread.thread_id)
664
    thread = Reference(thread_id, Thread.thread_id)
455
660
    preference = Int()
665
    preference = Int()
456
661
666
458
662
    def __init__(self,mlist):
667
    def __init__(self, mlist):
459
663
        self.mlist = mlist
668
        self.mlist = mlist
460
664
        self.database = getConn(mlist)
669
        self.database = getConn(mlist)
461
665
670
462
@@ -709,10 +714,9 @@
463
709
714
464
710
        return 1
715
        return 1
465
711
716
467
712
    def overrideURL(self,list_name, host_name, thread_reference, preference):
717
    def overrideURL(self, list_name, host_name, thread_reference, preference):
468
713
        return 'http://%s/mailman/options/%s?override=%s&preference=%d' % (host_name, list_name, thread_reference, preference)
718
        return 'http://%s/mailman/options/%s?override=%s&preference=%d' % (host_name, list_name, thread_reference, preference)
469
714
719
470
715
471
716
#Functions Independent of the database tables in DlistUtils
720
#Functions Independent of the database tables in DlistUtils
472
717
721
473
718
def GetEmailAddresses(mlist, subscribers):
722
def GetEmailAddresses(mlist, subscribers):
474
@@ -752,13 +756,22 @@
475
752
756
476
753
def _create_database(name):
757
def _create_database(name):
477
754
    """Create a database. This requires us to not be in a transaction."""
758
    """Create a database. This requires us to not be in a transaction."""
479
755
    conn = pgdb.connect(host='localhost', database='postgres',user='mailman', password='mailman')
759
    conn = pgdb.connect(host='localhost', database='postgres', user='mailman', password='mailman')
480
756
    old_iso_lvl = conn.isolation_level
760
    old_iso_lvl = conn.isolation_level
481
757
    conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
761
    conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
482
758
    cursor = conn.cursor()
762
    cursor = conn.cursor()
483
759
    cursor.execute('create database "%s"' % name) 
763
    cursor.execute('create database "%s"' % name) 
484
760
    conn.set_isolation_level(old_iso_lvl)
764
    conn.set_isolation_level(old_iso_lvl)
485
761
765
486
766
def _remove_database(name):
487
767
    """Remove a database. This requires us to not be in a transaction."""
488
768
    conn = pgdb.connect(host='localhost', database='postgres', user='mailman', password='mailman')
489
769
    old_iso_lvl = conn.isolation_level
490
770
    conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
491
771
    cursor = conn.cursor()
492
772
    cursor.execute('DROP DATABASE "%s"' % name) 
493
773
    conn.set_isolation_level(old_iso_lvl)
494
774
495
762
def executeSQL(mlist, commands):
775
def executeSQL(mlist, commands):
496
763
    """Execute a sequence of SQL commands that create tables in the database."""
776
    """Execute a sequence of SQL commands that create tables in the database."""
497
764
    database = getConn(mlist)
777
    database = getConn(mlist)
498
@@ -834,3 +847,9 @@
499
834
    mlist.Save()
847
    mlist.Save()
500
835
    if alreadyLocked == 0:
848
    if alreadyLocked == 0:
501
836
        mlist.Unlock()
849
        mlist.Unlock()
502
850
503
851
def remove_dlist(listname):
504
852
    """ Deletes the corresponding postgres database and tables."""
505
853
    _remove_database(listname)
506
854
    if DEBUG_MODE:
507
855
         syslog('info', "Database %s removed\n", listname)
508
837
856
509
=== modified file 'bin/rmlist'
510
--- bin/rmlist	2009-07-31 10:49:01 +0000
511
+++ bin/rmlist	2012-06-28 22:40:23 +0000
512
@@ -152,12 +152,7 @@
513
152
152
514
153
    # Remove the database in PostgreSQL if it was a dynamic list. Added by Systers.
153
    # Remove the database in PostgreSQL if it was a dynamic list. Added by Systers.
515
154
    try:
154
    try:
522
155
        conn = DlistUtils.getConn(None)
155
        DlistUtils.remove_dlist(listname)
517
156
        old_iso_lvl = conn.isolation_level
518
157
        conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
519
158
        cursor = conn.cursor()
520
159
        cursor.execute('DROP DATABASE "%s"' % listname)
521
160
        conn.set_isolation_level(old_iso_lvl)
523
161
    except:
156
    except:
524
162
        syslog('error', 'Tried to remove the database for %s, no such database (ok if it was a non dlist). If it was a dlist, the postgreSQL database for this list needs to be removed manually.' % listname)
157
        syslog('error', 'Tried to remove the database for %s, no such database (ok if it was a non dlist). If it was a dlist, the postgreSQL database for this list needs to be removed manually.' % listname)
525
163
158
Status:	Superseded
Proposed branch:	lp:~acoconut/systers/flexible_essays
Merge into:	lp:systers
Diff against target:	521 lines (+108/-81) 3 files modified Mailman/Cgi/listinfo.py (+19/-6) Mailman/DlistUtils.py (+88/-69) bin/rmlist (+1/-6)
To merge this branch:	bzr merge lp:~acoconut/systers/flexible_essays
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
beachbrake	2012-06-27	Pending
Robin J	2012-06-27	Pending
Review via email: mp+112331@code.launchpad.net