projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/git/platal
[platal.git]
/
bin
/
lists.rpc.py
diff --git
a/bin/lists.rpc.py
b/bin/lists.rpc.py
index
aac5a23
..
67abde0
100755
(executable)
--- a/
bin/lists.rpc.py
+++ b/
bin/lists.rpc.py
@@
-528,17
+528,24
@@
def get_pending_ops(userdesc, perms, vhost, listname):
helds = []
for id in mlist.GetHeldMessageIds():
ptime, sender, subject, reason, filename, msgdata = mlist.GetRecord(id)
helds = []
for id in mlist.GetHeldMessageIds():
ptime, sender, subject, reason, filename, msgdata = mlist.GetRecord(id)
+ fpath = os.path.join(mm_cfg.DATA_DIR, filename)
try:
try:
- size = os.path.getsize(
os.path.join(mm_cfg.DATA_DIR, filename)
)
+ size = os.path.getsize(
fpath
)
except OSError, e:
if e.errno <> errno.ENOENT: raise
continue
except OSError, e:
if e.errno <> errno.ENOENT: raise
continue
+ try:
+ msg = readMessage(fpath)
+ fromX = msg.has_key("X-Org-Mail")
+ except:
+ pass
helds.append({
'id' : id,
'sender': quote(sender, True),
'size' : size,
'subj' : quote(subject, True),
helds.append({
'id' : id,
'sender': quote(sender, True),
'size' : size,
'subj' : quote(subject, True),
- 'stamp' : ptime
+ 'stamp' : ptime,
+ 'fromx' : fromX
})
if dosave: mlist.Save()
mlist.Unlock()
})
if dosave: mlist.Save()
mlist.Unlock()