src/ldt/ldt/security/utils.py
changeset 503 4be5eba42451
parent 482 c802e00c7131
child 549 0313c23ffe7e
--- a/src/ldt/ldt/security/utils.py	Wed Feb 01 15:29:34 2012 +0100
+++ b/src/ldt/ldt/security/utils.py	Thu Feb 02 12:48:30 2012 +0100
@@ -27,23 +27,19 @@
     cls = cls.model_class()
     
     for elem in xml.xpath('/iri/medias/media'):
-        if not user.is_authenticated():
+        content = cls.safe_objects.filter(iri_id=elem.get('id'))
+        if not content:
             elem.set('video', settings.FORBIDDEN_STREAM_URL)
-        else:
-            content = cls.safe_objects.filter(iri_id=elem.get('id'))
-            if not content:
-                elem.set('video', settings.FORBIDDEN_STREAM_URL)
         
     return xml
 
 def use_forbidden_url(content):
-    user = get_current_user()
+    cls = ContentType.objects.get(model='content')
+    cls = cls.model_class()
 
-    if not user.is_authenticated():
-        return True
-    elif "Content" in settings.USE_GROUP_PERMISSIONS and user.has_perm('ldt_utils.view_content', content):
+    new_content = cls.safe_objects.filter(iri_id=content.iri_id)
+    if new_content:
         return False
-
     return True
 
 def add_change_attr(user, obj_list):