diff options
author | jomo <github@jomo.tv> | 2015-01-06 23:38:42 +0100 |
---|---|---|
committer | jomo <github@jomo.tv> | 2015-01-06 23:38:42 +0100 |
commit | 9a916ed2cd9440d46079f9b7db421a7b9fcbf6ee (patch) | |
tree | 3af33b3ddc2fa3159f9243b0ade09b3e3cc96425 /webtoken.py | |
parent | 3435e994326b14f700777741a76dd990a2bc703f (diff) |
change indentation from 2 spaces to 4, fix #5
Diffstat (limited to 'webtoken.py')
-rw-r--r-- | webtoken.py | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/webtoken.py b/webtoken.py index d01ba75..2ff97e8 100644 --- a/webtoken.py +++ b/webtoken.py @@ -18,96 +18,96 @@ from random import randrange def mysql_query(query, args, fetch = True): - conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver") - curs = conn.cursor() - curs.execute(query, args) - if fetch: - results = curs.fetchall() - else: - results = conn.commit() - curs.close() - conn.close() - return results + conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver") + curs = conn.cursor() + curs.execute(query, args) + if fetch: + results = curs.fetchall() + else: + results = conn.commit() + curs.close() + conn.close() + return results def generate_token(length): - cons = 'bcdfghjklmnpqrstvwxyz' - vows = 'aeiou' - - token = '' - start = randrange(2) - for i in range(0, length): - if i % 2 == start: - token += cons[randrange(21)] - else: - token += vows[randrange(5)] - return token + cons = 'bcdfghjklmnpqrstvwxyz' + vows = 'aeiou' + + token = '' + start = randrange(2) + for i in range(0, length): + if i % 2 == start: + token += cons[randrange(21)] + else: + token += vows[randrange(5)] + return token def get_token(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 + results = mysql_query("SELECT DISTINCT `token`, `email` FROM register_tokens WHERE `uuid` = ? LIMIT 1", (uuid,)) + return results[0] if len(results) == 1 else None def token_command(sender): - plugin_header(sender, "Website Token") - if is_player(sender): - try: - token = get_token(sender.getUniqueId().toString().replace("-", "")) - if token: - msg(sender, "&aEmail: &e%s" % token[1]) - msg(sender, "&aToken: &e%s" % token[0]) - msg(sender, "&cIMPORTANT: never share the token with anyone!") - msg(sender, "&cIt could be used to claim your website account!") - else: - msg(sender, "&cYou don't have a token yet! Use &e/gettoken <email>&c.") - except Exception, e: - error(e) - msg(sender, "&cError getting your token, please contact an admin!") - else: - msg(sender, "&cThis is only for players..") + plugin_header(sender, "Website Token") + if is_player(sender): + try: + token = get_token(sender.getUniqueId().toString().replace("-", "")) + if token: + msg(sender, "&aEmail: &e%s" % token[1]) + msg(sender, "&aToken: &e%s" % token[0]) + msg(sender, "&cIMPORTANT: never share the token with anyone!") + msg(sender, "&cIt could be used to claim your website account!") + else: + msg(sender, "&cYou don't have a token yet! Use &e/gettoken <email>&c.") + except Exception, e: + error(e) + msg(sender, "&cError getting your token, please contact an admin!") + else: + msg(sender, "&cThis is only for players..") def tokengen_command(sender, args): - plugin_header(sender, "Website Token") - if is_player(sender): - if len(args) < 1: - msg(sender, "&cPlease use &e/gettoken <email adress>") + plugin_header(sender, "Website Token") + if is_player(sender): + if len(args) < 1: + msg(sender, "&cPlease use &e/gettoken <email adress>") + else: + # 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: + token = generate_token(6) + uuid = sender.getUniqueId().toString().replace("-", "") + try: + mysql_query("DELETE FROM register_tokens WHERE `uuid` = ?", (uuid,), False) + mysql_query("INSERT INTO register_tokens (`uuid`, `token`, `email`) VALUES (?, ?, ?)", (uuid, token, mail), False) + msg(sender, "&aToken generated!") + msg(sender, "&aEmail: &e%s" % mail) + msg(sender, "&aToken: &e%s" % token) + msg(sender, "&cIMPORTANT: never share the token with anyone!") + msg(sender, "&cIt could be used to claim your website account!") + except Exception, e: + error(e) + msg(sender, "&cError getting your token, please contact an admin!") + else: + msg(sender, "&c'&6%s&c' doesn't look like a valid email adress!" % mail) else: - # 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: - token = generate_token(6) - uuid = sender.getUniqueId().toString().replace("-", "") - try: - mysql_query("DELETE FROM register_tokens WHERE `uuid` = ?", (uuid,), False) - mysql_query("INSERT INTO register_tokens (`uuid`, `token`, `email`) VALUES (?, ?, ?)", (uuid, token, mail), False) - msg(sender, "&aToken generated!") - msg(sender, "&aEmail: &e%s" % mail) - msg(sender, "&aToken: &e%s" % token) - msg(sender, "&cIMPORTANT: never share the token with anyone!") - msg(sender, "&cIt could be used to claim your website account!") - except Exception, e: - error(e) - msg(sender, "&cError getting your token, please contact an admin!") - else: - msg(sender, "&c'&6%s&c' doesn't look like a valid email adress!" % mail) - else: - msg(sender, "&cThis is only for players..") + msg(sender, "&cThis is only for players..") @hook.command("token") def on_token_command(sender, args): - thread.start_new_thread(token_command, (sender,)) - return True + thread.start_new_thread(token_command, (sender,)) + return True @hook.command("gettoken") def on_gettoken_command(sender, args): - thread.start_new_thread(tokengen_command, (sender, args)) - return True + thread.start_new_thread(tokengen_command, (sender, args)) + return True |