diff --git a/bbb-installer.sh b/bbb-installer.sh index 504eb41..7f54828 100755 --- a/bbb-installer.sh +++ b/bbb-installer.sh @@ -99,8 +99,8 @@ rm -Rf $TMPFOLDER echo "Deploying Zimlets" cd /tmp -wget --no-cache https://github.com/Zimbra-Community/bigbluebutton-zimlet/releases/download/0.0.7/tk_barrydegraaff_bigbluebutton.zip -O /tmp/tk_barrydegraaff_bigbluebutton.zip -wget --no-cache https://github.com/Zimbra/zimbra-zimlet-bigbluebutton/releases/download/0.0.6/zimbra-zimlet-bigbluebutton.zip -O /tmp/zimbra-zimlet-bigbluebutton.zip +wget --no-cache https://github.com/Zimbra-Community/bigbluebutton-zimlet/releases/download/0.0.8/tk_barrydegraaff_bigbluebutton.zip -O /tmp/tk_barrydegraaff_bigbluebutton.zip +wget --no-cache https://github.com/Zimbra/zimbra-zimlet-bigbluebutton/releases/download/0.0.8/zimbra-zimlet-bigbluebutton.zip -O /tmp/zimbra-zimlet-bigbluebutton.zip su - zimbra -c "/opt/zimbra/bin/zmzimletctl deploy /tmp/tk_barrydegraaff_bigbluebutton.zip" su - zimbra -c "/opt/zimbra/bin/zmzimletctl deploy /tmp/zimbra-zimlet-bigbluebutton.zip" su - zimbra -c "zmmailboxdctl restart" diff --git a/extension/.idea/workspace.xml b/extension/.idea/workspace.xml index ab8d3ab..f4112a2 100644 --- a/extension/.idea/workspace.xml +++ b/extension/.idea/workspace.xml @@ -6,6 +6,8 @@ + + @@ -74,18 +76,18 @@ - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "SHARE_PROJECT_CONFIGURATION_FILES": "true", - "last_opened_file_path": "/home/bar/zimbra-libs", - "project.structure.last.edited": "Project", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.2", - "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler" + +}]]> diff --git a/extension/i18n/english.properties b/extension/i18n/english.properties index af61245..a02dba6 100644 --- a/extension/i18n/english.properties +++ b/extension/i18n/english.properties @@ -32,3 +32,4 @@ join1 = Meeting ID join2 = Your name join3 = Password join4 = Join Meeting +join5 = If you are in Zimbra Desktop you can copy the URL from below and open it in your web browser diff --git a/extension/i18n/french.properties b/extension/i18n/french.properties index 6c7b458..38cd0c8 100644 --- a/extension/i18n/french.properties +++ b/extension/i18n/french.properties @@ -32,3 +32,4 @@ join1 = ID de la r\u00E9union join2 = Votre nom join3 = Mot de passe join4 = Rejoindre la r\u00E9union +join5 = If you are in Zimbra Desktop you can copy the URL from below and open it in your web browser diff --git a/extension/out/artifacts/BigBlueButton_jar/BigBlueButton.jar b/extension/out/artifacts/BigBlueButton_jar/BigBlueButton.jar index 85d6fff..75f4cb4 100644 Binary files a/extension/out/artifacts/BigBlueButton_jar/BigBlueButton.jar and b/extension/out/artifacts/BigBlueButton_jar/BigBlueButton.jar differ diff --git a/extension/out/production/extension/tk/barrydegraaff/bigbluebutton/BigBlueButton.class b/extension/out/production/extension/tk/barrydegraaff/bigbluebutton/BigBlueButton.class index 13b379a..b0ea0da 100644 Binary files a/extension/out/production/extension/tk/barrydegraaff/bigbluebutton/BigBlueButton.class and b/extension/out/production/extension/tk/barrydegraaff/bigbluebutton/BigBlueButton.class differ diff --git a/extension/src/tk/barrydegraaff/bigbluebutton/BigBlueButton.java b/extension/src/tk/barrydegraaff/bigbluebutton/BigBlueButton.java index 4e26398..14acc16 100644 --- a/extension/src/tk/barrydegraaff/bigbluebutton/BigBlueButton.java +++ b/extension/src/tk/barrydegraaff/bigbluebutton/BigBlueButton.java @@ -87,6 +87,7 @@ public String getPath() { private String join2; private String join3; private String join4; + private String join5; /** * Processes HTTP POST requests. @@ -147,6 +148,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc this.join2 = prop.getProperty("join2"); this.join3 = prop.getProperty("join3"); this.join4 = prop.getProperty("join4"); + this.join5 = prop.getProperty("join5"); input.close(); } catch (Exception ex) { ex.printStackTrace(); @@ -202,8 +204,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc ) { String joinUrl = bbbRequest("join", "meetingID=" + meeting.getString("meetingId") + "&password=" + req.getParameter("password") + "&fullName=" + encodeURIComponent(req.getParameter("name"))); resp.setCharacterEncoding("UTF-8"); - resp.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); - resp.setHeader("Location", joinUrl); + //resp.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); + //resp.setHeader("Location", joinUrl); + joinPage(resp, joinUrl); } else { showPage(resp, meeting.getString("meetingId")); } @@ -343,6 +346,23 @@ private void showPage(HttpServletResponse resp, String meetingID) throws IOExcep } } + private void joinPage(HttpServletResponse resp, String meetingURL) throws IOException, ServletException { + try { + + resp.setHeader("Content-Type", "text/html"); + + resp.getOutputStream().print("\r\nZimbra BigBlueButton Meeting"); + resp.getOutputStream().print("

"+this.join4+"

"+this.mail2+"

" + this.join5 + "

"); + } catch ( + Exception ex) { + ex.printStackTrace(); + } + } + private void sendConfirmation(Account account, String meetingId, String attendeePassword, String moderatorPassword, String hostname) { try { MimeMessage mm = new Mime.FixedMimeMessage(JMSession.getSmtpSession(account)); diff --git a/zimlet/tk_barrydegraaff_bigbluebutton/tk_barrydegraaff_bigbluebutton.xml b/zimlet/tk_barrydegraaff_bigbluebutton/tk_barrydegraaff_bigbluebutton.xml index 0dd968e..d382d34 100644 --- a/zimlet/tk_barrydegraaff_bigbluebutton/tk_barrydegraaff_bigbluebutton.xml +++ b/zimlet/tk_barrydegraaff_bigbluebutton/tk_barrydegraaff_bigbluebutton.xml @@ -1,4 +1,4 @@ - + BigBlueButton.png tk_barrydegraaff_bigbluebutton.js