changeset 614:81cb72cfddac

bbb: don't crash because of wrong salt
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Wed, 15 Aug 2012 13:36:59 +0200
parents 23d688c016bf
children 56a239027b87
files data/plugin/action/submit_bbb_start_meeting.py data/plugin/macro/bbb.py
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/action/submit_bbb_start_meeting.py	Wed Aug 15 13:33:54 2012 +0200
+++ b/data/plugin/action/submit_bbb_start_meeting.py	Wed Aug 15 13:36:59 2012 +0200
@@ -80,6 +80,8 @@
                 except TypeError:
                     recreate = False
                     msg, state = ("Usually the meeting is running and you tried to change some important parameters. Stop the Meeting beforehand.", "error")
+                # XXX there is an AttributeError if the SALT is wrong.
+                # catching the AttributeError seems no solution for a correct SALT.
 
             except KeyError:
                 msg, state = ("Usually not the right parameters or syntax used! Check the page content.  ", "error")
--- a/data/plugin/macro/bbb.py	Wed Aug 15 13:33:54 2012 +0200
+++ b/data/plugin/macro/bbb.py	Wed Aug 15 13:36:59 2012 +0200
@@ -40,16 +40,16 @@
         txt = ['= Currently active Meetings =']
     if all_sessions:
         txt.append('|| meeting id || participation count || moderator count || users ||')
-    for session in all_sessions:
-        meeting_id = session["info"]['meeting_id']
-        participation_count = session["info"]['participant_count']
-        moderator_count = session["info"]['moderator_count']
-        users = session["info"]["users"]
-        users_in_meeting = ["%s %s" % (user["name"], user["role"][0]) for user in users]
+        for session in all_sessions:
+            meeting_id = session["info"]['meeting_id']
+            participation_count = session["info"]['participant_count']
+            moderator_count = session["info"]['moderator_count']
+            users = session["info"]["users"]
+            users_in_meeting = ["%s %s" % (user["name"], user["role"][0]) for user in users]
             
         
 
-        txt.append('|| %(meeting_id)s || %(participation_count)s|| %(moderator_count)s || %(users)s ||' % {"meeting_id": meeting_id,
+            txt.append('|| %(meeting_id)s || %(participation_count)s|| %(moderator_count)s || %(users)s ||' % {"meeting_id": meeting_id,
                                                                                               "participation_count": participation_count,
                                                                                               "moderator_count": moderator_count,
                                                                                               "users": '<<BR>>'.join(users_in_meeting)