remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 4c958e0e45
commit 4ea87f441c
  1. 11
      apps/auth/views.py
  2. 9
      apps/payment/views.py

@ -1,4 +1,5 @@
from uuid import uuid4 from uuid import uuid4
from urllib.parse import urlsplit
from facepy import GraphAPI from facepy import GraphAPI
from facepy.exceptions import FacepyError from facepy.exceptions import FacepyError
@ -48,9 +49,8 @@ class LearnerRegistrationView(FormView):
# fixme: change email text # fixme: change email text
# fixme: async send email # fixme: async send email
refferer = self.request.META.get('HTTP_REFERER') refferer = urlsplit(self.request.META.get('HTTP_REFERER'))
if refferer.endswith('/'): refferer = refferer[0] + '://' + refferer[1]
refferer = refferer[:-1]
token = verification_email_token.make_token(user) token = verification_email_token.make_token(user)
url = refferer + str(reverse_lazy('lilcity:verification-email', args=[token])) url = refferer + str(reverse_lazy('lilcity:verification-email', args=[token]))
send_email('Verification Email', email, "notification/email/verification_email.html", url=url) send_email('Verification Email', email, "notification/email/verification_email.html", url=url)
@ -109,9 +109,8 @@ class PasswordResetView(views.PasswordContextMixin, BaseFormView):
token_generator = views.default_token_generator token_generator = views.default_token_generator
def form_valid(self, form): def form_valid(self, form):
refferer = self.request.META.get('HTTP_REFERER') refferer = urlsplit(self.request.META.get('HTTP_REFERER'))
if refferer.endswith('/'): refferer = refferer[0] + '://' + refferer[1]
refferer = refferer[:-1]
opts = { opts = {
'domain_override': refferer, 'domain_override': refferer,
'use_https': self.request.is_secure(), 'use_https': self.request.is_secure(),

@ -2,6 +2,7 @@ import logging
import json import json
from datetime import timedelta from datetime import timedelta
from urllib.parse import urlsplit
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
@ -43,7 +44,8 @@ class CourseBuyView(TemplateView):
template_name = 'payment/paymentwall_widget.html' template_name = 'payment/paymentwall_widget.html'
def get(self, request, pk=None, *args, **kwargs): def get(self, request, pk=None, *args, **kwargs):
host = request.scheme + '://' + request.get_host() host = urlsplit(self.request.META.get('HTTP_REFERER'))
host = host[0] + '://' + host[1]
course = Course.objects.get(id=pk) course = Course.objects.get(id=pk)
if request.user == course.author: if request.user == course.author:
messages.error(request, 'Вы не можете приобрести свой курс.') messages.error(request, 'Вы не можете приобрести свой курс.')
@ -79,9 +81,8 @@ class SchoolBuyView(TemplateView):
template_name = 'payment/paymentwall_widget.html' template_name = 'payment/paymentwall_widget.html'
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
host = self.request.META.get('HTTP_REFERER') host = urlsplit(self.request.META.get('HTTP_REFERER'))
if host.endswith('/'): host = host[0] + '://' + host[1]
host = host[:-1]
weekdays = set(request.GET.getlist('weekdays', [])) weekdays = set(request.GET.getlist('weekdays', []))
if not weekdays: if not weekdays:
messages.error(request, 'Выберите несколько дней недели.') messages.error(request, 'Выберите несколько дней недели.')

Loading…
Cancel
Save