Fixes bug in openid auth consumer, and problem with modules template loader.

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 7b9e1f0f432ed6821051afade6fbbad30d7bdbbd..0db3f3b9ba2759b333d9c262fcb1d88c4678a99f 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -1,5 +1,4 @@
 # encoding:utf-8
 # encoding:utf-8

-# Django settings for lanai project.

 import os.path
 import sys
 
 import os.path
 import sys
 


@@ -7,58 +6,83 @@ SITE_ID = 1
 
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'

-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
+
+TEMPLATE_LOADERS = [

     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',

-    'forum.modules.module_templates_loader',
+    'forum.modules.template_loader.module_templates_loader',

     'forum.skins.load_template_source',
     'forum.skins.load_template_source',

-#     'django.template.loaders.eggs.load_template_source',
-)
+]

 
 MIDDLEWARE_CLASSES = [
 
 MIDDLEWARE_CLASSES = [

-    #'django.middleware.gzip.GZipMiddleware',

     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

-    #'django.middleware.locale.LocaleMiddleware',
-    #'django.middleware.cache.UpdateCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.middleware.common.CommonMiddleware',

-    #'django.middleware.cache.FetchFromCacheMiddleware',

     'forum.middleware.extended_user.ExtendedUser',
     'forum.middleware.extended_user.ExtendedUser',

-    #'django.middleware.sqlprint.SqlPrintingMiddleware',

     'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',

-    #'recaptcha_django.middleware.ReCaptchaMiddleware',
+    'forum.middleware.admin_messages.AdminMessagesMiddleware',

     'django.middleware.transaction.TransactionMiddleware',
 ]
 
     'django.middleware.transaction.TransactionMiddleware',
 ]
 

-TEMPLATE_CONTEXT_PROCESSORS = (
+TEMPLATE_CONTEXT_PROCESSORS = [

     'django.core.context_processors.request',
     'forum.context.application_settings',
     'django.core.context_processors.request',
     'forum.context.application_settings',

-    #'django.core.context_processors.i18n',
-    'forum.user_messages.context_processors.user_messages',#must be before auth
-    'django.core.context_processors.auth', #this is required for admin
-)
+    'forum.user_messages.context_processors.user_messages',
+    'django.core.context_processors.auth',
+]

 
 ROOT_URLCONF = 'urls'
 
 ROOT_URLCONF = 'urls'

+APPEND_SLASH = True

 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'),
 )
 
 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'),
 )
 

-#UPLOAD SETTINGS
+

 FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
 FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
 FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'

-# for user upload
+

 ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
 ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')

-# unit byte

 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
 # User settings
 from settings_local import *
 
 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
 # User settings
 from settings_local import *
 

+try:
+    if len(FORUM_SCRIPT_ALIAS) > 0:
+        APP_URL = '%s/%s' % (APP_URL, FORUM_SCRIPT_ALIAS[:-1])
+except NameError:
+    pass
+
+app_url_split = APP_URL.split("://")
+
+APP_PROTOCOL = app_url_split[0]
+APP_DOMAIN = app_url_split[1].split('/')[0]
+APP_BASE_URL = '%s://%s' % (APP_PROTOCOL, APP_DOMAIN)
+
+FORCE_SCRIPT_NAME = ''
+
+for path in app_url_split[1].split('/')[1:]:
+    FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME + '/' + path
+
+if FORCE_SCRIPT_NAME.endswith('/'):
+    FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
+
+from forum import modules
+modules.init_modules_engine(SITE_SRC_ROOT, DISABLED_MODULES)
+
+[MIDDLEWARE_CLASSES.extend(
+        ["%s.%s" % (m.__name__, mc) for mc in getattr(m, 'MIDDLEWARE_CLASSES', [])]
+                          ) for m in modules.MODULE_LIST]
+
+[TEMPLATE_LOADERS.extend(
+        ["%s.%s" % (m.__name__, tl) for tl in getattr(m, 'TEMPLATE_LOADERS', [])]
+                          ) for m in modules.MODULE_LIST]
+
+

 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -71,7 +95,7 @@ INSTALLED_APPS = [
     'forum',
 ]
 
     'forum',
 ]
 

-if DEBUG and False:
+if DEBUG:

     try:
         import debug_toolbar
         MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
     try:
         import debug_toolbar
         MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')