ticketfrei
/
ticketfrei
10
1
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #78 from ticketfrei/master 

2.1.1 Hotfix
stable2
b3yond 2019-01-12 01:15:12 +01:00 committed by GitHub
parent 9d7cca6a0b 26fa98ad9b
commit ef0d8705c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
photo-1461685265823-f8d5d0b08b9b?ixlib=rb-1.2.1&q=85&fm=jpg&crop=entropy&cs=srgb&dl=matthew-henry-87142-unsplash.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 MiB

2
static/css/style.css
View File

@ -1,6 +1,6 @@
body {
background-image: url(/static/img/ticketfrei-og-image.jpg);
background-size: 50%;
background-height: 100%;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12pt;
line-height: 1.5em;

BIN
static/img/ticketfrei-og-image.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 KiB

After

Width:  |  Height:  |  Size: 628 KiB

6
user.py
View File

@ -9,7 +9,7 @@ from pylibscrypt import scrypt_mcf, scrypt_mcf_check
class User(object):
def __init__(self, uid):
# set cookie
response.set_cookie('uid', uid, secret=db.secret, path='/')
response.set_cookie('uid', uid, secret=db.get_secret(), path='/')
self.uid = uid
def check_password(self, password):
@ -55,7 +55,7 @@ class User(object):
return jwt.encode({
'email': email,
'uid': self.uid
}, db.secret).decode('ascii')
}, db.get_secret()).decode('ascii')
def is_appropriate(self, report):
db.execute("SELECT patterns FROM triggerpatterns WHERE user_id=?;",
@ -300,7 +300,7 @@ schlitz
client_secret = row[1]
return client_id, client_secret
except TypeError:
app_name = "ticketfrei" + str(db.secret)[0:4]
app_name = "ticketfrei" + str(db.get_secret())[0:4]
client_id, client_secret \
= Mastodon.create_app(app_name, api_base_url=instance)
db.execute("""INSERT INTO mastodon_instances(