summaryrefslogtreecommitdiff
path: root/meetingtools/apps
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-02-09 11:06:55 +0100
committerLeif Johansson <leifj@sunet.se>2011-02-09 11:06:55 +0100
commitc33af4c971f26fcf3e7eb61a6c3dd8e8af8418a6 (patch)
tree8cbdeaeb48e3bfb5f4dd7d3ab190f8b8be634479 /meetingtools/apps
parent5f6b0000b9f611c56f42ff37f32003325c410947 (diff)
restructure
Diffstat (limited to 'meetingtools/apps')
-rw-r--r--meetingtools/apps/__init__.py0
-rw-r--r--meetingtools/apps/auth/__init__.py0
-rw-r--r--meetingtools/apps/auth/utils.py26
-rw-r--r--meetingtools/apps/auth/views.py85
-rw-r--r--meetingtools/apps/cluster/__init__.py0
-rw-r--r--meetingtools/apps/cluster/admin.py10
-rw-r--r--meetingtools/apps/cluster/models.py16
-rw-r--r--meetingtools/apps/room/__init__.py0
-rw-r--r--meetingtools/apps/room/admin.py10
-rw-r--r--meetingtools/apps/room/forms.py33
-rw-r--r--meetingtools/apps/room/models.py30
-rw-r--r--meetingtools/apps/room/views.py253
-rw-r--r--meetingtools/apps/userprofile/__init__.py0
-rw-r--r--meetingtools/apps/userprofile/admin.py4
-rw-r--r--meetingtools/apps/userprofile/models.py21
15 files changed, 0 insertions, 488 deletions
diff --git a/meetingtools/apps/__init__.py b/meetingtools/apps/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/meetingtools/apps/__init__.py
+++ /dev/null
diff --git a/meetingtools/apps/auth/__init__.py b/meetingtools/apps/auth/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/meetingtools/apps/auth/__init__.py
+++ /dev/null
diff --git a/meetingtools/apps/auth/utils.py b/meetingtools/apps/auth/utils.py
deleted file mode 100644
index 3a7efe6..0000000
--- a/meetingtools/apps/auth/utils.py
+++ /dev/null
@@ -1,26 +0,0 @@
-'''
-Created on Jul 7, 2010
-
-@author: leifj
-'''
-from uuid import uuid4
-
-def nonce():
- return uuid4().hex
-
-def anonid():
- return uuid4().urn
-
-def groups(request):
- groups = []
- if request.user.is_authenticated():
- if request.session and request.session.has_key('entitlement'):
- groups = groups + request.session['entitlement']
-
- if '@' in request.user.username:
- (local,domain) = request.user.username.split('@')
- groups.append(domain)
- for e in ('member','employee','student'):
- groups.append("%s@%s" % (e,domain))
-
- return groups \ No newline at end of file
diff --git a/meetingtools/apps/auth/views.py b/meetingtools/apps/auth/views.py
deleted file mode 100644
index 6828ac2..0000000
--- a/meetingtools/apps/auth/views.py
+++ /dev/null
@@ -1,85 +0,0 @@
-'''
-Created on Jul 5, 2010
-
-@author: leifj
-'''
-from django.http import HttpResponseRedirect
-from django.contrib.auth.models import User
-import datetime
-from django.views.decorators.cache import never_cache
-import logging
-from meetingtools.apps.userprofile.models import UserProfile
-from meetingtools.multiresponse import redirect_to
-
-def meta(request,attr):
- v = request.META.get(attr)
- if not v:
- return None
- values = filter(lambda x: x != "(null)",v.split(";"))
- return values;
-
-def meta1(request,attr):
- v = meta(request,attr)
- if v:
- return v[0]
- else:
- return None
-
-def accounts_login_federated(request):
- if request.user.is_authenticated():
- profile,created = UserProfile.objects.get_or_create(user=request.user)
- if created:
- profile.identifier = request.user.username
- profile.user = request.user
- profile.save()
-
- update = False
- cn = meta1(request,'cn')
- if not cn:
- cn = meta1(request,'displayName')
- logging.warn(cn)
- if not cn:
- fn = meta1(request,'givenName')
- ln = meta1(request,'sn')
- if fn and ln:
- cn = "%s %s" % (fn,ln)
- if not cn:
- cn = profile.identifier
-
- mail = meta1(request,'mail')
-
- idp = meta1(request,'Shib-Identity-Provider')
-
- for attrib_name, meta_value in (('display_name',cn),('email',mail),('idp',idp)):
- attrib_value = getattr(profile, attrib_name)
- if meta_value and not attrib_value:
- setattr(profile,attrib_name,meta_value)
- update = True
-
- if request.user.password == "":
- request.user.password = "(not used for federated logins)"
- update = True
-
- if update:
- request.user.save()
-
- # Allow auto_now to kick in for the lastupdated field
- #profile.lastupdated = datetime.datetime.now()
- profile.save()
-
- epe = meta(request,'entitlement')
- if epe:
- request.session['entitlement'] = epe
-
- next = request.session.get("after_login_redirect", None)
- if next is not None:
- return redirect_to(next)
- else:
- pass
- return redirect_to("/")
-
-@never_cache
-def logout(request):
- from django.contrib.auth import logout
- logout(request)
- return HttpResponseRedirect("/Shibboleth.sso/Logout") \ No newline at end of file
diff --git a/meetingtools/apps/cluster/__init__.py b/meetingtools/apps/cluster/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/meetingtools/apps/cluster/__init__.py
+++ /dev/null
diff --git a/meetingtools/apps/cluster/admin.py b/meetingtools/apps/cluster/admin.py
deleted file mode 100644
index 3fc9eea..0000000
--- a/meetingtools/apps/cluster/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-'''
-Created on Jan 31, 2011
-
-@author: leifj
-'''
-
-from django.contrib import admin
-from meetingtools.apps.cluster.models import ACCluster
-
-admin.site.register(ACCluster) \ No newline at end of file
diff --git a/meetingtools/apps/cluster/models.py b/meetingtools/apps/cluster/models.py
deleted file mode 100644
index 9748073..0000000
--- a/meetingtools/apps/cluster/models.py
+++ /dev/null
@@ -1,16 +0,0 @@
-'''
-Created on Feb 3, 2011
-
-@author: leifj
-'''
-
-from django.db import models
-from django.db.models.fields import CharField, URLField, TextField
-
-class ACCluster(models.Model):
- api_url = URLField()
- url = URLField()
- user = CharField(max_length=128)
- password = CharField(max_length=128)
- name = CharField(max_length=128,blank=True,unique=True)
- domain_match = TextField() \ No newline at end of file
diff --git a/meetingtools/apps/room/__init__.py b/meetingtools/apps/room/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/meetingtools/apps/room/__init__.py
+++ /dev/null
diff --git a/meetingtools/apps/room/admin.py b/meetingtools/apps/room/admin.py
deleted file mode 100644
index 13d80a8..0000000
--- a/meetingtools/apps/room/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-'''
-Created on Jan 31, 2011
-
-@author: leifj
-'''
-
-from django.contrib import admin
-from meetingtools.apps.room.models import Room
-
-admin.site.register(Room) \ No newline at end of file
diff --git a/meetingtools/apps/room/forms.py b/meetingtools/apps/room/forms.py
deleted file mode 100644
index 3b89297..0000000
--- a/meetingtools/apps/room/forms.py
+++ /dev/null
@@ -1,33 +0,0 @@
-'''
-Created on Feb 1, 2011
-
-@author: leifj
-'''
-from django.forms.models import ModelForm
-from meetingtools.apps.room.models import Room
-from django.forms.widgets import Select, TextInput
-from django.forms.fields import ChoiceField, BooleanField
-from django.forms.forms import Form
-
-PUBLIC = 0
-PROTECTED = 1
-PRIVATE = 2
-
-class UpdateRoomForm(ModelForm):
- #protection = ChoiceField(choices=((PUBLIC,'Anyone can enter the room.'),
- # (PROTECTED,'Only group members and accepted guests can enter the room.'),
- # (PRIVATE,'Only group members can enter.')))
-
- class Meta:
- model = Room
- fields = ['name','urlpath','participants','presenters','hosts','source_sco_id','self_cleaning']
- widgets = {'participants': Select(),
- 'presenters': Select(),
- 'hosts': Select(),
- 'source_sco_id': Select(),
- 'urlpath': TextInput(attrs={'size': '40'}),
- 'name': TextInput(attrs={'size': '40'}),
- }
-
-class DeleteRoomForm(Form):
- confirm = BooleanField(label="Confirm remove room") \ No newline at end of file
diff --git a/meetingtools/apps/room/models.py b/meetingtools/apps/room/models.py
deleted file mode 100644
index 90e5868..0000000
--- a/meetingtools/apps/room/models.py
+++ /dev/null
@@ -1,30 +0,0 @@
-'''
-Created on Jan 31, 2011
-
-@author: leifj
-'''
-
-from django.db import models
-from django.db.models.fields import CharField, BooleanField, IntegerField, SmallIntegerField
-from django.db.models.fields.related import ForeignKey
-from django.contrib.auth.models import User
-from meetingtools.apps.cluster.models import ACCluster
-
-class Room(models.Model):
- creator = ForeignKey(User,editable=False)
- name = CharField(max_length=128,blank=True,unique=True)
- urlpath = CharField(max_length=128,blank=True,unique=True)
- acc = ForeignKey(ACCluster,verbose_name="Adobe Connect Cluster",editable=False)
- participants = CharField(max_length=255,blank=True,verbose_name="Participants") # populate from entitlement held by creator session
- presenters = CharField(max_length=255,blank=True,verbose_name="Presenters") # populate from entitlement held by creator session
- hosts = CharField(max_length=255,blank=True,verbose_name="Hosts") # populate from entitlement held by creator session
- self_cleaning = BooleanField(verbose_name="Clean-up when empty?")
- sco_id = IntegerField(verbose_name="Adobe Connect Room",blank=False)
- source_sco_id = IntegerField(verbose_name="Template",blank=True,null=True)
- timecreated = models.DateTimeField(auto_now_add=True)
- lastupdated = models.DateTimeField(auto_now=True)
- lastvisited = models.DateTimeField(blank=True,null=True)
-
- def __unicode__(self):
- return "%s (sco_id=%d,source_sco_id=%d)" % (self.name,self.sco_id,self.source_sco_id)
- \ No newline at end of file
diff --git a/meetingtools/apps/room/views.py b/meetingtools/apps/room/views.py
deleted file mode 100644
index 7bdffc0..0000000
--- a/meetingtools/apps/room/views.py
+++ /dev/null
@@ -1,253 +0,0 @@
-'''
-Created on Jan 31, 2011
-
-@author: leifj
-'''
-from meetingtools.apps.room.models import Room, ACCluster
-from meetingtools.multiresponse import respond_to, redirect_to
-from meetingtools.apps.room.forms import UpdateRoomForm, DeleteRoomForm
-from django.shortcuts import get_object_or_404
-from meetingtools.ac import ac_api_client, api
-import re
-from meetingtools.apps import room
-from django.contrib.auth.decorators import login_required
-from meetingtools.apps.auth.utils import groups
-import logging
-from pprint import pformat
-from meetingtools.utils import session
-import time
-from meetingtools.settings import GRACE
-from django.utils.datetime_safe import datetime
-
-def _acc_for_user(user):
- (local,domain) = user.username.split('@')
- if not domain:
- #raise Exception,"Improperly formatted user: %s" % user.username
- domain = "nordu.net" # testing with local accts only
- for acc in ACCluster.objects.all():
- for regex in acc.domain_match.split():
- if re.match(regex,domain):
- return acc
- raise Exception,"I don't know which cluster you belong to... (%s)" % user.username
-
-def _user_meeting_folder(request,acc):
- if not session(request,'my_meetings_sco_id'):
- connect_api = ac_api_client(request, acc)
- userid = request.user.username
- folders = connect_api.request('sco-search-by-field',{'filter-type': 'folder','field':'name','query':userid}).et.xpath('//sco[folder-name="User Meetings"]')
- logging.debug("user meetings folder: "+pformat(folders))
- #folder = next((f for f in folders if f.findtext('.//folder-name') == 'User Meetings'), None)
- if folders and len(folders) > 0:
- session(request,'my_meetings_sco_id',folders[0].get('sco-id'))
- return session(request,'my_meetings_sco_id')
-
-def _shared_templates_folder(request,acc):
- if not session(request,'shared_templates_sco_id'):
- connect_api = ac_api_client(request, acc)
- shared = connect_api.request('sco-shortcuts').et.xpath('.//sco[@type="shared-meeting-templates"]')
- logging.debug("shared templates folder: "+pformat(shared))
- #folder = next((f for f in folders if f.findtext('.//folder-name') == 'User Meetings'), None)
- if shared and len(shared) > 0:
- session(request,'shared_templates_sco_id',shared[0].get('sco-id'))
- return session(request,'shared_templates_sco_id')
-
-def _user_rooms(request,acc,my_meetings_sco_id):
- rooms = []
- if my_meetings_sco_id:
- connect_api = ac_api_client(request, acc)
- meetings = connect_api.request('sco-expanded-contents',{'sco-id': my_meetings_sco_id,'filter-type': 'meeting'})
- if meetings:
- rooms = [(r.get('sco-id'),r.findtext('name'),r.get('source-sco-id'),r.findtext('url-path')) for r in meetings.et.findall('.//sco')]
- return rooms
-
-def _user_templates(request,acc,my_meetings_sco_id):
- templates = []
- connect_api = ac_api_client(request, acc)
- if my_meetings_sco_id:
- my_templates = connect_api.request('sco-contents',{'sco-id': my_meetings_sco_id,'filter-type': 'folder'}).et.xpath('.//sco[folder-name="My Templates"][0]')
- if my_templates and len(my_templates) > 0:
- my_templates_sco_id = my_templates[0].get('sco_id')
- meetings = connect_api.request('sco-contents',{'sco-id': my_templates_sco_id,'filter-type': 'meeting'})
- if meetings:
- templates = templates + [(r.get('sco-id'),r.findtext('name')) for r in meetings.et.findall('.//sco')]
-
- shared_templates_sco_id = _shared_templates_folder(request, acc)
- if shared_templates_sco_id:
- shared_templates = connect_api.request('sco-contents',{'sco-id': shared_templates_sco_id,'filter-type': 'meeting'})
- if shared_templates:
- templates = templates + [(r.get('sco-id'),r.findtext('name')) for r in shared_templates.et.findall('.//sco')]
-
- return templates
-
-def _find_current_session(session_info):
- for r in session_info.et.xpath('//row'):
- #logging.debug(pformat(etree.tostring(r)))
- end = r.findtext('date-end')
- if end is None:
- return r
- return None
-
-def _nusers(session_info):
- cur = _find_current_session(session_info)
- if cur is not None:
- return cur.get('num-participants')
- else:
- return 0
-
-@login_required
-def view(request,id):
- room = get_object_or_404(Room,pk=id)
- api = ac_api_client(request,room.acc)
- room_info = api.request('sco-info',{'sco-id':room.sco_id},raise_error=True)
- perm_info = api.request('permissions-info',{'acl-id':room.sco_id,'filter-principal-id': 'public-access'},raise_error=True)
- session_info = api.request('report-meeting-sessions',{'sco-id':room.sco_id},raise_error=True)
-
- room.name = room_info.et.findtext('.//sco/name')
- room.save()
- return respond_to(request,
- {'text/html':'apps/room/view.html'},
- {'user':request.user,
- 'room':room,
- 'permission': perm_info.et.find('.//principal').get('permission-id'),
- 'nusers': _nusers(session_info)
- })
-
-def _init_update_form(request,form,acc,my_meetings_sco_id):
- form.fields['participants'].widget.choices = [('','-- anyone --')]+[(g,g) for g in groups(request)]
- form.fields['presenters'].widget.choices = [('','-- nobody --')]+[(g,g) for g in groups(request)]
- form.fields['hosts'].widget.choices = [('','-- nobody --')]+[(g,g) for g in groups(request)]
- form.fields['source_sco_id'].widget.choices = [('','-- select template --')]+[r for r in _user_templates(request,acc,my_meetings_sco_id)]
-
-@login_required
-def update(request,id=None):
- if id:
- room = get_object_or_404(Room,pk=id)
- acc = room.acc
- what = "Update"
- title = "Modify %s" % room.name
- update = True
- else:
- acc = _acc_for_user(request.user)
- room = Room(creator=request.user,acc=acc)
- what = "Create"
- title = "Create a new room"
- update = False
-
- my_meetings_sco_id = _user_meeting_folder(request,acc)
-
- if request.method == 'POST':
- form = UpdateRoomForm(request.POST,instance=room)
- _init_update_form(request, form, acc, my_meetings_sco_id)
- if form.is_valid():
- api = ac_api_client(request,acc)
- params = {'type':'meeting','name':room.name,'folder-id':my_meetings_sco_id,'sco-id':room.sco_id,'source-sco-id':room.source_sco_id,'url-path':room.urlpath}
- if form.cleaned_data.has_key('source_sco_id'):
- params['source-sco-id'] = form.cleaned_data['source_sco_id']
-
- if form.cleaned_data.has_key('urlpath'):
- params['url-path'] = form.cleaned_data['urlpath']
-
- r = api.request('sco-update',params,raise_error=True)
- params['sco-id'] = r.et.find(".//sco").get('sco-id')
- params['sco-source-id'] = r.et.find(".//sco").get('sco-source-id')
- room = form.save()
- room = _import_room(params['sco-id'],params['name'],params['source-sco-id'],params['url-path'],request.user,acc)
- return redirect_to("/rooms#%d" % room.id)
- else:
- form = UpdateRoomForm(instance=room)
- _init_update_form(request, form, acc, my_meetings_sco_id)
- if update:
- form.fields['urlpath'].widget.attrs['readonly'] = True
-
- return respond_to(request,{'text/html':'edit.html'},{'form':form,'formtitle': title,'submitname':'%s Room' % what})
-
-def _import_room(sco_id,name,source_sco_id,urlpath,user,acc):
- modified = False
- room,created = Room.objects.get_or_create(sco_id=sco_id,acc=acc,creator=user)
-
- if room.name != name:
- room.name = name
- modified = True
-
- if not room.sco_id and sco_id:
- room.sco_id = sco_id
- modified = True
-
- if not room.source_sco_id and source_sco_id:
- room.source_sco_id = source_sco_id
- modified = True
-
- if room.urlpath != urlpath:
- room.urlpath = urlpath.strip('/')
- modified = True
-
- if '/' in room.urlpath:
- room.urlpath = urlpath.strip('/')
- modified = True
-
- if modified:
- room.save()
-
- return room
-
-@login_required
-def list(request):
- acc = _acc_for_user(request.user)
- my_meetings_sco_id = _user_meeting_folder(request,acc)
- user_rooms = _user_rooms(request,acc,my_meetings_sco_id)
-
- ar = []
- for (sco_id,name,source_sco_id,urlpath) in user_rooms:
- room = _import_room(sco_id,name,source_sco_id,urlpath,request.user,acc)
- ar.append(int(sco_id))
-
- #logging.debug(pformat(ar))
-
- for r in Room.objects.filter(creator=request.user).all():
- #logging.debug(pformat(r))
- if (not r.sco_id in ar) and (not r.self_cleaning):
- r.delete()
- return respond_to(request,{'text/html':'apps/room/list.html'},{'user':request.user,'rooms':Room.objects.filter(creator=request.user).all()})
-
-@login_required
-def delete(request,id):
- room = get_object_or_404(Room,pk=id)
- if request.method == 'POST':
- form = DeleteRoomForm(request.POST)
- if form.is_valid():
- api = ac_api_client(request,room.acc)
- api.request('sco-delete',{'sco-id':room.sco_id},raise_error=True)
- room.delete()
- return redirect_to("/rooms")
- else:
- form = DeleteRoomForm()
-
- return respond_to(request,{'text/html':'edit.html'},{'form':form,'formtitle': 'Delete %s' % room.name,'submitname':'Delete Room'})
-
-def _clean(room):
- pass
-
-def go_by_id(request,id):
- room = get_object_or_404(Room,pk=id)
- return goto(request,room)
-
-def go_by_path(request,path):
- room = get_object_or_404(Room,urlpath=path)
- return goto(request,room)
-
-def goto(request,room):
- client = ac_api_client(request, room.acc)
- session_info = client.request('report-meeting-sessions',{'sco-id':room.sco_id})
-
- now = time.time()
- if room.self_cleaning:
- if (_nusers(session_info) == 0) and (abs(room.lastvisited - now) > GRACE):
- _clean(room)
-
- room.lastvisited = datetime.now()
- room.save()
-
- r = client.request('sco-info',{'sco-id':room.sco_id})
- urlpath = r.et.findtext('.//sco/url-path')
- return redirect_to(room.acc.url+urlpath)
- \ No newline at end of file
diff --git a/meetingtools/apps/userprofile/__init__.py b/meetingtools/apps/userprofile/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/meetingtools/apps/userprofile/__init__.py
+++ /dev/null
diff --git a/meetingtools/apps/userprofile/admin.py b/meetingtools/apps/userprofile/admin.py
deleted file mode 100644
index 21ca598..0000000
--- a/meetingtools/apps/userprofile/admin.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.contrib import admin
-from meetingtools.apps.userprofile.models import UserProfile
-
-admin.site.register(UserProfile) \ No newline at end of file
diff --git a/meetingtools/apps/userprofile/models.py b/meetingtools/apps/userprofile/models.py
deleted file mode 100644
index b0bc7ae..0000000
--- a/meetingtools/apps/userprofile/models.py
+++ /dev/null
@@ -1,21 +0,0 @@
-'''
-Created on Jul 5, 2010
-
-@author: leifj
-'''
-from django.db import models
-from django.contrib.auth.models import User
-
-class UserProfile(models.Model):
- user = models.ForeignKey(User,blank=True,related_name='profile')
- display_name = models.CharField(max_length=255,blank=True)
- email = models.EmailField(blank=True)
- idp = models.CharField(max_length=255)
- timecreated = models.DateTimeField(auto_now_add=True)
- lastupdated = models.DateTimeField(auto_now=True)
-
- def __unicode__(self):
- return "%s - %s" % (self.user.username,self.display_name)
-
-def profile(user):
- return UserProfile.objects.get(user=user)