From 8d9422e0e3166b163f6a9cb1bd71ab7d73e5fcbe Mon Sep 17 00:00:00 2001
From: Ajurna <ajurna@gmail.com>
Date: Fri, 6 Apr 2018 15:14:12 +0100
Subject: [PATCH] updated settings.

---
 cbreader/settings.py |  1 +
 comic/forms.py       | 32 +-------------------------------
 comic/views.py       | 12 ------------
 comic_auth/forms.py  | 15 ++-------------
 4 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/cbreader/settings.py b/cbreader/settings.py
index 50e8501..d8c9f19 100644
--- a/cbreader/settings.py
+++ b/cbreader/settings.py
@@ -110,5 +110,6 @@ LOGIN_URL = '/login/'
 
 UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar'
 
+CBREADER_USE_RECAPTCHA = True
 RECAPTCHA_PRIVATE_KEY = '6Ld50TUUAAAAAD6tQ4pR7HoBZ80EW_Mp2TyoS8Dz'
 RECAPTCHA_PUBLIC_KEY = '6Ld50TUUAAAAANJmBFM0lUVqwuFyyCdoejfpdema'
diff --git a/comic/forms.py b/comic/forms.py
index f0b987d..0f539e1 100644
--- a/comic/forms.py
+++ b/comic/forms.py
@@ -203,27 +203,6 @@ class SettingsForm(forms.Form):
                                        'class': 'form-control'
                                    }
                                ))
-    recaptcha = forms.BooleanField(help_text='Use Recaptcha',
-                                   required=False,
-                                   widget=forms.CheckboxInput(
-                                       attrs={
-                                           'class': 'checkbox'
-                                       }
-                                   ))
-    recaptcha_public_key = forms.CharField(help_text='Recaptcha Public Key',
-                                           required=False,
-                                           widget=forms.TextInput(
-                                               attrs={
-                                                   'class': 'form-control'
-                                               }
-                                           ))
-    recaptcha_private_key = forms.CharField(help_text='Recaptcha Private Key',
-                                            required=False,
-                                            widget=forms.TextInput(
-                                                attrs={
-                                                    'class': 'form-control'
-                                                }
-                                            ))
 
     def clean_base_dir(self):
         data = self.cleaned_data['base_dir']
@@ -234,17 +213,8 @@ class SettingsForm(forms.Form):
     @staticmethod
     def get_initial_values():
         base_dir, _ = Setting.objects.get_or_create(name='BASE_DIR')
-        recaptcha_public_key, _ = Setting.objects.get_or_create(name='RECAPTCHA_PUBLIC_KEY')
-        recaptcha_private_key, _ = Setting.objects.get_or_create(name='RECAPTCHA_PRIVATE_KEY')
-        recaptcha, _ = Setting.objects.get_or_create(name='RECAPTCHA')
-        if recaptcha.value == '1':
-            recaptcha = True
-        else:
-            recaptcha = False
+
         initial = {
             'base_dir': base_dir.value,
-            'recaptcha': recaptcha,
-            'recaptcha_public_key': recaptcha_public_key.value,
-            'recaptcha_private_key': recaptcha_private_key.value,
         }
         return initial
diff --git a/comic/views.py b/comic/views.py
index 55d47f8..7b96100 100644
--- a/comic/views.py
+++ b/comic/views.py
@@ -293,18 +293,6 @@ def settings_page(request):
             base_dir = Setting.objects.get(name='BASE_DIR')
             base_dir.value = form.cleaned_data['base_dir']
             base_dir.save()
-            recap = Setting.objects.get(name='RECAPTCHA')
-            if form.cleaned_data['recaptcha']:
-                recap.value = '1'
-            else:
-                recap.value = '0'
-            recap.save()
-            recaptcha_private_key = Setting.objects.get(name='RECAPTCHA_PRIVATE_KEY')
-            recaptcha_private_key.value = form.cleaned_data['recaptcha_private_key']
-            recaptcha_private_key.save()
-            recaptcha_public_key = Setting.objects.get(name='RECAPTCHA_PUBLIC_KEY')
-            recaptcha_public_key.value = form.cleaned_data['recaptcha_public_key']
-            recaptcha_public_key.save()
             success_message.append('Settings updated.')
     form = SettingsForm(initial=SettingsForm.get_initial_values())
     context = {
diff --git a/comic_auth/forms.py b/comic_auth/forms.py
index 1bc76af..0466730 100644
--- a/comic_auth/forms.py
+++ b/comic_auth/forms.py
@@ -1,9 +1,8 @@
 from django import forms
+from django.conf import settings
 from snowpenguin.django.recaptcha2.fields import ReCaptchaField
 from snowpenguin.django.recaptcha2.widgets import ReCaptchaWidget
 
-from comic.models import Setting
-
 
 class LoginForm(forms.Form):
 
@@ -28,15 +27,5 @@ class LoginForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(LoginForm, self).__init__(*args, **kwargs)
-        setting, created = Setting.objects.get_or_create(name='RECAPTCHA')
-        if created:
-            setting.value = '0'
-        if setting.value == '1':
-            # public_key = Setting.objects.get(name='RECAPTCHA_PUBLIC_KEY').value
-            # private_key = Setting.objects.get(name='RECAPTCHA_PRIVATE_KEY').value
-            #
-            # captcha = ReCaptchaField(
-            #     public_key=public_key,
-            #     private_key=private_key,
-            # )
+        if settings.CBREADER_USE_RECAPTCHA if hasattr(settings, 'CBREADER_USE_RECAPTCHA') else False:
             self.fields['captcha'] = ReCaptchaField(widget=ReCaptchaWidget())