X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fviews.py;h=9e893d566ba3cb11121e2d426cf84616f4bc964c;hb=87548030cbeaeff301afd297e052ceb5bc438ca7;hp=cd6aba9b8fdc6a6608ee51ef63376193b96ffab8;hpb=6603b300418efe0f28390a5b53208c9c7068489b;p=mediagoblin.git

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index cd6aba9b..9e893d56 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,21 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-
 from mediagoblin import mg_globals
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.tools.pagination import Pagination
-from mediagoblin.tools.response import render_to_response
-from mediagoblin.db.util import DESCENDING
-from mediagoblin.decorators import uses_pagination
-from mediagoblin import media_types
-
+from mediagoblin.tools.pluginapi import hook_handle
+from mediagoblin.tools.response import render_to_response, render_404
+from mediagoblin.decorators import uses_pagination, user_not_banned
 
 
+@user_not_banned
 @uses_pagination
-def root_view(request, page):
-    cursor = request.db.MediaEntry.find(
-        {u'state': u'processed'}).sort('created', DESCENDING)
+def default_root_view(request, page):
+    cursor = request.db.query(MediaEntry).filter_by(state=u'processed').\
+        order_by(MediaEntry.created.desc())
 
     pagination = Pagination(page, cursor)
     media_entries = pagination()
@@ -36,8 +34,17 @@ def root_view(request, page):
         request, 'mediagoblin/root.html',
         {'media_entries': media_entries,
          'allow_registration': mg_globals.app_config["allow_registration"],
-         'pagination': pagination,
-         'sys': sys})
+         'pagination': pagination})
+
+
+
+def root_view(request):
+    """
+    Proxies to the real root view that's displayed
+    """
+    view = hook_handle("frontpage_view") or default_root_view
+    return view(request)
+
 
 
 def simple_template_render(request):
@@ -48,3 +55,10 @@ def simple_template_render(request):
     template_name = request.matchdict['template']
     return render_to_response(
         request, template_name, {})
+
+def terms_of_service(request):
+    if mg_globals.app_config["show_tos"] is False:
+        return render_404(request)
+
+    return render_to_response(request,
+        'mediagoblin/terms_of_service.html', {})