Changeset 1440

Timestamp:

02/22/08 15:02:26 (8 months ago)

Author:

JensDiemer

Message:

A new way to setup contextrobots?
I am not really convinced of it yet.

Location:

trunk/pylucid/PyLucid

Files:

• index.py (modified) (5 diffs)
• plugins_internal/auth/auth.py (modified) (1 diff)
• system/context_processors.py (modified) (3 diffs)
• system/plugin_manager.py (modified) (3 diffs)

trunk/pylucid/PyLucid/index.py

@@ -45 +45 @@
 
 
-def _render_cms_page(context, page_content=None):
+def _render_cms_page(request, context, page_content=None):
     """
     render the cms page.
@@ -51 +51 @@
     - render a _command request: The page.content is the output from the plugin.
     """
+    if request.anonymous_view == False:
+        # context["robots"] was set in contex_processors.static()
+        # Hide the response from search engines
+        context["robots"] = "NONE,NOARCHIVE"
+
     current_page = context["PAGE"]
 
@@ -92 +97 @@
     For index() and handle_command() views.
     """
+    # add additional attribute
+    request.anonymous_view = True
+
     try:
         context = RequestContext(request)
@@ -227 +235 @@
     context = _get_context(request, current_page_obj)
     # Get the response for the requested cms page:
-    response = _render_cms_page(context)
+    response = _render_cms_page(request, context)
 
     if use_cache:
@@ -317 +325 @@
         )
 
-    return _render_cms_page(context, page_content)
+    return _render_cms_page(request, context, page_content)
 
 

trunk/pylucid/PyLucid/plugins_internal/auth/auth.py

@@ -166 +166 @@
                 "Warning: DEBUG is ON! Should realy only use for debugging!"
             )
+
+        # This view is available for anonymous users. Only a anonymous user
+        # must login ;)
+        # But the html line <meta name="robots" content="{{ robots }}" />
+        # should be set to "NONE,NOARCHIVE"
+        self.request.anonymous_view = False
 
         UsernameForm = forms.form_for_model(User, fields=("username",))

trunk/pylucid/PyLucid/system/context_processors.py

@@ -17 +17 @@
     http://www.djangoproject.com/documentation/templates_python/#writing-your-own-context-processors
     """
-    context_extras = {}
-
-    #___________________________________________________________________________
-
-    context_extras['powered_by'] = mark_safe(
-        '<a href="http://www.pylucid.org">PyLucid v%s</a>' \
+    return {
+        "powered_by": mark_safe(
+            '<a href="http://www.pylucid.org">PyLucid v%s</a>' \
                                                         % PYLUCID_VERSION_STRING
-    )
-
-    #___________________________________________________________________________
-
-    # The module_manager set "must_login":
-    if getattr(request, "must_login", False):
-        context_extras["robots"] = "NONE,NOARCHIVE"
-    else:
-        context_extras["robots"] = "index,follow"
-
-    #___________________________________________________________________________
-
-    return context_extras
-
+        ),
+        # This value would be changed in index._render_cms_page(), if the
+        # plugin manager or any plugin set request.anonymous_view = False
+        "robots": "index,follow",
+    }
 
 
@@ -53 +41 @@
         txt = "%s [%s]" % (_("Log out"), request.user.username)
     else:
-        url = URLs.commandLink("auth", "login/?next=%s" % request.path)
+#        url = URLs.commandLink("auth", "login/?next=%s" % request.path)
+        url = URLs.commandLink("auth", "login")
         txt = _("Log in")
 
-    context["login_link"] = mark_safe(
-        '<a href="%s">%s</a>' % (url, txt)
-    )
-    
+    context["login_link"] = mark_safe('<a href="%s">%s</a>' % (url, txt))
+
     # Put the language information into the context, if it exists.
     # see: http://www.djangoproject.com/documentation/i18n/
@@ -66 +53 @@
     else:
         context['django_language']=''
-
 
 

trunk/pylucid/PyLucid/system/plugin_manager.py

@@ -131 +131 @@
         # User must be login to use this method
         # http://www.djangoproject.com/documentation/authentication/
-
-        request.must_login = True # For static_tags an the robot tag
-
         if request.user.is_anonymous():
             # User is not logged in
@@ -148 +145 @@
             raise AccessDenied
 
+    # set if the current request was viewable for anonymous user
+    # interesting for: <meta name="robots" content="{{ robots }}" />
+    if request.anonymous_view == True:
+        # Only change anonymous_view, if it not set to False in the past.
+        if method_cfg["must_login"] or method_cfg["must_admin"]:
+            request.anonymous_view = False
+
     URLs = context["URLs"]
     URLs.current_plugin = plugin_name
@@ -193 +197 @@
     """
     output = run(context, response, plugin_name, method_name, url_args)
+
     return output