Fixes #15 by adding a new-optional attribute to send_passwordreset,

for using a different mail template

uffd/selfservice/templates/newuser.mail.txt

+Hi {{ user.displayname }},
+
+welcome to the CCCV infrastructure.
+An account was created for you, visit this url to set your password: {{ url_for('selfservice.token_password', token=token, _external=True) }}
+**Please note this link is only valid for 48h**
+
+If you have no idea why someone would create an account for you to be used for the next CCC event organization, please contact it@cccv.de.
+
+Kind regards,
+uffd

uffd/selfservice/views.py

@@ -142,7 +142,7 @@ def send_mail_verification(loginname, newmail):
 	msg['Subject'] = 'Mail verification'
 	send_mail(newmail, msg)
 
-def send_passwordreset(loginname):
+def send_passwordreset(loginname, new=False):
 	session = db.session
 	expired_tokens = PasswordToken.query.filter(PasswordToken.created < (datetime.datetime.now() - datetime.timedelta(days=2))).all()
 	duplicate_tokens = PasswordToken.query.filter(PasswordToken.loginname == loginname).all()
@@ -156,8 +156,12 @@ def send_passwordreset(loginname):
 	user = User.from_ldap_dn(loginname_to_dn(loginname))
 
 	msg = EmailMessage()
-	msg.set_content(render_template('passwordreset.mail.txt', user=user, token=token.token))
-	msg['Subject'] = 'Password reset'
+	if new:
+		msg.set_content(render_template('newuser.mail.txt', user=user, token=token.token))
+		msg['Subject'] = 'Welcome to the CCCV infrastructure'
+	else:
+		msg.set_content(render_template('passwordreset.mail.txt', user=user, token=token.token))
+		msg['Subject'] = 'Password reset'
 	send_mail(user.mail, msg)
 
 def send_mail(to_address, msg):

uffd/user/views_user.py

@@ -88,7 +88,7 @@ def update(uid=False):
 
 	if user.to_ldap(new=is_newuser):
 		if is_newuser:
-			send_passwordreset(user.loginname)
+			send_passwordreset(user.loginname, new=True)
 			flash('User created. We sent the user a password reset link by mail')
 		else:
 			flash('User updated')
@@ -158,7 +158,7 @@ def csvimport():
 			result = newuser.to_ldap(new=True)
 			print(result)
 			if result:
-				send_passwordreset(newuser.loginname)
+				send_passwordreset(newuser.loginname, new=True)
 
 				usergroups = set()
 				for role in Role.get_for_user(newuser).all():