old login system restored, merge done

15 files changed, 52 insertions, 52 deletions

diff --git a/forum/forms.py b/forum/forms.py
index 1953bbe2..0a68bb85 100755
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -9,7 +9,6 @@ from django.contrib.contenttypes.models import ContentType
 from forum.utils.forms import NextUrlField, UserNameField, SetPasswordForm
 from recaptcha_django import ReCaptchaField
 from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
 import logging
 
 
diff --git a/forum/models/answer.py b/forum/models/answer.py
index a41069f5..25a885ee 100755
--- a/forum/models/answer.py
+++ b/forum/models/answer.py
@@ -176,9 +176,7 @@ class AnonymousAnswer(AnonymousContent):
 
     def publish(self,user):
         added_at = datetime.datetime.now()
-        #print user.id
-        am = AnswerManager()
-        am.create_new(question=self.question,wiki=self.wiki,
+        Answer.objects.create_new(question=self.question,wiki=self.wiki,
                             added_at=added_at,text=self.text,
                             author=user)
         self.delete()
diff --git a/forum/models/base.py b/forum/models/base.py
index fb66ff1b..52fc8522 100755
--- a/forum/models/base.py
+++ b/forum/models/base.py
@@ -17,6 +17,8 @@ import django.dispatch
 from django.conf import settings
 import logging
 
+#todo: sphinx search import used to be here
+
 from forum.const import *
 
 class UserContent(models.Model):
diff --git a/forum/models/question.py b/forum/models/question.py
index 8f59c448..9860eb24 100755
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -10,7 +10,7 @@ markdowner = Markdown(html4tags=True)
 from forum.utils.lists import LazyList
 
 class QuestionManager(models.Manager):
-    def create_new(cls, title=None,author=None,added_at=None, wiki=False,tagnames=None, text=None):
+    def create_new(self, title=None,author=None,added_at=None, wiki=False,tagnames=None, text=None):
         html = sanitize_html(markdowner.convert(text))
         summary = strip_tags(html)[:120]
         question = Question(
@@ -124,8 +124,6 @@ class QuestionManager(models.Manager):
 
         return LazyList(get_data)
 
-
-
 class Question(Content, DeletableContent):
     title    = models.CharField(max_length=300)
     tags     = models.ManyToManyField('Tag', related_name='questions')
@@ -442,11 +440,14 @@ class AnonymousQuestion(AnonymousContent):
 
     def publish(self,user):
         added_at = datetime.datetime.now()
-        qm = QuestionManager()
-        #todo: use as classmethod instead??
-        qm.create_new(title=self.title, author=user, added_at=added_at,
-                                wiki=self.wiki, tagnames=self.tagnames,
-                                summary=self.summary, text=self.text)
+        Question.objects.create_new(
+                                title=self.title,
+                                author=user,
+                                added_at=added_at,
+                                wiki=self.wiki,
+                                tagnames=self.tagnames,
+                                text=self.text,
+                                )
         self.delete()
 
 from answer import Answer, AnswerManager
diff --git a/forum/models/repute.py b/forum/models/repute.py
index 65561d68..f71be4db 100755
--- a/forum/models/repute.py
+++ b/forum/models/repute.py
@@ -78,7 +78,7 @@ class ReputeManager(models.Manager):
     def get_reputation_by_upvoted_today(self, user):
         """
         For one user in one day, he can only earn rep till certain score (ep. +200)
-        by upvoted(also substracted from upvoted canceled). This is because we need
+        by upvoted(also subtracted from upvoted canceled). This is because we need
         to prohibit gaming system by upvoting/cancel again and again.
         """
         if user is None:
diff --git a/forum/skins/default/templates/about.html b/forum/skins/default/templates/about.html
index e463ac44..66dcc3fd 100755
--- a/forum/skins/default/templates/about.html
+++ b/forum/skins/default/templates/about.html
@@ -26,7 +26,7 @@
     These points (very) roughly reflect the level of trust of the community.
     </p>
     <p>No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url auth_signin %}">join us!</a></strong>
+    <strong><a href="{% url user_signin %}">join us!</a></strong>
     </p>
     <p>
             If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
diff --git a/forum/skins/default/templates/auth/signup.html b/forum/skins/default/templates/auth/signup.html
index bd5750b4..ac5eb241 100755
--- a/forum/skins/default/templates/auth/signup.html
+++ b/forum/skins/default/templates/auth/signup.html
@@ -26,7 +26,7 @@
     {{form.recaptcha}}{% endcomment %}
     <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
     <strong>{% trans "or" %}
-    <a href="{% url auth_signin %}">{% trans "return to login page" %}</a></strong></div>
+    <a href="{% url user_signin %}">{% trans "return to login page" %}</a></strong></div>
 </form>
 {% endblock %}
 <!--end signup.html-->
diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html
index 284e1229..e7b2b626 100755
--- a/forum/skins/default/templates/faq.html
+++ b/forum/skins/default/templates/faq.html
@@ -113,7 +113,7 @@
         <div>
             <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
             <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-            <strong><a href="{% url auth_signin %}">{% trans "Login now!" %}</a> »</strong> 
+            <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong> 
             </p>
         </div>
     
diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index e65ac73a..099bfb85 100755
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -8,7 +8,7 @@
                     <a href="{% url user_profile id=request.user.id,slug=request.user.username|slugify %}">{{ request.user.username }}</a> {% get_score_badge request.user %} 
                     <a href="{% url logout %}">{% trans "logout" %}</a>
                 {% else %}
-                    <a href="{% url auth_signin %}">{% trans "login" %}</a>
+                    <a href="{% url user_signin %}">{% trans "login" %}</a>
                 {% endif %}
                 <a href="{% url about %}">{% trans "about" %}</a>
                 <a href="{% url faq %}">{% trans "faq" %}</a>
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 4fc37dbd..1c542c8b 100755
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -33,7 +33,7 @@
             {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}

             

             lanai.highlightSyntax();

-            $('#btLogin').bind('click', function(){window.location.href='{% url auth_signin %}'; } )

+            $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )

         });

         

         function initEditor(){

diff --git a/forum/urls.py b/forum/urls.py
index a76906cb..4a9ae6bf 100755
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -86,22 +86,22 @@ urlpatterns = patterns('',
     url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
     url(r'^%s$' % _('search/'), app.readers.search, name='search'),
     url(r'^%s$' % _('feedback/'), app.meta.feedback, name='feedback'),
-    #(r'^%sfb/' % _('account/'),  include('fbconnect.urls')), 
-    #(r'^%s' % _('account/'), include('django_authopenid.urls')),
+    (r'^%sfb/' % _('account/'),  include('fbconnect.urls')), 
+    (r'^%s' % _('account/'), include('django_authopenid.urls')),
     (r'^i18n/', include('django.conf.urls.i18n')),
 
-    url(r'^%s%s$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_signin'),
-    url(r'^%s%s$' % (_('account/'), _('signout/')), app.auth.signout, name='user_signout'),
-    url(r'^%s%s(?P<action>\w+)/$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_action_signin'),
-    url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('signin/')), app.auth.prepare_provider_signin, name='auth_provider_signin'),
-    url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('done/')), app.auth.process_provider_signin, name='auth_provider_done'),
-    url(r'^%s%s$' % (_('account/'), _('register/')), app.auth.external_register, name='auth_external_register'),
-    url(r'^%s%s(?P<user>\d+)/(?P<code>.+)/$' % (_('account/'), _('validate/')),  app.auth.validate_email, name="auth_validate_email"),
-    url(r'^%s%s$' % (_('account/'), _('tempsignin/')),  app.auth.request_temp_login, name="auth_request_tempsignin"),
-    url(r'^%s%s(?P<user>\d+)/(?P<code>.+)/$' % (_('account/'), _('tempsignin/')),  app.auth.temp_signin, name="auth_tempsignin"),
-    url(r'^%s%s$' % (_('account/'), _('authsettings/')), app.auth.auth_settings, name='user_authsettings'),
-    url(r'^%s%s(?P<id>\d+)/%s$' % (_('account/'), _('providers/'),  _('remove/')), app.auth.remove_external_provider, name='user_remove_external_provider'),
-    url(r'^%s%s%s$' % (_('account/'), _('providers/'),  _('add/')), app.auth.signin_page, name='user_add_external_provider'),
+    #url(r'^%s%s$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_signin'),
+    #url(r'^%s%s$' % (_('account/'), _('signout/')), app.auth.signout, name='user_signout'),
+    #url(r'^%s%s(?P<action>\w+)/$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_action_signin'),
+    #url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('signin/')), app.auth.prepare_provider_signin, name='auth_provider_signin'),
+    #url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('done/')), app.auth.process_provider_signin, name='auth_provider_done'),
+    #url(r'^%s%s$' % (_('account/'), _('register/')), app.auth.external_register, name='auth_external_register'),
+    #url(r'^%s%s(?P<user>\d+)/(?P<code>.+)/$' % (_('account/'), _('validate/')),  app.auth.validate_email, name="auth_validate_email"),
+    #url(r'^%s%s$' % (_('account/'), _('tempsignin/')),  app.auth.request_temp_login, name="auth_request_tempsignin"),
+    #url(r'^%s%s(?P<user>\d+)/(?P<code>.+)/$' % (_('account/'), _('tempsignin/')),  app.auth.temp_signin, name="auth_tempsignin"),
+    #url(r'^%s%s$' % (_('account/'), _('authsettings/')), app.auth.auth_settings, name='user_authsettings'),
+    #url(r'^%s%s(?P<id>\d+)/%s$' % (_('account/'), _('providers/'),  _('remove/')), app.auth.remove_external_provider, name='user_remove_external_provider'),
+    #url(r'^%s%s%s$' % (_('account/'), _('providers/'),  _('add/')), app.auth.signin_page, name='user_add_external_provider'),
 
     #url(r'^%s%s%s$' % (_('accounts/'), _('password/'), _('confirm/')), app.user.confirmchangepw, name='user_confirmchangepw'),
     #url(r'^%s$' % _('account/'), app.users.account_settings, name='user_account_settings'),
diff --git a/forum/views/auth.py b/forum/views/auth.py
index 72b0af29..648bda80 100644
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -80,7 +80,7 @@ def prepare_provider_signin(request, provider):
         except InvalidAuthentication, e:
             request.session['auth_error'] = e.message
 
-        return HttpResponseRedirect(reverse('auth_signin'))    
+        return HttpResponseRedirect(reverse('user_signin'))    
 
 
 def process_provider_signin(request, provider):
@@ -91,7 +91,7 @@ def process_provider_signin(request, provider):
             assoc_key = provider_class.process_authentication_request(request)
         except InvalidAuthentication, e:
             request.session['auth_error'] = e.message
-            return HttpResponseRedirect(reverse('auth_signin'))
+            return HttpResponseRedirect(reverse('user_signin'))
 
         if request.user.is_authenticated():
             if isinstance(assoc_key, (type, User)):
@@ -112,7 +112,7 @@ def process_provider_signin(request, provider):
                     request.user.message_set.create(message=_('The new credentials are now associated with your account'))
                     return HttpResponseRedirect(reverse('user_authsettings'))
 
-            return HttpResponseRedirect(reverse('auth_signin'))
+            return HttpResponseRedirect(reverse('user_signin'))
         else:
             if isinstance(assoc_key, (type, User)):
                 return login_and_forward(request, assoc_key) 
@@ -126,7 +126,7 @@ def process_provider_signin(request, provider):
             request.session['auth_provider'] = provider
             return HttpResponseRedirect(reverse('auth_external_register'))
 
-    return HttpResponseRedirect(reverse('auth_signin'))
+    return HttpResponseRedirect(reverse('user_signin'))
 
 def external_register(request):
     if request.method == 'POST' and 'bnewaccount' in request.POST:
@@ -148,7 +148,7 @@ def external_register(request):
                 auth_provider = request.session['auth_provider']
             except:
                 request.session['auth_error'] = _("Oops, something went wrong in the middle of this process. Please try again.")
-                return HttpResponseRedirect(request.session.get('on_signin_url', reverse('auth_signin'))) 
+                return HttpResponseRedirect(request.session.get('on_signin_url', reverse('user_signin'))) 
 
             uassoc = AuthKeyUserAssociation(user=user_, key=request.session['assoc_key'], provider=request.session['auth_provider'])
             uassoc.save()
@@ -356,4 +356,4 @@ def signout(request):
     """
 
     logout(request)
-    return HttpResponseRedirect(reverse('index'))
\ No newline at end of file
+    return HttpResponseRedirect(reverse('index'))
diff --git a/forum/views/writers.py b/forum/views/writers.py
index a9406fdc..b9b1aad5 100755
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -129,7 +129,7 @@ def ask(request):#view used to ask a new question
                     ip_addr = request.META['REMOTE_ADDR'],
                 )
                 question.save()
-                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
+                return HttpResponseRedirect(reverse('user_signin_new_question'))
     else:
         form = AskForm()
 
@@ -290,7 +290,7 @@ def answer(request, id):#process a new answer
                                        ip_addr=request.META['REMOTE_ADDR'],
                                        )
                 anon.save()
-                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newanswer'}))
+                return HttpResponseRedirect(reverse('user_signin_new_answer'))
 
     return HttpResponseRedirect(question.get_absolute_url())
 
diff --git a/settings.py b/settings.py
index a0f6d80a..c8098df9 100644
--- a/settings.py
+++ b/settings.py
@@ -11,7 +11,7 @@ SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
-    'forum.modules.module_templates_loader',
+    'forum.modules.module_templates_loader',#todo: remove this
     'forum.skins.load_template_source',
 #     'django.template.loaders.eggs.load_template_source',
 )
diff --git a/settings_local.py.dist b/settings_local.py.dist
index bb7fd0dd..681d1446 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -3,7 +3,7 @@ import os.path
 from django.utils.translation import ugettext as _
 
 SITE_SRC_ROOT = os.path.dirname(__file__)
-LOG_FILENAME = 'django.osqa.log'
+LOG_FILENAME = 'askbot.log'
 
 #for logging
 import logging
@@ -31,7 +31,7 @@ DATABASE_PORT = ''
 
 #set this value to 'dummy://' if you don't want to use cache, or set up your favourite caching mechanism
 #see http://docs.djangoproject.com/en/1.1/topics/cache/ for details
-#example (set local file system cache in a cache folder in the root of the osqa install):
+#example (set local file system cache in a cache folder in the root of the askbot install):
 #CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
 CACHE_BACKEND = 'dummy://'
 
@@ -43,13 +43,13 @@ SERVER_EMAIL = ''
 DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[OSQA] '
-EMAIL_HOST='osqa.net'
+EMAIL_SUBJECT_PREFIX = '[ASKBOT] '
+EMAIL_HOST='askbot.org'
 EMAIL_PORT='25'
 EMAIL_USE_TLS=False
 
 #HACK - anonymous user email - for email-less users
-ANONYMOUS_USER_EMAIL = 'anonymous@osqa.net'
+ANONYMOUS_USER_EMAIL = 'anonymous@askbot.org'
 
 #LOCALIZATIONS
 TIME_ZONE = 'America/New_York'
@@ -64,12 +64,12 @@ FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 
 #OTHER SETTINGS
-APP_TITLE = u'OSQA: Open Source Q&A Forum'
-APP_SHORT_NAME = u'OSQA'
-APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
+APP_TITLE = u'ASKBOT: Open Source Q&A Forum'
+APP_SHORT_NAME = u'ASKBOT'
+APP_KEYWORDS = u'ASKBOT,CNPROG,forum,community'
 APP_DESCRIPTION = u'Ask and answer questions.'
 APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
+APP_COPYRIGHT = 'Copyright ASKBOT, 2009. Some rights reserved under creative commons license.'
 LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
 
@@ -78,7 +78,7 @@ LANGUAGE_CODE = 'en'
 EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False
-APP_URL = 'http://osqa.net' #used by email notif system and RSS
+APP_URL = 'http://askbot.org' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = ''
 GOOGLE_ANALYTICS_KEY = ''
 WIKI_ON = True
@@ -91,5 +91,5 @@ RESOURCE_REVISION=4
 #please get these at recaptcha.net
 RECAPTCHA_PRIVATE_KEY='...'
 RECAPTCHA_PUBLIC_KEY='...'
-OSQA_DEFAULT_SKIN = 'default'
+ASKBOT_DEFAULT_SKIN = 'default'