removed/disabled checking of avatar type synchronously as there were timeouts contacting gravatar server

7 files changed, 9 insertions, 46 deletions

diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py
index 3c30bffa..beb56a72 100644
--- a/askbot/conf/login_providers.py
+++ b/askbot/conf/login_providers.py
@@ -23,6 +23,8 @@ settings.register(
     )
 )
 
+#todo: remove this - we don't want the local login button
+#but instead always show the login/password field when used
 settings.register(
     livesettings.BooleanValue(
         LOGIN_PROVIDERS,
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index c6a9146a..b2bebd76 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -307,11 +307,10 @@ def user_get_avatar_url(self, size=48):
                 raise django_exceptions.ImproperlyConfigured(message)
         else:
             return self.get_gravatar_url(size)
+    if askbot_settings.ENABLE_GRAVATAR:
+        return self.get_gravatar_url(size)
     else:
-        if askbot_settings.ENABLE_GRAVATAR:
-            return self.get_gravatar_url(size)
-        else:
-            return self.get_default_avatar_url(size)
+        return self.get_default_avatar_url(size)
 
 def user_get_top_answers_paginator(self, visitor=None):
     """get paginator for top answers by the user for a
@@ -356,6 +355,9 @@ def user_strip_email_signature(self, text):
     return text
 
 def _check_gravatar(gravatar):
+    return 'n'
+    #todo: think of whether we need this and if so
+    #how to check the avatar type appropriately
     gravatar_url = askbot_settings.GRAVATAR_BASE_URL + "/%s?d=404" % gravatar
     code = urllib.urlopen(gravatar_url).getcode()
     if urllib.urlopen(gravatar_url).getcode() != 404:
@@ -3729,7 +3731,7 @@ django_signals.post_save.connect(moderate_group_joining, sender=GroupMembership)
 
 if 'avatar' in django_settings.INSTALLED_APPS:
     from avatar.models import Avatar
-    django_signals.post_save.connect(set_user_avatar_type_flag,sender=Avatar)
+    django_signals.post_save.connect(set_user_avatar_type_flag, sender=Avatar)
     django_signals.post_delete.connect(update_user_avatar_type_flag, sender=Avatar)
 
 django_signals.post_delete.connect(record_cancel_vote, sender=Vote)
diff --git a/askbot/schedules.py b/askbot/schedules.py
deleted file mode 100644
index b9bbdbc8..00000000
--- a/askbot/schedules.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""tests on whether certain scheduled tasks need
-to be performed at the moment"""
-from datetime import datetime
-
-def should_update_avatar_data(request):
-    """True if it is time to update user's avatar data
-    user is taken from the request object
-    """
-    user = request.user
-    if user.is_authenticated():
-        if (datetime.today() - user.last_login).days <= 1:
-            #avatar is updated on login anyway
-            return False
-        updated_at = request.session.get('avatar_data_updated_at', None)
-        if updated_at is None:
-            return True
-        else:
-            return (datetime.now() - updated_at).days > 0
-    return False
diff --git a/askbot/templates/main_page/javascript.html b/askbot/templates/main_page/javascript.html
index 72d63ed3..3a3c3d23 100644
--- a/askbot/templates/main_page/javascript.html
+++ b/askbot/templates/main_page/javascript.html
@@ -6,10 +6,6 @@
         Hilite.exact = false;
         Hilite.elementid = "question-list";
         Hilite.debug_referrer = location.href;
-        {% if update_avatar_data == True %}
-            var today = new Date();{#add timestamp to prevent browser caching #}
-            $.getJSON('{% url user_update_has_custom_avatar %}?t=' + today.getTime());
-        {% endif %}
     });
 
     askbot['urls']['mark_interesting_tag'] = '{% url mark_interesting_tag %}';
diff --git a/askbot/urls.py b/askbot/urls.py
index 551fa329..566173ce 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -125,11 +125,6 @@ urlpatterns = patterns('',
         name='groups'
     ),
     url(
-        r'^%s$' % _('users/update_has_custom_avatar/'),
-        views.users.update_has_custom_avatar,
-        name='user_update_has_custom_avatar'
-    ),
-    url(
         r'^%s$' % _('badges/'),
         views.meta.badges,
         name='badges'
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 89f802d1..3c3b053c 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -42,7 +42,6 @@ from askbot.forms import GetDataForPostForm
 from askbot.utils.loading import load_module
 from askbot import conf
 from askbot import models
-from askbot import schedules
 from askbot.models.tag import Tag
 from askbot import const
 from askbot.startup_procedures import domain_is_bad
@@ -252,7 +251,6 @@ def questions(request, **kwargs):
             'font_size' : extra_tags.get_tag_font_size(related_tags),
             'display_tag_filter_strategy_choices': conf.get_tag_display_filter_strategy_choices(),
             'email_tag_filter_strategy_choices': conf.get_tag_email_filter_strategy_choices(),
-            'update_avatar_data': schedules.should_update_avatar_data(request),
             'query_string': search_state.query_string(),
             'search_state': search_state,
             'feed_url': context_feed_url,
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 64f0e38e..1b6eeca8 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -1094,17 +1094,6 @@ def user(request, id, slug=None, tab_name=None):
         context['custom_tab_slug'] = CUSTOM_TAB['SLUG']
     return user_view_func(request, profile_owner, context)
 
-@csrf.csrf_exempt
-def update_has_custom_avatar(request):
-    """updates current avatar type data for the user
-    """
-    if request.is_ajax() and request.user.is_authenticated():
-        if request.user.avatar_type in ('n', 'g'):
-            request.user.update_avatar_type()
-            request.session['avatar_data_updated_at'] = datetime.datetime.now()
-            return HttpResponse(simplejson.dumps({'status':'ok'}), mimetype='application/json')
-    return HttpResponseForbidden()
-
 def groups(request, id = None, slug = None):
     """output groups page
     """