Merge pull request #68 from blindsidenetworks/master

Updates to v11.1

api/src/java/org/sakaiproject/bbb/api/BBBMeeting.java

@@ -49,8 +49,10 @@ public class BBBMeeting implements Entity {
 	private Date endDate = null;
 	private Boolean waitForModerator = null;
 	private Boolean multipleSessionsAllowed = null;
+	private String presentation = null;
+	private Boolean groupSessions = null;
 	private Boolean deleted = null;
-	private Boolean recording = null; 
+	private Boolean recording = null;
 	private Long recordingDuration = null;
 	private String recordingEmail = null;
 

api/src/java/org/sakaiproject/bbb/api/BBBMeetingManager.java

@@ -48,18 +48,24 @@ public interface BBBMeetingManager {
     public final static String CFG_DEFAULT_OWNER = "bbb.default.participants.owner";
     public final static String CFG_AUTOREFRESHMEETINGS = "bbb.autorefresh.meetings";
     public final static String CFG_AUTOREFRESHRECORDINGS = "bbb.autorefresh.recordings";
-    public final static String CFG_GETSITERECORDINGS = "bbb.getsiterecordings";
-    public final static String CFG_RECORDING = "bbb.recording";                             // [true|false]
     public final static String CFG_RECORDING_ENABLED = "bbb.recording.enabled";             // [true|false]
+    public final static String CFG_RECORDING_EDITABLE = "bbb.recording.editable";           // [true|false]
     public final static String CFG_RECORDING_DEFAULT = "bbb.recording.default";             // [true|false]
+    public final static String CFG_RECORDINGREADYNOTIFICATION_ENABLED = "bbb.recordingready.enabled";           // [true|false]
     public final static String CFG_DESCRIPTIONMAXLENGTH = "bbb.descriptionmaxlength";
     public final static String CFG_DESCRIPTIONTYPE = "bbb.descriptiontype";                 // [fckeditor|ckeditor|plaintext]
     public final static String CFG_DURATION_ENABLED = "bbb.duration.enabled";               // [true|false]
     public final static String CFG_DURATION_DEFAULT = "bbb.duration.default";
     public final static String CFG_WAITMODERATOR_ENABLED = "bbb.waitmoderator.enabled";     // [true|false]
+    public final static String CFG_WAITMODERATOR_EDITABLE = "bbb.waitmoderator.editable";   // [true|false]
     public final static String CFG_WAITMODERATOR_DEFAULT = "bbb.waitmoderator.default";     // [true|false]
     public final static String CFG_MULTIPLESESSIONSALLOWED_ENABLED = "bbb.multiplesessionsallowed.enabled";     // [true|false]
+    public final static String CFG_MULTIPLESESSIONSALLOWED_EDITABLE = "bbb.multiplesessionsallowed.editable";   // [true|false]
     public final static String CFG_MULTIPLESESSIONSALLOWED_DEFAULT = "bbb.multiplesessionsallowed.default";     // [true|false]
+    public final static String CFG_PREUPLOADPRESENTATION_ENABLED = "bbb.preuploadpresentation.enabled";     // [true|false]
+    public final static String CFG_GROUPSESSIONS_ENABLED = "bbb.groupsessions.enabled";               // [true|false]
+    public final static String CFG_GROUPSESSIONS_EDITABLE = "bbb.groupsessions.editable";             // [true|false]
+    public final static String CFG_GROUPSESSIONS_DEFAULT = "bbb.groupsessions.default";               // [true|false]
 
     // Permissions
     public static final String FN_PREFIX = "bbb.";
@@ -142,7 +148,7 @@ public boolean createMeeting(BBBMeeting meeting, boolean notifyParticipants, boo
      * 
      * @param meeting
      */
-    public boolean updateMeeting(BBBMeeting meeting, boolean notifyParticipants, boolean addToCalendar, boolean iCalAttached, Long iCalAlarmMinutes)
+    public boolean updateMeeting(BBBMeeting meeting, boolean notifyParticipants, boolean addToCalendar, boolean iCalAttached, Long iCalAlarmMinutes, boolean meetingOnly)
             throws SecurityException, BBBException;
 
     /**
@@ -152,16 +158,22 @@ public boolean updateMeeting(BBBMeeting meeting, boolean notifyParticipants, boo
     public boolean isMeetingRunning(String meetingID) 
             throws BBBException;
 
+    /**
+     * Get all meetings from BBB server.
+     */
+    public Map<String, Object> getMeetings()
+            throws BBBException;
+
     /**
      * Get live meeting details from BBB server.
      */
-    public Map<String, Object> getMeetingInfo(String meetingID)
+    public Map<String, Object> getMeetingInfo(String meetingID, String groupId)
             throws BBBException;
 
     /**
      * Get playback recordings from BBB server.
      */
-    public Map<String, Object> getRecordings(String meetingID)
+    public Map<String, Object> getRecordings(String meetingID, String groupId)
             throws BBBException;
 
     /**
@@ -191,7 +203,7 @@ public boolean deleteMeeting(String id)
     /**
      * Only executes endMeeting.
      */
-    public boolean endMeeting(String id) 
+    public boolean endMeeting(String id, String groupId, boolean endAll) 
             throws SecurityException, BBBException;
 
     /**
@@ -249,7 +261,7 @@ public void checkJoinMeetingPreConditions(BBBMeeting meeting)
     /**
      * Returns true if the current user can view recordings in the supplied site
      */
-     public boolean getCanView(String siteId);
+    public boolean getCanView(String siteId);
 
     /**
      * Checks tool permissions in site, apply defaults if no perms set and
@@ -294,6 +306,11 @@ public void checkJoinMeetingPreConditions(BBBMeeting meeting)
     public String getJoinUrl(BBBMeeting meeting)
             throws SecurityException, Exception;
 
+    /**
+     * Returns true if participants were notified when recording was ready
+     */
+    public boolean recordingReady(String meetingId);
+
     /**
      * Returns bbb.autorefresh.meetings parameter set up on sakai.properties or the one set up by default.
      */
@@ -306,6 +323,8 @@ public String getJoinUrl(BBBMeeting meeting)
 
     public String isRecordingEnabled();
 
+    public String isRecordingEditable();
+
     public String getRecordingDefault();
 
     public String isDurationEnabled();
@@ -314,11 +333,23 @@ public String getJoinUrl(BBBMeeting meeting)
 
     public String isWaitModeratorEnabled();
 
+    public String isWaitModeratorEditable();
+
     public String getWaitModeratorDefault();
 
     public String isMultipleSessionsAllowedEnabled();
 
+    public String isMultipleSessionsAllowedEditable();
+
     public String getMultipleSessionsAllowedDefault();
+
+    public String isPreuploadPresentationEnabled();
+
+    public String isGroupSessionsEnabled();
+
+    public String isGroupSessionsEditable();
+
+    public String getGroupSessionsDefault();
 
     public String getMaxLengthForDescription();
 
@@ -334,4 +365,6 @@ public String getJoinUrl(BBBMeeting meeting)
 
     public String getUserRoleInSite(String userId, String siteId);
 
+    public List<String> getUserGroupIdsInSite(String userId, String siteId);
+
 }

bundle/src/resources/EmailNotificationRecordingReady.properties

@@ -0,0 +1,32 @@
+#####################################
+# Title
+#####################################
+email.title = [ {0} - Recording Ready ] {1}
+
+#####################################
+# Header
+#####################################
+email.header = <html><head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"></head>
+
+#####################################
+# Body
+#####################################
+email.body = <body><p>A recording is available for the following meeting on the "{0}" site at {1}.</p>\
+<p><b>Location:</b> "{0}" site > Meetings > Recordings > <a href="{2}">{3}</a></p>
+
+email.body.meeting_details = <p><b>Meeting Details:</b>\
+<table border="0" style="margin: 5px 0 0 20px"><tbody>\
+<tr><td style="font-weight:bold;color:#555;">Title: </td><td>{0} </td></tr>\
+<tr><td style="font-weight:bold;color:#555;">Description: </td><td>{1} </td></tr>\
+<tr><td style="font-weight:bold;color:#555;">Start date: </td><td>{2} </td></tr>\
+<tr><td style="font-weight:bold;color:#555;">End date: </td><td>{3} </td></tr>\
+<tr><td style="font-weight:bold;color:#555;">Created by: </td><td>{4} </td></tr>\
+</tbody></table>\
+</p>
+
+#####################################
+# Footer
+#####################################
+email.footer = <p><hr/><br/>\
+This automatic notification message was sent by {0} ({1}) \
+from the {2} site.</p></body></html>

bundle/src/resources/ToolMessages.properties

@@ -11,7 +11,10 @@ bbb_permissions_label = Permissions
 bbb_permissions_tooltip = Click to view permissions
 bbb_recordings_label = Recordings
 bbb_recordings_tooltip = Click to see all recordings
-
+bbb_search = Search
+bbb_back_button = Back
+bbb_back_button_tooltip = Click to go back to meeting info
+bbb_refresh = Refresh
 
 #####################################
 # Page: Meeting list
@@ -31,6 +34,7 @@ bbb_action_delete_meeting_question = Are you sure you want to end and delete per
 bbb_action_end_meeting = End
 bbb_action_end_meeting_tooltip = Click to end this meeting. All current participants will be kicked out.
 bbb_action_end_meeting_question = Are you sure you want to end {0}?\n\nClick OK to continue.
+bbb_action_end_all_meeting_question = Are you sure you want to end {0}?\n\n(Note: This will end all active group sessions)\n\nClick OK to continue.
 
 
 #####################################
@@ -40,15 +44,18 @@ bbb_th_recordingname = Recordings
 bbb_th_recordings = Playback
 bbb_th_recordingdate = Recording date
 bbb_th_recordinglength = Length
+bbb_th_recordingpreview = Preview
+bbb_th_recordingActions = Actions
 bbb_action_hide = Hide
 bbb_action_hide_tooltip = Click to make this recording hidden for Students
 bbb_action_show = Show
-bbb_action_show_tooltip = Click to make this recording visible from Students
+bbb_action_show_tooltip = Click to make this recording visible for Students
 bbb_action_delete_recording = Delete
 bbb_action_delete_recording_tooltip = Click to delete this recordings from the server
 bbb_action_delete_recording_question = Are you sure you want to delete permanently this recording {0}?\n\nClick OK to continue.
 bbb_recording_status_hidden = Unpublished
 bbb_recording_status_shown = Published
+bbb_recording_thumbnails_hidden = Only for published recordings
 bbb_recording_type.presentation = Presentation
 bbb_recording_view_tooltip.presentation = View the presentation
 
@@ -68,7 +75,10 @@ bbb_info_recording_duration_units = minutes
 bbb_info_recordings = Recordings:
 bbb_info_voicebridge = Voice bridge:
 bbb_info_waitformoderator = Wait for moderator:
+bbb_info_preuploadpresentation = Preupload Presentation:
+bbb_info_remove = Remove
 bbb_info_multiplesessionsallowed = Multiple sessions allowed:
+bbb_info_groupsessions = Group Sessions:
 bbb_default_welcome_description = Online session
 bbb_welcome_message_opening = Welcome to {0}!
 #bbb_welcome_message_general_info = For help on using BigBlueButton see these (short) <a href="{0}"><u>tutorial videos</u></a>.<br><br>To join the voice bridge for this meeting:<br>&nbsp;&nbsp;(1) click the headset icon in the upper-left <b>(please use a headset to avoid causing noise for others)</b>, or<br>&nbsp;&nbsp;(2) dial {1} and enter conference ID: {2}
@@ -110,6 +120,8 @@ bbb_notification_notify_ical_alarm_units = minutes before meeting starts.
 #####################################
 bbb_meetinginfo_title = Meeting Details
 bbb_meetinginfo_status = Status:
+bbb_meetinginfo_group = Group:
+bbb_meetinginfo_defaultGroup = Default (No Group)
 bbb_meetinginfo_participants_count = Connected users:
 bbb_meetinginfo_participants_atendee = attendee
 bbb_meetinginfo_participants_atendees = attendees
@@ -133,12 +145,12 @@ bbb_meetinginfo_recordings_false = False
 bbb_permissions_instr = Define permissions for Meeting tool in the current site.
 bbb_permissions_role = Role
 bbb_permissions_saved = Permissions successfully saved
-bbb_permissions_create = Create
-bbb_permissions_delete_any = Delete any
-bbb_permissions_delete_own = Delete own
-bbb_permissions_edit_any = Edit any
-bbb_permissions_edit_own = Edit own
-bbb_permissions_participate = Participate
+bbb_permissions_create = Create meetings
+bbb_permissions_delete_any = Delete any meetings
+bbb_permissions_delete_own = Delete own meetings
+bbb_permissions_edit_any = Edit any meetings
+bbb_permissions_edit_own = Edit own meetings
+bbb_permissions_participate = Participate in meetings
 bbb_permissions_recordings_view = View recordings
 bbb_permissions_recordings_edit_own = Edit own recordings
 bbb_permissions_recordings_edit_any = Edit any recordings
@@ -180,6 +192,8 @@ bbb_err_curr_user = Failed to get current user
 bbb_err_maintain_role = Failed to get the maintain role
 bbb_err_create_meeting = Failed to create meeting
 bbb_err_update_meeting = Failed to update meeting
+bbb_err_do_upload = Failed to upload file
+bbb_err_remove_upload = Failed to remove file upload
 bbb_err_end_all_meetings = Failed to end all meetings
 bbb_err_meeting_list_empty = The meeting list is empty!
 bbb_err_no_permissions = You are not authorized to perform this action

bundle/src/resources/ToolMessages_en.properties

@@ -11,7 +11,10 @@ bbb_permissions_label = Permissions
 bbb_permissions_tooltip = Click to view permissions
 bbb_recordings_label = Recordings
 bbb_recordings_tooltip = Click to see all recordings
-
+bbb_search = Search
+bbb_back_button = Back
+bbb_back_button_tooltip = Click to go back to meeting info
+bbb_refresh = Refresh
 
 #####################################
 # Page: Meeting list
@@ -31,6 +34,7 @@ bbb_action_delete_meeting_question = Are you sure you want to end and delete per
 bbb_action_end_meeting = End
 bbb_action_end_meeting_tooltip = Click to end this meeting. All current participants will be kicked out.
 bbb_action_end_meeting_question = Are you sure you want to end {0}?\n\nClick OK to continue.
+bbb_action_end_all_meeting_question = Are you sure you want to end {0}?\n\n(Note: This will end all active group sessions)\n\nClick OK to continue.
 
 
 #####################################
@@ -40,15 +44,18 @@ bbb_th_recordingname = Recordings
 bbb_th_recordings = Playback
 bbb_th_recordingdate = Recording date
 bbb_th_recordinglength = Length
+bbb_th_recordingpreview = Preview
+bbb_th_recordingActions = Actions
 bbb_action_hide = Hide
 bbb_action_hide_tooltip = Click to make this recording hidden for Students
 bbb_action_show = Show
-bbb_action_show_tooltip = Click to make this recording visible from Students
+bbb_action_show_tooltip = Click to make this recording visible for Students
 bbb_action_delete_recording = Delete
 bbb_action_delete_recording_tooltip = Click to delete this recordings from the server
 bbb_action_delete_recording_question = Are you sure you want to delete permanently this recording {0}?\n\nClick OK to continue.
 bbb_recording_status_hidden = Unpublished
 bbb_recording_status_shown = Published
+bbb_recording_thumbnails_hidden = Only for published recordings
 
 
 #####################################
@@ -66,7 +73,10 @@ bbb_info_recording_duration_units = minutes
 bbb_info_recordings = Recordings:
 bbb_info_voicebridge = Voice bridge:
 bbb_info_waitformoderator = Wait for moderator:
+bbb_info_preuploadpresentation = Preupload Presentation:
+bbb_info_remove = Remove
 bbb_info_multiplesessionsallowed = Multiple sessions allowed:
+bbb_info_groupsessions = Group Sessions:
 bbb_default_welcome_description = Online session
 bbb_welcome_message_opening = Welcome to {0}!
 #bbb_welcome_message_general_info = For help on using BigBlueButton see these (short) <a href="{0}"><u>tutorial videos</u></a>.<br><br>To join the voice bridge for this meeting:<br>&nbsp;&nbsp;(1) click the headset icon in the upper-left <b>(please use a headset to avoid causing noise for others)</b>, or<br>&nbsp;&nbsp;(2) dial {1} and enter conference ID: {2}
@@ -108,6 +118,8 @@ bbb_notification_notify_ical_alarm_units = minutes before meeting starts.
 #####################################
 bbb_meetinginfo_title = Meeting Details
 bbb_meetinginfo_status = Status:
+bbb_meetinginfo_group = Group:
+bbb_meetinginfo_defaultGroup = Default (No Group)
 bbb_meetinginfo_participants_count = Connected users:
 bbb_meetinginfo_participants_atendee = attendee
 bbb_meetinginfo_participants_atendees = attendees
@@ -131,12 +143,12 @@ bbb_meetinginfo_recordings_false = False
 bbb_permissions_instr = Define permissions for Meeting tool in the current site.
 bbb_permissions_role = Role
 bbb_permissions_saved = Permissions successfully saved
-bbb_permissions_create = Create
-bbb_permissions_delete_any = Delete any
-bbb_permissions_delete_own = Delete own
-bbb_permissions_edit_any = Edit any
-bbb_permissions_edit_own = Edit own
-bbb_permissions_participate = Participate
+bbb_permissions_create = Create meetings
+bbb_permissions_delete_any = Delete any meetings
+bbb_permissions_delete_own = Delete own meetings
+bbb_permissions_edit_any = Edit any meetings
+bbb_permissions_edit_own = Edit own meetings
+bbb_permissions_participate = Participate in meetings
 bbb_permissions_recordings_view = View recordings
 bbb_permissions_recordings_edit_own = Edit own recordings
 bbb_permissions_recordings_edit_any = Edit any recordings
@@ -178,6 +190,8 @@ bbb_err_curr_user = Failed to get current user
 bbb_err_maintain_role = Failed to get the maintain role
 bbb_err_create_meeting = Failed to create meeting
 bbb_err_update_meeting = Failed to update meeting
+bbb_err_do_upload = Failed to upload file
+bbb_err_remove_upload = Failed to remove file upload
 bbb_err_end_all_meetings = Failed to end all meetings
 bbb_err_meeting_list_empty = The meeting list is empty!
 bbb_err_no_permissions = You are not authorized to perform this action