mirror of
https://github.com/gooba42/adventureland.git
synced 2026-10-14 18:39:27 -05:00
big bug fix
This commit is contained in:
@@ -10,7 +10,6 @@ def serve_admin_maker():
|
|||||||
user.put()
|
user.put()
|
||||||
return "done!"
|
return "done!"
|
||||||
|
|
||||||
|
|
||||||
@app.route('/admin/renderer')
|
@app.route('/admin/renderer')
|
||||||
@ndb.toplevel
|
@ndb.toplevel
|
||||||
def serve_render():
|
def serve_render():
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ def signup_or_login_api(**args):
|
|||||||
self,domain,email,password,only_login,only_signup,mobile=gdmuld(args,"self","domain","email","password","only_login","only_signup","mobile")
|
self,domain,email,password,only_login,only_signup,mobile=gdmuld(args,"self","domain","email","password","only_login","only_signup","mobile")
|
||||||
logging.info("Signup or Login")
|
logging.info("Signup or Login")
|
||||||
|
|
||||||
|
#jhtmle(self,"Disabled for now"); return
|
||||||
|
|
||||||
try: email=purify_email(email)
|
try: email=purify_email(email)
|
||||||
except: return jhtmle(self,"Invalid Email")
|
except: return jhtmle(self,"Invalid Email")
|
||||||
|
|
||||||
|
|||||||
@@ -114,10 +114,11 @@ if is_production:
|
|||||||
#maps["desertland"]["key"]="jayson_desertland_copy"
|
#maps["desertland"]["key"]="jayson_desertland_copy"
|
||||||
pass
|
pass
|
||||||
|
|
||||||
game_version=788
|
game_version=789
|
||||||
SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales
|
SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales
|
||||||
update_notes=[
|
update_notes=[
|
||||||
"Lunar New Year Event",
|
"Lunar New Year Event",
|
||||||
|
"Valentines Day Event",
|
||||||
"Last Update [6th of February]",
|
"Last Update [6th of February]",
|
||||||
"Switched to Python3",
|
"Switched to Python3",
|
||||||
"All major issues fixed",
|
"All major issues fixed",
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
@@ -2238,7 +2238,7 @@ def pbkdf2_hex(data, salt, iterations=1000, keylen=24, hashfunc=None):
|
|||||||
if 1/2==0:
|
if 1/2==0:
|
||||||
return pbkdf2_bin(data, salt, iterations, keylen, hashfunc).encode('hex')
|
return pbkdf2_bin(data, salt, iterations, keylen, hashfunc).encode('hex')
|
||||||
else:
|
else:
|
||||||
pbkdf2_bin(data, salt, iterations, keylen, hashfunc).encode("utf-8").hex()
|
return pbkdf2_bin(data, salt, iterations, keylen, hashfunc).encode("utf-8").hex()
|
||||||
|
|
||||||
def pbkdf2_bin(data, salt, iterations=1000, keylen=24, hashfunc=None):
|
def pbkdf2_bin(data, salt, iterations=1000, keylen=24, hashfunc=None):
|
||||||
"""Returns a binary digest for the PBKDF2 hash algorithm of `data`
|
"""Returns a binary digest for the PBKDF2 hash algorithm of `data`
|
||||||
|
|||||||
Reference in New Issue
Block a user