From 0f6982649692cff135db303910bb7bf94205ca7f Mon Sep 17 00:00:00 2001
From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 2 Jun 2010 22:56:08 +0000
Subject: [PATCH] better support for accented user names

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@358 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 .../skins/default/templates/auth/signin.html  |  4 +-
 forum_modules/localauth/forms.py              |  2 +-
 settings.py                                   | 84 ++++++++++++++++++-
 3 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/forum/skins/default/templates/auth/signin.html b/forum/skins/default/templates/auth/signin.html
index a31054b..22225d2 100644
--- a/forum/skins/default/templates/auth/signin.html
+++ b/forum/skins/default/templates/auth/signin.html
@@ -27,7 +27,7 @@
         <p class="error">{{ msg }}</p>
     {% endif %}
     {% for provider in top_stackitem_providers %}
-        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}">
+        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}" accept-charset="utf-8">
             {% include provider.stack_item_template %}
             <input type="hidden" class="validate_email" name="validate_email" value="yes" />
         </form>
@@ -91,7 +91,7 @@
     </form>
     {% for provider in stackitem_providers %}
         <h3 class="or_label">{% trans 'Or...' %}</h3>
-        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}">
+        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}" accept-charset="utf-8">
             {% include provider.stack_item_template %}
             <input type="hidden" class="validate_email" name="validate_email" value="yes" />
         </form>
diff --git a/forum_modules/localauth/forms.py b/forum_modules/localauth/forms.py
index 06fcb79..ec59a10 100644
--- a/forum_modules/localauth/forms.py
+++ b/forum_modules/localauth/forms.py
@@ -47,7 +47,7 @@ class ClassicLoginForm(forms.Form):
     def _clean_nonempty_field(self,field):
         value = None
         if field in self.cleaned_data:
-            value = str(self.cleaned_data[field]).strip()
+            value = self.cleaned_data[field].strip()
             if value == '':
                 value = None
         self.cleaned_data[field] = value
diff --git a/settings.py b/settings.py
index a7c5893..2cf11e9 100644
--- a/settings.py
+++ b/settings.py
@@ -56,8 +56,85 @@ ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
 # unit byte
 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
-# User settings
-from settings_local import *
+
+
+def check_local_setting(name, value):
+    local_vars = locals()
+    if name in local_vars and local_vars[name] == value:
+        return True
+    else:
+        return False
+
+SITE_SRC_ROOT = os.path.dirname(__file__)
+LOG_FILENAME = 'django.osqa.log'
+
+#for logging
+import logging
+logging.basicConfig(
+    filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
+    level=logging.ERROR,
+    format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
+)
+
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'forum@example.com'),)
+MANAGERS = ADMINS
+
+DEBUG = True
+DEBUG_TOOLBAR_CONFIG = {
+    'INTERCEPT_REDIRECTS': True
+}
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
+if True:
+
+    DATABASE_NAME =  'meta_rep'          # Or path to database file if using sqlite3.
+    DATABASE_USER = 'postgres'               # Not used with sqlite3.
+    DATABASE_PASSWORD = 'postgres'               # Not used with sqlite3.
+    DATABASE_ENGINE = 'postgresql_psycopg2'  #mysql, etc
+    DATABASE_HOST = 'localhost'
+    DATABASE_PORT = ''
+else:
+    DATABASE_NAME =  'd:/stuff/sxtest.db'#'sxtest2rep'          # Or path to database file if using sqlite3.
+    DATABASE_USER = ''               # Not used with sqlite3.
+    DATABASE_PASSWORD = ''               # Not used with sqlite3.
+    DATABASE_ENGINE = 'sqlite3'  #mysql, etc
+    DATABASE_HOST = ''
+    DATABASE_PORT = ''
+
+#CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
+#CACHE_BACKEND = 'dummy://'
+CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+
+APP_URL = 'http://' #used by email notif system and RSS
+
+#LOCALIZATIONS
+TIME_ZONE = 'America/New_York'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
+
+
+#OTHER SETTINGS
+
+USE_I18N = False
+LANGUAGE_CODE = 'en'
+
+EMAIL_VALIDATION = 'off' #string - on|off
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
+OSQA_DEFAULT_SKIN = 'default'
+
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
+
 
 INSTALLED_APPS = [
     'django.contrib.auth',
@@ -93,3 +170,6 @@ if not DEBUG:
         pass
 
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]
+
+
+
-- 
2.45.1