Skip to content

Commit

Permalink
open source
Browse files Browse the repository at this point in the history
  • Loading branch information
daisycamber committed Feb 6, 2025
1 parent 39079c8 commit a4b5640
Show file tree
Hide file tree
Showing 11 changed files with 400 additions and 264 deletions.
637 changes: 379 additions & 258 deletions backup.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backup_date.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Wed Feb 5 12:18:02 PM PST 2025
Thu Feb 6 12:17:18 AM PST 2025
2 changes: 1 addition & 1 deletion backup_init_date.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Wed Feb 5 12:00:02 PM PST 2025
Thu Feb 6 12:00:01 AM PST 2025
3 changes: 2 additions & 1 deletion email_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ beautifulsweetheart89,mikederteeni@gmail.com
dirtywoman70,interconnectza@gmail.com
funbeauty17,mikeencazylayebygype@gmail.com
sexygirl97,mikeshehorpder@gmail.com
beautifulwoman49,lotte.grace.harper@gmail.com
famouscutie90,
bustylover13,kansasgirl7900@yahoo.com
funperson13,amandaimardy1@gmail.com
Expand Down Expand Up @@ -47,6 +46,7 @@ sexybeauty69,jamescook312@outlook.com
beautifulsweetheart54,mikexxxx@gmail.com
perfectwoman92,ebojajuje04@gmail.com
lovelybeast15,yasen.krasen.13+85607@mail.ru
beautifulwoman49,lotte.grace.harper@gmail.com
bustylover76,bagsikpogi4@gmail.com
Guest821841,duqotayowud23@gmail.com
gorgeousbeauty43,adinatanat@gmail.com
Expand All @@ -72,3 +72,4 @@ gorgeousrunt36,7b6muygz@icloud.com
handsomekitty38,info@speed-seo.net
gorgeousbabe58,anepivepaz038@gmail.com
Daisy,jasper.camber.holton@gmail.com
bustypuppy14,patu2css@yahoo.com
Binary file modified face/__pycache__/forms.cpython-312.pyc
Binary file not shown.
Binary file modified lotteh/__pycache__/settings.cpython-312.pyc
Binary file not shown.
6 changes: 6 additions & 0 deletions lotteh/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@
'PASSWORD': 'password',
'HOST': 'localhost',
'PORT': '',
# 'OPTIONS': {
# 'timeout': 180,
# }
# 'DISABLE_SERVER_SIDE_CURSORS': True,
},
'lotteh2024': {
Expand All @@ -216,6 +219,9 @@
'PASSWORD': 'password',
'HOST': 'localhost',
'PORT': '',
# 'OPTIONS': {
# 'timeout': 180,
# }
# 'DISABLE_SERVER_SIDE_CURSORS': True,
}
# 'default': {
Expand Down
Binary file modified stacktrace/__pycache__/exceptions.cpython-312.pyc
Binary file not shown.
Binary file modified users/__pycache__/views.cpython-312.pyc
Binary file not shown.
14 changes: 11 additions & 3 deletions users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ def login(request):
return render(request,'users/login.html', {'form':form, 'title': title, 'dontshowad': True, 'dontshowsidebar': True, 'small': True, 'email_query_delay': 15})

def activate(request, uidb64, token):
from django.urls import reverse
from django.contrib import messages
from django.contrib.auth.models import User
from security.apis import get_client_ip
Expand All @@ -722,13 +723,20 @@ def activate(request, uidb64, token):
from django.utils.encoding import force_str
from users.models import Profile
from security.models import SecurityProfile
from barcode.tests import barcode_scanned
try:
uid = force_str(urlsafe_base64_decode(uidb64))
user = User.objects.get(pk=uid)
except(TypeError, ValueError, OverflowError, User.DoesNotExist):
user = None
ip = get_client_ip(request)
if user is not None and account_activation_token.check_token(user, token) and not check_raw_ip_risk(ip):
if user.profile.email_verified and not barcode_scanned(user):
messages.success(request, 'You have already verified your email. Please continue to take a photo of your face and scan your ID.')
return redirect(reverse('users:login') + '?next=' + reverse('barcode:scan'))
elif user.profile.email_verified:
messages.success(request, 'You have already verified your email. Please continue to login.')
return redirect(reverse('users:login'))
elif user is not None and account_activation_token.check_token(user, token) and not check_raw_ip_risk(ip):
if not user.profile.email_verified:
from .tfa import send_user_text
send_user_text(User.objects.get(id=settings.MY_ID), 'Someone new has joined {}.'.format(settings.SITE_NAME))
Expand All @@ -738,10 +746,10 @@ def activate(request, uidb64, token):
user.save()
sendwelcomeemail(request, user)
messages.success(request, f'Thanks for confirming your email! You can now log into your account, and a welcome email has been sent to you.')
return redirect(user.profile.create_face_url())
return redirect(user.profile.create_face_url() + '?next=' + reverse('barcode:scan'))
else:
messages.success(request, f'Your activation link has expired. Please request a new activation link.')
return redirect('verify:verify')
return redirect(reverse('users:verify'))

def resend_activation(request):
from .forms import ResendActivationEmailForm
Expand Down
Binary file modified verify/__pycache__/verify.cpython-312.pyc
Binary file not shown.

0 comments on commit a4b5640

Please sign in to comment.