"Mail" can now be blank, it'll then use MyUID.

If a valid email is provided in a registration but MyUID is repeated,
it'll take over the account instead.

1 files changed, 13 insertions, 1 deletions

diff --git a/player.py b/player.py
index d035a72..49d5a8a 100644
--- a/player.py
+++ b/player.py
@@ -816,9 +816,14 @@ def register(args, token):
         y=json.loads(args)
         tmp=y["email"]
         mail=str(tmp)
+        tmp=y["MyUID"]
+        leni=len(tmp)
+        MyUID=str(y["MyUID"])
         # Check if email is valid with above regex
         if not re.search(regex,mail):
-            raise Exception("Not a valid email")
+            if leni != 32 or mail != "":
+                raise Exception("Not a valid email")
+            mail="_%s@spheres.tmw2.org" % (MyUID)
     except:
         return ERR_BAD
 
@@ -832,6 +837,13 @@ def register(args, token):
         stdout("WARNING: Tried to register email \"%s\" (belongs to account %s)" % (mail, check))
         return ERR_BAD
 
+    # If email is an UID mail, clobber it
+    check=sql.query_email("_%s@spheres.tmw2.org" % (MyUID))
+    if (check != ""):
+        passwd=clobber_email(check, "_%s@spheres.tmw2.org" % (MyUID), mail)
+        stdout("INFO: Set a new email for \"%s\" (%s)" % (check, mail))
+        return compress({"userid": userid, "password": passwd})
+
     stdout("Now registering account")
     # Register it
     data=sql.add_player(mail)