Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

fix comments

Browse Source
This commit is contained in:
jomo
2014-06-23 03:16:09 +02:00
parent 06a0bf8428
commit fa944b4e37
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webtoken.py
View File

@@ -1,5 +1,5 @@
#pylint: disable=F0401 #pylint: disable=F0401
import mysqlhack import mysqlhack #pylint: disable=unused-import
import thread import thread
from re import match from re import match
from com.ziclix.python.sql import zxJDBC from com.ziclix.python.sql import zxJDBC
@@ -43,7 +43,6 @@ def generate_token(length):
return token return token
def get_token(uuid): def get_token(uuid):
# ae795aa86327408e92ab25c8a59f3ba1
results = mysql_query("SELECT DISTINCT `token`, `email` FROM register_tokens WHERE `uuid` = ? LIMIT 1", (uuid,)) results = mysql_query("SELECT DISTINCT `token`, `email` FROM register_tokens WHERE `uuid` = ? LIMIT 1", (uuid,))
return results[0] if len(results) == 1 else None return results[0] if len(results) == 1 else None
@@ -70,8 +69,9 @@ def tokengen_command(sender, args):
plugHeader(sender, "Website Token") plugHeader(sender, "Website Token")
if isPlayer(sender): if isPlayer(sender):
if checkargs(sender, args, 1, -1): if checkargs(sender, args, 1, -1):
# email regex, needs something followed by an @ followed by something # email may contain spaces
mail = " ".join(args) # email may contain spaces mail = " ".join(args)
# email regex, needs something followed by an @ followed by domain or IP
if match("^.+@(.+\\..{2,}|\\[[0-9a-fA-F:.]+\\])$", mail) != None: if match("^.+@(.+\\..{2,}|\\[[0-9a-fA-F:.]+\\])$", mail) != None:
token = generate_token(6) token = generate_token(6)
uuid = sender.getUniqueId().toString().replace("-", "") uuid = sender.getUniqueId().toString().replace("-", "")