improve domain matches

This commit is contained in:
Matthew Hodgson 2018-07-10 15:21:14 +01:00
parent 9d57abcadd
commit 11728561f3

View File

@ -423,9 +423,9 @@ class RegisterRestServlet(RestServlet):
parts = address.replace('.', ' ').split('@') parts = address.replace('.', ' ').split('@')
org_parts = parts[1].split(' ') org_parts = parts[1].split(' ')
if org_parts[0] == "matrix" and org_parts[1] == "org": if org_parts[-2] == "matrix" and org_parts[-1] == "org":
org = "Tchap Admin" org = "Tchap Admin"
elif org_parts[-2] == "gouv": elif org_parts[-2] == "gouv" and org_parts[-1] == "fr":
org = org_parts[-3] if len(org_parts) > 2 else org_parts[-2] org = org_parts[-3] if len(org_parts) > 2 else org_parts[-2]
else: else:
org = org_parts[-2] org = org_parts[-2]