diff options
| -rw-r--r-- | .gitignore | 42 | ||||
| -rw-r--r-- | drupal_auth/models.py | 38 | ||||
| -rw-r--r-- | forums/settings.py | 19 | ||||
| -rw-r--r-- | forums/wsgi.py | 6 | ||||
| -rw-r--r-- | spoken_auth/__init__.py (renamed from drupal_auth/__init__.py) | 0 | ||||
| -rw-r--r-- | spoken_auth/backends.py (renamed from drupal_auth/backends.py) | 5 | ||||
| -rw-r--r-- | spoken_auth/managers.py (renamed from drupal_auth/managers.py) | 0 | ||||
| -rw-r--r-- | spoken_auth/models.py | 13 | ||||
| -rw-r--r-- | spoken_auth/routers.py (renamed from drupal_auth/routers.py) | 8 | ||||
| -rw-r--r-- | static/forums/templates/user-login.html | 2 |
10 files changed, 69 insertions, 64 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74da341 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +*~ +*.swp +*.pyc +config.py +forums/wsgi.py +static/CACHE/* +*.py[cod] +robots.txt +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +__pycache__ + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject diff --git a/drupal_auth/models.py b/drupal_auth/models.py deleted file mode 100644 index 5161d65..0000000 --- a/drupal_auth/models.py +++ /dev/null @@ -1,38 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User -from django.contrib.auth.models import ( - BaseUserManager, AbstractBaseUser -) - -from drupal_auth.managers import DrupalUserManager - -class Users(models.Model): - id = models.BigIntegerField(primary_key=True) - username = models.CharField(max_length=100L, unique=True) - password = models.CharField(max_length=32L) - email = models.CharField(max_length=100L) - - USERNAME_FIELD = 'username' - REQUIRED_FIELDS = [] - objects = DrupalUserManager() - - def __unicode__(self): - return self.username - - class Meta: - db_table = 'mdl_user' - - def is_authenticated(self): - return True - - def is_active(self): - return True - - def is_staff(self): - return True - - def has_perm(self, perm, obj=None): - return True - - def has_module_perms(self, app_label): - return True diff --git a/forums/settings.py b/forums/settings.py index 725bf62..d793004 100644 --- a/forums/settings.py +++ b/forums/settings.py @@ -28,22 +28,13 @@ DATABASES = { }, 'spoken': { 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'CDEEP', # Or path to database file if using sqlite3. + 'NAME': 'spoken', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: 'USER': db_user, 'PASSWORD': db_pass, 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. 'PORT': '', # Set to empty string for default. }, - 'otc': { - 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'OTC', # Or path to database file if using sqlite3. - # The following settings are not used with sqlite3: - 'USER': db_user, - 'PASSWORD': db_pass, - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. - } } # Hosts/domain names that are valid for this site; required if DEBUG is False @@ -156,7 +147,7 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'website', 'widget_tweaks', - 'drupal_auth', + 'spoken_auth', 'compressor', 'debug_toolbar', ) @@ -190,9 +181,9 @@ LOGGING = { } } -AUTH_USER_MODEL = 'drupal_auth.Users' -AUTHENTICATION_BACKENDS = ( 'drupal_auth.backends.DrupalAuthBackend', ) -DATABASE_ROUTERS = ['drupal_auth.routers.DrupalAuthRouter'] +AUTH_USER_MODEL = 'spoken_auth.Users' +AUTHENTICATION_BACKENDS = ( 'spoken_auth.backends.DrupalAuthBackend', ) +DATABASE_ROUTERS = ['spoken_auth.routers.DrupalAuthRouter'] TEMPLATE_CONTEXT_PROCESSORS += ( 'django.core.context_processors.request', 'website.context_processors.admin_processor', diff --git a/forums/wsgi.py b/forums/wsgi.py index 728eed4..aacba59 100644 --- a/forums/wsgi.py +++ b/forums/wsgi.py @@ -16,7 +16,7 @@ framework. import os import sys -sys.path.append('/Sites/venv/forums/') +#sys.path.append('/Sites/venv/forums/') # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks # if running multiple sites in the same mod_wsgi process. To fix this, use @@ -24,8 +24,8 @@ sys.path.append('/Sites/venv/forums/') # os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" -activate_this = '/Sites/venv/bin/activate_this.py' -execfile(activate_this, dict(__file__=activate_this)) +#activate_this = '/Sites/venv/bin/activate_this.py' +#execfile(activate_this, dict(__file__=activate_this)) # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/drupal_auth/__init__.py b/spoken_auth/__init__.py index e69de29..e69de29 100644 --- a/drupal_auth/__init__.py +++ b/spoken_auth/__init__.py diff --git a/drupal_auth/backends.py b/spoken_auth/backends.py index 8f1a6bd..a46ea80 100644 --- a/drupal_auth/backends.py +++ b/spoken_auth/backends.py @@ -1,5 +1,4 @@ import hashlib - from django.contrib.auth.models import User from django.contrib.auth import get_user_model from django.shortcuts import render_to_response, get_object_or_404 @@ -13,9 +12,7 @@ class DrupalAuthBackend(object): user_logged_in.disconnect(update_last_login) try: user = User.objects.get(username=username) - p = hashlib.md5() - p.update(password) - if user.password == p.hexdigest(): + if user.check_password(password): return user return None except User.DoesNotExist: diff --git a/drupal_auth/managers.py b/spoken_auth/managers.py index 953c867..953c867 100644 --- a/drupal_auth/managers.py +++ b/spoken_auth/managers.py diff --git a/spoken_auth/models.py b/spoken_auth/models.py new file mode 100644 index 0000000..1992ed8 --- /dev/null +++ b/spoken_auth/models.py @@ -0,0 +1,13 @@ +from django.db import models +from django.contrib.auth.models import User +from django.contrib.auth.models import ( + BaseUserManager, AbstractBaseUser +) + +#from drupal_auth.managers import DrupalUserManager +class Users(AbstractBaseUser): + id = models.IntegerField(primary_key=True) + username = models.CharField(max_length=100L, unique=True) + USERNAME_FIELD = 'username' + class Meta: + db_table = 'auth_user' diff --git a/drupal_auth/routers.py b/spoken_auth/routers.py index 846df14..f2d759b 100644 --- a/drupal_auth/routers.py +++ b/spoken_auth/routers.py @@ -1,12 +1,12 @@ class DrupalAuthRouter(object): def db_for_read(self, model, **hints): - if model._meta.app_label == 'drupal_auth': - return 'otc' + if model._meta.app_label == 'spoken_auth': + return 'spoken' return 'default' def db_for_write(self, model, **hints): - if model._meta.app_label == 'drupal_auth': - return 'otc' + if model._meta.app_label == 'spoken_auth': + return 'spoken' return 'default' def allow_relation(self, obj1, obj2, **hints): diff --git a/static/forums/templates/user-login.html b/static/forums/templates/user-login.html index ef62ffe..350cce5 100644 --- a/static/forums/templates/user-login.html +++ b/static/forums/templates/user-login.html @@ -40,7 +40,7 @@ </ul> <h4>Dont have a Spoken-Tutorial.org account yet ?</h4> <p> - <a class="btn btn-sm btn-success" href="http://www.spoken-tutorial.org/user/register" target="_blank">Register</a> + <a class="btn btn-sm btn-success" href="http://www.spoken-tutorial.org/accounts/register/" target="_blank">Register</a> </p> </div> <!-- /.col --> </div> <!-- /.row --> |