decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

add mail interface to users dialog

Browse source
This commit is contained in:
rolux 2011-12-18 09:27:15 +00:00
commit bea69a918c
10 changed files with 632 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/0xdb.jsonc
View file

@ -25,7 +25,8 @@
"canSeeDebugMenu": {"staff": true, "admin": true},
"canSeeFiles": {"staff": true, "admin": true},
"canSeeItem": {"guest": 3, "member": 3, "friend": 4, "staff": 4, "admin": 4},
"canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}
"canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true},
"canSendMail": {"staff": true, "admin": true}
},
/*
clipKeys are the properties that clips can by sorted by.
@ -549,9 +550,12 @@
],
"sendReferrer": false,
"site": {
// FIXME: "from" and "to" would be more intuitive as keys here
"email": {
// E-mail address in contact form (to)
"contact": "0xdb@0xdb.org",
"footer": "-- \n0xDB - http://0xdb.org",
"prefix": "0xDB Newsletter -",
// E-mail address uses by the system (from)
"system": "0xdb@0xdb.org"
},

2
pandora/padma.jsonc
View file

@ -461,6 +461,8 @@
"email": {
// E-mail address in contact form (to)
"contact": "pad.ma@pad.ma",
"footer": "-- \nPad.ma - http://pad.ma",
"prefix": "Pad.ma Newsletter -",
// E-mail address uses by the system (from)
"system": "system@pad.ma"
},

4
pandora/user/models.py
View file

@ -135,6 +135,7 @@ class SessionData(models.Model):
'lastseen': self.lastseen,
'level': 'guest',
'location': self.location,
'newsletter': False,
'notes': '',
'numberoflists': 0,
'screensize': self.screensize,
@ -149,6 +150,7 @@ class SessionData(models.Model):
j['disabled'] = not self.user.is_active
j['email'] = self.user.email
j['level'] = p.get_level()
j['newsletter'] = p.newsletter
j['notes'] = p.notes
j['numberoflists'] = self.user.lists.count()
if keys:
@ -263,6 +265,7 @@ def init_user(user, request=None):
result['level'] = profile.get_level()
result['groups'] = [g.name for g in user.groups.all()]
result['email'] = user.email
result['newsletter'] = profile.newsletter
result['ui'] = profile.get_ui()
result['volumes'] = [v.json() for v in user.volumes.all()]
return result
@ -276,6 +279,7 @@ def user_json(user, keys=None):
'id': ox.to26(user.id),
'lastseen': user.last_login,
'level': p.get_level(),
'newsletter': p.newsletter,
'notes': p.notes,
'numberoflists': user.lists.count(),
'username': user.username,

3
pandora/user/templates/contact_email.txt
View file

@ -3,5 +3,4 @@ Subject: {{subject}}
{{message}}
--
{{sitename}} - {{url}}
{{footer}}

3
pandora/user/templates/contact_receipt.txt
View file

@ -4,5 +4,4 @@ Subject: {{subject}}
{{message}}
--
{{sitename}} - {{url}}
{{footer}}

4
pandora/user/templates/mailout_receipt.txt Normal file
View file

@ -0,0 +1,4 @@
To: {{to|safe}}
Subject: {{subject|safe}}
{{message|safe}}

3
pandora/user/templates/password_reset_email.txt
View file

@ -4,5 +4,4 @@ To reset your password, please use the following code:
If you don't want to reset your password, no further action is required.
--
{{sitename}} - {{url}}
{{footer}}

85
pandora/user/views.py
View file

@ -4,12 +4,11 @@ import random
random.seed()
import re
from django.contrib.auth.models import User
from django.contrib.auth import authenticate, login, logout
from django.template import RequestContext, loader
from django.utils import simplejson as json
from django.conf import settings
from django.core.mail import send_mail, BadHeaderError
from django.core.mail import send_mail, BadHeaderError, EmailMessage
from django.db.models import Sum
from django.shortcuts import redirect
@ -280,6 +279,7 @@ def requestToken(request):
context = RequestContext(request, {
'code': code,
'sitename': settings.SITENAME,
'footer': settings.CONFIG['site']['email']['footer'],
'url': request.build_absolute_uri('/'),
})
message = template.render(context)
@ -333,6 +333,8 @@ def editUser(request):
profile.set_level(data['level'])
if 'notes' in data:
profile.notes = data['notes']
if 'newsletter' in data:
profile.newsletter = data['newsletter']
if 'username' in data:
if models.User.objects.filter(username=data['username']).exclude(id=user.id).count()>0:
response = json_response(status=403, text='username already in use')
@ -388,10 +390,10 @@ def findUser(request):
if data['key'] == 'email':
response['data']['users'] = [models.user_json(u, keys)
for u in User.objects.filter(email__iexact=data['value'])]
for u in models.User.objects.filter(email__iexact=data['value'])]
else:
response['data']['users'] = [models.user_json(u, keys)
for u in User.objects.filter(username__iexact=data['value'])]
for u in models.User.objects.filter(username__iexact=data['value'])]
return render_to_json_response(response)
actions.register(findUser)
@ -527,6 +529,71 @@ Positions
return render_to_json_response(response)
actions.register(findUsers)
@login_required_json
def mail(request):
'''
param data {
'to': array of usernames,
'subject': string,
'message': string
}
message can contain {username} or {email},
this will be replace with the user/email
the mail is sent to.
return {
'status': {'code': int, 'text': string}
}
'''
response = json_response()
data = json.loads(request.POST['data'])
p = request.user.get_profile()
if p.capability('canSendMail'):
email_from = '"%s" <%s>' % (settings.SITENAME, settings.CONFIG['site']['email']['system'])
headers = {
'Reply-To': settings.CONFIG['site']['email']['contact']
}
subject = data.get('subject', '').strip()
users = [models.User.objects.get(username=username) for username in data['to']]
for user in users:
if user.email:
message = data['message']
for key, value in (
('{username}', user.username),
('{email}', user.email),
):
message = message.replace(key, value)
email_to = '"%s" <%s>' % (user.username, user.email)
email = EmailMessage(subject,
message,
email_from,
[email_to],
headers = headers)
email.send(fail_silently=True)
if 'receipt' in data \
and data['receipt']:
template = loader.get_template('mailout_receipt.txt')
context = RequestContext(request, {
'footer': settings.CONFIG['site']['email']['footer'],
'to': ', '.join(['"%s" <%s>' % (u.username, u.email) for u in users]),
'subject': subject,
'message': data['message'],
'url': request.build_absolute_uri('/'),
})
message = template.render(context)
subject = u'Fwd: %s' % subject
email_to = '"%s" <%s>' % (request.user.username, request.user.email)
receipt = EmailMessage(subject,
message,
email_from,
[email_to])
receipt.send(fail_silently=True)
response = json_response(text='message sent')
else:
response = json_response(status=403, text='not allowed to send mail')
return render_to_json_response(response)
actions.register(mail, cache=False)
def contact(request):
'''
@ -549,7 +616,7 @@ def contact(request):
if not email:
email = request.user.email
if 'message' in data and data['message'].strip():
email_from = settings.CONFIG['site']['email']['system']
email_from = '"%s" <%s>' % (settings.SITENAME, settings.CONFIG['site']['email']['system'])
email_to = [settings.CONFIG['site']['email']['contact'], ]
subject = data.get('subject', '').strip()
template = loader.get_template('contact_email.txt')
@ -559,12 +626,13 @@ def contact(request):
'subject': subject,
'message': data['message'].strip(),
'sitename': settings.SITENAME,
'footer': settings.CONFIG['site']['email']['footer'],
'url': request.build_absolute_uri('/'),
})
message = template.render(context)
response = json_response(text='message sent')
try:
send_mail(u'[%s Contact] %s' % (settings.SITENAME, subject), message, email_from, email_to)
send_mail(u'%s Contact - %s' % (settings.SITENAME, subject), message, email_from, email_to)
except BadHeaderError:
response = json_response(status=400, text='invalid data')
if request.user.is_authenticated() \
@ -575,6 +643,7 @@ def contact(request):
'name': name,
'from': email,
'sitename': settings.SITENAME,
'footer': settings.CONFIG['site']['email']['footer'],
'to': email_to[0],
'subject': subject,
'message': data['message'].strip(),
@ -618,6 +687,10 @@ def editPreferences(request):
else:
change = True
request.user.email = data['email']
if 'newsletter' in data:
profile = request.user.get_profile()
profile.newsletter = data['newsletter']
profile.save()
if 'password' in data:
change = True
request.user.set_password(data['password'])